Changeset 35565 in osm

Timestamp:

2020-09-29T18:19:41+02:00 (4 years ago)

Author:

Mkyral

Message:

PointInfo: Switch to SVG icons

Location:

applications/editors/josm/plugins/pointInfo

Files:

• build.xml (modified) (3 diffs)
• data/zh_CN.lang (modified) ( previous)
• images-src (added)
• images-src/copy-tags.xcf (added)
• images-src/create-addr.xcf.bz2 (added)
• images-src/create-bug-report.xcf (added)
• images-src/open-external-link.xcf (added)
• images-src/pointinfo.svg (added)
• images/cursor/modifier/info-sml.png (deleted)
• images/cursor/modifier/pointinfo.svg (added)
• images/dialogs/info-sml.png (deleted)
• images/dialogs/pointinfo.svg (added)
• images/mapmode/info-sml.png (deleted)
• images/mapmode/pointinfo.svg (added)
• images/preferences/info-sml.png (deleted)
• images/preferences/pointinfo.svg (added)
• images/src (deleted)
• servers/RUIAN/index.php (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/pointinfo/PointInfoAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/pointinfo/PointInfoPreference.java (modified) (1 diff)

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

@@ -3 +3 @@
 
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="PointInfo: Adds a link to photo metadata in Catastro module. Patch by Javier Sánchez Portero."/>
+    <property name="commit.message" value="PointInfo: Switch to SVG icons"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="14153"/>
@@ -16 +16 @@
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.pointinfo.PointInfoPlugin"/>
     <property name="plugin.description" value="Shows an additional information about point on map. Only Czech RUIAN and Spanish Cadastre Web Services modules are available at this moment."/>
-    <property name="plugin.icon" value="images/mapmode/info-sml.png"/>
+    <property name="plugin.icon" value="images/mapmode/pointinfo.svg"/>
     <property name="plugin.link" value="https://github.com/mkyral/josm-pointInfo"/>
     <!--<property name="plugin.early" value="..."/>-->
@@ -22 +22 @@
     <!--<property name="plugin.stage" value="..."/>-->
 
-    <property name="josm" location="../../core/dist/josm-custom.jar"/>
-    <property name="plugin.dist.dir" value="../../dist"/>
-
     <!-- ** include targets that all plugins have in common ** -->
     <import file="../build-common.xml"/>

applications/editors/josm/plugins/pointInfo/servers/RUIAN/index.php

@@ -78 +78 @@
     select nb.user_nick, nb.datum, nbd.popis, nb.poznamka
     from neplatne_budovy nb, neplatne_budovy_duvod nbd
-    where nb.duvod = nbd.id and nb.kod = ".$row["kod"]."
+    where nb.duvod = nbd.id and not nb.deleted and nb.kod = ".$row["kod"]."
     ;
   ";

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoAction.java

@@ -41 +41 @@
 
     PointInfoAction() {
-        super(tr("Point info"), "info-sml", tr("Point info."),
+        super(tr("Point info"), "pointinfo", tr("Point info."),
                 Shortcut.registerShortcut("tools:pointInfo", tr("Tool: {0}", tr("Point info")), KeyEvent.VK_X, Shortcut.CTRL_SHIFT),
                 getCursor());
@@ -63 +63 @@
 
     private static Cursor getCursor() {
-        return ImageProvider.getCursor("crosshair", "info-sml");
+        return ImageProvider.getCursor("crosshair", "pointinfo");
     }
 
@@ -110 +110 @@
                         JScrollPane scrollPane = new JScrollPane(msgLabel);
                         Object[] objects = {scrollPane};
-                        final ImageIcon icon = new ImageIcon(getClass().getResource("/images/dialogs/info-sml.png"));
+                        final ImageIcon icon = ImageProvider.get("dialogs/pointinfo", ImageProvider.ImageSizes.SETTINGS_TAB);
                         JOptionPane.showMessageDialog(
                                 null, objects, tr("PointInfo") + " " + coordinatesText, JOptionPane.PLAIN_MESSAGE, icon);

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoPreference.java

@@ -34 +34 @@
 
     @Override
-    public String getIconName() {
-        return "info-sml.png";
-    }
-
-    @Override
     public void addGui(PreferenceTabbedPane gui) {
         JPanel panel = new JPanel(new GridBagLayout());