Revert "Adjustment of Windows Power Overlay is now optional"

app/AppConfig.cs

@@ -69,7 +69,6 @@ public class AppConfig
     {
         config = new Dictionary<string, object>();
         config["performance_mode"] = 0;
-        config["auto_apply_power_plan"] = 1;
         string jsonString = JsonSerializer.Serialize(config);
         File.WriteAllText(configFile, jsonString);
     }

app/Extra.Designer.cs

@@ -74,7 +74,6 @@ namespace GHelper
             checkSleepLid = new CheckBox();
             checkShutdownLid = new CheckBox();
             groupOther = new GroupBox();
-            checkApplyWindowsPowerMode = new CheckBox();
             checkKeyboardAuto = new CheckBox();
             checkUSBC = new CheckBox();
             checkNoOverdrive = new CheckBox();

app/Extra.cs

@@ -73,7 +73,6 @@ namespace GHelper
             checkNoOverdrive.Text = Properties.Strings.DisableOverdrive;
             checkTopmost.Text = Properties.Strings.WindowTop;
             checkUSBC.Text = Properties.Strings.OptimizedUSBC;
-            checkApplyWindowsPowerMode.Text = Properties.Strings.ApplyWindowsPowerPlan;
 
             labelBacklight.Text = Properties.Strings.Keyboard;
             labelBacklightBar.Text = Properties.Strings.Lightbar;
@@ -177,8 +176,6 @@ namespace GHelper
             checkUSBC.Checked = (Program.config.getConfig("optimized_usbc") == 1);
             checkUSBC.CheckedChanged += CheckUSBC_CheckedChanged;
 
-            checkApplyWindowsPowerMode.Checked = Program.config.getConfig("auto_apply_power_plan") == 1;
-
             int kb_brightness = Program.config.getConfig("keyboard_brightness");
             trackBrightness.Value = (kb_brightness >= 0 && kb_brightness <= 3) ? kb_brightness : 3;
 
@@ -302,11 +299,5 @@ namespace GHelper
             Top = Program.settingsForm.Top;
             Left = Program.settingsForm.Left - Width - 5;
         }
-
-        private void checkApplyWindowsPowerMode_CheckedChanged(object sender, EventArgs e)
-        {
-            CheckBox chk = (CheckBox)sender;
-            Program.config.setConfig("auto_apply_power_plan", chk.Checked ? 1 : 0);
-        }
     }
 }

app/Properties/Strings.Designer.cs

