Skip to content

Commit

Permalink
Merge pull request #11 from chrisknepper/bug/windows-icon-issue
Browse files Browse the repository at this point in the history
-Re-export icons using new method to attempt to solve icon artifacts/…
  • Loading branch information
chrisknepper authored Jun 26, 2018
2 parents d93816d + 2237be2 commit 1730822
Show file tree
Hide file tree
Showing 15 changed files with 14 additions and 2 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,6 @@ npm run release
Once the packaging process finished, the `dist` directory will contain your distributable file.

We use [electron-builder](https://github.com/electron-userland/electron-builder) to handle the packaging process. It has a lot of [customization options](https://www.electron.build/configuration/configuration), which you can declare under `"build"` key in `package.json`.

# The icons
We use [png2icons](https://www.npmjs.com/package/png2icons) to create Windows and Mac icons from the source PNG icon, which is located in [assets/android_messages_desktop_icon.png](assets/android_messages_desktop_icon.png). However, the Windows icon generated from this package seems to result in visual corruption on Windows 10, so I'm manually converting the PNG to a Windows icon with [icoconvert.com](http://icoconvert.com) for the time being.
Binary file modified assets/android_messages_desktop_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"test": "npm run unit && npm run e2e",
"start": "node build/start.js",
"release": "npm test && webpack --config=build/webpack.app.config.js --env=production && electron-builder -mwl",
"generate-icons": "electron-icon-maker --input=./assets/android_messages_desktop_icon.png --output=./assets/output"
"generate-icons": "png2icons assets/android_messages_desktop_icon.png resources/icon -all -i"
},
"dependencies": {
"about-window": "^1.11.1",
Expand All @@ -66,11 +66,11 @@
"css-loader": "^0.28.7",
"electron": "2.0.2",
"electron-builder": "^20.15.1",
"electron-icon-maker": "0.0.4",
"electron-mocha": "^6.0.4",
"file-loader": "^1.1.11",
"friendly-errors-webpack-plugin": "^1.6.1",
"mocha": "^5.2.0",
"png2icons": "^1.0.1",
"source-map-support": "^0.5.0",
"spectron": "^3.7.2",
"style-loader": "^0.21.0",
Expand Down
Binary file modified resources/icon.icns
Binary file not shown.
Binary file modified resources/icon.ico
Binary file not shown.
Binary file modified resources/icons/1024x1024.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/icons/128x128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/icons/16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/icons/24x24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/icons/256x256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/icons/32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/icons/48x48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/icons/512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/icons/64x64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 1730822

Please sign in to comment.