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

Timestamp:

2009-12-05T17:54:49+01:00 (14 years ago)

Author:

bastiK

Message:

Adjusted toggle dialog behavior for geoimage:

• When click on a thumbnail, show the detached dialog unless the side dialog is already open.
• When closing the detached dialog do not open it in the side dialog again, just close.
• When the toggle button is clicked, always open the side dialog.

File:

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

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

@@ -46 +46 @@
 public class ToggleDialog extends JPanel implements Helpful {
     /** The action to toggle this dialog */
-    private ToggleDialogAction toggleAction;
-    private String preferencePrefix;
+    protected ToggleDialogAction toggleAction;
+    protected String preferencePrefix;
 
     /** DialogsPanel that manages all ToggleDialogs */
-    private DialogsPanel dialogsPanel;
-
-    private TitleBar titleBar;
+    protected DialogsPanel dialogsPanel;
+
+    protected TitleBar titleBar;
 
     /**
      * Indicates whether the dialog is showing or not.
      */
-    private boolean isShowing;
+    protected boolean isShowing;
     /**
      * If isShowing is true, indicates whether the dialog is docked or not, e. g.
      * shown as part of the main window or as a seperate dialog window.
      */
-    private boolean isDocked;
+    protected boolean isDocked;
     /**
      * If isShowing and isDocked are true, indicates whether the dialog is
      * currently minimized or not.
      */
-    boolean isCollapsed;
+    protected boolean isCollapsed;
 
     /** the preferred height if the toggle dialog is expanded */
@@ -139 +139 @@
 
         public void actionPerformed(ActionEvent e) {
+            toggleButtonHook();
             if (isShowing) {
                 hideDialog();
@@ -204 +205 @@
         detachedDialog = new DetachedDialog();
         detachedDialog.setVisible(true);
+        setIsShowing(true);
         setIsDocked(false);
     }
@@ -213 +215 @@
     public void collapse() {
 //        if (isShowing && isDocked && !isCollapsed) {
+        if (isDialogInDefaultView()) {
             setContentVisible(false);
             setIsCollapsed(true);
@@ -220 +223 @@
             lblMinimized.setIcon(ImageProvider.get("misc", "minimized"));
             hideNotify();
-//        }
-//        else throw ...
+        }
+        else throw new IllegalStateException();
     }
 
@@ -229 +232 @@
     protected void expand() {
 //        if (isShowing && isDocked && isCollapsed) {
+        if (isDialogInCollapsedView()) {
             setContentVisible(true);
             setIsCollapsed(false);
@@ -235 +239 @@
             lblMinimized.setIcon(ImageProvider.get("misc", "normal"));
             showNotify();
-//        }
-//        else throw ...
+        }
+        else throw new IllegalStateException();
     }
 
@@ -392 +396 @@
                     getContentPane().removeAll();
                     dispose();
-                    dock();
-                    expand();
-                    dialogsPanel.reconstruct(Action.INVISIBLE_TO_DEFAULT, ToggleDialog.this);
+                    if (dockWhenClosingDetachedDlg()) {
+                        dock();
+                        if (isDialogInCollapsedView()) {
+                            expand();
+                        }
+                        dialogsPanel.reconstruct(Action.INVISIBLE_TO_DEFAULT, ToggleDialog.this);
+                    } else {
+                        hideDialog();
+                    }
                 }
             });
@@ -426 +436 @@
 
     /**
-     * Change the Geometry of the detached dialog to better fit the content.
-     * Overrride this to make it useful.
-     */
-    protected Rectangle getDetachedGeometry(Rectangle last) {
-        return last;
-    }
-
-    /**
-     * Default size of the detached dialog.
-     * Override this method to customize the initial dialog size.
-     */
-    protected Dimension getDefaultDetachedSize() {
-        return new Dimension(Main.map.DEF_TOGGLE_DLG_WIDTH, preferredHeight);
-    }
-
-    /**
      * Replies the action to toggle the visible state of this toggle dialog
      *
@@ -481 +475 @@
     }
 
-    private void setIsShowing(boolean val) {
+    protected void setIsShowing(boolean val) {
         isShowing = val;
         Main.pref.put(preferencePrefix+".visible", val);
     }
 
-    private void setIsDocked(boolean val) {
+    protected void setIsDocked(boolean val) {
         isDocked = val;
         Main.pref.put(preferencePrefix+".docked", val);
     }
 
-    private void setIsCollapsed(boolean val) {
+    protected void setIsCollapsed(boolean val) {
         isCollapsed = val;
         Main.pref.put(preferencePrefix+".minimized", val);
@@ -498 +492 @@
     public int getPreferredHeight() {
         return preferredHeight;
-    }
-
-    /**
-     * Replies true if this dialog is showing either as docked or as detached dialog
-     */
-    public boolean isDialogShowing() {
-        return isShowing;
-    }
-
-    /**
-     * Replies true if this dialog is docked and expanded
-     */
-    public boolean isDialogInDefaultView() {
-        return isShowing && isDocked && (! isCollapsed);
-    }
-
-    /**
-     * Replies true if this dialog is docked and collapsed
-     */
-    public boolean isDialogInCollapsedView() {
-        return isShowing && isDocked && isCollapsed;
     }
 
@@ -526 +499 @@
         return "Dialog/"+help;
     }
+    /**
+     * Replies true if this dialog is showing either as docked or as detached dialog
+     */
+    public boolean isDialogShowing() {
+        return isShowing;
+    }
+
+    /**
+     * Replies true if this dialog is docked and expanded
+     */
+    public boolean isDialogInDefaultView() {
+        return isShowing && isDocked && (! isCollapsed);
+    }
+
+    /**
+     * Replies true if this dialog is docked and collapsed
+     */
+    public boolean isDialogInCollapsedView() {
+        return isShowing && isDocked && isCollapsed;
+    }
+
+    /***
+     * The following methods are intended to be overridden, in order to customize
+     * the toggle dialog behavior.
+     **/
+
+    /**
+    * Change the Geometry of the detached dialog to better fit the content.
+    */
+    protected Rectangle getDetachedGeometry(Rectangle last) {
+        return last;
+    }
+
+    /**
+     * Default size of the detached dialog.
+     * Override this method to customize the initial dialog size.
+     */
+    protected Dimension getDefaultDetachedSize() {
+        return new Dimension(dialogsPanel.getWidth(), preferredHeight);
+    }
+
+    /**
+     * Do something when the toggleButton is pressed.
+     */
+    protected void toggleButtonHook() {
+    }
+
+    protected boolean dockWhenClosingDetachedDlg() {
+        return true;
+    }
+
+    /***
+     * End of override hooks
+     **/
 }