Feature: Look and Feel Plugin: The Look and Feel preferences now allows to adjust several controls,

  e.g the SQL editor and the message panel, to dark Look and Feels.
  See menu File -- > Global Preferences --> tab "L & F"
  Note: This option replaces the previous theme choice at tab "General".
  The new option now does support any Look and Feel instead of only FlatLaf's Flat Dark

Author: gerdwagner

sql12/core/doc/changes.txt

@@ -6,6 +6,12 @@ Not yet released, available in our GIT repository, snapshots and future releases
 
 Enhancements:
 
+Look and Feel Plugin: The Look and Feel preferences now allows to adjust several controls,
+  e.g the SQL editor and the message panel, to dark Look and Feels.
+  See menu File -- > Global Preferences --> tab "L & F"
+  Note: This option replaces the previous theme choice at tab "General".
+  The new option now does support any Look and Feel instead of only FlatLaf's Flat Dark
+
 Look and Feel Plugin: The following dark radiance L&Fs are available:
   Graphite,GraphiteChalk,GraphiteAqua,GraphiteElectric,GraphiteGold,GraphiteSienna,GraphiteSunset,GraphiteGlass
   Raven,NightShade,Twilight,Magellan

sql12/core/src/net/sourceforge/squirrel_sql/client/preferences/GeneralPreferencesGUI.java

@@ -1,7 +1,6 @@
 package net.sourceforge.squirrel_sql.client.preferences;
 
 import net.sourceforge.squirrel_sql.client.gui.db.passwordaccess.PasswordAccessPrefsCtrl;
-import net.sourceforge.squirrel_sql.client.preferences.themes.ThemesController;
 import net.sourceforge.squirrel_sql.client.session.messagepanel.MessagePrefsCtrl;
 import net.sourceforge.squirrel_sql.client.util.ApplicationFiles;
 import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
@@ -257,11 +256,11 @@ private JPanel createAppearancePanel()
       ++gbc.gridy;
       pnl.add(createValuePopupPanel(), gbc);
 
-      ++gbc.gridy;
-      final GridBagConstraints gbcThemes = (GridBagConstraints) gbc.clone();
-      gbcThemes.fill = GridBagConstraints.NONE;
-      gbcThemes.anchor = GridBagConstraints.NORTHWEST;
-      pnl.add(new ThemesController(_messagePrefsCtrl).getPanel(), gbcThemes);
+      //++gbc.gridy;
+      //final GridBagConstraints gbcThemes = (GridBagConstraints) gbc.clone();
+      //gbcThemes.fill = GridBagConstraints.NONE;
+      //gbcThemes.anchor = GridBagConstraints.NORTHWEST;
+      //pnl.add(new ThemesController(_messagePrefsCtrl).getPanel(), gbcThemes);
 
       ++gbc.gridy;
       final GridBagConstraints gbcMessagePanel = (GridBagConstraints) gbc.clone();

sql12/core/src/net/sourceforge/squirrel_sql/client/preferences/GlobalPreferencesSheet.java

@@ -36,8 +36,17 @@
 import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
 import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
+import javax.swing.WindowConstants;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
@@ -58,9 +67,6 @@ public class GlobalPreferencesSheet extends DialogWidget
 
    private final static ILogger s_log = LoggerController.createLogger(GlobalPreferencesSheet.class);
 
