Merge branch 'main' into asus-mouse-support

# Conflicts:
#	app/Settings.Designer.cs

app/AsusUSB.cs

@@ -1,4 +1,5 @@
-using HidLibrary;
+using GHelper.Helpers;
+using HidLibrary;
 using System.Text;
 
 namespace GHelper
@@ -50,6 +51,7 @@ namespace GHelper
 
     public static class AsusUSB
     {
+        public const int HEATMAP = 20;
 
         public const int ASUS_ID = 0x0b05;
 
@@ -73,6 +75,30 @@ namespace GHelper
         public static Color Color2 = Color.Black;
 
 
+        static System.Timers.Timer timer = new System.Timers.Timer(1000);
+        static HidDevice? auraDevice = null;
+
+        static AsusUSB()
+        {
+            timer.Elapsed += Timer_Elapsed;
+        }
+
+        private static void Timer_Elapsed(object? sender, System.Timers.ElapsedEventArgs e)
+        {
+            float cpuTemp = (float)HardwareControl.GetCPUTemp();
+            int freeze = 20, cold = 40, warm = 65, hot = 90;
+            Color color;
+
+            //Debug.WriteLine(cpuTemp);
+
+            if (cpuTemp < cold) color = ColorUtilities.GetWeightedAverage(Color.Blue, Color.Green, ((float)cpuTemp - freeze) / (cold - freeze));
+            else if (cpuTemp < warm) color = ColorUtilities.GetWeightedAverage(Color.Green, Color.Yellow, ((float)cpuTemp - cold) / (warm - cold));
+            else if (cpuTemp < hot) color = ColorUtilities.GetWeightedAverage(Color.Yellow, Color.Red, ((float)cpuTemp - warm) / (hot - warm));
+            else color = Color.Red;
+
+            ApplyColor(color);
+        }
+
         public static Dictionary<int, string> GetSpeeds()
         {
             return new Dictionary<int, string>
@@ -91,6 +117,7 @@ namespace GHelper
                 { 2, Properties.Strings.AuraColorCycle },
                 { 3, Properties.Strings.AuraRainbow },
                 { 10, Properties.Strings.AuraStrobe },
+                { HEATMAP, "Heatmap"}
             };
 
         static Dictionary<int, string> _modesStrix = new Dictionary<int, string>
@@ -107,6 +134,7 @@ namespace GHelper
                 { 10, Properties.Strings.AuraStrobe},
                 { 11, "Comet" },
                 { 12, "Flash" },
+                { HEATMAP, "Heatmap"}
             };
 
 
@@ -183,6 +211,7 @@ namespace GHelper
         }
 
 
+
         private static IEnumerable<HidDevice> GetHidDevices(int[] deviceIds, int minFeatures = 1)
         {
             HidDevice[] HidDeviceList = HidDevices.Enumerate(ASUS_ID, deviceIds).ToArray();
@@ -372,6 +401,37 @@ namespace GHelper
         }
 
 
