Changeset 2138 in josm for trunk

Timestamp:

2009-09-14T23:02:59+02:00 (15 years ago)

Author:

xeen

Message:

Add remember window geometry feature to extended dialog (see #3478)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DownloadAction.java (modified) (1 diff)
• gui/ExtendedDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/DownloadAction.java

@@ -46 +46 @@
 
         final String prefName = dialog.getClass().getName()+ ".geometry";
-        ExtendedDialog dialog = new ExtendedDialog(Main.parent, tr("Download"), new String[] {tr("OK"), tr("Cancel")}) {
-            @Override
-            public void setVisible(boolean visible) {
-                if (visible) {
-                    new WindowGeometry(
-                            prefName,
-                            WindowGeometry.centerInWindow(Main.parent, new Dimension(1000,600))
-                    ).apply(this);
-                } else {
-                    new WindowGeometry(this).remember(prefName);
-                }
-                super.setVisible(visible);
-            }
-        };
+        final WindowGeometry wg = WindowGeometry.centerInWindow(Main.parent,
+                new Dimension(1000,600));
+
+        ExtendedDialog dialog = new ExtendedDialog(Main.parent,
+                tr("Download"),
+                new String[] {tr("OK"), tr("Cancel")});
         dialog.setContent(downPanel, false /* don't use a scroll pane inside the dialog */);
         dialog.setButtonIcons(new String[] {"ok", "cancel"});
+        dialog.setRememberWindowGeometry(prefName, wg);
         return dialog;
     }

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

@@ -25 +25 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.WindowGeometry;
 
 
@@ -32 +33 @@
     public static final int DialogClosedOtherwise = 0;
     private boolean toggleable = false;
+    private String rememberSizePref = "";
+    private WindowGeometry defaultWindowGeometry = null;
     private String togglePref = "";
     private String toggleCheckboxText = tr("Do not show again");
@@ -59 +62 @@
      *   <li><code>toggleDisable</code></li>
      *   <li><code>setToggleCheckboxText</code></li>
+     *   <li><code>setRememberWindowGeometry</code></li>
      * </ul>
      * 
@@ -286 +290 @@
     @Override
     public void setVisible(boolean visible) {
-        super.setVisible(visible);
         if (visible) {
             repaint();
         }
+
+        // Ensure all required variables are available
+        if(!rememberSizePref.isEmpty() && defaultWindowGeometry != null) {
+            if(visible) {
+                new WindowGeometry(rememberSizePref,
+                        defaultWindowGeometry).apply(this);
+            } else {
+                new WindowGeometry(this).remember(rememberSizePref);
+            }
+        }
+        super.setVisible(visible);
+    }
+
+    /**
+     * Call this if you want the dialog to remember the size set by the user.
+     * Set the pref to <code>null</code> or to an empty string to disable again.
+     * By default, it's disabled.
+     * 
+     * Note: If you want to set the width of this dialog directly use the usual
+     * setSize, setPreferredSize, setMaxSize, setMinSize
+     * 
+     * @param pref  The preference to save the dimension to
+     * @param wg    The default window geometry that should be used if no
+     *              existing preference is found (only takes effect if
+     *              <code>pref</code> is not null or empty
+     * 
+     */
+    public void setRememberWindowGeometry(String pref, WindowGeometry wg) {
+        rememberSizePref = pref == null ? "" : pref;
+        defaultWindowGeometry = wg;
     }