diff --git a/console/resources/console-tray-Template.png b/console/resources/console-tray-Template.png new file mode 100644 index 0000000000..11dbbbc38f Binary files /dev/null and b/console/resources/console-tray-Template.png differ diff --git a/console/resources/console-tray-Template@2x.png b/console/resources/console-tray-Template@2x.png new file mode 100644 index 0000000000..8acd094606 Binary files /dev/null and b/console/resources/console-tray-Template@2x.png differ diff --git a/console/resources/console-tray.png b/console/resources/console-tray.png index 83c6f7dbcc..6ff889828c 100644 Binary files a/console/resources/console-tray.png and b/console/resources/console-tray.png differ diff --git a/console/resources/console-tray@2x.png b/console/resources/console-tray@2x.png index b43035b92c..7295647c20 100644 Binary files a/console/resources/console-tray@2x.png and b/console/resources/console-tray@2x.png differ diff --git a/console/resources/console-tray@4x.png b/console/resources/console-tray@4x.png deleted file mode 100644 index ed815042b7..0000000000 Binary files a/console/resources/console-tray@4x.png and /dev/null differ diff --git a/console/src/main.js b/console/src/main.js index 645fcd4780..010732b511 100644 --- a/console/src/main.js +++ b/console/src/main.js @@ -16,8 +16,12 @@ var ProcessGroupStates = hfprocess.ProcessGroupStates; const ipcMain = electron.ipcMain; +const osType = os.type(); + var path = require('path'); -var TRAY_ICON = path.join(__dirname, '../resources/console-tray.png'); + +const TRAY_FILENAME = (osType == "Darwin" ? "console-tray-Template.png" : "console-tray.png"); +const TRAY_ICON = path.join(__dirname, '../resources/' + TRAY_FILENAME); // print out uncaught exceptions in the console process.on('uncaughtException', console.log.bind(console)); @@ -52,12 +56,11 @@ if (argv.localDebugBuilds || argv.localReleaseBuilds) { // TODO: show an error for the binaries that couldn't be found function openFileBrowser(path) { - var type = os.type(); - if (type == "Windows_NT") { + if (osType == "Windows_NT") { childProcess.exec('start ' + path); - } else if (type == "Darwin") { + } else if (osType == "Darwin") { childProcess.exec('open ' + path); - } else if (type == "Linux") { + } else if (osType == "Linux") { childProcess.exec('xdg-open ' + path); } } @@ -161,7 +164,6 @@ function updateMenuArray(menuArray, serverState) { function updateTrayMenu(serverState) { if (tray) { var menuArray = buildMenuArray(serverState); - console.log(menuArray); tray.setContextMenu(Menu.buildFromTemplate(menuArray)); } }