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

* New translations strings.resx (French)

* New translations strings.resx (French)

app/AppConfig.cs

@@ -428,7 +428,7 @@ public static class AppConfig
 
     public static bool IsGPUFixNeeded()
     {
-        return ContainsModel("GA402X") || ContainsModel("GV302") || ContainsModel("GV301") || ContainsModel("GZ301") || ContainsModel("FX506") || ContainsModel("GU603") || ContainsModel("GU604") || ContainsModel("G614J");
+        return ContainsModel("GA402X") || ContainsModel("GV302") || ContainsModel("GV301") || ContainsModel("GZ301") || ContainsModel("FX506") || ContainsModel("GU603") || ContainsModel("GU604") || ContainsModel("G614J") || ContainsModel("GA503");
     }
 
     public static bool IsGPUFix()

app/Fans.cs

@@ -599,7 +599,7 @@ namespace GHelper
             int Max = FanSensorControl.GetFanMax(device);
 
             if (fanRpm)
-                return (200 * Math.Round((float)(Min * 100 + (Max - Min) * percentage) / 200)).ToString() + unit;
+                return (200 * Math.Floor((float)(Min * 100 + (Max - Min) * percentage) / 200)).ToString() + unit;
             else
                 return percentage + "%";
         }
@@ -790,10 +790,11 @@ namespace GHelper
         {
 
             bool modeA0 = (Program.acpi.DeviceGet(AsusACPI.PPT_TotalA0) >= 0 || RyzenControl.IsAMD());
+            bool modeA3 = Program.acpi.DeviceGet(AsusACPI.PPT_APUA3) >= 0;
             bool modeB0 = Program.acpi.IsAllAmdPPT();
             bool modeC1 = Program.acpi.DeviceGet(AsusACPI.PPT_APUC1) >= 0;
 
-            panelA0.Visible = modeA0;
+            panelA0.Visible = panelA3.Visible = modeA0;
             panelB0.Visible = modeB0;
 
             panelApplyPower.Visible = panelTitleCPU.Visible = modeA0 || modeB0 || modeC1;
@@ -815,6 +816,7 @@ namespace GHelper
                     labelLeftA3.Text = "CPU Slow (sPPT)";
                     labelLeftC1.Text = "CPU Fast (fPPT)";
                     panelC1.Visible = modeC1;
+                    panelA3.Visible = modeA3;
                 }
                 else
                 {
@@ -1146,7 +1148,7 @@ namespace GHelper
                         tip = true;
                     }
 
-                    labelTip.Text = Math.Round(curPoint.XValue) + "C, " + ChartYLabel((int)curPoint.YValues[0], device, " " + Properties.Strings.RPM);
+                    labelTip.Text = Math.Floor(curPoint.XValue) + "C, " + ChartYLabel((int)curPoint.YValues[0], device, " " + Properties.Strings.RPM);
                     labelTip.Top = e.Y + ((Control)sender).Top;
                     labelTip.Left = e.X - 50;
 

app/GHelper.csproj

@@ -15,7 +15,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <AssemblyVersion>0.138</AssemblyVersion>
+    <AssemblyVersion>0.139</AssemblyVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

app/Input/InputDispatcher.cs

@@ -634,13 +634,19 @@ namespace GHelper.Input
             {
                 case 16: // FN+F7
                     if (Control.ModifierKeys == Keys.Shift)
-                        SetScreenpad(-10);
+                    {
+                        if (AppConfig.IsDUO()) SetScreenpad(-10);
+                        else Program.settingsForm.BeginInvoke(Program.settingsForm.CycleMatrix, -1);
+                    }
                     else
                         Program.acpi.DeviceSet(AsusACPI.UniversalControl, AsusACPI.Brightness_Down, "Brightness");
                     break;
                 case 32: // FN+F8
                     if (Control.ModifierKeys == Keys.Shift)
-                        SetScreenpad(10);
+                    {
+                        if (AppConfig.IsDUO()) SetScreenpad(10);
+                        else Program.settingsForm.BeginInvoke(Program.settingsForm.CycleMatrix, 1);
+                    }
                     else
                         Program.acpi.DeviceSet(AsusACPI.UniversalControl, AsusACPI.Brightness_Up, "Brightness");
                     break;

app/Properties/Strings.fr.resx

@@ -124,10 +124,10 @@
     <value>Connexion impossible avec ASUS ACPI. L'application ne peut fonctionner sans. Veuillez installer Asus System Control Interface</value>
   </data>
   <data name="AlertAPUMemoryRestart" xml:space="preserve">
-    <value>Restart your device to apply changes</value>
+    <value>Redémarrez votre appareil pour appliquer les modifications</value>
   </data>
   <data name="AlertAPUMemoryRestartTitle" xml:space="preserve">
-    <value>Restart now?</value>
+    <value>Redémarrer maintenant ?</value>
   </data>
   <data name="AlertDGPU" xml:space="preserve">
     <value>Le GPU semble être surchargé, voulez vous le désactiver ?</value>
@@ -169,7 +169,7 @@
     <value>Ajustement auto des modes de gestion alim. Windows</value>
   </data>
   <data name="APUMemory" xml:space="preserve">
-    <value>Memory Assigned to GPU</value>
+    <value>Mémoire attribuée au GPU</value>
   </data>
   <data name="AsusServicesRunning" xml:space="preserve">
     <value>Services Asus actifs</value>
@@ -247,7 +247,7 @@
     <value>Allumé</value>
   </data>
   <data name="BacklightTimeout" xml:space="preserve">
-    <value>Délai d'activation de la batterie (0 - ON)</value>
+    <value>Délai branché / sur batterie (0 - ON)</value>
   </data>
   <data name="Balanced" xml:space="preserve">
     <value>Équilibré</value>
@@ -354,7 +354,7 @@ Voulez-vous continuer ?</value>
     <value>Profil du ventilateur central</value>
   </data>
   <data name="FanProfiles" xml:space="preserve">
-    <value>Profil</value>
+    <value>Profil des ventilateurs</value>
   </data>
   <data name="FansAndPower" xml:space="preserve">
     <value>Ventilateurs + Puissance</value>
@@ -399,7 +399,7 @@ Voulez-vous continuer ?</value>
     <value>Température cible</value>
   </data>
   <data name="HibernateAfter" xml:space="preserve">
-    <value>Minutes jusqu'à la mise en veille prolongée sur la batterie (0 - OFF)</value>
+    <value>Minutes avant mise en veille prolongée sur batterie (0 - OFF)</value>
   </data>
   <data name="High" xml:space="preserve">
     <value>Élevé</value>

app/Settings.cs

@@ -761,6 +761,15 @@ namespace GHelper
         }
 
 
+        public void CycleMatrix(int delta)
+        {
+            comboMatrix.SelectedIndex = Math.Min(Math.Max(0, comboMatrix.SelectedIndex + delta), comboMatrix.Items.Count - 1);
+            AppConfig.Set("matrix_brightness", comboMatrix.SelectedIndex);
+            matrixControl.SetMatrix();
+            Program.toast.RunToast(comboMatrix.GetItemText(comboMatrix.SelectedItem), delta > 0 ? ToastIcon.BacklightUp : ToastIcon.BacklightDown);
+        }
+
+
         public void CycleAuraMode()
         {
             if (comboKeyboard.SelectedIndex < comboKeyboard.Items.Count - 1)