Fix #4 - Add in new application icons (#587)

* Add new files

* Add oni-header to assets folder

* Add icons of all resolutions

* add script to generate windows icon

* Update icon creation script

* Delete unneeded files, update icns and ico

* Update icons

* Update README

* Remove committed icons

* Update scripts

* Update comment in CopyIcons

* Clean up README

* Change layout of icons

* Another iteration of README

* Update README again

* Remove unnecessary to-ico-sync dependency

.gitignore

@@ -41,6 +41,7 @@ coverage
 
 # Compiled binary addons (http://nodejs.org/api/addons.html)
 build/Release
+build/*.ico
 
 # Dependency directories
 node_modules

README.md

@@ -1,10 +1,11 @@
+![alt text](./assets/oni-header.png)
+
+### A new way to Vim: IDE powered by Neovim + React + Electron
+
 [![Build Status](https://travis-ci.org/extr0py/oni.svg?branch=master)](https://travis-ci.org/extr0py/oni)
 [![Build Status](https://ci.appveyor.com/api/projects/status/gum9hty9hm65o7ae/branch/master?svg=true)](https://ci.appveyor.com/project/extr0py/oni/branch/master)
 [![Join the chat at https://gitter.im/extr0py/Lobby](https://badges.gitter.im/extr0py/Lobby.svg)](https://gitter.im/extr0py/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![BountySource Active Bounties](https://api.bountysource.com/badge/tracker?tracker_id=48462304)](https://www.bountysource.com/teams/oni)
-# Oni
-![alt text](./images/Oni_128.png)
-## Neovim + JavaScript powered IDE
 
 - [Introduction](#introduction)
 - [Features](#features)

appveyor.yml

@@ -42,6 +42,7 @@ test_script:
   - npm run lint
   - npm run test:unit
   # create setup package
+  - npm run copy-icons
   - npm run dist:win
   - npm run pack:win
   # run integration tests

build/BuildSetupTemplate.js

@@ -28,8 +28,8 @@ const valuesToReplace = {
     "AppSetupExecutableName": `${prodName}-${version}-ia32-win`,
     "Version": version,
     "SourcePath": path.join(__dirname, "..", "dist", "win-ia32-unpacked", "*"),
-    "WizardImageFilePath": path.join(__dirname, "..", "images", "setup", "Oni_128.bmp"),
-    "WizardSmallImageFilePath": path.join(__dirname, "..", "images", "setup", "Oni_64.bmp")
+    "WizardImageFilePath": path.join(__dirname, "setup", "Oni_128.bmp"),
+    "WizardSmallImageFilePath": path.join(__dirname, "setup", "Oni_54.bmp")
 }
 
 _.keys(valuesToReplace).forEach((key) => {

build/CopyIcons.js

@@ -0,0 +1,12 @@
+// CopyIcons.js
+//
+// The windows packager requires an `icon.ico` and `installerIcon.ico`,
+// this script reuses the one we use for oni's menu bar.
+
+const path = require("path")
+const fs = require("fs")
+
+const buf = fs.readFileSync(path.join(__dirname, "..", "images", "oni.ico"))
+
+fs.writeFileSync(path.join(__dirname, "icon.ico"), buf)
+fs.writeFileSync(path.join(__dirname, "installerIcon.ico"), buf)

main.js

@@ -62,7 +62,8 @@ function createWindow(commandLineArguments, workingDirectory) {
     }
 
     // Create the browser window.
-    let mainWindow = new BrowserWindow({ width: 800, height: 600, icon: path.join(__dirname, "images", "Oni_128.png"), webPreferences })
+    // TODO: Do we need to use non-ico for other platforms?
+    let mainWindow = new BrowserWindow({ width: 800, height: 600, icon: path.join(__dirname, "images", "oni.ico"), webPreferences })
 
     updateMenu(mainWindow, false)
 

package.json

@@ -23,8 +23,14 @@
       "**/*",
       "!**/*.oni",
       "!**/*.vscode",
+      "!app",
+      "!assets",
+      "!browser",
       "!bin",
-      "!lib_test"
+      "!build",
+      "!examples",
+      "!lib_test",
+      "!test"
     ],
     "asar": false,
     "mac": {
@@ -68,6 +74,7 @@
     "clean": "npm run clean:plugin:oni-plugin-reasonml",
     "clean:plugin:oni-plugin-reasonml": "cd vim/core/oni-plugin-reasonml && bsb -clean",
     "pack": "build --publish never",
+    "copy-icons": "node build/CopyIcons.js",
     "dist:win": "build --arch ia32 --publish never",
     "pack:win": "node build/BuildSetupTemplate.js && innosetup-compiler dist/setup.iss --verbose --O=dist",
     "test": "npm run test:unit && npm run test:integration",