Index: /trunk/src/org/openstreetmap/josm/actions/AboutAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/AboutAction.java	(revision 16504)
+++ /trunk/src/org/openstreetmap/josm/actions/AboutAction.java	(revision 16505)
@@ -64,5 +64,5 @@
         super(tr("About"), "logo", tr("Display the about screen."),
             Shortcut.registerShortcut("system:about", tr("About"),
-            KeyEvent.VK_F1, Shortcut.SHIFT), true);
+            KeyEvent.VK_F1, Shortcut.SHIFT), true, false);
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java	(revision 16504)
+++ /trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java	(revision 16505)
@@ -39,4 +39,9 @@
 
     @Override
+    protected void installAdapters() {
+        // do nothing
+    }
+
+    @Override
     public void actionPerformed(ActionEvent e) {
         toggleSelectedState(e);
Index: /trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java	(revision 16504)
+++ /trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java	(revision 16505)
@@ -52,5 +52,5 @@
                 tr("File: {0}", tr("Close open changesets")),
                 KeyEvent.VK_Q, Shortcut.ALT_CTRL),
-            true
+            true, false
         );
         setHelpId(ht("/Action/CloseChangeset"));
Index: /trunk/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java	(revision 16504)
+++ /trunk/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java	(revision 16505)
@@ -34,5 +34,5 @@
     public DownloadPrimitiveAction() {
         super(tr("Download object..."), "downloadprimitive", tr("Download OSM object by ID"),
-                SHORTCUT, true);
+                SHORTCUT, true, false);
         setHelpId(ht("/Action/DownloadObject"));
     }
Index: /trunk/src/org/openstreetmap/josm/actions/ExitAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/ExitAction.java	(revision 16504)
+++ /trunk/src/org/openstreetmap/josm/actions/ExitAction.java	(revision 16505)
@@ -22,5 +22,5 @@
     public ExitAction() {
         super(tr("Exit"), "exit", tr("Exit the application."),
-                Shortcut.registerShortcut("system:menuexit", tr("Exit"), KeyEvent.VK_Q, Shortcut.CTRL), true);
+                Shortcut.registerShortcut("system:menuexit", tr("Exit"), KeyEvent.VK_Q, Shortcut.CTRL), true, false);
         setHelpId(ht("/Action/Exit"));
     }
Index: /trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java	(revision 16504)
+++ /trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java	(revision 16505)
@@ -49,4 +49,9 @@
         setSelected(Config.getPref().getBoolean("draw.fullscreen", false));
         notifySelectedState();
+    }
+
+    @Override
+    protected void installAdapters() {
+        // not needed
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java	(revision 16504)
+++ /trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java	(revision 16505)
@@ -36,8 +36,6 @@
         super(tr("History"), "dialogs/history",
                 tr("Display history information about OSM ways, nodes, or relations."),
-                SHORTCUT, false);
+                SHORTCUT, true, "action/historyinfo", false);
         setHelpId(ht("/Action/ObjectHistory"));
-        setToolbarId("action/historyinfo");
-        MainApplication.getToolbar().register(this);
         setEnabled(true);
     }
Index: /trunk/src/org/openstreetmap/josm/actions/NewAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/NewAction.java	(revision 16504)
+++ /trunk/src/org/openstreetmap/josm/actions/NewAction.java	(revision 16505)
@@ -23,5 +23,5 @@
     public NewAction() {
         super(tr("New Layer"), "new", tr("Create a new map layer."),
-                Shortcut.registerShortcut("system:new", tr("File: {0}", tr("New Layer")), KeyEvent.VK_N, Shortcut.CTRL), true);
+                Shortcut.registerShortcut("system:new", tr("File: {0}", tr("New Layer")), KeyEvent.VK_N, Shortcut.CTRL), true, false);
         setHelpId(ht("/Action/NewLayer"));
     }
Index: /trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java	(revision 16504)
+++ /trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java	(revision 16505)
@@ -67,5 +67,6 @@
     public OpenFileAction() {
         super(tr("Open..."), "open", tr("Open a file."),
-                Shortcut.registerShortcut("system:open", tr("File: {0}", tr("Open...")), KeyEvent.VK_O, Shortcut.CTRL));
+                Shortcut.registerShortcut("system:open", tr("File: {0}", tr("Open...")), KeyEvent.VK_O, Shortcut.CTRL),
+                true, null, false);
         setHelpId(ht("/Action/Open"));
     }
Index: /trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java	(revision 16504)
+++ /trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java	(revision 16505)
@@ -87,5 +87,5 @@
         super(tr("Open Location..."), "openlocation", tr("Open an URL."),
                 Shortcut.registerShortcut("system:open_location", tr("File: {0}", tr("Open Location...")),
-                        KeyEvent.VK_L, Shortcut.CTRL), true);
+                        KeyEvent.VK_L, Shortcut.CTRL), true, false);
         setHelpId(ht("/Action/OpenLocation"));
         this.downloadTasks = new ArrayList<>();
Index: /trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java	(revision 16504)
+++ /trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java	(revision 16505)
@@ -88,5 +88,5 @@
     public PreferencesAction() {
         super(tr("Preferences..."), "preference", tr("Open a preferences dialog for global settings."),
-                Shortcut.registerShortcut("system:preferences", tr("Preferences"), KeyEvent.VK_F12, Shortcut.DIRECT), true);
+                Shortcut.registerShortcut("system:preferences", tr("Preferences"), KeyEvent.VK_F12, Shortcut.DIRECT), true, false);
         setHelpId(ht("/Action/Preferences"));
         this.tab = null;
Index: /trunk/src/org/openstreetmap/josm/actions/RestartAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/RestartAction.java	(revision 16504)
+++ /trunk/src/org/openstreetmap/josm/actions/RestartAction.java	(revision 16505)
@@ -49,5 +49,5 @@
     public RestartAction() {
         super(tr("Restart"), "restart", tr("Restart the application."),
-                Shortcut.registerShortcut("file:restart", tr("File: {0}", tr("Restart")), KeyEvent.VK_J, Shortcut.ALT_CTRL_SHIFT), false);
+                Shortcut.registerShortcut("file:restart", tr("File: {0}", tr("Restart")), KeyEvent.VK_J, Shortcut.ALT_CTRL_SHIFT), false, false);
         setHelpId(ht("/Action/Restart"));
         setToolbarId("action/restart");