From 08ce795999f879c9f2eda2f7b83cb87fbb09e5f4 Mon Sep 17 00:00:00 2001
From: PryosCode <info@pryoscode.net>
Date: Fri, 3 Jun 2022 17:57:53 +0200
Subject: [PATCH] Rename Menu Items + Fix Help MacOS

---
 build.gradle.kts                                          | 2 +-
 src/main/kotlin/net/pryoscode/decompiler/Main.kt          | 1 +
 .../net/pryoscode/decompiler/window/menu/file/File.kt     | 8 ++++----
 .../window/menu/file/items/{CloseFile.kt => CloseTab.kt}  | 2 +-
 .../menu/file/items/{OpenArchive.kt => OpenFile.kt}       | 2 +-
 .../net/pryoscode/decompiler/window/menu/help/Help.kt     | 2 ++
 6 files changed, 10 insertions(+), 7 deletions(-)
 rename src/main/kotlin/net/pryoscode/decompiler/window/menu/file/items/{CloseFile.kt => CloseTab.kt} (92%)
 rename src/main/kotlin/net/pryoscode/decompiler/window/menu/file/items/{OpenArchive.kt => OpenFile.kt} (93%)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3a11231..3806c05 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "net.pryoscode"
-version = "0.4.2"
+version = "0.4.3"
 
 kotlin {
     jvmToolchain {
diff --git a/src/main/kotlin/net/pryoscode/decompiler/Main.kt b/src/main/kotlin/net/pryoscode/decompiler/Main.kt
index fb214d4..bb3a372 100644
--- a/src/main/kotlin/net/pryoscode/decompiler/Main.kt
+++ b/src/main/kotlin/net/pryoscode/decompiler/Main.kt
@@ -12,6 +12,7 @@ class Main {
         fun main(args: Array<String>) {
             System.setProperty("apple.laf.useScreenMenuBar", "true")
             System.setProperty("apple.awt.application.name", "Decompiler")
+            System.setProperty("apple.awt.application.appearance", "NSAppearanceNameAqua")
             FlatLightLaf.setup()
             Platform.startup {}
             Window.run(args)
diff --git a/src/main/kotlin/net/pryoscode/decompiler/window/menu/file/File.kt b/src/main/kotlin/net/pryoscode/decompiler/window/menu/file/File.kt
index b79ec92..bcde376 100644
--- a/src/main/kotlin/net/pryoscode/decompiler/window/menu/file/File.kt
+++ b/src/main/kotlin/net/pryoscode/decompiler/window/menu/file/File.kt
@@ -1,9 +1,9 @@
 package net.pryoscode.decompiler.window.menu.file
 
-import net.pryoscode.decompiler.window.menu.file.items.CloseFile
+import net.pryoscode.decompiler.window.menu.file.items.CloseTab
 import net.pryoscode.decompiler.window.menu.file.items.Exit
 import net.pryoscode.decompiler.window.menu.file.items.NewWindow
-import net.pryoscode.decompiler.window.menu.file.items.OpenArchive
+import net.pryoscode.decompiler.window.menu.file.items.OpenFile
 import java.awt.event.KeyEvent
 import javax.swing.JMenu
 import javax.swing.JSeparator
@@ -12,8 +12,8 @@ class File : JMenu("File") {
 
     init {
         mnemonic = KeyEvent.VK_F
-        add(OpenArchive())
-        add(CloseFile())
+        add(OpenFile())
+        add(CloseTab())
         add(JSeparator())
         add(NewWindow())
         add(Exit())
diff --git a/src/main/kotlin/net/pryoscode/decompiler/window/menu/file/items/CloseFile.kt b/src/main/kotlin/net/pryoscode/decompiler/window/menu/file/items/CloseTab.kt
similarity index 92%
rename from src/main/kotlin/net/pryoscode/decompiler/window/menu/file/items/CloseFile.kt
rename to src/main/kotlin/net/pryoscode/decompiler/window/menu/file/items/CloseTab.kt
index b376b92..ab1159b 100644
--- a/src/main/kotlin/net/pryoscode/decompiler/window/menu/file/items/CloseFile.kt
+++ b/src/main/kotlin/net/pryoscode/decompiler/window/menu/file/items/CloseTab.kt
@@ -10,7 +10,7 @@ import javax.swing.JMenuItem
 import javax.swing.KeyStroke
 import javax.swing.SwingUtilities
 
-class CloseFile : JMenuItem("Close File", KeyEvent.VK_W), ActionListener {
+class CloseTab : JMenuItem("Close Tab", KeyEvent.VK_W), ActionListener {
 
     init {
         isEnabled = false
diff --git a/src/main/kotlin/net/pryoscode/decompiler/window/menu/file/items/OpenArchive.kt b/src/main/kotlin/net/pryoscode/decompiler/window/menu/file/items/OpenFile.kt
similarity index 93%
rename from src/main/kotlin/net/pryoscode/decompiler/window/menu/file/items/OpenArchive.kt
rename to src/main/kotlin/net/pryoscode/decompiler/window/menu/file/items/OpenFile.kt
index ec98d16..29ff99f 100644
--- a/src/main/kotlin/net/pryoscode/decompiler/window/menu/file/items/OpenArchive.kt
+++ b/src/main/kotlin/net/pryoscode/decompiler/window/menu/file/items/OpenFile.kt
@@ -12,7 +12,7 @@ import javax.swing.JMenuItem
 import javax.swing.KeyStroke
 import javax.swing.filechooser.FileNameExtensionFilter
 
-class OpenArchive : JMenuItem("Open Archive", KeyEvent.VK_O), ActionListener {
+class OpenFile : JMenuItem("Open File", KeyEvent.VK_O), ActionListener {
 
     init {
         accelerator = KeyStroke.getKeyStroke(KeyEvent.VK_O, Toolkit.getDefaultToolkit().menuShortcutKeyMaskEx)
diff --git a/src/main/kotlin/net/pryoscode/decompiler/window/menu/help/Help.kt b/src/main/kotlin/net/pryoscode/decompiler/window/menu/help/Help.kt
index 5ac0c4e..b2ac5a0 100644
--- a/src/main/kotlin/net/pryoscode/decompiler/window/menu/help/Help.kt
+++ b/src/main/kotlin/net/pryoscode/decompiler/window/menu/help/Help.kt
@@ -1,6 +1,7 @@
 package net.pryoscode.decompiler.window.menu.help
 
 import net.pryoscode.decompiler.window.menu.help.items.About
+import java.awt.Desktop
 import java.awt.event.KeyEvent
 import javax.swing.JMenu
 
@@ -8,6 +9,7 @@ class Help : JMenu("Help") {
 
     init {
         mnemonic = KeyEvent.VK_H
+        isVisible = !Desktop.getDesktop().isSupported(Desktop.Action.APP_ABOUT)
         add(About())
     }