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

Timestamp:

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

Author:

stoecker

Message:

updated a lot

Location:

applications/editors/josm/plugins/openvisible

Files:

• build.xml (modified) (3 diffs)
• src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java (modified) (2 diffs)
• src/at/dallermassl/josm/plugin/openvisible/OpenVisiblePlugin.java (modified) (2 diffs)

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

@@ -17 +17 @@
   <property name="plugin.jar" value="${plugin.name}.jar"/>
   
-  <!-- plugin meta data (enter new version number if anything changed!) -->
-  <property name="plugin.version" value="0.2.3"/>
   <property name="plugin.description" value="Allows opening gpx/osm files that intersect the currently visible screen area (V${plugin.version})."/>
   <property name="plugin.stage" value="50"/>
@@ -47 +45 @@
     <mkdir dir="${plugin.dist.dir}"/>
     
+    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+      <env key="LANG" value="C"/>
+      <arg value="info"/>
+      <arg value="--xml"/>
+      <arg value="."/>
+    </exec>
+    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+    <delete file="REVISION"/>
     <!-- create jar file -->
     <jar destfile="${plugin.dist.dir}/${plugin.jar}" basedir="${plugin.build.dir}">
@@ -52 +58 @@
         <attribute name="Plugin-Class" value="${plugin.class}" />
         <attribute name="Plugin-Description" value="${plugin.description}" />
-        <attribute name="Plugin-Version" value="${plugin.version}" />
+        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+        <attribute name="Plugin-Mainversion" value="1180" />
         <attribute name="Plugin-Dependencies" value="jgrapht-jdk1.5" />
         <attribute name="Plugin-Stage" value="${plugin.stage}" />

applications/editors/josm/plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java

@@ -31 +31 @@
 import org.openstreetmap.josm.io.GpxReader;
 import org.openstreetmap.josm.io.OsmReader;
+import org.openstreetmap.josm.tools.Shortcut;
 import org.xml.sax.SAXException;
 
@@ -41 +42 @@
     
     public OpenVisibleAction() {
-        super(tr("Open Visible ..."), "openvisible", tr("Open only files that are visible in current view."), KeyEvent.VK_O, 
-            InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK, true);
+        super(tr("Open Visible ..."), "openvisible",
+        tr("Open only files that are visible in current view."),
+        Shortcut.registerShortcut("tools:openvisible", tr("Menu: {0}", tr("Open Visible ...")),
+        KeyEvent.VK_I, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), true);
     }
 

applications/editors/josm/plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisiblePlugin.java

@@ -8 +8 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.actions.JosmAction;
@@ -16 +17 @@
  */
 public class OpenVisiblePlugin extends Plugin {
-    
+
     public OpenVisiblePlugin() {
         super();
-        JMenu fileMenu = Main.main.menu.fileMenu;
-        JosmAction openVisible = new OpenVisibleAction();
-
-        //JMenu navigatorMenu = new JMenu("Open Visible");
-        JMenuItem menuItem = new JMenuItem(openVisible);
-        
-        fileMenu.add(menuItem,2);
-        menuItem.setAccelerator(openVisible.shortcut);
+        MainMenu.add(Main.main.menu.fileMenu, new OpenVisibleAction());
     }