master:Added assets, modified build scripts

DKunin · Apr 12, 2017 · 05514eb · 05514eb
1 parent 7e46c6f
commit 05514eb
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
 ## Menubar Helper
 
-curl $(localip):7288/openeditor?options='*.js:20:1'
+<img src="./assets/images/eye.png" width="200px">
+
+- curl $(localip):7288/openeditor?options='*.js:20:1'
diff --git a/assets/images/favicon.png b/assets/images/favicon.png
diff --git a/assets/images/icon-128.png b/assets/images/icon-128.png
diff --git a/assets/images/icon-16.png b/assets/images/icon-16.png
diff --git a/assets/images/icon.icns b/assets/images/icon.icns
diff --git a/assets/images/icon.png b/assets/images/icon.png
diff --git a/bin/prepeare-icons b/bin/prepeare-icons
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+sizes=( 128 16 )
+
+for i in "${sizes[@]}"
+do
+   ffmpeg -i ./assets/images/icon.png -vf scale=$i:$i ./assets/images/icon-$i.png
+done
+
+ffmpeg -i ./assets/images/icon.png -vf scale=16:16 ./assets/images/favicon.png
diff --git a/icon.png b/icon.png
diff --git a/package.json b/package.json
@@ -21,9 +21,8 @@
     "check-style": "eslint ./src",
     "pretty": "prettier ./src/*.js --single-quote --tab-width 4 --write",
     "test": "npm run pretty && npm run check-style",
-    "build-mac": "rm -rf ./build/*darwin*; electron-packager . MenuBarHelper --out=./build --platform=darwin --arch=x64 --version=1.4.11 --icon=./res/logo.icns --overwrite",
-    "build-win": "rm -rf ./build/*win32*; electron-packager . MenuBarHelper --out=./build --platform=win32 --arch=x64 --version=1.4.11 --icon=./res/logo.icns --overwrite",
-    "build": "npm run build-mac",
+    "build": "rm -rf ./build/*darwin*; electron-packager . MenuBarHelper --out=./build --platform=darwin --arch=x64 --icon=./assets/images/icon.icns --overwrite",
+    "package": "create-dmg 'build/MenuBarHelper-darwin-x64/MenuBarHelper.app' && mv ./*.dmg ./build",
     "start": "electron ."
   }
 }
diff --git a/src/index.html b/src/index.html
@@ -30,6 +30,7 @@
         margin: 10px 0;
     }
     </style>
+    <link rel="shortcut icon" href="../assets/images/favicon.png" type="image/png">
 </head>
 <body>
     <form>

diff --git a/src/main.js b/src/main.js
@@ -97,7 +97,7 @@ app.on('ready', function() {
     win.loadURL('file://' + __dirname + '/index.html');
     // win.webContents.openDevTools();
     // appIcon = new Tray(iconPath.inactive);
-    appIcon = new Tray(path.resolve(__dirname, '../icon.png'));
+    appIcon = new Tray(path.resolve(__dirname, '../assets/images/icon-16.png'));
 
     startServer();