1 files changed, 172 insertions, 1 deletions

diff --git a/src/WixToolset.Data/Tuples/ControlTuple.cs b/src/WixToolset.Data/Tuples/ControlTuple.cs
index 82de917c..f77c3689 100644
--- a/src/WixToolset.Data/Tuples/ControlTuple.cs
+++ b/src/WixToolset.Data/Tuples/ControlTuple.cs
@@ -18,10 +18,20 @@ namespace WixToolset.Data
                 new IntermediateFieldDefinition(nameof(ControlTupleFields.Width), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(ControlTupleFields.Height), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(ControlTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.Enabled), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.Indirect), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.Integer), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.LeftScroll), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.RightAligned), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.RightToLeft), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.Sunken), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.Visible), IntermediateFieldType.Bool),
                 new IntermediateFieldDefinition(nameof(ControlTupleFields.Property), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ControlTupleFields.Text), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ControlTupleFields.Control_Next), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ControlTupleFields.Help), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.TrackDiskSpace), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.SourceFile), IntermediateFieldType.Path),
             },
             typeof(ControlTuple));
     }
@@ -39,10 +49,20 @@ namespace WixToolset.Data.Tuples
         Width,
         Height,
         Attributes,
+        Enabled,
+        Indirect,
+        Integer,
+        LeftScroll,
+        RightAligned,
+        RightToLeft,
+        Sunken,
+        Visible,
         Property,
         Text,
         Control_Next,
         Help,
+        TrackDiskSpace,
+        SourceFile,
     }
 
     public class ControlTuple : IntermediateTuple
@@ -101,10 +121,149 @@ namespace WixToolset.Data.Tuples
 
         public int Attributes
         {
-            get => (int)this.Fields[(int)ControlTupleFields.Attributes]?.Value;
+            get => this.Fields[(int)ControlTupleFields.Attributes].AsNumber();
             set => this.Set((int)ControlTupleFields.Attributes, value);
         }
 
