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>

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index ddc54cbd18a82958b4cefc1bd809a43cc7b80c1e..600d8acce428232f973e0ff4cef79c7bf13b7db7 100644 (file)
--- 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 70598634f6990b4e7c0985236a9fbbf3ac3a16c1..338b363ed0bc099dd107e5eaed27c8389bbf4f35 100644 (file)
--- 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 46ca3e5d8785602ae2acd867f574f85a3ce293d7..510579c5973c56ab05255c9630513c89eb618856 100644 (file)
--- 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 926d66f083a076c8634cbe4dc6e5a8db05542b46..9977e82b2483d83d93f4cdd63132c4bf97cb8191 100644 (file)
--- 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 0d9931d585ec70979a2d40e771ca0a45e89c09b4..23163e40278dbb63f68333d3df861cfc8c0b46f6 100644 (file)
--- 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 36969846b3743d6337c8351fed62d273e176ed96..6010df58544cf5c608b58afbafc417828788907a 100644 (file)
--- 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 (file)
index 0000000..f1343d9
Binary files /dev/null and b/icon/altus-metrum-128.png differ

diff --git a/icon/altus-metrum-16.png b/icon/altus-metrum-16.png
new file mode 100644 (file)
index 0000000..5bd4599
Binary files /dev/null and b/icon/altus-metrum-16.png differ

diff --git a/icon/altus-metrum-16x16.jpg b/icon/altus-metrum-16x16.jpg
deleted file mode 100644 (file)
index 8d8bbc6..0000000
Binary files a/icon/altus-metrum-16x16.jpg and /dev/null differ

diff --git a/icon/altus-metrum-256.png b/icon/altus-metrum-256.png
new file mode 100644 (file)
index 0000000..46e1670
Binary files /dev/null and b/icon/altus-metrum-256.png differ

diff --git a/icon/altus-metrum-32.png b/icon/altus-metrum-32.png
new file mode 100644 (file)
index 0000000..c858889
Binary files /dev/null and b/icon/altus-metrum-32.png differ

diff --git a/icon/altus-metrum-48.png b/icon/altus-metrum-48.png
new file mode 100644 (file)
index 0000000..3bee98e
Binary files /dev/null and b/icon/altus-metrum-48.png differ

diff --git a/icon/altus-metrum-512.png b/icon/altus-metrum-512.png
new file mode 100644 (file)
index 0000000..47c4700
Binary files /dev/null and b/icon/altus-metrum-512.png differ

diff --git a/icon/altus-metrum-64.png b/icon/altus-metrum-64.png
new file mode 100644 (file)
index 0000000..0ee086a
Binary files /dev/null and b/icon/altus-metrum-64.png differ