Changeset 12588 in osm for applications/editors/josm/plugins/agpifoj

Timestamp:

2008-12-25T19:01:06+01:00 (16 years ago)

Author:

stoecker

Message:

updated a lot

Location:

applications/editors/josm/plugins/agpifoj

Files:

• build.xml (modified) (1 diff)
• images/svpDown.png (deleted)
• images/svpLeft.png (deleted)
• images/svpRight.png (deleted)
• images/svpUp.png (deleted)
• src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/agpifoj/ScrollViewport.java (deleted)

applications/editors/josm/plugins/agpifoj/build.xml

@@ -49 +49 @@
         <attribute name="Plugin-Early" value="false" />
         <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+        <attribute name="Plugin-Mainversion" value="1180"/>
         <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
       </manifest>

applications/editors/josm/plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java

@@ -22 +22 @@
 import org.openstreetmap.josm.plugins.agpifoj.AgpifojLayer.ImageEntry;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Shortcut;
 
 public class AgpifojDialog extends ToggleDialog implements ActionListener {
@@ -45 +46 @@
 
     private AgpifojDialog() {
-        super(tr("AgPifoJ - Geotagged pictures"), "agpifoj", tr("Display geotagged photos"), KeyEvent.VK_Y, 200);
-        
+        super(tr("AgPifoJ - Geotagged pictures"), "agpifoj", tr("Display geotagged photos"), Shortcut.registerShortcut("tools:geotagged", tr("Tool: {0}", tr("Display geotagged photos")), KeyEvent.VK_Y, Shortcut.GROUP_EDIT), 200);
+
         if (INSTANCE != null) {
             throw new IllegalStateException("Agpifoj dialog should not be instanciated twice !");

applications/editors/josm/plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java

@@ -23 +23 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.gui.IconToggleButton;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -35 +37 @@
                   "agpifoj-open",
                   tr("Load set of images as a new layer."),
-                  0, 0, false);
+                  null, false);
         }
 
@@ -82 +84 @@
 
     public AgpifojPlugin() {
-
-        JMenuBar menu = Main.main.menu;
-        JMenu view = null;
-        JMenuItem agpifojMenu = new JMenuItem(new Action());
-
-        for (int i = 0; i < menu.getMenuCount(); ++i) {
-            if (menu.getMenu(i) != null
-                    && tr("File").equals(menu.getMenu(i).getText())) {
-                view = menu.getMenu(i);
-                break;
-            }
-        }
-
-        if (view != null) {
-            view.insert(agpifojMenu, 2);
-        
-        } else if (menu.getMenuCount() > 0) {
-            view = menu.getMenu(0);
-            view.insert(agpifojMenu, 0);
-        }
-
-        agpifojMenu.setVisible(true);
+        MainMenu.add(Main.main.menu.fileMenu, new Action());
     }
 
@@ -113 +94 @@
     public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
         if (newFrame != null) {
-            if (newFrame.getLayout() instanceof BorderLayout) {
-                newFrame.remove(newFrame.toolBarActions);
-                newFrame.add(new ScrollViewport(newFrame.toolBarActions, ScrollViewport.VERTICAL_DIRECTION), 
-                             BorderLayout.WEST);
-                newFrame.repaint();
-            }
-            
             AgpifojDialog dialog = AgpifojDialog.getInstance();
-            newFrame.addToggleDialog(dialog);
-        
+            IconToggleButton b = newFrame.addToggleDialog(dialog);
+
             boolean found = false;
             for (Layer layer : newFrame.mapView.getAllLayers()) {
@@ -130 +104 @@
                 }
             }
-            JToolBar tb = newFrame.toolBarActions;
-            ((JToggleButton) tb.getComponent(tb.getComponentCount() - 1)).getModel().setSelected(found);
-        
+            b.setSelected(found);
         } else {
             AgpifojDialog.getInstance().displayImage(null, null);