From: lehtonen <lehtonen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Tue, 19 Oct 2010 07:33:51 +0000 (+0000)
Subject: git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@18466 ac1ea38d-2e2b... 
X-Git-Tag: simantics-1.2.1~11
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=8c7dc589a5e4df86299c0d85750784b3252de6f2;p=simantics%2Fsysdyn.git

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@18466 ac1ea38d-2e2b-0410-8846-a27921b304fc
---

diff --git a/installer/shortcutSpec.xml b/installer/default_shortcut_specification.xml
similarity index 95%
rename from installer/shortcutSpec.xml
rename to installer/default_shortcut_specification.xml
index 161ddcc1..091dca92 100644
--- a/installer/shortcutSpec.xml
+++ b/installer/default_shortcut_specification.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <shortcuts>
 
-  <skipIfNotSupported/>
-
   <programGroup defaultName="Simantics/System Dynamics" location="applications"/>
 
   <shortcut
diff --git a/installer/installer.xml b/installer/installer.xml
index feb6adcb..d9572c18 100644
--- a/installer/installer.xml
+++ b/installer/installer.xml
@@ -48,7 +48,7 @@
         <res id="TargetPanel.dir.windows" src="TargetDir.txt.windows" />
         <res id="TargetPanel.dir.unix" src="TargetDir.txt.unix" />
         <res id="CustomLangpack.xml_eng" src="CustomLangpack_eng.xml" />
-        <res id="shortcutSpec.xml" src="shortcutSpec.xml" />
+        <res id="shortcutSpec.xml" src="default_shortcut_specification.xml" />
 	</resources>
 	<panels>
 		<panel classname="CheckedHelloPanel"/>
@@ -56,8 +56,9 @@
 		<panel classname="PacksPanel"/>
 		<panel classname="NonBlankTargetPanel"/>
 		<panel classname="SummaryPanel"/>
-		<panel classname="InstallPanel"/>
-		<!--<panel classname="SimpleFinishPanel"/>-->
+        <panel classname="InstallPanel"/>
+        <!--<panel classname="ShortcutPanel"/>-->
+		<panel classname="FinishPanel"/>
 	</panels>
 	<variables>
 		<variable name="DesktopShortcutCheckboxEnabled" value="true"/>
@@ -68,6 +69,7 @@
 			<os family="windows"/>
 			<description>Simantics SDK requires an up-to-date version of the Java Runtime Environment version 6.
 If your JRE is old, you can install JRE 6 update 22 by selecting this.
+NOTE: Installing this will require network access for downloading Java components.
 Other Java installers are available at http://www.java.com/en/download/manual.jsp.</description>
 			<file override="update"
 				src="files/jre-6u22-windows-i586-iftw-rv.exe" targetdir="$INSTALL_PATH"/>