From b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 5 May 2010 15:29:01 +0000
Subject: Merged feature branch mocca-1.2.13-id@r724 back to trunk.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@725 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUWebStart/src/main/jnlp/keystore.ks           | Bin 5635 -> 5639 bytes
 BKUWebStart/src/main/jnlp/template-local.xml    |  18 ++++++++++--------
 BKUWebStart/src/main/jnlp/template-unstable.xml |   2 ++
 BKUWebStart/src/main/jnlp/template.xml          |   2 ++
 4 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'BKUWebStart/src/main/jnlp')

diff --git a/BKUWebStart/src/main/jnlp/keystore.ks b/BKUWebStart/src/main/jnlp/keystore.ks
index 824c3a40..ba0b4652 100644
Binary files a/BKUWebStart/src/main/jnlp/keystore.ks and b/BKUWebStart/src/main/jnlp/keystore.ks differ
diff --git a/BKUWebStart/src/main/jnlp/template-local.xml b/BKUWebStart/src/main/jnlp/template-local.xml
index f9a7d917..2e89f2ed 100644
--- a/BKUWebStart/src/main/jnlp/template-local.xml
+++ b/BKUWebStart/src/main/jnlp/template-local.xml
@@ -5,16 +5,18 @@
     <title>MOCCA Developement</title>
     <vendor>E-Government Innovationszentrum (EGIZ)</vendor>
     <homepage href="${project.Url}"/>
-    <description>${project.Description} (BKU) MOCCA Web Start - Developement Version</description>
-    <description kind="short">${project.Description}</description>
-    <icon kind="shortcut" href="img/chip16.png" width="16" height="16"/>
-    <icon kind="shortcut" href="img/chip24.png" width="24" height="24"/>
-    <icon kind="shortcut" href="img/chip32.png" width="32" height="32"/>
+    <description>MOCCA Web Start - Developement Version</description>
+    <description kind="short">MOCCA Development</description>
     <icon kind="shortcut" href="img/chip48.png" width="48" height="48"/>
-    <icon kind="default" href="img/chip16.png" width="16" height="16"/>
-    <icon kind="default" href="img/chip24.png" width="24" height="24"/>
-    <icon kind="default" href="img/chip32.png" width="32" height="32"/>
+    <icon kind="shortcut" href="img/chip32.png" width="32" height="32"/>
+    <icon kind="shortcut" href="img/chip24.png" width="24" height="24"/>
+    <icon kind="shortcut" href="img/chip16.png" width="16" height="16"/>
     <icon kind="default" href="img/chip48.png" width="48" height="48"/>
+    <icon kind="default" href="img/chip32.png" width="32" height="32"/>
+    <icon kind="default" href="img/chip24.png" width="24" height="24"/>
+    <icon kind="default" href="img/chip16.png" width="16" height="16"/>
+    <!-- MacOS X (dock, programmumschalter) icon (unfortunately also iconf for trayIcon INFO message) -->
+    <icon kind="default" href="img/chip128.png" width="128" height="128"/>
     <icon kind="splash" href="img/splash.png"/>
     <shortcut online="true">
       <desktop/>
diff --git a/BKUWebStart/src/main/jnlp/template-unstable.xml b/BKUWebStart/src/main/jnlp/template-unstable.xml
index 7d0f474a..d562d4ed 100644
--- a/BKUWebStart/src/main/jnlp/template-unstable.xml
+++ b/BKUWebStart/src/main/jnlp/template-unstable.xml
@@ -11,10 +11,12 @@
     <icon kind="shortcut" href="img/chip24.png" width="24" height="24"/>
     <icon kind="shortcut" href="img/chip32.png" width="32" height="32"/>
     <icon kind="shortcut" href="img/chip48.png" width="48" height="48"/>
+    <icon kind="shortcut" href="img/chip128.png" width="128" height="128"/>
     <icon kind="default" href="img/chip16.png" width="16" height="16"/>
     <icon kind="default" href="img/chip24.png" width="24" height="24"/>
     <icon kind="default" href="img/chip32.png" width="32" height="32"/>
     <icon kind="default" href="img/chip48.png" width="48" height="48"/>
+    <icon kind="default" href="img/chip128.png" width="128" height="128"/>
     <icon kind="splash" href="img/splash.png"/>
     <shortcut online="true">
       <desktop/>
diff --git a/BKUWebStart/src/main/jnlp/template.xml b/BKUWebStart/src/main/jnlp/template.xml
index b56f88b7..83130493 100644
--- a/BKUWebStart/src/main/jnlp/template.xml
+++ b/BKUWebStart/src/main/jnlp/template.xml
@@ -11,10 +11,12 @@
     <icon kind="shortcut" href="img/chip24.png" width="24" height="24"/>
     <icon kind="shortcut" href="img/chip32.png" width="32" height="32"/>
     <icon kind="shortcut" href="img/chip48.png" width="48" height="48"/>
+    <icon kind="shortcut" href="img/chip128.png" width="128" height="128"/>
     <icon kind="default" href="img/chip16.png" width="16" height="16"/>
     <icon kind="default" href="img/chip24.png" width="24" height="24"/>
     <icon kind="default" href="img/chip32.png" width="32" height="32"/>
     <icon kind="default" href="img/chip48.png" width="48" height="48"/>
+    <icon kind="default" href="img/chip128.png" width="128" height="128"/>
     <icon kind="splash" href="img/splash.png"/>
     <shortcut online="true">
       <desktop/>
-- 
cgit v1.2.3