Put an icon on most buttons

DeflatedPickle · Nov 27, 2020 · b06d8e2 · b06d8e2
1 parent d33ca7a
commit b06d8e2
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 32 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ plugins {
 }
 
 group 'com.deflatedpickle'
-version '1.6.1'
+version '1.6.2'
 
 allprojects {
 	apply plugin: 'org.jetbrains.kotlin.jvm'

diff --git a/core/build.gradle b/core/build.gradle
@@ -53,4 +53,7 @@ dependencies {
 	// Logging
 	implementation 'org.apache.logging.log4j:log4j-api:2.11.1'
 	implementation 'org.apache.logging.log4j:log4j-core:2.11.1'
+
+	// Icons
+	api 'com.github.DeflatedPickle:Nagato:v1.1.0'
 }
diff --git a/core/src/main/kotlin/com/deflatedpickle/quiver/frontend/extension/JMenu.kt b/core/src/main/kotlin/com/deflatedpickle/quiver/frontend/extension/JMenu.kt
@@ -3,11 +3,12 @@
 package com.deflatedpickle.quiver.frontend.extension
 
 import java.awt.event.ActionEvent
+import javax.swing.Icon
 import javax.swing.JMenu
 import javax.swing.JMenuItem
 
-fun JMenu.add(text: String, action: (ActionEvent) -> Unit): JMenuItem {
-    val item = JMenuItem(text).apply { addActionListener { action(it) } }
+fun JMenu.add(text: String, icon: Icon? = null, action: (ActionEvent) -> Unit): JMenuItem {
+    val item = JMenuItem(text, icon).apply { addActionListener { action(it) } }
     this.add(item)
     return item
 }
diff --git a/core/src/main/kotlin/com/deflatedpickle/quiver/frontend/extension/JPopupMenu.kt b/core/src/main/kotlin/com/deflatedpickle/quiver/frontend/extension/JPopupMenu.kt
@@ -3,11 +3,12 @@
 package com.deflatedpickle.quiver.frontend.extension
 
 import java.awt.event.ActionEvent
+import javax.swing.Icon
 import javax.swing.JMenuItem
 import javax.swing.JPopupMenu
 
-fun JPopupMenu.add(text: String, action: (ActionEvent) -> Unit): JMenuItem {
-    val item = JMenuItem(text).apply { addActionListener { action(it) } }
+fun JPopupMenu.add(text: String, icon: Icon? = null, action: (ActionEvent) -> Unit): JMenuItem {
+    val item = JMenuItem(text, icon).apply { addActionListener { action(it) } }
     this.add(item)
     return item
 }
diff --git a/core/src/main/kotlin/com/deflatedpickle/quiver/frontend/extension/JToolBar.kt b/core/src/main/kotlin/com/deflatedpickle/quiver/frontend/extension/JToolBar.kt
@@ -5,7 +5,17 @@ package com.deflatedpickle.quiver.frontend.extension
 import java.awt.Component
 import javax.swing.JToolBar
 import org.jdesktop.swingx.JXButton
+import javax.swing.Icon
 
-fun JToolBar.add(text: String, action: () -> Unit): Component = this.add(JXButton(text).apply {
-    addActionListener { action() }
-})
+fun JToolBar.add(text: String, action: () -> Unit): Component =
+    this.add(JXButton(text).apply {
+        addActionListener { action() }
+    })
+
+fun JToolBar.add(icon: Icon, tooltip: String = "", action: () -> Unit): Component =
+    this.add(JXButton(icon).apply {
+        if (tooltip.isNotEmpty()) {
+            toolTipText = tooltip
+        }
+        addActionListener { action() }
+    })
diff --git a/core/src/main/kotlin/com/deflatedpickle/quiver/frontend/menu/LinkedFilesPopupMenu.kt b/core/src/main/kotlin/com/deflatedpickle/quiver/frontend/menu/LinkedFilesPopupMenu.kt
@@ -3,6 +3,7 @@
 package com.deflatedpickle.quiver.frontend.menu
 
 import blue.endless.jankson.Jankson
+import com.deflatedpickle.nagato.NagatoIcon
 import com.deflatedpickle.quiver.Quiver
 import com.deflatedpickle.quiver.backend.event.EventSearchFile
 import com.deflatedpickle.quiver.backend.event.EventSearchFolder
@@ -43,7 +44,7 @@ class LinkedFilesPopupMenu(
         val targetFile = file.parentFile.resolve("${file.name}.mcmeta")
 
         if (targetFile.exists() && targetFile.isFile) {
-            this.add("Meta") {
+            this.add("Meta", NagatoIcon.FILE_JSON) {
                 EventSearchFile.trigger(targetFile)
             }
         }
@@ -53,7 +54,7 @@ class LinkedFilesPopupMenu(
         val targetFile = file.parentFile.resolve("${file.name.split(".")[0]}.png")
 
         if (targetFile.exists() && targetFile.isFile) {
-            this.add("Texture") {
+            this.add("Texture", NagatoIcon.PAINTING_BLANK) {
                 EventSearchFile.trigger(targetFile)
             }
         }
@@ -68,7 +69,7 @@ class LinkedFilesPopupMenu(
             val entries = jsonObject.entries
 
             when {
-                entries.size == 1 -> this.add("Texture") {
+                entries.size == 1 -> this.add("Texture", NagatoIcon.PAINTING_BLANK) {
                     this.searchTexture(
                         jsonObject.get(
                             String::class.java,
@@ -80,7 +81,7 @@ class LinkedFilesPopupMenu(
                     for ((key, _) in this.json
                         .load(file)
                         .getObject("textures")!!.entries) {
-                        this.texturesMenu.add(key) {
+                        this.texturesMenu.add(key, NagatoIcon.PAINTING_BLANK) {
                             this.searchTexture(
                                 jsonObject.get(
                                     String::class.java,

diff --git a/core/src/main/kotlin/com/deflatedpickle/quiver/frontend/widget/SearchToolbar.kt b/core/src/main/kotlin/com/deflatedpickle/quiver/frontend/widget/SearchToolbar.kt
@@ -1,11 +1,10 @@
 package com.deflatedpickle.quiver.frontend.widget
 
+import com.deflatedpickle.nagato.NagatoIcon
 import org.jdesktop.swingx.JXSearchField
 import org.jdesktop.swingx.search.Searchable
 import java.util.regex.Pattern
-import javax.swing.JCheckBox
-import javax.swing.JSeparator
-import javax.swing.JToolBar
+import javax.swing.*
 
 class SearchToolbar(
     private val searchable: Searchable
@@ -14,24 +13,30 @@ class SearchToolbar(
         searchMode = JXSearchField.SearchMode.INSTANT
     }
 
-    private val backwardsCheckbox = JCheckBox("Backwards")
+    private val backwardsCheckbox = JToggleButton(NagatoIcon.UNDO).apply {
+        toolTipText = "Backwards"
+    }
 
     // Regex checks
-    private val caseInsensitiveCheckbox = JCheckBox("Case Insensitive").apply {
-        isSelected = true
+    private val matchCaseCheckbox = JToggleButton(NagatoIcon.CASE_INSENSITIVE).apply {
+        toolTipText = "Match Case"
     }
-    private val ignoreWhitespaceCheckbox = JCheckBox("Ignore Whitespace").apply {
+    private val ignoreWhitespaceCheckbox = JToggleButton(NagatoIcon.IGNORE_WHITESPACE).apply {
+        toolTipText = "Ignore Whitespace"
         isSelected = true
     }
 
     // Non-regex checks
-    private val stripSpecialChecks = JCheckBox("Strip Special Characters")
+    private val stripSpecialChecks = JToggleButton(NagatoIcon.STRIP_SPECIAL_CHARACTERS).apply {
+        toolTipText = "Strip Special Characters"
+        isSelected = true
+    }
 
     init {
         this.add(this.searchField)
         this.add(this.backwardsCheckbox)
         this.addSeparator()
-        this.add(this.caseInsensitiveCheckbox)
+        this.add(this.matchCaseCheckbox)
         this.add(this.ignoreWhitespaceCheckbox)
         this.addSeparator()
         this.add(this.stripSpecialChecks)
@@ -45,7 +50,7 @@ class SearchToolbar(
 
             this.search(
                 search,
-                this.caseInsensitiveCheckbox.isSelected,
+                !this.matchCaseCheckbox.isSelected,
                 this.ignoreWhitespaceCheckbox.isSelected
             )
         }

diff --git a/filepanel/src/main/kotlin/com/deflatedpickle/quiver/filepanel/FilePanel.kt b/filepanel/src/main/kotlin/com/deflatedpickle/quiver/filepanel/FilePanel.kt
@@ -4,6 +4,7 @@ package com.deflatedpickle.quiver.filepanel
 
 import com.alexandriasoftware.swing.JSplitButton
 import com.deflatedpickle.haruhi.component.PluginPanel
+import com.deflatedpickle.nagato.NagatoIcon
 import com.deflatedpickle.quiver.Quiver
 import com.deflatedpickle.quiver.filepanel.widget.ReplaceButton
 import com.deflatedpickle.quiver.frontend.extension.add
@@ -31,26 +32,28 @@ object FilePanel : PluginPanel() {
     private val fileSizeLabel = JXLabel("File Size")
     val fileSize = JXLabel()
 
-    private val openButton = JSplitButton("Open  ").apply {
+    private val openButton = JSplitButton("  ", NagatoIcon.FOLDER_OPEN_FILE).apply {
         popupMenu = JPopupMenu("Open Alternatives").apply {
-            this.add("Open Folder") { Desktop.getDesktop().open(Quiver.selectedFile?.parentFile) }
+            this.add("Open Folder", NagatoIcon.FOLDER_OPEN) { Desktop.getDesktop().open(Quiver.selectedFile?.parentFile) }
         }
+        toolTipText = "Open File"
         isEnabled = false
 
         addButtonClickedActionListener {
             Desktop.getDesktop().open(Quiver.selectedFile)
         }
     }
 
-    private val editButton = JXButton("Edit").apply {
+    private val editButton = JXButton(NagatoIcon.PENCIL).apply {
+        toolTipText = "Edit"
         isEnabled = false
 
         addActionListener {
             Desktop.getDesktop().edit(Quiver.selectedFile)
         }
     }
 
-    private val replaceButton = ReplaceButton("Replace").apply {
+    private val replaceButton = ReplaceButton().apply {
         isEnabled = false
     }
 

diff --git a/filepanel/src/main/kotlin/com/deflatedpickle/quiver/filepanel/widget/ReplaceButton.kt b/filepanel/src/main/kotlin/com/deflatedpickle/quiver/filepanel/widget/ReplaceButton.kt
@@ -3,6 +3,7 @@
 package com.deflatedpickle.quiver.filepanel.widget
 
 import com.deflatedpickle.haruhi.util.PluginUtil
+import com.deflatedpickle.nagato.NagatoIcon
 import com.deflatedpickle.quiver.Quiver
 import com.deflatedpickle.quiver.backend.event.EventReplaceFile
 import com.deflatedpickle.quiver.filepanel.FilePanelPlugin
@@ -17,8 +18,10 @@ import javax.swing.filechooser.FileNameExtensionFilter
 import org.apache.commons.io.FileUtils
 import org.jdesktop.swingx.JXButton
 
-class ReplaceButton(text: String) : JXButton(text) {
+class ReplaceButton : JXButton(NagatoIcon.REPLACE) {
     init {
+        this.toolTipText = "Replace"
+
         this.addActionListener()
         this.addDropTarget()
     }

diff --git a/filetable/src/main/kotlin/com/deflatedpickle/quiver/filetable/FileTablePlugin.kt b/filetable/src/main/kotlin/com/deflatedpickle/quiver/filetable/FileTablePlugin.kt
@@ -7,6 +7,7 @@ import com.deflatedpickle.haruhi.api.plugin.Plugin
 import com.deflatedpickle.haruhi.api.plugin.PluginType
 import com.deflatedpickle.haruhi.event.EventProgramFinishSetup
 import com.deflatedpickle.haruhi.util.ConfigUtil
+import com.deflatedpickle.nagato.NagatoIcon
 import com.deflatedpickle.quiver.backend.event.EventSearchFile
 import com.deflatedpickle.quiver.backend.event.EventSelectFile
 import com.deflatedpickle.quiver.backend.event.EventSelectFolder
@@ -43,7 +44,7 @@ object FileTablePlugin {
         else null
     }
 
-    private val linkButton = JSplitButton("Linked  ").apply {
+    private val linkButton = JSplitButton("  ", NagatoIcon.CHAIN_LINK).apply {
         popupMenu = fileLinkMenu
         isEnabled = false
     }

diff --git a/launcher/src/main/kotlin/com/deflatedpickle/quiver/launcher/LauncherPlugin.kt b/launcher/src/main/kotlin/com/deflatedpickle/quiver/launcher/LauncherPlugin.kt
@@ -7,9 +7,11 @@ import com.deflatedpickle.haruhi.api.plugin.Plugin
 import com.deflatedpickle.haruhi.api.plugin.PluginType
 import com.deflatedpickle.haruhi.event.EventProgramFinishSetup
 import com.deflatedpickle.haruhi.util.RegistryUtil
+import com.deflatedpickle.nagato.NagatoIcon
 import com.deflatedpickle.quiver.backend.util.ActionUtil
 import com.deflatedpickle.quiver.frontend.extension.add
 import com.deflatedpickle.quiver.launcher.window.Toolbar
+import javax.swing.JComponent
 import javax.swing.JMenu
 
 @Plugin(
@@ -28,13 +30,13 @@ object LauncherPlugin {
         EventProgramFinishSetup.addListener {
             val menuBar = RegistryUtil.get(MenuCategory.MENU.name)
             (menuBar?.get(MenuCategory.FILE.name) as JMenu).apply {
-                add("New Pack") { ActionUtil.newPack() }
-                add("Open Pack") { ActionUtil.openPack() }
+                add("New Pack", NagatoIcon.FOLDER_NEW) { ActionUtil.newPack() }
+                add("Open Pack", NagatoIcon.FOLDER_OPEN) { ActionUtil.openPack() }
                 addSeparator()
             }
 
-            Toolbar.add("New Pack") { ActionUtil.newPack() }
-            Toolbar.add("Open Pack") { ActionUtil.openPack() }
+            Toolbar.add(NagatoIcon.FOLDER_NEW, "New Pack") { ActionUtil.newPack() } as JComponent
+            Toolbar.add(NagatoIcon.FOLDER_OPEN, "Open Pack") { ActionUtil.openPack() }
         }
     }
 }