From aefd29c4590e22fa056c8647a5f2648bd696833c Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Mon, 24 Jul 2023 21:45:16 +0200 Subject: [PATCH 1/5] New translations Strings.resx (Romanian) --- app/Properties/Strings.ro.resx | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/app/Properties/Strings.ro.resx b/app/Properties/Strings.ro.resx index 4dd75771..30af0895 100644 --- a/app/Properties/Strings.ro.resx +++ b/app/Properties/Strings.ro.resx @@ -151,22 +151,22 @@ Aplică - Apply Custom Fan Curve + Aplicați curba personalizată Aplică limitele de putere - Auto adjust Windows Power Modes + Reglare automată a modului de alimentare Windows - Asus Services Running + Servicii Asus în derulare - Breathe + Respirație - Color Cycle + Ciclu de culori Rapid @@ -184,7 +184,7 @@ Static - Strobe + Stroboscop Aplicare automată @@ -193,22 +193,22 @@ Automat - Sets 60Hz to save battery, and back when plugged + Setează ecranul la 60Hz pentru a economisi bateria, și înapoi cât se încarcă - Awake + Treaz - Timeout plugged / on battery (0 - ON) + Timeout conectat / folosind bateria (0 - ON) Echilibrat - Battery Charge Limit + Limita de încărcare a bateriei - Battery Health + Sănătatea bateriei BIOS and Driver Updates @@ -525,21 +525,21 @@ Do you still want to continue? 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. - Updates + Actualizări - Version + Versiune - Volume Down + Buton scădere volum - Volume Mute + Buton dezactivare sunet - Volume Up + Buton mărire volum - Keep app window always on top + Păstrează aplicația mereu deasupra \ No newline at end of file From c533511166ab0fd86c48f1e4387e39363c87bcbd Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Mon, 24 Jul 2023 22:48:30 +0200 Subject: [PATCH 2/5] New translations Strings.resx (Romanian) --- app/Properties/Strings.ro.resx | 136 ++++++++++++++++----------------- 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/app/Properties/Strings.ro.resx b/app/Properties/Strings.ro.resx index 30af0895..50e9f009 100644 --- a/app/Properties/Strings.ro.resx +++ b/app/Properties/Strings.ro.resx @@ -211,28 +211,28 @@ Sănătatea bateriei - BIOS and Driver Updates + Actualizări BIOS și Driver - Boot + Pornire Luminozitate - Brightness Down + Scăderea luminozității - Brightness Up + Mărirea luminozității - Charging + Se încarcă Culoare - CPU Boost + Accelerare CPU Personalizat @@ -241,7 +241,7 @@ Implicit - Disable screen overdrive + Dezactivează screen overdrive Se descarcă @@ -250,21 +250,21 @@ Descărcați actualizarea - Drivers and Software + Drivers și Aplicații - Disables dGPU to save battery + Dezactivează dGPU pentru a economisi bateria Eco - 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. + 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? +Încă mai vrei să continui? - NVIDIA Display Mode is not set to Optimus + NVIDIA Display Mode nu este setat la modul Optimus Extra @@ -276,37 +276,37 @@ Do you still want to continue? Setările implicite ale fabricii - Fan Curves + Curbele ventilatorului - CPU Fan Profile + Profil ventilator CPU - GPU Fan Profile + Profil ventilator GPU - Mid Fan Profile + Profil mediu ventilator - Fan Profiles + Profiluri ventilatoare - Fans and Power + Ventilatoare și energie - Fan + Ventilator Fans + Power - Process Fn+F hotkeys without Fn + Procesează tastele Fn+F fără Fn Dynamic Boost - Changing + Modificare Core Clock Offset @@ -315,40 +315,40 @@ Do you still want to continue? Memory Clock Offset - GPU Mode + Modul GPU - iGPU only + Doar iGPU iGPU + dGPU - dGPU exclusive + exclusiv dGPU - GPU Settings + Setări GPU - Temperature Target + Temperatura țintă - Key Bindings + Asocieri taste Tastatură - Stop all apps using GPU when switching to Eco + Opriți toate aplicațiile care folosesc GPU când treceți în modul Eco - Laptop Backlight + Lumina de fundal - Laptop Keyboard + Tastatură Laptop - Laptop Screen + Ecran Laptop Lid @@ -360,13 +360,13 @@ Do you still want to continue? Logo-ul - Audio Visualizer + Vizualizator audio Binary Banner - Bright + Luminos Ceas @@ -381,22 +381,22 @@ Do you still want to continue? Mediu - Off + Oprit - Picture + Imagine - Max refresh rate for lower latency + Valoare maximă refresh rate pentru latență mai mică - 60Hz refresh rate to save battery + 60Hz refresh rate pentru a economisi bateria Multizone - Mute Mic + Oprire microfon Actualizări noi @@ -405,70 +405,70 @@ Do you still want to continue? Nu există actualizări noi - Open G-Helper window + Deschide fereastra G-Helper - Optimized + Optimizat - Switch to Eco on battery and to Standard when plugged + Schimbă la modul Eco pe baterie și la Standard când este conectat - Keep GPU disabled on USB-C charger in Optimized mode + Păstraţi GPU dezactivat când încărcătorul USB-C e folosit în modul Optimized - Other + Altele Overdrive - Mode + Mod - Picture / Gif + Poză / Gif - Play / Pause + Redare / Pauză - Power Limits + Limite de putere - Power Limits is an experimental feature. Use carefully and at your own risk! + Limitele de putere sunt o funcție experimentală. Folosiți cu atenție și pe propriul risc! PrintScreen - Quit + Închide - Something is using dGPU and preventing Eco mode. Restart dGPU in device manager? * Please proceed at your own risk. + O aplicație folosește dGPU și previne pornirea modului Eco. Reporniți dGPU în device manager? * Continuați pe propriul risc. RPM - Run on Startup + Rulează la pornirea sistemului - Screenpad Brightness Down + Scade luminozitate Screenpad - Screenpad Brightness Up + Mărește luminozitate Screenpad - Shutdown + Oprire - Silent + Silențios - Sleep + Somn - Enables dGPU for standard use + Activează dGPU pentru uz standard Standard @@ -477,52 +477,52 @@ Do you still want to continue? Start - Starting Services + Se pornesc serviciile - Startup Error + Eroare la Pornire Stop - Stop GPU Applications + Oprește aplicațiile care folosesc GPU - Stopping Services + Se opresc serviciile Toggle Aura - Auto Toggle Clamshell Mode + Auto Toggle Mod Clamshell Toggle Fn-Lock - Toggle Miniled (if supported) + Toggle Miniled (dacă e suportat) - Toggle Screen + Toggle Ecran Turbo - Turned off + Dezactivat - Turn off on battery + Dezactivează când bateria e folosită - Routes laptop screen to dGPU, maximizing FPS + Rutează ecranul laptop-ului spre dGPU, maximizând FPS Ultimate - 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. + 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. Actualizări From 702e6ccb0af6f8fb22d4f40cd01c2f096981c344 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Tue, 25 Jul 2023 00:09:30 +0200 Subject: [PATCH 3/5] Added Heatmap backlight mode --- app/AsusUSB.cs | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/app/AsusUSB.cs b/app/AsusUSB.cs index 16c16247..32f4ff08 100644 --- a/app/AsusUSB.cs +++ b/app/AsusUSB.cs @@ -1,9 +1,28 @@ using HidLibrary; +using System.Diagnostics; using System.Text; namespace GHelper { + public class ColorUtilities + { + // Method to get the weighted average between two colors + public static Color GetWeightedAverage(Color color1, Color color2, double 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); + } + } + [Flags] public enum AuraDev19b6 : uint { @@ -50,6 +69,7 @@ namespace GHelper public static class AsusUSB { + public const int HEATMAP = 20; public const int ASUS_ID = 0x0b05; @@ -73,6 +93,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) + { + int cpuTemp = Program.acpi.DeviceGet(AsusACPI.Temp_CPU); + int freeze = 20, cold = 45, warm = 65, hot = 90; + Color color; + + //Debug.WriteLine(cpuTemp); + + if (cpuTemp < cold) color = color = ColorUtilities.GetWeightedAverage(Color.Blue, Color.Green, ((double)cpuTemp - freeze) / (cold - freeze)); + else if (cpuTemp < warm) color = ColorUtilities.GetWeightedAverage(Color.Green, Color.Yellow, ((double)cpuTemp - cold) / (warm - cold)); + else if (cpuTemp < hot) color = ColorUtilities.GetWeightedAverage(Color.Yellow, Color.Red, ((double)cpuTemp - warm) / (hot - warm)); + else color = Color.Red; + + ApplyColor(color); + } + public static Dictionary GetSpeeds() { return new Dictionary @@ -91,6 +135,7 @@ namespace GHelper { 2, Properties.Strings.AuraColorCycle }, { 3, Properties.Strings.AuraRainbow }, { 10, Properties.Strings.AuraStrobe }, + { HEATMAP, "Heatmap"} }; static Dictionary _modesStrix = new Dictionary @@ -107,6 +152,7 @@ namespace GHelper { 10, Properties.Strings.AuraStrobe}, { 11, "Comet" }, { 12, "Flash" }, + { HEATMAP, "Heatmap"} }; @@ -183,6 +229,7 @@ namespace GHelper } + private static IEnumerable GetHidDevices(int[] deviceIds, int minFeatures = 1) { HidDevice[] HidDeviceList = HidDevices.Enumerate(ASUS_ID, deviceIds).ToArray(); @@ -372,6 +419,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 +458,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 () => { From fab464feb5802ad57a55a8fd705471702c9a2214 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Tue, 25 Jul 2023 01:50:46 +0200 Subject: [PATCH 4/5] Heatmap --- app/AsusUSB.cs | 32 +++--------- app/HardwareControl.cs | 29 ++++++++--- app/Helpers/ColorUtilities.cs | 21 ++++++++ app/Settings.Designer.cs | 95 ++++++++++++++++++----------------- 4 files changed, 98 insertions(+), 79 deletions(-) create mode 100644 app/Helpers/ColorUtilities.cs diff --git a/app/AsusUSB.cs b/app/AsusUSB.cs index 32f4ff08..dbb9f3c5 100644 --- a/app/AsusUSB.cs +++ b/app/AsusUSB.cs @@ -1,28 +1,10 @@ -using HidLibrary; -using System.Diagnostics; +using GHelper.Helpers; +using HidLibrary; using System.Text; namespace GHelper { - public class ColorUtilities - { - // Method to get the weighted average between two colors - public static Color GetWeightedAverage(Color color1, Color color2, double 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); - } - } - [Flags] public enum AuraDev19b6 : uint { @@ -103,15 +85,15 @@ namespace GHelper private static void Timer_Elapsed(object? sender, System.Timers.ElapsedEventArgs e) { - int cpuTemp = Program.acpi.DeviceGet(AsusACPI.Temp_CPU); - int freeze = 20, cold = 45, warm = 65, hot = 90; + float cpuTemp = (float)HardwareControl.GetCPUTemp(); + int freeze = 20, cold = 40, warm = 65, hot = 90; Color color; //Debug.WriteLine(cpuTemp); - if (cpuTemp < cold) color = color = ColorUtilities.GetWeightedAverage(Color.Blue, Color.Green, ((double)cpuTemp - freeze) / (cold - freeze)); - else if (cpuTemp < warm) color = ColorUtilities.GetWeightedAverage(Color.Green, Color.Yellow, ((double)cpuTemp - cold) / (warm - cold)); - else if (cpuTemp < hot) color = ColorUtilities.GetWeightedAverage(Color.Yellow, Color.Red, ((double)cpuTemp - warm) / (hot - warm)); + 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); diff --git a/app/HardwareControl.cs b/app/HardwareControl.cs index 60beb671..92a64ee4 100644 --- a/app/HardwareControl.cs +++ b/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(); diff --git a/app/Helpers/ColorUtilities.cs b/app/Helpers/ColorUtilities.cs new file mode 100644 index 00000000..f6e8db78 --- /dev/null +++ b/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); + } + } + +} \ No newline at end of file diff --git a/app/Settings.Designer.cs b/app/Settings.Designer.cs index 06264065..5393777c 100644 --- a/app/Settings.Designer.cs +++ b/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(); @@ -136,7 +136,7 @@ namespace GHelper panelMatrix.Controls.Add(panelMatrixTitle); panelMatrix.Controls.Add(checkMatrix); panelMatrix.Dock = DockStyle.Top; - panelMatrix.Location = new Point(11, 898); + panelMatrix.Location = new Point(11, 758); panelMatrix.Margin = new Padding(0); panelMatrix.Name = "panelMatrix"; panelMatrix.Padding = new Padding(20, 20, 20, 11); @@ -203,11 +203,11 @@ namespace GHelper buttonMatrix.Dock = DockStyle.Top; buttonMatrix.FlatAppearance.BorderSize = 0; buttonMatrix.FlatStyle = FlatStyle.Flat; - buttonMatrix.Location = new Point(518, 8); - buttonMatrix.Margin = new Padding(4, 8, 4, 8); + buttonMatrix.Location = new Point(518, 6); + buttonMatrix.Margin = new Padding(4, 6, 4, 6); buttonMatrix.Name = "buttonMatrix"; buttonMatrix.Secondary = true; - buttonMatrix.Size = new Size(249, 44); + buttonMatrix.Size = new Size(249, 48); buttonMatrix.TabIndex = 18; buttonMatrix.Text = Properties.Strings.PictureGif; buttonMatrix.UseVisualStyleBackColor = false; @@ -348,14 +348,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"; @@ -364,28 +363,6 @@ namespace GHelper tableButtons.Size = new Size(771, 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(248, 50); - buttonKeyboard.TabIndex = 24; - buttonKeyboard.Text = Properties.Strings.Extra; - buttonKeyboard.TextImageRelation = TextImageRelation.ImageBeforeText; - buttonKeyboard.UseVisualStyleBackColor = false; - // // buttonUpdates // buttonUpdates.AccessibleName = "BIOS and Driver Updates"; @@ -397,12 +374,12 @@ namespace GHelper buttonUpdates.FlatStyle = FlatStyle.Flat; buttonUpdates.Image = Properties.Resources.icons8_software_32_white; buttonUpdates.ImageAlign = ContentAlignment.MiddleRight; - buttonUpdates.Location = new Point(260, 4); + buttonUpdates.Location = new Point(4, 4); buttonUpdates.Margin = new Padding(4); buttonUpdates.Name = "buttonUpdates"; buttonUpdates.Secondary = true; buttonUpdates.Size = new Size(248, 50); - buttonUpdates.TabIndex = 22; + buttonUpdates.TabIndex = 24; buttonUpdates.Text = "Updates"; buttonUpdates.TextImageRelation = TextImageRelation.ImageBeforeText; buttonUpdates.UseVisualStyleBackColor = false; @@ -416,13 +393,16 @@ 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(516, 4); buttonQuit.Margin = new Padding(4); buttonQuit.Name = "buttonQuit"; buttonQuit.Secondary = true; - buttonQuit.Size = new Size(187, 50); + buttonQuit.Size = new Size(251, 50); buttonQuit.TabIndex = 23; buttonQuit.Text = "Quit"; + buttonQuit.TextAlign = ContentAlignment.MiddleRight; + buttonQuit.TextImageRelation = TextImageRelation.ImageBeforeText; buttonQuit.UseVisualStyleBackColor = false; // // checkStartup @@ -1025,7 +1005,7 @@ namespace GHelper panelKeyboard.Controls.Add(tableLayoutKeyboard); panelKeyboard.Controls.Add(panelKeyboardTitle); panelKeyboard.Dock = DockStyle.Top; - panelKeyboard.Location = new Point(11, 758); + panelKeyboard.Location = new Point(11, 929); panelKeyboard.Margin = new Padding(0); panelKeyboard.Name = "panelKeyboard"; panelKeyboard.Padding = new Padding(20); @@ -1040,6 +1020,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; @@ -1051,6 +1032,28 @@ namespace GHelper tableLayoutKeyboard.Size = new Size(771, 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(518, 6); + buttonKeyboard.Margin = new Padding(4, 6, 4, 6); + buttonKeyboard.Name = "buttonKeyboard"; + buttonKeyboard.Secondary = true; + buttonKeyboard.Size = new Size(249, 48); + buttonKeyboard.TabIndex = 37; + buttonKeyboard.Text = Properties.Strings.Extra; + buttonKeyboard.TextImageRelation = TextImageRelation.ImageBeforeText; + buttonKeyboard.UseVisualStyleBackColor = false; + // // panelColor // panelColor.AutoSize = true; @@ -1058,10 +1061,10 @@ namespace GHelper panelColor.Controls.Add(pictureColor); panelColor.Controls.Add(buttonKeyboardColor); panelColor.Dock = DockStyle.Fill; - panelColor.Location = new Point(261, 8); - panelColor.Margin = new Padding(4, 8, 4, 8); + panelColor.Location = new Point(261, 6); + panelColor.Margin = new Padding(4, 6, 4, 6); panelColor.Name = "panelColor"; - panelColor.Size = new Size(249, 44); + panelColor.Size = new Size(249, 48); panelColor.TabIndex = 36; // // pictureColor2 @@ -1095,10 +1098,10 @@ namespace GHelper buttonKeyboardColor.FlatStyle = FlatStyle.Flat; buttonKeyboardColor.ForeColor = SystemColors.ControlText; buttonKeyboardColor.Location = new Point(0, 0); - buttonKeyboardColor.Margin = new Padding(4, 8, 4, 8); + buttonKeyboardColor.Margin = new Padding(4); buttonKeyboardColor.Name = "buttonKeyboardColor"; buttonKeyboardColor.Secondary = false; - buttonKeyboardColor.Size = new Size(249, 44); + buttonKeyboardColor.Size = new Size(249, 48); buttonKeyboardColor.TabIndex = 14; buttonKeyboardColor.Text = Properties.Strings.Color; buttonKeyboardColor.UseVisualStyleBackColor = false; @@ -1188,8 +1191,8 @@ namespace GHelper Controls.Add(panelFooter); Controls.Add(panelVersion); Controls.Add(panelBattery); - Controls.Add(panelMatrix); Controls.Add(panelKeyboard); + Controls.Add(panelMatrix); Controls.Add(panelScreen); Controls.Add(panelGPU); Controls.Add(panelPerformance); @@ -1289,7 +1292,6 @@ namespace GHelper private RButton buttonKeyboardColor; private RButton buttonFans; private Slider sliderBattery; - private RButton buttonUpdates; private Panel panelGPUTitle; private PictureBox pictureGPU; private Label labelGPU; @@ -1315,7 +1317,8 @@ namespace GHelper private Panel panelVersion; private Label labelVersion; private RButton buttonStopGPU; - private RButton buttonKeyboard; private TableLayoutPanel tableButtons; + private RButton buttonUpdates; + private RButton buttonKeyboard; } } \ No newline at end of file From ac6c71252d8c6b03b370ecccc16c31d2a24a215a Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Tue, 25 Jul 2023 08:16:37 +0200 Subject: [PATCH 5/5] New translations Strings.resx (Romanian) --- app/Properties/Strings.ro.resx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Properties/Strings.ro.resx b/app/Properties/Strings.ro.resx index 50e9f009..ebc7de66 100644 --- a/app/Properties/Strings.ro.resx +++ b/app/Properties/Strings.ro.resx @@ -276,7 +276,7 @@ Setările implicite ale fabricii - Curbele ventilatorului + Curbe ventilator Profil ventilator CPU @@ -291,10 +291,10 @@ Profiluri ventilatoare - Ventilatoare și energie + Vent. și putere - Ventilator + Vent Fans + Power