Update shortcut handling and asset paths

Refactored Electron global shortcut registration for better maintainability and added common edit shortcuts. Updated asset paths in loading component and translation service to use relative paths. Fixed usage of getCurrentLang() in app.component.ts.

Author: michelu89

core/apps/ame/src/app/app.component.ts

@@ -143,6 +143,6 @@ export class AppComponent implements OnInit {
   }
 
   setMenuTranslation(): void {
-    this.electronTunnelService.sendTranslationsToElectron(this.translate.translateService.currentLang);
+    this.electronTunnelService.sendTranslationsToElectron(this.translate.translateService.getCurrentLang());
   }
 }

core/apps/ame/src/app/components/loading/loading.component.html

@@ -12,6 +12,6 @@
   -->
 
 <div class="loading-container">
-  <img ngSrc="'assets/img/png/aspect-model-editor-targetsize-256.png'" alt="AME Logo" fill />
+  <img ngSrc="'./assets/img/png/aspect-model-editor-targetsize-256.png'" alt="AME Logo" fill />
   <h2>Opening editor...</h2>
 </div>

core/electron-libs/shortcuts.js

@@ -14,47 +14,77 @@
 const {app, globalShortcut, BrowserWindow, Menu, nativeTheme} = require('electron');
 const platformData = require('./os-checker');
 
-function registerGlobalShortcuts() {
-  const globalShortcuts = [
-    {key: 'CommandOrControl+W', action: () => BrowserWindow.getFocusedWindow()?.close()},
-    {key: 'CommandOrControl+M', action: () => BrowserWindow.getFocusedWindow()?.minimize()},
-    {key: 'CommandOrControl+Shift+M', action: () => BrowserWindow.getFocusedWindow()?.maximize()},
-    {key: 'CommandOrControl+Shift+F', action: () => BrowserWindow.getFocusedWindow()?.setFullScreen(true)},
-    {key: 'CommandOrControl+Shift+G', action: () => BrowserWindow.getFocusedWindow()?.setFullScreen(false)},
-  ];
+const COMMON_SHORTCUTS = [
+  {key: 'CommandOrControl+W', action: win => win.close()},
+  {key: 'CommandOrControl+M', action: win => win.minimize()},
+  {key: 'CommandOrControl+Shift+M', action: win => win.maximize()},
+  {key: 'CommandOrControl+Shift+F', action: win => win.setFullScreen(true)},
+  {key: 'CommandOrControl+Shift+G', action: win => win.setFullScreen(false)},
+  // Edit operations
+  {key: 'CommandOrControl+X', action: win => win.webContents.cut()},
+  {key: 'CommandOrControl+C', action: win => win.webContents.copy()},
+  {key: 'CommandOrControl+V', action: win => win.webContents.paste()},
+  {key: 'CommandOrControl+Z', action: win => win.webContents.undo()},
+  {key: 'CommandOrControl+A', action: win => win.webContents.selectAll()},
+  {key: 'CommandOrControl+R', action: win => win.reload()},
+];
 
-  const macShortcuts = [
-    {key: 'CommandOrControl+Q', action: () => (BrowserWindow.getFocusedWindow() ? app.quit() : null)},
-    {key: 'Command+Option+I', action: () => BrowserWindow.getFocusedWindow().webContents.openDevTools()},
-    {key: 'CommandOrControl+R', action: () => BrowserWindow.getFocusedWindow()?.reload()},
-    {
-      key: 'CommandOrControl+Shift+R',
-      action: () => BrowserWindow.getFocusedWindow()?.webContents.reloadIgnoringCache(),
+const MAC_SHORTCUTS = [
+  {
+    key: 'CommandOrControl+Q',
+    action: () => {
+      const win = BrowserWindow.getFocusedWindow();
+      if (win) {
+        app.quit();
+      }
+    },
+  },
+  {
+    key: 'Command+Option+I',
+    action: () => {
+      const win = BrowserWindow.getFocusedWindow();
+      win?.webContents.openDevTools();
     },
-  ];
+  },
+];
 
-  const openDevShortcut = [{key: 'Control+Shift+I', action: () => BrowserWindow.getFocusedWindow().webContents.openDevTools()}];
+const DEVTOOLS_SHORTCUTS = [
+  {
+    key: 'Control+Shift+I',
+    action: () => {
+      const win = BrowserWindow.getFocusedWindow();
+      win?.webContents.openDevTools();
+    },
+  },
+];
 
-  globalShortcuts.forEach(({key, action}) => {
-    globalShortcut.register(key, action);
+function registerShortcut({key, action}) {
+  globalShortcut.register(key, () => {
+    const focusedWindow = BrowserWindow.getFocusedWindow();
+    if (!focusedWindow && action.length > 0) {
+      // For actions that rely on a window, do nothing if there is none
+      return;
+    }
+
+    if (action.length > 0) {
+      // action expects a window
+      action(focusedWindow);
+    } else {
+      // action handles its own window lookup
+      action();
+    }
   });
+}
 
-  if (platformData.isMac) {
-    macShortcuts.forEach(({key, action}) => {
-      globalShortcut.register(key, action);
-    });
-  }
+function registerGlobalShortcuts() {
+  COMMON_SHORTCUTS.forEach(registerShortcut);
 
-  if (platformData.isWin) {
-    openDevShortcut.forEach(({key, action}) => {
-      globalShortcut.register(key, action);
-    });
+  if (platformData.isMac) {
+    MAC_SHORTCUTS.forEach(registerShortcut);
   }
 
-  if (platformData.isLinux) {
-    openDevShortcut.forEach(({key, action}) => {
-      globalShortcut.register(key, action);
-    });
+  if (platformData.isWin || platformData.isLinux) {
+    DEVTOOLS_SHORTCUTS.forEach(registerShortcut);
   }
 }
 

core/libs/translation/src/lib/services/language-translation.service.ts

@@ -52,7 +52,7 @@ export class LanguageTranslationService {
   }
 
   getTranslation(language: string): Observable<Translation> {
-    return this.http.get<Translation>(`/assets/i18n/${language}.json`).pipe(
+    return this.http.get<Translation>(`./assets/i18n/${language}.json`).pipe(
       takeUntilDestroyed(this.destroyRef),
       tap((translation: Translation) => (this.language = translation)),
     );