Changeset 1658 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-06-10T16:16:01+02:00 (16 years ago)

Author:

stoecker

Message:

fix some usability issues - see #2460

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/GpxLayer.java (modified) (1 diff)
• tools/DontShowAgainInfo.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -806 +806 @@
                 toDownload.size())), GBC.eol());
 
-            if (JOptionPane.showConfirmDialog(Main.parent, msg,
+            if (toDownload.size() > 1 && JOptionPane.showConfirmDialog(Main.parent, msg,
                 tr("Download from OSM along this track"),
                 JOptionPane.OK_CANCEL_OPTION) == JOptionPane.CANCEL_OPTION) {

trunk/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java

@@ -17 +17 @@
 
     public static boolean show(String prefKey, String msg) {
-        return show(prefKey, new JLabel(msg), true, JOptionPane.OK_CANCEL_OPTION, JOptionPane.OK_OPTION);
+        return show(prefKey, new JLabel(msg), false, JOptionPane.OK_CANCEL_OPTION, JOptionPane.OK_OPTION);
     }
 
@@ -25 +25 @@
 
     public static boolean show(String prefKey, Container msg) {
-        return show(prefKey, msg, true, JOptionPane.OK_CANCEL_OPTION, JOptionPane.OK_OPTION);
+        return show(prefKey, msg, false, JOptionPane.OK_CANCEL_OPTION, JOptionPane.OK_OPTION);
     }
 
     public static boolean show(String prefKey, Container msg, Boolean state, int options, int true_option) {
-        if (!Main.pref.getBoolean("message."+prefKey)) {
+        if (!Main.pref.getBoolean("message."+prefKey, state)) {
             JCheckBox dontshowagain = new JCheckBox(tr("Do not show again"));
             dontshowagain.setSelected(Main.pref.getBoolean("message."+prefKey, state));