From: Keith Packard <keithp@keithp.com>
Date: Thu, 10 Jul 2014 07:26:55 +0000 (-0700)
Subject: micropeak/altosui/telegps: Fix icon file names
X-Git-Tag: 1.4.9.2~25
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=6f2a4c610dfacbf500650db0eeeca6623bb49c5c;hp=1684291ba9a4f3bc2828e7b079ac27efcba6a163

micropeak/altosui/telegps: Fix icon file names

The icon file names are now structured to have an organization name
and application name component. This should avoid collisions with
other packages when the icon files are installed in a shared
directory, as on Linux. Within the Java .jar file, the new names need
to be correctly referenced or we won't find them.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altosuilib/AltosUIFrame.java b/altosuilib/AltosUIFrame.java
index 5b915e85..2e886932 100644
--- a/altosuilib/AltosUIFrame.java
+++ b/altosuilib/AltosUIFrame.java
@@ -36,12 +36,12 @@ public class AltosUIFrame extends JFrame implements AltosUIListener, AltosPositi
 	}
 
 	static String[] altos_icon_names = {
-		"/altus-metrum-16.png",
-		"/altus-metrum-32.png",
-		"/altus-metrum-48.png",
-		"/altus-metrum-64.png",
-		"/altus-metrum-128.png",
-		"/altus-metrum-256.png"
+		"/altusmetrum-altosui-16.png",
+		"/altusmetrum-altosui-32.png",
+		"/altusmetrum-altosui-48.png",
+		"/altusmetrum-altosui-64.png",
+		"/altusmetrum-altosui-128.png",
+		"/altusmetrum-altosui-256.png"
 	};
 
 	static public String[] icon_names;
diff --git a/micropeak/MicroFrame.java b/micropeak/MicroFrame.java
index f82d1c5e..8b3d49b5 100644
--- a/micropeak/MicroFrame.java
+++ b/micropeak/MicroFrame.java
@@ -25,12 +25,12 @@ import org.altusmetrum.altosuilib_3.*;
 
 public class MicroFrame extends AltosUIFrame {
 	static String[] micro_icon_names = {
-		"/micropeak-16.png",
-		"/micropeak-32.png",
-		"/micropeak-48.png",
-		"/micropeak-64.png",
-		"/micropeak-128.png",
-		"/micropeak-256.png"
+		"/altusmetrum-micropeak-16.png",
+		"/altusmetrum-micropeak-32.png",
+		"/altusmetrum-micropeak-48.png",
+		"/altusmetrum-micropeak-64.png",
+		"/altusmetrum-micropeak-128.png",
+		"/altusmetrum-micropeak-256.png"
 	};
 
 	static { set_icon_names(micro_icon_names); }
diff --git a/telegps/TeleGPS.java b/telegps/TeleGPS.java
index d4b7bacf..a4b221e8 100644
--- a/telegps/TeleGPS.java
+++ b/telegps/TeleGPS.java
@@ -32,12 +32,12 @@ public class TeleGPS
 {
 
 	static String[] telegps_icon_names = {
-		"/telegps-16.png",
-		"/telegps-32.png",
-		"/telegps-48.png",
-		"/telegps-64.png",
-		"/telegps-128.png",
-		"/telegps-256.png"
+		"/altusmetrum-telegps-16.png",
+		"/altusmetrum-telegps-32.png",
+		"/altusmetrum-telegps-48.png",
+		"/altusmetrum-telegps-64.png",
+		"/altusmetrum-telegps-128.png",
+		"/altusmetrum-telegps-256.png"
 	};
 
 	static { set_icon_names(telegps_icon_names); }