From 000b9b6bd037a5ddbf4743629fba43bd0c5b16ce Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 22 Jun 2020 23:10:39 -0700
Subject: Move Control\Condition inner text to appropriate Condition attribute

---
 src/WixToolset.Core/Compiler_UI.cs | 76 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/src/WixToolset.Core/Compiler_UI.cs b/src/WixToolset.Core/Compiler_UI.cs
index 0b5b3980..5c2400e4 100644
--- a/src/WixToolset.Core/Compiler_UI.cs
+++ b/src/WixToolset.Core/Compiler_UI.cs
@@ -1086,6 +1086,12 @@ namespace WixToolset.Core
             string x = null;
             string y = null;
 
+            string defaultCondition = null;
+            string enableCondition = null;
+            string disableCondition = null;
+            string hideCondition = null;
+            string showCondition = null;
+
             var hidden = false;
             var sunken = false;
             var indirect = false;
@@ -1221,6 +1227,21 @@ namespace WixToolset.Core
                     case "Default":
                         isDefault = YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
                         break;
+                    case "DefaultCondition":
+                        defaultCondition = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                        break;
+                    case "EnableCondition":
+                        enableCondition = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                        break;
+                    case "DisableCondition":
+                        disableCondition = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                        break;
+                    case "HideCondition":
+                        hideCondition = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                        break;
+                    case "ShowCondition":
+                        showCondition = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                        break;
                     case "Height":
                         height = this.Core.GetAttributeLocalizableIntegerValue(sourceLineNumbers, attrib, 0, Int16.MaxValue);
                         break;
@@ -1556,6 +1577,61 @@ namespace WixToolset.Core
 
                     tuple = controlTuple;
                 }
+
+                if (!String.IsNullOrEmpty(defaultCondition))
+                {
+                    this.Core.AddTuple(new ControlConditionTuple(sourceLineNumbers)
+                    {
+                        DialogRef = dialog,
+                        ControlRef = controlId.Id,
+                        Action = "Default",
+                        Condition = defaultCondition,
+                    });
+                }
+
+                if (!String.IsNullOrEmpty(enableCondition))
+                {
+                    this.Core.AddTuple(new ControlConditionTuple(sourceLineNumbers)
+                    {
+                        DialogRef = dialog,
+                        ControlRef = controlId.Id,
+                        Action = "Enable",
+                        Condition = enableCondition,
+                    });
+                }
+
+                if (!String.IsNullOrEmpty(disableCondition))
+                {
+                    this.Core.AddTuple(new ControlConditionTuple(sourceLineNumbers)
+                    {
+                        DialogRef = dialog,
+                        ControlRef = controlId.Id,
+                        Action = "Disable",
+                        Condition = disableCondition,
+                    });
+                }
+
+                if (!String.IsNullOrEmpty(hideCondition))
+                {
+                    this.Core.AddTuple(new ControlConditionTuple(sourceLineNumbers)
+                    {
+                        DialogRef = dialog,
+                        ControlRef = controlId.Id,
+                        Action = "Hide",
+                        Condition = hideCondition,
+                    });
+                }
+
+                if (!String.IsNullOrEmpty(showCondition))
+                {
+                    this.Core.AddTuple(new ControlConditionTuple(sourceLineNumbers)
+                    {
+                        DialogRef = dialog,
+                        ControlRef = controlId.Id,
+                        Action = "Show",
+                        Condition = showCondition,
+                    });
+                }
             }
 
             if (!notTabbable)
-- 
cgit v1.2.3-55-g6feb