Changeset 6097 in josm for trunk

Timestamp:

2013-08-01T18:34:17+02:00 (11 years ago)

Author:

akks

Message:

see #6355: move Rectified Image and plugin imagery layers to Imagery/More... submenu
(last part of menu rework)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• ImageryMenu.java (modified) (3 diffs)
• MainMenu.java (modified) (1 diff)

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

@@ -82 +82 @@
     private Map_Rectifier_WMSmenuAction rectaction = new Map_Rectifier_WMSmenuAction();
 
-    public ImageryMenu() {
+    public ImageryMenu(JMenu subMenu) {
         super(tr("Imagery"));
         setupMenuScroller();
@@ -101 +101 @@
             }
         });
+        MainMenu.add(subMenu, rectaction);
     }
     
@@ -163 +164 @@
 
         addDynamicSeparator();
-        addDynamic(rectaction);
+        addDynamic(Main.main.menu.imagerySubMenu);
     }
 

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

@@ -232 +232 @@
     public final JMenu selectionMenu = addMenu(marktr("Selection"), KeyEvent.VK_N, 6, ht("/Menu/Selection"));
     public final JMenu presetsMenu = addMenu(marktr("Presets"), KeyEvent.VK_P, 7, ht("/Menu/Presets"));
+    /**
+     * submenu in Imagery menu that contains plugin-managed additional imagery layers 
+     * @since 6097
+     */
+    public final JMenu imagerySubMenu = new JMenu(tr("More..."));
     public final ImageryMenu imageryMenu =
-        (ImageryMenu)addMenu(new ImageryMenu(), marktr("Imagery"), KeyEvent.VK_I, 8, ht("/Menu/Imagery"));
+        (ImageryMenu)addMenu(new ImageryMenu(imagerySubMenu), marktr("Imagery"), KeyEvent.VK_I, 8, ht("/Menu/Imagery"));
      /**
      * gpsMenu contains all plugin actions that are related