menu: Reorder file menu and add option to Add Organization.

Reorder the File Menu. Also, adds a new option to
add a new organization to the file menu.

Author: vsvipul

app/main/menu.js

@@ -259,6 +259,21 @@ class AppMenu {
 		return [{
 			label: `${app.getName()}`,
 			submenu: [{
+				label: 'Add Organization',
+				accelerator: 'Cmd+Shift+N',
+				click(item, focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('new-server');
+					}
+				}
+			}, {
+				label: 'Toggle Do Not Disturb',
+				accelerator: 'Cmd+Shift+M',
+				click() {
+					const dndUtil = DNDUtil.toggle();
+					AppMenu.sendAction('toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
+				}
+			}, {
 				label: 'Desktop Settings',
 				accelerator: 'Cmd+,',
 				click(item, focusedWindow) {
@@ -277,13 +292,6 @@ class AppMenu {
 				}
 			}, {
 				type: 'separator'
-			}, {
-				label: 'Toggle Do Not Disturb',
-				accelerator: 'Command+Shift+M',
-				click() {
-					const dndUtil = DNDUtil.toggle();
-					AppMenu.sendAction('toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
-				}
 			}, {
 				label: 'Copy Zulip URL',
 				accelerator: 'Cmd+Shift+C',
@@ -293,7 +301,7 @@ class AppMenu {
 					}
 				}
 			}, {
-				label: 'Log Out',
+				label: 'Log Out of Organization',
 				accelerator: 'Cmd+L',
 				enabled: enableMenu,
 				click(item, focusedWindow) {
@@ -316,6 +324,10 @@ class AppMenu {
 				role: 'unhide'
 			}, {
 				type: 'separator'
+			}, {
+				role: 'minimize'
+			}, {
+				role: 'close'
 			}, {
 				role: 'quit'
 			}]
@@ -362,15 +374,30 @@ class AppMenu {
 		return [{
 			label: '&File',
 			submenu: [{
+				label: 'Add Organization',
+				accelerator: 'Ctrl+Shift+N',
+				click(item, focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('new-server');
+					}
+				}
+			}, {
+				type: 'separator'
+			}, {
+				label: 'Toggle Do Not Disturb',
+				accelerator: 'Ctrl+Shift+M',
+				click() {
+					const dndUtil = DNDUtil.toggle();
+					AppMenu.sendAction('toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
+				}
+			}, {
 				label: 'Desktop Settings',
 				accelerator: 'Ctrl+,',
 				click(item, focusedWindow) {
 					if (focusedWindow) {
 						AppMenu.sendAction('open-settings');
 					}
 				}
-			}, {
-				type: 'separator'
 			}, {
 				label: 'Keyboard Shortcuts',
 				accelerator: 'Ctrl+Shift+K',
@@ -382,13 +409,6 @@ class AppMenu {
 				}
 			}, {
 				type: 'separator'
-			}, {
-				label: 'Toggle Do Not Disturb',
-				accelerator: 'Ctrl+Shift+M',
-				click() {
-					const dndUtil = DNDUtil.toggle();
-					AppMenu.sendAction('toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
-				}
 			}, {
 				label: 'Copy Zulip URL',
 				accelerator: 'Ctrl+Shift+C',
@@ -398,7 +418,7 @@ class AppMenu {
 					}
 				}
 			}, {
-				label: 'Log Out',
+				label: 'Log Out of Organization',
 				accelerator: 'Ctrl+L',
 				enabled: enableMenu,
 				click(item, focusedWindow) {
@@ -408,6 +428,10 @@ class AppMenu {
 				}
 			}, {
 				type: 'separator'
+			}, {
+				role: 'minimize'
+			}, {
+				role: 'close'
 			}, {
 				role: 'quit',
 				accelerator: 'Ctrl+Q'

app/renderer/js/main.js

@@ -734,6 +734,10 @@ class ServerManagerView {
 		ipcRenderer.on('copy-zulip-url', () => {
 			clipboard.writeText(DomainUtil.getDomain(this.activeTabIndex).url);
 		});
+
+		ipcRenderer.on('new-server', () => {
+			this.openSettings('AddServer');
+		});
 	}
 }