Changeset 4146 in josm

Timestamp:

Jun 19, 2011 5:17:43 PM (2 years ago)

Author:

stoecker

Message:

fix #6480 - toolbar cleanups

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ShowStatusReportAction.java (modified) (1 diff)
• gui/io/RecentlyOpenedFilesMenu.java (modified) (2 diffs)
• gui/preferences/ToolbarPreferences.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -41 +41 @@
                 tr("Show status report with useful information that can be attached to bugs"),
                 Shortcut.registerShortcut("help:showstatusreport", tr("Help: {0}",
-                        tr("Show Status Report")), KeyEvent.VK_R, Shortcut.GROUP_NONE), true);
+                        tr("Show Status Report")), KeyEvent.VK_R, Shortcut.GROUP_NONE), false);
 
         putValue("help", ht("/Action/ShowStatusReport"));
         putValue("toolbar", "help/showstatusreport");
+        Main.toolbar.register(this);
     }
 

trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java

@@ -58 +58 @@
                     putValue(NAME, file);
                     putValue("help", ht("/Action/OpenRecent"));
+                    putValue("toolbar", false);
                 }
                 @Override
@@ -83 +84 @@
             putValue(SHORT_DESCRIPTION, tr("Clear the list of recently opened files"));
             putValue("help", ht("/Action/OpenRecent"));
+            putValue("toolbar", "recentlyopenedfiles/clear");
         }
 

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

@@ -490 +490 @@
             int index = selectedList.getSelectedIndex();
             upButton.setEnabled(index > 0);
-            downButton.setEnabled(index < selectedList.getModel().getSize() - 1);
+            downButton.setEnabled(index != -1 && index < selectedList.getModel().getSize() - 1);
             removeButton.setEnabled(index != -1);
             addButton.setEnabled(actionsTree.getSelectionCount() > 0);
@@ -788 +788 @@
                     Action action = menuItem.getAction();
                     userObject = action;
-                    String toolbar = (String) action.getValue("toolbar");
-                    if(toolbar == null) {
+                    Object tb = action.getValue("toolbar");
+                    if(tb == null) {
                         System.out.println(tr("Toolbar action without name: {0}",
                         action.getClass().getName()));
+                        continue;
+                    } else if (!(tb instanceof String)) {
+                        if(!(tb instanceof Boolean) || (Boolean)tb) {
+                            System.out.println(tr("Strange toolbar value: {0}",
+                            action.getClass().getName()));
+                        }
+                        continue;
                     } else {
+                        String toolbar = (String) tb;
                         Action r = actions.get(toolbar);
                         if(r != null &&  r != action) {
@@ -798 +806 @@
                             toolbar, r.getClass().getName(), action.getClass().getName()));
                         }
-                    }
-                    actions.put(toolbar, action);
+                        actions.put(toolbar, action);
+                    }
                 } else {
                     userObject = menuItem.getText();