Changeset 5661 in josm for trunk/src

Timestamp:

2013-01-04T00:49:01+01:00 (11 years ago)

Author:

Don-vip

Message:

show/hide Audio menu without restart

File:

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

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -100 +100 @@
 import org.openstreetmap.josm.actions.audio.AudioSlowerAction;
 import org.openstreetmap.josm.actions.search.SearchAction;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.gui.io.RecentlyOpenedFilesMenu;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -557 +559 @@
         changesetManagerToggleAction.addButtonModel(mi.getModel());
 
-
         if (!Main.pref.getBoolean("audio.menuinvisible", false)) {
+            showAudioMenu(true);
+        }
+        
+        Main.pref.addPreferenceChangeListener(new PreferenceChangedListener() {
+            @Override
+            public void preferenceChanged(PreferenceChangeEvent e) {
+                if (e.getKey().equals("audio.menuinvisible")) {
+                    showAudioMenu(!Boolean.parseBoolean(e.getNewValue().toString()));
+                }
+            }
+        });
+
+        helpMenu.add(statusreport);
+
+        current = helpMenu.add(help); // FIXME why is help not a JosmAction?
+        current.setAccelerator(Shortcut.registerShortcut("system:help", tr("Help"), KeyEvent.VK_F1,
+                Shortcut.DIRECT).getKeyStroke());
+        add(helpMenu, about);
+
+
+        windowMenu.addMenuListener(menuSeparatorHandler);
+
+        new PresetsMenuEnabler(presetsMenu).refreshEnabled();
+    }
+    
+    protected void showAudioMenu(boolean showMenu) {
+        if (showMenu && audioMenu == null) {
             audioMenu = addMenu(marktr("Audio"), KeyEvent.VK_U, defaultMenuPos, ht("/Menu/Audio"));
             add(audioMenu, audioPlayPause);
@@ -567 +595 @@
             add(audioMenu, audioSlower);
             add(audioMenu, audioFaster);
-        }
-
-        helpMenu.add(statusreport);
-
-        current = helpMenu.add(help); // FIXME why is help not a JosmAction?
-        current.setAccelerator(Shortcut.registerShortcut("system:help", tr("Help"), KeyEvent.VK_F1,
-                Shortcut.DIRECT).getKeyStroke());
-        add(helpMenu, about);
-
-
-        windowMenu.addMenuListener(menuSeparatorHandler);
-
-        new PresetsMenuEnabler(presetsMenu).refreshEnabled();
+            validate();
+        } else if (!showMenu && audioMenu != null) {
+            remove(audioMenu);
+            audioMenu.removeAll();
+            audioMenu = null;
+            validate();
+        }
     }