Feature/new toolbar

.github/workflows/build.yml

@@ -24,9 +24,11 @@ jobs:
       matrix:
         config:
           - os: [self-hosted, windows-sign-pc]
+            id: windows
           - os: ubuntu-latest
-          - os: macos-13
-          - os: macos-14
+            id: linux
+          - os: macos-latest
+            id: macos-universal
     runs-on: ${{ matrix.config.os }}
     timeout-minutes: 90
 
@@ -92,9 +94,9 @@ jobs:
             npm run build
 
       - name: Upload [GitHub Actions]
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.JOB_TRANSFER_ARTIFACT }}
+          name: ${{ env.JOB_TRANSFER_ARTIFACT }}-${{ matrix.config.id }}
           path: dist
 
   artifacts:
@@ -108,26 +110,29 @@ jobs:
         artifact:
           - path: "*-linux_x64.zip"
             name: Arduino-Lab-for-MicroPython_Linux_X86-64
-          - path: "*-mac_x64.zip"
-            name: Arduino-Lab-for-MicroPython_macOS_X86-64
-          - path: "*-mac_arm64.zip"
-            name: Arduino-Lab-for-MicroPython_macOS_arm-64
+            id: linux
+          - path: "*-mac_universal.zip"
+            name: Arduino-Lab-for-MicroPython_macOS_Universal
+            id: macos-universal
           # - path: "*Windows_64bit.exe"
           #   name: Windows_X86-64_interactive_installer
+          #   id: windows
           # - path: "*Windows_64bit.msi"
           #   name: Windows_X86-64_MSI
+          #   id: windows
           - path: "*-win_x64.zip"
             name: Arduino-Lab-for-MicroPython_Windows_X86-64
+            id: windows
 
     steps:
       - name: Download job transfer artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: ${{ env.JOB_TRANSFER_ARTIFACT }}
+          name: ${{ env.JOB_TRANSFER_ARTIFACT }}-${{ matrix.artifact.id }}
           path: ${{ env.JOB_TRANSFER_ARTIFACT }}
 
       - name: Upload tester build artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.artifact.name }}
           path: ${{ env.JOB_TRANSFER_ARTIFACT }}/${{ matrix.artifact.path }}
@@ -137,23 +142,25 @@ jobs:
     if: github.repository == 'arduino/lab-micropython-editor' && startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     steps:
-      - name: Download [GitHub Actions]
-        uses: actions/download-artifact@v3
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
         with:
-          name: ${{ env.JOB_TRANSFER_ARTIFACT }}
-          path: ${{ env.JOB_TRANSFER_ARTIFACT }}
+          path: artifacts
+
+      - name: List artifacts
+        run: ls -R artifacts
 
       - name: Get Tag
         id: tag_name
         run: |
