Merge branch 'bugfix/about-window-issues' into feature/new-toolbar

Author: ubidefeo

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,6 +55,10 @@ module.exports = function registerMenu(win, state = {}) {
     {
       label: 'File',
       submenu: [
+        { label: 'Save', 
+          accelerator: shortcuts.menu.SAVE,
+          click: () => win.webContents.send('shortcut-cmd', shortcuts.global.SAVE)
+        },
         isMac ? { role: 'close' } : { role: 'quit' }
       ]
     },
@@ -166,40 +203,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,4 +1,6 @@
-module.exports = {
+const { globalShortcut } = require('electron')
+let shortcutsActive = false
+const shortcuts = {
   global: {
     CONNECT: 'CommandOrControl+Shift+C',
     DISCONNECT: 'CommandOrControl+Shift+D',
@@ -26,5 +28,32 @@ module.exports = {
     CLEAR_TERMINAL: 'CmdOrCtrl+L',
     EDITOR_VIEW: 'CmdOrCtrl+Alt+1',
     FILES_VIEW: 'CmdOrCtrl+Alt+2'
-  }
+  },
+  // Shortcuts
+}
+
+function shortcutAction(key, win) {
+  console.log("key:", key)
+  win.send('shortcut-cmd', key);
+}
+
+function registerShortcuts (win) {
+  console.log("registering shortcuts")
+  win.send('ignore-shortcuts', false)
+}
+function unregisterShortcuts(win) {
+  console.log("unregistering shortcuts")
+  // globalShortcut.unregisterAll()
+  win.send('ignore-shortcuts', true)
+}
+
+function disableShortcuts (win, value) {
+  console.log("registering 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")
   })
 
-})
+})

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,12 @@ const Window = {
       callback(k);
     })
   },
+  onDisableShortcuts: (callback, value) => {
+    ipcRenderer.on('ignore-shortcuts', (e, value) => {
+      console.log("ipcRenderer ignore-shortcuts", value)
+      callback(value);
+    })
+  },
 
   beforeClose: (callback) => ipcRenderer.on('check-before-close', callback),
   confirmClose: () => ipcRenderer.invoke('confirm-close'),

ui/arduino/store.js

@@ -67,6 +67,8 @@ async function store(state, emitter) {
 
   state.isTerminalBound = false
 
+  state.shortcutsDisabled = false
+
   await createNewTab('disk')
   state.savedPanelHeight = PANEL_DEFAULT
   state.panelHeight = PANEL_CLOSED
@@ -1418,12 +1420,14 @@ async function store(state, emitter) {
     await win.confirmClose()
   })
 
-  // win.shortcutCmdR(() => {
-  //   // Only run if we can execute
-    
-  // })
-
+  win.onDisableShortcuts((disable) => {
+    console.log('state.shortcutsDisabled', disable)
+    state.shortcutsDisabled = disable
+  }),
+  
   win.onKeyboardShortcut((key) => {
+    if (state.shortcutsDisabled) return
+
     if (key === shortcuts.CONNECT) {
       emitter.emit('open-connection-dialog')
     }