Merge branch 'main' of https://github.com/seerge/g-helper

app/Peripherals/Mouse/Models/GladiusIIIWireless.cs

@@ -1,13 +1,13 @@
 namespace GHelper.Peripherals.Mouse.Models
 {
     //P706_Wireless
-    public class GladiusIII : AsusMouse
+    public class GladiusIIIWireless : AsusMouse
     {
-        public GladiusIII() : base(0x0B05, 0x197F, "mi_00", true)
+        public GladiusIIIWireless() : base(0x0B05, 0x197F, "mi_00", true)
         {
         }
 
-        protected GladiusIII(ushort vendorId, bool wireless) : base(0x0B05, vendorId, "mi_00", wireless)
+        protected GladiusIIIWireless(ushort vendorId, bool wireless) : base(0x0B05, vendorId, "mi_00", wireless)
         {
         }
 
@@ -77,7 +77,7 @@
         }
     }
 
-    public class GladiusIIIWired : GladiusIII
+    public class GladiusIIIWired : GladiusIIIWireless
     {
         public GladiusIIIWired() : base(0x197d, false)
         {
@@ -88,4 +88,43 @@
             return "ROG Gladius III (Wired)";
         }
     }
+
+
+    //P514
+    public class GladiusIII : GladiusIIIWireless
+    {
+        public GladiusIII() : base(0x197B, false)
+        {
+        }
+
+        public override string GetDisplayName()
+        {
+            return "ROG Gladius III";
+        }
+
+        public override bool HasAutoPowerOff()
+        {
+            return false;
+        }
+
+        public override bool HasLowBatteryWarning()
+        {
+            return false;
+        }
+
+        public override bool HasBattery()
+        {
+            return false;
+        }
+
+        public override bool IsLightingModeSupported(LightingMode lightingMode)
+        {
+            return lightingMode == LightingMode.Static
+                || lightingMode == LightingMode.Breathing
+                || lightingMode == LightingMode.ColorCycle
+                || lightingMode == LightingMode.Rainbow
+                || lightingMode == LightingMode.React
+                || lightingMode == LightingMode.Comet;
+        }
+    }
 }

app/Peripherals/PeripheralsProvider.cs

@@ -198,8 +198,9 @@ namespace GHelper.Peripherals
             DetectMouse(new TUFM4WirelssCN());
             DetectMouse(new StrixImpactIIWireless());
             DetectMouse(new StrixImpactIIWirelessWired());
-            DetectMouse(new GladiusIII());
+            DetectMouse(new GladiusIIIWireless());
             DetectMouse(new GladiusIIIWired());
+            DetectMouse(new GladiusIII());
             DetectMouse(new GladiusIIIAimpointEva2());
             DetectMouse(new GladiusIIIAimpointEva2Wired());
             DetectMouse(new HarpeAceAimLabEdition());

app/Properties/Strings.uk.resx

@@ -507,7 +507,7 @@
     <value>Ілюмінація</value>
   </data>
   <data name="LockScreen" xml:space="preserve">
-    <value>Lock Screen</value>
+    <value>Блокування екрану</value>
   </data>
   <data name="Logo" xml:space="preserve">
     <value>Лого</value>
@@ -741,7 +741,7 @@
     <value>Вимкнути екран</value>
   </data>
   <data name="ToggleTouchscreen" xml:space="preserve">
-    <value>Toggle Touchscreen</value>
+    <value>Сенсорний екран</value>
   </data>
   <data name="Touchscreen" xml:space="preserve">
     <value/>

app/Properties/Strings.zh-TW.resx

@@ -139,7 +139,7 @@
     <value>關閉獨顯需要重新啟動</value>
   </data>
   <data name="AlertUltimateOn" xml:space="preserve">
-    <value>獨顯直連需要重新啟動</value>
+    <value>獨顯輸出需要重新啟動</value>
   </data>
   <data name="AlertUltimateTitle" xml:space="preserve">
     <value>現在重新啟動嗎?</value>
@@ -271,7 +271,7 @@
     <value>閒置時關閉燈光(充電模式)</value>
   </data>
   <data name="Balanced" xml:space="preserve">