+        static void GetAuraDevice()
+        {
+            var devices = GetHidDevices(deviceIds);
+            foreach (HidDevice device in devices)
+            {
+                device.OpenDevice();
+                if (device.ReadFeatureData(out byte[] data, AURA_HID_ID))
+                {
+                    auraDevice = device;
+                    return;
+                }
+                else
+                {
+                    device.CloseDevice();
+                }
+            }
+        }
+
+        public static void ApplyColor(Color color)
+        {
+            Task.Run(async () =>
+            {
+                if (auraDevice is null || !auraDevice.IsConnected) GetAuraDevice();
+                if (auraDevice is null || !auraDevice.IsConnected) return;
+                auraDevice.WriteFeatureData(AuraMessage(0, color, color, 0xf5));
+                auraDevice.WriteFeatureData(MESSAGE_SET);
+                //auraDevice.WriteFeatureData(MESSAGE_APPLY);
+            });
+        }
+
+
         public static void ApplyAura()
         {
 
@@ -380,6 +440,16 @@ namespace GHelper
             SetColor(AppConfig.Get("aura_color"));
             SetColor2(AppConfig.Get("aura_color2"));
 
+            if (Mode == HEATMAP)
+            {
+                timer.Enabled = true;
+                return;
+            }
+            else
+            {
+                timer.Enabled = false;
+            }
+
             Task.Run(async () =>
             {
 

app/HardwareControl.cs

@@ -24,6 +24,8 @@ public static class HardwareControl
 
     public static int? gpuUse;
 
+    static long lastUpdate;
+
     public static int GetFanMax()
     {
         int max = 58;
@@ -170,15 +172,10 @@ public static class HardwareControl
         return health;
     }
 
-    public static void ReadSensors()
-    {
-        batteryRate = 0;
-        gpuTemp = -1;
-        gpuUse = -1;
+    public static float? GetCPUTemp() {
 
-        cpuFan = FormatFan(Program.acpi.DeviceGet(AsusACPI.CPU_Fan));
-        gpuFan = FormatFan(Program.acpi.DeviceGet(AsusACPI.GPU_Fan));
-        midFan = FormatFan(Program.acpi.DeviceGet(AsusACPI.Mid_Fan));
+        if (Math.Abs(DateTimeOffset.Now.ToUnixTimeMilliseconds() - lastUpdate) < 1000) return cpuTemp;
+        lastUpdate = DateTimeOffset.Now.ToUnixTimeMilliseconds();
 
         cpuTemp = Program.acpi.DeviceGet(AsusACPI.Temp_CPU);
 
@@ -194,6 +191,22 @@ public static class HardwareControl
                 Debug.WriteLine("Failed reading CPU temp :" + ex.Message);
             }
 
+        return cpuTemp;
+    }
+
+
+    public static void ReadSensors()
+    {
+        batteryRate = 0;
+        gpuTemp = -1;
+        gpuUse = -1;
+
+        cpuFan = FormatFan(Program.acpi.DeviceGet(AsusACPI.CPU_Fan));
+        gpuFan = FormatFan(Program.acpi.DeviceGet(AsusACPI.GPU_Fan));
+        midFan = FormatFan(Program.acpi.DeviceGet(AsusACPI.Mid_Fan));
+
+        cpuTemp = GetCPUTemp();
+
         try
         {
             gpuTemp = GpuControl?.GetCurrentTemperature();

app/Helpers/ColorUtilities.cs

@@ -0,0 +1,21 @@
+namespace GHelper.Helpers
+{
+    public class ColorUtilities
+    {
+        // Method to get the weighted average between two colors
+        public static Color GetWeightedAverage(Color color1, Color color2, float weight)
+        {
+
+            int red = (int)Math.Round(color1.R * (1 - weight) + color2.R * weight);
+            int green = (int)Math.Round(color1.G * (1 - weight) + color2.G * weight);
+            int blue = (int)Math.Round(color1.B * (1 - weight) + color2.B * weight);
+
+            red = Math.Min(255, Math.Max(0, red));
+            green = Math.Min(255, Math.Max(0, green));
+            blue = Math.Min(255, Math.Max(0, blue));
+
+            return Color.FromArgb(red, green, blue);
+        }
+    }
+
+}

app/Properties/Strings.ro.resx

@@ -151,22 +151,22 @@
     <value>Aplică</value>
   </data>
   <data name="ApplyFanCurve" xml:space="preserve">
-    <value>Apply Custom Fan Curve</value>
+    <value>Aplicați curba personalizată</value>
   </data>
   <data name="ApplyPowerLimits" xml:space="preserve">
     <value>Aplică limitele de putere</value>
   </data>
   <data name="ApplyWindowsPowerPlan" xml:space="preserve">
-    <value>Auto adjust Windows Power Modes</value>
+    <value>Reglare automată a modului de alimentare Windows</value>
   </data>
   <data name="AsusServicesRunning" xml:space="preserve">
-    <value>Asus Services Running</value>
+    <value>Servicii Asus în derulare</value>
   </data>
   <data name="AuraBreathe" xml:space="preserve">
-    <value>Breathe</value>
+    <value>Respirație</value>
   </data>
   <data name="AuraColorCycle" xml:space="preserve">
-    <value>Color Cycle</value>
+    <value>Ciclu de culori</value>
   </data>
   <data name="AuraFast" xml:space="preserve">
     <value>Rapid</value>
@@ -184,7 +184,7 @@
     <value>Static</value>
   </data>
   <data name="AuraStrobe" xml:space="preserve">
-    <value>Strobe</value>
+    <value>Stroboscop</value>
   </data>
   <data name="AutoApply" xml:space="preserve">
     <value>Aplicare automată</value>
@@ -193,46 +193,46 @@
     <value>Automat</value>
   </data>
   <data name="AutoRefreshTooltip" xml:space="preserve">
-    <value>Sets 60Hz to save battery, and back when plugged</value>
+    <value>Setează ecranul la 60Hz pentru a economisi bateria, și înapoi cât se încarcă</value>
   </data>
   <data name="Awake" xml:space="preserve">
-    <value>Awake</value>
+    <value>Treaz</value>
   </data>
   <data name="BacklightTimeout" xml:space="preserve">
-    <value>Timeout plugged / on battery (0 - ON)</value>
+    <value>Timeout conectat / folosind bateria (0 - ON)</value>
   </data>
   <data name="Balanced" xml:space="preserve">
     <value>Echilibrat</value>
   </data>
   <data name="BatteryChargeLimit" xml:space="preserve">
-    <value>Battery Charge Limit</value>
+    <value>Limita de încărcare a bateriei</value>
   </data>
   <data name="BatteryHealth" xml:space="preserve">
-    <value>Battery Health</value>
+    <value>Sănătatea bateriei</value>
   </data>
   <data name="BiosAndDriverUpdates" xml:space="preserve">
-    <value>BIOS and Driver Updates</value>
+    <value>Actualizări BIOS și Driver</value>
   </data>
   <data name="Boot" xml:space="preserve">
-    <value>Boot</value>
+    <value>Pornire</value>
   </data>
   <data name="Brightness" xml:space="preserve">
     <value>Luminozitate</value>
   </data>
   <data name="BrightnessDown" xml:space="preserve">
-    <value>Brightness Down</value>
+    <value>Scăderea luminozității</value>
   </data>
   <data name="BrightnessUp" xml:space="preserve">
-    <value>Brightness Up</value>
+    <value>Mărirea luminozității</value>
   </data>
   <data name="Charging" xml:space="preserve">
-    <value>Charging</value>
+    <value>Se încarcă</value>
   </data>
   <data name="Color" xml:space="preserve">
     <value>Culoare</value>
   </data>
   <data name="CPUBoost" xml:space="preserve">
-    <value>CPU Boost</value>
+    <value>Accelerare CPU</value>
   </data>
   <data name="Custom" xml:space="preserve">
     <value>Personalizat</value>
@@ -241,7 +241,7 @@
     <value>Implicit</value>
   </data>
   <data name="DisableOverdrive" xml:space="preserve">
-    <value>Disable screen overdrive</value>
+    <value>Dezactivează screen overdrive</value>
   </data>
   <data name="Discharging" xml:space="preserve">
     <value>Se descarcă</value>
@@ -250,21 +250,21 @@
     <value>Descărcați actualizarea</value>
   </data>
   <data name="DriverAndSoftware" xml:space="preserve">
-    <value>Drivers and Software</value>
+    <value>Drivers și Aplicații</value>
   </data>
   <data name="EcoGPUTooltip" xml:space="preserve">
-    <value>Disables dGPU to save battery</value>
+    <value>Dezactivează dGPU pentru a economisi bateria</value>
   </data>
   <data name="EcoMode" xml:space="preserve">
     <value>Eco</value>
   </data>
   <data name="EnableOptimusText" xml:space="preserve">
-    <value>Disabling the dGPU by going into Eco mode while Display Mode in NVIDIA Control Panel is not set to Optimus might cause problems with brightness controls until after the next reboot. 
+    <value>Dezactivarea dGPU pentru a utiliza modul Eco, în timp ce Display Mode în NVIDIA Control Panel nu este setat la modul Optimus, poate cauza probleme cu controalele de luminozitate până la următoarea repornire. 
 
-Do you still want to continue?</value>
+Încă mai vrei să continui?</value>
   </data>
   <data name="EnableOptimusTitle" xml:space="preserve">
-    <value>NVIDIA Display Mode is not set to Optimus</value>
+    <value>NVIDIA Display Mode nu este setat la modul Optimus</value>
   </data>
   <data name="Extra" xml:space="preserve">
     <value>Extra</value>
@@ -276,37 +276,37 @@ Do you still want to continue?</value>
     <value>Setările implicite ale fabricii</value>
   </data>
   <data name="FanCurves" xml:space="preserve">
-    <value>Fan Curves</value>
+    <value>Curbe ventilator</value>
   </data>
   <data name="FanProfileCPU" xml:space="preserve">
-    <value>CPU Fan Profile</value>
+    <value>Profil ventilator CPU</value>
   </data>
   <data name="FanProfileGPU" xml:space="preserve">
-    <value>GPU Fan Profile</value>
+    <value>Profil ventilator GPU</value>
   </data>
   <data name="FanProfileMid" xml:space="preserve">
-    <value>Mid Fan Profile</value>
+    <value>Profil mediu ventilator</value>
   </data>
   <data name="FanProfiles" xml:space="preserve">
-    <value>Fan Profiles</value>
+    <value>Profiluri ventilatoare</value>
   </data>
   <data name="FansAndPower" xml:space="preserve">
-    <value>Fans and Power</value>
+    <value>Vent. și putere</value>
   </data>
   <data name="FanSpeed" xml:space="preserve">
-    <value>Fan</value>
+    <value>Vent</value>
   </data>
   <data name="FansPower" xml:space="preserve">
     <value>Fans + Power</value>
   </data>
   <data name="FnLock" xml:space="preserve">
-    <value>Process Fn+F hotkeys without Fn</value>
+    <value>Procesează tastele Fn+F fără Fn</value>
   </data>
   <data name="GPUBoost" xml:space="preserve">
     <value>Dynamic Boost</value>
   </data>
   <data name="GPUChanging" xml:space="preserve">
-    <value>Changing</value>
+    <value>Modificare</value>
   </data>
   <data name="GPUCoreClockOffset" xml:space="preserve">
     <value>Core Clock Offset</value>
@@ -315,40 +315,40 @@ Do you still want to continue?</value>
     <value>Memory Clock Offset</value>
   </data>
   <data name="GPUMode" xml:space="preserve">
-    <value>GPU Mode</value>
+    <value>Modul GPU</value>
   </data>
   <data name="GPUModeEco" xml:space="preserve">
-    <value>iGPU only</value>
+    <value>Doar iGPU</value>
   </data>
   <data name="GPUModeStandard" xml:space="preserve">
     <value>iGPU + dGPU</value>
   </data>
   <data name="GPUModeUltimate" xml:space="preserve">
-    <value>dGPU exclusive</value>
+    <value>exclusiv dGPU</value>
   </data>
   <data name="GPUSettings" xml:space="preserve">
-    <value>GPU Settings</value>
+    <value>Setări GPU</value>
   </data>
   <data name="GPUTempTarget" xml:space="preserve">
-    <value>Temperature Target</value>
+    <value>Temperatura țintă</value>
   </data>
   <data name="KeyBindings" xml:space="preserve">
-    <value>Key Bindings</value>
+    <value>Asocieri taste</value>
   </data>
   <data name="Keyboard" xml:space="preserve">
     <value>Tastatură</value>
   </data>
   <data name="KillGpuApps" xml:space="preserve">
-    <value>Stop all apps using GPU when switching to Eco</value>
+    <value>Opriți toate aplicațiile care folosesc GPU când treceți în modul Eco</value>
   </data>
   <data name="LaptopBacklight" xml:space="preserve">
-    <value>Laptop Backlight</value>
+    <value>Lumina de fundal</value>
   </data>
   <data name="LaptopKeyboard" xml:space="preserve">
-    <value>Laptop Keyboard</value>
+    <value>Tastatură Laptop</value>
   </data>
   <data name="LaptopScreen" xml:space="preserve">
-    <value>Laptop Screen</value>
+    <value>Ecran Laptop</value>
   </data>
   <data name="Lid" xml:space="preserve">
     <value>Lid</value>
@@ -360,13 +360,13 @@ Do you still want to continue?</value>
     <value>Logo-ul</value>
   </data>
   <data name="MatrixAudio" xml:space="preserve">
-    <value>Audio Visualizer</value>
+    <value>Vizualizator audio</value>
   </data>
   <data name="MatrixBanner" xml:space="preserve">
     <value>Binary Banner</value>
   </data>
   <data name="MatrixBright" xml:space="preserve">
-    <value>Bright</value>
+    <value>Luminos</value>
   </data>
   <data name="MatrixClock" xml:space="preserve">
     <value>Ceas</value>
@@ -381,22 +381,22 @@ Do you still want to continue?</value>
     <value>Mediu</value>
   </data>
   <data name="MatrixOff" xml:space="preserve">
-    <value>Off</value>
+    <value>Oprit</value>
   </data>
   <data name="MatrixPicture" xml:space="preserve">
-    <value>Picture</value>
+    <value>Imagine</value>
   </data>
   <data name="MaxRefreshTooltip" xml:space="preserve">
-    <value>Max refresh rate for lower latency</value>
+    <value>Valoare maximă refresh rate pentru latență mai mică</value>
   </data>
   <data name="MinRefreshTooltip" xml:space="preserve">
-    <value>60Hz refresh rate to save battery</value>
+    <value>60Hz refresh rate pentru a economisi bateria</value>
   </data>
   <data name="Multizone" xml:space="preserve">
     <value>Multizone</value>
   </data>
   <data name="MuteMic" xml:space="preserve">
-    <value>Mute Mic</value>
+    <value>Oprire microfon</value>
   </data>
   <data name="NewUpdates" xml:space="preserve">
     <value>Actualizări noi</value>
@@ -405,70 +405,70 @@ Do you still want to continue?</value>
     <value>Nu există actualizări noi</value>
   </data>
   <data name="OpenGHelper" xml:space="preserve">
-    <value>Open G-Helper window</value>
+    <value>Deschide fereastra G-Helper</value>
   </data>
   <data name="Optimized" xml:space="preserve">
-    <value>Optimized</value>
+    <value>Optimizat</value>
   </data>
   <data name="OptimizedGPUTooltip" xml:space="preserve">
-    <value>Switch to Eco on battery and to Standard when plugged</value>
+    <value>Schimbă la modul Eco pe baterie și la Standard când este conectat</value>
   </data>
   <data name="OptimizedUSBC" xml:space="preserve">
-    <value>Keep GPU disabled on USB-C charger in Optimized mode</value>
+    <value>Păstraţi GPU dezactivat când încărcătorul USB-C e folosit în modul Optimized</value>
   </data>
   <data name="Other" xml:space="preserve">
-    <value>Other</value>
+    <value>Altele</value>
   </data>
   <data name="Overdrive" xml:space="preserve">
     <value>Overdrive</value>
   </data>
   <data name="PerformanceMode" xml:space="preserve">
-    <value>Mode</value>
+    <value>Mod</value>
   </data>
   <data name="PictureGif" xml:space="preserve">
-    <value>Picture / Gif</value>
+    <value>Poză / Gif</value>
   </data>
   <data name="PlayPause" xml:space="preserve">
-    <value>Play / Pause</value>
+    <value>Redare / Pauză</value>
   </data>
   <data name="PowerLimits" xml:space="preserve">
-    <value>Power Limits</value>
+    <value>Limite de putere</value>
   </data>
   <data name="PPTExperimental" xml:space="preserve">
-    <value>Power Limits is an experimental feature. Use carefully and at your own risk!</value>
+    <value>Limitele de putere sunt o funcție experimentală. Folosiți cu atenție și pe propriul risc!</value>
   </data>
   <data name="PrintScreen" xml:space="preserve">
     <value>PrintScreen</value>
   </data>
   <data name="Quit" xml:space="preserve">
-    <value>Quit</value>
+    <value>Închide</value>
   </data>
   <data name="RestartGPU" xml:space="preserve">
-    <value>Something is using dGPU and preventing Eco mode. Restart dGPU in device manager? * Please proceed at your own risk.</value>
+    <value>O aplicație folosește dGPU și previne pornirea modului Eco. Reporniți dGPU în device manager? * Continuați pe propriul risc.</value>
   </data>
   <data name="RPM" xml:space="preserve">
     <value>RPM</value>
   </data>
   <data name="RunOnStartup" xml:space="preserve">
-    <value>Run on Startup</value>
+    <value>Rulează la pornirea sistemului</value>
   </data>
   <data name="ScreenPadDown" xml:space="preserve">
-    <value>Screenpad Brightness Down</value>
+    <value>Scade luminozitate Screenpad</value>
   </data>
   <data name="ScreenPadUp" xml:space="preserve">
-    <value>Screenpad Brightness Up</value>
+    <value>Mărește luminozitate Screenpad</value>
   </data>
   <data name="Shutdown" xml:space="preserve">
-    <value>Shutdown</value>
+    <value>Oprire</value>
   </data>
   <data name="Silent" xml:space="preserve">
-    <value>Silent</value>
+    <value>Silențios</value>
   </data>
   <data name="Sleep" xml:space="preserve">
-    <value>Sleep</value>
+    <value>Somn</value>
   </data>
   <data name="StandardGPUTooltip" xml:space="preserve">
-    <value>Enables dGPU for standard use</value>
+    <value>Activează dGPU pentru uz standard</value>
   </data>
   <data name="StandardMode" xml:space="preserve">
     <value>Standard</value>
@@ -477,69 +477,69 @@ Do you still want to continue?</value>
     <value>Start</value>
   </data>
   <data name="StartingServices" xml:space="preserve">
-    <value>Starting Services</value>
+    <value>Se pornesc serviciile</value>
   </data>
   <data name="StartupError" xml:space="preserve">
-    <value>Startup Error</value>
+    <value>Eroare la Pornire</value>
   </data>
   <data name="Stop" xml:space="preserve">
     <value>Stop</value>
   </data>
   <data name="StopGPUApps" xml:space="preserve">
-    <value>Stop GPU Applications</value>
+    <value>Oprește aplicațiile care folosesc GPU</value>
   </data>
   <data name="StoppingServices" xml:space="preserve">
-    <value>Stopping Services</value>
+    <value>Se opresc serviciile</value>
   </data>
   <data name="ToggleAura" xml:space="preserve">
     <value>Toggle Aura</value>
   </data>
   <data name="ToggleClamshellMode" xml:space="preserve">
-    <value>Auto Toggle Clamshell Mode</value>
+    <value>Auto Toggle Mod Clamshell</value>
   </data>
   <data name="ToggleFnLock" xml:space="preserve">
     <value>Toggle Fn-Lock</value>
   </data>
   <data name="ToggleMiniled" xml:space="preserve">
-    <value>Toggle Miniled (if supported)</value>
+    <value>Toggle Miniled (dacă e suportat)</value>
   </data>
   <data name="ToggleScreen" xml:space="preserve">
-    <value>Toggle Screen</value>
+    <value>Toggle Ecran</value>
   </data>
   <data name="Turbo" xml:space="preserve">
     <value>Turbo</value>
   </data>
   <data name="TurnedOff" xml:space="preserve">
-    <value>Turned off</value>
+    <value>Dezactivat</value>
   </data>
   <data name="TurnOffOnBattery" xml:space="preserve">
-    <value>Turn off on battery</value>
+    <value>Dezactivează când bateria e folosită</value>
   </data>
   <data name="UltimateGPUTooltip" xml:space="preserve">
-    <value>Routes laptop screen to dGPU, maximizing FPS</value>
+    <value>Rutează ecranul laptop-ului spre dGPU, maximizând FPS</value>
   </data>
   <data name="UltimateMode" xml:space="preserve">
     <value>Ultimate</value>
   </data>
   <data name="UndervoltingRisky" xml:space="preserve">
-    <value>Undervolting is an experimental and risky feature. If applied values are too low for your hardware, it can become unstable, shut down or cause data corruption. If you want to try - start from small values first, click Apply and test what works for you.</value>
+    <value>Undervolting este o funcțiune experimentală și riscantă. Dacă valorile aplicate sunt prea mici pentru hardware-ul dumneavoastră, acesta poate deveni instabil, a se opri sau să corupă datele. Dacă vrei să încerci - mai întâi începe de la valori mici, apasă Aplică și testează ce funcționează pentru tine.</value>
   </data>
   <data name="Updates" xml:space="preserve">
-    <value>Updates</value>
+    <value>Actualizări</value>
   </data>
   <data name="VersionLabel" xml:space="preserve">
-    <value>Version</value>
+    <value>Versiune</value>
   </data>
   <data name="VolumeDown" xml:space="preserve">
-    <value>Volume Down</value>
+    <value>Buton scădere volum</value>
   </data>
   <data name="VolumeMute" xml:space="preserve">
-    <value>Volume Mute</value>
+    <value>Buton dezactivare sunet</value>
   </data>
   <data name="VolumeUp" xml:space="preserve">
-    <value>Volume Up</value>
+    <value>Buton mărire volum</value>
   </data>
   <data name="WindowTop" xml:space="preserve">
-    <value>Keep app window always on top</value>
+    <value>Păstrează aplicația mereu deasupra</value>
   </data>
 </root>

app/Settings.Designer.cs

@@ -47,7 +47,6 @@ namespace GHelper
             labelBatteryTitle = new Label();
             panelFooter = new Panel();
             tableButtons = new TableLayoutPanel();
-            buttonKeyboard = new RButton();
             buttonUpdates = new RButton();
             buttonQuit = new RButton();
             checkStartup = new CheckBox();
@@ -87,6 +86,7 @@ namespace GHelper
             labelSreen = new Label();
             panelKeyboard = new Panel();
             tableLayoutKeyboard = new TableLayoutPanel();
+            buttonKeyboard = new RButton();
             panelColor = new Panel();
             pictureColor2 = new PictureBox();
             pictureColor = new PictureBox();
@@ -148,11 +148,11 @@ namespace GHelper
             panelMatrix.Controls.Add(panelMatrixTitle);
             panelMatrix.Controls.Add(checkMatrix);
             panelMatrix.Dock = DockStyle.Top;
-            panelMatrix.Location = new Point(8, 675);
+            panelMatrix.Location = new Point(8, 568);
             panelMatrix.Margin = new Padding(0);
             panelMatrix.Name = "panelMatrix";
             panelMatrix.Padding = new Padding(15, 15, 15, 8);
-            panelMatrix.Size = new Size(621, 130);
+            panelMatrix.Size = new Size(621, 149);
             panelMatrix.TabIndex = 4;
             // 
             // tableLayoutMatrix
@@ -173,7 +173,7 @@ namespace GHelper
             tableLayoutMatrix.Name = "tableLayoutMatrix";
             tableLayoutMatrix.RowCount = 1;
             tableLayoutMatrix.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
-            tableLayoutMatrix.Size = new Size(591, 47);
+            tableLayoutMatrix.Size = new Size(591, 60);
             tableLayoutMatrix.TabIndex = 43;
             // 
             // comboMatrix
@@ -215,11 +215,11 @@ namespace GHelper
             buttonMatrix.Dock = DockStyle.Top;
             buttonMatrix.FlatAppearance.BorderSize = 0;
             buttonMatrix.FlatStyle = FlatStyle.Flat;
-            buttonMatrix.Location = new Point(397, 6);
-            buttonMatrix.Margin = new Padding(3, 6, 3, 6);
+            buttonMatrix.Location = new Point(398, 6);
+            buttonMatrix.Margin = new Padding(4, 6, 4, 6);
             buttonMatrix.Name = "buttonMatrix";
             buttonMatrix.Secondary = true;
-            buttonMatrix.Size = new Size(191, 33);
+            buttonMatrix.Size = new Size(189, 48);
             buttonMatrix.TabIndex = 18;
             buttonMatrix.Text = Properties.Strings.PictureGif;
             buttonMatrix.UseVisualStyleBackColor = false;
@@ -259,7 +259,7 @@ namespace GHelper
             // 
             checkMatrix.AutoSize = true;
             checkMatrix.ForeColor = SystemColors.GrayText;
-            checkMatrix.Location = new Point(20, 90);
+            checkMatrix.Location = new Point(20, 109);
             checkMatrix.Margin = new Padding(6, 3, 6, 3);
             checkMatrix.Name = "checkMatrix";
             checkMatrix.Size = new Size(188, 29);
@@ -274,7 +274,7 @@ namespace GHelper
             panelBattery.Controls.Add(sliderBattery);
             panelBattery.Controls.Add(panelBatteryTitle);
             panelBattery.Dock = DockStyle.Top;
-            panelBattery.Location = new Point(8, 959);
+            panelBattery.Location = new Point(8, 991);
             panelBattery.Margin = new Padding(0);
             panelBattery.Name = "panelBattery";
             panelBattery.Padding = new Padding(15, 15, 15, 5);
@@ -345,7 +345,7 @@ namespace GHelper
             panelFooter.AutoSizeMode = AutoSizeMode.GrowAndShrink;
             panelFooter.Controls.Add(tableButtons);
             panelFooter.Dock = DockStyle.Top;
-            panelFooter.Location = new Point(8, 1084);
+            panelFooter.Location = new Point(8, 1116);
             panelFooter.Margin = new Padding(0);
             panelFooter.Name = "panelFooter";
             panelFooter.Padding = new Padding(20);
@@ -355,14 +355,13 @@ namespace GHelper
             // tableButtons
             // 
             tableButtons.AutoSize = true;
-            tableButtons.ColumnCount = 4;
+            tableButtons.ColumnCount = 3;
             tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F));
             tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F));
-            tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 8.33083248F));
-            tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25.0024986F));
-            tableButtons.Controls.Add(buttonKeyboard, 0, 0);
-            tableButtons.Controls.Add(buttonUpdates, 1, 0);
-            tableButtons.Controls.Add(buttonQuit, 3, 0);
+            tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F));
+            tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 20F));
+            tableButtons.Controls.Add(buttonUpdates, 0, 0);
+            tableButtons.Controls.Add(buttonQuit, 2, 0);
             tableButtons.Dock = DockStyle.Top;
             tableButtons.Location = new Point(20, 20);
             tableButtons.Name = "tableButtons";
