- code refactor settings and quit menu item creation

mediathekview · Mar 29, 2024 · fe4ad3a · fe4ad3a
1 parent e0f9d9b
commit fe4ad3a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/src/main/java/mediathek/mac/MediathekGuiMac.kt b/src/main/java/mediathek/mac/MediathekGuiMac.kt
@@ -32,6 +32,13 @@ class MediathekGuiMac : MediathekGui() {
         return true
     }
 
+    override fun addQuitMenuItem() {
+        //using native handler instead
+    }
+
+    override fun addSettingsMenuItem() {
+        //using native handler instead
+    }
     override fun setToolBarProperties() {
         //not used on macOS
     }

diff --git a/src/main/java/mediathek/mainwindow/MediathekGui.java b/src/main/java/mediathek/mainwindow/MediathekGui.java
@@ -943,13 +943,18 @@ private void createFileMenu() {
         jMenuDatei.add(exportMenu);
         jMenuDatei.add(importMenu);
 
-        //on macOS we will use native handlers instead...
-        if (!SystemUtils.IS_OS_MAC_OSX) {
-            jMenuDatei.addSeparator();
-            jMenuDatei.add(settingsAction);
-            jMenuDatei.addSeparator();
-            jMenuDatei.add(new QuitAction(this));
-        }
+        addSettingsMenuItem();
+        addQuitMenuItem();
+    }
+
+    protected void addSettingsMenuItem() {
+        jMenuDatei.addSeparator();
+        jMenuDatei.add(settingsAction);
+    }
+
+    protected void addQuitMenuItem() {
+        jMenuDatei.addSeparator();
+        jMenuDatei.add(new QuitAction(this));
     }
 
     private void createViewMenu() {