Merge

app/Extra.Designer.cs

@@ -1033,7 +1033,6 @@ namespace GHelper
             checkAutoToggleClamshellMode.TabIndex = 58;
             checkAutoToggleClamshellMode.Text = "Auto Toggle Clamshell Mode";
             checkAutoToggleClamshellMode.UseVisualStyleBackColor = true;
-            checkAutoToggleClamshellMode.CheckedChanged += checkAutoToggleClamshellMode_CheckedChanged;
             // 
             // checkAutoApplyWindowsPowerMode
             // 

app/Extra.cs

@@ -229,6 +229,7 @@ namespace GHelper
 
             checkAutoToggleClamshellMode.Visible = clamshellControl.IsExternalDisplayConnected();
             checkAutoToggleClamshellMode.Checked = AppConfig.Is("toggle_clamshell_mode");
+            checkAutoToggleClamshellMode.CheckedChanged += checkAutoToggleClamshellMode_CheckedChanged;
 
             checkTopmost.Checked = AppConfig.Is("topmost");
             checkTopmost.CheckedChanged += CheckTopmost_CheckedChanged; ;
@@ -487,10 +488,20 @@ namespace GHelper
             AppConfig.Set("auto_apply_power_plan", checkAutoApplyWindowsPowerMode.Checked ? 1 : 0);
         }
 
-        private void checkAutoToggleClamshellMode_CheckedChanged(object sender, EventArgs e)
+        private void checkAutoToggleClamshellMode_CheckedChanged(object? sender, EventArgs e)
         {
             AppConfig.Set("toggle_clamshell_mode", checkAutoToggleClamshellMode.Checked ? 1 : 0);
-            clamshellControl.ToggleLidAction();
+
+            if (checkAutoToggleClamshellMode.Checked)
+            {
+                ClamshellModeControl ctrl = new ClamshellModeControl();
+                ctrl.ToggleLidAction();
+            }
+            else
+            {
+                ClamshellModeControl.DisableClamshellMode();
+            }
+
         }
     }
 }

app/Helpers/ClamshellModeControl.cs

@@ -39,24 +39,38 @@ namespace GHelper.Helpers
             return SystemInformation.PowerStatus.PowerLineStatus == PowerLineStatus.Online;
         }
 
-        public bool IsInClamshellMode()
+        public bool IsClamshellReady()
         {
             return IsExternalDisplayConnected() && IsChargerConnected();
         }
 
         public void ToggleLidAction()
         {
-            if (IsInClamshellMode() && IsClamshellEnabled())
+            if (!IsClamshellEnabled())
             {
-                PowerNative.SetLidAction(0, true);
-                Logger.WriteLine("Engaging Clamshell Mode");
+                return;
+            }
+
+            if (IsClamshellReady())
+            {
+                EnableClamshellMode();
             }
             else
             {
-                PowerNative.SetLidAction(1, true);
-                Logger.WriteLine("Disengaging Clamshell Mode");
+                DisableClamshellMode();
             }
         }
+        public static void DisableClamshellMode()
+        {
+            PowerNative.SetLidAction(1, true);
+            Logger.WriteLine("Disengaging Clamshell Mode");
+        }
+
+        public static void EnableClamshellMode()
+        {
+            PowerNative.SetLidAction(0, true);
+            Logger.WriteLine("Engaging Clamshell Mode");
+        }
 
         public void UnregisterDisplayEvents()
         {

app/Properties/Strings.es.resx

@@ -402,7 +402,7 @@
     <value>Nuevas actualizaciones</value>
   </data>
   <data name="NoNewUpdates" xml:space="preserve">
-    <value>No hay nuevas actualizaciones</value>
+    <value>No hay actualizaciones</value>
   </data>
   <data name="OpenGHelper" xml:space="preserve">
     <value>Abrir ventana G-Helper</value>

app/Properties/Strings.it.resx

@@ -208,7 +208,7 @@
     <value>Limite Ricarica Batteria</value>
   </data>
   <data name="BatteryHealth" xml:space="preserve">
-    <value>Battery Health</value>
+    <value>Salute Batteria</value>
   </data>
   <data name="BiosAndDriverUpdates" xml:space="preserve">
     <value>Aggiornamenti Driver e BIOS</value>
@@ -232,7 +232,7 @@
     <value>Colore</value>
   </data>
   <data name="CPUBoost" xml:space="preserve">
-    <value>CPU Boost</value>
+    <value>Boost CPU</value>
   </data>
   <data name="Custom" xml:space="preserve">
     <value>Personalizzato</value>

app/Properties/Strings.pl.resx

@@ -208,7 +208,7 @@
     <value>Limit ładowania baterii</value>
   </data>
   <data name="BatteryHealth" xml:space="preserve">
-    <value>Battery Health</value>
+    <value>Stan baterii</value>
   </data>
   <data name="BiosAndDriverUpdates" xml:space="preserve">
     <value>Aktualizacje BIOS i sterowników</value>
@@ -294,7 +294,7 @@ Nadal chcesz kontynuować?</value>
     <value>Wentylatory i moc</value>
   </data>
   <data name="FanSpeed" xml:space="preserve">
-    <value>Wentylator</value>
+    <value>Went</value>
   </data>
   <data name="FansPower" xml:space="preserve">
     <value>Dostosuj</value>

app/Properties/Strings.uk.resx

@@ -208,7 +208,7 @@
     <value>Ліміт заряду батареї</value>
   </data>
   <data name="BatteryHealth" xml:space="preserve">
-    <value>Battery Health</value>
+    <value>Стан батареї</value>
   </data>
   <data name="BiosAndDriverUpdates" xml:space="preserve">
     <value>Оновлення BIOS та драйверів</value>

app/Properties/Strings.zh-CN.resx

@@ -208,7 +208,7 @@
     <value>电池充电限制</value>
   </data>
   <data name="BatteryHealth" xml:space="preserve">
-    <value>Battery Health</value>
+    <value>电池健康</value>
   </data>
   <data name="BiosAndDriverUpdates" xml:space="preserve">
     <value>BIOS 和驱动程序更新</value>
@@ -495,7 +495,7 @@
     <value>切换 Aura 模式</value>
   </data>
   <data name="ToggleClamshellMode" xml:space="preserve">
-    <value>Auto Toggle Clamshell Mode</value>
+    <value>自动启用外接显示器模式</value>
   </data>
   <data name="ToggleFnLock" xml:space="preserve">
     <value>切换 Fn 锁定</value>

app/Properties/Strings.zh-TW.resx

@@ -208,7 +208,7 @@
     <value>電池充電上限</value>
   </data>
   <data name="BatteryHealth" xml:space="preserve">
-    <value>Battery Health</value>
+    <value>電池健康度</value>
   </data>
   <data name="BiosAndDriverUpdates" xml:space="preserve">
     <value>BIOS與驅動程式更新 Updates</value>