Changeset 10069 in josm

Timestamp:

2016-03-28T14:41:27+02:00 (9 years ago)

Author:

stoecker

Message:

update geticons script, drop 4 unused icons

Location:

trunk

Files:

• geticons.pl (modified) (5 diffs)
• images_nodist/josm_small.png (moved) (moved from trunk/images/dialogs/mappaint/josm_small.png )
• images_nodist/misc/showhide.png (moved) (moved from trunk/images/misc/showhide.png )
• images_nodist/presets/bicycle_road.svg (moved) (moved from trunk/images/presets/bicycle_road.svg )
• images_nodist/presets/level_crossing.png (moved) (moved from trunk/images/presets/level_crossing.png )

trunk/geticons.pl

@@ -30 +30 @@
     {
       next if $l =~ /NO-ICON/;
-      if($l =~ /icon\s*[:=]\s*["']([^+]+?)["']/)
+      if($l =~ /icon\s*[:=]\s*["']([^"'+]+?)["']/)
       {
         ++$icons{$1};
@@ -46 +46 @@
       {
         my $i = $1;
-        $i = "styles/standard/$i" if $i eq "misc/no_icon.png";
+        $i = "styles/standard/$i" if $i eq "misc/no_icon";
         ++$icons{$i};
       }
@@ -69 +69 @@
         ++$icons{$i};
       }
-      if($l =~ /ImageProvider\.get\(\"(.*?)\",\s*\"(.*?)\"\s*\)/)
+      if($l =~ /setIcon\(\"(.*?)\"/)
+      {
+        my $i = "statusline/$1";
+        ++$icons{$i};
+      }
+      if($l =~ /ImageProvider\.get(?:IfAvailable)?\(\"(.*?)\",\s*\"(.*?)\"\s*\)/)
+      {
+        my $i = "$1/$2";
+        ++$icons{$i};
+      }
+      if($l =~ /new ImageProvider\(\"(.*?)\",\s*\"(.*?)\"\s*\)/)
       {
         my $i = "$1/$2";
@@ -116 +126 @@
         ++$icons{$i};
       }
-      if($l =~ /\.setButtonIcons.*\{(.*)\}/)
+      if($l =~ /setButtonIcons.*\{(.*)\}/)
       {
         my $t = $1;
@@ -132 +142 @@
       {
         $extends = "dialogs/";
+      }
+      elsif($l =~ /extends JosmAction/)
+      {
+        $extends = "";
       }
     }