From 692e5b7dbcd53f118650f44f2d2af6115091c9ba Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Sat, 10 Feb 2018 17:07:46 -0500 Subject: [PATCH] re-organize menu --- package.json | 2 +- src/index.html | 2 +- src/main/menu.main.ts | 56 +++++++++++++++++++++++++------------------ 3 files changed, 35 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index 54aa7ff397..fde8f80800 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bitwarden", - "productName": "bitwarden", + "productName": "Bitwarden", "description": "A secure and free password manager for all of your devices.", "version": "0.0.1", "main": "main.js", diff --git a/src/index.html b/src/index.html index d786e532d5..4a4c67e35b 100644 --- a/src/index.html +++ b/src/index.html @@ -3,7 +3,7 @@ - bitwarden + Bitwarden diff --git a/src/main/menu.main.ts b/src/main/menu.main.ts index cc02319f7e..d4709c86e1 100644 --- a/src/main/menu.main.ts +++ b/src/main/menu.main.ts @@ -52,25 +52,15 @@ export class MenuMain { }, ], }, - { type: 'separator' }, { label: this.i18nService.t('addNewFolder'), click: () => self.send('newFolder'), }, { type: 'separator' }, - { - label: this.i18nService.t('settings'), - click: () => self.send('openSettings'), - }, { label: this.i18nService.t('syncVault'), click: () => self.send('syncVault'), }, - { - label: this.i18nService.t('lockNow'), - click: () => self.send('lockVault'), - accelerator: 'CmdOrCtrl+L', - }, ], }, { @@ -300,29 +290,49 @@ export class MenuMain { }, ]; + const firstMenuOptions: MenuItemConstructorOptions[] = [ + { type: 'separator' }, + { + label: this.i18nService.t('settings'), + click: () => self.send('openSettings'), + }, + { + label: this.i18nService.t('lockNow'), + click: () => self.send('lockVault'), + accelerator: 'CmdOrCtrl+L', + }, + ]; + if (process.platform === 'darwin') { - template[0].label = app.getName(); - template[0].submenu = (template[0].submenu as MenuItemConstructorOptions[]).concat([ - { type: 'separator' }, + const firstMenuPart: MenuItemConstructorOptions[] = [ { role: 'about' }, - { type: 'separator' }, - { role: 'services', submenu: [] }, - { type: 'separator' }, - { role: 'hide' }, - { role: 'hideothers' }, - { role: 'unhide' }, - { type: 'separator' }, - { role: 'quit' }, - ]); + ]; + + template.unshift({ + label: 'Bitwarden', + submenu: firstMenuPart.concat(firstMenuOptions, [ + { type: 'separator' }, + { role: 'services', submenu: [] }, + { type: 'separator' }, + { role: 'hide' }, + { role: 'hideothers' }, + { role: 'unhide' }, + { type: 'separator' }, + { role: 'quit' }, + ]), + }); // Window menu - template[4].submenu = [ + template[template.length - 2].submenu = [ { role: 'close' }, { role: 'minimize' }, { role: 'zoom' }, { type: 'separator' }, { role: 'front' }, ]; + } else { + template[0].submenu = (template[0].submenu as MenuItemConstructorOptions[]).concat( + firstMenuOptions); } const menu = Menu.buildFromTemplate(template);