Merge branch 'release/2.0.28.0'

MikePohatu · Oct 21, 2024 · 1af3f7a · 1af3f7a
2 parents 17759f3 + 7dc3466
commit 1af3f7a
Show file tree

Hide file tree

Showing 35 changed files with 176 additions and 97 deletions.
diff --git a/Core/Properties/AssemblyInfo.cs b/Core/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-#region license
+#region license
 // Copyright (c) 2021 20Road Limited
 //
 // This file is part of DevChecker.
@@ -50,5 +50,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.27.0")]
-[assembly: AssemblyFileVersion("2.0.27.0")]
+[assembly: AssemblyVersion("2.0.28.0")]
+[assembly: AssemblyFileVersion("2.0.28.0")]
diff --git a/CustomActions/Properties/AssemblyInfo.cs b/CustomActions/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-#region license
+#region license
 // Copyright (c) 2021 20Road Limited
 //
 // This file is part of DevChecker.
@@ -50,5 +50,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.27.0")]
-[assembly: AssemblyFileVersion("2.0.27.0")]
+[assembly: AssemblyVersion("2.0.28.0")]
+[assembly: AssemblyFileVersion("2.0.28.0")]
diff --git a/MessageCrap/Properties/AssemblyInfo.cs b/MessageCrap/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.27.0")]
-[assembly: AssemblyFileVersion("2.0.27.0")]
+[assembly: AssemblyVersion("2.0.28.0")]
+[assembly: AssemblyFileVersion("2.0.28.0")]
diff --git a/Release notes.txt b/Release notes.txt
@@ -1,8 +1,8 @@
-Version 2.0.27.0
-Release date: 22 Sep 2024
+Version 2.0.28.0
+Release date: 21 Oct 2024
 
-*Features
-	Made 'ReadOnly' option common across all GuiOption types
+*Fixes
+	Fixed toggles not initialising properly: https://github.com/MikePohatu/TsGui/issues/22
 
 
 *Known issues
@@ -14,7 +14,14 @@ Release date: 22 Sep 2024
 *Requires Microsoft .NET (WinPE-NetFx), Windows PowerShell (WinPE-PowerShell), and HTML (WinPE-HTA) be added to your boot image 
 
 
+---------------
+Version 2.0.27.0
+Release date: 22 Sep 2024
+
+*Features
+	Made 'ReadOnly' option common across all GuiOption types
 
+---------------
 Version 2.0.26.0
 Release date: 27 Jul 2024
 

diff --git a/TestConfigs/Config.34-inverse_grouping.xml b/TestConfigs/Config.34-inverse_grouping.xml
@@ -0,0 +1,70 @@
+<TsGui LiveData="TRUE">
+	<Height>530</Height>
+	<Width>500</Width>
+
+	<!--<ShowGridLines/>-->
+	<HardwareEval />
+
+	<Heading>
+		<Title>TsGui</Title>
+		<Text>Uncheck box to get extra page</Text>
+		<Bg-Color>#ff0000</Bg-Color>
+	</Heading>
+
+	<Page>
+		<Row>
+			<Column>
+				<GuiOption Type="CheckBox">
+					<Variable>options</Variable>
+					<Checked />
+					<Label>Additional options</Label>
+					<Toggle Group="Group_options">
+						<Enabled>FALSE</Enabled>
+						<Disabled>TRUE</Disabled>
+						<Hide />
+					</Toggle>
+				</GuiOption>
+			</Column>
+		</Row>
+	</Page>
+	<Page>
+		<Group>Group_options</Group>
+		<Row>
+			<Column>
+
+				<GuiOption Type="ComputerName" />
+
+				<GuiOption Type="CheckBox">
+					<Variable>TOGGLE_DiskID</Variable>
+					<Label>Choose disk</Label>
+					<HAlign>left</HAlign>
+
+					<Toggle Group="Group_Disk">
+						<Enabled>TRUE</Enabled>
+						<Disabled>FALSE</Disabled>
+					</Toggle>
+				</GuiOption>
+
+				<GuiOption Type="DropDownList" PurgeInactive="TRUE">
+					<Group>Group_Disk</Group>
+					<Variable>OSDDiskIndex</Variable>
+					<Label>Disk</Label>
+					<DefaultValue>0</DefaultValue>
+					<Query Type="Wmi">
+						<Wql>select Index,Caption,Size FROM Win32_DiskDrive where MediaType='Fixed hard disk media'</Wql>
+						<Property Name="Index" />
+						<Property Name="Index">
+							<Prefix>ID: </Prefix>
+						</Property>
+						<Property Name="Size">
+							<Calculate DecimalPlaces="2">VALUE/1073741824</Calculate>
+							<Append>GB</Append>
+						</Property>
+						<Property Name="Caption" />
+						<Separator> - </Separator>
+					</Query>
+				</GuiOption>
+			</Column>
+		</Row>
+	</Page>
+</TsGui>
diff --git a/TsGui.Tests/Properties/AssemblyInfo.cs b/TsGui.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-#region license
+#region license
 // Copyright (c) 2020 Mike Pohatu
 //
 // This file is part of TsGui.
