From e23d7e52966eae2af322795eb9f07413573fac8e Mon Sep 17 00:00:00 2001
From: Nils Andresen <nils@nils-andresen.de>
Date: Wed, 23 Aug 2023 22:33:08 +0200
Subject: [PATCH] (#325) Changed the way icons are loaded

This is probably due to the change in UI on the intellij-side.
It seems the builtin add/remove icons were removed and replaced by new
ones. These needed a different kind of "loading".
---
 .../net/cakebuild/settings/CakeRunnerSettingsEditor.form    | 2 --
 .../net/cakebuild/settings/CakeRunnerSettingsEditor.java    | 3 +++
 .../cakebuild/settings/controls/SimpleAddEditControl.form   | 2 --
 .../cakebuild/settings/controls/SimpleAddEditControl.java   | 4 ++++
 src/rider/src/main/kotlin/icons/CakeIcons.kt                | 6 ++++++
 src/rider/src/main/resources/META-INF/plugin.xml            | 2 +-
 6 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/rider/src/main/java/net/cakebuild/settings/CakeRunnerSettingsEditor.form b/src/rider/src/main/java/net/cakebuild/settings/CakeRunnerSettingsEditor.form
index a69dfc05..df917cd7 100644
--- a/src/rider/src/main/java/net/cakebuild/settings/CakeRunnerSettingsEditor.form
+++ b/src/rider/src/main/java/net/cakebuild/settings/CakeRunnerSettingsEditor.form
@@ -86,7 +86,6 @@
                   <gridbag weightx="0.0" weighty="0.0"/>
                 </constraints>
                 <properties>
-                  <icon value="general/add.png"/>
                   <maximumSize width="30" height="30"/>
                   <minimumSize width="30" height="30"/>
                   <preferredSize width="30" height="30"/>
@@ -99,7 +98,6 @@
                   <gridbag weightx="0.0" weighty="0.0"/>
                 </constraints>
                 <properties>
-                  <icon value="general/remove.png"/>
                   <label value=""/>
                   <maximumSize width="30" height="30"/>
                   <minimumSize width="30" height="30"/>
diff --git a/src/rider/src/main/java/net/cakebuild/settings/CakeRunnerSettingsEditor.java b/src/rider/src/main/java/net/cakebuild/settings/CakeRunnerSettingsEditor.java
index 660d4515..815b24b7 100644
--- a/src/rider/src/main/java/net/cakebuild/settings/CakeRunnerSettingsEditor.java
+++ b/src/rider/src/main/java/net/cakebuild/settings/CakeRunnerSettingsEditor.java
@@ -1,5 +1,6 @@
 package net.cakebuild.settings;
 
+import icons.CakeIcons;
 import net.cakebuild.shared.ui.RegexCellEditor;
 
 import javax.swing.JButton;
@@ -45,6 +46,7 @@ public CakeRunnerSettingsEditor() {
         regexCellEditor.setOnValidationError(s -> { setValidationError(s); return null; });
         regexCellEditor.setOnValidationSuccess(() -> { setValidationError(null); return null; });
         overrides.getColumnModel().getColumn(0).setCellEditor(regexCellEditor);
+        addButton.setIcon(CakeIcons.GeneralAdd);
         addButton.addActionListener(e -> {
             model.addRow(new Object[]{"",""});
             int row = model.getRowCount()-1;
@@ -54,6 +56,7 @@ public CakeRunnerSettingsEditor() {
             Component textEdit = overrides.prepareEditor(editor, row, 0);
             textEdit.requestFocus();
         });
+        removeButton.setIcon(CakeIcons.GeneralRemove);
         removeButton.setEnabled(false);
         removeButton.addActionListener(e -> {
             int row = overrides.getSelectedRow();
diff --git a/src/rider/src/main/java/net/cakebuild/settings/controls/SimpleAddEditControl.form b/src/rider/src/main/java/net/cakebuild/settings/controls/SimpleAddEditControl.form
index 784f0f53..d54703bf 100644
--- a/src/rider/src/main/java/net/cakebuild/settings/controls/SimpleAddEditControl.form
+++ b/src/rider/src/main/java/net/cakebuild/settings/controls/SimpleAddEditControl.form
@@ -29,7 +29,6 @@
               <gridbag weightx="0.0" weighty="0.0"/>
             </constraints>
             <properties>
-              <icon value="general/add.png"/>
               <maximumSize width="30" height="30"/>
               <minimumSize width="30" height="30"/>
               <opaque value="true"/>
@@ -43,7 +42,6 @@
               <gridbag weightx="0.0" weighty="0.0"/>
             </constraints>
             <properties>
-              <icon value="general/remove.png"/>
               <label value=""/>
               <maximumSize width="30" height="30"/>
               <minimumSize width="30" height="30"/>
diff --git a/src/rider/src/main/java/net/cakebuild/settings/controls/SimpleAddEditControl.java b/src/rider/src/main/java/net/cakebuild/settings/controls/SimpleAddEditControl.java
index 47a5a418..4a42799b 100644
--- a/src/rider/src/main/java/net/cakebuild/settings/controls/SimpleAddEditControl.java
+++ b/src/rider/src/main/java/net/cakebuild/settings/controls/SimpleAddEditControl.java
@@ -1,5 +1,7 @@
 package net.cakebuild.settings.controls;
 
+import icons.CakeIcons;
+
 import javax.swing.*;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableCellEditor;
@@ -34,6 +36,7 @@ public SimpleAddEditControl(String[] headers, Supplier<String[]> newItemGenerato
             int row = table.getSelectedRow();
             removeItem.setEnabled(row >= 0);
         });
+        addItem.setIcon(CakeIcons.GeneralAdd);
         addItem.addActionListener(e -> {
             model.addRow(newItemGenerator.get());
             int row = model.getRowCount()-1;
@@ -43,6 +46,7 @@ public SimpleAddEditControl(String[] headers, Supplier<String[]> newItemGenerato
             Component textEdit = table.prepareEditor(editor, row, 0);
             textEdit.requestFocus();
         });
+        removeItem.setIcon(CakeIcons.GeneralRemove);
         removeItem.setEnabled(false);
         removeItem.addActionListener(e -> {
             int row = table.getSelectedRow();
diff --git a/src/rider/src/main/kotlin/icons/CakeIcons.kt b/src/rider/src/main/kotlin/icons/CakeIcons.kt
index a365fd47..35060c14 100644
--- a/src/rider/src/main/kotlin/icons/CakeIcons.kt
+++ b/src/rider/src/main/kotlin/icons/CakeIcons.kt
@@ -14,4 +14,10 @@ object CakeIcons {
 
     @JvmField
     val CakeTestProjectTemplate = IconLoader.getIcon("/icons/CakeTestProject.svg", CakeIcons.javaClass)
+
+    @JvmField
+    val GeneralAdd = IconLoader.getIcon("/general/add.svg", CakeIcons.javaClass)
+
+    @JvmField
+    val GeneralRemove = IconLoader.getIcon("/general/remove.svg", CakeIcons.javaClass)
 }
diff --git a/src/rider/src/main/resources/META-INF/plugin.xml b/src/rider/src/main/resources/META-INF/plugin.xml
index fd7634ff..50b5c73b 100644
--- a/src/rider/src/main/resources/META-INF/plugin.xml
+++ b/src/rider/src/main/resources/META-INF/plugin.xml
@@ -18,7 +18,7 @@
     <projectConfigurable parentId="build" instance="net.cakebuild.settings.CakeGeneralSettingsConfigurable"
                          id="net.cakebuild.settings.cake" displayName="Cake" nonDefaultProject="false" />
     <projectConfigurable parentId="net.cakebuild.settings.cake" instance="net.cakebuild.settings.CakeSearchPathSettingsConfigurable"
-                         id="net.cakebuild.settings.cake.runner.paths" displayName="Search paths" nonDefaultProject="false" />
+                         id="net.cakebuild.settings.cake.runner.paths" displayName="Search Paths" nonDefaultProject="false" />
     <projectConfigurable parentId="net.cakebuild.settings.cake" instance="net.cakebuild.settings.CakeRunnerSettingsConfigurable"
                          id="net.cakebuild.settings.cake.runner" displayName="Runner" nonDefaultProject="false" />
     <projectService serviceImplementation="net.cakebuild.settings.CakeSettings" />