-          echo ::set-output name=TAG_NAME::${GITHUB_REF#refs/tags/}
+          echo "TAG_NAME=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
 
       - name: Publish Release [GitHub]
         uses: svenstaro/[email protected]
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           release_name: ${{ steps.tag_name.outputs.TAG_NAME }}
-          file: ${{ env.JOB_TRANSFER_ARTIFACT }}/*
+          file: artifacts/**/*
           tag: ${{ github.ref }}
           file_glob: true
 
@@ -167,7 +174,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Remove unneeded job transfer artifact
+      - name: Remove unneeded job transfer artifacts
         uses: geekyeggo/delete-artifact@v2
         with:
-          name: ${{ env.JOB_TRANSFER_ARTIFACT }}
+          name: |
+            ${{ env.JOB_TRANSFER_ARTIFACT }}-windows
+            ${{ env.JOB_TRANSFER_ARTIFACT }}-linux
+            ${{ env.JOB_TRANSFER_ARTIFACT }}-macos-x64
+            ${{ env.JOB_TRANSFER_ARTIFACT }}-macos-arm64

backend/menu.js

@@ -1,10 +1,43 @@
 const { app, Menu } = require('electron')
+const { shortcuts, disableShortcuts } = require('./shortcuts.js')
 const path = require('path')
 const serial = require('./serial/serial.js').sharedInstance
 const openAboutWindow = require('about-window').default
-const shortcuts  = require('./shortcuts.js')
+
 const { type } = require('os')
 
+let appInfoWindow = null
+
+function closeAppInfo(win) {
+  disableShortcuts(win, false)
+  appInfoWindow.off('close', () => closeAppInfo(win))
+  appInfoWindow = null
+
+}
+function openAppInfo(win) {
+  if (appInfoWindow != null) {
+    appInfoWindow.show()
+  } else {
+    appInfoWindow = openAboutWindow({
+      icon_path: path.resolve(__dirname, '../ui/arduino/media/about_image.png'),
+      css_path: path.resolve(__dirname, '../ui/arduino/views/about.css'),
+      copyright: '© Arduino SA 2022',
+      package_json_dir: path.resolve(__dirname, '..'),
+      bug_report_url: "https://github.com/arduino/lab-micropython-editor/issues",
+      bug_link_text: "report an issue",
+      homepage: "https://labs.arduino.cc",
+      use_version_info: false,
+      win_options: {
+          parent: win,
+          modal: true,
+      },
+      show_close_button: 'Close',
+    })
+    appInfoWindow.on('close', () => closeAppInfo(win));
+    disableShortcuts(win, true)
+  }
+}
+
 module.exports = function registerMenu(win, state = {}) {
   const isMac = process.platform === 'darwin'
   const template = [
@@ -22,7 +55,22 @@ module.exports = function registerMenu(win, state = {}) {
     {
       label: 'File',
       submenu: [
-        isMac ? { role: 'close' } : { role: 'quit' }
+        { label: 'New', 
+          accelerator: shortcuts.menu.NEW,
+          enabled: state.view === 'editor',
+          click: () => win.webContents.send('shortcut-cmd', shortcuts.global.NEW)
+        },
+        { label: 'Save', 
+          accelerator: shortcuts.menu.SAVE,
+          enabled: state.view === 'editor',
+          click: () => win.webContents.send('shortcut-cmd', shortcuts.global.SAVE)
+        },
+        { label: 'Close tab',
+          accelerator: 'CmdOrCtrl+W',
+          enabled: state.view === 'editor',
+          click: () => win.webContents.send('shortcut-cmd', shortcuts.global.CLOSE)
+         },
+        { role: 'quit' }
       ]
     },
     {
@@ -166,40 +214,14 @@ module.exports = function registerMenu(win, state = {}) {
         },
         {
           label:'About Arduino Lab for MicroPython',
-          click: () => {
-              openAboutWindow({
-                  icon_path: path.resolve(__dirname, '../ui/arduino/media/about_image.png'),
-                  css_path: path.resolve(__dirname, '../ui/arduino/views/about.css'),
-                  copyright: '© Arduino SA 2022',
-                  package_json_dir: path.resolve(__dirname, '..'),
-                  bug_report_url: "https://github.com/arduino/lab-micropython-editor/issues",
-                  bug_link_text: "report an issue",
-                  homepage: "https://labs.arduino.cc",
-                  use_version_info: false,
-                  win_options: {
-                      parent: win,
-                      modal: true,
-                  },
-                  show_close_button: 'Close',
-              })
-            }
+          click: () => { openAppInfo(win) }
         },
       ]
     }
   ]
 
   const menu = Menu.buildFromTemplate(template)
 
-  app.setAboutPanelOptions({
-    applicationName: app.name,
-    applicationVersion: app.getVersion(),
-    copyright: app.copyright,
-    credits: '(See "Info about this app" in the Help menu)',
-    authors: ['Arduino'],
-    website: 'https://arduino.cc',
-    iconPath: path.join(__dirname, '../assets/image.png'),
-  })
-
   Menu.setApplicationMenu(menu)
 
 }

backend/shortcuts.js

@@ -1,29 +1,46 @@
-module.exports = {
+const { globalShortcut } = require('electron')
+let shortcutsActive = false
+const shortcuts = {
   global: {
+    CLOSE: 'CommandOrControl+W',
     CONNECT: 'CommandOrControl+Shift+C',
     DISCONNECT: 'CommandOrControl+Shift+D',
-    SAVE: 'CommandOrControl+S',
     RUN: 'CommandOrControl+R',
     RUN_SELECTION: 'CommandOrControl+Alt+R',
     RUN_SELECTION_WL: 'CommandOrControl+Alt+S',
     STOP: 'CommandOrControl+H',
     RESET: 'CommandOrControl+Shift+R',
+    NEW: 'CommandOrControl+N',
+    SAVE: 'CommandOrControl+S',
     CLEAR_TERMINAL: 'CommandOrControl+L',
     EDITOR_VIEW: 'CommandOrControl+Alt+1',
     FILES_VIEW: 'CommandOrControl+Alt+2',
-    ESC: 'Escape'
   },
   menu: {
+    CLOSE: 'CmdOrCtrl+W',
     CONNECT: 'CmdOrCtrl+Shift+C',
     DISCONNECT: 'CmdOrCtrl+Shift+D',
-    SAVE: 'CmdOrCtrl+S',
     RUN: 'CmdOrCtrl+R',
     RUN_SELECTION: 'CmdOrCtrl+Alt+R',
     RUN_SELECTION_WL: 'CmdOrCtrl+Alt+S',
     STOP: 'CmdOrCtrl+H',
     RESET: 'CmdOrCtrl+Shift+R',
+    NEW: 'CmdOrCtrl+N',
+    SAVE: 'CmdOrCtrl+S',
     CLEAR_TERMINAL: 'CmdOrCtrl+L',
     EDITOR_VIEW: 'CmdOrCtrl+Alt+1',
     FILES_VIEW: 'CmdOrCtrl+Alt+2'
-  }
+  },
+  // Shortcuts
+}
+
+function disableShortcuts (win, value) {
+  console.log(value ? 'disabling' : 'enabling', 'shortcuts')
+  win.send('ignore-shortcuts', value)
+}
+
+module.exports = {
+  shortcuts,
+  disableShortcuts
 }
+

index.js

@@ -1,8 +1,6 @@
 const { app, BrowserWindow, ipcMain, dialog, globalShortcut } = require('electron')
 const path = require('path')
 const fs = require('fs')
-const shortcuts = require('./backend/shortcuts.js').global
-
 const registerIPCHandlers = require('./backend/ipc.js')
 const registerMenu = require('./backend/menu.js')
 
@@ -63,28 +61,15 @@ function createWindow () {
   })
 }
 