-   /**
-    * Singleton instance of this class.
-    */
    private static GlobalPreferencesSheet s_instance;
 
    /**
@@ -91,14 +97,13 @@ private GlobalPreferencesSheet(boolean toUseByPreferencesFinderOnly)
 
       createGUI();
 
-      for (Iterator<IGlobalPreferencesPanel> it = _globalPreferencesPanels.iterator(); it.hasNext(); )
+      for(IGlobalPreferencesPanel pnl : _globalPreferencesPanels)
       {
-         IGlobalPreferencesPanel pnl = it.next();
          try
          {
             pnl.initialize(Main.getApplication());
          }
-         catch (Throwable th)
+         catch(Throwable th)
          {
             final String msg = s_stringMgr.getString("GlobalPreferencesSheet.error.loading", pnl.getTitle());
             s_log.error(msg, th);
@@ -217,9 +222,8 @@ public void dispose()
       Props.putInt(PREF_KEY_GLOBAL_PREFS_SHEET_WIDTH, size.width);
       Props.putInt(PREF_KEY_GLOBAL_PREFS_SHEET_HEIGHT, size.height);
 
-      for (Iterator<IGlobalPreferencesPanel> it = _globalPreferencesPanels.iterator(); it.hasNext(); )
+      for(IGlobalPreferencesPanel pnl : _globalPreferencesPanels)
       {
-         IGlobalPreferencesPanel pnl = it.next();
          pnl.uninitialize(Main.getApplication());
       }
 
@@ -257,14 +261,13 @@ private void performOk()
       cursorChg.show();
       try
       {
-         for (Iterator<IGlobalPreferencesPanel> it = _globalPreferencesPanels.iterator(); it.hasNext(); )
+         for(IGlobalPreferencesPanel pnl : _globalPreferencesPanels)
          {
-            IGlobalPreferencesPanel pnl = it.next();
             try
             {
                pnl.applyChanges();
             }
-            catch (Throwable th)
+            catch(Throwable th)
             {
                final String msg = s_stringMgr.getString("GlobalPreferencesSheet.error.saving", pnl.getTitle());
                s_log.error(msg, th);

sql12/core/src/net/sourceforge/squirrel_sql/client/preferences/themes/I18NStrings.properties

@@ -1,19 +1,6 @@
 ThemesEnum.light=Light
 ThemesEnum.dark=Dark
 
-ThemesPanel.chose.theme.label=Choose theme (requires restart)
-
-ThemesPanel.apply=Apply...
-
 LAFPluginAccessor.lafPluginNeeded=Setting themes is only available with the Look and Feel Plugin.\nGet the plugin from www.squirrelsql.org. It's free.
 
-ThemesController.apply.dark.theme=This will make SQuirreL appear dark by changing Look&Feel to FlatLaf with theme Flat Dark.\n\
-  All background colors of the SQL editor will be set to black and some of its foreground colors will be adjusted.\n\
-  Please restart SQuirreL after this function was executed.\n\
-  Do you wish to continue?
-
-ThemesController.apply.light.theme=This will set SQuirreL to its standard Look&Feel and SQL editor colors.\n\
-    Please restart SQuirreL after this function was executed.\n\
-    Do you wish to continue?
-
 SyntaxPluginAccessor.syntaxPluginNeeded=Syntax Highlighting Plugin is not available.\nGet the plugin from www.squirrelsql.org. It's free.

sql12/core/src/net/sourceforge/squirrel_sql/client/preferences/themes/ThemesController.java

@@ -141,27 +141,27 @@ public void applyChanges(SquirrelPreferences prefs)
       Main.getApplication().getMainFrame().getMessagePanel().applyMessagePanelStyle(prefs);
    }
 
-   public void switchToLight()
-   {
-      loadData(new SquirrelPreferences()); // Setting to default
-      applyChanges(Main.getApplication().getSquirrelPreferences());
-   }
-
-   public void switchToDark()
-   {
-      final SquirrelPreferences darkThemePrefs = new SquirrelPreferences(); // Start with default
-
-       darkThemePrefs.setMessagePanelMessageForeground(Color.green.getRGB());
-       darkThemePrefs.setMessagePanelMessageBackground(Color.white.getRGB());
-       darkThemePrefs.setMessagePanelMessageHistoryForeground(Color.black.getRGB());
-       darkThemePrefs.setMessagePanelMessageHistoryBackground(Color.white.getRGB());
-
-       darkThemePrefs.setMessagePanelWarningForeground(Color.yellow.getRGB());
-       darkThemePrefs.setMessagePanelWarningBackground(Color.white.getRGB());
-       darkThemePrefs.setMessagePanelWarningHistoryForeground(Color.yellow.darker().darker().getRGB());
-       darkThemePrefs.setMessagePanelWarningHistoryBackground(Color.white.getRGB());
-
-       loadData(darkThemePrefs);
-       applyChanges(Main.getApplication().getSquirrelPreferences());
-   }
+   //public void switchToLight()
+   //{
+   //   loadData(new SquirrelPreferences()); // Setting to default
+   //   applyChanges(Main.getApplication().getSquirrelPreferences());
+   //}
+   //
+   //public void switchToDark()
+   //{
+   //   final SquirrelPreferences darkThemePrefs = new SquirrelPreferences(); // Start with default
+   //
+   //    darkThemePrefs.setMessagePanelMessageForeground(Color.green.getRGB());
+   //    darkThemePrefs.setMessagePanelMessageBackground(Color.white.getRGB());
+   //    darkThemePrefs.setMessagePanelMessageHistoryForeground(Color.black.getRGB());
+   //    darkThemePrefs.setMessagePanelMessageHistoryBackground(Color.white.getRGB());
+   //
+   //    darkThemePrefs.setMessagePanelWarningForeground(Color.yellow.getRGB());
+   //    darkThemePrefs.setMessagePanelWarningBackground(Color.white.getRGB());
+   //    darkThemePrefs.setMessagePanelWarningHistoryForeground(Color.yellow.darker().darker().getRGB());
+   //    darkThemePrefs.setMessagePanelWarningHistoryBackground(Color.white.getRGB());
+   //
+   //    loadData(darkThemePrefs);
+   //    applyChanges(Main.getApplication().getSquirrelPreferences());
+   //}
 }

sql12/core/src/net/sourceforge/squirrel_sql/client/preferences/themes/ThemesPanel.java

@@ -1,6 +1,6 @@
 
 laf.lookAndFeel=Look and Feel:
-laf.lafWarning=Note: Controls may not be drawn correctly after changes in this panel until the application is restarted.
+laf.lafWarningRestart=Note: Any change here requires to restart SQuirreL!
 laf.lf=L & F
 laf.settings=Look and Feel settings
 laf.jars=L & F jars:
@@ -31,4 +31,11 @@ laf.other=Other
 
 laf.lafCriticalWarning=Also note: Some Look and Feels may cause performance or even functional problems. If you think you are seeing such problems switch to a Metal Look and Feel. 
 
-RadianceLookAndFeelController.radianceSkinLabel=Radiance Skin:
+RadianceLookAndFeelController.radianceSkinLabel=Radiance Skin:
+
+LightDarkSwitchPanel.title=Light / Dark switch
+LightDarkSwitchPanel.description=When switching between light and dark Look and Feels you may adjust the SQL editor and other controls here.\n\
+  Note: Recommended dark Look and Feels are FlatLaf Dark, Dracula as well as Radiance Graphite..., Raven, NightShade.
+
+LightDarkSwitchPanel.light=Light
+LightDarkSwitchPanel.dark=Dark

sql12/core/src/net/sourceforge/squirrel_sql/client/session/messagepanel/MessagePrefsCtrl.java

@@ -147,7 +147,7 @@ public void applyChanges()
 	 */
 	public String getTitle()
 	{
-		return FontSelectionPanel.i18n.TAB_TITLE;
+		return s_stringMgr.getString("laf.tabTitle");
 	}
 
 	/**
@@ -157,27 +157,14 @@ public String getTitle()
 	 */
 	public String getHint()
 	{
-		return FontSelectionPanel.i18n.TAB_HINT;
+		return s_stringMgr.getString("laf.tabHint");
 	}
 
 	/**
 	 * "Fonts" panel to be displayed in the preferences dialog.
 	 */
 	private static final class FontSelectionPanel extends JPanel
 	{
-		/**
-		 * This interface defines locale specific strings. This should be
-		 * replaced with a property file.
-		 */
-		interface i18n
-		{
-			// i18n[laf.warning=Note: Changes may not take effect until the application is restarted.]
-			String LAF_WARNING =	s_stringMgr.getString("laf.warning");
-			// i18n[laf.tabTitle=Fonts]
-			String TAB_TITLE = s_stringMgr.getString("laf.tabTitle");
-			// i18n[laf.tabHint=Fonts]
-			String TAB_HINT = s_stringMgr.getString("laf.tabHint");
-		}
 
 		/** Button to select font for menus. */
 		private FontButton _menuFontBtn;
@@ -280,7 +267,7 @@ private void createUserInterface()
 
 			++gbc.gridy;
 			gbc.gridwidth = GridBagConstraints.REMAINDER;
-			add(new MultipleLineLabel(i18n.LAF_WARNING), gbc);
+			add(new MultipleLineLabel(s_stringMgr.getString("laf.warning")), gbc);
 		}
 
 		private JPanel createFontsPanel()