@@ -371,28 +370,6 @@ namespace GHelper
             tableButtons.Size = new Size(581, 58);
             tableButtons.TabIndex = 25;
             // 
-            // buttonKeyboard
-            // 
-            buttonKeyboard.AccessibleName = "Extra Settings";
-            buttonKeyboard.Activated = false;
-            buttonKeyboard.BackColor = SystemColors.ControlLight;
-            buttonKeyboard.BorderColor = Color.Transparent;
-            buttonKeyboard.BorderRadius = 2;
-            buttonKeyboard.Dock = DockStyle.Top;
-            buttonKeyboard.FlatAppearance.BorderSize = 0;
-            buttonKeyboard.FlatStyle = FlatStyle.Flat;
-            buttonKeyboard.Image = Properties.Resources.icons8_settings_32;
-            buttonKeyboard.ImageAlign = ContentAlignment.MiddleRight;
-            buttonKeyboard.Location = new Point(4, 4);
-            buttonKeyboard.Margin = new Padding(4);
-            buttonKeyboard.Name = "buttonKeyboard";
-            buttonKeyboard.Secondary = true;
-            buttonKeyboard.Size = new Size(185, 50);
-            buttonKeyboard.TabIndex = 24;
-            buttonKeyboard.Text = Properties.Strings.Extra;
-            buttonKeyboard.TextImageRelation = TextImageRelation.ImageBeforeText;
-            buttonKeyboard.UseVisualStyleBackColor = false;
-            // 
             // buttonUpdates
             // 
             buttonUpdates.AccessibleName = "BIOS and Driver Updates";
