Added view switch, replaced editor icon, updated shortcuts.

ubidefeo · ubidefeo · commit b0511201bb2b · 2024-12-13T09:15:44.000+01:00
Signed-off-by: ubi de feo &lt;me@ubidefeo.com&gt;
diff --git a/backend/menu.js b/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 ? [
diff --git a/backend/shortcuts.js b/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'
   }
 }
diff --git a/ui/arduino/media/code.svg b/ui/arduino/media/code.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.98 7.21999L14.98 25.22C14.9277 25.441 14.8027 25.6381 14.625 25.7796C14.4473 25.921 14.2271 25.9987 14 26C13.9263 25.9979 13.8529 25.9912 13.78 25.98C13.5204 25.9212 13.2946 25.7619 13.1521 25.537C13.0097 25.3121 12.9622 25.0399 13.02 24.78L17.02 6.77999C17.0793 6.52107 17.2388 6.2962 17.4635 6.15457C17.6882 6.01294 17.9599 5.96609 18.219 6.02427C18.4782 6.08245 18.7038 6.24093 18.8464 6.46502C18.989 6.68911 19.037 6.96056 18.98 7.21999ZM9.77 10.6399L5.3 15.9999L9.77 21.3599C9.93771 21.565 10.0181 21.8277 9.99375 22.0915C9.96942 22.3553 9.84237 22.599 9.64 22.7699C9.45902 22.9171 9.23328 22.9982 9 22.9999C8.85298 23.0008 8.70759 22.969 8.5744 22.9067C8.44121 22.8445 8.32356 22.7533 8.23 22.6399L3.23 16.6399C3.07976 16.4605 2.99744 16.2339 2.99744 15.9999C2.99744 15.7659 3.07976 15.5393 3.23 15.3599L8.23 9.35991C8.31405 9.25879 8.41719 9.17522 8.53353 9.11396C8.64988 9.0527 8.77715 9.01496 8.90808 9.00289C9.03901 8.99081 9.17103 9.00465 9.29662 9.0436C9.4222 9.08255 9.53888 9.14586 9.64 9.22991C9.74112 9.31395 9.82469 9.41709 9.88595 9.53344C9.94721 9.64978 9.98495 9.77705 9.99702 9.90798C10.0091 10.0389 9.99526 10.1709 9.95631 10.2965C9.91735 10.4221 9.85405 10.5388 9.77 10.6399ZM23.77 22.6399L28.77 16.6399C28.9202 16.4605 29.0026 16.2339 29.0026 15.9999C29.0026 15.7659 28.9202 15.5393 28.77 15.3599L23.77 9.35991C23.686 9.25879 23.5828 9.17522 23.4665 9.11396C23.3501 9.0527 23.2229 9.01496 23.0919 9.00289C22.961 8.99081 22.829 9.00465 22.7034 9.0436C22.5778 9.08255 22.4611 9.14586 22.36 9.22991C22.2589 9.31395 22.1753 9.41709 22.114 9.53344C22.0528 9.64978 22.015 9.77705 22.003 9.90798C21.9909 10.0389 22.0047 10.1709 22.0437 10.2965C22.0826 10.4221 22.146 10.5388 22.23 10.6399L26.7 15.9999L22.23 21.3599C22.0623 21.565 21.9819 21.8277 22.0063 22.0915C22.0306 22.3553 22.1576 22.599 22.36 22.7699C22.541 22.9171 22.7667 22.9982 23 22.9999C23.147 23.0008 23.2924 22.969 23.4256 22.9067C23.5588 22.8445 23.6764 22.7533 23.77 22.6399Z" fill="black"/>
+</svg>
diff --git a/ui/arduino/store.js b/ui/arduino/store.js
@@ -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')
diff --git a/ui/arduino/views/components/toolbar.js b/ui/arduino/views/components/toolbar.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')
       })}