@@ -47,5 +47,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.27.0")]
-[assembly: AssemblyFileVersion("2.0.27.0")]
+[assembly: AssemblyVersion("2.0.28.0")]
+[assembly: AssemblyFileVersion("2.0.28.0")]
diff --git a/TsGui.Tests/TestDirector.cs b/TsGui.Tests/TestDirector.cs
@@ -57,7 +57,6 @@ public void CloseWithError(string Title, string Message) { }
         public void AddOptionToLibary(IOption Option) { }
         public void MoveNext() { }
         public void MovePrevious() { }
-        public void AddToggleControl(IToggleControl ToogleControl) { }
         public void Finish() { }
         public void Cancel() { }
         public void OnWindowClosing(object sender, CancelEventArgs e) { }

diff --git a/TsGui/Authentication/ActiveDirectory/ActiveDirectoryAuthenticator.cs b/TsGui/Authentication/ActiveDirectory/ActiveDirectoryAuthenticator.cs
@@ -143,7 +143,7 @@ private async Task UpdateGroupIDAsync(string groupName, bool ismember)
             if (option != null)
             {
                 option.CurrentValue = member;
-                await option.UpdateValueAsync(MessageHub.CreateMessage(this, null));
+                await option.UpdateLinkedValueAsync(MessageHub.CreateMessage(this, null));
             }
         }
 

diff --git a/TsGui/Authentication/ExposedPassword/ExposedPasswordAuthenticator.cs b/TsGui/Authentication/ExposedPassword/ExposedPasswordAuthenticator.cs
@@ -131,7 +131,7 @@ protected void NotifyUpdate()
             this.OnPropertyChanged(this, "LiveValue");
         }
 
-        public async Task UpdateValueAsync(Message message)
+        public async Task UpdateLinkedValueAsync(Message message)
         {
             LinkingHub.Instance.SendUpdateMessage(this, message);
             await Task.CompletedTask;

diff --git a/TsGui/Director.cs b/TsGui/Director.cs
@@ -263,17 +263,16 @@ public async Task InitAsync()
             //now init all the options
             await OptionLibrary.InitialiseOptionsAsync();
 
+            //init the groups
+            GroupLibrary.Init();
+
             //subscribe to closing event
             this.ParentWindow.Closing += this.OnWindowClosing;
 
             if (ConfigData.Pages.Count > 0)
             {
                 Log.Debug("Loading pages");
                 this.CurrentPage = ConfigData.Pages.First();
-                //update group settings to all controls
-                foreach (IToggleControl t in ConfigData.Toggles)
-                { t.InitialiseToggle(); }
-
                 this.ParentWindow.DataContext = ConfigData.TsMainWindow;
 
                 // Now show and close the ghost window to make sure WinPE honours the 
@@ -452,11 +451,6 @@ public void MovePrevious()
             this.CurrentPage.Update();
             this.UpdateWindow();
         }
-
-        public void AddToggleControl(IToggleControl ToogleControl)
-        {
-            ConfigData.Toggles.Add(ToogleControl);
-        }
 
         //Navigate to the current page, and update the datacontext of the window
         private void UpdateWindow()

diff --git a/TsGui/Grouping/Group.cs b/TsGui/Grouping/Group.cs
@@ -41,8 +41,8 @@ public GroupState State
                 if (this._state != value)
                 {
                     this._state = value;
-                    StateEvent?.Invoke();
                     Log.Info("Group " + this.ID + " state changed. New state: " + this._state.ToString());
+                    StateEvent?.Invoke();
                 }              
             }
         }
@@ -66,5 +66,11 @@ public void Add(GroupableBase GroupableElement)
             this._groupables.Add(GroupableElement);
             this.StateEvent += GroupableElement.OnGroupStateChange;
         }
+
+        public void Init()
+        {
+            Log.Info("Group " + this.ID + " Initialised. State: " + this._state.ToString());
+            StateEvent?.Invoke();
+        }
     }
 }
diff --git a/TsGui/Grouping/GroupLibrary.cs b/TsGui/Grouping/GroupLibrary.cs
@@ -78,5 +78,13 @@ public static void Reset()
         {
             _groups.Clear();
         }
+
+        public static void Init()
+        {
+            foreach (var group in _groups.Values)
+            {
+                group.Init();
+            }
+        }
     }
 }
diff --git a/TsGui/Grouping/IToggleControl.cs b/TsGui/Grouping/IToggleControl.cs
@@ -27,6 +27,5 @@ public interface IToggleControl
         string CurrentValue { get; }
         bool IsActive { get; }
         event ToggleEvent ToggleEvent;
-        void InitialiseToggle();
     }
 }
