Changeset 4840 in josm for trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java

Timestamp:

2012-01-21T23:04:50+01:00 (12 years ago)

Author:

bastiK

Message:

expert mode rework:

• toggling of expert mode does not require restart
• checkbox at a more prominent places (MainMenu > View and in the preference dialog at the bottom)

File:

• trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java

@@ -13 +13 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.ExpertToggleAction;
+import org.openstreetmap.josm.actions.ExpertToggleAction.ExpertModeChangeListener;
 import org.openstreetmap.josm.tools.Destroyable;
 
@@ -21 +23 @@
  * @author imi, akks
  */
-public class IconToggleButton extends JToggleButton implements HideableButton, PropertyChangeListener, Destroyable {
+public class IconToggleButton extends JToggleButton implements HideableButton, PropertyChangeListener, Destroyable, ExpertModeChangeListener {
 
     public boolean groupbutton;
     private ShowHideButtonListener listener;
-    private boolean hideIfDisabled=false;
-    private boolean hiddenByDefault;
+    private boolean hideIfDisabled = false;
+    private boolean isExpert;
 
     /**
@@ -38 +40 @@
      * Construct the toggle button with the given action.
      */
-    public IconToggleButton(Action action, boolean hiddenByDefault) {
+    public IconToggleButton(Action action, boolean isExpert) {
         super(action);
-        this.hiddenByDefault = hiddenByDefault;
+        this.isExpert = isExpert;
         setText(null);
 
@@ -55 +57 @@
             }
         });
+
+        ExpertToggleAction.addExpertModeChangeListener(this);
     }
 
@@ -75 +79 @@
         }
     }
-    
+
     String getPreferenceKey() {
         String s = (String) getSafeActionValue("toolbar");
-        if (s==null) {
-            if (getAction()!=null) s=getAction().getClass().getName();
+        if (s == null) {
+            if (getAction()!=null) {
+                s = getAction().getClass().getName();
+            }
         }
         return "sidetoolbar.hidden."+s;
-        
+
     }
-    
+
+    @Override
+    public void expertChanged(boolean isExpert) {
+        applyButtonHiddenPreferences();
+    }
+
     @Override
     public void applyButtonHiddenPreferences() {
         boolean alwaysHideDisabled = Main.pref.getBoolean("sidetoolbar.hideDisabledButtons", false);
-        boolean hiddenFlag = Main.pref.getBoolean(getPreferenceKey(), hiddenByDefault);
-        if (!isEnabled() && (hideIfDisabled || alwaysHideDisabled)) 
-                setVisible(false);  // hide because of disabled button 
-            else 
-                setVisible( !hiddenFlag ); // show or hide, do what preferences say  
+        if (!isEnabled() && (hideIfDisabled || alwaysHideDisabled)) {
+            setVisible(false);  // hide because of disabled button
+        } else {
+            boolean hiddenFlag = false;
+            String hiddenFlagStr = Main.pref.get(getPreferenceKey(), null);
+            if (hiddenFlagStr == null) {
+                if (isExpert && !Main.main.menu.expert.isSelected()) {
+                    hiddenFlag = true;
+                }
+            } else {
+                hiddenFlag = Boolean.parseBoolean(hiddenFlagStr);
+            }
+            setVisible( !hiddenFlag ); // show or hide, do what preferences say
+        }
     }
 
@@ -101 +121 @@
             if (!b) listener.buttonShown(); else listener.buttonHidden();
         }
-        Main.pref.put(getPreferenceKey(), b);
+        if ((b && isExpert && !Main.main.menu.expert.isSelected()) ||
+            (!b && isExpert && Main.main.menu.expert.isSelected())) {
+            Main.pref.put(getPreferenceKey(), null);
+        } else {
+            Main.pref.put(getPreferenceKey(), b);
+        }
     }
-    
-    /* 
+
+    /*
      * This fuction should be called for plugins that want to enable auto-hiding
      * custom buttons when they are disabled (because of incorrect layer, for example)
      */
     public void setAutoHideDisabledButton(boolean b) {
-        hideIfDisabled=b;
-        if (b && !isEnabled()) setVisible(false);
+        hideIfDisabled = b;
+        if (b && !isEnabled()) {
+            setVisible(false);
+        }
     }
-    
+
     @Override
     public void showButton() {
         setButtonHidden(false);
     }
-    
+
     @Override
     public void hideButton() {