Changeset 2005 in josm for trunk/src/org/openstreetmap/josm/gui/MapFrame.java

Timestamp:

29.08.2009 15:51:00 (3 years ago)

Author:

Gubaer

Message:

fixed #2367: panel will be empty when undocked from minimized state
cleanup in Toggle Dialog
new: toggle dialog remember position when detached
new: title in toggle dialog
NOTE: this changeset probably breaks plugins, in particular the validator plugin

File:

• trunk/src/org/openstreetmap/josm/gui/MapFrame.java (modified) (4 diffs)

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

@@ -70 +70 @@
      * instead of adding directly to this list.
      */
-    public JPanel toggleDialogs = new JPanel();
-    public ArrayList<ToggleDialog> allDialogs = new ArrayList<ToggleDialog>();
+    private JPanel toggleDialogs = new JPanel();
+    private ArrayList<ToggleDialog> allDialogs = new ArrayList<ToggleDialog>();
 
     public final ButtonGroup toolGroup = new ButtonGroup();
@@ -135 +135 @@
     public void destroy() {
         for (ToggleDialog t : allDialogs) {
-            t.close();
+            t.closeDetachedDialog();
         }
         for (int i = 0; i < toolBarActions.getComponentCount(); ++i)
@@ -167 +167 @@
         for (Component c : toggleDialogs.getComponents()) {
             if (c instanceof ToggleDialog) {
-                boolean sel = Main.pref.getBoolean(((ToggleDialog)c).prefName+".visible");
-                ((ToggleDialog)c).action.button.setSelected(sel);
-                c.setVisible(sel);
+                ToggleDialog td = (ToggleDialog)c;
+                if (Main.pref.getBoolean(td.getPreferencePrefix()+".visible")) {
+                    td.showDialog();
+                }
             }
         }
@@ -179 +180 @@
      */
     public IconToggleButton addToggleDialog(ToggleDialog dlg) {
-        IconToggleButton button = new IconToggleButton(dlg.action);
-        dlg.action.button = button;
-        dlg.parent = toggleDialogs;
+        IconToggleButton button = new IconToggleButton(dlg.getToggleAction());
+        dlg.setParent(toggleDialogs);
         toolBarToggle.add(button);
         toggleDialogs.add(dlg);