diff --git a/TsGui/Grouping/Toggle.cs b/TsGui/Grouping/Toggle.cs
@@ -30,25 +30,37 @@ namespace TsGui.Grouping
 {
     public class Toggle
     {
+        //ID is set by either LoadXml or Create via the SetID() method
+        public string ID { get; private set; }
         private Group _group;
         private Dictionary<string, bool> _toggleValMappings = new Dictionary<string, bool>();
         private bool _hiddenMode = false;
         private bool _inverse = false;
         private IToggleControl _option;
 
+
         private Toggle(IToggleControl option)
         {
-            this._option = option;
-            Director.Instance.AddToggleControl(option);
-            this._option.ToggleEvent += this.OnToggleEvent;
+            this.Init(option);
         }
 
         public Toggle(IToggleControl option, XElement InputXml)
+        {
+            this.Init(option);
+            this.LoadXml(InputXml);
+        }
+
+        private void Init(IToggleControl option)
         {
             this._option = option;
-            Director.Instance.AddToggleControl(option);
+            ConfigData.Toggles.Add(option);
             this._option.ToggleEvent += this.OnToggleEvent;
-            this.LoadXml(InputXml);
+        }
+
+        private void SetGroup(Group group)
+        {
+            this._group = group;
+            this.ID = $"var:{this._option.VariableName}_gid:{group?.ID}";
         }
 
         /// <summary>
@@ -63,7 +75,7 @@ public static Toggle Create(IToggleControl option, string groupid, bool hide, bo
         {
             var toggle = new Toggle(option);
 
-            toggle._group = GroupLibrary.GetGroupFromID(groupid);
+            toggle.SetGroup(GroupLibrary.GetGroupFromID(groupid));
             toggle._hiddenMode = hide;
             toggle._inverse = invert;
             toggle._toggleValMappings.Add("TRUE", true);
@@ -82,7 +94,7 @@ private void LoadXml(XElement InputXml)
                 throw new InvalidOperationException("No Group ID set in Toggle configured in XML: " + Environment.NewLine + InputXml); 
             }
 
-            this._group = GroupLibrary.GetGroupFromID(groupid);
+            this.SetGroup(GroupLibrary.GetGroupFromID(groupid));
 
             IEnumerable<XElement> togglesX;
             togglesX = InputXml.Elements("Enabled");
@@ -120,7 +132,7 @@ private void LoadXml(XElement InputXml)
 
         public void OnToggleEvent()
         {
-            Log.Trace($"Toggle Event received by toggle | VariableName: {this._option.VariableName} | Group: {this._group?.ID}" );
+            Log.Trace($"Toggle Event received by toggle: " + this.ID );
             string val;
             bool newenabled;
 
@@ -146,8 +158,10 @@ public void OnToggleEvent()
                 }
                 else
                 {
-                    if (newenabled == true) { this.DisableGroup(); }
-                    else { this.EnableGroup(); }
+                    if (newenabled == true) 
+                    { this.DisableGroup(); }
+                    else 
+                    { this.EnableGroup(); }
                 }
             }
         }

diff --git a/TsGui/IDirector.cs b/TsGui/IDirector.cs
@@ -55,7 +55,6 @@ public interface IDirector
         void AddOptionToLibary(IOption Option);
         void MoveNext();
         void MovePrevious();
-        void AddToggleControl(IToggleControl ToogleControl);
         void Finish();
         void Cancel();
         void OnWindowClosing(object sender, CancelEventArgs e);

diff --git a/TsGui/Linking/ILinkSource.cs b/TsGui/Linking/ILinkSource.cs
@@ -32,6 +32,6 @@ public interface ILinkSource: ISubscribable
         /// <summary>
         /// Request a link source to update the value set on the option.
         /// </summary>
-        Task UpdateValueAsync(Message message);
+        Task UpdateLinkedValueAsync(Message message);
     }
 }
diff --git a/TsGui/Linking/LinkingHub.cs b/TsGui/Linking/LinkingHub.cs
@@ -71,7 +71,7 @@ public async void OnTopicMessageReceived(string topic, Message message)
                     IOption option = this.GetSourceOption(message.Payload as string);
                     if (option != null)
                     {
-                        await option.UpdateValueAsync(message);
+                        await option.UpdateLinkedValueAsync(message);
                     }
                     break;
                 default:

diff --git a/TsGui/Options/MiscOption.cs b/TsGui/Options/MiscOption.cs
@@ -72,7 +72,7 @@ public MiscOption() : base()
         }
 
         //public methods
-        public async Task UpdateValueAsync(Message message)
+        public async Task UpdateLinkedValueAsync(Message message)
         {
             await Task.CompletedTask;
             LinkingHub.Instance.SendUpdateMessage(this, message);
@@ -81,7 +81,7 @@ public async Task UpdateValueAsync(Message message)
 
         public async Task OnSourceValueUpdatedAsync(Message message)
         {
-            await this.UpdateValueAsync(message);
+            await this.UpdateLinkedValueAsync(message);
         }
 
         protected void NotifyViewUpdate()
@@ -94,7 +94,7 @@ protected void NotifyViewUpdate()
         //This is called by the controller once everything is loaded
         public async Task InitialiseAsync()
         {
-            await this.UpdateValueAsync(null);
+            await this.UpdateLinkedValueAsync(null);
         }
     }
 }