From 24bf436b0c17c64d062518e326aab5509160a239 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 22 Jan 2020 15:25:21 +1100
Subject: [PATCH] disable menubar by default and remove old preferences from
 menubar

---
 app/menu.js                                        | 11 -----------
 js/background.js                                   |  9 +++++++--
 js/views/app_view.js                               |  2 +-
 ts/components/session/settings/SessionSettings.tsx |  2 +-
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/menu.js b/app/menu.js
index fc63414c4..840bc9214 100644
--- a/app/menu.js
+++ b/app/menu.js
@@ -16,17 +16,12 @@ exports.createTemplate = (options, messages) => {
     setupWithImport,
     showAbout,
     showDebugLog,
-    showSettings,
   } = options;
 
   const template = [
     {
       label: messages.mainMenuFile.message,
       submenu: [
-        {
-          label: messages.mainMenuSettings.message,
-          click: showSettings,
-        },
         {
           type: 'separator',
         },
@@ -193,7 +188,6 @@ function updateForMac(template, messages, options) {
     setupAsStandalone,
     setupWithImport,
     showAbout,
-    showSettings,
     showWindow,
   } = options;
 
@@ -242,11 +236,6 @@ function updateForMac(template, messages, options) {
       {
         type: 'separator',
       },
-      {
-        label: messages.mainMenuSettings.message,
-        accelerator: 'CommandOrControl+,',
-        click: showSettings,
-      },
       {
         type: 'separator',
       },
diff --git a/js/background.js b/js/background.js
index 91d35bd38..f6ef3c01b 100644
--- a/js/background.js
+++ b/js/background.js
@@ -1005,8 +1005,13 @@
     };
 
     window.toggleMenuBar = () => {
-      const newValue = !window.getSettingValue('hide-menu-bar');
-      window.Events.setHideMenuBar(newValue);
+      const current = window.getSettingValue('hide-menu-bar');
+      if (current === undefined) {
+        window.Events.setHideMenuBar(false);
+        return;
+      }
+
+      window.Events.setHideMenuBar(!current);
     };
 
     window.toggleSpellCheck = () => {
diff --git a/js/views/app_view.js b/js/views/app_view.js
index 962665536..fbf27a458 100644
--- a/js/views/app_view.js
+++ b/js/views/app_view.js
@@ -38,7 +38,7 @@
       }
     },
     applyHideMenu() {
-      const hideMenuBar = storage.get('hide-menu-bar', false);
+      const hideMenuBar = storage.get('hide-menu-bar', true);
       window.setAutoHideMenuBar(hideMenuBar);
       window.setMenuBarVisibility(!hideMenuBar);
     },
diff --git a/ts/components/session/settings/SessionSettings.tsx b/ts/components/session/settings/SessionSettings.tsx
index dd96a1d74..34a7dfbc1 100644
--- a/ts/components/session/settings/SessionSettings.tsx
+++ b/ts/components/session/settings/SessionSettings.tsx
@@ -314,7 +314,7 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
         type: SessionSettingType.Toggle,
         category: SessionSettingCategory.General,
         setFn: window.toggleMenuBar,
-        content: undefined,
+        content: { defaultValue: true },
         comparisonValue: undefined,
         onClick: undefined,
       },