[Commits] Rev 2932: Replace pre-selected check box in "Remove database directory" dialog with in file:///H:/bzr/packaging2/

Vladislav Vaintroub wlad at montyprogram.com
Fri Jan 21 18:17:47 EET 2011


At file:///H:/bzr/packaging2/

------------------------------------------------------------
revno: 2932
revision-id: wlad at montyprogram.com-20110121161749-dz12adbbq114vgcy
parent: dbart at montyprogram.com-20110120142833-zkuln38g2sn7zssw
committer: Vladislav Vaintroub <wlad at montyprogram.com>
branch nick: packaging2
timestamp: Fri 2011-01-21 17:17:49 +0100
message:
  Replace pre-selected check box in "Remove database directory" dialog with
  buttons "Remove data" and "Keep data", while keeping "Next" button 
  disabled.
  
  This way user has to make a choice  whether to remove or keep data directory.
-------------- next part --------------
=== modified file 'win/packaging/create_msi.cmake.in'
--- a/win/packaging/create_msi.cmake.in	2011-01-15 01:41:39 +0000
+++ b/win/packaging/create_msi.cmake.in	2011-01-21 16:17:49 +0000
@@ -364,7 +364,7 @@
 	SET(EXTRA_CANDLE_ARGS "$ENV{EXTRA_CANDLE_ARGS}")
 ENDIF()
 
-SET(EXTRA_LIGHT_ARGS -cc . -reusecab -sice:ICE30)
+SET(EXTRA_LIGHT_ARGS -cc . -reusecab)
 IF("$ENV{EXTRA_LIGHT_ARGS}")
 	SET(EXTRA_LIGHT_ARGS "$ENV{EXTRA_LIGHT_ARGS}")
 ENDIF()

=== modified file 'win/packaging/extra.wxs.in'
--- a/win/packaging/extra.wxs.in	2011-01-20 14:04:23 +0000
+++ b/win/packaging/extra.wxs.in	2011-01-21 16:17:49 +0000
@@ -30,7 +30,6 @@
     <Property Id="CLEANUPDATA" Secure="yes" Value="1"/>
 
 
-
     <!-- 
       User interface dialogs 
      -->
@@ -40,15 +39,38 @@
 
       <!-- Dialog on uninstall of the database -->
       <Dialog Id="ConfirmDataCleanupDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
-        <Control Id="CleanupDataCheckBox" Type="CheckBox" X="20" Y="100" Height="30" Property="CLEANUPDATA" Width="300" CheckBoxValue="1"
+
+        <!--<Control Id="CleanupDataCheckBox" Type="CheckBox" X="20" Y="100" Height="30" Property="CLEANUPDATA" Width="300" CheckBoxValue="1"
                 Text="{\Font1}Remove default database directory &#xD;&#xA;'[DATADIR]'"/>
+                -->
+        <Control Id="RemoveDatadirButton" Type="PushButton" X="40" Y="65" Width="80" Height="18"
+                  Text="Remove data">
+          <Publish Property="CLEANUPDATA" Value="1">1</Publish>
+          <Publish Event="NewDialog" Value="VerifyReadyDlg">WixUI_InstallMode</Publish>
+          <Publish Event="EndDialog" Value="Return">NOT WixUI_InstallMode</Publish>
+
+        </Control>
+        <Control Id="RemoveDatadirText" Type="Text" X="60" Y="85" Width="280" Height="20">
+          <Text>Remove default database directory [DATADIR]. Ensures proper cleanup on uninstall.</Text>
+        </Control>
+
+        <Control Id="KeepDatadirButton" Type="PushButton" X="40" Y="118" Width="80" Height="18"
+                 Text="Keep data">
+          <Publish Property="CLEANUPDATA">1</Publish>
+          <Publish Event="NewDialog" Value="VerifyReadyDlg">WixUI_InstallMode</Publish>
+          <Publish Event="EndDialog" Value="Return">NOT WixUI_InstallMode</Publish>
+        </Control>
+        <Control Id="KeepDataDirText" Type="Text" X="60" Y="138" Width="280" Height="70" >
+          <Text>Do not remove [DATADIR]. Choose this option if you intend to use data in the future</Text>
+        </Control>
+
 
         <!-- Navigation buttons-->
         <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&amp;Back">
           <Publish Event="NewDialog" Value="CustomizeDlg">WixUI_InstallMode="Change"</Publish>
           <Condition Action="disable">NOT WixUI_InstallMode</Condition>
         </Control>
-        <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="&amp;Next">
+        <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="&amp;Next">
           <Publish Event="NewDialog" Value="VerifyReadyDlg">WixUI_InstallMode</Publish>
           <Publish Event="EndDialog" Value="Return">NOT WixUI_InstallMode</Publish>
         </Control>
@@ -230,7 +252,7 @@
 
       <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="ServicePortDlg" Order="3" ><![CDATA[&DBInstance=3 AND NOT !DBInstance=3]]></Publish>
       <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3"> <![CDATA[OLDERVERSIONBEINGUPGRADED <>""]]></Publish>
-      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="ConfirmDataCleanupDlg" Order="3" ><![CDATA[(&DBInstance=2) AND (!DBInstance=3)]]></Publish>
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="ConfirmDataCleanupDlg" Order="1" ><![CDATA[(&DBInstance=2) AND (!DBInstance=3)]]></Publish>
 
 
       <Publish Dialog="CustomizeDlg" Control="Next" Event="DoAction" Value="CheckDataDirectoryEmpty" Order="1"><![CDATA[&DBInstance=3 AND NOT !DBInstance=3]]></Publish>
@@ -247,7 +269,12 @@
       </Publish>
 
       <Publish Dialog="ConfirmDataCleanupDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg">WixUI_InstallMode = "Change"</Publish>
-      <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="ConfirmDataCleanupDlg" Order="999">!DBInstance=3 AND CLEANUPDATA</Publish>
+      <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="ConfirmDataCleanupDlg" Order="999">
+        !DBInstance=3 AND (CLEANUPDATA Or USECONFIRMDATACLEANUPDLG)
+      </Publish>
+      <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Property="USECONFIRMDATACLEANUPDLG" Value="1" Order="999">
+        !DBInstance=3 AND CLEANUPDATA
+      </Publish>
       <Publish Dialog="ConfirmDataCleanupDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">WixUI_InstallMode = "Remove"</Publish>
     </UI>
 



More information about the commits mailing list