@@ -404,12 +381,12 @@ namespace GHelper
             buttonUpdates.FlatStyle = FlatStyle.Flat;
             buttonUpdates.Image = Properties.Resources.icons8_software_32_white;
             buttonUpdates.ImageAlign = ContentAlignment.MiddleRight;
-            buttonUpdates.Location = new Point(197, 4);
+            buttonUpdates.Location = new Point(4, 4);
             buttonUpdates.Margin = new Padding(4);
             buttonUpdates.Name = "buttonUpdates";
             buttonUpdates.Secondary = true;
             buttonUpdates.Size = new Size(185, 50);
-            buttonUpdates.TabIndex = 22;
+            buttonUpdates.TabIndex = 24;
             buttonUpdates.Text = "Updates";
             buttonUpdates.TextImageRelation = TextImageRelation.ImageBeforeText;
             buttonUpdates.UseVisualStyleBackColor = false;
@@ -423,19 +400,22 @@ namespace GHelper
             buttonQuit.BorderRadius = 2;
             buttonQuit.Dock = DockStyle.Top;
             buttonQuit.FlatStyle = FlatStyle.Flat;
-            buttonQuit.Location = new Point(580, 4);
+            buttonQuit.Image = Properties.Resources.icons8_quit_32;
+            buttonQuit.Location = new Point(390, 4);
             buttonQuit.Margin = new Padding(4);
             buttonQuit.Name = "buttonQuit";
             buttonQuit.Secondary = true;
             buttonQuit.Size = new Size(187, 50);
             buttonQuit.TabIndex = 23;
             buttonQuit.Text = "Quit";
