Changeset 5965 in josm for trunk/src/org/openstreetmap/josm/gui/preferences

Timestamp:

2013-05-17T20:45:17+02:00 (11 years ago)

Author:

akks

Message:

see #8652 (patch by cmuelle8, part 1, modified): add "toggle panels" action (soon will be on Tab)
rework all toolbar context menus (add "do not hide" item and remove PopupMenuLauncher usage)
fixing minor warnings (@Override, private final)

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (modified) (21 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -30 +30 @@
 import java.util.Map;
 
+import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.DefaultListCellRenderer;
@@ -36 +37 @@
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
+import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
@@ -51 +53 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
@@ -66 +70 @@
 import org.openstreetmap.josm.actions.ParameterizedActionDecorator;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
-import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -72 +75 @@
 
 public class ToolbarPreferences implements PreferenceSettingFactory {
-
 
     private static final String EMPTY_TOOLBAR_MARKER = "<!-empty-!>";
@@ -228 +230 @@
                     skip('=');
                     String paramValue = readTillChar(',','}');
-                    if ("icon".equals(paramName) && paramValue.length() > 0)
+                    if ("icon".equals(paramName) && paramValue.length() > 0) {
                         result.setIcon(paramValue);
-                    else if("name".equals(paramName) && paramValue.length() > 0)
+                    } else if("name".equals(paramName) && paramValue.length() > 0) {
                         result.setName(paramValue);
+                    }
                     skip(',');
                 }
@@ -294 +297 @@
                     first = false;
                 }
-                if(!first)
+                if(!first) {
                     result.append('}');
+            }
             }
 
@@ -339 +343 @@
                         return null;
                     }
-                } else
+                } else {
                     rowIndex -= 2;
+            }
             }
             ActionParameter<Object> param = getParam(rowIndex);
@@ -368 +373 @@
                      currentAction.setIcon((String)aValue);
                      return;
-                } else
+                } else {
                     rowIndex -= 2;
+            }
             }
             ActionParameter<Object> param = getParam(rowIndex);
@@ -383 +389 @@
     }
 
