From d31fdc9fae5228593eac7ddefa8ddb58fa7ccbbe Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Tue, 12 Jun 2018 13:49:38 +0200
Subject: [PATCH] jj: fix installer, has feature and folder selection now

---
 DDUserManager/SetupWix/Product.wxs | 47 +++++++++++++-----------------
 1 file changed, 20 insertions(+), 27 deletions(-)

diff --git a/DDUserManager/SetupWix/Product.wxs b/DDUserManager/SetupWix/Product.wxs
index 8c6a39a..b99f300 100644
--- a/DDUserManager/SetupWix/Product.wxs
+++ b/DDUserManager/SetupWix/Product.wxs
@@ -104,6 +104,10 @@
         <File Id="DevExpress.XtraPrinting.v15.2" Name="DevExpress.XtraPrinting.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll"/>
       </Component>
 
+      <Component Id="DDLibs" >
+        <File Id="DD_LIB_Standards" Name="DD_LIB_Standards.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DD_LIB_Standards.dll" />
+      </Component>
+
       <!-- Für weitere Dateien hier Component Elemente anlegen!! -->
       <!--
         <Component Id="FirmaXYLib" Guid="PUT-GUID-HERE">
@@ -116,6 +120,7 @@
       <ComponentRef Id="MainApplicationExe" />
       <ComponentRef Id="RegistryKeys" />
       <ComponentRef Id="DevExpressLibs"/>
+      <ComponentRef Id="DDLibs"/>
       <!-- Weitere Komponenten hier hinzufügen! -->
     </Feature>
 
@@ -134,38 +139,26 @@
 
     <!-- Legt das Standard-Installationsverzeichnis fest-->
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
+    <Property Id="_BrowseProperty" Value="INSTALLDIR" />
 
     <!-- Konfiguriert die Reihenfolge der Installer-Dialoge -->
     <UI>
       <UIRef Id="WixUI_FeatureTree"/>
-      <UIRef Id="WixUI_ErrorProgressText" />
-      <!--<UIRef Id="CustomUI_Database"/>-->
       
-      <Publish Dialog="WelcomeDlg"
-            Control="Next"
-            Event="NewDialog"
-            Value="InstallDirDlg"
-            Order="2">1</Publish>
-      <Publish Dialog="InstallDirDlg"
-            Control="Back"
-            Event="NewDialog"
-            Value="WelcomeDlg"
-            Order="2">1</Publish>
-      <Publish Dialog="InstallDirDlg"
-            Control="Next"
-            Event="NewDialog"
-            Value="FeaturesDlg"
-            Order="2">1</Publish>
-      <Publish Dialog="InstallDirDlg"
-            Control="ChangeFolder"
-            Event="NewDialog"
-            Value="BrowseDlg"
-            Order="2">1</Publish>
-      <Publish Dialog="FeaturesDlg"
-              Control="Back"
-              Event="NewDialog"
-              Value="InstallDirDlg"
-              Order="2">1</Publish>      
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2">1</Publish>
+        
+      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="FeaturesDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
+      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
+      
+      <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
+      <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+      
+      <Publish Dialog="FeaturesDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="2">1</Publish>
     </UI>
   </Product>
 </Wix>