diff --git a/build.gradle.kts b/build.gradle.kts index 7061932d..9e001c8a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,7 +20,7 @@ plugins { val skipJavadoc by props() val enableMavenLocal by props(false) val enableGradleMetadata by props() -val skipAutostyle by props(false) +val skipAutostyle by props(true) val isRelease = project.stringProperty("release").toBool() val snapshotName by props("") diff --git a/core/build.gradle.kts b/core/build.gradle.kts index a818bbec..33ce8e36 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -13,6 +13,7 @@ dependencies { api(projects.darklafPropertyLoader) api(projects.darklafUtils) implementation(projects.darklafCompatibility) + implementation(projects.darklafIconset) implementation(projects.darklafNativeUtils) implementation(projects.darklafPlatformBase) implementation(projects.darklafWindows) @@ -42,7 +43,8 @@ tasks.test { workingDir.mkdirs() } useJUnitPlatform() - val verboseTest by props(false) + patchTestExecParams() + val verboseTest by props(true) if (!verboseTest) { exclude("**/DemoTest*") } @@ -72,7 +74,7 @@ val makeDocumentation by tasks.registering(JavaExec::class) { workingDir = File(project.rootDir, "build") workingDir.mkdirs() - main = "com.github.weisj.darklaf.documentation.CreateUITable" + main = "com.github.weisj.darklaf.core.documentation.CreateUITable" classpath(sourceSets.main.get().runtimeClasspath, sourceSets.test.get().runtimeClasspath) } @@ -90,7 +92,8 @@ abstract class DemoTask : JavaExec() { val runDemo by tasks.registering(DemoTask::class) { group = LifecycleBasePlugin.VERIFICATION_GROUP - description = "Launches demo (e.g. com.github.weisj.darklaf.ui.table.TableDemo, com.github.weisj.darklaf.ui.button.ButtonDemo, ...)" + description = + "Launches demo (e.g. com.github.weisj.darklaf.ui.table.TableDemo, com.github.weisj.darklaf.ui.button.ButtonDemo, ...)" classpath(sourceSets.test.map { it.runtimeClasspath }) diff --git a/core/src/main/java/com/github/weisj/darklaf/DarkLaf.java b/core/src/main/java/com/github/weisj/darklaf/DarkLaf.java index de01d3d7..36b73adf 100644 --- a/core/src/main/java/com/github/weisj/darklaf/DarkLaf.java +++ b/core/src/main/java/com/github/weisj/darklaf/DarkLaf.java @@ -43,6 +43,7 @@ public class DarkLaf extends ThemedLookAndFeel { public static final String SYSTEM_PROPERTY_PREFIX = "darklaf."; public static final String ALLOW_NATIVE_CODE_FLAG = DarkLaf.SYSTEM_PROPERTY_PREFIX + "allowNativeCode"; private static final Logger LOGGER = LogUtil.getLogger(DarkLaf.class); + /* * All tasks for initializing the ui defaults in order of execution. */ @@ -100,7 +101,7 @@ public class DarkLaf extends ThemedLookAndFeel { UIManager.setLookAndFeel(systemLafClassName); baseLaf = currentOrFallback(UIManager.getLookAndFeel()); } catch (final Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage(), e.getStackTrace()); + LOGGER.log(Level.SEVERE, e.getMessage(), e); throw new IllegalStateException("Could not load base LaF class." + e.getMessage()); } } diff --git a/core/src/main/java/com/github/weisj/darklaf/LafManager.java b/core/src/main/java/com/github/weisj/darklaf/LafManager.java index d5ceb842..24430bba 100644 --- a/core/src/main/java/com/github/weisj/darklaf/LafManager.java +++ b/core/src/main/java/com/github/weisj/darklaf/LafManager.java @@ -261,6 +261,7 @@ public final class LafManager { * @param theme the theme to register. */ public static void registerTheme(final Theme theme) { + LOGGER.fine("Registering " + theme); registeredThemes.add(theme); } diff --git a/core/src/main/java/com/github/weisj/darklaf/components/ColoredRadioButton.java b/core/src/main/java/com/github/weisj/darklaf/components/ColoredRadioButton.java index 4f77c379..4556a549 100644 --- a/core/src/main/java/com/github/weisj/darklaf/components/ColoredRadioButton.java +++ b/core/src/main/java/com/github/weisj/darklaf/components/ColoredRadioButton.java @@ -29,6 +29,7 @@ import javax.swing.plaf.ComponentUI; import com.github.weisj.darklaf.DarkLaf; import com.github.weisj.darklaf.LafManager; +import com.github.weisj.darklaf.iconset.IconSet; import com.github.weisj.darklaf.properties.PropertyLoader; import com.github.weisj.darklaf.properties.icons.IconLoader; import com.github.weisj.darklaf.properties.icons.StateIcon; @@ -193,14 +194,14 @@ public class ColoredRadioButton extends JRadioButton { Theme theme = LafManager.getInstalledTheme(); Properties props = new Properties(); UIDefaults defaults = UIManager.getLookAndFeelDefaults(); - theme.loadDefaults(props, defaults); + theme.loadDefaults(props, defaults, DarkUIUtil.ICON_LOADER); Color accentCol = color == DEFAULT_COLOR ? (Color) props.get("widgetFillDefault") : color; Color focusCol = focusColor == DEFAULT_COLOR ? accentCol : focusColor; adjustment.applyColors(theme, props, accentCol, null); - PropertyLoader.putProperties(PropertyLoader.loadProperties(DarkLaf.class, "radioButton", "properties/ui/"), - props, defaults); - PropertyLoader.putProperties( - PropertyLoader.loadProperties(DarkLaf.class, "radioButton", "properties/icons/"), props, defaults); + PropertyLoader.putProperties(PropertyLoader.loadProperties(DarkLaf.class, "radioButton", "ui/"), + props, defaults, DarkUIUtil.ICON_LOADER); + PropertyLoader.putProperties(PropertyLoader.loadProperties(IconSet.class, "radioButton", ""), + props, defaults, DarkUIUtil.ICON_LOADER); propertyMap = new Properties(); for (String prop : PROPERTIES) { propertyMap.put(prop, props.get(prop)); diff --git a/core/src/main/java/com/github/weisj/darklaf/components/iconeditor/IconEditor.java b/core/src/main/java/com/github/weisj/darklaf/components/iconeditor/IconEditor.java index 425bc882..3d81828b 100644 --- a/core/src/main/java/com/github/weisj/darklaf/components/iconeditor/IconEditor.java +++ b/core/src/main/java/com/github/weisj/darklaf/components/iconeditor/IconEditor.java @@ -118,9 +118,9 @@ public class IconEditor extends JPanel { DarkUIUtil.ICON_LOADER.getIcon("navigation/add.svg", addIconSize, addIconSize, true)); int overlaySize = (2 * addIconSize) / 3; addEditorButton.setOverlayDropDownIcon( - DarkUIUtil.ICON_LOADER.getIcon("indicator/dropDown.svg", overlaySize, overlaySize, true)); + DarkUIUtil.ICON_LOADER.getIcon("indicator/dropdown.svg", overlaySize, overlaySize, true)); addEditorButton.setOverlayDropDownDisabledIcon( - DarkUIUtil.ICON_LOADER.getIcon("indicator/dropDownDisabled.svg", overlaySize, overlaySize, true)); + DarkUIUtil.ICON_LOADER.getIcon("indicator/dropdownDisabled.svg", overlaySize, overlaySize, true)); addEditorButton.putClientProperty(ButtonConstants.KEY_ARC_MULTIPLIER, 3); JPopupMenu menu = addEditorButton.getActionMenu(); diff --git a/core/src/main/java/com/github/weisj/darklaf/components/iconeditor/IconEditorPanel.java b/core/src/main/java/com/github/weisj/darklaf/components/iconeditor/IconEditorPanel.java index 7ba5bdad..732e2f6e 100644 --- a/core/src/main/java/com/github/weisj/darklaf/components/iconeditor/IconEditorPanel.java +++ b/core/src/main/java/com/github/weisj/darklaf/components/iconeditor/IconEditorPanel.java @@ -377,7 +377,7 @@ public class IconEditorPanel extends JPanel { }.getDefaults(); } Properties props = new Properties(); - theme.loadIconTheme(props, defaults); + theme.loadIconTheme(props, defaults, DarkUIUtil.ICON_LOADER); props.entrySet().forEach(e -> e.setValue(defaults.get(e.getKey()))); return new ThemeIconDefaults(defaults, props); }); diff --git a/core/src/main/java/com/github/weisj/darklaf/settings/ThemeSettings.java b/core/src/main/java/com/github/weisj/darklaf/settings/ThemeSettings.java index e103419c..41365b69 100644 --- a/core/src/main/java/com/github/weisj/darklaf/settings/ThemeSettings.java +++ b/core/src/main/java/com/github/weisj/darklaf/settings/ThemeSettings.java @@ -371,19 +371,19 @@ public class ThemeSettings implements ThemePreferenceListener { protected Component createButtonPanel() { Locale l = Locale.getDefault(); - JButton ok = new DefaultButton(UIManager.getString("dialog_ok", l)); + JButton ok = new DefaultButton(UIManager.getString("settings.dialog_ok", l)); ok.setDefaultCapable(true); ok.addActionListener(e -> { apply(); dialog.dispatchEvent(new WindowEvent(dialog, WindowEvent.WINDOW_CLOSING)); }); - JButton cancel = new JButton(UIManager.getString("dialog_cancel", l)); + JButton cancel = new JButton(UIManager.getString("settings.dialog_cancel", l)); cancel.addActionListener(e -> { revert(); dialog.dispatchEvent(new WindowEvent(dialog, WindowEvent.WINDOW_CLOSING)); }); - JButton apply = new JButton(UIManager.getString("dialog_apply", l)); + JButton apply = new JButton(UIManager.getString("settings.dialog_apply", l)); apply.addActionListener(e -> apply()); Box box = Box.createHorizontalBox(); @@ -531,7 +531,7 @@ public class ThemeSettings implements ThemePreferenceListener { * @return the title */ public String getTitle() { - return UIManager.getString("title", Locale.getDefault()); + return UIManager.getString("settings.title", Locale.getDefault()); } @Override diff --git a/core/src/main/java/com/github/weisj/darklaf/settings/ThemeSettingsUI.java b/core/src/main/java/com/github/weisj/darklaf/settings/ThemeSettingsUI.java index f34b1db9..b7a36b96 100644 --- a/core/src/main/java/com/github/weisj/darklaf/settings/ThemeSettingsUI.java +++ b/core/src/main/java/com/github/weisj/darklaf/settings/ThemeSettingsUI.java @@ -62,12 +62,12 @@ import com.github.weisj.darklaf.util.Alignment; public class ThemeSettingsUI { - public final static String THEME_LABEL_KEY = "label_theme"; - public final static String SELECTION_COLOR_LABEL_KEY = "label_selection_color"; - public final static String ACCENT_COLOR_LABEL_KEY = "label_accent_color"; - public final static String FONT_SIZE_LABEL_KEY = "label_font_size"; - public final static String GENERAL_LABEL_KEY = "title_general"; - public final static String MONITORING_LABEL_KEY = "title_monitoring"; + public final static String THEME_LABEL_KEY = "settings.label_theme"; + public final static String SELECTION_COLOR_LABEL_KEY = "settings.label_selection_color"; + public final static String ACCENT_COLOR_LABEL_KEY = "settings.label_accent_color"; + public final static String FONT_SIZE_LABEL_KEY = "settings.label_font_size"; + public final static String GENERAL_LABEL_KEY = "settings.title_general"; + public final static String MONITORING_LABEL_KEY = "settings.title_monitoring"; private final SettingsUIConfiguration settingsConfiguration; private final List listeners = new ArrayList<>(); @@ -108,14 +108,14 @@ public class ThemeSettingsUI { fontSlider = createFontSlider(); enabledSystemPreferences = DynamicUI.withDynamic(new TristateCheckBox(), - c -> c.setText(UIManager.getString("check_system_preferences", c.getLocale()))); - accentColorFollowsSystem = createSystemSettingCheckBox("check_system_accent_color", + c -> c.setText(UIManager.getString("settings.check_system_preferences", c.getLocale()))); + accentColorFollowsSystem = createSystemSettingCheckBox("settings.check_system_accent_color", ThemePreferencesHandler::supportsNativeAccentColor); - selectionColorFollowsSystem = createSystemSettingCheckBox("check_system_selection_color", + selectionColorFollowsSystem = createSystemSettingCheckBox("settings.check_system_selection_color", ThemePreferencesHandler::supportsNativeSelectionColor); - fontSizeFollowsSystem = createSystemSettingCheckBox("check_system_font", + fontSizeFollowsSystem = createSystemSettingCheckBox("settings.check_system_font", ThemePreferencesHandler::supportsNativeFontSize); - themeFollowsSystem = createSystemSettingCheckBox("check_system_theme", + themeFollowsSystem = createSystemSettingCheckBox("settings.check_system_theme", ThemePreferencesHandler::supportsNativeTheme); setupListeners(); @@ -256,25 +256,25 @@ public class ThemeSettingsUI { return new RadioColorChooser( Arrays.asList( new RadioColorChooser.ColorSpec( - ColoredRadioButton.DEFAULT_COLOR, defaultAccentColor, "color_default"), + ColoredRadioButton.DEFAULT_COLOR, defaultAccentColor, "settings.color_default"), new RadioColorChooser.ColorSpec( - MacOSColors.ACCENT_BLUE, null, "color_blue"), + MacOSColors.ACCENT_BLUE, null, "settings.color_blue"), new RadioColorChooser.ColorSpec( - MacOSColors.ACCENT_LILAC, null, "color_lilac"), + MacOSColors.ACCENT_LILAC, null, "settings.color_lilac"), new RadioColorChooser.ColorSpec( - MacOSColors.ACCENT_ROSE, null, "color_rose"), + MacOSColors.ACCENT_ROSE, null, "settings.color_rose"), new RadioColorChooser.ColorSpec( - MacOSColors.ACCENT_RED, null, "color_red"), + MacOSColors.ACCENT_RED, null, "settings.color_red"), new RadioColorChooser.ColorSpec( - MacOSColors.ACCENT_ORANGE, null, "color_orange"), + MacOSColors.ACCENT_ORANGE, null, "settings.color_orange"), new RadioColorChooser.ColorSpec( - MacOSColors.ACCENT_YELLOW, null, "color_yellow"), + MacOSColors.ACCENT_YELLOW, null, "settings.color_yellow"), new RadioColorChooser.ColorSpec( - MacOSColors.ACCENT_GREEN, null, "color_green"), + MacOSColors.ACCENT_GREEN, null, "settings.color_green"), new RadioColorChooser.ColorSpec( - MacOSColors.ACCENT_GRAPHITE, null, "color_gray")), + MacOSColors.ACCENT_GRAPHITE, null, "settings.color_gray")), new RadioColorChooser.ColorSpec( - currentAccentColor, null, "color_custom"), + currentAccentColor, null, "settings.color_custom"), currentAccentColor, defaultAccentColor); } @@ -283,25 +283,25 @@ public class ThemeSettingsUI { return new RadioColorChooser( Arrays.asList( new RadioColorChooser.ColorSpec( - defaultSelectionColor, ColoredRadioButton.DEFAULT_COLOR, "color_default"), + defaultSelectionColor, ColoredRadioButton.DEFAULT_COLOR, "settings.color_default"), new RadioColorChooser.ColorSpec( - MacOSColors.SELECTION_BLUE, MacOSColors.ACCENT_BLUE, "color_blue"), + MacOSColors.SELECTION_BLUE, MacOSColors.ACCENT_BLUE, "settings.color_blue"), new RadioColorChooser.ColorSpec( - MacOSColors.SELECTION_PURPLE, MacOSColors.ACCENT_LILAC, "color_purple"), + MacOSColors.SELECTION_PURPLE, MacOSColors.ACCENT_LILAC, "settings.color_purple"), new RadioColorChooser.ColorSpec( - MacOSColors.SELECTION_PINK, MacOSColors.ACCENT_ROSE, "color_pink"), + MacOSColors.SELECTION_PINK, MacOSColors.ACCENT_ROSE, "settings.color_pink"), new RadioColorChooser.ColorSpec( - MacOSColors.SELECTION_RED, MacOSColors.ACCENT_RED, "color_red"), + MacOSColors.SELECTION_RED, MacOSColors.ACCENT_RED, "settings.color_red"), new RadioColorChooser.ColorSpec( - MacOSColors.SELECTION_ORANGE, MacOSColors.ACCENT_ORANGE, "color_orange"), + MacOSColors.SELECTION_ORANGE, MacOSColors.ACCENT_ORANGE, "settings.color_orange"), new RadioColorChooser.ColorSpec( - MacOSColors.SELECTION_YELLOW, MacOSColors.ACCENT_YELLOW, "color_yellow"), + MacOSColors.SELECTION_YELLOW, MacOSColors.ACCENT_YELLOW, "settings.color_yellow"), new RadioColorChooser.ColorSpec( - MacOSColors.SELECTION_GREEN, MacOSColors.ACCENT_GREEN, "color_green"), + MacOSColors.SELECTION_GREEN, MacOSColors.ACCENT_GREEN, "settings.color_green"), new RadioColorChooser.ColorSpec( - MacOSColors.SELECTION_GRAPHITE, MacOSColors.ACCENT_GRAPHITE, "color_gray")), + MacOSColors.SELECTION_GRAPHITE, MacOSColors.ACCENT_GRAPHITE, "settings.color_gray")), new RadioColorChooser.ColorSpec( - currentSelectionColor, defaultSelectionColor, "color_custom"), + currentSelectionColor, defaultSelectionColor, "settings.color_custom"), currentSelectionColor, defaultSelectionColor); } @@ -337,7 +337,8 @@ public class ThemeSettingsUI { Dictionary dict = fontSlider.createStandardLabels(tickSpacing); JLabel min = ((JLabel) dict.get(fontSlider.getMinimum())); UIUpdater.registerComponent(min); - DynamicUI.withDynamic(min, c -> c.setText(UIManager.getString("label_font_smaller", fontSlider.getLocale()))); + DynamicUI.withDynamic(min, + c -> c.setText(UIManager.getString("settings.label_font_smaller", fontSlider.getLocale()))); min.setAlignmentX(JComponent.LEFT_ALIGNMENT); min.putClientProperty(DarkSliderUI.KEY_MANUAL_LABEL_ALIGN, true); @@ -345,14 +346,16 @@ public class ThemeSettingsUI { UIUpdater.registerComponent(mid); dict.remove(fontSlider.getMinimum() + tickSpacing); dict.put(FontSizePreset.NORMAL.getPercentage(), mid); - DynamicUI.withDynamic(mid, c -> c.setText(UIManager.getString("label_font_default", fontSlider.getLocale()))); + DynamicUI.withDynamic(mid, + c -> c.setText(UIManager.getString("settings.label_font_default", fontSlider.getLocale()))); mid.setAlignmentX(JComponent.CENTER_ALIGNMENT); mid.setHorizontalTextPosition(JLabel.RIGHT); JLabel max = ((JLabel) dict.get(fontSlider.getMaximum())); max.putClientProperty(DarkSliderUI.KEY_MANUAL_LABEL_ALIGN, true); - DynamicUI.withDynamic(max, c -> c.setText(UIManager.getString("label_font_bigger", fontSlider.getLocale()))); + DynamicUI.withDynamic(max, + c -> c.setText(UIManager.getString("settings.label_font_bigger", fontSlider.getLocale()))); max.setAlignmentX(JComponent.RIGHT_ALIGNMENT); max.putClientProperty(DarkSliderUI.KEY_MANUAL_LABEL_ALIGN, true); UIUpdater.registerComponent(max); diff --git a/core/src/main/java/com/github/weisj/darklaf/task/FontDefaultsInitTask.java b/core/src/main/java/com/github/weisj/darklaf/task/FontDefaultsInitTask.java index 00e7f18d..3a19982b 100644 --- a/core/src/main/java/com/github/weisj/darklaf/task/FontDefaultsInitTask.java +++ b/core/src/main/java/com/github/weisj/darklaf/task/FontDefaultsInitTask.java @@ -38,6 +38,7 @@ import com.github.weisj.darklaf.properties.PropertyLoader; import com.github.weisj.darklaf.properties.uiresource.DarkFontUIResource; import com.github.weisj.darklaf.theme.Theme; import com.github.weisj.darklaf.theme.info.FontSizeRule; +import com.github.weisj.darklaf.ui.util.DarkUIUtil; import com.github.weisj.darklaf.util.FontUtil; import com.github.weisj.darklaf.util.LogUtil; import com.github.weisj.darklaf.util.PropertyUtil; @@ -49,7 +50,7 @@ public class FontDefaultsInitTask implements DefaultsInitTask { private static final Logger LOGGER = LogUtil.getLogger(FontDefaultsInitTask.class); private static final String SWING_AA_KEY = "swing.aatext"; private static final String SWING_AA_DEFAULT_VALUE = "true"; - private static final String FONT_PROPERTY_PATH = "properties/"; + private static final String FONT_PROPERTY_PATH = ""; private static final String FONT_SIZE_DEFAULTS_NAME = "font_sizes"; private static final String FONT_DEFAULTS_NAME = "font"; private static final String KERNING_ALLOW_LIST = "kerning.allowList"; @@ -176,9 +177,9 @@ public class FontDefaultsInitTask implements DefaultsInitTask { private void loadFontProperties(final UIDefaults defaults) { Properties fontSizeProps = PropertyLoader.loadProperties(DarkLaf.class, FONT_SIZE_DEFAULTS_NAME, FONT_PROPERTY_PATH); - PropertyLoader.putProperties(fontSizeProps, defaults); + PropertyLoader.putProperties(fontSizeProps, defaults, DarkUIUtil.ICON_LOADER); Properties fontProps = PropertyLoader.loadProperties(DarkLaf.class, FONT_DEFAULTS_NAME, FONT_PROPERTY_PATH); - PropertyLoader.putProperties(fontProps, defaults); + PropertyLoader.putProperties(fontProps, defaults, DarkUIUtil.ICON_LOADER); } private void patchOSFonts(final UIDefaults defaults, final Function, Font> mapper) { diff --git a/core/src/main/java/com/github/weisj/darklaf/task/RemoveUnusedInitTask.java b/core/src/main/java/com/github/weisj/darklaf/task/RemoveUnusedInitTask.java index 282819b5..af211811 100644 --- a/core/src/main/java/com/github/weisj/darklaf/task/RemoveUnusedInitTask.java +++ b/core/src/main/java/com/github/weisj/darklaf/task/RemoveUnusedInitTask.java @@ -33,7 +33,7 @@ public class RemoveUnusedInitTask implements DefaultsInitTask { @Override public void run(final Theme currentTheme, final UIDefaults defaults) { - Properties props = PropertyLoader.loadProperties(DarkLaf.class, "unused", "properties/"); + Properties props = PropertyLoader.loadProperties(DarkLaf.class, "unused", ""); props.keySet().forEach(defaults::remove); } } diff --git a/core/src/main/java/com/github/weisj/darklaf/task/ResourceBundleInitTask.java b/core/src/main/java/com/github/weisj/darklaf/task/ResourceBundleInitTask.java index 50faf376..d0a5d115 100644 --- a/core/src/main/java/com/github/weisj/darklaf/task/ResourceBundleInitTask.java +++ b/core/src/main/java/com/github/weisj/darklaf/task/ResourceBundleInitTask.java @@ -33,9 +33,9 @@ public class ResourceBundleInitTask implements DefaultsInitTask { */ private static final String PLAF_BUNDLE_NAME = "com.sun.swing.internal.plaf.basic.resources.basic"; private static final String METAL_BUNDLE_NAME = "com.sun.swing.internal.plaf.metal.resources.metal"; - private static final String DARKLAF_BUNDLE_NAME = ResourceUtil.getBundleName("darklaf"); - private static final String SETTING_BUNDLE_NAME = ResourceUtil.getBundleName("theme_settings"); - private static final String TAB_FRAME_BUNDLE_NAME = ResourceUtil.getBundleName("tabFrame"); + private static final String DARKLAF_BUNDLE_NAME = ResourceUtil.getBundleName("task/darklaf"); + private static final String SETTING_BUNDLE_NAME = ResourceUtil.getBundleName("task/theme_settings"); + private static final String TAB_FRAME_BUNDLE_NAME = ResourceUtil.getBundleName("task/tabFrame"); @Override public void run(final Theme currentTheme, final UIDefaults defaults) { diff --git a/core/src/main/java/com/github/weisj/darklaf/task/SystemDefaultsInitTask.java b/core/src/main/java/com/github/weisj/darklaf/task/SystemDefaultsInitTask.java index a2aac9a2..cbb178e8 100644 --- a/core/src/main/java/com/github/weisj/darklaf/task/SystemDefaultsInitTask.java +++ b/core/src/main/java/com/github/weisj/darklaf/task/SystemDefaultsInitTask.java @@ -28,10 +28,11 @@ import javax.swing.*; import com.github.weisj.darklaf.DarkLaf; import com.github.weisj.darklaf.properties.PropertyLoader; import com.github.weisj.darklaf.theme.Theme; +import com.github.weisj.darklaf.ui.util.DarkUIUtil; public class SystemDefaultsInitTask implements DefaultsInitTask { - private static final String OVERWRITES_PATH = "properties/"; + private static final String OVERWRITES_PATH = ""; private static final String OVERWRITES_NAME = "overwrites"; @Override @@ -44,6 +45,6 @@ public class SystemDefaultsInitTask implements DefaultsInitTask { overwrites.values().removeIf(v -> System.getProperty(DarkLaf.SYSTEM_PROPERTY_PREFIX + v.toString()) == null); overwrites.entrySet() .forEach(e -> e.setValue(System.getProperty(DarkLaf.SYSTEM_PROPERTY_PREFIX + e.getValue().toString()))); - PropertyLoader.putProperties(overwrites, defaults); + PropertyLoader.putProperties(overwrites, defaults, DarkUIUtil.ICON_LOADER); } } diff --git a/core/src/main/java/com/github/weisj/darklaf/task/ThemeDefaultsInitTask.java b/core/src/main/java/com/github/weisj/darklaf/task/ThemeDefaultsInitTask.java index 4234569c..2acbc18c 100644 --- a/core/src/main/java/com/github/weisj/darklaf/task/ThemeDefaultsInitTask.java +++ b/core/src/main/java/com/github/weisj/darklaf/task/ThemeDefaultsInitTask.java @@ -29,9 +29,11 @@ import java.util.Properties; import javax.swing.*; import com.github.weisj.darklaf.DarkLaf; +import com.github.weisj.darklaf.iconset.IconSet; import com.github.weisj.darklaf.platform.DecorationsHandler; import com.github.weisj.darklaf.properties.PropertyLoader; import com.github.weisj.darklaf.theme.Theme; +import com.github.weisj.darklaf.ui.util.DarkUIUtil; import com.github.weisj.darklaf.util.PropertyUtil; import com.github.weisj.darklaf.util.SystemInfo; @@ -63,7 +65,7 @@ public class ThemeDefaultsInitTask implements DefaultsInitTask { private void loadThemeDefaults(final Theme currentTheme, final UIDefaults defaults) { Properties uiProps = new Properties(); - currentTheme.loadDefaults(uiProps, defaults); + currentTheme.loadDefaults(uiProps, defaults, DarkUIUtil.ICON_LOADER); backupAccentColors(uiProps); @@ -108,10 +110,10 @@ public class ThemeDefaultsInitTask implements DefaultsInitTask { } private void initGlobals(final Theme currentTheme, final UIDefaults defaults, final Properties uiProps) { - PropertyLoader.putProperties(PropertyLoader.loadProperties(DarkLaf.class, "globals", "properties/"), uiProps, - defaults); + PropertyLoader.putProperties(PropertyLoader.loadProperties(DarkLaf.class, "globals", ""), + uiProps, defaults, DarkUIUtil.ICON_LOADER); - currentTheme.customizeGlobals(uiProps, defaults); + currentTheme.customizeGlobals(uiProps, defaults, DarkUIUtil.ICON_LOADER); installGlobals(uiProps, defaults); } @@ -132,26 +134,26 @@ public class ThemeDefaultsInitTask implements DefaultsInitTask { private void initUIProperties(final Theme currentTheme, final UIDefaults defaults, final Properties uiProps) { for (String property : UI_PROPERTIES) { - PropertyLoader.putProperties(PropertyLoader.loadProperties(DarkLaf.class, property, "properties/ui/"), - uiProps, defaults); + PropertyLoader.putProperties(PropertyLoader.loadProperties(DarkLaf.class, property, "ui/"), + uiProps, defaults, DarkUIUtil.ICON_LOADER); } - currentTheme.customizeUIProperties(uiProps, defaults); + currentTheme.customizeUIProperties(uiProps, defaults, DarkUIUtil.ICON_LOADER); } private void initIconTheme(final Theme currentTheme, final UIDefaults defaults, final Properties uiProps) { - currentTheme.loadIconTheme(uiProps, defaults); + currentTheme.loadIconTheme(uiProps, defaults, DarkUIUtil.ICON_LOADER); for (String property : ICON_PROPERTIES) { - PropertyLoader.putProperties(PropertyLoader.loadProperties(DarkLaf.class, property, "properties/icons/"), - uiProps, defaults); + PropertyLoader.putProperties(PropertyLoader.loadProperties(IconSet.class, property, ""), + uiProps, defaults, DarkUIUtil.ICON_LOADER); } - currentTheme.customizeIconTheme(uiProps, defaults); + currentTheme.customizeIconTheme(uiProps, defaults, DarkUIUtil.ICON_LOADER); } private void initPlatformProperties(final Theme currentTheme, final UIDefaults defaults, final Properties uiProps) { PropertyLoader.putProperties( - PropertyLoader.loadProperties(DarkLaf.class, SystemInfo.getOsName(), "properties/platform/"), uiProps, - defaults); - currentTheme.customizePlatformProperties(uiProps, defaults); + PropertyLoader.loadProperties(DarkLaf.class, SystemInfo.getOsName(), "platform/"), + uiProps, defaults, DarkUIUtil.ICON_LOADER); + currentTheme.customizePlatformProperties(uiProps, defaults, DarkUIUtil.ICON_LOADER); } private void adjustPlatformSpecifics(final Properties uiProps) { diff --git a/core/src/main/java/com/github/weisj/darklaf/ui/util/DarkUIUtil.java b/core/src/main/java/com/github/weisj/darklaf/ui/util/DarkUIUtil.java index 689c476c..fb675e64 100644 --- a/core/src/main/java/com/github/weisj/darklaf/ui/util/DarkUIUtil.java +++ b/core/src/main/java/com/github/weisj/darklaf/ui/util/DarkUIUtil.java @@ -42,6 +42,7 @@ import javax.swing.tree.TreeCellEditor; import javax.swing.tree.TreeCellRenderer; import com.github.weisj.darklaf.focus.FocusParentHelper; +import com.github.weisj.darklaf.iconset.IconSet; import com.github.weisj.darklaf.properties.icons.IconLoader; import com.github.weisj.darklaf.ui.cell.CellRenderer; import com.github.weisj.darklaf.ui.popupmenu.DarkPopupMenuUI; @@ -55,7 +56,7 @@ import com.github.weisj.darklaf.util.PropertyUtil; public final class DarkUIUtil { private static final int CELL_SEARCH_DEPTH = 3; - public static final IconLoader ICON_LOADER = IconLoader.get(IconLoader.class); + public static final IconLoader ICON_LOADER = IconSet.ICON_LOADER; private static final Rectangle iconRect = new Rectangle(); private static final Rectangle textRect = new Rectangle(); diff --git a/core/src/main/java/com/github/weisj/darklaf/ui/util/ResourceUtil.java b/core/src/main/java/com/github/weisj/darklaf/ui/util/ResourceUtil.java index b9cfbb3f..b9eaef4a 100644 --- a/core/src/main/java/com/github/weisj/darklaf/ui/util/ResourceUtil.java +++ b/core/src/main/java/com/github/weisj/darklaf/ui/util/ResourceUtil.java @@ -21,15 +21,11 @@ */ package com.github.weisj.darklaf.ui.util; -import java.awt.*; - import com.github.weisj.darklaf.DarkLaf; public final class ResourceUtil { - private static final String BUNDLE_DIR = "bundles"; - public static String getBundleName(final String name) { - return DarkLaf.class.getPackage().getName() + "." + BUNDLE_DIR + "." + name; + return DarkLaf.class.getPackage().getName() + "." + name.replace('/', '.'); } } diff --git a/core/src/main/java/org/pbjar/jxlayer/plaf/ext/TransformUI.java b/core/src/main/java/org/pbjar/jxlayer/plaf/ext/TransformUI.java index 3cea45e7..902fed98 100644 --- a/core/src/main/java/org/pbjar/jxlayer/plaf/ext/TransformUI.java +++ b/core/src/main/java/org/pbjar/jxlayer/plaf/ext/TransformUI.java @@ -132,7 +132,7 @@ import com.github.weisj.darklaf.util.SystemInfo; public class TransformUI extends MouseEventUI { public static final String BUFFERED_REPAINT_FLAG = "darklaf.useBufferedRepaintManager"; - private static final String EXPORTS_FLAG = "--add-exports java.desktop/com.sun.java.swing=ALL-UNNAMED"; + private static final String EXPORTS_FLAG = "--add-exports java.desktop/com.sun.java.swing=darklaf.core"; private static final LayoutManager transformLayout = new TransformLayout(); private static final String KEY_VIEW = "view"; private static final boolean delegatePossible; diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings.properties b/core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings.properties deleted file mode 100644 index 156c1bf5..00000000 --- a/core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings.properties +++ /dev/null @@ -1,62 +0,0 @@ -# -# MIT License -# -# Copyright (c) 2021 Jannis Weis -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# -# -# suppress inspection "UnusedProperty" for whole file -# -title = Theme Settings -color_default = Default -color_blue = Blue -color_lilac = Lilac -color_rose = Rose -color_red = Red -color_orange = Orange -color_yellow = Yellow -color_green = Green -color_gray = Graphite -color_custom = Custom -color_purple = Purple -color_pink = Pink - -label_theme = Theme - -label_accent_color = Accent Color -label_selection_color = Selection Color - -label_font_size = Font size -label_font_smaller = Smaller -label_font_default = Default -label_font_bigger = Bigger - -check_system_preferences = Follow system preferences -check_system_accent_color = Apply accent color -check_system_selection_color = Apply selection color -check_system_theme = Apply theme -check_system_font = Apply font size - -title_general = General -title_monitoring = System - -dialog_ok = OK -dialog_cancel = Cancel -dialog_apply = Apply diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_de.properties b/core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_de.properties deleted file mode 100644 index 097860f1..00000000 --- a/core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_de.properties +++ /dev/null @@ -1,62 +0,0 @@ -# -# MIT License -# -# Copyright (c) 2021 Jannis Weis -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# -# -# suppress inspection "UnusedProperty" for whole file -# -title = Thema Einstellungen -color_default = Standard -color_blue = Blau -color_lilac = Lila -color_rose = Rosa -color_red = Rot -color_orange = Orange -color_yellow = Gelb -color_green = Grün -color_gray = Graphit -color_custom = Benutzerdefiniert -color_purple = Lila -color_pink = Pink - -label_theme = Farbschema - -label_accent_color = Akzentfarbe -label_selection_color = Auswahlfarbe - -label_font_size = Schriftgröße -label_font_smaller = Kleiner -label_font_default = Standard -label_font_bigger = Größer - -check_system_preferences = Systemeinstellungen folgen -check_system_accent_color = Akzentfarbe anwenden -check_system_selection_color = Auswahlfarbe anwenden -check_system_theme = Thema anwenden -check_system_font = Schriftgröße anwenden - -title_general = Allgemein -title_monitoring = System - -dialog_ok = OK -dialog_cancel = Abbrechen -dialog_apply = Übernehmen diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_en_GB.properties b/core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_en_GB.properties deleted file mode 100644 index c981f55f..00000000 --- a/core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_en_GB.properties +++ /dev/null @@ -1,62 +0,0 @@ -# -# MIT License -# -# Copyright (c) 2021 Jannis Weis -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# -# -# suppress inspection "UnusedProperty" for whole file -# -title = Theme Settings -color_default = Default -color_blue = Blue -color_lilac = Lilac -color_rose = Rose -color_red = Red -color_orange = Orange -color_yellow = Yellow -color_green = Green -color_gray = Graphite -color_custom = Custom -color_purple = Purple -color_pink = Pink - -label_theme = Theme - -label_accent_color = Accent Colour -label_selection_color = Selection Colour - -label_font_size = Font size -label_font_smaller = Smaller -label_font_default = Default -label_font_bigger = Bigger - -check_system_preferences = Follow system preferences -check_system_accent_color = Apply accent colour -check_system_selection_color = Apply selection colour -check_system_theme = Apply theme -check_system_font = Apply font size - -title_general = General -title_monitoring = System - -dialog_ok = OK -dialog_cancel = Cancel -dialog_apply = Apply diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_en_US.properties b/core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_en_US.properties deleted file mode 100644 index 156c1bf5..00000000 --- a/core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_en_US.properties +++ /dev/null @@ -1,62 +0,0 @@ -# -# MIT License -# -# Copyright (c) 2021 Jannis Weis -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# -# -# suppress inspection "UnusedProperty" for whole file -# -title = Theme Settings -color_default = Default -color_blue = Blue -color_lilac = Lilac -color_rose = Rose -color_red = Red -color_orange = Orange -color_yellow = Yellow -color_green = Green -color_gray = Graphite -color_custom = Custom -color_purple = Purple -color_pink = Pink - -label_theme = Theme - -label_accent_color = Accent Color -label_selection_color = Selection Color - -label_font_size = Font size -label_font_smaller = Smaller -label_font_default = Default -label_font_bigger = Bigger - -check_system_preferences = Follow system preferences -check_system_accent_color = Apply accent color -check_system_selection_color = Apply selection color -check_system_theme = Apply theme -check_system_font = Apply font size - -title_general = General -title_monitoring = System - -dialog_ok = OK -dialog_cancel = Cancel -dialog_apply = Apply diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_es.properties b/core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_es.properties deleted file mode 100644 index fc4bbb8a..00000000 --- a/core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_es.properties +++ /dev/null @@ -1,62 +0,0 @@ -# -# MIT License -# -# Copyright (c) 2021 Jannis Weis -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# -# -# suppress inspection "UnusedProperty" for whole file -# -title = Configuración de Temas -color_default = Defecto -color_blue = Azul -color_lilac = Lila -color_rose = Rosa -color_red = Rojo -color_orange = Naranja -color_yellow = Amarillo -color_green = Verde -color_gray = Grafito -color_custom = Personalizado -color_purple = Lila -color_pink = Rosa - -label_theme = Tema: - -label_accent_color = Color de acento -label_selection_color = Color de selección - -label_font_size = Tamaño de fuente -label_font_smaller = Mas pequeño -label_font_default = Defecto -label_font_bigger = Mas grande - -check_system_preferences = Siga las preferencias del sistema -check_system_accent_color = Aplicar color de acento -check_system_selection_color = Aplicar color de selección -check_system_theme = Aplicar tema -check_system_font = Aplicar tamaño de fuente - -title_general = General -title_monitoring = Sistema - -dialog_ok = OK -dialog_cancel = Cancelar -dialog_apply = Aplicar diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_fr.properties b/core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_fr.properties deleted file mode 100644 index 24a868dc..00000000 --- a/core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_fr.properties +++ /dev/null @@ -1,62 +0,0 @@ -# -# MIT License -# -# Copyright (c) 2021 Jannis Weis -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# -# -# suppress inspection "UnusedProperty" for whole file -# -title = Réglage des Thèmes -color_default = Défaut -color_blue = Bleu -color_lilac = Lilas -color_rose = Rose -color_red = Rouge -color_orange = Orange -color_yellow = Jaune -color_green = Vert -color_gray = Graphite -color_custom = Personnalisé -color_purple = Lilas -color_pink = Rose - -label_theme = Thème - -label_accent_color = Couleur accentuée -label_selection_color = Couleur de sélection - -label_font_size = Taille de police -label_font_smaller = Plus petite -label_font_default = Défaut -label_font_bigger = Plus gros - -check_system_preferences = Suivez les préférences du système -check_system_accent_color = Appliquer une couleur d'accent -check_system_selection_color = Appliquer la couleur de sélection -check_system_theme = Appliquer le thème -check_system_font = Appliquer la taille de police - -title_general = Général -title_monitoring = Système - -dialog_ok = OK -dialog_cancel = Annuler -dialog_apply = Appliquer diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_ru.properties b/core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_ru.properties deleted file mode 100644 index 316dfcae..00000000 --- a/core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_ru.properties +++ /dev/null @@ -1,62 +0,0 @@ -# -# MIT License -# -# Copyright (c) 2021 Jannis Weis -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# -# -# suppress inspection "UnusedProperty" for whole file -# -title = Настройки Темы -color_default = По умолчанию -color_blue = Синий -color_lilac = Сирень -color_rose = Розовый -color_red = Красный -color_orange = Оранжевый -color_yellow = Жёлтый -color_green = Зелёный -color_gray = Графит -color_custom = Другой -color_purple = Сирень -color_pink = Розовый - -label_theme = Тема: - -label_accent_color = Цветовой акцент -label_selection_color = Цвет выделения - -label_font_size = Размер шрифта -label_font_smaller = Меньше -label_font_default = По умолчанию -label_font_bigger = Больше - -check_system_preferences = Использовать настройки операционной системы -check_system_accent_color = Применить акцент цвет -check_system_selection_color = Применить выделение цвета -check_system_theme = Применить тему -check_system_font = Применить размер шрифта - -title_general = Общее -title_monitoring = Система - -dialog_ok = ОК -dialog_cancel = Отмена -dialog_apply = Применить diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/font.properties b/core/src/main/resources/com/github/weisj/darklaf/font.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/font.properties rename to core/src/main/resources/com/github/weisj/darklaf/font.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/font_sizes.properties b/core/src/main/resources/com/github/weisj/darklaf/font_sizes.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/font_sizes.properties rename to core/src/main/resources/com/github/weisj/darklaf/font_sizes.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/globals.properties b/core/src/main/resources/com/github/weisj/darklaf/globals.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/globals.properties rename to core/src/main/resources/com/github/weisj/darklaf/globals.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/overwrites.properties b/core/src/main/resources/com/github/weisj/darklaf/overwrites.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/overwrites.properties rename to core/src/main/resources/com/github/weisj/darklaf/overwrites.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/platform/linux.properties b/core/src/main/resources/com/github/weisj/darklaf/platform/linux.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/platform/linux.properties rename to core/src/main/resources/com/github/weisj/darklaf/platform/linux.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/platform/mac.properties b/core/src/main/resources/com/github/weisj/darklaf/platform/mac.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/platform/mac.properties rename to core/src/main/resources/com/github/weisj/darklaf/platform/mac.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/platform/windows.properties b/core/src/main/resources/com/github/weisj/darklaf/platform/windows.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/platform/windows.properties rename to core/src/main/resources/com/github/weisj/darklaf/platform/windows.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/dark/info.md b/core/src/main/resources/com/github/weisj/darklaf/properties/icons/dark/info.md deleted file mode 100644 index aadc8916..00000000 --- a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/dark/info.md +++ /dev/null @@ -1 +0,0 @@ -Theme aware icons will looks from this sub directory for the dark version of the icon. diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/light/info.md b/core/src/main/resources/com/github/weisj/darklaf/properties/icons/light/info.md deleted file mode 100644 index 43ee49ed..00000000 --- a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/light/info.md +++ /dev/null @@ -1 +0,0 @@ -Theme aware icons will looks from this sub directory for the light version of the icon. diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf.properties b/core/src/main/resources/com/github/weisj/darklaf/task/darklaf.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/darklaf.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_ar.properties b/core/src/main/resources/com/github/weisj/darklaf/task/darklaf_ar.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_ar.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/darklaf_ar.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_da.properties b/core/src/main/resources/com/github/weisj/darklaf/task/darklaf_da.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_da.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/darklaf_da.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_de.properties b/core/src/main/resources/com/github/weisj/darklaf/task/darklaf_de.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_de.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/darklaf_de.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_en.properties b/core/src/main/resources/com/github/weisj/darklaf/task/darklaf_en.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_en.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/darklaf_en.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_en_GB.properties b/core/src/main/resources/com/github/weisj/darklaf/task/darklaf_en_GB.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_en_GB.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/darklaf_en_GB.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_en_US.properties b/core/src/main/resources/com/github/weisj/darklaf/task/darklaf_en_US.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_en_US.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/darklaf_en_US.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_es.properties b/core/src/main/resources/com/github/weisj/darklaf/task/darklaf_es.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_es.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/darklaf_es.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_fr.properties b/core/src/main/resources/com/github/weisj/darklaf/task/darklaf_fr.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_fr.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/darklaf_fr.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_it.properties b/core/src/main/resources/com/github/weisj/darklaf/task/darklaf_it.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_it.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/darklaf_it.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_ja.properties b/core/src/main/resources/com/github/weisj/darklaf/task/darklaf_ja.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_ja.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/darklaf_ja.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_nl.properties b/core/src/main/resources/com/github/weisj/darklaf/task/darklaf_nl.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_nl.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/darklaf_nl.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_no.properties b/core/src/main/resources/com/github/weisj/darklaf/task/darklaf_no.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_no.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/darklaf_no.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_pl.properties b/core/src/main/resources/com/github/weisj/darklaf/task/darklaf_pl.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_pl.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/darklaf_pl.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_ru.properties b/core/src/main/resources/com/github/weisj/darklaf/task/darklaf_ru.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_ru.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/darklaf_ru.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_sv.properties b/core/src/main/resources/com/github/weisj/darklaf/task/darklaf_sv.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_sv.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/darklaf_sv.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_zh.properties b/core/src/main/resources/com/github/weisj/darklaf/task/darklaf_zh.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/darklaf_zh.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/darklaf_zh.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame.properties b/core/src/main/resources/com/github/weisj/darklaf/task/tabFrame.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/tabFrame.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_ar.properties b/core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_ar.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_ar.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_ar.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_da.properties b/core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_da.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_da.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_da.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_de.properties b/core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_de.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_de.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_de.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_en.properties b/core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_en.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_en.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_en.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_en_GB.properties b/core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_en_GB.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_en_GB.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_en_GB.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_en_US.properties b/core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_en_US.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_en_US.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_en_US.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_es.properties b/core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_es.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_es.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_es.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_fr.properties b/core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_fr.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_fr.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_fr.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_it.properties b/core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_it.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_it.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_it.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_ja.properties b/core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_ja.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_ja.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_ja.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_nl.properties b/core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_nl.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_nl.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_nl.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_no.properties b/core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_no.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_no.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_no.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_pl.properties b/core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_pl.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_pl.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_pl.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_ru.properties b/core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_ru.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_ru.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_ru.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_sv.properties b/core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_sv.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_sv.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_sv.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_zh.properties b/core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_zh.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/bundles/tabFrame_zh.properties rename to core/src/main/resources/com/github/weisj/darklaf/task/tabFrame_zh.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/task/theme_settings.properties b/core/src/main/resources/com/github/weisj/darklaf/task/theme_settings.properties new file mode 100644 index 00000000..31501563 --- /dev/null +++ b/core/src/main/resources/com/github/weisj/darklaf/task/theme_settings.properties @@ -0,0 +1,62 @@ +# +# MIT License +# +# Copyright (c) 2021 Jannis Weis +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# +# +# suppress inspection "UnusedProperty" for whole file +# +settings.title = Theme Settings +settings.color_default = Default +settings.color_blue = Blue +settings.color_lilac = Lilac +settings.color_rose = Rose +settings.color_red = Red +settings.color_orange = Orange +settings.color_yellow = Yellow +settings.color_green = Green +settings.color_gray = Graphite +settings.color_custom = Custom +settings.color_purple = Purple +settings.color_pink = Pink + +settings.label_theme = Theme + +settings.label_accent_color = Accent Color +settings.label_selection_color = Selection Color + +settings.label_font_size = Font size +settings.label_font_smaller = Smaller +settings.label_font_default = Default +settings.label_font_bigger = Bigger + +settings.check_system_preferences = Follow system preferences +settings.check_system_accent_color = Apply accent color +settings.check_system_selection_color = Apply selection color +settings.check_system_theme = Apply theme +settings.check_system_font = Apply font size + +settings.title_general = General +settings.title_monitoring = System + +settings.dialog_ok = OK +settings.dialog_cancel = Cancel +settings.dialog_apply = Apply diff --git a/core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_de.properties b/core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_de.properties new file mode 100644 index 00000000..58548284 --- /dev/null +++ b/core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_de.properties @@ -0,0 +1,62 @@ +# +# MIT License +# +# Copyright (c) 2021 Jannis Weis +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# +# +# suppress inspection "UnusedProperty" for whole file +# +settings.title = Thema Einstellungen +settings.color_default = Standard +settings.color_blue = Blau +settings.color_lilac = Lila +settings.color_rose = Rosa +settings.color_red = Rot +settings.color_orange = Orange +settings.color_yellow = Gelb +settings.color_green = Grün +settings.color_gray = Graphit +settings.color_custom = Benutzerdefiniert +settings.color_purple = Lila +settings.color_pink = Pink + +settings.label_theme = Farbschema + +settings.label_accent_color = Akzentfarbe +settings.label_selection_color = Auswahlfarbe + +settings.label_font_size = Schriftgröße +settings.label_font_smaller = Kleiner +settings.label_font_default = Standard +settings.label_font_bigger = Größer + +settings.check_system_preferences = Systemeinstellungen folgen +settings.check_system_accent_color = Akzentfarbe anwenden +settings.check_system_selection_color = Auswahlfarbe anwenden +settings.check_system_theme = Thema anwenden +settings.check_system_font = Schriftgröße anwenden + +settings.title_general = Allgemein +settings.title_monitoring = System + +settings.dialog_ok = OK +settings.dialog_cancel = Abbrechen +settings.dialog_apply = Übernehmen diff --git a/core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_en_GB.properties b/core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_en_GB.properties new file mode 100644 index 00000000..abb131cd --- /dev/null +++ b/core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_en_GB.properties @@ -0,0 +1,62 @@ +# +# MIT License +# +# Copyright (c) 2021 Jannis Weis +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# +# +# suppress inspection "UnusedProperty" for whole file +# +settings.title = Theme Settings +settings.color_default = Default +settings.color_blue = Blue +settings.color_lilac = Lilac +settings.color_rose = Rose +settings.color_red = Red +settings.color_orange = Orange +settings.color_yellow = Yellow +settings.color_green = Green +settings.color_gray = Graphite +settings.color_custom = Custom +settings.color_purple = Purple +settings.color_pink = Pink + +settings.label_theme = Theme + +settings.label_accent_color = Accent Colour +settings.label_selection_color = Selection Colour + +settings.label_font_size = Font size +settings.label_font_smaller = Smaller +settings.label_font_default = Default +settings.label_font_bigger = Bigger + +settings.check_system_preferences = Follow system preferences +settings.check_system_accent_color = Apply accent colour +settings.check_system_selection_color = Apply selection colour +settings.check_system_theme = Apply theme +settings.check_system_font = Apply font size + +settings.title_general = General +settings.title_monitoring = System + +settings.dialog_ok = OK +settings.dialog_cancel = Cancel +settings.dialog_apply = Apply diff --git a/core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_en_US.properties b/core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_en_US.properties new file mode 100644 index 00000000..31501563 --- /dev/null +++ b/core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_en_US.properties @@ -0,0 +1,62 @@ +# +# MIT License +# +# Copyright (c) 2021 Jannis Weis +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# +# +# suppress inspection "UnusedProperty" for whole file +# +settings.title = Theme Settings +settings.color_default = Default +settings.color_blue = Blue +settings.color_lilac = Lilac +settings.color_rose = Rose +settings.color_red = Red +settings.color_orange = Orange +settings.color_yellow = Yellow +settings.color_green = Green +settings.color_gray = Graphite +settings.color_custom = Custom +settings.color_purple = Purple +settings.color_pink = Pink + +settings.label_theme = Theme + +settings.label_accent_color = Accent Color +settings.label_selection_color = Selection Color + +settings.label_font_size = Font size +settings.label_font_smaller = Smaller +settings.label_font_default = Default +settings.label_font_bigger = Bigger + +settings.check_system_preferences = Follow system preferences +settings.check_system_accent_color = Apply accent color +settings.check_system_selection_color = Apply selection color +settings.check_system_theme = Apply theme +settings.check_system_font = Apply font size + +settings.title_general = General +settings.title_monitoring = System + +settings.dialog_ok = OK +settings.dialog_cancel = Cancel +settings.dialog_apply = Apply diff --git a/core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_es.properties b/core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_es.properties new file mode 100644 index 00000000..7dc42ffd --- /dev/null +++ b/core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_es.properties @@ -0,0 +1,62 @@ +# +# MIT License +# +# Copyright (c) 2021 Jannis Weis +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# +# +# suppress inspection "UnusedProperty" for whole file +# +settings.title = Configuración de Temas +settings.color_default = Defecto +settings.color_blue = Azul +settings.color_lilac = Lila +settings.color_rose = Rosa +settings.color_red = Rojo +settings.color_orange = Naranja +settings.color_yellow = Amarillo +settings.color_green = Verde +settings.color_gray = Grafito +settings.color_custom = Personalizado +settings.color_purple = Lila +settings.color_pink = Rosa + +settings.label_theme = Tema: + +settings.label_accent_color = Color de acento +settings.label_selection_color = Color de selección + +settings.label_font_size = Tamaño de fuente +settings.label_font_smaller = Mas pequeño +settings.label_font_default = Defecto +settings.label_font_bigger = Mas grande + +settings.check_system_preferences = Siga las preferencias del sistema +settings.check_system_accent_color = Aplicar color de acento +settings.check_system_selection_color = Aplicar color de selección +settings.check_system_theme = Aplicar tema +settings.check_system_font = Aplicar tamaño de fuente + +settings.title_general = General +settings.title_monitoring = Sistema + +settings.dialog_ok = OK +settings.dialog_cancel = Cancelar +settings.dialog_apply = Aplicar diff --git a/core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_fr.properties b/core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_fr.properties new file mode 100644 index 00000000..6b7fe963 --- /dev/null +++ b/core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_fr.properties @@ -0,0 +1,62 @@ +# +# MIT License +# +# Copyright (c) 2021 Jannis Weis +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# +# +# suppress inspection "UnusedProperty" for whole file +# +settings.title = Réglage des Thèmes +settings.color_default = Défaut +settings.color_blue = Bleu +settings.color_lilac = Lilas +settings.color_rose = Rose +settings.color_red = Rouge +settings.color_orange = Orange +settings.color_yellow = Jaune +settings.color_green = Vert +settings.color_gray = Graphite +settings.color_custom = Personnalisé +settings.color_purple = Lilas +settings.color_pink = Rose + +settings.label_theme = Thème + +settings.label_accent_color = Couleur accentuée +settings.label_selection_color = Couleur de sélection + +settings.label_font_size = Taille de police +settings.label_font_smaller = Plus petite +settings.label_font_default = Défaut +settings.label_font_bigger = Plus gros + +settings.check_system_preferences = Suivez les préférences du système +settings.check_system_accent_color = Appliquer une couleur d'accent +settings.check_system_selection_color = Appliquer la couleur de sélection +settings.check_system_theme = Appliquer le thème +settings.check_system_font = Appliquer la taille de police + +settings.title_general = Général +settings.title_monitoring = Système + +settings.dialog_ok = OK +settings.dialog_cancel = Annuler +settings.dialog_apply = Appliquer diff --git a/core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_ru.properties b/core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_ru.properties new file mode 100644 index 00000000..713b94e1 --- /dev/null +++ b/core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_ru.properties @@ -0,0 +1,62 @@ +# +# MIT License +# +# Copyright (c) 2021 Jannis Weis +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# +# +# suppress inspection "UnusedProperty" for whole file +# +settings.title = Настройки Темы +settings.color_default = По умолчанию +settings.color_blue = Синий +settings.color_lilac = Сирень +settings.color_rose = Розовый +settings.color_red = Красный +settings.color_orange = Оранжевый +settings.color_yellow = Жёлтый +settings.color_green = Зелёный +settings.color_gray = Графит +settings.color_custom = Другой +settings.color_purple = Сирень +settings.color_pink = Розовый + +settings.label_theme = Тема: + +settings.label_accent_color = Цветовой акцент +settings.label_selection_color = Цвет выделения + +settings.label_font_size = Размер шрифта +settings.label_font_smaller = Меньше +settings.label_font_default = По умолчанию +settings.label_font_bigger = Больше + +settings.check_system_preferences = Использовать настройки операционной системы +settings.check_system_accent_color = Применить акцент цвет +settings.check_system_selection_color = Применить выделение цвета +settings.check_system_theme = Применить тему +settings.check_system_font = Применить размер шрифта + +settings.title_general = Общее +settings.title_monitoring = Система + +settings.dialog_ok = ОК +settings.dialog_cancel = Отмена +settings.dialog_apply = Применить diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/borders.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/borders.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/borders.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/borders.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/button.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/button.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/button.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/button.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/cell.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/cell.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/cell.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/cell.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/checkBox.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/checkBox.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/checkBox.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/checkBox.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/colorChooser.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/colorChooser.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/colorChooser.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/colorChooser.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/comboBox.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/comboBox.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/comboBox.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/comboBox.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/fileChooser.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/fileChooser.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/fileChooser.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/fileChooser.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/internalFrame.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/internalFrame.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/internalFrame.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/internalFrame.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/label.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/label.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/label.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/label.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/list.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/list.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/list.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/list.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/menu.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/menu.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/menu.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/menu.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/menuBar.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/menuBar.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/menuBar.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/menuBar.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/menuItem.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/menuItem.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/menuItem.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/menuItem.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/misc.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/misc.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/misc.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/misc.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/numberingPane.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/numberingPane.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/numberingPane.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/numberingPane.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/optionPane.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/optionPane.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/optionPane.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/optionPane.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/panel.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/panel.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/panel.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/panel.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/popupMenu.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/popupMenu.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/popupMenu.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/popupMenu.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/progressBar.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/progressBar.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/progressBar.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/progressBar.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/radioButton.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/radioButton.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/radioButton.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/radioButton.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/rootPane.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/rootPane.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/rootPane.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/rootPane.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/scrollBar.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/scrollBar.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/scrollBar.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/scrollBar.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/scrollPane.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/scrollPane.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/scrollPane.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/scrollPane.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/separator.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/separator.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/separator.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/separator.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/slider.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/slider.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/slider.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/slider.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/spinner.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/spinner.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/spinner.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/spinner.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/splitPane.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/splitPane.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/splitPane.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/splitPane.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/statusBar.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/statusBar.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/statusBar.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/statusBar.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/tabFrame.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/tabFrame.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/tabFrame.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/tabFrame.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/tabbedPane.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/tabbedPane.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/tabbedPane.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/tabbedPane.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/table.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/table.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/table.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/table.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/taskPane.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/taskPane.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/taskPane.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/taskPane.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/text.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/text.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/text.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/text.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/toggleButton.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/toggleButton.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/toggleButton.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/toggleButton.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/toolBar.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/toolBar.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/toolBar.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/toolBar.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/toolTip.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/toolTip.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/toolTip.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/toolTip.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/tree.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/tree.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/tree.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/tree.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/tristate.properties b/core/src/main/resources/com/github/weisj/darklaf/ui/tristate.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/ui/tristate.properties rename to core/src/main/resources/com/github/weisj/darklaf/ui/tristate.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/unused.properties b/core/src/main/resources/com/github/weisj/darklaf/unused.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/unused.properties rename to core/src/main/resources/com/github/weisj/darklaf/unused.properties diff --git a/core/src/test/java/com/github/weisj/darklaf/documentation/CreateUITable.java b/core/src/test/java/com/github/weisj/darklaf/core/documentation/CreateUITable.java similarity index 99% rename from core/src/test/java/com/github/weisj/darklaf/documentation/CreateUITable.java rename to core/src/test/java/com/github/weisj/darklaf/core/documentation/CreateUITable.java index 177630a5..245b720e 100644 --- a/core/src/test/java/com/github/weisj/darklaf/documentation/CreateUITable.java +++ b/core/src/test/java/com/github/weisj/darklaf/core/documentation/CreateUITable.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package com.github.weisj.darklaf.documentation; +package com.github.weisj.darklaf.core.documentation; import java.awt.*; import java.awt.image.BufferedImage; diff --git a/core/src/test/java/com/github/weisj/darklaf/misc/GenerateColors.java b/core/src/test/java/com/github/weisj/darklaf/core/misc/GenerateColors.java similarity index 98% rename from core/src/test/java/com/github/weisj/darklaf/misc/GenerateColors.java rename to core/src/test/java/com/github/weisj/darklaf/core/misc/GenerateColors.java index bd3017a6..cefdea07 100644 --- a/core/src/test/java/com/github/weisj/darklaf/misc/GenerateColors.java +++ b/core/src/test/java/com/github/weisj/darklaf/core/misc/GenerateColors.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package com.github.weisj.darklaf.misc; +package com.github.weisj.darklaf.core.misc; import java.awt.*; import java.util.logging.Logger; diff --git a/core/src/test/java/com/github/weisj/darklaf/AbstractImageTest.java b/core/src/test/java/com/github/weisj/darklaf/core/test/AbstractImageTest.java similarity index 94% rename from core/src/test/java/com/github/weisj/darklaf/AbstractImageTest.java rename to core/src/test/java/com/github/weisj/darklaf/core/test/AbstractImageTest.java index 44699035..a407112c 100644 --- a/core/src/test/java/com/github/weisj/darklaf/AbstractImageTest.java +++ b/core/src/test/java/com/github/weisj/darklaf/core/test/AbstractImageTest.java @@ -19,9 +19,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package com.github.weisj.darklaf; +package com.github.weisj.darklaf.core.test; -import java.awt.*; +import java.awt.AWTException; +import java.awt.Component; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.Robot; +import java.awt.Window; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; diff --git a/core/src/test/java/com/github/weisj/darklaf/CustomTitleBarTest.java b/core/src/test/java/com/github/weisj/darklaf/core/test/CustomTitleBarTest.java similarity index 94% rename from core/src/test/java/com/github/weisj/darklaf/CustomTitleBarTest.java rename to core/src/test/java/com/github/weisj/darklaf/core/test/CustomTitleBarTest.java index 313920ce..dd5d939e 100644 --- a/core/src/test/java/com/github/weisj/darklaf/CustomTitleBarTest.java +++ b/core/src/test/java/com/github/weisj/darklaf/core/test/CustomTitleBarTest.java @@ -19,21 +19,35 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package com.github.weisj.darklaf; - -import java.awt.*; +package com.github.weisj.darklaf.core.test; + +import java.awt.AWTException; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.GridBagLayout; +import java.awt.Rectangle; +import java.awt.Robot; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.awt.image.BufferedImage; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; -import javax.swing.*; - -import org.junit.jupiter.api.*; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JRootPane; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledOnOs; import org.junit.jupiter.api.condition.OS; +import com.github.weisj.darklaf.LafManager; import com.github.weisj.darklaf.theme.DarculaTheme; import com.github.weisj.darklaf.theme.IntelliJTheme; import com.github.weisj.darklaf.ui.rootpane.DarkRootPaneUI; diff --git a/core/src/test/java/com/github/weisj/darklaf/DelicateDemo.java b/core/src/test/java/com/github/weisj/darklaf/core/test/DelicateDemo.java similarity index 97% rename from core/src/test/java/com/github/weisj/darklaf/DelicateDemo.java rename to core/src/test/java/com/github/weisj/darklaf/core/test/DelicateDemo.java index f55b5fbb..5c0bf4bc 100644 --- a/core/src/test/java/com/github/weisj/darklaf/DelicateDemo.java +++ b/core/src/test/java/com/github/weisj/darklaf/core/test/DelicateDemo.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package com.github.weisj.darklaf; +package com.github.weisj.darklaf.core.test; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/test/java/com/github/weisj/darklaf/DemoTest.java b/core/src/test/java/com/github/weisj/darklaf/core/test/DemoTest.java similarity index 79% rename from core/src/test/java/com/github/weisj/darklaf/DemoTest.java rename to core/src/test/java/com/github/weisj/darklaf/core/test/DemoTest.java index a2ac240a..c804c63c 100644 --- a/core/src/test/java/com/github/weisj/darklaf/DemoTest.java +++ b/core/src/test/java/com/github/weisj/darklaf/core/test/DemoTest.java @@ -19,9 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package com.github.weisj.darklaf; +package com.github.weisj.darklaf.core.test; +import java.awt.Robot; import java.awt.Window; import java.util.List; import java.util.concurrent.atomic.AtomicReference; @@ -31,8 +32,10 @@ import java.util.logging.Logger; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import com.github.weisj.darklaf.LafManager; import com.github.weisj.darklaf.theme.Theme; import com.github.weisj.darklaf.ui.DemoLauncher; +import com.github.weisj.darklaf.util.Lambdas; import com.github.weisj.darklaf.util.LogUtil; class DemoTest implements NonThreadSafeTest { @@ -41,15 +44,17 @@ class DemoTest implements NonThreadSafeTest { @Test void runningDemosDoesNotThrow() { + @SuppressWarnings("Convert2MethodRef") + Robot robot = Lambdas.orDefault(() -> new Robot(), null).get(); LafManager.setLogLevel(Level.WARNING); for (Theme theme : LafManager.getRegisteredThemes()) { LOGGER.warning("Testing " + theme.getDisplayName()); - runDemos(theme); + runDemos(theme, robot); if (!Boolean.getBoolean("runAllThemes")) break; } } - private void runDemos(final Theme theme) { + private void runDemos(final Theme theme, final Robot robot) { List demos = new DemoLauncher().getDemoClasses(); int count = demos.size(); int index = 0; @@ -61,6 +66,15 @@ class DemoTest implements NonThreadSafeTest { continue; } AtomicReference windowRef = demo.start(Level.WARNING); + if (robot != null) robot.waitForIdle(); + try { + synchronized (windowRef) { + while (windowRef.get() == null) { + windowRef.wait(); + } + } + } catch (InterruptedException ignored) { + } TestUtils.runOnSwingThreadNotThrowing(() -> { Assertions.assertNotNull(windowRef.get()); TestUtils.closeWindow(windowRef.get()); diff --git a/core/src/test/java/com/github/weisj/darklaf/FontTest.java b/core/src/test/java/com/github/weisj/darklaf/core/test/FontTest.java similarity index 96% rename from core/src/test/java/com/github/weisj/darklaf/FontTest.java rename to core/src/test/java/com/github/weisj/darklaf/core/test/FontTest.java index de268104..6fb24dd6 100644 --- a/core/src/test/java/com/github/weisj/darklaf/FontTest.java +++ b/core/src/test/java/com/github/weisj/darklaf/core/test/FontTest.java @@ -19,9 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package com.github.weisj.darklaf; +package com.github.weisj.darklaf.core.test; -import java.awt.*; +import java.awt.Font; +import java.awt.RenderingHints; import java.awt.font.TextAttribute; import java.text.AttributedCharacterIterator; import java.util.ArrayList; @@ -29,7 +30,9 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import javax.swing.*; +import javax.swing.JComponent; +import javax.swing.JTextArea; +import javax.swing.UIManager; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/core/src/test/java/com/github/weisj/darklaf/MemoryTest.java b/core/src/test/java/com/github/weisj/darklaf/core/test/MemoryTest.java similarity index 98% rename from core/src/test/java/com/github/weisj/darklaf/MemoryTest.java rename to core/src/test/java/com/github/weisj/darklaf/core/test/MemoryTest.java index 8ca62a43..53f9211c 100644 --- a/core/src/test/java/com/github/weisj/darklaf/MemoryTest.java +++ b/core/src/test/java/com/github/weisj/darklaf/core/test/MemoryTest.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package com.github.weisj.darklaf; +package com.github.weisj.darklaf.core.test; import java.awt.FlowLayout; import java.awt.KeyboardFocusManager; @@ -44,6 +44,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; +import com.github.weisj.darklaf.LafManager; import com.github.weisj.darklaf.components.DynamicUI; import com.github.weisj.darklaf.listener.UIUpdater; diff --git a/core/src/test/java/com/github/weisj/darklaf/NativeLibraryTest.java b/core/src/test/java/com/github/weisj/darklaf/core/test/NativeLibraryTest.java similarity index 98% rename from core/src/test/java/com/github/weisj/darklaf/NativeLibraryTest.java rename to core/src/test/java/com/github/weisj/darklaf/core/test/NativeLibraryTest.java index a775e048..477fd422 100644 --- a/core/src/test/java/com/github/weisj/darklaf/NativeLibraryTest.java +++ b/core/src/test/java/com/github/weisj/darklaf/core/test/NativeLibraryTest.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package com.github.weisj.darklaf; +package com.github.weisj.darklaf.core.test; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/github/weisj/darklaf/NonThreadSafeTest.java b/core/src/test/java/com/github/weisj/darklaf/core/test/NonThreadSafeTest.java similarity index 96% rename from core/src/test/java/com/github/weisj/darklaf/NonThreadSafeTest.java rename to core/src/test/java/com/github/weisj/darklaf/core/test/NonThreadSafeTest.java index 407e3f12..b6c97639 100644 --- a/core/src/test/java/com/github/weisj/darklaf/NonThreadSafeTest.java +++ b/core/src/test/java/com/github/weisj/darklaf/core/test/NonThreadSafeTest.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package com.github.weisj.darklaf; +package com.github.weisj.darklaf.core.test; import org.junit.jupiter.api.parallel.ResourceLock; diff --git a/core/src/test/java/com/github/weisj/darklaf/PointerUtilTest.java b/core/src/test/java/com/github/weisj/darklaf/core/test/PointerUtilTest.java similarity index 98% rename from core/src/test/java/com/github/weisj/darklaf/PointerUtilTest.java rename to core/src/test/java/com/github/weisj/darklaf/core/test/PointerUtilTest.java index 8a72c4ff..742b7610 100644 --- a/core/src/test/java/com/github/weisj/darklaf/PointerUtilTest.java +++ b/core/src/test/java/com/github/weisj/darklaf/core/test/PointerUtilTest.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package com.github.weisj.darklaf; +package com.github.weisj.darklaf.core.test; import java.awt.Window; import java.lang.reflect.InvocationTargetException; diff --git a/core/src/test/java/com/github/weisj/darklaf/TestUtils.java b/core/src/test/java/com/github/weisj/darklaf/core/test/TestUtils.java similarity index 96% rename from core/src/test/java/com/github/weisj/darklaf/TestUtils.java rename to core/src/test/java/com/github/weisj/darklaf/core/test/TestUtils.java index 2710716b..f3966917 100644 --- a/core/src/test/java/com/github/weisj/darklaf/TestUtils.java +++ b/core/src/test/java/com/github/weisj/darklaf/core/test/TestUtils.java @@ -19,17 +19,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package com.github.weisj.darklaf; +package com.github.weisj.darklaf.core.test; import java.awt.Window; import java.awt.event.WindowEvent; import java.lang.reflect.InvocationTargetException; import java.util.concurrent.atomic.AtomicReference; -import javax.swing.*; +import javax.swing.SwingUtilities; import org.junit.jupiter.api.Assertions; +import com.github.weisj.darklaf.LafManager; import com.github.weisj.darklaf.theme.IntelliJTheme; import com.github.weisj.darklaf.theme.Theme; diff --git a/core/src/test/java/com/github/weisj/darklaf/TooltipTest.java b/core/src/test/java/com/github/weisj/darklaf/core/test/TooltipTest.java similarity index 93% rename from core/src/test/java/com/github/weisj/darklaf/TooltipTest.java rename to core/src/test/java/com/github/weisj/darklaf/core/test/TooltipTest.java index ba8a8ee5..f7e192eb 100644 --- a/core/src/test/java/com/github/weisj/darklaf/TooltipTest.java +++ b/core/src/test/java/com/github/weisj/darklaf/core/test/TooltipTest.java @@ -19,13 +19,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package com.github.weisj.darklaf; +package com.github.weisj.darklaf.core.test; -import java.awt.*; +import java.awt.Color; +import java.awt.Component; +import java.awt.GraphicsEnvironment; +import java.awt.Window; import java.awt.image.BufferedImage; import java.util.logging.Logger; -import javax.swing.*; +import javax.swing.JRootPane; +import javax.swing.JToolTip; +import javax.swing.Popup; +import javax.swing.PopupFactory; +import javax.swing.SwingUtilities; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/core/src/test/java/com/github/weisj/darklaf/util/ClassFinder.java b/core/src/test/java/com/github/weisj/darklaf/core/test/util/ClassFinder.java similarity index 95% rename from core/src/test/java/com/github/weisj/darklaf/util/ClassFinder.java rename to core/src/test/java/com/github/weisj/darklaf/core/test/util/ClassFinder.java index 78e33d93..89a125ba 100644 --- a/core/src/test/java/com/github/weisj/darklaf/util/ClassFinder.java +++ b/core/src/test/java/com/github/weisj/darklaf/core/test/util/ClassFinder.java @@ -19,13 +19,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package com.github.weisj.darklaf.util; +package com.github.weisj.darklaf.core.test.util; import java.lang.reflect.Modifier; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; +import com.github.weisj.darklaf.util.Lambdas; + public final class ClassFinder { public static List> getInstancesOfType(final Class type, final String... packages) { diff --git a/core/src/test/java/com/github/weisj/darklaf/util/Instantiable.java b/core/src/test/java/com/github/weisj/darklaf/core/test/util/Instantiable.java similarity index 91% rename from core/src/test/java/com/github/weisj/darklaf/util/Instantiable.java rename to core/src/test/java/com/github/weisj/darklaf/core/test/util/Instantiable.java index b78c1243..4ad34d52 100644 --- a/core/src/test/java/com/github/weisj/darklaf/util/Instantiable.java +++ b/core/src/test/java/com/github/weisj/darklaf/core/test/util/Instantiable.java @@ -19,7 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package com.github.weisj.darklaf.util; +package com.github.weisj.darklaf.core.test.util; + +import com.github.weisj.darklaf.util.Lambdas; +import com.github.weisj.darklaf.util.LazyValue; public class Instantiable { diff --git a/core/src/test/java/com/github/weisj/darklaf/util/ResourceWalker.java b/core/src/test/java/com/github/weisj/darklaf/core/test/util/ResourceWalker.java similarity index 85% rename from core/src/test/java/com/github/weisj/darklaf/util/ResourceWalker.java rename to core/src/test/java/com/github/weisj/darklaf/core/test/util/ResourceWalker.java index 349b179f..9fe5b0ad 100644 --- a/core/src/test/java/com/github/weisj/darklaf/util/ResourceWalker.java +++ b/core/src/test/java/com/github/weisj/darklaf/core/test/util/ResourceWalker.java @@ -19,18 +19,26 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package com.github.weisj.darklaf.util; +package com.github.weisj.darklaf.core.test.util; import java.io.File; import java.io.IOException; import java.net.URL; import java.nio.file.FileSystem; +import java.nio.file.FileSystemNotFoundException; import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.Path; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Objects; import java.util.stream.Stream; +import com.github.weisj.darklaf.util.Lambdas; +import com.github.weisj.darklaf.util.StreamUtil; + public class ResourceWalker implements AutoCloseable { private final List fileSystemList = new ArrayList<>(); @@ -75,7 +83,12 @@ public class ResourceWalker implements AutoCloseable { return stream.map(Lambdas.wrap(URL::toURI)).flatMap(uri -> { if ("jar".equals(uri.getScheme())) { try { - FileSystem fileSystem = FileSystems.newFileSystem(uri, Collections.emptyMap()); + FileSystem fileSystem; + try { + fileSystem = FileSystems.getFileSystem(uri); + } catch (FileSystemNotFoundException e) { + fileSystem = FileSystems.newFileSystem(uri, Collections.emptyMap()); + } Path resourcePath = fileSystem.getPath(pathName); fileSystemList.add(fileSystem); return Files.walk(resourcePath, Integer.MAX_VALUE); diff --git a/core/src/test/java/com/github/weisj/darklaf/theme/ColorPaletteDemo.java b/core/src/test/java/com/github/weisj/darklaf/core/theme/ColorPaletteDemo.java similarity index 95% rename from core/src/test/java/com/github/weisj/darklaf/theme/ColorPaletteDemo.java rename to core/src/test/java/com/github/weisj/darklaf/core/theme/ColorPaletteDemo.java index 58ed4dd4..fe344873 100644 --- a/core/src/test/java/com/github/weisj/darklaf/theme/ColorPaletteDemo.java +++ b/core/src/test/java/com/github/weisj/darklaf/core/theme/ColorPaletteDemo.java @@ -19,9 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package com.github.weisj.darklaf.theme; +package com.github.weisj.darklaf.core.theme; -import javax.swing.*; +import javax.swing.Box; +import javax.swing.JComponent; +import javax.swing.JLabel; import com.github.weisj.darklaf.graphics.ThemedColor; import com.github.weisj.darklaf.layout.LayoutHelper; diff --git a/core/src/test/java/com/github/weisj/darklaf/theme/MapTableModel.java b/core/src/test/java/com/github/weisj/darklaf/core/theme/MapTableModel.java similarity index 98% rename from core/src/test/java/com/github/weisj/darklaf/theme/MapTableModel.java rename to core/src/test/java/com/github/weisj/darklaf/core/theme/MapTableModel.java index bd52bc85..c59bd5eb 100644 --- a/core/src/test/java/com/github/weisj/darklaf/theme/MapTableModel.java +++ b/core/src/test/java/com/github/weisj/darklaf/core/theme/MapTableModel.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package com.github.weisj.darklaf.theme; +package com.github.weisj.darklaf.core.theme; import java.util.LinkedHashMap; import java.util.Map; diff --git a/core/src/test/java/com/github/weisj/darklaf/theme/MyCustomTheme.java b/core/src/test/java/com/github/weisj/darklaf/core/theme/MyCustomTheme.java similarity index 77% rename from core/src/test/java/com/github/weisj/darklaf/theme/MyCustomTheme.java rename to core/src/test/java/com/github/weisj/darklaf/core/theme/MyCustomTheme.java index 8c88a185..0e903b7a 100644 --- a/core/src/test/java/com/github/weisj/darklaf/theme/MyCustomTheme.java +++ b/core/src/test/java/com/github/weisj/darklaf/core/theme/MyCustomTheme.java @@ -19,12 +19,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package com.github.weisj.darklaf.theme; +package com.github.weisj.darklaf.core.theme; import java.util.Properties; -import javax.swing.*; +import javax.swing.UIDefaults; +import com.github.weisj.darklaf.properties.icons.IconLoader; +import com.github.weisj.darklaf.theme.Theme; import com.github.weisj.darklaf.theme.info.ColorToneRule; import com.github.weisj.darklaf.theme.info.PresetIconRule; import com.github.weisj.darklaf.util.SystemInfo; @@ -32,38 +34,40 @@ import com.github.weisj.darklaf.util.SystemInfo; public class MyCustomTheme extends Theme { @Override - public void customizeGlobals(final Properties properties, final UIDefaults currentDefaults) { - super.customizeGlobals(properties, currentDefaults); + public void customizeGlobals(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { + super.customizeGlobals(properties, currentDefaults, iconLoader); /* * Properties in the globals file should have a 'globals.' to be applied globally. */ - loadCustomProperties("globals", properties, currentDefaults); + loadCustomProperties("globals", properties, currentDefaults, iconLoader); } @Override - public void customizePlatformProperties(final Properties properties, final UIDefaults currentDefaults) { - super.customizePlatformProperties(properties, currentDefaults); + public void customizePlatformProperties(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { + super.customizePlatformProperties(properties, currentDefaults, iconLoader); /* * Loading this file (and having it present) is optional. */ final String osSuffix = SystemInfo.isMac ? "mac" : SystemInfo.isWindows ? "windows" : "linux"; - loadCustomProperties(osSuffix, properties, currentDefaults); + loadCustomProperties(osSuffix, properties, currentDefaults, iconLoader); } @Override - public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults) { - super.customizeUIProperties(properties, currentDefaults); + public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { + super.customizeUIProperties(properties, currentDefaults, iconLoader); /* * Loading this file (and having it present) is optional. */ - loadCustomProperties("ui", properties, currentDefaults); + loadCustomProperties("ui", properties, currentDefaults, iconLoader); } @Override protected PresetIconRule getPresetIconRule() { /* - * Use a custom com.github.weisj.icon com.github.weisj.theme. Colors are defined in - * my_custom_theme_icons.properties. + * Use a custom icon com.github.weisj.theme. Colors are defined in my_custom_theme_icons.properties. */ return PresetIconRule.NONE; } diff --git a/core/src/test/java/com/github/weisj/darklaf/theme/RecordingProperties.java b/core/src/test/java/com/github/weisj/darklaf/core/theme/RecordingProperties.java similarity index 94% rename from core/src/test/java/com/github/weisj/darklaf/theme/RecordingProperties.java rename to core/src/test/java/com/github/weisj/darklaf/core/theme/RecordingProperties.java index a0407aaf..297412f9 100644 --- a/core/src/test/java/com/github/weisj/darklaf/theme/RecordingProperties.java +++ b/core/src/test/java/com/github/weisj/darklaf/core/theme/RecordingProperties.java @@ -19,9 +19,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package com.github.weisj.darklaf.theme; +package com.github.weisj.darklaf.core.theme; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; +import java.util.Set; public class RecordingProperties extends Properties { diff --git a/core/src/test/java/com/github/weisj/darklaf/theme/ThemeEditor.java b/core/src/test/java/com/github/weisj/darklaf/core/theme/ThemeEditor.java similarity index 92% rename from core/src/test/java/com/github/weisj/darklaf/theme/ThemeEditor.java rename to core/src/test/java/com/github/weisj/darklaf/core/theme/ThemeEditor.java index f6b36de6..cc9d1e66 100644 --- a/core/src/test/java/com/github/weisj/darklaf/theme/ThemeEditor.java +++ b/core/src/test/java/com/github/weisj/darklaf/core/theme/ThemeEditor.java @@ -19,9 +19,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package com.github.weisj.darklaf.theme; +package com.github.weisj.darklaf.core.theme; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Font; +import java.awt.Insets; import java.util.LinkedHashMap; import java.util.Map; import java.util.Properties; @@ -29,7 +32,23 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; -import javax.swing.*; +import javax.swing.BorderFactory; +import javax.swing.Box; +import javax.swing.Icon; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JMenuItem; +import javax.swing.JPanel; +import javax.swing.JPopupMenu; +import javax.swing.JTabbedPane; +import javax.swing.JTable; +import javax.swing.JToggleButton; +import javax.swing.ListSelectionModel; +import javax.swing.SwingUtilities; +import javax.swing.UIDefaults; import javax.swing.table.DefaultTableModel; import com.github.weisj.darklaf.DarkLaf; @@ -47,6 +66,8 @@ import com.github.weisj.darklaf.properties.icons.IconLoader; import com.github.weisj.darklaf.properties.icons.OverlayIcon; import com.github.weisj.darklaf.properties.icons.TextIcon; import com.github.weisj.darklaf.properties.uiresource.DarkColorUIResource; +import com.github.weisj.darklaf.theme.Theme; +import com.github.weisj.darklaf.theme.ThemeDelegate; import com.github.weisj.darklaf.theme.info.AccentColorRule; import com.github.weisj.darklaf.theme.info.ColorToneRule; import com.github.weisj.darklaf.theme.info.ContrastRule; @@ -148,30 +169,35 @@ public class ThemeEditor extends JPanel { MutableTheme mutableTheme = new MutableTheme(baseTheme.get()) { @Override - public void loadDefaults(final Properties properties, final UIDefaults currentDefaults) { - super.loadDefaults(properties, currentDefaults); + public void loadDefaults(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { + super.loadDefaults(properties, currentDefaults, iconLoader); putAll(properties, themeDefaults); properties.put(KEY_DARK, darkToggle.isSelected()); properties.put(KEY_HIGH_CONTRAST, contrastToggle.isSelected()); } @Override - public void customizeGlobals(final Properties properties, final UIDefaults currentDefaults) { + public void customizeGlobals(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { properties.putAll(globalDefaults); } @Override - public void customizePlatformProperties(final Properties properties, final UIDefaults currentDefaults) { + public void customizePlatformProperties(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { properties.putAll(platformDefaults); } @Override - public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults) { + public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { properties.putAll(uiDefaults); } @Override - public void customizeIconTheme(final Properties properties, final UIDefaults currentDefaults) { + public void customizeIconTheme(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { properties.putAll(iconDefaults); } }; @@ -193,23 +219,26 @@ public class ThemeEditor extends JPanel { Theme t = new ThemeDelegate((Theme) themeCombo.getSelectedItem()) { @Override - public void customizeGlobals(final Properties properties, final UIDefaults currentDefaults) { + public void customizeGlobals(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { RecordingProperties props = new RecordingProperties(properties); - super.customizeGlobals(props, currentDefaults); + super.customizeGlobals(props, currentDefaults, iconLoader); putAll(globalDefaults, props.getRecording()); } @Override - public void customizePlatformProperties(final Properties properties, final UIDefaults currentDefaults) { + public void customizePlatformProperties(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { RecordingProperties props = new RecordingProperties(properties); - super.customizePlatformProperties(props, currentDefaults); + super.customizePlatformProperties(props, currentDefaults, iconLoader); putAll(platformDefaults, props.getRecording()); } @Override - public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults) { + public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { RecordingProperties props = new RecordingProperties(properties); - super.customizeUIProperties(props, currentDefaults); + super.customizeUIProperties(props, currentDefaults, iconLoader); putAll(uiDefaults, props.getRecording()); } }; diff --git a/core/src/test/java/com/github/weisj/darklaf/defaults/SafeIcon.java b/core/src/test/java/com/github/weisj/darklaf/defaults/SafeIcon.java index ce4ec088..00e5b7d0 100644 --- a/core/src/test/java/com/github/weisj/darklaf/defaults/SafeIcon.java +++ b/core/src/test/java/com/github/weisj/darklaf/defaults/SafeIcon.java @@ -44,9 +44,9 @@ import javax.swing.*; * http://tips4java.wordpress.com/2008/12/18/icon-table-cell-renderer * *

- * The base idea is to instantiate a component of the type expected by the com.github.weisj.icon, - * let it paint into the graphics of a bufferedImage and create an ImageIcon from it. In subsequent - * calls the ImageIcon is used. + * The base idea is to instantiate a component of the type expected by the icon, let it paint into + * the graphics of a bufferedImage and create an ImageIcon from it. In subsequent calls the + * ImageIcon is used. */ final class SafeIcon implements Icon { private final Icon wrappee; diff --git a/core/src/test/java/com/github/weisj/darklaf/defaults/UIManagerDefaults.java b/core/src/test/java/com/github/weisj/darklaf/defaults/UIManagerDefaults.java index a702572f..cf79123c 100644 --- a/core/src/test/java/com/github/weisj/darklaf/defaults/UIManagerDefaults.java +++ b/core/src/test/java/com/github/weisj/darklaf/defaults/UIManagerDefaults.java @@ -316,8 +316,7 @@ public class UIManagerDefaults implements ItemListener, ComponentDemo { } /* - * Some rows containing icons, may need to be sized taller to fully display the - * com.github.weisj.icon. + * Some rows containing icons, may need to be sized taller to fully display the icon. */ private void updateRowHeights() { try { diff --git a/core/src/test/java/com/github/weisj/darklaf/icon/AllIcons.java b/core/src/test/java/com/github/weisj/darklaf/icon/AllIcons.java index b901a20d..a7141079 100644 --- a/core/src/test/java/com/github/weisj/darklaf/icon/AllIcons.java +++ b/core/src/test/java/com/github/weisj/darklaf/icon/AllIcons.java @@ -22,6 +22,7 @@ package com.github.weisj.darklaf.icon; import java.awt.*; +import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.Properties; @@ -32,15 +33,15 @@ import javax.swing.event.ListDataListener; import com.github.weisj.darklaf.LafManager; import com.github.weisj.darklaf.components.OverlayScrollPane; +import com.github.weisj.darklaf.core.test.util.ClassFinder; +import com.github.weisj.darklaf.core.test.util.Instantiable; +import com.github.weisj.darklaf.core.test.util.ResourceWalker; import com.github.weisj.darklaf.platform.decorations.DecorationsProvider; import com.github.weisj.darklaf.properties.icons.IconLoader; import com.github.weisj.darklaf.properties.icons.ThemedSVGIcon; import com.github.weisj.darklaf.ui.ComponentDemo; -import com.github.weisj.darklaf.util.ClassFinder; -import com.github.weisj.darklaf.util.Instantiable; import com.github.weisj.darklaf.util.Lambdas; import com.github.weisj.darklaf.util.Pair; -import com.github.weisj.darklaf.util.ResourceWalker; public class AllIcons implements ComponentDemo { @@ -69,9 +70,9 @@ public class AllIcons implements ComponentDemo { return new OverlayScrollPane(createIconJList(ICON_SIZE)); } - protected static JList> createIconJList(final int displaySize) { - JList> list = new JList<>(new ListModel>() { - final List> elements = loadIcons(displaySize, true); + protected static JList> createIconJList(final int displaySize) { + JList> list = new JList<>(new ListModel>() { + final List> elements = loadIcons(displaySize, true); @Override public int getSize() { @@ -79,7 +80,7 @@ public class AllIcons implements ComponentDemo { } @Override - public Pair getElementAt(final int index) { + public NamedIcon getElementAt(final int index) { return elements.get(index); } @@ -95,12 +96,12 @@ public class AllIcons implements ComponentDemo { return list; } - protected static List> loadIcons(final int displaySize, final boolean centered) { + protected static List> loadIcons(final int displaySize, final boolean centered) { IconLoader loader = IconLoader.get(); try (ResourceWalker walker = ResourceWalker.walkResources("com.github.weisj")) { return walker.stream().filter(p -> p.endsWith("svg")).map(p -> { ThemedSVGIcon icon = (ThemedSVGIcon) loader.loadSVGIcon(p, -displaySize, -displaySize, true); - return new Pair<>(p, centered ? new CenterIcon(icon, displaySize, displaySize) : icon); + return new NamedIcon<>(p, centered ? new CenterIcon(icon, displaySize, displaySize) : icon); }).collect(Collectors.groupingBy(pair -> pathToIconName(pair.getFirst()))) .values().stream() .peek(list -> makeUnique(list, 1)) @@ -109,11 +110,12 @@ public class AllIcons implements ComponentDemo { } } - private static void makeUnique(final List> iconList, final int depth) { + private static void makeUnique(final List> iconList, final int depth) { if (iconList.size() <= 1) { iconList.forEach(p -> p.setFirst(pathToIconName(p.getFirst(), depth))); } else { - iconList.stream() + new HashSet<>(iconList) + .stream() .collect(Collectors.groupingBy(p -> pathToIconName(p.getFirst(), depth + 1))) .values() .forEach(list -> makeUnique(list, depth + 1)); @@ -138,15 +140,15 @@ public class AllIcons implements ComponentDemo { } private static final class IconListRenderer extends JLabel - implements ListCellRenderer> { + implements ListCellRenderer> { private IconListRenderer() { setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2)); } @Override - public Component getListCellRendererComponent(final JList> list, - final Pair value, final int index, final boolean isSelected, + public Component getListCellRendererComponent(final JList> list, + final NamedIcon value, final int index, final boolean isSelected, final boolean cellHasFocus) { setIcon(value.getSecond()); setText(value.getFirst()); @@ -183,4 +185,21 @@ public class AllIcons implements ComponentDemo { return height; } } + + public static class NamedIcon extends Pair { + + public NamedIcon(final String first, final T second) { + super(first, second); + } + + @Override + public boolean equals(final Object obj) { + return obj instanceof NamedIcon && Objects.equals(((NamedIcon) obj).getFirst(), getFirst()); + } + + @Override + public int hashCode() { + return Objects.hashCode(getFirst()); + } + } } diff --git a/core/src/test/java/com/github/weisj/darklaf/icon/IconDemo.java b/core/src/test/java/com/github/weisj/darklaf/icon/IconDemo.java index 1bc0c773..3e4fc141 100644 --- a/core/src/test/java/com/github/weisj/darklaf/icon/IconDemo.java +++ b/core/src/test/java/com/github/weisj/darklaf/icon/IconDemo.java @@ -60,12 +60,12 @@ public class IconDemo implements ComponentDemo { Icon themedIcon = iconLoader.getIcon("themed_icon.svg", 16, 16, true); Icon imageIcon = iconLoader.getIcon("image_icon.png"); - iconPanel.add(new JLabel("Aware image com.github.weisj.icon", uiAwareImageIcon, JLabel.LEFT)); - iconPanel.add(new JLabel("Aware image com.github.weisj.icon (dual)", uiAwareImageIconDual, JLabel.LEFT)); - iconPanel.add(new JLabel("Aware svg com.github.weisj.icon", uiAwareIcon, JLabel.LEFT)); - iconPanel.add(new JLabel("Aware svg com.github.weisj.icon (dual)", uiAwareIconDual, JLabel.LEFT)); - iconPanel.add(new JLabel("Themed com.github.weisj.icon", themedIcon, JLabel.LEFT)); - iconPanel.add(new JLabel("Image com.github.weisj.icon", imageIcon, JLabel.LEFT)); + iconPanel.add(new JLabel("Aware image icon", uiAwareImageIcon, JLabel.LEFT)); + iconPanel.add(new JLabel("Aware image icon (dual)", uiAwareImageIconDual, JLabel.LEFT)); + iconPanel.add(new JLabel("Aware svg icon", uiAwareIcon, JLabel.LEFT)); + iconPanel.add(new JLabel("Aware svg icon (dual)", uiAwareIconDual, JLabel.LEFT)); + iconPanel.add(new JLabel("Themed icon", themedIcon, JLabel.LEFT)); + iconPanel.add(new JLabel("Image icon", imageIcon, JLabel.LEFT)); DemoPanel panel = new DemoPanel(iconPanel, new BorderLayout(), 0); JPanel controlPanel = panel.addControls(); @@ -78,7 +78,7 @@ public class IconDemo implements ComponentDemo { } }); controlPanel - .add(new QuickColorChooser("Themed com.github.weisj.icon color", UIManager.getColor("TestIcon.color"), + .add(new QuickColorChooser("Themed icon color", UIManager.getColor("TestIcon.color"), this::updateThemedIconColor)); return panel; diff --git a/core/src/test/java/com/github/weisj/darklaf/icon/IconEditorDemo.java b/core/src/test/java/com/github/weisj/darklaf/icon/IconEditorDemo.java index 3859af5f..409fba28 100644 --- a/core/src/test/java/com/github/weisj/darklaf/icon/IconEditorDemo.java +++ b/core/src/test/java/com/github/weisj/darklaf/icon/IconEditorDemo.java @@ -22,12 +22,14 @@ package com.github.weisj.darklaf.icon; import java.awt.*; +import java.util.stream.Collectors; import javax.swing.*; import com.github.weisj.darklaf.components.iconeditor.IconEditor; import com.github.weisj.darklaf.ui.ComponentDemo; import com.github.weisj.darklaf.ui.DemoPanel; +import com.github.weisj.darklaf.util.Pair; public class IconEditorDemo implements ComponentDemo { @@ -37,7 +39,11 @@ public class IconEditorDemo implements ComponentDemo { @Override public JComponent createComponent() { - IconEditor editor = new IconEditor(AllIcons.loadIcons(16, false)); + IconEditor editor = new IconEditor( + AllIcons.loadIcons(16, false) + .stream() + .map(p -> new Pair<>(p.getFirst(), p.getSecond())) + .collect(Collectors.toList())); DemoPanel panel = new DemoPanel(editor, new BorderLayout(), 0); JPanel controls = panel.addControls(); controls.add(new JCheckBox("Show add/remove controls") { diff --git a/core/src/test/java/com/github/weisj/darklaf/icon/RotatableIconDemo.java b/core/src/test/java/com/github/weisj/darklaf/icon/RotatableIconDemo.java index f1571aa1..52133e98 100644 --- a/core/src/test/java/com/github/weisj/darklaf/icon/RotatableIconDemo.java +++ b/core/src/test/java/com/github/weisj/darklaf/icon/RotatableIconDemo.java @@ -33,7 +33,6 @@ import com.github.weisj.darklaf.ui.ComponentDemo; import com.github.weisj.darklaf.ui.DemoPanel; import com.github.weisj.darklaf.ui.DemoResources; import com.github.weisj.darklaf.util.Alignment; -import com.github.weisj.darklaf.util.Pair; public class RotatableIconDemo implements ComponentDemo { @@ -96,7 +95,7 @@ public class RotatableIconDemo implements ComponentDemo { controls = panel.addControls(new BorderLayout()); AtomicReference nextIcon = new AtomicReference<>(rotateIcon.getIcon()); - JList> list = AllIcons.createIconJList(size); + JList> list = AllIcons.createIconJList(size); list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); list.addListSelectionListener(e -> nextIcon.set(list.getSelectedValue().getSecond())); controls.add(new OverlayScrollPane(list)); diff --git a/core/src/test/java/com/github/weisj/darklaf/ui/ComponentDemo.java b/core/src/test/java/com/github/weisj/darklaf/ui/ComponentDemo.java index 07073d4a..b8ec159f 100644 --- a/core/src/test/java/com/github/weisj/darklaf/ui/ComponentDemo.java +++ b/core/src/test/java/com/github/weisj/darklaf/ui/ComponentDemo.java @@ -120,7 +120,10 @@ public interface ComponentDemo { window.setVisible(true); window.setLocationRelativeTo(null); - windowRef.set(window); + synchronized (windowRef) { + windowRef.set(window); + windowRef.notifyAll(); + } }); return windowRef; } diff --git a/core/src/test/java/com/github/weisj/darklaf/ui/DemoLauncher.java b/core/src/test/java/com/github/weisj/darklaf/ui/DemoLauncher.java index ffb4ffe2..2e7add4e 100644 --- a/core/src/test/java/com/github/weisj/darklaf/ui/DemoLauncher.java +++ b/core/src/test/java/com/github/weisj/darklaf/ui/DemoLauncher.java @@ -29,10 +29,9 @@ import java.util.stream.Collectors; import javax.swing.*; -import com.github.weisj.darklaf.DelicateDemo; -import com.github.weisj.darklaf.util.ClassFinder; -import com.github.weisj.darklaf.util.Instantiable; - +import com.github.weisj.darklaf.core.test.DelicateDemo; +import com.github.weisj.darklaf.core.test.util.ClassFinder; +import com.github.weisj.darklaf.core.test.util.Instantiable; public class DemoLauncher implements ComponentDemo { diff --git a/core/src/test/java/com/github/weisj/darklaf/ui/dialog/DialogDemo.java b/core/src/test/java/com/github/weisj/darklaf/ui/dialog/DialogDemo.java index 5e0fab67..f04f3033 100644 --- a/core/src/test/java/com/github/weisj/darklaf/ui/dialog/DialogDemo.java +++ b/core/src/test/java/com/github/weisj/darklaf/ui/dialog/DialogDemo.java @@ -249,8 +249,7 @@ public class DialogDemo extends JPanel { /* * Creates the panel shown by the 3rd tab. These dialogs are implemented using showMessageDialog, - * but you can specify the com.github.weisj.icon (using similar code) for any other kind of dialog, - * as well. + * but you can specify the icon (using similar code) for any other kind of dialog, as well. */ private JPanel createIconDialogBox() { JButton showItButton = null; @@ -266,22 +265,22 @@ public class DialogDemo extends JPanel { final String warningCommand = "warning"; final String customCommand = "custom"; - radioButtons[0] = new JRadioButton("Plain (no com.github.weisj.icon)"); + radioButtons[0] = new JRadioButton("Plain (no icon)"); radioButtons[0].setActionCommand(plainCommand); - radioButtons[1] = new JRadioButton("Information com.github.weisj.icon"); + radioButtons[1] = new JRadioButton("Information icon"); radioButtons[1].setActionCommand(infoCommand); - radioButtons[2] = new JRadioButton("Question com.github.weisj.icon"); + radioButtons[2] = new JRadioButton("Question icon"); radioButtons[2].setActionCommand(questionCommand); - radioButtons[3] = new JRadioButton("Error com.github.weisj.icon"); + radioButtons[3] = new JRadioButton("Error icon"); radioButtons[3].setActionCommand(errorCommand); - radioButtons[4] = new JRadioButton("Warning com.github.weisj.icon"); + radioButtons[4] = new JRadioButton("Warning icon"); radioButtons[4].setActionCommand(warningCommand); - radioButtons[5] = new JRadioButton("Custom com.github.weisj.icon"); + radioButtons[5] = new JRadioButton("Custom icon"); radioButtons[5].setActionCommand(customCommand); for (int i = 0; i < numButtons; i++) { @@ -293,11 +292,11 @@ public class DialogDemo extends JPanel { showItButton.addActionListener(e -> { String command = group.getSelection().getActionCommand(); - // no com.github.weisj.icon + // no icon if (Objects.equals(command, plainCommand)) { JOptionPane.showMessageDialog(frame, "Eggs aren't supposed to be green.", "A plain message", JOptionPane.PLAIN_MESSAGE); - // information com.github.weisj.icon + // information icon } else if (Objects.equals(command, infoCommand)) { JOptionPane.showMessageDialog(frame, "Eggs aren't supposed to be green.", "Inane informational dialog", JOptionPane.INFORMATION_MESSAGE); @@ -305,20 +304,20 @@ public class DialogDemo extends JPanel { // XXX: It doesn't make sense to make a question with // XXX: only one button. // XXX: See "Yes/No (but not in those words)" for a better solution. - // question com.github.weisj.icon + // question icon } else if (Objects.equals(command, questionCommand)) { JOptionPane.showMessageDialog(frame, "You shouldn't use a message dialog " + "(like this)\n" + "for a question, OK?", "Inane question", JOptionPane.QUESTION_MESSAGE); - // error com.github.weisj.icon + // error icon } else if (Objects.equals(command, errorCommand)) { JOptionPane.showMessageDialog(frame, "Eggs aren't supposed to be green.", "Inane error", JOptionPane.ERROR_MESSAGE); - // warning com.github.weisj.icon + // warning icon } else if (Objects.equals(command, warningCommand)) { JOptionPane.showMessageDialog(frame, "Eggs aren't supposed to be green.", "Inane warning", JOptionPane.WARNING_MESSAGE); - // custom com.github.weisj.icon + // custom icon } else if (Objects.equals(command, customCommand)) { JOptionPane.showMessageDialog(frame, "Eggs aren't supposed to be green.", "Inane custom dialog", JOptionPane.INFORMATION_MESSAGE, icon); diff --git a/core/src/test/java/com/github/weisj/darklaf/ui/tabFrame/TabFrameDemo.java b/core/src/test/java/com/github/weisj/darklaf/ui/tabFrame/TabFrameDemo.java index 8b1b9c8c..ae22920e 100644 --- a/core/src/test/java/com/github/weisj/darklaf/ui/tabFrame/TabFrameDemo.java +++ b/core/src/test/java/com/github/weisj/darklaf/ui/tabFrame/TabFrameDemo.java @@ -26,6 +26,8 @@ import java.awt.*; import javax.swing.*; import javax.swing.text.BadLocationException; +import org.pbjar.jxlayer.plaf.ext.TransformUI; + import com.github.weisj.darklaf.components.tabframe.JTabFrame; import com.github.weisj.darklaf.components.tabframe.TabbedPopup; import com.github.weisj.darklaf.components.text.NonWrappingTextPane; @@ -35,11 +37,13 @@ import com.github.weisj.darklaf.ui.ComponentDemo; import com.github.weisj.darklaf.ui.DemoResources; import com.github.weisj.darklaf.ui.util.DarkUIUtil; import com.github.weisj.darklaf.util.Alignment; +import com.github.weisj.darklaf.util.PropertyValue; import com.github.weisj.darklaf.util.StringUtil; public class TabFrameDemo implements ComponentDemo { public static void main(final String[] args) { + System.setProperty(TransformUI.BUFFERED_REPAINT_FLAG, PropertyValue.TRUE); ComponentDemo.showDemo(new TabFrameDemo()); } diff --git a/core/src/test/java/com/github/weisj/darklaf/ui/tree/FileTreeDemo.java b/core/src/test/java/com/github/weisj/darklaf/ui/tree/FileTreeDemo.java index 95aaf51d..a2411eb7 100644 --- a/core/src/test/java/com/github/weisj/darklaf/ui/tree/FileTreeDemo.java +++ b/core/src/test/java/com/github/weisj/darklaf/ui/tree/FileTreeDemo.java @@ -27,9 +27,9 @@ import java.io.File; import javax.swing.*; import javax.swing.filechooser.FileSystemView; -import com.github.weisj.darklaf.DelicateDemo; import com.github.weisj.darklaf.components.OverlayScrollPane; import com.github.weisj.darklaf.components.filetree.FileTree; +import com.github.weisj.darklaf.core.test.DelicateDemo; import com.github.weisj.darklaf.ui.ComponentDemo; import com.github.weisj.darklaf.ui.DemoPanel; import com.github.weisj.darklaf.ui.button.ButtonConstants; diff --git a/core/src/test/java/com/github/weisj/darklaf/ui/treetable/TreeTableDemo.java b/core/src/test/java/com/github/weisj/darklaf/ui/treetable/TreeTableDemo.java index 94d80a4e..a37db788 100644 --- a/core/src/test/java/com/github/weisj/darklaf/ui/treetable/TreeTableDemo.java +++ b/core/src/test/java/com/github/weisj/darklaf/ui/treetable/TreeTableDemo.java @@ -27,9 +27,9 @@ import java.util.Random; import javax.swing.*; -import com.github.weisj.darklaf.DelicateDemo; import com.github.weisj.darklaf.components.treetable.JTreeTable; import com.github.weisj.darklaf.components.treetable.model.*; +import com.github.weisj.darklaf.core.test.DelicateDemo; import com.github.weisj.darklaf.ui.ComponentDemo; import com.github.weisj.darklaf.ui.DemoPanel; diff --git a/core/src/test/resources/com/github/weisj/darklaf/theme/my_custom_theme_defaults.properties b/core/src/test/resources/com/github/weisj/darklaf/core/theme/my_custom_theme_defaults.properties similarity index 100% rename from core/src/test/resources/com/github/weisj/darklaf/theme/my_custom_theme_defaults.properties rename to core/src/test/resources/com/github/weisj/darklaf/core/theme/my_custom_theme_defaults.properties diff --git a/core/src/test/resources/com/github/weisj/darklaf/theme/my_custom_theme_icons.properties b/core/src/test/resources/com/github/weisj/darklaf/core/theme/my_custom_theme_icons.properties similarity index 100% rename from core/src/test/resources/com/github/weisj/darklaf/theme/my_custom_theme_icons.properties rename to core/src/test/resources/com/github/weisj/darklaf/core/theme/my_custom_theme_icons.properties diff --git a/core/src/test/resources/com/github/weisj/darklaf/theme/my_custom_theme_linux.properties b/core/src/test/resources/com/github/weisj/darklaf/core/theme/my_custom_theme_linux.properties similarity index 100% rename from core/src/test/resources/com/github/weisj/darklaf/theme/my_custom_theme_linux.properties rename to core/src/test/resources/com/github/weisj/darklaf/core/theme/my_custom_theme_linux.properties diff --git a/core/src/test/resources/com/github/weisj/darklaf/theme/my_custom_theme_mac.properties b/core/src/test/resources/com/github/weisj/darklaf/core/theme/my_custom_theme_mac.properties similarity index 100% rename from core/src/test/resources/com/github/weisj/darklaf/theme/my_custom_theme_mac.properties rename to core/src/test/resources/com/github/weisj/darklaf/core/theme/my_custom_theme_mac.properties diff --git a/core/src/test/resources/com/github/weisj/darklaf/theme/my_custom_theme_styleSheet.css b/core/src/test/resources/com/github/weisj/darklaf/core/theme/my_custom_theme_styleSheet.css similarity index 100% rename from core/src/test/resources/com/github/weisj/darklaf/theme/my_custom_theme_styleSheet.css rename to core/src/test/resources/com/github/weisj/darklaf/core/theme/my_custom_theme_styleSheet.css diff --git a/core/src/test/resources/com/github/weisj/darklaf/theme/my_custom_theme_ui.properties b/core/src/test/resources/com/github/weisj/darklaf/core/theme/my_custom_theme_ui.properties similarity index 100% rename from core/src/test/resources/com/github/weisj/darklaf/theme/my_custom_theme_ui.properties rename to core/src/test/resources/com/github/weisj/darklaf/core/theme/my_custom_theme_ui.properties diff --git a/core/src/test/resources/com/github/weisj/darklaf/theme/my_custom_theme_windows.properties b/core/src/test/resources/com/github/weisj/darklaf/core/theme/my_custom_theme_windows.properties similarity index 100% rename from core/src/test/resources/com/github/weisj/darklaf/theme/my_custom_theme_windows.properties rename to core/src/test/resources/com/github/weisj/darklaf/core/theme/my_custom_theme_windows.properties diff --git a/iconset/build.gradle.kts b/iconset/build.gradle.kts new file mode 100644 index 00000000..ca005d88 --- /dev/null +++ b/iconset/build.gradle.kts @@ -0,0 +1,27 @@ +import com.github.vlsi.gradle.crlf.CrLfSpec +import com.github.vlsi.gradle.crlf.LineEndings + +plugins { + `java-library` + `module-info-compile` + id("com.github.vlsi.crlf") +} + +dependencies { + api(projects.darklafPropertyLoader) +} + +fun Jar.includeLicenses() { + CrLfSpec(LineEndings.LF).run { + into("META-INF") { + filteringCharset = "UTF-8" + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + textFrom("$rootDir/licenses/INTELLIJ_LICENSE.txt") + textFrom("$rootDir/licenses/INTELLIJ_NOTICE.txt") + } + } +} + +tasks.jar { + includeLicenses() +} diff --git a/iconset/src/main/java/com/github/weisj/darklaf/iconset/IconSet.java b/iconset/src/main/java/com/github/weisj/darklaf/iconset/IconSet.java new file mode 100644 index 00000000..0248e636 --- /dev/null +++ b/iconset/src/main/java/com/github/weisj/darklaf/iconset/IconSet.java @@ -0,0 +1,28 @@ +/* + * MIT License + * + * Copyright (c) 2021 Jannis Weis + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + * associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, + * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or + * substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT + * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + */ +package com.github.weisj.darklaf.iconset; + +import com.github.weisj.darklaf.properties.icons.IconLoader; + +public class IconSet { + public static final IconLoader ICON_LOADER = IconLoader.get(IconSet.class); +} diff --git a/iconset/src/main/module/module-info.java b/iconset/src/main/module/module-info.java new file mode 100644 index 00000000..5860dba2 --- /dev/null +++ b/iconset/src/main/module/module-info.java @@ -0,0 +1,6 @@ + +open module darklaf.iconset { + requires darklaf.properties; + + exports com.github.weisj.darklaf.iconset; +} diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/checkBox.properties b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/checkBox.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/checkBox.properties rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/checkBox.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/checkBox.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/checkBox.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/checkBox.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/checkBox.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/checkBoxDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/checkBoxDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/checkBoxDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/checkBoxDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/checkBoxFocused.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/checkBoxFocused.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/checkBoxFocused.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/checkBoxFocused.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/checkBoxIndeterminateSelected.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/checkBoxIndeterminateSelected.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/checkBoxIndeterminateSelected.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/checkBoxIndeterminateSelected.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/checkBoxIndeterminateSelectedDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/checkBoxIndeterminateSelectedDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/checkBoxIndeterminateSelectedDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/checkBoxIndeterminateSelectedDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/checkBoxIndeterminateSelectedFocused.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/checkBoxIndeterminateSelectedFocused.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/checkBoxIndeterminateSelectedFocused.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/checkBoxIndeterminateSelectedFocused.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/checkBoxSelected.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/checkBoxSelected.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/checkBoxSelected.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/checkBoxSelected.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/checkBoxSelectedDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/checkBoxSelectedDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/checkBoxSelectedDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/checkBoxSelectedDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/checkBoxSelectedFocused.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/checkBoxSelectedFocused.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/checkBoxSelectedFocused.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/checkBoxSelectedFocused.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/radio.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/radio.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/radio.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/radio.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/radioDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/radioDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/radioDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/radioDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/radioFocused.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/radioFocused.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/radioFocused.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/radioFocused.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/radioSelected.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/radioSelected.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/radioSelected.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/radioSelected.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/radioSelectedDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/radioSelectedDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/radioSelectedDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/radioSelectedDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/radioSelectedFocused.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/radioSelectedFocused.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/radioSelectedFocused.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/radioSelectedFocused.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/slider.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/slider.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/slider.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/slider.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/sliderDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/sliderDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/sliderDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/sliderDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/sliderFocused.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/sliderFocused.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/sliderFocused.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/sliderFocused.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/volumeSlider.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/volumeSlider.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/volumeSlider.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/volumeSlider.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/volumeSliderDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/volumeSliderDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/volumeSliderDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/volumeSliderDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/volumeSliderFocused.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/volumeSliderFocused.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/control/volumeSliderFocused.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/control/volumeSliderFocused.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/dialog/errorDialog.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/dialog/errorDialog.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/dialog/errorDialog.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/dialog/errorDialog.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/dialog/informationDialog.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/dialog/informationDialog.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/dialog/informationDialog.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/dialog/informationDialog.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/dialog/questionDialog.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/dialog/questionDialog.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/dialog/questionDialog.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/dialog/questionDialog.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/dialog/warningDialog.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/dialog/warningDialog.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/dialog/warningDialog.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/dialog/warningDialog.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/files.properties b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/files.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/files.properties rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/files.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/desktop.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/desktop.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/desktop.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/desktop.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/drive.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/drive.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/drive.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/drive.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/folder.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/folder.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/folder.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/folder.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/general.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/general.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/general.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/general.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/homeFolder.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/homeFolder.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/homeFolder.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/homeFolder.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/image.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/image.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/image.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/image.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/missingImage.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/missingImage.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/missingImage.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/missingImage.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/newFolder.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/newFolder.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/newFolder.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/newFolder.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/pendingImage.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/pendingImage.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/pendingImage.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/pendingImage.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/text.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/text.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/text.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/text.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/unknown.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/unknown.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/unknown.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/unknown.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/upFolder.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/upFolder.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/files/upFolder.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/files/upFolder.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/frame.properties b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/frame.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/frame.properties rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/frame.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/frame/closeActive.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/frame/closeActive.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/frame/closeActive.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/frame/closeActive.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/frame/frame.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/frame/frame.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/frame/frame.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/frame/frame.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/frame/help.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/frame/help.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/frame/help.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/frame/help.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/frame/helpInactive.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/frame/helpInactive.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/frame/helpInactive.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/frame/helpInactive.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/frame/maximize.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/frame/maximize.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/frame/maximize.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/frame/maximize.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/frame/minimize.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/frame/minimize.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/frame/minimize.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/frame/minimize.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/frame/restore.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/frame/restore.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/frame/restore.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/frame/restore.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/dropdown.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/dropdown.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/dropdown.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/dropdown.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/dropdownDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/dropdownDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/dropdownDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/dropdownDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/speaker0.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/speaker0.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/speaker0.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/speaker0.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/speaker0Disabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/speaker0Disabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/speaker0Disabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/speaker0Disabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/speaker1.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/speaker1.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/speaker1.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/speaker1.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/speaker1Disabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/speaker1Disabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/speaker1Disabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/speaker1Disabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/speaker2.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/speaker2.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/speaker2.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/speaker2.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/speaker2Disabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/speaker2Disabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/speaker2Disabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/speaker2Disabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/speaker3.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/speaker3.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/speaker3.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/speaker3.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/speaker3Disabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/speaker3Disabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/speaker3Disabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/speaker3Disabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/speaker4.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/speaker4.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/speaker4.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/speaker4.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/speaker4Disabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/speaker4Disabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator/speaker4Disabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/indicator/speaker4Disabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/colorChooser.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/colorChooser.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/colorChooser.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/colorChooser.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/copy.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/copy.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/copy.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/copy.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/copyDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/copyDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/copyDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/copyDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/cut.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/cut.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/cut.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/cut.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/cutDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/cutDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/cutDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/cutDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/delete.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/delete.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/delete.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/delete.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/deleteDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/deleteDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/deleteDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/deleteDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/down.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/down.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/down.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/down.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/groupBy.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/groupBy.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/groupBy.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/groupBy.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/groupBySelected.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/groupBySelected.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/groupBySelected.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/groupBySelected.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/help.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/help.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/help.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/help.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/helpDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/helpDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/helpDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/helpDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/helpHighlight.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/helpHighlight.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/helpHighlight.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/helpHighlight.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/listFiles.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/listFiles.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/listFiles.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/listFiles.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/listFilesSelected.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/listFilesSelected.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/listFilesSelected.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/listFilesSelected.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/paste.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/paste.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/paste.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/paste.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/pasteDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/pasteDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/pasteDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/pasteDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/redo.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/redo.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/redo.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/redo.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/redoDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/redoDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/redoDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/redoDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/save.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/save.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/save.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/save.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/saveDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/saveDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/saveDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/saveDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/settings.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/settings.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/settings.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/settings.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/themeSettings.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/themeSettings.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/themeSettings.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/themeSettings.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/undo.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/undo.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/undo.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/undo.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/undoDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/undoDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/undoDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/undoDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/up.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/up.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/up.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/up.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/upDown.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/upDown.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/menu/upDown.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/menu/upDown.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/eye.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/eye.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/eye.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/eye.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/eyeHovered.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/eyeHovered.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/eyeHovered.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/eyeHovered.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/minus.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/minus.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/minus.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/minus.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/minusSelected.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/minusSelected.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/minusSelected.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/minusSelected.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/palette.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/palette.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/palette.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/palette.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/paletteDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/paletteDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/paletteDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/paletteDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/pipette.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/pipette.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/pipette.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/pipette.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/pipetteRollover.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/pipetteRollover.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/pipetteRollover.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/pipetteRollover.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/plus.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/plus.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/plus.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/plus.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/plusSelected.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/plusSelected.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/plusSelected.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/plusSelected.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/refresh.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/refresh.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/refresh.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/refresh.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/refreshDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/refreshDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/refreshDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/refreshDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/revert.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/revert.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/revert.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/revert.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/revertDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/revertDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/misc/revertDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/misc/revertDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/add.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/add.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/add.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/add.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowDown.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowDown.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowDown.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowDown.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowDownDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowDownDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowDownDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowDownDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowDownHover.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowDownHover.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowDownHover.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowDownHover.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowDownSelected.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowDownSelected.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowDownSelected.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowDownSelected.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowLeft.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowLeft.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowLeft.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowLeft.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowLeftDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowLeftDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowLeftDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowLeftDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowLeftHover.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowLeftHover.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowLeftHover.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowLeftHover.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowLeftSelected.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowLeftSelected.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowLeftSelected.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowLeftSelected.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowRight.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowRight.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowRight.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowRight.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowRightDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowRightDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowRightDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowRightDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowRightHover.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowRightHover.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowRightHover.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowRightHover.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowRightSelected.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowRightSelected.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowRightSelected.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowRightSelected.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowUp.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowUp.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowUp.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowUp.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowUpDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowUpDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowUpDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowUpDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowUpHover.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowUpHover.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowUpHover.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowUpHover.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowUpSelected.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowUpSelected.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thick/arrowUpSelected.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thick/arrowUpSelected.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowDown.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowDown.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowDown.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowDown.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowDownDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowDownDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowDownDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowDownDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowDownHover.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowDownHover.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowDownHover.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowDownHover.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowDownSelected.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowDownSelected.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowDownSelected.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowDownSelected.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowLeft.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowLeft.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowLeft.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowLeft.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowLeftDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowLeftDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowLeftDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowLeftDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowLeftHover.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowLeftHover.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowLeftHover.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowLeftHover.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowLeftSelected.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowLeftSelected.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowLeftSelected.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowLeftSelected.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowRight.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowRight.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowRight.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowRight.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowRightDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowRightDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowRightDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowRightDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowRightHover.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowRightHover.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowRightHover.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowRightHover.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowRightSelected.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowRightSelected.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowRightSelected.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowRightSelected.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowUp.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowUp.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowUp.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowUp.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowUpDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowUpDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowUpDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowUpDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowUpHover.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowUpHover.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowUpHover.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowUpHover.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowUpSelected.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowUpSelected.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrow/thin/arrowUpSelected.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrow/thin/arrowUpSelected.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrowDivider.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrowDivider.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrowDivider.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrowDivider.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrowSplitCenterH.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrowSplitCenterH.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrowSplitCenterH.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrowSplitCenterH.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrowSplitCenterV.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrowSplitCenterV.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/arrowSplitCenterV.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/arrowSplitCenterV.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/checkmark.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/checkmark.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/checkmark.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/checkmark.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/checkmarkDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/checkmarkDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/checkmarkDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/checkmarkDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/checkmarkSelected.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/checkmarkSelected.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/checkmarkSelected.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/checkmarkSelected.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/close.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/close.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/close.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/close.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/closeDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/closeDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/closeDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/closeDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/closeHovered.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/closeHovered.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/closeHovered.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/closeHovered.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/collapse.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/collapse.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/collapse.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/collapse.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/divider.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/divider.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/divider.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/divider.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/horizontalGlue.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/horizontalGlue.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/horizontalGlue.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/horizontalGlue.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/horizontalGrip.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/horizontalGrip.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/horizontalGrip.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/horizontalGrip.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moreTabs.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moreTabs.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moreTabs.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moreTabs.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToBottomLeft.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToBottomLeft.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToBottomLeft.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToBottomLeft.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToBottomLeftDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToBottomLeftDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToBottomLeftDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToBottomLeftDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToBottomRight.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToBottomRight.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToBottomRight.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToBottomRight.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToBottomRightDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToBottomRightDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToBottomRightDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToBottomRightDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToLeftBottom.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToLeftBottom.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToLeftBottom.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToLeftBottom.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToLeftBottomDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToLeftBottomDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToLeftBottomDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToLeftBottomDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToLeftTop.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToLeftTop.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToLeftTop.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToLeftTop.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToLeftTopDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToLeftTopDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToLeftTopDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToLeftTopDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToRightBottom.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToRightBottom.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToRightBottom.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToRightBottom.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToRightBottomDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToRightBottomDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToRightBottomDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToRightBottomDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToRightTop.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToRightTop.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToRightTop.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToRightTop.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToRightTopDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToRightTopDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToRightTopDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToRightTopDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToTopLeft.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToTopLeft.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToTopLeft.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToTopLeft.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToTopLeftDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToTopLeftDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToTopLeftDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToTopLeftDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToTopRight.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToTopRight.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToTopRight.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToTopRight.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToTopRightDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToTopRightDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/moveToTopRightDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/moveToTopRightDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/search.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/search.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/search.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/search.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/searchDisabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/searchDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/searchDisabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/searchDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/searchWithHistory.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/searchWithHistory.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/searchWithHistory.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/searchWithHistory.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/searchWithHistory_disabled.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/searchWithHistory_disabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/searchWithHistory_disabled.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/searchWithHistory_disabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/separatorH.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/separatorH.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/separatorH.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/separatorH.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/separatorV.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/separatorV.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/separatorV.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/separatorV.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/verticalGlue.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/verticalGlue.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/verticalGlue.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/verticalGlue.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/verticalGrip.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/verticalGrip.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation/verticalGrip.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/navigation/verticalGrip.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/progress/pause.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/progress/pause.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/progress/pause.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/progress/pause.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/progress/resume.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/progress/resume.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/progress/resume.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/progress/resume.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/progress/stepPassive.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/progress/stepPassive.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/progress/stepPassive.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/progress/stepPassive.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/progress/stepWorking.svg b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/progress/stepWorking.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/progress/stepWorking.svg rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/progress/stepWorking.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/radioButton.properties b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/radioButton.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/radioButton.properties rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/radioButton.properties diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/slider.properties b/iconset/src/main/resources/com/github/weisj/darklaf/iconset/slider.properties similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/properties/icons/slider.properties rename to iconset/src/main/resources/com/github/weisj/darklaf/iconset/slider.properties diff --git a/macos/src/main/module/module-info.java b/macos/src/main/module/module-info.java index 8ef56ced..25288c4b 100644 --- a/macos/src/main/module/module-info.java +++ b/macos/src/main/module/module-info.java @@ -22,7 +22,7 @@ * SOFTWARE. * */ -module darklaf.platform.macos { +open module darklaf.platform.macos { requires transitive darklaf.platform.base; requires transitive darklaf.theme; diff --git a/native-utils/src/main/java/com/github/weisj/darklaf/nativeutil/AbstractLibrary.java b/native-utils/src/main/java/com/github/weisj/darklaf/nativeutil/AbstractLibrary.java index 96bbcb3f..2372eff4 100644 --- a/native-utils/src/main/java/com/github/weisj/darklaf/nativeutil/AbstractLibrary.java +++ b/native-utils/src/main/java/com/github/weisj/darklaf/nativeutil/AbstractLibrary.java @@ -59,7 +59,12 @@ public abstract class AbstractLibrary { try { String path = getLibraryPath(); if (path != null && !path.isEmpty()) { - NativeUtil.loadLibraryFromJarWithExtraResources(getLibraryPath(), getResourcePaths()); + List resources = getResourcePaths(); + if (resources == null || resources.isEmpty()) { + NativeUtil.loadLibraryFromJar(getClass(), path); + } else { + NativeUtil.loadLibraryFromJarWithExtraResources(getClass(), path, resources); + } loaded = true; info("Loaded " + getLibraryName() + "."); } diff --git a/native-utils/src/main/java/com/github/weisj/darklaf/nativeutil/NativeUtil.java b/native-utils/src/main/java/com/github/weisj/darklaf/nativeutil/NativeUtil.java index c46ec086..51bc92b9 100644 --- a/native-utils/src/main/java/com/github/weisj/darklaf/nativeutil/NativeUtil.java +++ b/native-utils/src/main/java/com/github/weisj/darklaf/nativeutil/NativeUtil.java @@ -71,6 +71,7 @@ public final class NativeUtil { * is deleted after exiting. Method uses String as filename because the pathname is "abstract", not * system-dependent. * + * @param loaderClass the class to use for loading. * @param path The path of file inside JAR as absolute path (beginning with '/'), e.g. * /package/File.ext * @throws IOException If temporary file creation or read/write operation fails @@ -80,17 +81,19 @@ public final class NativeUtil { * {@link File#createTempFile(java.lang.String, java.lang.String)}). * @throws FileNotFoundException If the file could not be found inside the JAR. */ - public static void loadLibraryFromJarWithExtraResources(final String path, final List resources) + public static void loadLibraryFromJarWithExtraResources(final Class loaderClass, final String path, + final List resources) throws IOException { - List resourcePaths = extractResources(resources); + List resourcePaths = extractResources(loaderClass, resources); try { - loadLibraryFromJar(path); + loadLibraryFromJar(loaderClass, path); } finally { resourcePaths.forEach(NativeUtil::releaseResource); } } - private static List extractResources(final List resources) throws IOException { + private static List extractResources(final Class caller, final List resources) + throws IOException { List paths = new ArrayList<>(resources.size()); Path tempDir = getTemporaryDirectory(); for (Resource resource : resources) { @@ -99,7 +102,7 @@ public final class NativeUtil { Path destinationPath = destinationDir.resolve(Objects.requireNonNull(filename)); try { Files.createDirectories(destinationDir); - extractFile(resource.filePath, tempDir, destinationPath); + extractFile(caller, resource.filePath, tempDir, destinationPath); } catch (final IOException e) { paths.forEach(NativeUtil::delete); throw e; @@ -117,6 +120,7 @@ public final class NativeUtil { * is deleted after exiting. Method uses String as filename because the pathname is "abstract", not * system-dependent. * + * @param loaderClass the class to use for loading. * @param path The path of file inside JAR as absolute path (beginning with '/'), e.g. * /package/File.ext * @throws IOException If temporary file creation or read/write operation fails @@ -126,7 +130,7 @@ public final class NativeUtil { * {@link File#createTempFile(java.lang.String, java.lang.String)}). * @throws FileNotFoundException If the file could not be found inside the JAR. */ - public static void loadLibraryFromJar(final String path) throws IOException { + public static void loadLibraryFromJar(final Class loaderClass, final String path) throws IOException { String filename = getFileNameFromPath(path); // Check if the filename is okay @@ -138,7 +142,7 @@ public final class NativeUtil { Path tempDir = getTemporaryDirectory(); Path temp = tempDir.resolve(filename); - extractFile(path, tempDir, temp); + extractFile(loaderClass, path, tempDir, temp); try { System.load(temp.toAbsolutePath().toString()); @@ -147,9 +151,10 @@ public final class NativeUtil { } } - private static void extractFile(final String path, final Path destinationDir, final Path destinationPath) + private static void extractFile(final Class loaderClass, final String path, final Path destinationDir, + final Path destinationPath) throws IOException { - try (InputStream is = NativeUtil.class.getResourceAsStream(path)) { + try (InputStream is = loaderClass.getResourceAsStream(path)) { if (is == null) throw new FileNotFoundException("File " + path + " was not found inside JAR."); if (!destinationDir.toFile().canWrite()) throw new IOException("Can't write to temporary directory."); Files.copy(is, destinationPath.toAbsolutePath(), StandardCopyOption.REPLACE_EXISTING); diff --git a/property-loader/src/main/java/com/github/weisj/darklaf/properties/PropertyLoader.java b/property-loader/src/main/java/com/github/weisj/darklaf/properties/PropertyLoader.java index b5a88665..be780f14 100644 --- a/property-loader/src/main/java/com/github/weisj/darklaf/properties/PropertyLoader.java +++ b/property-loader/src/main/java/com/github/weisj/darklaf/properties/PropertyLoader.java @@ -38,12 +38,10 @@ import com.github.weisj.darklaf.properties.parser.ParserContext; import com.github.weisj.darklaf.util.*; /** - * @author Konstantin Bulenkov * @author Jannis Weis */ public final class PropertyLoader { private static final Logger LOGGER = LogUtil.getLogger(PropertyLoader.class); - private static final IconLoader ICON_LOADER = IconLoader.get(IconLoader.class); private static final char REFERENCE_PREFIX = '%'; @@ -53,25 +51,16 @@ public final class PropertyLoader { try (InputStream stream = clazz.getResourceAsStream(p)) { properties.load(stream); } catch (IOException | NullPointerException e) { - LOGGER.log(Level.SEVERE, "Could not load " + p + " " + e.getMessage(), e.getStackTrace()); + LOGGER.log(Level.SEVERE, "Could not load " + p + " " + e.getMessage(), e); } return properties; } - public static void putProperties(final Properties properties, final Properties accumulator, - final UIDefaults currentDefaults) { - putProperties(properties, accumulator, currentDefaults, ICON_LOADER); - } - public static void putProperties(final Properties properties, final Properties accumulator, final UIDefaults currentDefaults, final IconLoader iconLoader) { putProperties(properties, properties.stringPropertyNames(), accumulator, currentDefaults, iconLoader); } - public static void putProperties(final Properties properties, final UIDefaults defaults) { - putProperties(properties, defaults, ICON_LOADER); - } - public static void putProperties(final Properties properties, final UIDefaults defaults, final IconLoader iconLoader) { putProperties(properties, properties.stringPropertyNames(), defaults, defaults, iconLoader); diff --git a/settings.gradle.kts b/settings.gradle.kts index 7eacda37..3d79148d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -21,6 +21,7 @@ include( "native-utils", "core", "compatibility", + "iconset", "theme", "property-loader", "utils", diff --git a/theme/src/main/java/com/github/weisj/darklaf/theme/DarculaTheme.java b/theme/src/main/java/com/github/weisj/darklaf/theme/DarculaTheme.java index e3d2ef87..9afc3e43 100644 --- a/theme/src/main/java/com/github/weisj/darklaf/theme/DarculaTheme.java +++ b/theme/src/main/java/com/github/weisj/darklaf/theme/DarculaTheme.java @@ -26,6 +26,7 @@ import java.util.Properties; import javax.swing.*; import com.github.weisj.darklaf.annotations.SynthesiseLaf; +import com.github.weisj.darklaf.properties.icons.IconLoader; import com.github.weisj.darklaf.theme.info.ColorToneRule; import com.github.weisj.darklaf.theme.info.PresetIconRule; import com.google.auto.service.AutoService; @@ -76,8 +77,9 @@ public class DarculaTheme extends Theme { } @Override - public void loadIconTheme(final Properties properties, final UIDefaults currentDefaults) { - super.loadIconTheme(properties, currentDefaults); - loadCustomProperties("icons", properties, currentDefaults); + public void loadIconTheme(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { + super.loadIconTheme(properties, currentDefaults, iconLoader); + loadCustomProperties("icons", properties, currentDefaults, iconLoader); } } diff --git a/theme/src/main/java/com/github/weisj/darklaf/theme/HighContrastDarkTheme.java b/theme/src/main/java/com/github/weisj/darklaf/theme/HighContrastDarkTheme.java index 59d04e56..3a399e01 100644 --- a/theme/src/main/java/com/github/weisj/darklaf/theme/HighContrastDarkTheme.java +++ b/theme/src/main/java/com/github/weisj/darklaf/theme/HighContrastDarkTheme.java @@ -27,6 +27,7 @@ import javax.swing.*; import com.github.weisj.darklaf.annotations.SynthesiseLaf; import com.github.weisj.darklaf.properties.PropertyLoader; +import com.github.weisj.darklaf.properties.icons.IconLoader; import com.github.weisj.darklaf.theme.info.ColorToneRule; import com.github.weisj.darklaf.theme.info.ContrastRule; import com.github.weisj.darklaf.theme.info.PresetIconRule; @@ -72,22 +73,25 @@ public class HighContrastDarkTheme extends Theme { } @Override - public void loadIconTheme(Properties properties, UIDefaults currentDefaults) { + public void loadIconTheme(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { // First load base theme - super.loadIconTheme(properties, currentDefaults); + super.loadIconTheme(properties, currentDefaults, iconLoader); // Then customize using our own values. - PropertyLoader.putProperties(loadPropertyFile("icons"), properties, currentDefaults); + PropertyLoader.putProperties(loadPropertyFile("icons"), properties, currentDefaults, iconLoader); } @Override - public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults) { - super.customizeUIProperties(properties, currentDefaults); - loadCustomProperties("ui", properties, currentDefaults); + public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { + super.customizeUIProperties(properties, currentDefaults, iconLoader); + loadCustomProperties("ui", properties, currentDefaults, iconLoader); } @Override - public void customizePlatformProperties(final Properties properties, final UIDefaults currentDefaults) { - super.customizePlatformProperties(properties, currentDefaults); - loadCustomProperties("platform", properties, currentDefaults); + public void customizePlatformProperties(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { + super.customizePlatformProperties(properties, currentDefaults, iconLoader); + loadCustomProperties("platform", properties, currentDefaults, iconLoader); } } diff --git a/theme/src/main/java/com/github/weisj/darklaf/theme/HighContrastLightTheme.java b/theme/src/main/java/com/github/weisj/darklaf/theme/HighContrastLightTheme.java index 435f7952..cf0ba80b 100644 --- a/theme/src/main/java/com/github/weisj/darklaf/theme/HighContrastLightTheme.java +++ b/theme/src/main/java/com/github/weisj/darklaf/theme/HighContrastLightTheme.java @@ -27,6 +27,7 @@ import javax.swing.*; import com.github.weisj.darklaf.annotations.SynthesiseLaf; import com.github.weisj.darklaf.properties.PropertyLoader; +import com.github.weisj.darklaf.properties.icons.IconLoader; import com.github.weisj.darklaf.theme.info.ColorToneRule; import com.github.weisj.darklaf.theme.info.ContrastRule; import com.github.weisj.darklaf.theme.info.PresetIconRule; @@ -72,22 +73,25 @@ public class HighContrastLightTheme extends Theme { } @Override - public void loadIconTheme(Properties properties, UIDefaults currentDefaults) { + public void loadIconTheme(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { // First load base theme - super.loadIconTheme(properties, currentDefaults); + super.loadIconTheme(properties, currentDefaults, iconLoader); // Then customize using our own values. - PropertyLoader.putProperties(loadPropertyFile("icons"), properties, currentDefaults); + PropertyLoader.putProperties(loadPropertyFile("icons"), properties, currentDefaults, iconLoader); } @Override - public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults) { - super.customizeUIProperties(properties, currentDefaults); - loadCustomProperties("ui", properties, currentDefaults); + public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { + super.customizeUIProperties(properties, currentDefaults, iconLoader); + loadCustomProperties("ui", properties, currentDefaults, iconLoader); } @Override - public void customizePlatformProperties(final Properties properties, final UIDefaults currentDefaults) { - super.customizePlatformProperties(properties, currentDefaults); - loadCustomProperties("platform", properties, currentDefaults); + public void customizePlatformProperties(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { + super.customizePlatformProperties(properties, currentDefaults, iconLoader); + loadCustomProperties("platform", properties, currentDefaults, iconLoader); } } diff --git a/theme/src/main/java/com/github/weisj/darklaf/theme/IntelliJTheme.java b/theme/src/main/java/com/github/weisj/darklaf/theme/IntelliJTheme.java index 95a73949..e466f6bd 100644 --- a/theme/src/main/java/com/github/weisj/darklaf/theme/IntelliJTheme.java +++ b/theme/src/main/java/com/github/weisj/darklaf/theme/IntelliJTheme.java @@ -26,6 +26,7 @@ import java.util.Properties; import javax.swing.*; import com.github.weisj.darklaf.annotations.SynthesiseLaf; +import com.github.weisj.darklaf.properties.icons.IconLoader; import com.github.weisj.darklaf.theme.info.ColorToneRule; import com.github.weisj.darklaf.theme.info.PresetIconRule; import com.google.auto.service.AutoService; @@ -66,15 +67,17 @@ public class IntelliJTheme extends Theme { } @Override - public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults) { - super.customizeUIProperties(properties, currentDefaults); - loadCustomProperties("ui", properties, currentDefaults); + public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { + super.customizeUIProperties(properties, currentDefaults, iconLoader); + loadCustomProperties("ui", properties, currentDefaults, iconLoader); } @Override - public void loadIconTheme(final Properties properties, final UIDefaults currentDefaults) { - super.loadIconTheme(properties, currentDefaults); - loadCustomProperties("icons", properties, currentDefaults); + public void loadIconTheme(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { + super.loadIconTheme(properties, currentDefaults, iconLoader); + loadCustomProperties("icons", properties, currentDefaults, iconLoader); } @Override diff --git a/theme/src/main/java/com/github/weisj/darklaf/theme/OneDarkTheme.java b/theme/src/main/java/com/github/weisj/darklaf/theme/OneDarkTheme.java index 4e86679b..dcc4aa9b 100644 --- a/theme/src/main/java/com/github/weisj/darklaf/theme/OneDarkTheme.java +++ b/theme/src/main/java/com/github/weisj/darklaf/theme/OneDarkTheme.java @@ -26,6 +26,7 @@ import java.util.Properties; import javax.swing.*; import com.github.weisj.darklaf.annotations.SynthesiseLaf; +import com.github.weisj.darklaf.properties.icons.IconLoader; import com.github.weisj.darklaf.theme.info.ColorToneRule; import com.github.weisj.darklaf.theme.info.PresetIconRule; import com.google.auto.service.AutoService; @@ -64,9 +65,10 @@ public class OneDarkTheme extends Theme { } @Override - public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults) { - super.customizeUIProperties(properties, currentDefaults); - loadCustomProperties("ui", properties, currentDefaults); + public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { + super.customizeUIProperties(properties, currentDefaults, iconLoader); + loadCustomProperties("ui", properties, currentDefaults, iconLoader); } @Override @@ -80,7 +82,8 @@ public class OneDarkTheme extends Theme { } @Override - public void customizeIconTheme(final Properties properties, final UIDefaults currentDefaults) { - loadCustomProperties("icons_adjustments", properties, currentDefaults); + public void customizeIconTheme(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { + loadCustomProperties("icons_adjustments", properties, currentDefaults, iconLoader); } } diff --git a/theme/src/main/java/com/github/weisj/darklaf/theme/SolarizedDarkTheme.java b/theme/src/main/java/com/github/weisj/darklaf/theme/SolarizedDarkTheme.java index 64a7317f..c47ce5e6 100644 --- a/theme/src/main/java/com/github/weisj/darklaf/theme/SolarizedDarkTheme.java +++ b/theme/src/main/java/com/github/weisj/darklaf/theme/SolarizedDarkTheme.java @@ -26,6 +26,7 @@ import java.util.Properties; import javax.swing.*; import com.github.weisj.darklaf.annotations.SynthesiseLaf; +import com.github.weisj.darklaf.properties.icons.IconLoader; import com.github.weisj.darklaf.theme.info.ColorToneRule; import com.github.weisj.darklaf.theme.info.PresetIconRule; import com.google.auto.service.AutoService; @@ -65,9 +66,10 @@ public class SolarizedDarkTheme extends Theme { } @Override - public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults) { - super.customizeUIProperties(properties, currentDefaults); - loadCustomProperties("ui", properties, currentDefaults); + public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { + super.customizeUIProperties(properties, currentDefaults, iconLoader); + loadCustomProperties("ui", properties, currentDefaults, iconLoader); } @Override diff --git a/theme/src/main/java/com/github/weisj/darklaf/theme/SolarizedLightTheme.java b/theme/src/main/java/com/github/weisj/darklaf/theme/SolarizedLightTheme.java index 5f88e503..60482f31 100644 --- a/theme/src/main/java/com/github/weisj/darklaf/theme/SolarizedLightTheme.java +++ b/theme/src/main/java/com/github/weisj/darklaf/theme/SolarizedLightTheme.java @@ -26,6 +26,7 @@ import java.util.Properties; import javax.swing.*; import com.github.weisj.darklaf.annotations.SynthesiseLaf; +import com.github.weisj.darklaf.properties.icons.IconLoader; import com.github.weisj.darklaf.theme.info.ColorToneRule; import com.github.weisj.darklaf.theme.info.PresetIconRule; import com.google.auto.service.AutoService; @@ -70,9 +71,10 @@ public class SolarizedLightTheme extends Theme { } @Override - public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults) { - super.customizeUIProperties(properties, currentDefaults); - loadCustomProperties("ui", properties, currentDefaults); + public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { + super.customizeUIProperties(properties, currentDefaults, iconLoader); + loadCustomProperties("ui", properties, currentDefaults, iconLoader); } @Override diff --git a/theme/src/main/java/com/github/weisj/darklaf/theme/Theme.java b/theme/src/main/java/com/github/weisj/darklaf/theme/Theme.java index 4c997e1b..1cbb0f1f 100644 --- a/theme/src/main/java/com/github/weisj/darklaf/theme/Theme.java +++ b/theme/src/main/java/com/github/weisj/darklaf/theme/Theme.java @@ -33,6 +33,7 @@ import javax.swing.*; import javax.swing.text.html.StyleSheet; import com.github.weisj.darklaf.properties.PropertyLoader; +import com.github.weisj.darklaf.properties.icons.IconLoader; import com.github.weisj.darklaf.theme.info.*; import com.github.weisj.darklaf.theme.laf.RenamedTheme; import com.github.weisj.darklaf.util.LogUtil; @@ -123,9 +124,11 @@ public abstract class Theme implements Comparable, Comparator, Ser * * @param properties the properties to load the values into. * @param currentDefaults the current ui defaults. + * @param iconLoader the icon loader. */ - public void loadDefaults(final Properties properties, final UIDefaults currentDefaults) { - PropertyLoader.putProperties(loadPropertyFile("defaults"), properties, currentDefaults); + public void loadDefaults(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { + PropertyLoader.putProperties(loadPropertyFile("defaults"), properties, currentDefaults, iconLoader); } /** @@ -139,7 +142,8 @@ public abstract class Theme implements Comparable, Comparator, Ser * @param properties the properties to load the values into. * @param currentDefaults the current ui defaults. */ - public void customizeGlobals(final Properties properties, final UIDefaults currentDefaults) {} + public void customizeGlobals(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) {} /** * Customize the icon defaults. @@ -152,7 +156,8 @@ public abstract class Theme implements Comparable, Comparator, Ser * @param properties the properties to load the value into. * @param currentDefaults the current ui defaults. */ - public void customizeIconTheme(final Properties properties, final UIDefaults currentDefaults) {} + public void customizeIconTheme(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) {} /** * Load the general properties file for the icon themes. @@ -164,8 +169,10 @@ public abstract class Theme implements Comparable, Comparator, Ser * * @param properties the properties to load the value into. * @param currentDefaults the current ui defaults. + * @param iconLoader the icon loader. */ - public void loadIconTheme(final Properties properties, final UIDefaults currentDefaults) { + public void loadIconTheme(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { PresetIconRule iconTheme = getPresetIconRule(); Properties props; switch (iconTheme) { @@ -179,7 +186,7 @@ public abstract class Theme implements Comparable, Comparator, Ser default: props = loadPropertyFile("icons"); } - PropertyLoader.putProperties(props, properties, currentDefaults); + PropertyLoader.putProperties(props, properties, currentDefaults, iconLoader); } /** @@ -192,7 +199,8 @@ public abstract class Theme implements Comparable, Comparator, Ser * @param properties the properties to load the values into. * @param currentDefaults the current ui defaults. */ - public void customizePlatformProperties(final Properties properties, final UIDefaults currentDefaults) {} + public void customizePlatformProperties(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) {} /** * Customize the ui defaults. @@ -204,7 +212,8 @@ public abstract class Theme implements Comparable, Comparator, Ser * @param properties the properties to load the values into. * @param currentDefaults the current ui defaults. */ - public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults) {} + public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) {} /** * The preset icon theme. @@ -224,10 +233,11 @@ public abstract class Theme implements Comparable, Comparator, Ser * @param propertySuffix the property suffix. * @param properties the properties to load into. * @param currentDefaults the current ui defaults. + * @param iconLoader the icon loader. */ protected final void loadCustomProperties(final String propertySuffix, final Properties properties, - final UIDefaults currentDefaults) { - PropertyLoader.putProperties(loadPropertyFile(propertySuffix), properties, currentDefaults); + final UIDefaults currentDefaults, final IconLoader iconLoader) { + PropertyLoader.putProperties(loadPropertyFile(propertySuffix), properties, currentDefaults, iconLoader); } /** @@ -269,7 +279,7 @@ public abstract class Theme implements Comparable, Comparator, Ser } properties.load(stream); } catch (final Exception e) { - LOGGER.log(Level.SEVERE, "Could not load " + name + ". " + e.getMessage(), e.getStackTrace()); + LOGGER.log(Level.SEVERE, "Could not load " + name + ". " + e.getMessage(), e); } return properties; } diff --git a/theme/src/main/java/com/github/weisj/darklaf/theme/ThemeDelegate.java b/theme/src/main/java/com/github/weisj/darklaf/theme/ThemeDelegate.java index 8ca08912..95231510 100644 --- a/theme/src/main/java/com/github/weisj/darklaf/theme/ThemeDelegate.java +++ b/theme/src/main/java/com/github/weisj/darklaf/theme/ThemeDelegate.java @@ -25,6 +25,7 @@ import java.util.Properties; import javax.swing.*; +import com.github.weisj.darklaf.properties.icons.IconLoader; import com.github.weisj.darklaf.theme.info.*; public class ThemeDelegate extends Theme { @@ -101,33 +102,39 @@ public class ThemeDelegate extends Theme { } @Override - public void loadDefaults(final Properties properties, final UIDefaults currentDefaults) { - getDelegate().loadDefaults(properties, currentDefaults); + public void loadDefaults(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { + getDelegate().loadDefaults(properties, currentDefaults, iconLoader); } @Override - public void customizeGlobals(final Properties properties, final UIDefaults currentDefaults) { - getDelegate().customizeGlobals(properties, currentDefaults); + public void customizeGlobals(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { + getDelegate().customizeGlobals(properties, currentDefaults, iconLoader); } @Override - public void customizeIconTheme(final Properties properties, final UIDefaults currentDefaults) { - getDelegate().customizeIconTheme(properties, currentDefaults); + public void customizeIconTheme(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { + getDelegate().customizeIconTheme(properties, currentDefaults, iconLoader); } @Override - public void loadIconTheme(final Properties properties, final UIDefaults currentDefaults) { - getDelegate().loadIconTheme(properties, currentDefaults); + public void loadIconTheme(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { + getDelegate().loadIconTheme(properties, currentDefaults, iconLoader); } @Override - public void customizePlatformProperties(final Properties properties, final UIDefaults currentDefaults) { - getDelegate().customizePlatformProperties(properties, currentDefaults); + public void customizePlatformProperties(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { + getDelegate().customizePlatformProperties(properties, currentDefaults, iconLoader); } @Override - public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults) { - getDelegate().customizeUIProperties(properties, currentDefaults); + public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults, + final IconLoader iconLoader) { + getDelegate().customizeUIProperties(properties, currentDefaults, iconLoader); } @Override diff --git a/theme/src/main/module/module-info.java b/theme/src/main/module/module-info.java index 115eefd8..05356640 100644 --- a/theme/src/main/module/module-info.java +++ b/theme/src/main/module/module-info.java @@ -22,16 +22,28 @@ * SOFTWARE. * */ -module darklaf.theme { +open module darklaf.theme { requires transitive java.desktop; - requires darklaf.annotations; - requires com.google.auto.service; requires darklaf.utils; requires darklaf.properties; + requires static darklaf.annotations; + requires static com.google.auto.service; + exports com.github.weisj.darklaf.theme; exports com.github.weisj.darklaf.theme.info; exports com.github.weisj.darklaf.theme.event; exports com.github.weisj.darklaf.theme.laf; + + uses com.github.weisj.darklaf.theme.laf.SynthesisedThemedLaf.ThemedLafProvider; + + provides com.github.weisj.darklaf.theme.Theme with + com.github.weisj.darklaf.theme.IntelliJTheme, + com.github.weisj.darklaf.theme.DarculaTheme, + com.github.weisj.darklaf.theme.OneDarkTheme, + com.github.weisj.darklaf.theme.HighContrastLightTheme, + com.github.weisj.darklaf.theme.HighContrastDarkTheme, + com.github.weisj.darklaf.theme.SolarizedLightTheme, + com.github.weisj.darklaf.theme.SolarizedDarkTheme; } diff --git a/utils/src/main/java/com/github/weisj/darklaf/util/StringUtil.java b/utils/src/main/java/com/github/weisj/darklaf/util/StringUtil.java index 0e8be391..312c45f2 100644 --- a/utils/src/main/java/com/github/weisj/darklaf/util/StringUtil.java +++ b/utils/src/main/java/com/github/weisj/darklaf/util/StringUtil.java @@ -198,4 +198,12 @@ public final class StringUtil { } return builder.toString(); } + + public static String orEmpty(final String str) { + return str != null ? str : ""; + } + + public static String orEmpty(final Object obj) { + return obj != null ? orEmpty(obj.toString()) : ""; + } } diff --git a/windows/src/main/java/com/github/weisj/darklaf/platform/windows/ui/WindowsTitlePane.java b/windows/src/main/java/com/github/weisj/darklaf/platform/windows/ui/WindowsTitlePane.java index 5ceac302..e7c7a676 100644 --- a/windows/src/main/java/com/github/weisj/darklaf/platform/windows/ui/WindowsTitlePane.java +++ b/windows/src/main/java/com/github/weisj/darklaf/platform/windows/ui/WindowsTitlePane.java @@ -43,6 +43,7 @@ import com.github.weisj.darklaf.util.LogUtil; import com.github.weisj.darklaf.util.PropertyKey; import com.github.weisj.darklaf.util.PropertyUtil; import com.github.weisj.darklaf.util.Scale; +import com.github.weisj.darklaf.util.StringUtil; /** @author Jannis Weis */ public class WindowsTitlePane extends CustomTitlePane { @@ -243,13 +244,13 @@ public class WindowsTitlePane extends CustomTitlePane { if (window != null) { if (!installDecorations()) return; if (window instanceof Frame) { - titleLabel.setText(((Frame) window).getTitle()); + titleLabel.setText(StringUtil.orEmpty(((Frame) window).getTitle())); setState(((Frame) window).getExtendedState()); } else { setState(0); } if (window instanceof Dialog) { - titleLabel.setText(((Dialog) window).getTitle()); + titleLabel.setText(StringUtil.orEmpty(((Dialog) window).getTitle())); } determineColors(); setActive(window.isActive()); @@ -938,7 +939,7 @@ public class WindowsTitlePane extends CustomTitlePane { getRootPane().repaint(); } } else if (PropertyKey.TITLE.equals(name)) { - titleLabel.setText(pce.getNewValue() == null ? "" : pce.getNewValue().toString()); + titleLabel.setText(StringUtil.orEmpty(pce.getNewValue())); doLayout(); repaint(); } else if (PropertyKey.COMPONENT_ORIENTATION.equals(name)) { diff --git a/windows/src/main/module/module-info.java b/windows/src/main/module/module-info.java index 3fd80e27..0870b36e 100644 --- a/windows/src/main/module/module-info.java +++ b/windows/src/main/module/module-info.java @@ -22,7 +22,7 @@ * SOFTWARE. * */ -module darklaf.platform.windows { +open module darklaf.platform.windows { requires transitive darklaf.platform.base; requires transitive darklaf.theme;