Changeset 3737 in josm for trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java

Timestamp:

2010-12-21T18:37:05+01:00 (13 years ago)

Author:

Upliner

Message:

make possible to place imagery offset action to the top toolbar and place it there by default; completely fixes #5726

File:

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

trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java

@@ -19 +19 @@
 import javax.swing.Icon;
 import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JComponent;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
@@ -128 +129 @@
         public void actionPerformed(ActionEvent ev) {
             setOffset(b.dx, b.dy);
-            Main.main.menu.imageryMenuUpdater.refreshOffsetMenu();
+            Main.main.menu.imageryMenu.refreshOffsetMenu();
             Main.map.repaint();
         }
@@ -152 +153 @@
 
     public JMenuItem getOffsetMenuItem() {
+        JMenu subMenu = new JMenu(trc("layer", "Offset"));
+        subMenu.setIcon(ImageProvider.get("mapmode", "adjustimg"));
+        return (JMenuItem)getOffsetMenuItem(subMenu);
+    }
+
+    public JComponent getOffsetMenuItem(JComponent subMenu) {
         JMenuItem adjustMenuItem = new JMenuItem(adjustAction);
         if (OffsetBookmark.allBookmarks.isEmpty()) return adjustMenuItem;
 
-        JMenu subMenu = new JMenu(trc("layer", "Offset"));
-        subMenu.setIcon(ImageProvider.get("mapmode", "adjustimg"));
         subMenu.add(adjustMenuItem);
         subMenu.add(new JSeparator());