From 9d2f85abe32c66d6622af17ec1e9ed540380fc76 Mon Sep 17 00:00:00 2001
From: scantor <scantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Fri, 18 May 2012 21:11:48 +0000
Subject: [PATCH 1/1] Dialog adjustments

git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3670 cb58f699-b61c-0410-a6fe-9272a202ed29
---
 msi/WiX/ShibbolethSP-iis-dialog.wxs   |  6 +++---
 msi/WiX/ShibbolethSP-shibd-dialog.wxs | 29 +++++++++++++++++++----------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/msi/WiX/ShibbolethSP-iis-dialog.wxs b/msi/WiX/ShibbolethSP-iis-dialog.wxs
index 4564712..128dd84 100644
--- a/msi/WiX/ShibbolethSP-iis-dialog.wxs
+++ b/msi/WiX/ShibbolethSP-iis-dialog.wxs
@@ -45,10 +45,10 @@
                  Property='INSTALL_ISAPI_FILTER' Text='Install ISAPI filter and configure IIS' 
                  CheckBoxValue='TRUE' TabSkip='yes' />
 
-        <Control Id='ShibExtensionBox' Type='GroupBox' X='99' Y='165' Width='175' Height='35' TabSkip='yes' />
-        <Control Id='ShibExtensionText' Type='Text' X='114' Y='180' Width='96' Height='12' 
+        <Control Id='ShibExtensionBox' Type='GroupBox' X='99' Y='145' Width='175' Height='35' TabSkip='yes' />
+        <Control Id='ShibExtensionText' Type='Text' X='114' Y='160' Width='96' Height='12' 
                  Text='Shibboleth File Extension:' TabSkip='yes'/>
-        <Control Id='ShibExtensionEdit' Type='Edit' X='211' Y='177' Width='51' Height='16' 
+        <Control Id='ShibExtensionEdit' Type='Edit' X='211' Y='157' Width='51' Height='16' 
                  Property='SHIB_FILE_EXTENSION' TabSkip='yes'>
           <Condition Action='disable'>INSTALL_ISAPI_FILTER &lt;&gt; "TRUE"</Condition>
           <Condition Action='enable'>INSTALL_ISAPI_FILTER = "TRUE"</Condition>
diff --git a/msi/WiX/ShibbolethSP-shibd-dialog.wxs b/msi/WiX/ShibbolethSP-shibd-dialog.wxs
index 0a3981f..3470074 100644
--- a/msi/WiX/ShibbolethSP-shibd-dialog.wxs
+++ b/msi/WiX/ShibbolethSP-shibd-dialog.wxs
@@ -27,33 +27,33 @@
         </Control>
 
         <Control Id='Title' Type='Text' X='15' Y='6' Width='200' Height='15' Transparent='yes' NoPrefix='yes' 
-                 Text='{\WixUI_Font_Title}Shibd Service' />
+                 Text='{\WixUI_Font_Title}Shibboleth Service Provider' />
 
         <Control Id='BannerBitmap' Type='Bitmap' X='0' Y='0' Width='370' Height='44' TabSkip='no' 
                  Text='!(loc.InstallDirDlgBannerBitmap)' />
 
-        <Control Id='Description64' Type='Text' X='25' Y='23' Width='280' Height='15' Transparent='yes' NoPrefix='yes' 
-                 Text='Specify which architecture to run and the port for the Shibd daemon'>
+        <Control Id='Description64' Type='Text' X='25' Y='23' Width='300' Height='20' Transparent='yes' NoPrefix='yes' 
+                 Text='Control service, and specify which architecture (64-bit or 32-bit) to make active.'>
           <Condition Action='hide' >IS64BITINSTALL &lt;&gt; "TRUE"</Condition>
         </Control>
+        <!--
         <Control Id='Description32' Type='Text' X='25' Y='23' Width='280' Height='15' Transparent='yes' NoPrefix='yes' Text='Specify the port for the Shibd daemon'>
           <Condition Action='hide' >IS64BITINSTALL = "TRUE"</Condition>
         </Control>
-
+        -->
 
         <Control Id='BannerLine' Type='Line' X='0' Y='44' Width='370' Height='0' />
         <Control Id='BottomLine' Type='Line' X='0' Y='234' Width='370' Height='0' />
 
+        <!--
         <Control Id='ShibdLine1' Type='Text' X='25' Y='60' Width='312' Height='10' 
                  Text='Please enter the TCP port number in which the shibd daemon should run'/>
         <Control Id='ShibdLine2' Type='Text' X='25' Y='79' Width='312' Height='20' 
                  Text='NOTE: This is NOT the web server port and MUST be a valid Windows port number that is NOT in use by any other process!'/>
         <Control Id='ShibdLine3' Type='Text' X='25' Y='108' Width='312' Height='20' 
                  Text='If a copy of shibboleth2.xml already exists in the installation path, it will NOT be updated with this new port number.'/>
-        <Control Id='InstallShibdCheckBox' Type='CheckBox' X='118' Y='154' Width='96' Height='14' 
-                 Property='INSTALL_SHIBD_SERVICE' Text='Install Shibd daemon' 
-                 CheckBoxValue='TRUE' TabSkip='yes' />
-
+        -->
+        
         <!--
         <Control Id='ShibdPortBox' Type='GroupBox' X='131' Y='165' Width='104' Height='35' />
         <Control Id='ShibdPortText' Type='Text' X='146' Y='181' Width='40' Height='12' Text='Shibd port' >
@@ -67,8 +67,17 @@
         </Control>
         -->
 
-        <Control Id='Install32BitShibd' Type='CheckBox' X='118' Y='205' Width='140' Height='14' 
-                 Property='INSTALL_32BIT' Text='Install 32 bit shibd and plugins' 
+        <Control Id='InstallShibdCheckBox' Type='CheckBox' X='80' Y='80' Width='250' Height='30' 
+          Property='INSTALL_SHIBD_SERVICE' Text='Install Shibboleth Daemon as a service (recommended).' 
+          CheckBoxValue='TRUE' TabSkip='yes' />
+
+        <Control Id='ShibdLine1' Type='Text' X='25' Y='140' Width='312' Height='20' 
+          Text='By default, Shibboleth will operate as a 64-bit system. You can change this now, or after installation.'>
+          <Condition Action='hide' >IS64BITINSTALL &lt;&gt; "TRUE"</Condition>
+        </Control>
+        
+        <Control Id='Install32BitShibd' Type='CheckBox' X='118' Y='170' Width='250' Height='30' 
+                 Property='INSTALL_32BIT' Text='Run as a 32-bit system instead.' 
                  CheckBoxValue='TRUE' TabSkip='yes'>
           <Condition Action='hide' >IS64BITINSTALL &lt;&gt; "TRUE"</Condition>
         </Control>
-- 
2.1.4