diff --git a/app/Extra.cs b/app/Extra.cs index 3d7c8eb5..a38e1247 100644 --- a/app/Extra.cs +++ b/app/Extra.cs @@ -21,6 +21,10 @@ namespace GHelper private void SetKeyCombo(ComboBox combo, TextBox txbox, string name) { + + if (name == "m3") + customActions[""] = Properties.Strings.MuteMic; + if (name == "m4") customActions[""] = Properties.Strings.OpenGHelper; diff --git a/app/Program.cs b/app/Program.cs index 697674c3..95994132 100644 --- a/app/Program.cs +++ b/app/Program.cs @@ -264,7 +264,7 @@ namespace GHelper var commDevice = enumerator.GetDefaultAudioEndpoint(DataFlow.Capture, Role.Communications); bool muteStatus = !commDevice.AudioEndpointVolume.Mute; commDevice.AudioEndpointVolume.Mute = muteStatus; - settingsForm.BeginInvoke(settingsForm.RunToast, muteStatus ? "Muted" : "Unmuted", ToastIcon.Microphone); + settingsForm.BeginInvoke(settingsForm.RunToast, muteStatus ? "Muted" : "Unmuted", muteStatus ? ToastIcon.MicrophoneMute : ToastIcon.Microphone); } break; @@ -323,25 +323,25 @@ namespace GHelper brightness = Math.Max(0, brightness - 1); config.setConfig("keyboard_brightness", brightness); AsusUSB.ApplyBrightness(brightness); - settingsForm.BeginInvoke(settingsForm.RunToast, "Down", ToastIcon.Backlight); + settingsForm.BeginInvoke(settingsForm.RunToast, "Backlight", ToastIcon.BacklightDown); break; case 196: // FN+F3 brightness = Math.Min(3, brightness + 1); config.setConfig("keyboard_brightness", brightness); AsusUSB.ApplyBrightness(brightness); - settingsForm.BeginInvoke(settingsForm.RunToast, "Up", ToastIcon.Backlight); + settingsForm.BeginInvoke(settingsForm.RunToast, "Backlight", ToastIcon.BacklightUp); break; case 16: // FN+F7 ScreenBrightness.Adjust(-10); - settingsForm.BeginInvoke(settingsForm.RunToast, "Down", ToastIcon.Brightness); + settingsForm.BeginInvoke(settingsForm.RunToast, "Brightness", ToastIcon.BrightnessDown); break; case 32: // FN+F8 ScreenBrightness.Adjust(+10); - settingsForm.BeginInvoke(settingsForm.RunToast, "Up", ToastIcon.Brightness); + settingsForm.BeginInvoke(settingsForm.RunToast, "Brightness", ToastIcon.BrightnessUp); break; case 107: // FN+F10 AsusUSB.TouchpadToggle(); - settingsForm.BeginInvoke(settingsForm.RunToast, "Toggle", ToastIcon.Touchpad); + settingsForm.BeginInvoke(settingsForm.RunToast, "Touchpad", ToastIcon.Touchpad); break; case 108: // FN+F11 Application.SetSuspendState(PowerState.Suspend, true, true); diff --git a/app/Properties/Resources.Designer.cs b/app/Properties/Resources.Designer.cs index 81274350..31155903 100644 --- a/app/Properties/Resources.Designer.cs +++ b/app/Properties/Resources.Designer.cs @@ -60,6 +60,46 @@ namespace GHelper.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap backlight_down { + get { + object obj = ResourceManager.GetObject("backlight_down", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap backlight_up { + get { + object obj = ResourceManager.GetObject("backlight_up", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap brightness_down { + get { + object obj = ResourceManager.GetObject("brightness_down", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap brightness_up { + get { + object obj = ResourceManager.GetObject("brightness_up", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// @@ -90,16 +130,6 @@ namespace GHelper.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap icons8_brightness_96 { - get { - object obj = ResourceManager.GetObject("icons8_brightness_96", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -240,6 +270,16 @@ namespace GHelper.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_mute_unmute_96 { + get { + object obj = ResourceManager.GetObject("icons8_mute_unmute_96", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -340,16 +380,6 @@ namespace GHelper.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap icons8_sunset_96 { - get { - object obj = ResourceManager.GetObject("icons8_sunset_96", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/app/Properties/Resources.resx b/app/Properties/Resources.resx index 8e92f0e6..57f3f6d6 100644 --- a/app/Properties/Resources.resx +++ b/app/Properties/Resources.resx @@ -211,16 +211,25 @@ ..\Resources\icons8-project-management-48 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-brightness-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\icons8-sunset-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\icons8-microphone-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\icons8-touchpad-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\backlight-down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\backlight-up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\brightness-down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\brightness-up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-mute-unmute-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/app/Properties/Strings.Designer.cs b/app/Properties/Strings.Designer.cs index e8613922..ea0c7bf9 100644 --- a/app/Properties/Strings.Designer.cs +++ b/app/Properties/Strings.Designer.cs @@ -1,6 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -779,6 +780,15 @@ namespace GHelper.Properties { } } + /// + /// Looks up a localized string similar to Mute Mic. + /// + internal static string MuteMic { + get { + return ResourceManager.GetString("MuteMic", resourceCulture); + } + } + /// /// Looks up a localized string similar to Open G-Helper window. /// diff --git a/app/Properties/Strings.resx b/app/Properties/Strings.resx index d2d4496e..ec196a9e 100644 --- a/app/Properties/Strings.resx +++ b/app/Properties/Strings.resx @@ -357,6 +357,9 @@ Multizone + + Mute Mic + Open G-Helper window diff --git a/app/Resources/backlight-down.png b/app/Resources/backlight-down.png new file mode 100644 index 00000000..1570c4c9 Binary files /dev/null and b/app/Resources/backlight-down.png differ diff --git a/app/Resources/backlight-up.png b/app/Resources/backlight-up.png new file mode 100644 index 00000000..379efb93 Binary files /dev/null and b/app/Resources/backlight-up.png differ diff --git a/app/Resources/brightness-down.png b/app/Resources/brightness-down.png new file mode 100644 index 00000000..1f7da8ba Binary files /dev/null and b/app/Resources/brightness-down.png differ diff --git a/app/Resources/brightness-up.png b/app/Resources/brightness-up.png new file mode 100644 index 00000000..a28bbbe3 Binary files /dev/null and b/app/Resources/brightness-up.png differ diff --git a/app/Resources/icons8-brightness-96.png b/app/Resources/icons8-brightness-96.png deleted file mode 100644 index ed8e942e..00000000 Binary files a/app/Resources/icons8-brightness-96.png and /dev/null differ diff --git a/app/Resources/icons8-mute-unmute-96.png b/app/Resources/icons8-mute-unmute-96.png new file mode 100644 index 00000000..2e6213d9 Binary files /dev/null and b/app/Resources/icons8-mute-unmute-96.png differ diff --git a/app/Resources/icons8-sunset-96.png b/app/Resources/icons8-sunset-96.png deleted file mode 100644 index 23531509..00000000 Binary files a/app/Resources/icons8-sunset-96.png and /dev/null differ diff --git a/app/Settings.cs b/app/Settings.cs index 66c04072..fa268b02 100644 --- a/app/Settings.cs +++ b/app/Settings.cs @@ -6,6 +6,7 @@ using System.Net; using System.Reflection; using System.Text.Json; using System.Timers; +using System.Windows.Forms; using Tools; namespace GHelper @@ -272,7 +273,11 @@ namespace GHelper else { Program.acpi.DeviceSet(AsusACPI.GPUXG, 1, "GPU XGM"); + + if (Program.config.getConfigPerf("auto_apply") == 1) + AsusUSB.SetXGMFan(Program.config.getFanConfig(AsusFan.XGM)); } + InitXGM(); } diff --git a/app/ToastForm.cs b/app/ToastForm.cs index f532ee83..3c8a240c 100644 --- a/app/ToastForm.cs +++ b/app/ToastForm.cs @@ -45,10 +45,13 @@ namespace GHelper public enum ToastIcon { - Brightness, - Backlight, + BrightnessUp, + BrightnessDown, + BacklightUp, + BacklightDown, Touchpad, - Microphone + Microphone, + MicrophoneMute } public class ToastForm : OSDNativeForm @@ -79,15 +82,24 @@ namespace GHelper switch (toastIcon) { - case ToastIcon.Brightness: - icon = Properties.Resources.icons8_brightness_96; + case ToastIcon.BrightnessUp: + icon = Properties.Resources.brightness_up; break; - case ToastIcon.Backlight: - icon = Properties.Resources.icons8_sunset_96; + case ToastIcon.BrightnessDown: + icon = Properties.Resources.brightness_down; + break; + case ToastIcon.BacklightUp: + icon = Properties.Resources.backlight_up; + break; + case ToastIcon.BacklightDown: + icon = Properties.Resources.backlight_down; break; case ToastIcon.Microphone: icon = Properties.Resources.icons8_microphone_96; break; + case ToastIcon.MicrophoneMute: + icon = Properties.Resources.icons8_mute_unmute_96; + break; case ToastIcon.Touchpad: icon = Properties.Resources.icons8_touchpad_96; break; @@ -112,7 +124,7 @@ namespace GHelper public void RunToast(string text, ToastIcon? icon = null) { - Hide(); + //Hide(); timer.Stop(); toastText = text;