From 5e8fdf724a366019b5b461bf985dcc6a7e425ef9 Mon Sep 17 00:00:00 2001
From: Johannes Millan <johannes.millan@gmail.com>
Date: Mon, 9 Jan 2017 18:12:50 +0100
Subject: [PATCH] remove tray icon when process is shutdown

---
 .../assets/{img/ico.png => icons/tray-ico.png}    | Bin
 electron/jira.js                                  |   4 ++--
 electron/main.js                                  |  14 ++++++++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)
 rename electron/assets/{img/ico.png => icons/tray-ico.png} (100%)

diff --git a/electron/assets/img/ico.png b/electron/assets/icons/tray-ico.png
similarity index 100%
rename from electron/assets/img/ico.png
rename to electron/assets/icons/tray-ico.png
diff --git a/electron/jira.js b/electron/jira.js
index f924befafa..e15b46c632 100644
--- a/electron/jira.js
+++ b/electron/jira.js
@@ -1,7 +1,7 @@
 const JiraApi = require('jira').JiraApi;
 
 module.exports = (mainWindow, request) => {
-  console.log(request);
+  //console.log(request);
 
   let config = request.config;
   let apiMethod = request.apiMethod;
@@ -12,7 +12,7 @@ module.exports = (mainWindow, request) => {
   let jira = new JiraApi('https', config.host, config.port, config.userName, config.password, 'latest');
 
   jira[apiMethod](...arguments, (error, res) => {
-    console.log('JIRA_RESPONSE', error, res);
+    //console.log('JIRA_RESPONSE', error, res);
 
     mainWindow.webContents.send('JIRA_RESPONSE', {
       error: error,
diff --git a/electron/main.js b/electron/main.js
index e08d95b2c2..8bfa9655bf 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -5,7 +5,7 @@ const powerSaveBlocker = require('electron').powerSaveBlocker;
 const moment = require('moment');
 const open = require('open');
 const CONFIG = require('./CONFIG');
-const IMAGE_FOLDER = __dirname + '/assets/img/';
+const ICONS_FOLDER = __dirname + '/assets/icons/';
 
 const idle = require('./idle');
 const jira = require('./jira');
@@ -77,7 +77,7 @@ app.on('window-all-closed', function () {
 
 let appIcon = null;
 app.on('ready', () => {
-  appIcon = new electron.Tray(IMAGE_FOLDER + 'ico.png');
+  appIcon = new electron.Tray(ICONS_FOLDER + 'tray-ico.png');
   let contextMenu = electron.Menu.buildFromTemplate([
     {
       label: 'Show App', click: () => {
@@ -92,6 +92,12 @@ app.on('ready', () => {
     }
   ]);
   appIcon.setContextMenu(contextMenu);
+
+  appIcon.on('click', () => {
+    console.log('I am here!');
+
+    mainWindow.show();
+  });
 });
 
 app.on('ready', () => {
@@ -117,6 +123,10 @@ app.on('ready', () => {
   setInterval(trackTimeFn, CONFIG.PING_INTERVAL);
 });
 
+app.on('before-quit', () => {
+  appIcon.destroy();
+});
+
 // listen to events from frontend
 electron.ipcMain.on('SHUTDOWN', () => {
   app.isQuiting = true;