+            buttonQuit.TextAlign = ContentAlignment.MiddleRight;
+            buttonQuit.TextImageRelation = TextImageRelation.ImageBeforeText;
             buttonQuit.UseVisualStyleBackColor = false;
             // 
             // checkStartup
             // 
             checkStartup.AutoSize = true;
-            checkStartup.Location = new Point(27, 12);
+            checkStartup.Location = new Point(27, 8);
             checkStartup.Margin = new Padding(8, 4, 8, 4);
             checkStartup.Name = "checkStartup";
             checkStartup.Size = new Size(157, 29);
@@ -1010,11 +990,11 @@ namespace GHelper
             panelKeyboard.Controls.Add(tableLayoutKeyboard);
             panelKeyboard.Controls.Add(panelKeyboardTitle);
             panelKeyboard.Dock = DockStyle.Top;
-            panelKeyboard.Location = new Point(8, 568);
+            panelKeyboard.Location = new Point(8, 717);
             panelKeyboard.Margin = new Padding(0);
             panelKeyboard.Name = "panelKeyboard";
             panelKeyboard.Padding = new Padding(15);
-            panelKeyboard.Size = new Size(621, 107);
+            panelKeyboard.Size = new Size(621, 120);
             panelKeyboard.TabIndex = 3;
             // 
             // tableLayoutKeyboard
