fix: added linux about dialog

Lumieducation · Apr 10, 2022 · a39f4ae · a39f4ae
1 parent 913b0af
commit a39f4ae
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 18 deletions.
diff --git a/server/src/boot/updater.ts b/server/src/boot/updater.ts
@@ -13,7 +13,7 @@ let updating: boolean = false;
 
 const t = i18next.getFixedT(null, 'lumi');
 
-const loadPlatformInformation = (): {
+export const loadPlatformInformation = (): {
     package: string;
     platform: string;
     supportsUpdates: 'no' | 'external' | 'yes';

diff --git a/server/src/menu/analyticsMenu.ts b/server/src/menu/analyticsMenu.ts
@@ -33,5 +33,5 @@ export default (window: electron.BrowserWindow, websocket: SocketIO.Server) => [
     editMenu(),
     ...viewMenu(),
     ...windowMenu(),
-    helpMenu(window, websocket)
+    helpMenu(window)
 ];
diff --git a/server/src/menu/h5peditorMenu.ts b/server/src/menu/h5peditorMenu.ts
@@ -108,5 +108,5 @@ export default (
         editMenu(),
         ...viewMenu(),
         ...windowMenu(),
-        helpMenu(window, websocket)
+        helpMenu(window)
     ].filter((m) => m !== undefined);
diff --git a/server/src/menu/helpMenu.ts b/server/src/menu/helpMenu.ts
@@ -1,11 +1,8 @@
-import electron from 'electron';
-import SocketIO from 'socket.io';
+import electron, { dialog } from 'electron';
 import i18next from 'i18next';
+import { loadPlatformInformation } from '../boot/updater';
 
-export default function (
-    window: electron.BrowserWindow,
-    websocket: SocketIO.Server
-): any {
+export default function (window: electron.BrowserWindow): any {
     return {
         label: i18next.t('lumi:menu.help.label'),
         submenu: [
@@ -45,7 +42,19 @@ export default function (
                     );
                 }
             },
-            { label: i18next.t('lumi:menu.help.about'), role: 'about' }
+            process.platform === 'linux'
+                ? {
+                      label: i18next.t('lumi:menu.help.about'),
+                      click: () => {
+                          const platformInfo = loadPlatformInformation();
+                          dialog.showMessageBox(window, {
+                              message: `Lumi v${electron.app.getVersion()} - ${
+                                  platformInfo?.package ?? 'unknown package'
+                              }\n(C) 2022 Lumi Education GbR Jan Philip Schellenberg und Sebastian Rettig\nAGPL 3.0 License`
+                          });
+                      }
+                  }
+                : { label: i18next.t('lumi:menu.help.about'), role: 'about' }
         ]
     };
 }
diff --git a/server/src/menu/index.ts b/server/src/menu/index.ts
@@ -21,9 +21,7 @@ export default function menuFactory(
         case '/':
         default:
             electron.Menu.setApplicationMenu(
-                electron.Menu.buildFromTemplate(
-                    launchpadMenu(window, webSocket)
-                )
+                electron.Menu.buildFromTemplate(launchpadMenu(window))
             );
             break;
 
@@ -43,7 +41,7 @@ export default function menuFactory(
 
         case '/run':
             electron.Menu.setApplicationMenu(
-                electron.Menu.buildFromTemplate(runMenu(window, webSocket))
+                electron.Menu.buildFromTemplate(runMenu(window))
             );
             break;
 

diff --git a/server/src/menu/launchpadMenu.ts b/server/src/menu/launchpadMenu.ts
@@ -7,10 +7,10 @@ import helpMenu from './helpMenu';
 import windowMenu from './windowMenu';
 import viewMenu from './viewMenu';
 
-export default (window: electron.BrowserWindow, websocket: SocketIO.Server) => [
+export default (window: electron.BrowserWindow) => [
     ...macMenu(),
     editMenu(),
     ...viewMenu(),
     ...windowMenu(),
-    helpMenu(window, websocket)
+    helpMenu(window)
 ];
diff --git a/server/src/menu/runMenu.ts b/server/src/menu/runMenu.ts
@@ -4,7 +4,7 @@ import editMenu from './editMenu';
 
 import helpMenu from './helpMenu';
 
-export default (window: electron.BrowserWindow, websocket: SocketIO.Server) => [
+export default (window: electron.BrowserWindow) => [
     editMenu(),
-    helpMenu(window, websocket)
+    helpMenu(window)
 ];