Changeset 2253 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2009-10-06T23:52:41+02:00 (17 years ago)

Author:

Gubaer

Message:

Improved dialogs in the context of conflict resolution.
Improved support for online help in the context of conflict resolution, see also info about conflicts

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainMenu.java (modified) (1 diff)
• layer/OsmDataLayer.java (modified) (4 diffs)

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

@@ -207 +207 @@
         add(fileMenu, download);
         add(fileMenu, downloadReferrers);
+        add(fileMenu, update);
+        add(fileMenu, updateSelection);
+        fileMenu.addSeparator();
         add(fileMenu, upload);
         add(fileMenu, uploadSelection);
-        add(fileMenu, update);
-        add(fileMenu, updateSelection);
+        fileMenu.addSeparator();
         add(fileMenu, closeChangesetAction);
         fileMenu.addSeparator();

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

@@ -18 +18 @@
 import java.awt.TexturePaint;
 import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.geom.Area;
 import java.awt.image.BufferedImage;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.util.ArrayList;
@@ -30 +33 @@
 import javax.swing.AbstractAction;
 import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JMenuItem;
@@ -62 +67 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
+import org.openstreetmap.josm.gui.help.HelpBrowser;
+import org.openstreetmap.josm.gui.help.HelpBuilder;
 import org.openstreetmap.josm.tools.DateUtils;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.WindowGeometry;
 
 /**
@@ -338 +346 @@
             sb.append("<br>").append(msg2);
         }
+        sb.append("<br>").append(tr("Please consult the Conflict List Dialog<br>and manually resolve them."));
         sb.append("</html>");
         if (numNewConflicts > 0) {
-            JOptionPane.showMessageDialog(
-                    Main.parent,
+            JButton[] options = new JButton[] {
+                    new JButton(tr("OK")),
+                    new JButton(tr("Help"))
+            };
+            options[0].setIcon(ImageProvider.get("ok"));
+            options[1].setIcon(ImageProvider.get("help"));
+            final JOptionPane pane = new JOptionPane(
                     sb.toString(),
+                    JOptionPane.WARNING_MESSAGE,
+                    JOptionPane.DEFAULT_OPTION,
+                    null,
+                    options,
+                    options[0]
+            );
+            final JDialog dialog = new JDialog(
+                    JOptionPane.getFrameForComponent(Main.parent),
                     tr("Conflicts detected"),
-                    JOptionPane.WARNING_MESSAGE
+                    true);
+            options[0].addActionListener(
+                    new ActionListener() {
+                        public void actionPerformed(ActionEvent e) {
+                            dialog.setVisible(false);
+                        }
+                    }
             );
+            options[1].addActionListener(
+                    new ActionListener() {
+                        public void actionPerformed(ActionEvent e) {
+                            HelpBrowser b = new HelpBrowser();
+                            b.setUrlForHelpTopic("Help/Concepts/Conflict");
+                            b.setVisible(true);
+                        }
+                    }
+            );
+            dialog.setContentPane(pane);
+            dialog.pack();
+            HelpBuilder.setHelpContext(dialog.getRootPane(), "Concepts/Conflict");
+            WindowGeometry.centerOnScreen(dialog.getSize()).applySafe(dialog);
+            dialog.setVisible(true);
         }
     }