feat: Rearrange main menu

nervosnetwork · Jul 29, 2019 · 1b22932 · 1b22932
1 parent 881b845
commit 1b22932
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 34 deletions.
diff --git a/packages/neuron-wallet/src/locales/en.ts b/packages/neuron-wallet/src/locales/en.ts
@@ -39,12 +39,13 @@ export default {
       help: {
         label: 'Help',
         sourceCode: 'Source Code',
+        settings: 'Settings',
       },
       develop: {
         develop: 'Develop',
         'force-reload': 'Force Reload',
         reload: 'Reload',
-        'toggle-dev-tools': 'Toggle DevTools',
+        'toggle-dev-tools': 'Toggle Developer Tools',
       },
     },
     services: {

diff --git a/packages/neuron-wallet/src/locales/zh.ts b/packages/neuron-wallet/src/locales/zh.ts
@@ -8,7 +8,7 @@ export default {
     'application-menu': {
       neuron: {
         about: '关于{{app}}',
-        preferences: '设置...',
+        preferences: '偏好设置...',
         quit: '退出{{app}}',
       },
       wallet: {
@@ -39,6 +39,7 @@ export default {
       help: {
         label: '帮助',
         sourceCode: '源代码',
+        settings: '设置',
       },
       develop: {
         develop: '开发',

diff --git a/packages/neuron-wallet/src/utils/application-menu.ts b/packages/neuron-wallet/src/utils/application-menu.ts
@@ -5,6 +5,8 @@ import i18n from './i18n'
 import AppController from '../controllers/app'
 import WalletsService from '../services/wallets'
 
+const isMac = process.platform === 'darwin'
+
 const separator: MenuItemConstructorOptions = {
   type: 'separator',
 }
@@ -45,6 +47,7 @@ export const appMenuItem: MenuItemConstructorOptions = {
     },
   ],
 }
+
 export const walletMenuItem: MenuItemConstructorOptions = {
   id: 'wallet',
   label: 'Wallet',
@@ -95,10 +98,6 @@ export const walletMenuItem: MenuItemConstructorOptions = {
         walletsService.requestPassword(currentWallet.id, 'deleteWallet')
       },
     },
-    /**
-     * TODO: implement this menu item after alpha release
-     * { id: 'change-password', label: i18n.t('application-menu.wallet.change-password') },
-     */
   ],
 }
 
@@ -120,6 +119,7 @@ export const editMenuItem: MenuItemConstructorOptions = {
     },
   ],
 }
+
 export const viewMenuItem: MenuItemConstructorOptions = {
   id: 'view',
   label: i18n.t('application-menu.view.label'),
@@ -154,28 +154,55 @@ export const windowMenuItem: MenuItemConstructorOptions = {
     },
   ],
 }
+
+const helpSubmenu: MenuItemConstructorOptions[] = [
+  {
+    label: 'Nervos',
+    click: () => {
+      if (AppController) {
+        AppController.openWebsite()
+      }
+    },
+  },
+  {
+    label: i18n.t('application-menu.help.sourceCode'),
+    click: () => {
+      if (AppController) {
+        AppController.openRepository()
+      }
+    },
+  },
+]
+if (!isMac) {
+  helpSubmenu.push(separator)
+  helpSubmenu.push({
+    id: 'preference',
+    label: i18n.t('application-menu.help.settings'),
+    click: () => {
+      if (AppController) {
+        AppController.showPreference()
+      }
+    },
+  })
+  helpSubmenu.push({
+    id: 'about',
+    label: i18n.t('application-menu.neuron.about', {
+      app: app.getName(),
+    }),
+    role: 'about',
+    click: () => {
+      if (AppController) {
+        AppController.showAbout()
+      }
+    },
+  })
+}
+
 export const helpMenuItem: MenuItemConstructorOptions = {
   id: 'help',
   label: i18n.t('application-menu.help.label'),
   role: 'help',
-  submenu: [
-    {
-      label: 'Nervos',
-      click: () => {
-        if (AppController) {
-          AppController.openWebsite()
-        }
-      },
-    },
-    {
-      label: i18n.t('application-menu.help.sourceCode'),
-      click: () => {
-        if (AppController) {
-          AppController.openRepository()
-        }
-      },
-    },
-  ],
+  submenu: helpSubmenu,
 }
 
 export const developMenuItem: MenuItemConstructorOptions = {
@@ -197,17 +224,12 @@ export const developMenuItem: MenuItemConstructorOptions = {
   ],
 }
 
-export const applicationMenuTemplate = [
-  appMenuItem,
-  walletMenuItem,
-  editMenuItem,
-  viewMenuItem,
-  windowMenuItem,
-  helpMenuItem,
-]
+export const applicationMenuTemplate = env.isDevMode
+  ? [walletMenuItem, editMenuItem, viewMenuItem, developMenuItem, windowMenuItem, helpMenuItem]
+  : [walletMenuItem, editMenuItem, viewMenuItem, windowMenuItem, helpMenuItem]
 
-if (env.isDevMode) {
-  applicationMenuTemplate.push(developMenuItem)
+if (isMac) {
+  applicationMenuTemplate.unshift(appMenuItem)
 }
 
 export const updateApplicationMenu = (wallets: Controller.Wallet[], id: string | null) => {