From fe4ad3ac15900749bba194b59f3561bc354c4873 Mon Sep 17 00:00:00 2001
From: "Christian F." <crystalpalace1977@googlemail.com>
Date: Fri, 29 Mar 2024 14:01:28 +0100
Subject: [PATCH] - code refactor settings and quit menu item creation

---
 .../java/mediathek/mac/MediathekGuiMac.kt     |  7 +++++++
 .../mediathek/mainwindow/MediathekGui.java    | 19 ++++++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/main/java/mediathek/mac/MediathekGuiMac.kt b/src/main/java/mediathek/mac/MediathekGuiMac.kt
index c260cad840..06d2c439ab 100644
--- 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
index 0af4184785..fcecb80760 100644
--- 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() {