Changeset 6594 in josm for trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java

Timestamp:

2014-01-02T00:58:33+01:00 (12 years ago)

Author:

simon04

Message:

fix #8969 fix #9394 - add "Do not show again (this session)" choice, and in addition "Do not show again (this operation)" if a bulk operation has been marked in the code

The dialog displays 3 or 4 radio boxes with the labels:

• "Show this dialog again the next time"
• "Do not show again (this operation)"
• "Do not show again (this session)"
• "Do not show again (remembers choice)"

File:

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

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

@@ -20 +20 @@
 import javax.swing.Icon;
 import javax.swing.JButton;
-import javax.swing.JCheckBox;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
@@ -79 +78 @@
     private String togglePref = "";
     private int toggleValue = -1;
-    private String toggleCheckboxText = tr("Do not show again (remembers choice)");
-    private JCheckBox toggleCheckbox = null;
+    private ConditionalOptionPaneUtil.MessagePanel togglePanel;
     private Component parent;
     private Component content;
@@ -372 +370 @@
 
         if (toggleable) {
-            toggleCheckbox = new JCheckBox(toggleCheckboxText);
-            boolean showDialog = Main.pref.getBoolean("message."+ togglePref, true);
-            toggleCheckbox.setSelected(!showDialog);
+            togglePanel = new ConditionalOptionPaneUtil.MessagePanel(null, false);
             gc.gridx = icon != null ? 1 : 0;
             gc.gridy = y++;
             gc.anchor = GridBagConstraints.LINE_START;
             gc.insets = new Insets(5,contentInsets.left,5,contentInsets.right);
-            cp.add(toggleCheckbox, gc);
+            cp.add(togglePanel, gc);
         }
 
@@ -546 +542 @@
 
     /**
-     * Overwrites the default "Don't show again" text of the toggle checkbox
-     * if you want to give more information. Only has an effect if
-     * <code>toggleEnable</code> is set.
-     * @param text The toggle checkbox text
-     * @return {@code this}
-     */
-    public ExtendedDialog setToggleCheckboxText(String text) {
-        this.toggleCheckboxText = text;
-        return this;
-    }
-
-    /**
      * Sets the button that will react to ENTER.
      * @param defaultButtonIdx The button index (starts to )
@@ -597 +581 @@
     public final boolean toggleCheckState() {
         toggleable = togglePref != null && !togglePref.isEmpty();
-
-        toggleValue = Main.pref.getInteger("message."+togglePref+".value", -1);
-        // No identifier given, so return false (= show the dialog)
-        if (!toggleable || toggleValue == -1)
-            return false;
-        // The pref is true, if the dialog should be shown.
-        return !(Main.pref.getBoolean("message."+ togglePref, true));
+        toggleValue = ConditionalOptionPaneUtil.getDialogReturnValue(togglePref);
+        return toggleable && toggleValue != -1;
     }
 
@@ -612 +591 @@
     private void toggleSaveState() {
         if (!toggleable ||
-                toggleCheckbox == null ||
+                togglePanel == null ||
                 cancelButtonIdx.contains(result) ||
                 result == ExtendedDialog.DialogClosedOtherwise)
             return;
-        Main.pref.put("message."+ togglePref, !toggleCheckbox.isSelected());
-        Main.pref.putInteger("message."+togglePref+".value", result);
+        togglePanel.getNotShowAgain().store(togglePref, result);
     }