From 667a04531f1052d3e9873cb5f8550204b383dbbb Mon Sep 17 00:00:00 2001
From: Alex Brazier <aejbrazier.apps@gmail.com>
Date: Sat, 4 Feb 2017 20:36:09 +0000
Subject: [PATCH 1/2] Add option to hide tray icon

---
 src/scripts/menus.js | 13 +++++++++++++
 src/scripts/tray.js  | 21 +++++++++++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/scripts/menus.js b/src/scripts/menus.js
index 70d8ac62f788..4fea2135390d 100644
--- a/src/scripts/menus.js
+++ b/src/scripts/menus.js
@@ -4,6 +4,7 @@ import { remote } from 'electron';
 import { servers } from './servers';
 import { sidebar } from './sidebar';
 import { webview } from './webview';
+import tray from './tray';
 import '../branding/branding.js';
 
 var Menu = remote.Menu;
@@ -160,6 +161,12 @@ if (process.platform === 'darwin') {
                         sidebar.toggle();
                     }
                 },
+                {
+                    label: 'Toggle tray icon',
+                    click: function () {
+                        tray.toggle();
+                    }
+                },
                 {
                     type: 'separator'
                 },
@@ -375,6 +382,12 @@ if (process.platform === 'darwin') {
                         sidebar.toggle();
                     }
                 },
+                {
+                    label: 'Toggle tray icon',
+                    click: function () {
+                        tray.toggle();
+                    }
+                },
                 {
                     type: 'separator'
                 },
diff --git a/src/scripts/tray.js b/src/scripts/tray.js
index fd99a887a4c4..e12a8b865232 100644
--- a/src/scripts/tray.js
+++ b/src/scripts/tray.js
@@ -104,8 +104,25 @@ function showTrayAlert (showAlert, title) {
     }
 }
 
-createAppTray();
+function removeAppTray () {
+    mainWindow.destroyTray();
+}
+
+function toggle () {
+    if (localStorage.getItem('hideTray') === 'true') {
+        createAppTray();
+        localStorage.setItem('hideTray', 'false');
+    } else {
+        removeAppTray();
+        localStorage.setItem('hideTray', 'true');
+    }
+}
+
+if (localStorage.getItem('hideTray') !== 'true') {
+    createAppTray();
+}
 
 export default {
-    showTrayAlert: showTrayAlert
+    showTrayAlert,
+    toggle
 };

From c9b184ff8874dc87c5dbb62ff64c0a82783f32d9 Mon Sep 17 00:00:00 2001
From: Alex Brazier <aejbrazier.apps@gmail.com>
Date: Sat, 4 Feb 2017 20:42:15 +0000
Subject: [PATCH 2/2] Capitalize menu items

---
 src/scripts/menus.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/scripts/menus.js b/src/scripts/menus.js
index 4fea2135390d..44147e935b8c 100644
--- a/src/scripts/menus.js
+++ b/src/scripts/menus.js
@@ -156,13 +156,13 @@ if (process.platform === 'darwin') {
                     type: 'separator'
                 },
                 {
-                    label: 'Toggle server list',
+                    label: 'Toggle Server List',
                     click: function () {
                         sidebar.toggle();
                     }
                 },
                 {
-                    label: 'Toggle tray icon',
+                    label: 'Toggle Tray Icon',
                     click: function () {
                         tray.toggle();
                     }
@@ -377,13 +377,13 @@ if (process.platform === 'darwin') {
                     type: 'separator'
                 },
                 {
-                    label: 'Toggle server list',
+                    label: 'Toggle Server List',
                     click: function () {
                         sidebar.toggle();
                     }
                 },
                 {
-                    label: 'Toggle tray icon',
+                    label: 'Toggle Tray Icon',
                     click: function () {
                         tray.toggle();
                     }