-function shortcutAction(key) {
-  win.webContents.send('shortcut-cmd', key);
-}
-
-// Shortcuts
-function registerShortcuts() {
-  Object.entries(shortcuts).forEach(([command, shortcut]) => {
-    globalShortcut.register(shortcut, () => {
-      shortcutAction(shortcut)
-    });
-  })
-}
-
 app.on('ready', () => {
   createWindow()
-  registerShortcuts()
 
   win.on('focus', () => {
-    registerShortcuts()
+    console.log("win focus")
   })
+
   win.on('blur', () => {
-    globalShortcut.unregisterAll()
+    console.log("win blur")
   })
 
-})
+})

package.json

@@ -23,7 +23,10 @@
     "artifactName": "${productName}-${os}_${arch}.${ext}",
     "extraResources": "./ui/arduino/helpers.py",
     "mac": {
-      "target": "zip",
+      "target": [{
+        "target": "zip",
+        "arch": ["universal"]
+      }],
       "icon": "build_resources/icon.icns"
     },
     "win": {

preload.js

@@ -1,7 +1,7 @@
 console.log('preload')
 const { contextBridge, ipcRenderer } = require('electron')
 const path = require('path')
-const shortcuts = require('./backend/shortcuts.js').global
+const shortcuts = require('./backend/shortcuts.js').shortcuts.global
 const { emit, platform } = require('process')
 const SerialBridge = require('./backend/serial/serial-bridge.js')
 
@@ -63,6 +63,11 @@ const Window = {
       callback(k);
     })
   },
+  onDisableShortcuts: (callback, value) => {
+    ipcRenderer.on('ignore-shortcuts', (e, value) => {
+      callback(value);
+    })
+  },
 
   beforeClose: (callback) => ipcRenderer.on('check-before-close', callback),
   confirmClose: () => ipcRenderer.invoke('confirm-close'),

ui/arduino/index.html

@@ -25,6 +25,7 @@
     <!-- Components -->
     <script type="text/javascript" src="views/components/code-editor.js" charset="utf-8"></script>
     <script type="text/javascript" src="views/components/connection-dialog.js" charset="utf-8"></script>
+    <script type="text/javascript" src="views/components/new-file-dialog.js" charset="utf-8"></script>
     <script type="text/javascript" src="views/components/file-actions.js" charset="utf-8"></script>
     <script type="text/javascript" src="views/components/file-list.js" charset="utf-8"></script>
     <script type="text/javascript" src="views/components/repl-panel.js" charset="utf-8"></script>