From fff2f97751d3a1d00b81633f58d52a21e3ce4ac0 Mon Sep 17 00:00:00 2001
From: Wasa C <gie68i@gmail.com>
Date: Mon, 17 Sep 2018 23:33:13 +0700
Subject: [PATCH 1/2] adjusted menu to display zoom at view root level

---
 desktop/menus/view-menu.js | 129 +++++++++++++++++--------------------
 1 file changed, 60 insertions(+), 69 deletions(-)

diff --git a/desktop/menus/view-menu.js b/desktop/menus/view-menu.js
index 346ee0037..6711a3adf 100644
--- a/desktop/menus/view-menu.js
+++ b/desktop/menus/view-menu.js
@@ -6,75 +6,6 @@ const buildViewMenu = settings => {
   return {
     label: '&View',
     submenu: [
-      {
-        label: '&Note Display',
-        submenu: [
-          {
-            label: '&Comfy',
-            id: 'comfy',
-          },
-          {
-            label: 'C&ondensed',
-            id: 'condensed',
-          },
-          {
-            label: '&Expanded',
-            id: 'expanded',
-          },
-        ].map(
-          buildRadioGroup({
-            action: 'setNoteDisplay',
-            propName: 'noteDisplay',
-            settings,
-          })
-        ),
-      },
-      {
-        label: 'Note &Editor',
-        submenu: [
-          {
-            label: '&Font Size',
-            submenu: [
-              // For the oddity with "Command" vs "Cmd"
-              // Cite: https://github.com/atom/electron/issues/1507
-              {
-                label: '&Bigger',
-                accelerator: 'CommandOrControl+=',
-                click: appCommandSender({ action: 'increaseFontSize' }),
-              },
-              {
-                label: '&Smaller',
-                accelerator: 'CommandOrControl+-',
-                click: appCommandSender({ action: 'decreaseFontSize' }),
-              },
-              {
-                label: '&Reset',
-                accelerator: 'CommandOrControl+0',
-                click: appCommandSender({ action: 'resetFontSize' }),
-              },
-            ],
-          },
-          {
-            label: '&Line Length',
-            submenu: [
-              {
-                label: '&Narrow',
-                id: 'narrow',
-              },
-              {
-                label: '&Full',
-                id: 'full',
-              },
-            ].map(
-              buildRadioGroup({
-                action: 'setLineLength',
-                propName: 'lineLength',
-                settings,
-              })
-            ),
-          },
-        ],
-      },
       {
         label: '&Sort Type',
         submenu: [
@@ -110,6 +41,48 @@ const buildViewMenu = settings => {
             },
           ]),
       },
+      {
+        label: '&Note Display',
+        submenu: [
+          {
+            label: '&Comfy',
+            id: 'comfy',
+          },
+          {
+            label: 'C&ondensed',
+            id: 'condensed',
+          },
+          {
+            label: '&Expanded',
+            id: 'expanded',
+          },
+        ].map(
+          buildRadioGroup({
+            action: 'setNoteDisplay',
+            propName: 'noteDisplay',
+            settings,
+          })
+        ),
+      },
+      {
+        label: '&Line Length',
+        submenu: [
+          {
+            label: '&Narrow',
+            id: 'narrow',
+          },
+          {
+            label: '&Full',
+            id: 'full',
+          },
+        ].map(
+          buildRadioGroup({
+            action: 'setLineLength',
+            propName: 'lineLength',
+            settings,
+          })
+        ),
+      },
       {
         label: '&Theme',
         submenu: [
@@ -132,6 +105,24 @@ const buildViewMenu = settings => {
       {
         type: 'separator',
       },
+      {
+        label: '&Zoom In',
+        accelerator: 'CommandOrControl+Plus',
+        click: appCommandSender({ action: 'increaseFontSize' }),
+      },
+      {
+        label: '&Zoom Out',
+        accelerator: 'CommandOrControl+-',
+        click: appCommandSender({ action: 'decreaseFontSize' }),
+      },
+      {
+        label: '&Actual Size',
+        accelerator: 'CommandOrControl+0',
+        click: appCommandSender({ action: 'resetFontSize' }),
+      },
+      {
+        type: 'separator',
+      },
       {
         label: 'T&oggle Full Screen',
         accelerator: (function() {

From 9fc39da68666b82cfbbe691d4771f9144e638a37 Mon Sep 17 00:00:00 2001
From: Wasa C <gie68i@gmail.com>
Date: Tue, 18 Sep 2018 08:05:14 +0700
Subject: [PATCH 2/2] =?UTF-8?q?Change=20Zoom=20In,=20Zoom=20Out=20and=20To?=
 =?UTF-8?q?ggle=20Full=20Screen=20access=20key=20on=20Windows.=20Zoom=20In?=
 =?UTF-8?q?=20to=20=E2=80=98i=E2=80=99=20and=20Zoom=20Out=20to=20=E2=80=98?=
 =?UTF-8?q?o=E2=80=99.=20However,=20it=20will=20duplicate=20with=20Toggle?=
 =?UTF-8?q?=20Full=20Screen=20which=20previously=20was=20=E2=80=98o?=
 =?UTF-8?q?=E2=80=99,=20so=20I=20changed=20it=20to=20=E2=80=98f=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 desktop/menus/view-menu.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/desktop/menus/view-menu.js b/desktop/menus/view-menu.js
index 6711a3adf..bcd393b87 100644
--- a/desktop/menus/view-menu.js
+++ b/desktop/menus/view-menu.js
@@ -106,12 +106,12 @@ const buildViewMenu = settings => {
         type: 'separator',
       },
       {
-        label: '&Zoom In',
+        label: 'Zoom &In',
         accelerator: 'CommandOrControl+Plus',
         click: appCommandSender({ action: 'increaseFontSize' }),
       },
       {
-        label: '&Zoom Out',
+        label: 'Zoom &Out',
         accelerator: 'CommandOrControl+-',
         click: appCommandSender({ action: 'decreaseFontSize' }),
       },
@@ -124,7 +124,7 @@ const buildViewMenu = settings => {
         type: 'separator',
       },
       {
-        label: 'T&oggle Full Screen',
+        label: 'Toggle &Full Screen',
         accelerator: (function() {
           if (process.platform === 'darwin') {
             return 'Ctrl+Command+F';