@@ -1025,6 +1005,7 @@ namespace GHelper
             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.Dock = DockStyle.Top;
@@ -1033,9 +1014,31 @@ namespace GHelper
             tableLayoutKeyboard.Name = "tableLayoutKeyboard";
             tableLayoutKeyboard.RowCount = 1;
             tableLayoutKeyboard.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
-            tableLayoutKeyboard.Size = new Size(591, 47);
+            tableLayoutKeyboard.Size = new Size(591, 60);
             tableLayoutKeyboard.TabIndex = 39;
             // 
+            // buttonKeyboard
+            // 
+            buttonKeyboard.AccessibleName = "Extra Settings";
+            buttonKeyboard.Activated = false;
+            buttonKeyboard.BackColor = SystemColors.ControlLight;
+            buttonKeyboard.BorderColor = Color.Transparent;
+            buttonKeyboard.BorderRadius = 2;
+            buttonKeyboard.Dock = DockStyle.Top;
+            buttonKeyboard.FlatAppearance.BorderSize = 0;
+            buttonKeyboard.FlatStyle = FlatStyle.Flat;
+            buttonKeyboard.Image = Properties.Resources.icons8_settings_32;
+            buttonKeyboard.ImageAlign = ContentAlignment.MiddleRight;
+            buttonKeyboard.Location = new Point(398, 6);
+            buttonKeyboard.Margin = new Padding(4, 6, 4, 6);
+            buttonKeyboard.Name = "buttonKeyboard";
+            buttonKeyboard.Secondary = true;
+            buttonKeyboard.Size = new Size(189, 48);
+            buttonKeyboard.TabIndex = 37;
+            buttonKeyboard.Text = Properties.Strings.Extra;
+            buttonKeyboard.TextImageRelation = TextImageRelation.ImageBeforeText;
+            buttonKeyboard.UseVisualStyleBackColor = false;
+            // 
             // panelColor
             // 
             panelColor.AutoSize = true;
