From ff26d102564df2b12e24f44a9f2f24ecb030526f Mon Sep 17 00:00:00 2001
From: Bill Chatfield <bill_chatfield@yahoo.com>
Date: Sun, 23 Oct 2022 17:26:51 -0400
Subject: [PATCH] Fix windows install

---
 .idea/compiler.xml                                  |  2 +-
 .../Maven__net_java_linoleum_jlfgr_1_0.xml          | 13 -------------
 ...haus_izpack_izpack_standalone_compiler_4_3_5.xml | 13 -------------
 .../libraries/izpack_standalone_compiler_4_3_5.xml  |  9 +++++++++
 .idea/libraries/jlfgr_1_0.xml                       |  9 +++++++++
 rune.iml                                            |  4 ++--
 src/main/izpack/izpack-main-install-setup.xml       |  5 +++--
 src/main/izpack/panel-shortcut-windows.xml          |  2 +-
 8 files changed, 25 insertions(+), 32 deletions(-)
 delete mode 100644 .idea/libraries/Maven__net_java_linoleum_jlfgr_1_0.xml
 delete mode 100644 .idea/libraries/Maven__org_codehaus_izpack_izpack_standalone_compiler_4_3_5.xml
 create mode 100644 .idea/libraries/izpack_standalone_compiler_4_3_5.xml
 create mode 100644 .idea/libraries/jlfgr_1_0.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 447d6fc..7a20a5d 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -10,7 +10,7 @@
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
-      <module name="rune" target="1.5" />
+      <module name="rune" target="11" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_java_linoleum_jlfgr_1_0.xml b/.idea/libraries/Maven__net_java_linoleum_jlfgr_1_0.xml
deleted file mode 100644
index da9ac1f..0000000
--- a/.idea/libraries/Maven__net_java_linoleum_jlfgr_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: net.java.linoleum:jlfgr:1_0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/java/linoleum/jlfgr/1_0/jlfgr-1_0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/java/linoleum/jlfgr/1_0/jlfgr-1_0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/java/linoleum/jlfgr/1_0/jlfgr-1_0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
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
deleted file mode 100644
index 76d7c78..0000000
--- a/.idea/libraries/Maven__org_codehaus_izpack_izpack_standalone_compiler_4_3_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.codehaus.izpack:izpack-standalone-compiler:4.3.5">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/izpack/izpack-standalone-compiler/4.3.5/izpack-standalone-compiler-4.3.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/izpack/izpack-standalone-compiler/4.3.5/izpack-standalone-compiler-4.3.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/izpack/izpack-standalone-compiler/4.3.5/izpack-standalone-compiler-4.3.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/izpack_standalone_compiler_4_3_5.xml b/.idea/libraries/izpack_standalone_compiler_4_3_5.xml
new file mode 100644
index 0000000..bf55d03
--- /dev/null
+++ b/.idea/libraries/izpack_standalone_compiler_4_3_5.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="izpack-standalone-compiler-4.3.5">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/izpack-standalone-compiler-4.3.5.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/jlfgr_1_0.xml b/.idea/libraries/jlfgr_1_0.xml
new file mode 100644
index 0000000..595a87c
--- /dev/null
+++ b/.idea/libraries/jlfgr_1_0.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="jlfgr-1_0">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/jlfgr-1_0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/rune.iml b/rune.iml
index 63ff5a9..ca15621 100644
--- 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>
\ No newline at end of file
diff --git a/src/main/izpack/izpack-main-install-setup.xml b/src/main/izpack/izpack-main-install-setup.xml
index eb8879f..05b092a 100644
--- 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
index e287551..352e68a 100644
--- 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"