Merge pull request #512 from emoacht/develop

Develop

Author: emoacht

Source/Installer/Product.wxs

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="4.4.12"
+	<Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="4.4.13"
 			 Language="1033" Codepage="1252" UpgradeCode="{81A4D148-75D3-462E-938D-8C208FB48E3C}">
 		<Package Id="*" InstallerVersion="500" Compressed="yes"
 				 InstallScope="perMachine" InstallPrivileges="elevated"

Source/Monitorian.Core/AppKeeper.cs

@@ -8,7 +8,6 @@
 
 using Monitorian.Core.Models;
 using Monitorian.Core.Models.Monitor;
-using Monitorian.Core.Models.Watcher;
 using Monitorian.Core.Views;
 using StartupAgency;
 
@@ -74,9 +73,7 @@ public static IEnumerable<string> EnumerateStandardOptions() =>
 				StartupAgent.Options,
 				MonitorManager.Options,
 				LanguageService.Options,
-				WindowPainter.Options,
-				BrightnessConnector.Options,
-				DisplayInformationWatcher.Options
+				WindowPainter.Options
 			}
 			.SelectMany(x => x);
 

Source/Monitorian.Core/Models/Monitor/MonitorManager.cs

@@ -43,9 +43,13 @@ public BasicItem(
 
 		#endregion
 
-		#region Preclusion/Preclearance
+		#region Options
 
-		public static IReadOnlyCollection<string> Options => new[] { PrecludeOption, PreclearOption };
+		public static IReadOnlyCollection<string> Options => (new[] { PrecludeOption, PreclearOption })
+			.Concat(PowerManagement.Options)
+			.Concat(BrightnessConnector.Options)
+			.Concat(DisplayInformationWatcher.Options)
+			.ToArray();
 
 		private const string PrecludeOption = "/preclude";
 		private const string PreclearOption = "/preclear";

Source/Monitorian.Core/Models/Monitor/PowerManagement.cs

@@ -90,6 +90,19 @@ private struct SYSTEM_POWER_STATUS
 		// AC/DC power source derived from winnt.h
 		private static readonly Guid ACDC_POWER_SOURCE = new("5d3e9a59-e9d5-4b00-a6bd-ff34ff516548");
 
+		/// <summary>
+		/// Options
+		/// </summary>
+		public static IReadOnlyCollection<string> Options => new[] { PowerBindOption };
+
+		private const string PowerBindOption = "/powerbind";
+
+		public static bool IsBound => _isBound.Value;
+		private static readonly Lazy<bool> _isBound = new(() =>
+		{
+			return AppKeeper.StandardArguments.Select(x => x.ToLower()).Contains(PowerBindOption);
+		});
+
 		public static Guid GetActiveScheme()
 		{
 			if (PowerGetActiveScheme(
@@ -330,7 +343,7 @@ public static bool SetActiveSchemeBrightness(int brightness)
 
 			var schemeGuid = GetActiveScheme();
 
-			if (isOnline.Value)
+			if (isOnline.Value || IsBound)
 			{
 				if (PowerWriteACValueIndex(
 					IntPtr.Zero,
@@ -343,7 +356,7 @@ public static bool SetActiveSchemeBrightness(int brightness)
 					return false;
 				}
 			}
-			else
+			if (!isOnline.Value || IsBound)
 			{
 				if (PowerWriteDCValueIndex(
 					IntPtr.Zero,

Source/Monitorian.Core/Models/Watcher/BrightnessConnector.cs

@@ -104,17 +104,17 @@ private static string FindFamilyName(string identityName)
 			return package?.Id.FamilyName;
 		}
 
-		public virtual bool IsEnabled => _isSpecified && _isAvailable && !string.IsNullOrEmpty(_familyName.Value);
-		private readonly bool _isSpecified;
-		private bool _isAvailable = true; // default
-
 		/// <summary>
 		/// Options
 		/// </summary>
 		public static IReadOnlyCollection<string> Options => new[] { ConnectOption };
 
 		private const string ConnectOption = "/connect";
 
+		public virtual bool IsEnabled => _isSpecified && _isAvailable && !string.IsNullOrEmpty(_familyName.Value);
+		private readonly bool _isSpecified;
+		private bool _isAvailable = true; // default
+
 		public BrightnessConnector()
 		{
 			_isSpecified = OsVersion.Is10OrGreater &&

Source/Monitorian.Core/Properties/AssemblyInfo.cs

@@ -33,8 +33,8 @@
 // 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("4.4.12.0")]
-[assembly: AssemblyFileVersion("4.4.12.0")]
+[assembly: AssemblyVersion("4.4.13.0")]
+[assembly: AssemblyFileVersion("4.4.13.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
 // For unit test

Source/Monitorian/Properties/AssemblyInfo.cs

@@ -51,7 +51,7 @@
 // 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("4.4.12.0")]
-[assembly: AssemblyFileVersion("4.4.12.0")]
+[assembly: AssemblyVersion("4.4.13.0")]
+[assembly: AssemblyFileVersion("4.4.13.0")]
 [assembly: Guid("a4cc5362-9b08-465b-ad64-5cfabc72a4c7")]
 [assembly: NeutralResourcesLanguage("en-US")]