summaryrefslogtreecommitdiff
path: root/BKUWebStart/src
diff options
context:
space:
mode:
authorclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2009-08-20 16:33:43 +0000
committerclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2009-08-20 16:33:43 +0000
commit65f25f58df0df1d8a90625f3944155235a9d20be (patch)
treed1baef9ba455b6d89b78fe96bbb5abc66eb51b08 /BKUWebStart/src
parent22001c93bca360d1b15c252cb22d2a4147ff350d (diff)
downloadmocca-65f25f58df0df1d8a90625f3944155235a9d20be.tar.gz
mocca-65f25f58df0df1d8a90625f3944155235a9d20be.tar.bz2
mocca-65f25f58df0df1d8a90625f3944155235a9d20be.zip
24x24 icon for webstart
16x16 tray icon git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@449 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'BKUWebStart/src')
-rw-r--r--BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java12
-rw-r--r--BKUWebStart/src/main/jnlp/template.xml2
-rw-r--r--BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/logo_16.pngbin0 -> 1084 bytes
3 files changed, 11 insertions, 3 deletions
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java
index ca40ddc0..d216fdc4 100644
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java
@@ -171,9 +171,15 @@ public class Launcher implements BKUControllerInterface, ActionListener {
// get the SystemTray instance
SystemTray tray = SystemTray.getSystemTray();
log.debug("TrayIcon size: " + tray.getTrayIconSize());
- String iconResource = (tray.getTrayIconSize().height < 25)
- ? TRAYICON_RESOURCE + "24.png"
- : TRAYICON_RESOURCE + "32.png";
+
+ String iconResource;
+ if (tray.getTrayIconSize().height < 17) {
+ iconResource = TRAYICON_RESOURCE + "16.png";
+ } else if (tray.getTrayIconSize().height < 25) {
+ iconResource = TRAYICON_RESOURCE + "24.png";
+ } else {
+ iconResource = TRAYICON_RESOURCE + "32.png";
+ }
Image image = ImageIO.read(Launcher.class.getClassLoader().getResourceAsStream(iconResource));
PopupMenu popup = new PopupMenu();
diff --git a/BKUWebStart/src/main/jnlp/template.xml b/BKUWebStart/src/main/jnlp/template.xml
index bbc4c466..5d9db869 100644
--- a/BKUWebStart/src/main/jnlp/template.xml
+++ b/BKUWebStart/src/main/jnlp/template.xml
@@ -10,7 +10,9 @@
<description>$project.Description (BKU) MOCCA Web Start</description>
<description kind="short">$project.Description</description>
<!--icon kind="shortcut" href="img/logo_16.ico" width="16" height="16" version="1.0-SNAPSHOT"/-->
+ <icon kind="shortcut" href="img/logo_24.png" width="24" height="24" version="1.0"/>
<icon kind="shortcut" href="img/logo_32.png" width="32" height="32" version="1.0"/>
+ <icon kind="default" href="img/logo_24.png" width="24" height="24" version="1.0"/>
<icon kind="default" href="img/logo_32.png" width="32" height="32" version="1.0"/>
<icon kind="default" href="img/logo_64.png" width="64" height="64" version="1.0"/>
<icon kind="splash" href="img/splash.png" version="2.0"/>
diff --git a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/logo_16.png b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/logo_16.png
new file mode 100644
index 00000000..f84f108d
--- /dev/null
+++ b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/logo_16.png
Binary files differ