Merge pull request #587 from feross/electron-1.1.3

Electron 1.2.0

main/tray.js

@@ -4,11 +4,11 @@ module.exports = {
 }
 
 var cp = require('child_process')
-var path = require('path')
 var electron = require('electron')
 
 var app = electron.app
 
+var config = require('../config')
 var windows = require('./windows')
 
 var trayIcon
@@ -33,7 +33,7 @@ function hasTray () {
 }
 
 function createTrayIcon () {
-  trayIcon = new electron.Tray(path.join(__dirname, '..', 'static', 'WebTorrentSmall.png'))
+  trayIcon = new electron.Tray(getIconPath())
 
   // On Windows, left click to open the app, right click for context menu
   // On Linux, any click (right or left) opens the context menu
@@ -79,3 +79,9 @@ function hideApp () {
   windows.main.hide()
   windows.main.send('dispatch', 'backToList')
 }
+
+function getIconPath () {
+  return process.platform === 'win32'
+    ? config.APP_ICON + '.ico'
+    : config.APP_ICON + '.png'
+}

main/windows.js

@@ -24,7 +24,7 @@ function createAboutWindow () {
     show: false,
     center: true,
     resizable: false,
-    icon: config.APP_ICON + '.png',
+    icon: getIconPath(),
     title: process.platform !== 'darwin'
       ? 'About ' + config.APP_WINDOW_TITLE
       : '',
@@ -91,7 +91,7 @@ function createMainWindow () {
   var win = windows.main = new electron.BrowserWindow({
     backgroundColor: '#1E1E1E',
     darkTheme: true, // Forces dark theme (GTK+3)
-    icon: config.APP_ICON + 'Smaller.png', // Window and Volume Mixer icon.
+    icon: getIconPath(), // Window icon (Windows, Linux)
     minWidth: config.WINDOW_MIN_WIDTH,
     minHeight: config.WINDOW_MIN_HEIGHT,
     show: false, // Hide window until renderer sends 'ipcReady' event
@@ -137,3 +137,9 @@ function focusWindow (win) {
   }
   win.show() // shows and gives focus
 }
+
+function getIconPath () {
+  return process.platform === 'win32'
+    ? config.APP_ICON + '.ico'
+    : config.APP_ICON + '.png'
+}

package.json

@@ -22,7 +22,7 @@
     "deep-equal": "^1.0.1",
     "dlnacasts": "^0.1.0",
     "drag-drop": "^2.11.0",
-    "electron-prebuilt": "1.1.1",
+    "electron-prebuilt": "1.2.0",
     "fs-extra": "^0.27.0",
     "hyperx": "^2.0.2",
     "iso-639-1": "^1.2.1",