tombayley · tombayley · Sep 14, 2024 · Jul 26, 2024 · Aug 28, 2024 · Aug 28, 2024
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,10 +8,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 7.0.x
 
@@ -27,10 +27,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 7.0.x
 
@@ -48,13 +48,13 @@ jobs:
           & "c:\Program Files (x86)\Inno Setup 6\ISCC.exe" Installer/Installer.iss
 
       - name: Upload artifacts (portable)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: NightGlow-Portable
           path: NightGlow/bin/publish/
 
       - name: Upload artifacts (installer)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: NightGlow-Installer
           path: Installer/bin/NightGlow-Installer.exe
@@ -67,13 +67,13 @@ jobs:
 
     steps:
       - name: Download artifacts (portable)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: NightGlow-Portable
           path: NightGlow
 
       - name: Download artifacts (installer)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: NightGlow-Installer
 

diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,8 @@
 ##
 ## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
 
+Installer/Source/
+
 # User-specific files
 *.rsuser
 *.suo

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## v3.0.0 (14-Sep-2024)
+#### Breaking changes
+- Switched to using display IDs for detection rather than the display name and index. **All settings in the DDC tab will be reset**
+  - This makes remembering displays and configured settings in the DDC tab more reliable
+
+#### Non-breaking changes
+- Added option in General to show small popup when changing brightness/temperature
+- Made changing DDC brightness more reliable on some monitors
+
 ## v2.0.0 (13-Dec-2023)
 - Add DDC support (native monitor brightness)
 

diff --git a/Installer/Installer.iss b/Installer/Installer.iss
@@ -1,6 +1,6 @@
 #define AppName "Night Glow"
 #define AppExe "NightGlow.exe"
-#define AppVersion "2.0.0"
+#define AppVersion "3.0.0"
 
 [Setup]
 AppId={{8B87A5F9-0C03-4B92-9080-DDCF75DC18A4}

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
@@ -52,6 +52,12 @@
             <setting name="DdcConfigJson" serializeAs="String">
                 <value />
             </setting>
+            <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/App.xaml b/NightGlow/App.xaml
@@ -29,6 +29,13 @@
             <SolidColorBrush x:Key="SecondaryHueMidBrush" Color="{DynamicResource AccentColor}" />
             <SolidColorBrush x:Key="SecondaryHueMidForegroundBrush" Color="{DynamicResource TextColor}" />
 
+            <!-- Match/similar colors to the Windows volume popup for consistency -->
+            <!-- If changing Fore color, need to change color of popup SVGs too -->
+            <SolidColorBrush x:Key="WinVolPopupDarkBackColor" Color="#242424" />
+            <SolidColorBrush x:Key="WinVolPopupDarkForeColor" Color="#d9d6d6" />
+            <Sol
E7E0
idColorBrush x:Key="WinVolPopupProgressDarkBackColor" Color="#7d7d7d" />
+            <SolidColorBrush x:Key="WinVolPopupDarkBorderColor" Color="#424242" />
+
             <Style x:Key="SliderLimitPreview" TargetType="TextBlock">
                 <Setter Property="FontSize" Value="14" />
                 <Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />

diff --git a/NightGlow/App.xaml.cs b/NightGlow/App.xaml.cs
@@ -46,7 +46,9 @@ private void ConfigureServices(IServiceCollection services)
 
         services.AddSingleton<NotifyIconViewModel>();
         services.AddSingleton<MainWindowViewModel>();
+        services.AddSingleton<PopupViewModel>();
 
+        services.AddSingleton<PopupWindow>();
         services.AddTransient<MainWindow>();
     }
 

diff --git a/NightGlow/Assets/popup-brightness.svg b/NightGlow/Assets/popup-brightness.svg