From b4f0e5144720f3def28373b97d37d11929afd357 Mon Sep 17 00:00:00 2001 From: Andrew Auclair Date: Mon, 11 Dec 2023 21:24:23 -0500 Subject: [PATCH] Icon folders were named the same thing in multiple modules. --- .../resources/{icons => api_icons}/close-16.png | Bin .../resources/{icons => api_icons}/close.png | Bin .../resources/{icons => api_icons}/settings.png | Bin .../ModernDocking/internal/DockedTabbedPanel.java | 2 +- .../src/ModernDocking/ui/DefaultHeaderUI.java | 4 ++-- .../resources/{icons => ui_ext_icons}/close.svg | 0 .../resources/{icons => ui_ext_icons}/settings.svg | 0 docking-ui/src/ModernDocking/ext/ui/DockingUI.java | 2 +- .../src/ModernDocking/ext/ui/FlatLafHeaderUI.java | 4 ++-- 9 files changed, 6 insertions(+), 6 deletions(-) rename docking-api/resources/{icons => api_icons}/close-16.png (100%) rename docking-api/resources/{icons => api_icons}/close.png (100%) rename docking-api/resources/{icons => api_icons}/settings.png (100%) rename docking-ui/resources/{icons => ui_ext_icons}/close.svg (100%) mode change 100755 => 100644 rename docking-ui/resources/{icons => ui_ext_icons}/settings.svg (100%) mode change 100755 => 100644 diff --git a/docking-api/resources/icons/close-16.png b/docking-api/resources/api_icons/close-16.png similarity index 100% rename from docking-api/resources/icons/close-16.png rename to docking-api/resources/api_icons/close-16.png diff --git a/docking-api/resources/icons/close.png b/docking-api/resources/api_icons/close.png similarity index 100% rename from docking-api/resources/icons/close.png rename to docking-api/resources/api_icons/close.png diff --git a/docking-api/resources/icons/settings.png b/docking-api/resources/api_icons/settings.png similarity index 100% rename from docking-api/resources/icons/settings.png rename to docking-api/resources/api_icons/settings.png diff --git a/docking-api/src/ModernDocking/internal/DockedTabbedPanel.java b/docking-api/src/ModernDocking/internal/DockedTabbedPanel.java index b1eedf3c..3e6b9615 100644 --- a/docking-api/src/ModernDocking/internal/DockedTabbedPanel.java +++ b/docking-api/src/ModernDocking/internal/DockedTabbedPanel.java @@ -64,7 +64,7 @@ public class DockedTabbedPanel extends DockingPanel implements ChangeListener { */ private int selectedTab = -1; - private static Icon settingsIcon = new ImageIcon(Objects.requireNonNull(DockedTabbedPanel.class.getResource("/icons/settings.png"))); + private static Icon settingsIcon = new ImageIcon(Objects.requireNonNull(DockedTabbedPanel.class.getResource("/api_icons/settings.png"))); /** * Create a new instance of DockedTabbedPanel diff --git a/docking-api/src/ModernDocking/ui/DefaultHeaderUI.java b/docking-api/src/ModernDocking/ui/DefaultHeaderUI.java index d5a6ed67..7e1c9719 100644 --- a/docking-api/src/ModernDocking/ui/DefaultHeaderUI.java +++ b/docking-api/src/ModernDocking/ui/DefaultHeaderUI.java @@ -118,8 +118,8 @@ protected void init() { initialized = true; try { - settings.setIcon(new ImageIcon(Objects.requireNonNull(getClass().getResource("/icons/settings.png")))); - close.setIcon(new ImageIcon(Objects.requireNonNull(getClass().getResource("/icons/close.png")))); + settings.setIcon(new ImageIcon(Objects.requireNonNull(getClass().getResource("/api_icons/settings.png")))); + close.setIcon(new ImageIcon(Objects.requireNonNull(getClass().getResource("/api_icons/close.png")))); } catch (Exception ignored) { } diff --git a/docking-ui/resources/icons/close.svg b/docking-ui/resources/ui_ext_icons/close.svg old mode 100755 new mode 100644 similarity index 100% rename from docking-ui/resources/icons/close.svg rename to docking-ui/resources/ui_ext_icons/close.svg diff --git a/docking-ui/resources/icons/settings.svg b/docking-ui/resources/ui_ext_icons/settings.svg old mode 100755 new mode 100644 similarity index 100% rename from docking-ui/resources/icons/settings.svg rename to docking-ui/resources/ui_ext_icons/settings.svg diff --git a/docking-ui/src/ModernDocking/ext/ui/DockingUI.java b/docking-ui/src/ModernDocking/ext/ui/DockingUI.java index 1832f1f3..711a13b2 100644 --- a/docking-ui/src/ModernDocking/ext/ui/DockingUI.java +++ b/docking-ui/src/ModernDocking/ext/ui/DockingUI.java @@ -42,7 +42,7 @@ public static void initialize() { DockingInternal.createHeaderUI = FlatLafHeaderUI::new; - FlatSVGIcon settingsIcon = new FlatSVGIcon("icons/settings.svg"); + FlatSVGIcon settingsIcon = new FlatSVGIcon("ui_ext_icons/settings.svg"); DockedTabbedPanel.setSettingsIcon(settingsIcon); diff --git a/docking-ui/src/ModernDocking/ext/ui/FlatLafHeaderUI.java b/docking-ui/src/ModernDocking/ext/ui/FlatLafHeaderUI.java index 774eceb4..140c5807 100644 --- a/docking-ui/src/ModernDocking/ext/ui/FlatLafHeaderUI.java +++ b/docking-ui/src/ModernDocking/ext/ui/FlatLafHeaderUI.java @@ -33,12 +33,12 @@ public class FlatLafHeaderUI extends DefaultHeaderUI implements DockingHeaderUI /** * Settings icon for the header. Uses an SVG icon for sharper icons */ - private final FlatSVGIcon settingsIcon = new FlatSVGIcon("icons/settings.svg"); + private final FlatSVGIcon settingsIcon = new FlatSVGIcon("ui_ext_icons/settings.svg"); /** * Close icon for the header. Uses an SVG icon for sharper icons */ - private final FlatSVGIcon closeIcon = new FlatSVGIcon("icons/close.svg"); + private final FlatSVGIcon closeIcon = new FlatSVGIcon("ui_ext_icons/close.svg"); /** * Construct a new FlatLafHeaderUI