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

Timestamp:

2009-10-07T21:25:15+02:00 (15 years ago)

Author:

Gubaer

Message:

New utility class for help context aware option dialogs
Improved context sensitive help in the context of conflict resolution, see also Conflict List Dialog

File:

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

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

@@ -12 +12 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
-import javax.swing.Box;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
@@ -34 +30 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.dialogs.DialogsPanel.Action;
+import org.openstreetmap.josm.gui.help.HelpBuilder;
 import org.openstreetmap.josm.gui.help.Helpful;
 import org.openstreetmap.josm.tools.GBC;
@@ -348 +345 @@
      *
      */
-    private class DetachedDialog extends JDialog {
+    private class DetachedDialog extends JDialog{
         public DetachedDialog() {
             super(JOptionPane.getFrameForComponent(Main.parent));
@@ -362 +359 @@
                 }
             });
+            addMouseListener(
+                    new MouseAdapter() {
+                        @Override
+                        public void mouseEntered(MouseEvent e) {
+                            super.mouseEntered(e);
+                            System.out.println("requesting focus ...");
+                            requestFocusInWindow();
+                        }
+                    }
+            );
+
             String bounds = Main.pref.get(preferencePrefix+".bounds",null);
             if (bounds != null) {
@@ -373 +381 @@
             }
             setTitle(titleBar.getTitle());
+            HelpBuilder.setHelpContext(getRootPane(), helpTopic());
         }