From 17918562fc640200aac8054058c307334305c906 Mon Sep 17 00:00:00 2001 From: dragonmacher <48328597+dragonmacher@users.noreply.github.com> Date: Mon, 28 Nov 2022 10:42:31 -0500 Subject: [PATCH] GP-2879 - Fixed theme typos --- .../java/docking/theme/gui/ThemeDialog.java | 49 +++++++++---------- .../java/docking/theme/gui/ThemeUtils.java | 26 +++++----- 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/Ghidra/Framework/Docking/src/main/java/docking/theme/gui/ThemeDialog.java b/Ghidra/Framework/Docking/src/main/java/docking/theme/gui/ThemeDialog.java index 8ff6662636..d6330a0607 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/theme/gui/ThemeDialog.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/theme/gui/ThemeDialog.java @@ -69,21 +69,21 @@ public class ThemeDialog extends DialogComponentProvider { } private void createActions() { - DockingAction reloadDefaultsAction = new ActionBuilder("Reload Ghidra Defaults", getTitle()) + DockingAction reloadDefaultsAction = new ActionBuilder("Reload Theme Defaults", getTitle()) .toolBarIcon(new GIcon("icon.refresh")) .helpLocation(new HelpLocation("Theming", "Reload_Ghidra_Defaults")) .onAction(e -> reloadDefaultsCallback()) .build(); addAction(reloadDefaultsAction); - DockingAction resetValueAction = new ActionBuilder("Restore Value", getTitle()) - .popupMenuPath("Restore Value") - .withContext(ThemeTableContext.class) - .enabledWhen(c -> c.isChanged()) - .popupWhen(c -> true) - .helpLocation(new HelpLocation("Theming", "Restore_Value")) - .onAction(c -> c.getThemeValue().installValue(themeManager)) - .build(); + DockingAction resetValueAction = + new ActionBuilder("Restore Value", getTitle()).popupMenuPath("Restore Value") + .withContext(ThemeTableContext.class) + .enabledWhen(c -> c.isChanged()) + .popupWhen(c -> true) + .helpLocation(new HelpLocation("Theming", "Restore_Value")) + .onAction(c -> c.getThemeValue().installValue(themeManager)) + .build(); addAction(resetValueAction); } @@ -97,8 +97,8 @@ public class ThemeDialog extends DialogComponentProvider { private boolean handleChanges() { if (themeManager.hasThemeChanges()) { - int result = OptionDialog.showYesNoCancelDialog(null, "Close Theme Dialog", - "You have changed the theme.\n Do you want save your changes?"); + int result = OptionDialog.showYesNoCancelDialog(null, "Save Theme Changes?", + "You have changed the theme.\n Do you want to save your changes?"); if (result == OptionDialog.CANCEL_OPTION) { return false; } @@ -116,24 +116,22 @@ public class ThemeDialog extends DialogComponentProvider { private void restoreCallback() { if (themeManager.hasThemeChanges()) { - int result = OptionDialog.showYesNoDialog(null, "Restore Theme Values", - "Are you sure you want to discard all your changes?"); - if (result == OptionDialog.NO_OPTION) { - return; + int result = OptionDialog.showYesNoDialog(null, "Discard Theme Changes?", + "This will discard all of your theme changes. Continue?"); + if (result == OptionDialog.YES_OPTION) { + themeManager.restoreThemeValues(); } } - themeManager.restoreThemeValues(); } private void reloadDefaultsCallback() { if (themeManager.hasThemeChanges()) { - int result = OptionDialog.showYesNoDialog(null, "Reload Ghidra Default Values", - "This will discard all your theme changes. Continue?"); - if (result == OptionDialog.NO_OPTION) { - return; + int result = OptionDialog.showYesNoDialog(null, "Reload Default Theme Values?", + "This will discard all of your theme changes. Continue?"); + if (result == OptionDialog.YES_OPTION) { + themeManager.reloadApplicationDefaults(); } } - themeManager.reloadApplicationDefaults(); } private void reset() { @@ -154,14 +152,15 @@ public class ThemeDialog extends DialogComponentProvider { Swing.runLater(() -> updateCombo()); return; } - String themeName = (String) e.getItem(); + String themeName = (String) e.getItem(); Swing.runLater(() -> { GTheme theme = themeManager.getTheme(themeName); themeManager.setTheme(theme); if (theme.getLookAndFeelType() == LafType.GTK) { setStatusText( - "Warning - Themes using the GTK LookAndFeel do not support changing java component colors, fonts or icons.", + "Warning - Themes using the GTK LookAndFeel do not support changing java " + + "component colors, fonts or icons.", MessageType.ERROR); } else { @@ -240,7 +239,7 @@ public class ThemeDialog extends DialogComponentProvider { restoreButton.setMnemonic('R'); restoreButton.setName("Restore"); restoreButton.addActionListener(e -> restoreCallback()); - restoreButton.setToolTipText("Restores all values to current theme"); + restoreButton.setToolTipText("Restores all previous values to current theme"); return restoreButton; } @@ -280,7 +279,7 @@ public class ThemeDialog extends DialogComponentProvider { return contextProvider.getActionContext(event); } - class DialogThemeListener implements ThemeListener { + private class DialogThemeListener implements ThemeListener { @Override public void themeChanged(ThemeEvent event) { if (event.haveAllValuesChanged()) { diff --git a/Ghidra/Framework/Docking/src/main/java/docking/theme/gui/ThemeUtils.java b/Ghidra/Framework/Docking/src/main/java/docking/theme/gui/ThemeUtils.java index 25265bb6ef..9ed8942972 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/theme/gui/ThemeUtils.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/theme/gui/ThemeUtils.java @@ -47,12 +47,12 @@ public class ThemeUtils { public static boolean askToSaveThemeChanges(ThemeManager themeManager) { if (themeManager.hasThemeChanges()) { int result = OptionDialog.showYesNoCancelDialog(null, "Save Theme Changes?", - "You have made changes to the theme.\n Do you want save your changes?"); + "You have made changes to the theme.\n Do you want to save your changes?"); if (result == OptionDialog.CANCEL_OPTION) { return false; } if (result == OptionDialog.YES_OPTION) { - return ThemeUtils.saveThemeChanges(themeManager); + return saveThemeChanges(themeManager); } themeManager.reloadApplicationDefaults(); } @@ -108,19 +108,21 @@ public class ThemeUtils { } static void importTheme(ThemeManager themeManager, File themeFile) { - if (!ThemeUtils.askToSaveThemeChanges(themeManager)) { + if (!askToSaveThemeChanges(themeManager)) { return; } GTheme startingTheme = themeManager.getActiveTheme(); try { - GTheme imported = GTheme.loadTheme(themeFile); - // by setting the theme, we can let the normal save handle all the edge cases + // + // By setting the theme, we can let the normal save handle all the edge cases, // such as if a theme with that names exists and if so, should it be overwritten? // Also, the imported theme may contain default values which we don't want to save. So // by going through the usual save mechanism, only values that differ from defaults // be saved. + // + GTheme imported = GTheme.loadTheme(themeFile); themeManager.setTheme(imported); - if (!ThemeUtils.saveThemeChanges(themeManager)) { + if (!saveThemeChanges(themeManager)) { themeManager.setTheme(startingTheme); } } @@ -137,7 +139,7 @@ public class ThemeUtils { * @param themeManager the ThemeManager that actually does the export */ public static void exportTheme(ThemeManager themeManager) { - if (!ThemeUtils.askToSaveThemeChanges(themeManager)) { + if (!askToSaveThemeChanges(themeManager)) { return; } boolean hasExternalIcons = !themeManager.getActiveTheme().getExternalIconFiles().isEmpty(); @@ -178,12 +180,14 @@ public class ThemeUtils { } if (themeManager.getActiveTheme().equals(selectedTheme)) { Msg.showWarn(ThemeUtils.class, null, "Delete Failed", - "Can't delete the current theme."); + "Cannot delete the active theme."); return; } + GTheme fileTheme = selectedTheme; - int result = OptionDialog.showYesNoDialog(null, "Delete Theme: " + fileTheme.getName(), - "Are you sure you want to delete theme " + fileTheme.getName()); + int result = + OptionDialog.showYesNoDialog(null, "Delete Theme: " + fileTheme.getName() + "?", + "Are you sure you want to delete theme " + fileTheme.getName()); if (result == OptionDialog.YES_OPTION) { themeManager.deleteTheme(fileTheme); } @@ -235,9 +239,7 @@ public class ThemeUtils { "Error writing theme file: " + newTheme.getFile().getAbsolutePath(), e); return false; } - return true; - } private static File getSaveFile(String themeName) {