Bug fix: Look and Feel Plugin: Cleaned up L&F Preferences UI.

Author: gerdwagner

sql12/core/doc/changes.txt

@@ -122,6 +122,8 @@ Table cell data popup now offers find, Xml/Json-reformatting and export function
 
 Bug fixes:
 
+Look and Feel Plugin: Cleaned up L&F Preferences UI.
+
 #1532 MS Excel export: Fixed NoSuchMethodError
 
 SQL result tab header marks:

sql12/core/src/net/sourceforge/squirrel_sql/fw/gui/OutputLabel.java

@@ -17,7 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-import java.awt.Dimension;
 
 import javax.swing.JLabel;
 /**
@@ -28,17 +27,6 @@
  */
 public class OutputLabel extends JLabel
 {
-	/** Default preferred width. */
-	public static final int PREF_WIDTH = 200;
-
-	/**
-	 * Default ctor.
-	 */
-	public OutputLabel()
-	{
-		super();
-		commonCtor();
-	}
 
 	/**
 	 * Ctor specifying text.
@@ -48,7 +36,6 @@ public OutputLabel()
 	public OutputLabel(String text)
 	{
 		super(text);
-		commonCtor();
 		setToolTipText(text);
 	}
 
@@ -62,14 +49,4 @@ public void setText(String text)
 		super.setText(text);
 		setToolTipText(text);
 	}
-
-	/**
-	 * Common ctor code.
-	 */
-	private void commonCtor()
-	{
-		Dimension ps = getPreferredSize();
-		ps.width = PREF_WIDTH;
-		setPreferredSize(ps);
-	}
 }

sql12/plugins/laf/src/net/sourceforge/squirrel_sql/plugins/laf/I18NStrings.properties

@@ -31,6 +31,4 @@ 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. 
 
-SubstanceLookAndFeelController.substanceSkinLabel=Substance Skin:RadianceLookAndFeelController.radianceSkinLabel=Radiance Skin:
-
-RadianceLookAndFeelController.radianceSkinLabel=Radiance Skin:RadianceLookAndFeelController.radianceSkinLabel=Radiance Skin:
+RadianceLookAndFeelController.radianceSkinLabel=Radiance Skin:

sql12/plugins/laf/src/net/sourceforge/squirrel_sql/plugins/laf/LAFPreferencesPanel.java

@@ -1,5 +1,6 @@
 package net.sourceforge.squirrel_sql.plugins.laf;
 
+import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
 import net.sourceforge.squirrel_sql.fw.gui.MultipleLineLabel;
 import net.sourceforge.squirrel_sql.fw.util.StringManager;
 import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -10,7 +11,7 @@
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.SwingConstants;
+import javax.swing.JTextField;
 import javax.swing.UIManager;
 import java.awt.Color;
 import java.awt.GridBagConstraints;
@@ -29,29 +30,6 @@ final class LAFPreferencesPanel extends JPanel
 
    private static ILogger s_log = LoggerController.createLogger(LAFPreferencesPanel.class);
 
-   /**
-    * This interface defines locale specific strings. This should be
-    * replaced with a property file.
-    */
-   interface LAFPreferencesPanelI18n
-   {
-      StringManager s_stringMgr = StringManagerFactory.getStringManager(LAFPreferencesPanelI18n.class);
-
-      // i18n[laf.lookAndFeel=Look and Feel:]
-      String LOOK_AND_FEEL = s_stringMgr.getString("laf.lookAndFeel");
-      // i18n[laf.lafWarning=Note: Controls may not be drawn correctly after changes in this panel until the application is restarted.]
-      String LAF_WARNING = s_stringMgr.getString("laf.lafWarning");
-      // i18n[laf.lf=L & F]
-      String TAB_TITLE = s_stringMgr.getString("laf.lf");
-      // i18n[laf.settings=Look and Feel settings]
-      String TAB_HINT = s_stringMgr.getString("laf.settings");
-      // i18n[laf.jars=L & F jars:]
-      String LAF_LOC = s_stringMgr.getString("laf.jars");
-      // i18n[laf.lafPerformanceWarning=Also note: Some Look and Feels may cause performance problems.
-// If you think your selected Look and Feel slows down SQuirreL switch to a Metal or Plastic Look and Feel.]
-      String LAF_CRITICAL_WARNING = s_stringMgr.getString("laf.lafCriticalWarning");
-   }
-
    private LookAndFeelComboBox _lafCmb = new LookAndFeelComboBox();
    private JCheckBox _allowSetBorder = new JCheckBox(s_stringMgr.getString("laf.allowsetborder"));
 
