Added view switch, replaced editor icon, updated shortcuts.

Signed-off-by: ubi de feo <[email protected]>

Author: ubidefeo

backend/menu.js

@@ -2,6 +2,7 @@ const { app, Menu } = require('electron')
 const path = require('path')
 const openAboutWindow = require('about-window').default
 const shortcuts  = require('./shortcuts.js')
+const { type } = require('os')
 
 module.exports = function registerMenu(win, state = {}) {
   const isMac = process.platform === 'darwin'
@@ -99,6 +100,27 @@ module.exports = function registerMenu(win, state = {}) {
     },
     {
       label: 'View',
+      submenu: [
+        { 
+          label: 'Editor',
+          accelerator: shortcuts.menu.EDITOR_VIEW,
+          click: () => win.webContents.send('shortcut-cmd', shortcuts.global.EDITOR_VIEW,)
+        },
+        { 
+          label: 'Files',
+          accelerator: shortcuts.menu.FILES_VIEW,
+          click: () => win.webContents.send('shortcut-cmd', shortcuts.global.FILES_VIEW)
+        },
+        { type: 'separator' },
+        { role: 'resetZoom' },
+        { role: 'zoomIn' },
+        { role: 'zoomOut' },
+        { type: 'separator' },
+        { role: 'togglefullscreen' },
+      ]
+    },
+    {
+      label: 'Window',
       submenu: [
         { 
           label: 'Reload',
@@ -116,16 +138,6 @@ module.exports = function registerMenu(win, state = {}) {
         },
         { role: 'toggleDevTools'},
         { type: 'separator' },
-        { role: 'resetZoom' },
-        { role: 'zoomIn' },
-        { role: 'zoomOut' },
-        { type: 'separator' },
-        { role: 'togglefullscreen' },
-      ]
-    },
-    {
-      label: 'Window',
-      submenu: [
         { role: 'minimize' },
         { role: 'zoom' },
         ...(isMac ? [

backend/shortcuts.js

@@ -8,6 +8,8 @@ module.exports = {
     STOP: 'CommandOrControl+H',
     RESET: 'CommandOrControl+Shift+R',
     CLEAR_TERMINAL: 'CommandOrControl+L',
+    EDITOR_VIEW: 'CommandOrControl+Alt+1',
+    FILES_VIEW: 'CommandOrControl+Alt+2',
     ESC: 'Escape'
   },
   menu: {
@@ -19,5 +21,7 @@ module.exports = {
     STOP: 'CmdOrCtrl+H',
     RESET: 'CmdOrCtrl+Shift+R',
     CLEAR_TERMINAL: 'CmdOrCtrl+L',
+    EDITOR_VIEW: 'CmdOrCtrl+Alt+1',
+    FILES_VIEW: 'CmdOrCtrl+Alt+2'
   }
 }

ui/arduino/media/code.svg

@@ -1444,6 +1444,14 @@ async function store(state, emitter) {
       if (state.view != 'editor') return
       emitter.emit('save')
     }
+    if (key === shortcuts.EDITOR_VIEW) {
+      if (state.view != 'file-manager') return
+      emitter.emit('change-view', 'editor')
+    }
+    if (key === shortcuts.FILES_VIEW) {
+      if (state.view != 'editor') return
+      emitter.emit('change-view', 'file-manager')
+    }
     if (key === shortcuts.ESC) {
       if (state.isConnectionDialogOpen) {
         emitter.emit('close-connection-dialog')

ui/arduino/store.js

@@ -24,7 +24,7 @@ function Toolbar(state, emit) {
 
       ${Button({
         icon: 'run.svg',
-        tooltip: `Run (${metaKeyString}+r)`,
+        tooltip: `Run (${metaKeyString}+R)`,
         disabled: !_canExecute,
         onClick: (e) => {
           if (e.altKey) {
@@ -36,13 +36,13 @@ function Toolbar(state, emit) {
       })}
       ${Button({
         icon: 'stop.svg',
-        tooltip: `Stop (${metaKeyString}+h)`,
+        tooltip: `Stop (${metaKeyString}+H)`,
         disabled: !_canExecute,
         onClick: () => emit('stop')
       })}
       ${Button({
         icon: 'reboot.svg',
-        tooltip: `Reset (${metaKeyString}+Shift+r)`,
+        tooltip: `Reset (${metaKeyString}+Shift+R)`,
         disabled: !_canExecute,
         onClick: () => emit('reset')
       })}
@@ -51,22 +51,22 @@ function Toolbar(state, emit) {
 
       ${Button({
         icon: 'save.svg',
-        tooltip: `Save (${metaKeyString}+s)`,
+        tooltip: `Save (${metaKeyString}+S)`,
         disabled: !_canSave,
         onClick: () => emit('save')
       })}
 
       <div class="separator"></div>
 
       ${Button({
-        icon: 'editor.svg',
-        tooltip: 'Editor and REPL',
+        icon: 'code.svg',
+        tooltip: `Editor (${metaKeyString}+Alt+1)`,
         active: state.view === 'editor',
         onClick: () => emit('change-view', 'editor')
       })}
       ${Button({
         icon: 'files.svg',
-        tooltip: 'File Manager',
+        tooltip: `Files (${metaKeyString}+Alt+2)`,
         active: state.view === 'file-manager',
         onClick: () => emit('change-view', 'file-manager')
       })}