+        public bool Enabled
+        {
+            get => this.Fields[(int)ControlTupleFields.Enabled].AsBool();
+            set => this.Set((int)ControlTupleFields.Enabled, value);
+        }
+
+        public bool Indirect
+        {
+            get => this.Fields[(int)ControlTupleFields.Indirect].AsBool();
+            set => this.Set((int)ControlTupleFields.Indirect, value);
+        }
+
+        public bool Integer
+        {
+            get => this.Fields[(int)ControlTupleFields.Integer].AsBool();
+            set => this.Set((int)ControlTupleFields.Integer, value);
+        }
+        /*
+        /// <summary>PictureButton control</summary>
+        public bool Bitmap
+        {
+            get => this.Fields[(int)ControlTupleFields.Bitmap].AsBool();
+            set => this.Set((int)ControlTupleFields.Bitmap, value);
+        }
+
+        /// <summary>RadioButton control</summary>
+        public bool Border
+        {
+            get => this.Fields[(int)ControlTupleFields.Border].AsBool();
+            set => this.Set((int)ControlTupleFields.Border, value);
+        }
+
+        /// <summary>ListBox and ComboBox control</summary>
+        public bool ComboList
+        {
+            get => this.Fields[(int)ControlTupleFields.ComboList].AsBool();
+            set => this.Set((int)ControlTupleFields.ComboList, value);
+        }
+
+        /// <summary>PushButton control</summary>
+        public bool ElevationShield
+        {
+            get => this.Fields[(int)ControlTupleFields.ElevationShield].AsBool();
+            set => this.Set((int)ControlTupleFields.ElevationShield, value);
+        }
+
+        /// <summary>PictureButton control</summary>
+        public bool FixedSize
+        {
+            get => this.Fields[(int)ControlTupleFields.FixedSize].AsBool();
+            set => this.Set((int)ControlTupleFields.FixedSize, value);
+        }
+
+        /// <summary>PictureButton control</summary>
+        public bool Icon
+        {
+            get => this.Fields[(int)ControlTupleFields.Icon].AsBool();
+            set => this.Set((int)ControlTupleFields.Icon, value);
+        }
+
+        /// <summary>PictureButton control</summary>
+        public bool Icon16
+        {
+            get => this.Fields[(int)ControlTupleFields.Icon16].AsBool();
+            set => this.Set((int)ControlTupleFields.Icon16, value);
+        }
+
+        /// <summary>PictureButton control</summary>
+        public bool Icon32
+        {
+            get => this.Fields[(int)ControlTupleFields.Icon32].AsBool();
+            set => this.Set((int)ControlTupleFields.Icon32, value);
+        }
+
+        /// <summary>PictureButton control</summary>
+        public bool Icon48
+        {
+            get => this.Fields[(int)ControlTupleFields.Icon48].AsBool();
+            set => this.Set((int)ControlTupleFields.Icon48, value);
+        }
+        */
+        public bool LeftScroll
+        {
+            get => this.Fields[(int)ControlTupleFields.LeftScroll].AsBool();
+            set => this.Set((int)ControlTupleFields.LeftScroll, value);
+        }
+        /*
+        /// <summary>PictureButton control</summary>
+        public bool PushLike
+        {
+            get => this.Fields[(int)ControlTupleFields.PushLike].AsBool();
+            set => this.Set((int)ControlTupleFields.PushLike, value);
+        }
+
+        /// <summary>Edit control</summary>
+        public bool Mulitline
+        {
+            get => this.Fields[(int)ControlTupleFields.Mulitline].AsBool();
+            set => this.Set((int)ControlTupleFields.Mulitline, value);
+        }
+        */
+        public bool RightAligned
+        {
+            get => this.Fields[(int)ControlTupleFields.RightAligned].AsBool();
+            set => this.Set((int)ControlTupleFields.RightAligned, value);
+        }
+
+        public bool RightToLeft
+        {
+            get => this.Fields[(int)ControlTupleFields.RightToLeft].AsBool();
+            set => this.Set((int)ControlTupleFields.RightToLeft, value);
+        }
+        /*
+        /// <summary>VolumeCostList control</summary>
+        public bool ShowRollbackCost
+        {
+            get => this.Fields[(int)ControlTupleFields.ShowRollbackCost].AsBool();
+            set => this.Set((int)ControlTupleFields.ShowRollbackCost, value);
+        }
+
+        /// <summary>ListBox and ComboBox control</summary>
+        public bool Sorted
+        {
+            get => this.Fields[(int)ControlTupleFields.Sorted].AsBool();
+            set => this.Set((int)ControlTupleFields.Sorted, value);
+        }
+        */
+        public bool Sunken
+        {
+            get => this.Fields[(int)ControlTupleFields.Sunken].AsBool();
+            set => this.Set((int)ControlTupleFields.Sunken, value);
+        }
+
+        public bool Visible
+        {
+            get => this.Fields[(int)ControlTupleFields.Visible].AsBool();
+            set => this.Set((int)ControlTupleFields.Visible, value);
+        }
+
         public string Property
         {
             get => (string)this.Fields[(int)ControlTupleFields.Property]?.Value;
@@ -128,5 +287,17 @@ namespace WixToolset.Data.Tuples
             get => (string)this.Fields[(int)ControlTupleFields.Help]?.Value;
             set => this.Set((int)ControlTupleFields.Help, value);
         }
+
+        public bool TrackDiskSpace
+        {
+            get => this.Fields[(int)ControlTupleFields.TrackDiskSpace].AsBool();
+            set => this.Set((int)ControlTupleFields.TrackDiskSpace, value);
+        }
+
+        public string SourceFile
+        {
+            get => (string)this.Fields[(int)ControlTupleFields.SourceFile]?.Value;
+            set => this.Set((int)ControlTupleFields.SourceFile, value);
+        }
     }
 }
\ No newline at end of file