+ fixed installer for windows xp

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@184 174cde9d-5d70-4d2a-aa98-46368bc2aaf7

5 files changed, 41 insertions, 18 deletions

diff --git a/pdf-over-gui/src/main/resources/izpack/customicons.xml b/pdf-over-gui/src/main/resources/izpack/customicons.xml
new file mode 100644
index 00000000..6222001d
--- /dev/null
+++ b/pdf-over-gui/src/main/resources/izpack/customicons.xml
@@ -0,0 +1 @@
+<icon res="/resources/JFrameIcon.png" id="JFrameIcon"/>
\ No newline at end of file
diff --git a/pdf-over-gui/src/main/resources/izpack/icon16x16.png b/pdf-over-gui/src/main/resources/izpack/icon16x16.png
new file mode 100644
index 00000000..571c7885
--- /dev/null
+++ b/pdf-over-gui/src/main/resources/izpack/icon16x16.png
diff --git a/pdf-over-gui/src/main/resources/izpack/install.xml b/pdf-over-gui/src/main/resources/izpack/install.xml
index 3b40fa91..8fb14109 100644
--- a/pdf-over-gui/src/main/resources/izpack/install.xml
+++ b/pdf-over-gui/src/main/resources/izpack/install.xml
@@ -5,21 +5,28 @@
 	<info>
 		<appname>PDFOver</appname>
 		<appversion>4.0</appversion>
-		<uninstaller write="no" />
+		<uninstaller write="yes" />
 		<javaversion>1.6</javaversion>
 		<authors>
-			<author name="A-SIT (Secure Information Technology Center - Austria)" email="" />
+			<author name="A-SIT (Secure Information Technology Center - Austria)"
+				email="" />
 		</authors>
-		<uninstaller/>
+		<uninstaller />
 		<url>http://www.a-sit.at/</url>
 		<pack200 />
-		<run-privileged condition="izpack.windowsinstall.vista|izpack.macinstall|izpack.windowsinstall.7"/>
+		<run-privileged
+			condition="izpack.windowsinstall.vista|izpack.macinstall|izpack.windowsinstall.7" />
 	</info>
 
-	<guiprefs resizable="no" width="480" height="360">
-		<laf name="looks">
-			<param name="variant" value="windows" />
+	<guiprefs resizable="yes" width="480" height="360">
+		<laf name="substance">
 			<os family="windows" />
+			<os family="unix" />
+			<param name="variant" value="mist-silver" />
+		</laf>
+		<laf name="substance">
+			<os family="mac" />
+			<param name="variant" value="mist-aqua" />
 		</laf>
 	</guiprefs>
 
@@ -29,16 +36,15 @@
 	<resources>
 		<res src="./unix_shortcutSpec.xml" id="Unix_shortcutSpec.xml" />
 		<res src="./win_shortcutSpec.xml" id="Win_shortcutSpec.xml" />
-		<res id="TargetPanel.dir.windows" src="defaultInstallDir.txt" />
+		<res src="./win_shortcutSpec.xml" id="shortcutSpec.xml" />
+		<res src="defaultInstallDir.txt" id="TargetPanel.dir.windows" />
+		<res id="JFrameIcon.png" src="./icon16x16.png"/>
+		<res src="./customicons.xml" id="customicons.xml" />
 	</resources>
-	
-	<native type="izpack" name="ShellLink.dll">
-		<os family="windows" />
-	</native>
-	<native type="izpack" name="ShellLink_x64.dll">
-		<os family="windows" />
-	</native>
-	
+
+	<native type="izpack" name="ShellLink.dll" />
+	<native type="izpack" name="ShellLink_x64.dll" />
+
 	<variables>
 		<variable name="DesktopShortcutCheckboxEnabled" value="true" />
 	</variables>
diff --git a/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml b/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml
index 64f3fa9b..ee78dc48 100644
--- a/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml
+++ b/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml
@@ -20,8 +20,23 @@
      iconIndex="0"
      type="Application"
      encoding="UTF-8"
-     terminal="false"
-     KdeSubstUID="false"
+     initialState="normal">
+     <createForPack name="main"/>
+   </shortcut>
+   
+   <shortcut
+     name="Uninstall"
+     programGroup="yes"
+     desktop="no"
+     applications="no"
+     startMenu="yes"
+     startup="no"
+     target="$INSTALL_PATH/scripts/uninstall_win.bat"
+     commandLine=""
+     workingDirectory="$INSTALL_PATH/lib"
+     description="PDFOver 4.0 Uninstall"
+     type="Application"
+     encoding="UTF-8"
      initialState="normal">
      <createForPack name="main"/>
    </shortcut>
diff --git a/pdf-over-gui/src/main/resources/scripts/uninstall_win.bat b/pdf-over-gui/src/main/resources/scripts/uninstall_win.bat
new file mode 100644
index 00000000..5bb91af2
--- /dev/null
+++ b/pdf-over-gui/src/main/resources/scripts/uninstall_win.bat
@@ -0,0 +1 @@
+..\Uninstaller\uninstaller.jar
\ No newline at end of file