From b13306b989a9249a8bc29c99bd0596fe98b590d6 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Wed, 7 Jun 2023 16:34:40 +0200 Subject: [PATCH] Added brightness control to M-hotkeys --- app/Extra.cs | 2 ++ app/InputDispatcher.cs | 6 ++++++ app/Properties/Strings.Designer.cs | 18 ++++++++++++++++++ app/Properties/Strings.resx | 6 ++++++ app/Settings.cs | 13 ++++++++++--- 5 files changed, 42 insertions(+), 3 deletions(-) diff --git a/app/Extra.cs b/app/Extra.cs index 475995df..9f466a02 100644 --- a/app/Extra.cs +++ b/app/Extra.cs @@ -19,6 +19,8 @@ namespace GHelper {"screen", Properties.Strings.ToggleScreen}, {"miniled", Properties.Strings.ToggleMiniled}, {"fnlock", Properties.Strings.ToggleFnLock}, + {"brightness_down", Properties.Strings.BrightnessDown}, + {"brightness_up", Properties.Strings.BrightnessUp}, {"custom", Properties.Strings.Custom} }; diff --git a/app/InputDispatcher.cs b/app/InputDispatcher.cs index d7e9aacf..f31f081e 100644 --- a/app/InputDispatcher.cs +++ b/app/InputDispatcher.cs @@ -339,6 +339,12 @@ namespace GHelper Program.settingsForm.BeginInvoke(Program.settingsForm.RunToast, muteStatus ? "Muted" : "Unmuted", muteStatus ? ToastIcon.MicrophoneMute : ToastIcon.Microphone); } break; + case "brightness_up": + OptimizationEvent(32); + break; + case "brightness_down": + OptimizationEvent(16); + break; case "custom": CustomKey(name); break; diff --git a/app/Properties/Strings.Designer.cs b/app/Properties/Strings.Designer.cs index 891d02c6..a72ae39f 100644 --- a/app/Properties/Strings.Designer.cs +++ b/app/Properties/Strings.Designer.cs @@ -339,6 +339,24 @@ namespace GHelper.Properties { } } + /// + /// Looks up a localized string similar to Brightness Down. + /// + internal static string BrightnessDown { + get { + return ResourceManager.GetString("BrightnessDown", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Brightness Up. + /// + internal static string BrightnessUp { + get { + return ResourceManager.GetString("BrightnessUp", resourceCulture); + } + } + /// /// Looks up a localized string similar to Color. /// diff --git a/app/Properties/Strings.resx b/app/Properties/Strings.resx index f622dde0..f4eec432 100644 --- a/app/Properties/Strings.resx +++ b/app/Properties/Strings.resx @@ -210,6 +210,12 @@ Brightness + + Brightness Down + + + Brightness Up + Color diff --git a/app/Settings.cs b/app/Settings.cs index da354054..de5fbb6c 100644 --- a/app/Settings.cs +++ b/app/Settings.cs @@ -247,8 +247,9 @@ namespace GHelper public void SetContextMenu() { - contextMenuStrip.Items.Clear(); + var mode = AppConfig.getConfig("performance_mode"); + contextMenuStrip.Items.Clear(); Padding padding = new Padding(15, 5, 5, 5); var title = new ToolStripMenuItem(Properties.Strings.PerformanceMode); @@ -259,17 +260,19 @@ namespace GHelper menuSilent = new ToolStripMenuItem(Properties.Strings.Silent); menuSilent.Click += ButtonSilent_Click; menuSilent.Margin = padding; + menuSilent.Checked = (mode == AsusACPI.PerformanceSilent); contextMenuStrip.Items.Add(menuSilent); menuBalanced = new ToolStripMenuItem(Properties.Strings.Balanced); menuBalanced.Click += ButtonBalanced_Click; menuBalanced.Margin = padding; + menuBalanced.Checked = (mode == AsusACPI.PerformanceBalanced); contextMenuStrip.Items.Add(menuBalanced); menuTurbo = new ToolStripMenuItem(Properties.Strings.Turbo); menuTurbo.Click += ButtonTurbo_Click; - menuTurbo.Checked = true; menuTurbo.Margin = padding; + menuTurbo.Checked = (mode == AsusACPI.PerformanceTurbo); contextMenuStrip.Items.Add(menuTurbo); contextMenuStrip.Items.Add("-"); @@ -1256,6 +1259,10 @@ namespace GHelper buttonBalanced.Activated = false; buttonTurbo.Activated = false; + menuSilent.Checked = false; + menuBalanced.Checked = false; + menuTurbo.Checked = false; + switch (PerformanceMode) { case AsusACPI.PerformanceSilent: @@ -1271,8 +1278,8 @@ namespace GHelper default: buttonBalanced.Activated = true; menuBalanced.Checked = true; - PerformanceMode = AsusACPI.PerformanceBalanced; perfName = Properties.Strings.Balanced; + PerformanceMode = AsusACPI.PerformanceBalanced; break; }