@@ -77,8 +55,6 @@ interface LAFPreferencesPanelI18n
     */
    private BaseLAFPreferencesPanelComponent _curLAFConfigComp;
 
-
-
    LAFPreferencesPanel(LAFPlugin plugin, LAFRegister lafRegister)
    {
       super(new GridBagLayout());
@@ -146,10 +122,10 @@ private void createUserInterface()
       add(_lafPnl, gbc);
 
       gbc = new GridBagConstraints(0,1,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(4, 4, 4, 4),0,0);
-      add(new MultipleLineLabel(LAFPreferencesPanelI18n.LAF_WARNING), gbc);
+      add(new MultipleLineLabel(s_stringMgr.getString("laf.lafWarning")), gbc);
 
       gbc = new GridBagConstraints(0,2,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(4, 4, 4, 4),0,0);
-      MultipleLineLabel enforedWarningLabel = new MultipleLineLabel(LAFPreferencesPanelI18n.LAF_CRITICAL_WARNING);
+      MultipleLineLabel enforedWarningLabel = new MultipleLineLabel(s_stringMgr.getString("laf.lafCriticalWarning"));
       enforedWarningLabel.setForeground(Color.red);
       add(enforedWarningLabel, gbc);
 
@@ -165,22 +141,26 @@ private JPanel createLookAndFeelPanel()
       GridBagConstraints gbc = new GridBagConstraints();
 
       gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(4, 4, 4, 4),0,0);
-      ret.add(new JLabel(LAFPreferencesPanelI18n.LOOK_AND_FEEL, SwingConstants.RIGHT), gbc);
+      ret.add(new JLabel(s_stringMgr.getString("laf.lookAndFeel")), gbc);
 
       gbc = new GridBagConstraints(1,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(4, 4, 4, 4),0,0);
       ret.add(_lafCmb, gbc);
 
 
       gbc = new GridBagConstraints(0,1,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(4, 4, 4, 4),0,0);
-      ret.add(new JLabel(LAFPreferencesPanelI18n.LAF_LOC, SwingConstants.RIGHT), gbc);
+      ret.add(new JLabel(s_stringMgr.getString("laf.jars")), gbc);
 
-      gbc = new GridBagConstraints(1,1,1,1,1,0,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(4, 4, 4, 4),0,0);
-      ret.add(new MultipleLineLabel(_plugin.getLookAndFeelFolder().getAbsolutePath()), gbc);
+      gbc = new GridBagConstraints(1,1,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(4, 4, 4, 4),0,0);
+      ret.add(GUIUtils.styleTextFieldToCopyableLabel(new JTextField(_plugin.getLookAndFeelFolder().getAbsolutePath())), gbc);
 
 
-      gbc = new GridBagConstraints(0,2,2,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(4, 0, 4, 4),0,0);
+      gbc = new GridBagConstraints(0,2,GridBagConstraints.REMAINDER, 1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(4, 0, 4, 4),0,0);
+      //_configHolderPnl.setBorder(BorderFactory.createLineBorder(Color.red));
       ret.add(_configHolderPnl, gbc);
 
+      gbc = new GridBagConstraints(1,3,GridBagConstraints.REMAINDER, 1,1,1,GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0),0,0);
+      ret.add(new JPanel(), gbc);
+
       return ret;
    }
 

