Fix windows install

gungwald · Oct 23, 2022 · ff26d10 · ff26d10
1 parent a044716
commit ff26d10
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 32 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/libraries/Maven__net_java_linoleum_jlfgr_1_0.xml b/.idea/libraries/Maven__net_java_linoleum_jlfgr_1_0.xml
diff --git a/.idea/libraries/Maven__org_codehaus_izpack_izpack_standalone_compiler_4_3_5.xml b/.idea/libraries/Maven__org_codehaus_izpack_izpack_standalone_compiler_4_3_5.xml
diff --git a/.idea/libraries/izpack_standalone_compiler_4_3_5.xml b/.idea/libraries/izpack_standalone_compiler_4_3_5.xml
diff --git a/.idea/libraries/jlfgr_1_0.xml b/.idea/libraries/jlfgr_1_0.xml
diff --git a/rune.iml b/rune.iml
@@ -13,7 +13,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.izpack:izpack-standalone-compiler:4.3.5" level="project" />
-    <orderEntry type="library" name="Maven: net.java.linoleum:jlfgr:1_0" level="project" />
+    <orderEntry type="library" name="jlfgr-1_0" level="project" />
+    <orderEntry type="library" name="izpack-standalone-compiler-4.3.5" level="project" />
   </component>
 </module>
diff --git a/src/main/izpack/izpack-main-install-setup.xml b/src/main/izpack/izpack-main-install-setup.xml
@@ -11,7 +11,7 @@
 		<url>https://github.com/gungwald/rune</url>
 		<javaversion>@{target.java.version}</javaversion>
 		<requiresjdk>no</requiresjdk>
-		<!--<run-privileged condition="izpack.windowsinstall|izpack.macinstall" />-->
+		<run-privileged condition="izpack.windowsinstall|izpack.macinstall" />
 		<uninstaller write="yes" />
 		<readinstallationinformation>false</readinstallationinformation> <!-- Prevent izpack from stopping because old version is "incompatible". -->
 		<writeinstallationinformation>false</writeinstallationinformation> <!-- Prevent runtime error -->
@@ -25,11 +25,12 @@
 		<laf name="substance">
 			<os family="unix" />
 		</laf>
+		<!-- The default Windows theme doesn't look that good. -->
 		<laf name="looks"> <!-- JGoodies Looks -->
 			<os family="windows" />
 			<param name="variant" value="extwin" /> <!-- or just windows -->
 		</laf>
-		<modifier key="labelFontSize" value="1.2" />
+		<modifier key="labelFontSize" value="1.1" />
 		<modifier key="allYGap" value="10" />
 	</guiprefs>
 

diff --git a/src/main/izpack/panel-shortcut-windows.xml b/src/main/izpack/panel-shortcut-windows.xml
@@ -16,7 +16,7 @@
             commandLine=""
             workingDirectory="$USER_HOME"
             description="A text editor that works the way you expect"
-            iconFile="$INSTALL_PATH/share/icons/rune.png"
+            iconFile="$INSTALL_PATH/share/icons/rune.ico"
             iconIndex="0"
             type="Application"
             encoding="UTF-8"