Changeset 5631 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

Timestamp:

2012-12-25T23:43:22+01:00 (13 years ago)

Author:

Don-vip

Message:

Allow to access directly to validator preferences from validator dialog with a small preferences button left to pin button.
Generic approach in order to be reused by plugins using dialogs.
This leads to some changes in preferences settings system, but without any break in compatibility.
The only impact is the deprecation of some public JTabbedPane fields, that will be removed mid-2013.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

@@ -57 +57 @@
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.help.Helpful;
+import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
+import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.GBC;
@@ -139 +143 @@
      */
     protected JCheckBoxMenuItem windowMenuItem;
+    
+    /**
+     * The linked preferences class (optional). If set, accessible from the title bar with a dedicated button
+     */
+    protected Class<? extends PreferenceSetting> preferenceClass;
 
     /**
@@ -146 +155 @@
     public ToggleDialog(String name, String iconName, String tooltip, Shortcut shortcut, int preferredHeight) {
         this(name, iconName, tooltip, shortcut, preferredHeight, false);
+    }
+    /**
+     * Constructor
+     * (see below)
+     */
+    public ToggleDialog(String name, String iconName, String tooltip, Shortcut shortcut, int preferredHeight, boolean defShow) {
+        this(name, iconName, tooltip, shortcut, preferredHeight, defShow, null);
     }
     /**
@@ -156 +172 @@
      * @param preferredHeight the preferred height for the dialog
      * @param defShow if the dialog should be shown by default, if there is no preference
-     */
-    public ToggleDialog(String name, String iconName, String tooltip, Shortcut shortcut, int preferredHeight, boolean defShow) {
+     * @param prefClass the preferences settings class, or null if not applicable
+     */
+    public ToggleDialog(String name, String iconName, String tooltip, Shortcut shortcut, int preferredHeight, boolean defShow, Class<? extends PreferenceSetting> prefClass) {
         super(new BorderLayout());
         this.preferencePrefix = iconName;
         this.name = name;
+        this.preferenceClass = prefClass;
 
         /** Use the full width of the parent element */
@@ -522 +540 @@
                 add(buttonsHide);
             }
+            
+            // show the pref button if applicable
+            if (preferenceClass != null) {
+                inIcon = ImageProvider.get("preference");
+                smallIcon = new ImageIcon(inIcon.getImage().getScaledInstance(16 , 16, Image.SCALE_SMOOTH));
+                JButton pref = new JButton(smallIcon);
+                pref.setToolTipText(tr("Open preferences for this panel"));
+                pref.setBorder(BorderFactory.createEmptyBorder());
+                pref.addActionListener(
+                        new ActionListener(){
+                            @SuppressWarnings("unchecked")
+                            public void actionPerformed(ActionEvent e) {
+                                final PreferenceDialog p = new PreferenceDialog(Main.parent);
+                                if (TabPreferenceSetting.class.isAssignableFrom(preferenceClass)) {
+                                    p.selectPreferencesTabByClass((Class<? extends TabPreferenceSetting>) preferenceClass);
+                                } else if (SubPreferenceSetting.class.isAssignableFrom(preferenceClass)) {
+                                    p.selectSubPreferencesTabByClass((Class<? extends SubPreferenceSetting>) preferenceClass);
+                                }
+                                p.setVisible(true);
+                            }
+                        }
+                        );
+                add(pref);
+            }
 
             // show the sticky button