From 5240fcc8e718c98c888ec40e878e585a81a039d2 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Sun, 23 Jul 2023 18:48:29 +0200 Subject: [PATCH 1/5] New translations Strings.resx (Lithuanian) --- app/Properties/Strings.lt.resx | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/Properties/Strings.lt.resx b/app/Properties/Strings.lt.resx index 08372aa3..256e54f2 100644 --- a/app/Properties/Strings.lt.resx +++ b/app/Properties/Strings.lt.resx @@ -190,25 +190,25 @@ Taikyti automatiškai - Autom. + Automatinis - Nustato 60Hz, kad išsaugotų akumuliatoriaus įkrovą, ir atgal, kai prijungtas prie lizdo + Nustato 60Hz, kad stokotų akumuliatorių, ir atgal, kai prijungtas prie lizdo Pabudęs - Skirtasis laikas naudojant lizdą / akumuliatorių (0 – ĮJUNGTA) + Laiko riba su lizdu / akumuliatoriumi (0 – ĮJUNGTA) Balansuotas - Akumuliatoriaus įkrovos riba + Įkrovos riba - Akumuliatoriaus sveikata + Sveikata BIOS ir tvarkyklių naujinimai @@ -235,7 +235,7 @@ CPU spartinimas - Tinkinta + Tinkintas Numatytas @@ -342,13 +342,13 @@ Vis tiek norite tęsti? Sustabdyti visas GPU naudojančias programėles, kai perjungiama į ekonomišką režimą - Nešiojamojo kompiuterio apšvietimas + Apšvietimas - Nešiojamojo kompiuterio klaviatūra + Klaviatūra - Nešiojamojo kompiuterio ekranas + Ekranas Korpusas @@ -399,10 +399,10 @@ Vis tiek norite tęsti? Mikrofono nutildymas - Nauji naujinimai + Prieinami naujinimai - Nėra naujų naujinimų + Nėra prieinamų naujinimų Atidaryti G-Helper langą @@ -516,7 +516,7 @@ Vis tiek norite tęsti? Išjungti naudojant akumuliatorių - Nukreipia nešiojamojo kompiuterio ekraną į dGPU, kad maksimizuotų kadrų dažnį + Nukreipia ekraną į dGPU, kad maksimizuotų kadrų dažnį Maksimalus From ef6de6ad2aab0bc1ea591b802d24d8b171940549 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Mon, 24 Jul 2023 14:26:35 +0200 Subject: [PATCH 2/5] UI Re-arrangements --- app/AutoUpdate/AutoUpdateControl.cs | 3 +- app/Input/InputDispatcher.cs | 13 ++- app/Properties/Resources.Designer.cs | 20 ++++ app/Properties/Resources.resx | 70 ++++++------ app/Resources/icons8-quit-32.png | Bin 0 -> 576 bytes app/Resources/icons8-software-32-white.png | Bin 0 -> 500 bytes app/Settings.Designer.cs | 119 +++++++++++---------- app/Settings.cs | 4 +- app/Updates.cs | 6 +- 9 files changed, 140 insertions(+), 95 deletions(-) create mode 100644 app/Resources/icons8-quit-32.png create mode 100644 app/Resources/icons8-software-32-white.png diff --git a/app/AutoUpdate/AutoUpdateControl.cs b/app/AutoUpdate/AutoUpdateControl.cs index 8dba9d5d..dfd10d91 100644 --- a/app/AutoUpdate/AutoUpdateControl.cs +++ b/app/AutoUpdate/AutoUpdateControl.cs @@ -16,7 +16,8 @@ namespace GHelper.AutoUpdate public AutoUpdateControl(SettingsForm settingsForm) { settings = settingsForm; - settings.SetVersionLabel(Properties.Strings.VersionLabel + ": " + Assembly.GetExecutingAssembly().GetName().Version); + var appVersion = new Version(Assembly.GetExecutingAssembly().GetName().Version.ToString()); + settings.SetVersionLabel(Properties.Strings.VersionLabel + $": {appVersion.Major}.{appVersion.Minor}.{appVersion.Build}"); } public void CheckForUpdates() diff --git a/app/Input/InputDispatcher.cs b/app/Input/InputDispatcher.cs index c0879d49..64db2e0a 100644 --- a/app/Input/InputDispatcher.cs +++ b/app/Input/InputDispatcher.cs @@ -545,9 +545,16 @@ namespace GHelper.Input try { - string executable = command.Split(' ')[0]; - string arguments = command.Substring(executable.Length).Trim(); - Process proc = Process.Start(executable, arguments); + + //string executable = command.Split(' ')[0]; + //string arguments = command.Substring(executable.Length).Trim(); + + ProcessStartInfo startInfo = new ProcessStartInfo(); + startInfo.UseShellExecute = true; + startInfo.WorkingDirectory = Environment.CurrentDirectory; + startInfo.FileName = command; + //startInfo.Arguments = arguments; + Process proc = Process.Start(startInfo); } catch { diff --git a/app/Properties/Resources.Designer.cs b/app/Properties/Resources.Designer.cs index db1ad45f..7b788858 100644 --- a/app/Properties/Resources.Designer.cs +++ b/app/Properties/Resources.Designer.cs @@ -360,6 +360,16 @@ namespace GHelper.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_quit_32 { + get { + object obj = ResourceManager.GetObject("icons8-quit-32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -440,6 +450,16 @@ namespace GHelper.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_software_32_white { + get { + object obj = ResourceManager.GetObject("icons8-software-32-white", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/app/Properties/Resources.resx b/app/Properties/Resources.resx index dae79172..ffee67b5 100644 --- a/app/Properties/Resources.resx +++ b/app/Properties/Resources.resx @@ -118,24 +118,30 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\icons8-gauge-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\brightness-up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-temperature-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\backlight-down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\icons8-mute-unmute-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-quit-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\icons8-fiat-500-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\icons8-microphone-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-voltage-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\icons8-project-management-48 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -145,6 +151,9 @@ ..\Resources\icons8-touchpad-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-automation-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\icons8-help-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -154,8 +163,8 @@ ..\Resources\icons8-game-controller-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-matrix-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-video-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\icons8-refresh-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -181,6 +190,12 @@ ..\Resources\eco.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-video-card-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-rocket-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\icons8-edit-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -208,8 +223,20 @@ ..\Resources\icons8-remove-64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-video-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-matrix-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-keyboard-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-fan-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-software-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-gauge-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\icons8-leaf-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -217,43 +244,22 @@ ..\Resources\ultimate.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-rocket-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\backlight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\icons8-settings-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-keyboard-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\icons8-automation-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-processor-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\icons8-laptop-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-video-card-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\icons8-fan-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\icons8-processor-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\icons8-rocket-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-software-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\icons8-temperature-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\icons8-voltage-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-software-32-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/app/Resources/icons8-quit-32.png b/app/Resources/icons8-quit-32.png new file mode 100644 index 0000000000000000000000000000000000000000..3db87ccd2f30a0a5eefa741621c019544c637238 GIT binary patch literal 576 zcmV-G0>Ax33l1(mEth~VuJ6tCbFO^ikw&Y~D5>F!C1g8tCZ(C7U1ch#v=fAJsv zVI_9rAP!(Fntn6Z;WVD%C+2!Q4{;)5v;OTkek22Z#(mtxEj-4D1c&~&`#LaQq8XegbiK)MO<(5^UB zo!~xRrt~USRUq6L#Z{1Asvu%GVy9%pNDUE1pZFAAbVW`P!-}6Yc!&wXy4;} z#YQwyr4g-(mN}Ez)f6*3TeZb^Lg{3t!>AElbJ4a-(ZtJ0IF~^{JGh?LF|PX(LvprH zL()hFFN$@0U4kQtCA*6aHP?JH8T^nwu?Mdcr(2kn-B>oyJ|B*1pG~H{_MdlSFbDgTn4 zVmFMxtN9A}4txWYJsV@tT%CGu-KINtu9Y-=1^MbKdj5=Y<6S5G}w2umhaQ zY@Gp`;}q@!u7M)pR50T%fzGJK7l99nd;&MX1~4PD^{qJbDF6#mi61Cw2{-}T0({$n zoO~^2KZ=t(z&kJwGy+S&JunpzH=!;#^>m_JZ7)f@6}a=<_j;B1NyQdweG^v_I?>5p z@fTnWXb6$xTrn55j9O8Ts!eTo#XIDa0{UgP_JjF;sgu7N(ToJ`wHqF^x04%sfhW&( zJOVuxa=D#L|E7Rl1=)BRrh#p>Jyj;|EuzUM*QR*;tU@EFpjjWT-y_-w40!g&m19oa zX)OiJ`*1@ZK@%VJ?2RkOyg17l8hZ-b^5Lw_&puc1T;U3~#9Pj)SOLBR{`z{&axVuJ zkdIN^wS1TY(nJr-nH1n8S3vRz2_C~kjml~aW4NZ=*&wH3IlZcgbVO$2Z^}JVt Date: Mon, 24 Jul 2023 14:34:14 +0200 Subject: [PATCH 3/5] UI --- app/Settings.Designer.cs | 86 ++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/app/Settings.Designer.cs b/app/Settings.Designer.cs index 1153bbe2..b209e79f 100644 --- a/app/Settings.Designer.cs +++ b/app/Settings.Designer.cs @@ -46,9 +46,10 @@ namespace GHelper pictureBattery = new PictureBox(); labelBatteryTitle = new Label(); panelFooter = new Panel(); + tableLayoutPanel1 = new TableLayoutPanel(); buttonKeyboard = new RButton(); - buttonUpdates = new RButton(); buttonQuit = new RButton(); + buttonUpdates = new RButton(); checkStartup = new CheckBox(); panelPerformance = new Panel(); tablePerf = new TableLayoutPanel(); @@ -96,7 +97,6 @@ namespace GHelper labelKeyboard = new Label(); labelVersion = new Label(); panelVersion = new Panel(); - tableLayoutPanel1 = new TableLayoutPanel(); panelMatrix.SuspendLayout(); tableLayoutMatrix.SuspendLayout(); panelMatrixTitle.SuspendLayout(); @@ -105,6 +105,7 @@ namespace GHelper panelBatteryTitle.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBattery).BeginInit(); panelFooter.SuspendLayout(); + tableLayoutPanel1.SuspendLayout(); panelPerformance.SuspendLayout(); tablePerf.SuspendLayout(); panelCPUTitle.SuspendLayout(); @@ -125,7 +126,6 @@ namespace GHelper panelKeyboardTitle.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureKeyboard).BeginInit(); panelVersion.SuspendLayout(); - tableLayoutPanel1.SuspendLayout(); SuspendLayout(); // // panelMatrix @@ -342,9 +342,27 @@ namespace GHelper panelFooter.Margin = new Padding(0); panelFooter.Name = "panelFooter"; panelFooter.Padding = new Padding(20); - panelFooter.Size = new Size(811, 96); + panelFooter.Size = new Size(811, 98); panelFooter.TabIndex = 7; // + // tableLayoutPanel1 + // + tableLayoutPanel1.AutoSize = true; + tableLayoutPanel1.ColumnCount = 3; + tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F)); + tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F)); + tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F)); + tableLayoutPanel1.Controls.Add(buttonKeyboard, 0, 0); + tableLayoutPanel1.Controls.Add(buttonQuit, 2, 0); + tableLayoutPanel1.Controls.Add(buttonUpdates, 1, 0); + tableLayoutPanel1.Dock = DockStyle.Top; + tableLayoutPanel1.Location = new Point(20, 20); + tableLayoutPanel1.Name = "tableLayoutPanel1"; + tableLayoutPanel1.RowCount = 1; + tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Percent, 100F)); + tableLayoutPanel1.Size = new Size(771, 58); + tableLayoutPanel1.TabIndex = 25; + // // buttonKeyboard // buttonKeyboard.AccessibleName = "Extra Settings"; @@ -361,12 +379,30 @@ namespace GHelper buttonKeyboard.Margin = new Padding(4); buttonKeyboard.Name = "buttonKeyboard"; buttonKeyboard.Secondary = true; - buttonKeyboard.Size = new Size(248, 48); + buttonKeyboard.Size = new Size(248, 50); buttonKeyboard.TabIndex = 24; buttonKeyboard.Text = Properties.Strings.Extra; buttonKeyboard.TextImageRelation = TextImageRelation.ImageBeforeText; buttonKeyboard.UseVisualStyleBackColor = false; // + // buttonQuit + // + buttonQuit.AccessibleName = "Quit Application"; + buttonQuit.Activated = false; + buttonQuit.Anchor = AnchorStyles.Top | AnchorStyles.Right; + buttonQuit.BackColor = SystemColors.ControlLight; + buttonQuit.BorderColor = Color.Transparent; + buttonQuit.BorderRadius = 2; + buttonQuit.FlatStyle = FlatStyle.Flat; + buttonQuit.Image = Properties.Resources.icons8_quit_32; + buttonQuit.Location = new Point(703, 4); + buttonQuit.Margin = new Padding(4); + buttonQuit.Name = "buttonQuit"; + buttonQuit.Secondary = true; + buttonQuit.Size = new Size(64, 50); + buttonQuit.TabIndex = 23; + buttonQuit.UseVisualStyleBackColor = false; + // // buttonUpdates // buttonUpdates.AccessibleName = "BIOS and Driver Updates"; @@ -382,30 +418,12 @@ namespace GHelper buttonUpdates.Margin = new Padding(4); buttonUpdates.Name = "buttonUpdates"; buttonUpdates.Secondary = true; - buttonUpdates.Size = new Size(248, 48); + buttonUpdates.Size = new Size(248, 50); buttonUpdates.TabIndex = 22; buttonUpdates.Text = "Updates"; buttonUpdates.TextImageRelation = TextImageRelation.ImageBeforeText; buttonUpdates.UseVisualStyleBackColor = false; // - // buttonQuit - // - buttonQuit.AccessibleName = "Quit Application"; - buttonQuit.Activated = false; - buttonQuit.Anchor = AnchorStyles.Top | AnchorStyles.Right; - buttonQuit.BackColor = SystemColors.ControlLight; - buttonQuit.BorderColor = Color.Transparent; - buttonQuit.BorderRadius = 2; - buttonQuit.FlatStyle = FlatStyle.Flat; - buttonQuit.Image = Properties.Resources.icons8_quit_32; - buttonQuit.Location = new Point(703, 4); - buttonQuit.Margin = new Padding(4); - buttonQuit.Name = "buttonQuit"; - buttonQuit.Secondary = true; - buttonQuit.Size = new Size(64, 46); - buttonQuit.TabIndex = 23; - buttonQuit.UseVisualStyleBackColor = false; - // // checkStartup // checkStartup.AutoSize = true; @@ -1159,24 +1177,6 @@ namespace GHelper panelVersion.Size = new Size(811, 56); panelVersion.TabIndex = 6; // - // tableLayoutPanel1 - // - tableLayoutPanel1.AutoSize = true; - tableLayoutPanel1.ColumnCount = 3; - tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F)); - tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F)); - tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F)); - tableLayoutPanel1.Controls.Add(buttonKeyboard, 0, 0); - tableLayoutPanel1.Controls.Add(buttonQuit, 2, 0); - tableLayoutPanel1.Controls.Add(buttonUpdates, 1, 0); - tableLayoutPanel1.Dock = DockStyle.Top; - tableLayoutPanel1.Location = new Point(20, 20); - tableLayoutPanel1.Name = "tableLayoutPanel1"; - tableLayoutPanel1.RowCount = 1; - tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Percent, 100F)); - tableLayoutPanel1.Size = new Size(771, 56); - tableLayoutPanel1.TabIndex = 25; - // // SettingsForm // AutoScaleDimensions = new SizeF(192F, 192F); @@ -1213,6 +1213,7 @@ namespace GHelper ((System.ComponentModel.ISupportInitialize)pictureBattery).EndInit(); panelFooter.ResumeLayout(false); panelFooter.PerformLayout(); + tableLayoutPanel1.ResumeLayout(false); panelPerformance.ResumeLayout(false); panelPerformance.PerformLayout(); tablePerf.ResumeLayout(false); @@ -1243,7 +1244,6 @@ namespace GHelper ((System.ComponentModel.ISupportInitialize)pictureKeyboard).EndInit(); panelVersion.ResumeLayout(false); panelVersion.PerformLayout(); - tableLayoutPanel1.ResumeLayout(false); ResumeLayout(false); PerformLayout(); } From a9dd06de643e284b1bf3faef0d5747901bdbd469 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Mon, 24 Jul 2023 14:48:04 +0200 Subject: [PATCH 4/5] UI --- app/Settings.Designer.cs | 42 ++++++++++++++++++++-------------------- app/Settings.cs | 2 +- app/Settings.resx | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/app/Settings.Designer.cs b/app/Settings.Designer.cs index b209e79f..7f8387a1 100644 --- a/app/Settings.Designer.cs +++ b/app/Settings.Designer.cs @@ -46,7 +46,7 @@ namespace GHelper pictureBattery = new PictureBox(); labelBatteryTitle = new Label(); panelFooter = new Panel(); - tableLayoutPanel1 = new TableLayoutPanel(); + tableButtons = new TableLayoutPanel(); buttonKeyboard = new RButton(); buttonQuit = new RButton(); buttonUpdates = new RButton(); @@ -105,7 +105,7 @@ namespace GHelper panelBatteryTitle.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBattery).BeginInit(); panelFooter.SuspendLayout(); - tableLayoutPanel1.SuspendLayout(); + tableButtons.SuspendLayout(); panelPerformance.SuspendLayout(); tablePerf.SuspendLayout(); panelCPUTitle.SuspendLayout(); @@ -336,7 +336,7 @@ namespace GHelper // panelFooter.AutoSize = true; panelFooter.AutoSizeMode = AutoSizeMode.GrowAndShrink; - panelFooter.Controls.Add(tableLayoutPanel1); + panelFooter.Controls.Add(tableButtons); panelFooter.Dock = DockStyle.Top; panelFooter.Location = new Point(11, 1236); panelFooter.Margin = new Padding(0); @@ -345,23 +345,23 @@ namespace GHelper panelFooter.Size = new Size(811, 98); panelFooter.TabIndex = 7; // - // tableLayoutPanel1 + // tableButtons // - tableLayoutPanel1.AutoSize = true; - tableLayoutPanel1.ColumnCount = 3; - tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F)); - tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F)); - tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F)); - tableLayoutPanel1.Controls.Add(buttonKeyboard, 0, 0); - tableLayoutPanel1.Controls.Add(buttonQuit, 2, 0); - tableLayoutPanel1.Controls.Add(buttonUpdates, 1, 0); - tableLayoutPanel1.Dock = DockStyle.Top; - tableLayoutPanel1.Location = new Point(20, 20); - tableLayoutPanel1.Name = "tableLayoutPanel1"; - tableLayoutPanel1.RowCount = 1; - tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Percent, 100F)); - tableLayoutPanel1.Size = new Size(771, 58); - tableLayoutPanel1.TabIndex = 25; + tableButtons.AutoSize = true; + 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, 33.3333321F)); + tableButtons.Controls.Add(buttonKeyboard, 0, 0); + tableButtons.Controls.Add(buttonQuit, 2, 0); + tableButtons.Controls.Add(buttonUpdates, 1, 0); + tableButtons.Dock = DockStyle.Top; + tableButtons.Location = new Point(20, 20); + tableButtons.Name = "tableButtons"; + tableButtons.RowCount = 1; + tableButtons.RowStyles.Add(new RowStyle(SizeType.Percent, 100F)); + tableButtons.Size = new Size(771, 58); + tableButtons.TabIndex = 25; // // buttonKeyboard // @@ -1213,7 +1213,7 @@ namespace GHelper ((System.ComponentModel.ISupportInitialize)pictureBattery).EndInit(); panelFooter.ResumeLayout(false); panelFooter.PerformLayout(); - tableLayoutPanel1.ResumeLayout(false); + tableButtons.ResumeLayout(false); panelPerformance.ResumeLayout(false); panelPerformance.PerformLayout(); tablePerf.ResumeLayout(false); @@ -1315,6 +1315,6 @@ namespace GHelper private Label labelVersion; private RButton buttonStopGPU; private RButton buttonKeyboard; - private TableLayoutPanel tableLayoutPanel1; + private TableLayoutPanel tableButtons; } } \ No newline at end of file diff --git a/app/Settings.cs b/app/Settings.cs index 1773b8fa..8f71b5cc 100644 --- a/app/Settings.cs +++ b/app/Settings.cs @@ -181,7 +181,7 @@ namespace GHelper labelBattery.MouseLeave += PanelBattery_MouseLeave; labelBatteryTitle.MouseLeave += PanelBattery_MouseLeave; - Text = "G-Helper - " + AppConfig.GetModelShort() + (ProcessHelper.IsUserAdministrator() ? "." : ""); + Text = "G-Helper " + (ProcessHelper.IsUserAdministrator() ? "—" : "-") + " " + AppConfig.GetModelShort(); TopMost = AppConfig.Is("topmost"); SetContextMenu(); diff --git a/app/Settings.resx b/app/Settings.resx index a395bffc..af32865e 100644 --- a/app/Settings.resx +++ b/app/Settings.resx @@ -18,7 +18,7 @@ System.Resources.ResXResourceReader, System.Windows.Forms, ... System.Resources.ResXResourceWriter, System.Windows.Forms, ... this is my long stringthis is a comment - Blue + Blue [base64 mime encoded serialized .NET Framework object] From 4086098f58e8073840726612851a4b0341874387 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Mon, 24 Jul 2023 14:53:09 +0200 Subject: [PATCH 5/5] Hide Keyboard section for G14 2020 completely --- app/Settings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Settings.cs b/app/Settings.cs index 8f71b5cc..19ca3918 100644 --- a/app/Settings.cs +++ b/app/Settings.cs @@ -617,7 +617,7 @@ namespace GHelper if (AppConfig.ContainsModel("GA401I")) { - comboKeyboard.Visible = false; + panelKeyboard.Visible = false; } VisualiseAura();