@@ -1043,16 +1046,16 @@ namespace GHelper
             panelColor.Controls.Add(pictureColor);
             panelColor.Controls.Add(buttonKeyboardColor);
             panelColor.Dock = DockStyle.Fill;
-            panelColor.Location = new Point(200, 6);
-            panelColor.Margin = new Padding(3, 6, 3, 6);
+            panelColor.Location = new Point(201, 6);
+            panelColor.Margin = new Padding(4, 6, 4, 6);
             panelColor.Name = "panelColor";
-            panelColor.Size = new Size(191, 35);
+            panelColor.Size = new Size(189, 48);
             panelColor.TabIndex = 36;
             // 
             // pictureColor2
             // 
             pictureColor2.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            pictureColor2.Location = new Point(146, 9);
+            pictureColor2.Location = new Point(136, 20);
             pictureColor2.Margin = new Padding(6);
             pictureColor2.Name = "pictureColor2";
             pictureColor2.Size = new Size(15, 15);
@@ -1062,7 +1065,7 @@ namespace GHelper
             // pictureColor
             // 
             pictureColor.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            pictureColor.Location = new Point(164, 9);
+            pictureColor.Location = new Point(154, 20);
             pictureColor.Margin = new Padding(6);
             pictureColor.Name = "pictureColor";
             pictureColor.Size = new Size(15, 15);