sql12/plugins/laf/src/net/sourceforge/squirrel_sql/plugins/laf/LAFPreferencesTab.java

@@ -122,7 +122,7 @@ public void applyChanges()
 	 */
 	public String getTitle()
 	{
-		return LAFPreferencesPanel.LAFPreferencesPanelI18n.TAB_TITLE;
+		return s_stringMgr.getString("laf.lf");
 	}
 
 	/**
@@ -132,7 +132,6 @@ public String getTitle()
 	 */
 	public String getHint()
 	{
-		return LAFPreferencesPanel.LAFPreferencesPanelI18n.TAB_HINT;
+		return s_stringMgr.getString("laf.settings");
 	}
-
 }

sql12/plugins/laf/src/net/sourceforge/squirrel_sql/plugins/laf/RadianceLookAndFeelController.java

@@ -142,11 +142,6 @@ public BaseLAFPreferencesPanelComponent getPreferencesComponent() {
 
 	private static final class RadianceSkinPrefsPanel extends BaseLAFPreferencesPanelComponent {
 
-		interface SkinPrefsPanelI18n {
-			// i18n[RadianceLookAndFeelController.radianceSkinLabel=Radiance Skin:]
-			String THEME_PACK = s_stringMgr.getString("RadianceLookAndFeelController.radianceSkinLabel");
-		}
-
 		private RadianceLookAndFeelController _ctrl;
 
 		private JComboBox _skinCmb = new JComboBox();
@@ -165,7 +160,7 @@ private void createUserInterface() {
 
 			gbc.gridx = 0;
 			gbc.gridy = 0;
-			add(new JLabel(SkinPrefsPanelI18n.THEME_PACK, SwingConstants.RIGHT), gbc);
+			add(new JLabel(s_stringMgr.getString("RadianceLookAndFeelController.radianceSkinLabel"), SwingConstants.RIGHT), gbc);
 
 			++gbc.gridx;
 			add(_skinCmb, gbc);

sql12/plugins/laf/src/net/sourceforge/squirrel_sql/plugins/laf/SkinLookAndFeelController.java

@@ -19,13 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-import net.sourceforge.squirrel_sql.fw.gui.DirectoryListComboBox;
-import net.sourceforge.squirrel_sql.fw.gui.OutputLabel;
-import net.sourceforge.squirrel_sql.fw.id.IHasIdentifier;
-import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
-import net.sourceforge.squirrel_sql.fw.id.IntegerIdentifier;
 import net.sourceforge.squirrel_sql.fw.util.DuplicateObjectException;
-import net.sourceforge.squirrel_sql.fw.util.FileExtensionFilter;
 import net.sourceforge.squirrel_sql.fw.util.FileWrapper;
 import net.sourceforge.squirrel_sql.fw.util.FileWrapperFactory;
 import net.sourceforge.squirrel_sql.fw.util.FileWrapperFactoryImpl;
@@ -36,12 +30,7 @@
 import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
 import net.sourceforge.squirrel_sql.fw.xml.XMLObjectCache;
 
-import javax.swing.JLabel;
 import javax.swing.LookAndFeel;
-import javax.swing.SwingConstants;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -54,8 +43,7 @@
  */
 public class SkinLookAndFeelController extends DefaultLookAndFeelController
 {
-	private static final StringManager s_stringMgr =
-		StringManagerFactory.getStringManager(SkinLookAndFeelController.class);
+	private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(SkinLookAndFeelController.class);
 
 	/** Logger for this class. */
 	private static final ILogger s_log = LoggerController.createLogger(SkinLookAndFeelController.class);
@@ -170,120 +158,8 @@ public void setFileWrapperFactory(FileWrapperFactory fileWrapperFactory)
 		this.fileWrapperFactory = fileWrapperFactory;
 	}
 
-	private static final class SkinPrefsPanel extends BaseLAFPreferencesPanelComponent
+	public SkinPreferences getSkinPreferences()
 	{
-
-		/**
-		 * This interface defines locale specific strings. This should be replaced with a property file.
-		 */
-		interface SkinPrefsPanelI18n
-		{
-			// i18n[laf.skinThemPack=Theme Pack:]
-			String THEME_PACK = s_stringMgr.getString("laf.skinThemPack");
-
-			// i18n[laf.skinThemePackDir=Theme Pack Directory:]
-			String THEMEPACK_LOC = s_stringMgr.getString("laf.skinThemePackDir");
-		}
-
-		private SkinLookAndFeelController _ctrl;
-
-		private DirectoryListComboBox _themePackCmb = new DirectoryListComboBox();
-
-		SkinPrefsPanel(SkinLookAndFeelController ctrl)
-		{
-			super(new GridBagLayout());
-			_ctrl = ctrl;
-			createUserInterface();
-		}
-
-		private void createUserInterface()
-		{
-			final GridBagConstraints gbc = new GridBagConstraints();
-			gbc.anchor = GridBagConstraints.WEST;
-			gbc.fill = GridBagConstraints.HORIZONTAL;
-			gbc.insets = new Insets(4, 4, 4, 4);
-
-			gbc.gridx = 0;
-			gbc.gridy = 0;
-			add(new JLabel(SkinPrefsPanelI18n.THEME_PACK, SwingConstants.RIGHT), gbc);
-
-			++gbc.gridx;
-			add(_themePackCmb, gbc);
-
-			gbc.gridx = 0;
-			++gbc.gridy;
-			add(new JLabel(SkinPrefsPanelI18n.THEMEPACK_LOC, SwingConstants.RIGHT), gbc);
-
-			++gbc.gridx;
-			final String themePackDir = _ctrl._prefs.getThemePackDirectory();
-			add(new OutputLabel(themePackDir), gbc);
-		}
-
-		/**
-		 * @see BaseLAFPreferencesPanelComponent#loadPreferencesPanel()
-		 */
-		public void loadPreferencesPanel()
-		{
-			super.loadPreferencesPanel();
-			final String themePackDir = _ctrl._prefs.getThemePackDirectory();
-			// i18n[laf.jarZip=JAR/Zip files]
-			final FileExtensionFilter filter = new FileExtensionFilter(s_stringMgr.getString("laf.jarZip"), new String[] { ".jar", ".zip" });
-			_themePackCmb.load(new File(themePackDir), filter);
-			_themePackCmb.setSelectedItem(_ctrl._prefs.getThemePackName());
-			if (_themePackCmb.getSelectedIndex() == -1 && _themePackCmb.getModel().getSize() > 0)
-			{
-				_themePackCmb.setSelectedIndex(0);
-			}
-		}
-
-		/**
-		 * @see BaseLAFPreferencesPanelComponent#applyChanges()
-		 */
-		public boolean applyChanges()
-		{
-			super.applyChanges();
-			_ctrl._prefs.setThemePackName((String) _themePackCmb.getSelectedItem());
-
-			// Force the LAF to be set even if Skin is the current one. This
-			// allows a change in theme to take affect.
-			return true;
-		}
-	}
-
-	public static final class SkinPreferences implements IHasIdentifier
-	{
-		private String _themePackDir;
-
-		private String _themePackName;
-
-		private IntegerIdentifier _id = new IntegerIdentifier(1);
-
-		public String getThemePackDirectory()
-		{
-			return _themePackDir;
-		}
-
-		public void setThemePackDirectory(String value)
-		{
-			_themePackDir = value;
-		}
-
-		public String getThemePackName()
-		{
-			return _themePackName;
-		}
-
-		public void setThemePackName(String value)
-		{
-			_themePackName = value;
-		}
-
-		/**
-		 * @return The unique identifier for this object.
-		 */
-		public IIdentifier getIdentifier()
-		{
-			return _id;
-		}
+		return _prefs;
 	}
 }