@@ -169,16 +169,7 @@ namespace GHelper.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Auto Adjust Windows Power Plan.
+        ///   Looks up a localized string similar to Breathe.
-        /// </summary>
-        internal static string ApplyWindowsPowerPlan {
-            get {
-                return ResourceManager.GetString("ApplyWindowsPowerPlan", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///  Looks up a localized string similar to Breathe.
         /// </summary>
         internal static string AuraBreathe {
             get {

app/Properties/Strings.de.resx

@@ -94,9 +94,6 @@
   <data name="ApplyPowerLimits" xml:space="preserve">
     <value>Apply Power Limits</value>
   </data>
-  <data name="ApplyWindowsPowerPlan" xml:space="preserve">
-    <value>Auto Adjust Windows Power Plan</value>
-  </data>
   <data name="AuraBreathe" xml:space="preserve">
     <value>Breathe</value>
   </data>

app/Properties/Strings.es.resx

@@ -153,9 +153,6 @@
   <data name="ApplyPowerLimits" xml:space="preserve">
     <value>Aplicar límites de energía</value>
   </data>
-  <data name="ApplyWindowsPowerPlan" xml:space="preserve">
-    <value>Auto Adjust Windows Power Plan</value>
-  </data>
   <data name="AuraBreathe" xml:space="preserve">
     <value>Respiración</value>
   </data>

app/Properties/Strings.fr.resx

@@ -301,9 +301,6 @@
   <data name="RunOnStartup" xml:space="preserve">
     <value>Run on Startup</value>
   </data>
-  <data name="SApplyWindowsPowerPlan" xml:space="preserve">
-    <value>Auto Adjust Windows Power Plan</value>
-  </data>
   <data name="Shutdown" xml:space="preserve">
     <value>Shutdown</value>
   </data>

app/Properties/Strings.it.resx

@@ -94,9 +94,6 @@
   <data name="ApplyPowerLimits" xml:space="preserve">
     <value>Apply Power Limits</value>
   </data>
-  <data name="ApplyWindowsPowerPlan" xml:space="preserve">
-    <value>Auto Adjust Windows Power Plan</value>
-  </data>
   <data name="AuraBreathe" xml:space="preserve">
     <value>Breathe</value>
   </data>

app/Properties/Strings.resx

@@ -153,9 +153,6 @@
   <data name="ApplyPowerLimits" xml:space="preserve">
     <value>Apply Power Limits</value>
   </data>
-  <data name="ApplyWindowsPowerPlan" xml:space="preserve">
-    <value>Auto Adjust Windows Power Plan</value>
-  </data>
   <data name="AuraBreathe" xml:space="preserve">
     <value>Breathe</value>
   </data>

app/Properties/Strings.tr.resx

@@ -153,9 +153,6 @@
   <data name="ApplyPowerLimits" xml:space="preserve">
     <value>Güç Sınırlarını Uygula</value>
   </data>
-  <data name="ApplyWindowsPowerPlan" xml:space="preserve">
-    <value>Auto Adjust Windows Power Plan</value>
-  </data>
   <data name="AuraBreathe" xml:space="preserve">
     <value>Nefes</value>
   </data>

app/Properties/Strings.uk.resx

@@ -153,9 +153,6 @@
   <data name="ApplyPowerLimits" xml:space="preserve">
     <value>Застосувати потужність</value>
   </data>
-  <data name="ApplyWindowsPowerPlan" xml:space="preserve">
-    <value>Auto Adjust Windows Power Plan</value>
-  </data>
   <data name="AuraBreathe" xml:space="preserve">
     <value>Дихання</value>
   </data>

app/Properties/Strings.zh-CN.resx

@@ -153,9 +153,6 @@
   <data name="ApplyPowerLimits" xml:space="preserve">
     <value>应用功率限制</value>
   </data>
-  <data name="ApplyWindowsPowerPlan" xml:space="preserve">
-    <value>Auto Adjust Windows Power Plan</value>
-  </data>
   <data name="AuraBreathe" xml:space="preserve">
     <value>呼吸</value>
   </data>

app/Properties/Strings.zh-TW.resx

@@ -153,9 +153,6 @@
   <data name="ApplyPowerLimits" xml:space="preserve">
     <value>套用功率限制</value>
   </data>
-  <data name="ApplyWindowsPowerPlan" xml:space="preserve">
-    <value>Auto Adjust Windows Power Plan</value>
-  </data>
   <data name="AuraBreathe" xml:space="preserve">
     <value>呼吸</value>
   </data>

app/Settings.cs

@@ -1286,13 +1286,11 @@ namespace GHelper
             AutoFans();
             AutoPower(1000);
 
-            if (Program.config.getConfigPerf("auto_apply_power_plan") == 1)
+
-            {
+            if (Program.config.getConfigPerfString("scheme") is not null)
-                if (Program.config.getConfigPerfString("scheme") is not null)
+                NativeMethods.SetPowerScheme(Program.config.getConfigPerfString("scheme"));
-                    NativeMethods.SetPowerScheme(Program.config.getConfigPerfString("scheme"));
+            else
-                else
+                NativeMethods.SetPowerScheme(PerformanceMode);
-                    NativeMethods.SetPowerScheme(PerformanceMode);
-            }
 
             if (Program.config.getConfigPerf("auto_boost") != -1)
             {