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

Timestamp:

2008-10-05T17:06:27+02:00 (16 years ago)

Author:

stoecker

Message:

close bug #1622. Keyboard shortcuts and specific OS handling

File:

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

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

@@ -27 +27 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ShortCut;
 
 /**
@@ -40 +41 @@
                 public AbstractButton button;
 
-                private ToggleDialogAction(String name, String iconName, String tooltip, int shortCut, int modifier, String prefname) {
-                        super(name, iconName, tooltip, shortCut, modifier, false);
+                private ToggleDialogAction(String name, String iconName, String tooltip, ShortCut shortCut, String prefname) {
+                        super(name, iconName, tooltip, shortCut, false);
                         this.prefname = prefname;
                 }
@@ -62 +63 @@
         private final JPanel titleBar = new JPanel(new GridBagLayout());
 
+        @Deprecated
         public ToggleDialog(final String name, String iconName, String tooltip, int shortCut, int preferredHeight) {
                 super(new BorderLayout());
                 this.prefName = iconName;
+                ToggleDialogInit(name, iconName, tooltip, ShortCut.registerShortCut("auto:"+name, tooltip, shortCut, ShortCut.GROUP_LAYER), preferredHeight);
+        }
+
+        public ToggleDialog(final String name, String iconName, String tooltip, ShortCut shortCut, int preferredHeight) {
+                super(new BorderLayout());
+                this.prefName = iconName;
+                ToggleDialogInit(name, iconName, tooltip, shortCut, preferredHeight);
+        }
+
+        private void ToggleDialogInit(final String name, String iconName, String tooltip, ShortCut shortCut, int preferredHeight) {
                 setPreferredSize(new Dimension(330,preferredHeight));
-                action = new ToggleDialogAction(name, "dialogs/"+iconName, tooltip, shortCut, KeyEvent.ALT_MASK, iconName);
+                action = new ToggleDialogAction(name, "dialogs/"+iconName, tooltip, shortCut, iconName);
                 String helpId = "Dialog/"+getClass().getName().substring(getClass().getName().lastIndexOf('.')+1);
                 action.putValue("help", helpId.substring(0, helpId.length()-6));