From 4c55e16f2ec47ed6f4de5cfe3ba979302c50659b Mon Sep 17 00:00:00 2001
From: Serge <5920850+seerge@users.noreply.github.com>
Date: Mon, 29 May 2023 19:38:57 +0200
Subject: [PATCH] UI tweaks

---
 app/GHelper.csproj             |  2 +-
 app/Properties/Strings.uk.resx |  8 +++++++-
 app/Settings.Designer.cs       | 11 +++++------
 app/Settings.cs                | 20 ++++++++++++++++++--
 4 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/app/GHelper.csproj b/app/GHelper.csproj
index 08a723b9..2f159466 100644
--- a/app/GHelper.csproj
+++ b/app/GHelper.csproj
@@ -16,7 +16,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <AssemblyVersion>0.71</AssemblyVersion>
+    <AssemblyVersion>0.72</AssemblyVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/app/Properties/Strings.uk.resx b/app/Properties/Strings.uk.resx
index 3653fb5f..7abdb16a 100644
--- a/app/Properties/Strings.uk.resx
+++ b/app/Properties/Strings.uk.resx
@@ -288,6 +288,9 @@
   <data name="KeyboardAuto" xml:space="preserve">
     <value>Вимкнути підсвітку на батареї та увімкнути на зарядці</value>
   </data>
+  <data name="KillGpuApps" xml:space="preserve">
+    <value>Закривати додатки, що використовують GPU, під час переходу в режим Eco</value>
+  </data>
   <data name="LaptopBacklight" xml:space="preserve">
     <value>Підсвітка</value>
   </data>
@@ -297,6 +300,9 @@
   <data name="LaptopScreen" xml:space="preserve">
     <value>Дисплей</value>
   </data>
+  <data name="MatrixAudio" xml:space="preserve">
+    <value>Аудіо візуалізатор</value>
+  </data>
   <data name="MatrixBanner" xml:space="preserve">
     <value>Бінарний банер</value>
   </data>
@@ -400,7 +406,7 @@
     <value>Аура</value>
   </data>
   <data name="ToggleMiniled" xml:space="preserve">
-    <value>Міні-лед (якщо підтримується)</value>
+    <value>Міні-лед (якщо є)</value>
   </data>
   <data name="ToggleScreen" xml:space="preserve">
     <value>Вимкнути екран</value>
diff --git a/app/Settings.Designer.cs b/app/Settings.Designer.cs
index da4fc66d..7c27d532 100644
--- a/app/Settings.Designer.cs
+++ b/app/Settings.Designer.cs
@@ -901,13 +901,12 @@ namespace GHelper
             tableLayoutKeyboard.AutoSize = true;
             tableLayoutKeyboard.AutoSizeMode = AutoSizeMode.GrowAndShrink;
             tableLayoutKeyboard.ColumnCount = 3;
-            tableLayoutKeyboard.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F));
-            tableLayoutKeyboard.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F));
-            tableLayoutKeyboard.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F));
-            tableLayoutKeyboard.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F));
+            tableLayoutKeyboard.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33F));
+            tableLayoutKeyboard.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33F));
+            tableLayoutKeyboard.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33F));
+            tableLayoutKeyboard.Controls.Add(buttonKeyboard, 0, 0);
+            tableLayoutKeyboard.Controls.Add(panelColor, 0, 0);
             tableLayoutKeyboard.Controls.Add(comboKeyboard, 0, 0);
-            tableLayoutKeyboard.Controls.Add(panelColor, 1, 0);
-            tableLayoutKeyboard.Controls.Add(buttonKeyboard, 2, 0);
             tableLayoutKeyboard.Location = new Point(16, 50);
             tableLayoutKeyboard.Margin = new Padding(8);
             tableLayoutKeyboard.Name = "tableLayoutKeyboard";
diff --git a/app/Settings.cs b/app/Settings.cs
index 6fd8264d..f90208d5 100644
--- a/app/Settings.cs
+++ b/app/Settings.cs
@@ -688,6 +688,17 @@ namespace GHelper
             pictureColor.BackColor = AsusUSB.Color1;
             pictureColor2.BackColor = AsusUSB.Color2;
             pictureColor2.Visible = AsusUSB.HasSecondColor();
+
+            if (AppConfig.ContainsModel("GA401"))
+            {
+                panelColor.Visible = false;
+            }
+
+            if (AppConfig.ContainsModel("GA401I"))
+            {
+                comboKeyboard.Visible = false;
+            }
+
         }
 
         public void InitMatrix()
@@ -1065,17 +1076,22 @@ namespace GHelper
 
             if (AppConfig.getConfigPerf("auto_apply") == 1 || force)
             {
+
+                bool xgmFan = false;
                 if (AppConfig.isConfig("xgm_fan") && Program.acpi.IsXGConnected())
                 {
                     AsusUSB.SetXGMFan(AppConfig.getFanConfig(AsusFan.XGM));
-                } 
+                    xgmFan = true;
+                }
 
                 int cpuResult = Program.acpi.SetFanCurve(AsusFan.CPU, AppConfig.getFanConfig(AsusFan.CPU));
                 int gpuResult = Program.acpi.SetFanCurve(AsusFan.GPU, AppConfig.getFanConfig(AsusFan.GPU));
 
+
                 if (AppConfig.isConfig("mid_fan"))
                     Program.acpi.SetFanCurve(AsusFan.Mid, AppConfig.getFanConfig(AsusFan.Mid));
 
+
                 // something went wrong, resetting to default profile
                 if (cpuResult != 1 || gpuResult != 1)
                 {
@@ -1091,7 +1107,7 @@ namespace GHelper
                 }
 
                 // fix for misbehaving bios on intell based TUF 2022
-                if ((AppConfig.ContainsModel("FX507") || AppConfig.ContainsModel("FX517")) && AppConfig.getConfigPerf("auto_apply_power") != 1)
+                if ((AppConfig.ContainsModel("FX507") || AppConfig.ContainsModel("FX517") || xgmFan) && AppConfig.getConfigPerf("auto_apply_power") != 1)
                 {
                     Task.Run(async () =>
                     {