-    <value>平衡模式</value>
+    <value>效能</value>
   </data>
   <data name="BatteryCharge" xml:space="preserve">
     <value>充電</value>
@@ -370,7 +370,7 @@
     <value>節能模式</value>
   </data>
   <data name="EnableGPUOnShutdown" xml:space="preserve">
-    <value>關機前啟動顯卡(解決切換顯卡節能模式&amp;標準模式和亮度的某些問題)</value>
+    <value>關機前啟動顯卡(解決切換顯卡節能模式&amp;混合輸出和亮度的某些問題)</value>
   </data>
   <data name="EnableOptimusText" xml:space="preserve">
     <value>「Nvidia控制面板」中的顯示模式未設置為自動切換時，透過G-Helper的節能模式禁用獨顯可能導致螢幕亮度控制出現問題直到下次重新開機後。
@@ -621,13 +621,13 @@
     <value>開啟G-Helper視窗</value>
   </data>
   <data name="Optimized" xml:space="preserve">
-    <value>自動模式</value>
+    <value>自動調節</value>
   </data>
   <data name="OptimizedGPUTooltip" xml:space="preserve">
-    <value>使用電池切換到節能模式，插入電源時切換到標準模式</value>
+    <value>使用電池切換到整合式顯卡，插入電源時切換到獨立顯卡</value>
   </data>
   <data name="OptimizedUSBC" xml:space="preserve">
-    <value>自動模式下，使用USB-C充電時持續關閉獨顯</value>
+    <value>自動調節模式下，使用USB-C充電時持續關閉獨顯</value>
   </data>
   <data name="Other" xml:space="preserve">
     <value>其他</value>
@@ -696,13 +696,13 @@
     <value>關機時</value>
   </data>
   <data name="Silent" xml:space="preserve">
-    <value>安靜模式</value>
+    <value>靜音</value>
   </data>
   <data name="Sleep" xml:space="preserve">
     <value>睡眠時</value>
   </data>
   <data name="StandardGPUTooltip" xml:space="preserve">
-    <value>標準模式會啟用獨顯</value>
+    <value>自動切換獨立顯卡以及整合式顯卡 (MS-Hybrid)</value>
   </data>
   <data name="StandardMode" xml:space="preserve">
     <value>標準模式</value>
@@ -732,7 +732,7 @@
     <value>翻蓋模式 (蓋上筆電但有外接螢幕時，系統仍會持續運行)</value>
   </data>
   <data name="ToggleFnLock" xml:space="preserve">
-    <value>免按Fn鍵使用Fn+F1~F12功能</value>
+    <value>切換 Fn-Lock</value>
   </data>
   <data name="ToggleMiniled" xml:space="preserve">
     <value>切換 mini-LED (若有支援)</value>
@@ -756,10 +756,10 @@
     <value>電池模式時關閉</value>
   </data>
   <data name="UltimateGPUTooltip" xml:space="preserve">
-    <value>開啟獨顯直連獲得最佳幀數</value>
+    <value>開啟獨顯輸出獲得最佳幀數</value>
   </data>
   <data name="UltimateMode" xml:space="preserve">
-    <value>獨顯直連</value>
+    <value>獨顯輸出</value>
   </data>
   <data name="UndervoltingRisky" xml:space="preserve">
     <value>降壓是一項實驗性且有風險的功能，若設定的值過低，可能造成系統不穩定甚至無預警關機，建議可先嘗試較小的降壓數值，並點擊"套用"來測試適合你的使用狀況</value>

docs/README.md

@@ -44,7 +44,7 @@ Works with all popular models, such as ROG Zephyrus G14, G15, G16, M16, Flow X13
 4. Custom fan curve editor, power limits and turbo boost selection for every performance mode
 5. Anime Matrix or Slash Lighting control including animated GIFs, clock and Audio visualizer
 6. Backlight animation modes and colors 
-7. Custom hotkeys (M-keys, FN+X keys)
+7. Hotkey handling
 8. Monitor CPU and GPU temperature, fan speeds and battery status
 9. Battery charge limit to preserve battery health
 10. NVidia GPU overclocking and undervolting