diff --git a/.gitignore b/.gitignore index 1304d0448..ed6f649ae 100644 --- a/.gitignore +++ b/.gitignore @@ -41,6 +41,7 @@ coverage # Compiled binary addons (http://nodejs.org/api/addons.html) build/Release +build/*.ico # Dependency directories node_modules diff --git a/README.md b/README.md index 029afc475..1a0b5a23d 100644 --- a/README.md +++ b/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) diff --git a/appveyor.yml b/appveyor.yml index 33c38ef89..dd96542ab 100644 --- a/appveyor.yml +++ b/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 diff --git a/assets/oni-header.png b/assets/oni-header.png new file mode 100644 index 000000000..99b4c5da8 Binary files /dev/null and b/assets/oni-header.png differ diff --git a/build/BuildSetupTemplate.js b/build/BuildSetupTemplate.js index 44fb71c13..6acde558b 100644 --- a/build/BuildSetupTemplate.js +++ b/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) => { diff --git a/build/CopyIcons.js b/build/CopyIcons.js new file mode 100644 index 000000000..5914f667b --- /dev/null +++ b/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) diff --git a/build/icon.icns b/build/icon.icns index 554d27249..43369a2c3 100644 Binary files a/build/icon.icns and b/build/icon.icns differ diff --git a/build/icon.ico b/build/icon.ico deleted file mode 100644 index be88dd616..000000000 Binary files a/build/icon.ico and /dev/null differ diff --git a/build/icons/1024x1024.png b/build/icons/1024x1024.png new file mode 100644 index 000000000..eb6f86e79 Binary files /dev/null and b/build/icons/1024x1024.png differ diff --git a/build/icons/128x128.png b/build/icons/128x128.png index a3491e335..2d6447690 100644 Binary files a/build/icons/128x128.png and b/build/icons/128x128.png differ diff --git a/build/icons/16x16.png b/build/icons/16x16.png new file mode 100644 index 000000000..f37582531 Binary files /dev/null and b/build/icons/16x16.png differ diff --git a/build/icons/256x256.png b/build/icons/256x256.png index 125af73e8..4e528697d 100644 Binary files a/build/icons/256x256.png and b/build/icons/256x256.png differ diff --git a/build/icons/32x32.png b/build/icons/32x32.png index 45dc9732b..574291aae 100644 Binary files a/build/icons/32x32.png and b/build/icons/32x32.png differ diff --git a/build/icons/512x512.png b/build/icons/512x512.png new file mode 100644 index 000000000..3b74d474d Binary files /dev/null and b/build/icons/512x512.png differ diff --git a/build/icons/64x64.png b/build/icons/64x64.png index 317cd54e5..1d490d105 100644 Binary files a/build/icons/64x64.png and b/build/icons/64x64.png differ diff --git a/build/installerIcon.ico b/build/installerIcon.ico deleted file mode 100644 index be88dd616..000000000 Binary files a/build/installerIcon.ico and /dev/null differ diff --git a/build/setup/Oni_128.bmp b/build/setup/Oni_128.bmp new file mode 100644 index 000000000..f4257b35c Binary files /dev/null and b/build/setup/Oni_128.bmp differ diff --git a/build/setup/Oni_54.bmp b/build/setup/Oni_54.bmp new file mode 100644 index 000000000..4b9b67287 Binary files /dev/null and b/build/setup/Oni_54.bmp differ diff --git a/build/windows/256x256.png b/build/windows/256x256.png new file mode 100644 index 000000000..bd5a9324f Binary files /dev/null and b/build/windows/256x256.png differ diff --git a/images/Oni_128.png b/images/Oni_128.png deleted file mode 100644 index a3491e335..000000000 Binary files a/images/Oni_128.png and /dev/null differ diff --git a/images/Oni_256.icns b/images/Oni_256.icns deleted file mode 100644 index 554d27249..000000000 Binary files a/images/Oni_256.icns and /dev/null differ diff --git a/images/Oni_256.ico b/images/Oni_256.ico deleted file mode 100644 index be88dd616..000000000 Binary files a/images/Oni_256.ico and /dev/null differ diff --git a/images/Oni_256.png b/images/Oni_256.png deleted file mode 100644 index 125af73e8..000000000 Binary files a/images/Oni_256.png and /dev/null differ diff --git a/images/Oni_64.ico b/images/Oni_64.ico deleted file mode 100644 index b9102db1a..000000000 Binary files a/images/Oni_64.ico and /dev/null differ diff --git a/images/Oni_64.png b/images/Oni_64.png deleted file mode 100644 index 317cd54e5..000000000 Binary files a/images/Oni_64.png and /dev/null differ diff --git a/images/Oni_Full_Res.png b/images/Oni_Full_Res.png deleted file mode 100644 index 841014784..000000000 Binary files a/images/Oni_Full_Res.png and /dev/null differ diff --git a/images/Setup/Oni_128.bmp b/images/Setup/Oni_128.bmp deleted file mode 100644 index 1ecd2e887..000000000 Binary files a/images/Setup/Oni_128.bmp and /dev/null differ diff --git a/images/Setup/Oni_64.bmp b/images/Setup/Oni_64.bmp deleted file mode 100644 index 90cf2b7be..000000000 Binary files a/images/Setup/Oni_64.bmp and /dev/null differ diff --git a/images/oni.ico b/images/oni.ico new file mode 100644 index 000000000..05d8a8af7 Binary files /dev/null and b/images/oni.ico differ diff --git a/main.js b/main.js index 6b802ac35..5e70772e6 100644 --- a/main.js +++ b/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) diff --git a/package.json b/package.json index 7e9727511..58622b565 100644 --- a/package.json +++ b/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",