@@ -1080,10 +1083,10 @@ namespace GHelper
             buttonKeyboardColor.FlatStyle = FlatStyle.Flat;
             buttonKeyboardColor.ForeColor = SystemColors.ControlText;
             buttonKeyboardColor.Location = new Point(0, 0);
-            buttonKeyboardColor.Margin = new Padding(3, 6, 3, 6);
+            buttonKeyboardColor.Margin = new Padding(4);
             buttonKeyboardColor.Name = "buttonKeyboardColor";
             buttonKeyboardColor.Secondary = false;
-            buttonKeyboardColor.Size = new Size(191, 33);
+            buttonKeyboardColor.Size = new Size(189, 48);
             buttonKeyboardColor.TabIndex = 14;
             buttonKeyboardColor.Text = Properties.Strings.Color;
             buttonKeyboardColor.UseVisualStyleBackColor = false;
@@ -1155,7 +1158,7 @@ namespace GHelper
             panelVersion.Controls.Add(labelVersion);
             panelVersion.Controls.Add(checkStartup);
             panelVersion.Dock = DockStyle.Top;
-            panelVersion.Location = new Point(8, 1042);
+            panelVersion.Location = new Point(8, 1074);
             panelVersion.Name = "panelVersion";
             panelVersion.Size = new Size(621, 42);
             panelVersion.TabIndex = 6;
@@ -1167,7 +1170,7 @@ namespace GHelper
             panelPeripherals.Controls.Add(tableLayoutPeripherals);
             panelPeripherals.Controls.Add(panelPeripheralsTile);
             panelPeripherals.Dock = DockStyle.Top;
-            panelPeripherals.Location = new Point(8, 805);
+            panelPeripherals.Location = new Point(8, 837);
             panelPeripherals.Margin = new Padding(0);
             panelPeripherals.Name = "panelPeripherals";
             panelPeripherals.Padding = new Padding(15, 15, 15, 8);
@@ -1309,8 +1312,8 @@ namespace GHelper
             Controls.Add(panelVersion);
             Controls.Add(panelBattery);
             Controls.Add(panelPeripherals);
-            Controls.Add(panelMatrix);
             Controls.Add(panelKeyboard);
+            Controls.Add(panelMatrix);
             Controls.Add(panelScreen);
             Controls.Add(panelGPU);
             Controls.Add(panelPerformance);
@@ -1416,7 +1419,6 @@ namespace GHelper
         private RButton buttonKeyboardColor;
         private RButton buttonFans;
         private Slider sliderBattery;
-        private RButton buttonUpdates;
         private Panel panelGPUTitle;
         private PictureBox pictureGPU;
         private Label labelGPU;
@@ -1442,6 +1444,8 @@ namespace GHelper
         private Panel panelVersion;
         private Label labelVersion;
         private RButton buttonStopGPU;
+        private TableLayoutPanel tableButtons;
+        private RButton buttonUpdates;
         private Panel panelPeripherals;
         private TableLayoutPanel tableLayoutPeripherals;
         private Panel panelPeripheralsTile;
@@ -1451,6 +1455,5 @@ namespace GHelper
         private RButton buttonPeripheral3;
         private RButton buttonPeripheral1;
         private RButton buttonKeyboard;
-        private TableLayoutPanel tableButtons;
     }
 }