Switch to using display IDs rather than name + index

tombayley · Sep 12, 2024 · 10b1612 · 10b1612
1 parent 29d2ebb
commit 10b1612
Show file tree

Hide file tree

Showing 22 changed files with 910 additions and 557 deletions.
diff --git a/NightGlow.MonitorConfig/Monitors.cs b/NightGlow.MonitorConfig/Monitors.cs
diff --git a/NightGlow.MonitorConfig/NightGlow.MonitorConfig.csproj b/NightGlow.MonitorConfig/NightGlow.MonitorConfig.csproj
diff --git a/NightGlow.MonitorConfig/PhysicalMonitor.cs b/NightGlow.MonitorConfig/PhysicalMonitor.cs
diff --git a/NightGlow.MonitorConfig/VirtualMonitor.cs b/NightGlow.MonitorConfig/VirtualMonitor.cs
diff --git a/NightGlow.sln b/NightGlow.sln
@@ -4,14 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 17.7.34009.444
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NightGlow", "NightGlow\NightGlow.csproj", "{8E4BBB59-4D6D-48CF-9E04-CB3D7CA97401}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5D7C7E03-E446-49ED-977A-2EA6824FE29A} = {5D7C7E03-E446-49ED-977A-2EA6824FE29A}
-	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NightGlow.WindowsApi", "NightGlow.WindowsApi\NightGlow.WindowsApi.csproj", "{961F5C16-4446-40EC-9A72-1C352920335D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NightGlow.MonitorConfig", "NightGlow.MonitorConfig\NightGlow.MonitorConfig.csproj", "{5D7C7E03-E446-49ED-977A-2EA6824FE29A}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -46,18 +41,6 @@ Global
 		{961F5C16-4446-40EC-9A72-1C352920335D}.Release|x64.Build.0 = Release|Any CPU
 		{961F5C16-4446-40EC-9A72-1C352920335D}.Release|x86.ActiveCfg = Release|Any CPU
 		{961F5C16-4446-40EC-9A72-1C352920335D}.Release|x86.Build.0 = Release|Any CPU
-		{5D7C7E03-E446-49ED-977A-2EA6824FE29A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D7C7E03-E446-49ED-977A-2EA6824FE29A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D7C7E03-E446-49ED-977A-2EA6824FE29A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5D7C7E03-E446-49ED-977A-2EA6824FE29A}.Debug|x64.Build.0 = Debug|Any CPU
-		{5D7C7E03-E446-49ED-977A-2EA6824FE29A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5D7C7E03-E446-49ED-977A-2EA6824FE29A}.Debug|x86.Build.0 = Debug|Any CPU
-		{5D7C7E03-E446-49ED-977A-2EA6824FE29A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5D7C7E03-E446-49ED-977A-2EA6824FE29A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5D7C7E03-E446-49ED-977A-2EA6824FE29A}.Release|x64.ActiveCfg = Release|Any CPU
-		{5D7C7E03-E446-49ED-977A-2EA6824FE29A}.Release|x64.Build.0 = Release|Any CPU
-		{5D7C7E03-E446-49ED-977A-2EA6824FE29A}.Release|x86.ActiveCfg = Release|Any CPU
-		{5D7C7E03-E446-49ED-977A-2EA6824FE29A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/NightGlow/App.config b/NightGlow/App.config
@@ -55,6 +55,9 @@
             <setting name="ShowBrightTempPopup" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="DdcConfigJsonV2" serializeAs="String">
+                <value />
+            </setting>
         </NightGlow.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/NightGlow/Data/DdcConfig.cs b/NightGlow/Data/DdcConfig.cs
@@ -1,4 +1,4 @@
-using NightGlow.MonitorConfig;
+using NightGlow.Models;
 using System;
 using System.Collections.Generic;
 
@@ -8,56 +8,56 @@ namespace NightGlow.Data;
 public class DdcConfig
 {
 
-    public IList<DdcMonitorItem> DdcMonitorItems;
+    public IList<DdcConfigMonitor> DdcConfigMonitorItems;
 
     public DdcConfig()
     {
-        DdcMonitorItems = new List<DdcMonitorItem>();
+        DdcConfigMonitorItems = new List<DdcConfigMonitor>();
     }
 
-    public DdcMonitorItem GetOrCreateDdcMonitorItem(VirtualMonitor vm)
+    public DdcConfigMonitor GetOrCreateDdcConfigMonitor(DdcMonitor monitor)
     {
-        foreach (var item in DdcMonitorItems)
-            if (item.Name.Equals(vm.FriendlyName) && item.DeviceName.Equals(vm.DeviceName))
+        foreach (var item in DdcConfigMonitorItems)
+            if (item.DeviceInstanceId.Equals(monitor.DeviceInstanceId))
                 return item;
 
-        DdcMonitorItem newItem = new DdcMonitorItem
+        DdcConfigMonitor newItem = new DdcConfigMonitor
         {
-            Name = vm.FriendlyName,
-            DeviceName = vm.DeviceName,
+            Description = monitor.Description,
+            DeviceInstanceId = monitor.DeviceInstanceId,
             EnableDdc = false,
             MinBrightnessPct = 0,
             MaxBrightness = 100
         };
-        DdcMonitorItems.Add(newItem);
+        DdcConfigMonitorItems.Add(newItem);
         return newItem;
     }
 
-    public void SetEnableDdc(VirtualMonitor vm, bool value)
+    public void SetEnableDdc(DdcMonitor monitor, bool value)
     {
-        DdcMonitorItem item = GetOrCreateDdcMonitorItem(vm);
+        DdcConfigMonitor item = GetOrCreateDdcConfigMonitor(monitor);
         item.EnableDdc = value;
     }
 
-    public void SetMinBrightnessPct(VirtualMonitor vm, int value)
+    public void SetMinBrightnessPct(DdcMonitor monitor, int value)
     {
-        DdcMonitorItem item = GetOrCreateDdcMonitorItem(vm);
+        DdcConfigMonitor item = GetOrCreateDdcConfigMonitor(monitor);
         item.MinBrightnessPct = value;
     }
 
-    public void SetMaxBrightness(VirtualMonitor vm, int value)
+    public void SetMaxBrightness(DdcMonitor monitor, int value)
     {
-        DdcMonitorItem item = GetOrCreateDdcMonitorItem(vm);
+        DdcConfigMonitor item = GetOrCreateDdcConfigMonitor(monitor);
         item.MaxBrightness = value;
     }
 
 }
 
 [Serializable]
-public class DdcMonitorItem
+public class DdcConfigMonitor
 {
-    public string Name;
-    public string DeviceName;
+    public string Description;
+    public string DeviceInstanceId;
 
     public bool EnableDdc;