-    private static class ToolbarPopupMenu extends JPopupMenu {
-        public ToolbarPopupMenu(final ActionDefinition action) {
-
-            if(action != null) {
-                add(tr("Remove from toolbar",action.getDisplayName()))
-                        .addActionListener(new ActionListener() {
-                            @Override public void actionPerformed(ActionEvent e) {
+    private class ToolbarPopupMenu extends JPopupMenu  {
+        ActionDefinition act;
+
+        private void setActionAndAdapt(ActionDefinition action) {
+            this.act = action;
+            doNotHide.setSelected(Main.pref.getBoolean("toolbar.always-visible", true));
+            remove.setVisible(act!=null);
+            shortcutEdit.setVisible(act!=null);
+        }
+
+        JMenuItem remove = new JMenuItem(new AbstractAction(tr("Remove from toolbar")) {
+            @Override
+            public void actionPerformed(ActionEvent e) {
                                 Collection<String> t = new LinkedList<String>(getToolString());
                                 ActionParser parser = new ActionParser(null);
                                 // get text definition of current action
-                                String res = parser.saveAction(action);
+                String res = parser.saveAction(act);
                                 // remove the button from toolbar preferences
                                 t.remove( res );
@@ -400 +412 @@
                             }
                 });
-            }
             
-            add(tr("Configure toolbar")).addActionListener(new ActionListener() {
-                @Override public void actionPerformed(ActionEvent e) {
+        JMenuItem configure = new JMenuItem(new AbstractAction(tr("Configure toolbar")) {
+            @Override
+            public void actionPerformed(ActionEvent e) {
                     final PreferenceDialog p =new PreferenceDialog(Main.parent);
                     p.selectPreferencesTabByName("toolbar");
@@ -410 +422 @@
             });
 
-            add(tr("Edit shortcut")).addActionListener(new ActionListener() {
-                @Override public void actionPerformed(ActionEvent e) {
+        JMenuItem shortcutEdit = new JMenuItem(new AbstractAction(tr("Edit shortcut")) {
+            @Override
+            public void actionPerformed(ActionEvent e) {
                     final PreferenceDialog p =new PreferenceDialog(Main.parent);
-                    p.getTabbedPane().getShortcutPreference().setDefaultFilter(action.getDisplayName());
+                p.getTabbedPane().getShortcutPreference().setDefaultFilter(act.getDisplayName());
                     p.selectPreferencesTabByName("shortcuts");
                     p.setVisible(true);
-                    // refresh toolbar to accept changes of shortcuts without restart
+                // refresh toolbar to try using changed shortcuts without restart
                     Main.toolbar.refreshToolbarControl(); 
                 }
             });
-        }
-    }
+
+        JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("getSt hide toolbar and menu")) {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                boolean sel = ((JCheckBoxMenuItem) e.getSource()).getState();
+                Main.pref.put("toolbar.always-visible", sel);
+                Main.pref.put("menu.always-visible", sel);
+        }
+        });
+        {
+            addPopupMenuListener(new PopupMenuListener() {
+                @Override
+                public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+                    setActionAndAdapt(buttonActions.get(
+                            ((JPopupMenu)e.getSource()).getInvoker()
+                    ));
+    }
+                @Override
+                public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {}
+
+                @Override
+                public void popupMenuCanceled(PopupMenuEvent e) {}
+            });
+            add(remove);
+            add(configure);
+            add(shortcutEdit);
+            add(doNotHide);
+        }
+    }
+
+    private ToolbarPopupMenu popupMenu = new ToolbarPopupMenu();
 
     /**
@@ -433 +475 @@
 
     public JToolBar control = new JToolBar();
+    private HashMap<Object, ActionDefinition> buttonActions = new HashMap<Object, ActionDefinition>(30);
 
     @Override
@@ -826 +869 @@
                 } else {
                     String res = parser.saveAction(action);
-                    if(res != null)
+                    if(res != null) {
                         t.add(res);
                 }
+            }
             }
             if (t.isEmpty()) {
@@ -842 +886 @@
     public ToolbarPreferences() {
         control.setFloatable(false);
-        control.addMouseListener(new PopupMenuLauncher(new ToolbarPopupMenu(null)));
+        control.setComponentPopupMenu(popupMenu);
     }
 
@@ -979 +1023 @@
     public void refreshToolbarControl() {
         control.removeAll();
+        buttonActions.clear();
 
         for (ActionDefinition action : getDefinedActions()) {
@@ -985 +1030 @@
             } else {
                 final JButton b = addButtonAndShortcut(action);
+                buttonActions.put(b, action);
                 
                 Icon i = action.getDisplayIcon();
@@ -1001 +1047 @@
                     });
                 }
-                b.addMouseListener(new PopupMenuLauncher( new ToolbarPopupMenu(action)));
+                b.setInheritsPopupMenu(true);
             }
         }
@@ -1014 +1060 @@
         if (action.getAction() instanceof JosmAction) {
             sc = ((JosmAction) action.getAction()).getShortcut();
-            if (sc.getAssignedKey() == KeyEvent.CHAR_UNDEFINED) sc = null;
+            if (sc.getAssignedKey() == KeyEvent.CHAR_UNDEFINED) {
+                sc = null;
+        }
         }
 
@@ -1023 +1071 @@
         
         String tt = action.getDisplayTooltip();
-        if (tt==null) tt="";
+        if (tt==null) {
+            tt="";
+        }
 
         if (sc == null || paramCode != 0) {
             String name = (String) action.getAction().getValue("toolbar");
-            if (name==null) name=action.getDisplayName();
-            if (paramCode!=0) name = name+paramCode;
+            if (name==null) {
+                name=action.getDisplayName();
+            }
+            if (paramCode!=0) {
+                name = name+paramCode;
+            }
             String desc = action.getDisplayName() + ((paramCode==0)?"":action.parameters.toString());
             sc = Shortcut.registerShortcut("toolbar:"+name, tr("Toolbar: {0}", desc),
@@ -1044 +1098 @@
         }
         
-        if (!tt.isEmpty()) b.setToolTipText(tt);
+        if (!tt.isEmpty()) {
+            b.setToolTipText(tt);
+        }
         return b;
     }