altosui: Add multi-sized icons to all windows

This lets the window system pick a better size for presentation

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

14 files changed, 49 insertions, 20 deletions

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index ddc54cbd..600d8acc 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -170,10 +170,6 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 
 		GridBagConstraints c = new GridBagConstraints();
 
-		java.net.URL imgURL = AltosUI.class.getResource("/altus-metrum-16x16.jpg");
-		if (imgURL != null)
-			setIconImage(new ImageIcon(imgURL).getImage());
-
 		setTitle(String.format("AltOS %s", reader.name));
 
 		/* Stick channel selector at top of table for telemetry monitoring */
diff --git a/altosui/AltosFrame.java b/altosui/AltosFrame.java
index 70598634..338b363e 100644
--- a/altosui/AltosFrame.java
+++ b/altosui/AltosFrame.java
@@ -44,14 +44,37 @@ public class AltosFrame extends JFrame implements AltosUIListener {
 		this.pack();
 	}
 
+	static final String[] 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"
+	};
+
+	public void set_icon() {
+		ArrayList<Image> icons = new ArrayList<Image>();
+		
+		for (int i = 0; i < icon_names.length; i++) {
+			java.net.URL imgURL = AltosUI.class.getResource(icon_names[i]);
+			if (imgURL != null)
+				icons.add(new ImageIcon(imgURL).getImage());
+		}
+
+		setIconImages(icons);
+	}
+			
 	public AltosFrame() {
 		AltosUIPreferences.register_ui_listener(this);
 		addWindowListener(new AltosFrameListener());
+		set_icon();
 	}
 
 	public AltosFrame(String name) {
 		super(name);
 		AltosUIPreferences.register_ui_listener(this);
 		addWindowListener(new AltosFrameListener());
+		set_icon();
 	}
 }
diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index 46ca3e5d..510579c5 100644
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -106,10 +106,6 @@ public class AltosIdleMonitorUI extends AltosFrame implements AltosFlightDisplay
 
 		GridBagConstraints c = new GridBagConstraints();
 
-		java.net.URL imgURL = AltosUI.class.getResource("/altus-metrum-16x16.jpg");
-		if (imgURL != null)
-			setIconImage(new ImageIcon(imgURL).getImage());
-
 		setTitle(String.format("AltOS %s", device.toShortString()));
 
 		/* Stick frequency selector at top of table for telemetry monitoring */
diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 926d66f0..9977e82b 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -105,10 +105,6 @@ public class AltosUI extends AltosFrame {
 
 		load_library(null);
 
-		java.net.URL imgURL = AltosUI.class.getResource("/altus-metrum-16x16.jpg");
-		if (imgURL != null)
-			setIconImage(new ImageIcon(imgURL).getImage());
-
 		AltosUIPreferences.set_component(this);
 
 		pane = getContentPane();
diff --git a/altosui/Makefile-standalone b/altosui/Makefile-standalone
index 0d9931d5..23163e40 100644
--- a/altosui/Makefile-standalone
+++ b/altosui/Makefile-standalone
@@ -44,7 +44,14 @@ CLASSFILES=\
 	AltosRomconfigUI.class \
 	AltosVoice.class
 
-JAVA_ICON=../icon/altus-metrum-16x16.jpg
+JAVA_ICONS=\
+	../icon/altus-metrum-16.png \
+	../icon/altus-metrum-32.png \
+	../icon/altus-metrum-48.png \
+	../icon/altus-metrum-64.png \
+	../icon/altus-metrum-128.png \
+	../icon/altus-metrum-256.png
+
 WINDOWS_ICON=../icon/altus-metrum.ico
 
 # where altosui.jar gets installed
@@ -109,7 +116,7 @@ classes/libaltosJNI:
 
 classes/images:
 	mkdir -p classes/images
-	ln -sf ../$(JAVA_ICON) classes/images
+	ln -sf ../$(JAVA_ICONS) classes/images
 
 altosui:
 	echo "#!/bin/sh" > $@
@@ -123,11 +130,11 @@ fat/altosui:
 	echo 'exec java -Djava.library.path="$$DIR" -jar "$$DIR"/altosui.jar' >> $@
 	chmod +x $@
 
-fat/altosui.jar: $(CLASSFILES) $(JAVA_ICON) fat/classes/Manifest.txt
+fat/altosui.jar: $(CLASSFILES) $(JAVA_ICONS) fat/classes/Manifest.txt
 	mkdir -p fat/classes
 	test -L fat/classes/altosui || ln -sf ../.. fat/classes/altosui
 	mkdir -p fat/classes/images
-	cp $(JAVA_ICON) fat/classes/images
+	cp $(JAVA_ICONS) fat/classes/images
 	test -L fat/classes/libaltosJNI || ln -sf ../../libaltos/libaltosJNI fat/classes/libaltosJNI
 	cd ./fat/classes && jar cfm ../../$@ Manifest.txt images/* altosui/*.class libaltosJNI/*.class
 
diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 36969846..6010df58 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -119,14 +119,25 @@ FATJAR=altosui-fat.jar
 # Icons
 ICONDIR=$(top_srcdir)/icon
 
-JAVA_ICON=$(ICONDIR)/altus-metrum-16x16.jpg
+JAVA_ICONS=\
+	$(ICONDIR)/altus-metrum-16.png \
+	$(ICONDIR)/altus-metrum-32.png \
+	$(ICONDIR)/altus-metrum-48.png \
+	$(ICONDIR)/altus-metrum-64.png \
+	$(ICONDIR)/altus-metrum-128.png \
+	$(ICONDIR)/altus-metrum-256.png
 
 ICONS=	$(ICONDIR)/redled.png $(ICONDIR)/redoff.png \
 	$(ICONDIR)/greenled.png $(ICONDIR)/greenoff.png \
 	$(ICONDIR)/grayled.png $(ICONDIR)/grayoff.png
 
 # icon base names for jar
-ICONJAR= -C $(ICONDIR) altus-metrum-16x16.jpg \
+ICONJAR= -C $(ICONDIR) altus-metrum-16.png \
+	-C $(ICONDIR) altus-metrum-32.png \
+	-C $(ICONDIR) altus-metrum-48.png \
+	-C $(ICONDIR) altus-metrum-64.png \
+	-C $(ICONDIR) altus-metrum-128.png \
+	-C $(ICONDIR) altus-metrum-256.png \
 	-C $(ICONDIR) redled.png -C $(ICONDIR) redoff.png \
 	-C $(ICONDIR) greenled.png -C $(ICONDIR) greenoff.png \
 	-C $(ICONDIR) grayon.png -C $(ICONDIR) grayled.png
@@ -216,13 +227,13 @@ install-altosuiJAVA: altosui.jar
 classes/altosui:
 	mkdir -p classes/altosui
 
-$(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICON) $(ALTOSLIB_CLASS)
+$(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICONS) $(ALTOSLIB_CLASS)
 	jar cfm $@ Manifest.txt \
 		$(ICONJAR) \
 		-C classes altosui \
 		-C libaltos libaltosJNI
 
-$(FATJAR): classaltosui.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) $(JAVA_ICON)
+$(FATJAR): classaltosui.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) $(JAVA_ICONS)
 	jar cfm $@ Manifest-fat.txt \
 		$(ICONJAR) \
 		-C classes altosui \
diff --git a/icon/altus-metrum-128.png b/icon/altus-metrum-128.png
new file mode 100644
index 00000000..f1343d9e
--- /dev/null
+++ b/icon/altus-metrum-128.png
diff --git a/icon/altus-metrum-16.png b/icon/altus-metrum-16.png
new file mode 100644
index 00000000..5bd45999
--- /dev/null
+++ b/icon/altus-metrum-16.png
diff --git a/icon/altus-metrum-16x16.jpg b/icon/altus-metrum-16x16.jpg
deleted file mode 100644
index 8d8bbc6a..00000000
--- a/icon/altus-metrum-16x16.jpg
+++ /dev/null
diff --git a/icon/altus-metrum-256.png b/icon/altus-metrum-256.png
new file mode 100644
index 00000000..46e1670a
--- /dev/null
+++ b/icon/altus-metrum-256.png
diff --git a/icon/altus-metrum-32.png b/icon/altus-metrum-32.png
new file mode 100644
index 00000000..c8588899
--- /dev/null
+++ b/icon/altus-metrum-32.png
diff --git a/icon/altus-metrum-48.png b/icon/altus-metrum-48.png
new file mode 100644
index 00000000..3bee98e6
--- /dev/null
+++ b/icon/altus-metrum-48.png
diff --git a/icon/altus-metrum-512.png b/icon/altus-metrum-512.png
new file mode 100644
index 00000000..47c47003
--- /dev/null
+++ b/icon/altus-metrum-512.png
diff --git a/icon/altus-metrum-64.png b/icon/altus-metrum-64.png
new file mode 100644
index 00000000..0ee086a6
--- /dev/null
+++ b/icon/altus-metrum-64.png