Merge pull request #112 from ajivoin/master

View Menu with Fullscreen, Reload, and fixes placement of Check for Updates on Windows

Author: chrisknepper

package-lock.json

@@ -1,12 +1,13 @@
 import { appMenuTemplate } from './app_menu_template';
 import { fileMenuTemplate } from './file_menu_template';
 import { editMenuTemplate } from './edit_menu_template';
-import { windowMenuTemplate } from './window_menu_template';
 import { settingsMenu } from './settings_menu_template';
+import { viewMenuTemplate } from './view_menu_template';
+import { windowMenuTemplate } from './window_menu_template';
 import { IS_MAC } from '../constants';
 
 
-const baseMenuTemplate = [editMenuTemplate, windowMenuTemplate];
+const baseMenuTemplate = [editMenuTemplate, viewMenuTemplate, windowMenuTemplate];
 
 if (IS_MAC) {
     baseMenuTemplate.unshift(appMenuTemplate);

src/menu/base_menu_template.js

@@ -1,16 +1,19 @@
 import { app } from 'electron';
+import { IS_WINDOWS } from '../constants';
 import { checkForUpdatesMenuItem } from './items/check_for_updates';
+import { separator } from './items/separator';
+
+const submenu = [{
+    label: 'Quit Android Messages',
+    click: () => app.quit()
+}];
+
+if (!IS_WINDOWS) {
+    submenu.unshift(separator);
+    submenu.unshift(checkForUpdatesMenuItem);
+}
 
 export const fileMenuTemplate = {
     label: 'File',
-    submenu: [
-        checkForUpdatesMenuItem,
-        {
-            type: 'separator'
-        },
-        {
-            label: 'Quit Android Messages',
-            click: () => app.quit()
-        }
-    ]
+    submenu
 };

src/menu/file_menu_template.js

@@ -1,21 +1,30 @@
 import { shell } from 'electron';
-import { IS_MAC } from '../constants';
+import { IS_MAC, IS_WINDOWS } from '../constants';
 import { aboutMenuItem } from './items/about';
+import { checkForUpdatesMenuItem } from './items/check_for_updates';
+import { separator } from './items/separator';
 
-export const helpMenuTemplate = {
-  label: 'Help',
-  submenu: [
-    {
-        label: 'Learn More',
-        click: () => shell.openExternal('https://github.com/chrisknepper/android-messages-desktop/')
-    },
-    {
-        label: 'Changelog',
-        click: () => shell.openExternal('https://github.com/chrisknepper/android-messages-desktop/blob/master/CHANGELOG.md')
-    }
-  ]
-};
+const submenu = [{
+    label: 'Learn More',
+    click: () => shell.openExternal('https://github.com/chrisknepper/android-messages-desktop/')
+},
+{
+    label: 'Changelog',
+    click: () => shell.openExternal('https://github.com/chrisknepper/android-messages-desktop/blob/master/CHANGELOG.md')
+}
+];
+
+if (IS_WINDOWS) {
+    submenu.push(separator);
+    submenu.push(checkForUpdatesMenuItem);
+}
 
 if (!IS_MAC) {
-    helpMenuTemplate.submenu.push(aboutMenuItem);
+    submenu.push(separator);
+    submenu.push(aboutMenuItem);
 }
+
+export const helpMenuTemplate = {
+    label: 'Help',
+    submenu
+};

src/menu/help_menu_template.js

@@ -0,0 +1 @@
+export const separator = { type: 'separator' };

src/menu/items/separator.js

@@ -0,0 +1,11 @@
+export const viewMenuTemplate = {
+  label: "View",
+  submenu: [
+    {
+      role: "toggleFullScreen",
+    },
+    {
+      role: "reload"
+    }
+  ]
+};