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 48a7f8ec..e151f4d0 100644 --- a/app/Properties/Resources.Designer.cs +++ b/app/Properties/Resources.Designer.cs @@ -410,6 +410,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. /// @@ -490,6 +500,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 c9595ed8..a732ee99 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,44 +244,23 @@ ..\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 ..\Resources\icons8-maus-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a 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 diff --git a/app/Resources/icons8-quit-32.png b/app/Resources/icons8-quit-32.png new file mode 100644 index 00000000..3db87ccd Binary files /dev/null and b/app/Resources/icons8-quit-32.png differ diff --git a/app/Resources/icons8-software-32-white.png b/app/Resources/icons8-software-32-white.png new file mode 100644 index 00000000..3ee2865d Binary files /dev/null and b/app/Resources/icons8-software-32-white.png differ diff --git a/app/Settings.Designer.cs b/app/Settings.Designer.cs index 78308abd..cd9781cf 100644 --- a/app/Settings.Designer.cs +++ b/app/Settings.Designer.cs @@ -46,8 +46,10 @@ namespace GHelper pictureBattery = new PictureBox(); labelBatteryTitle = new Label(); panelFooter = new Panel(); - buttonUpdates = new RButton(); + tableButtons = new TableLayoutPanel(); + buttonKeyboard = new RButton(); buttonQuit = new RButton(); + buttonUpdates = new RButton(); checkStartup = new CheckBox(); panelPerformance = new Panel(); tablePerf = new TableLayoutPanel(); @@ -85,7 +87,6 @@ namespace GHelper labelSreen = new Label(); panelKeyboard = new Panel(); tableLayoutKeyboard = new TableLayoutPanel(); - buttonKeyboard = new RButton(); panelColor = new Panel(); pictureColor2 = new PictureBox(); pictureColor = new PictureBox(); @@ -95,7 +96,6 @@ namespace GHelper pictureKeyboard = new PictureBox(); labelKeyboard = new Label(); labelVersion = new Label(); - labelModel = new Label(); panelVersion = new Panel(); panelPeripherals = new Panel(); tableLayoutPeripherals = new TableLayoutPanel(); @@ -113,6 +113,7 @@ namespace GHelper panelBatteryTitle.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBattery).BeginInit(); panelFooter.SuspendLayout(); + tableButtons.SuspendLayout(); panelPerformance.SuspendLayout(); tablePerf.SuspendLayout(); panelCPUTitle.SuspendLayout(); @@ -342,34 +343,54 @@ namespace GHelper // panelFooter.AutoSize = true; panelFooter.AutoSizeMode = AutoSizeMode.GrowAndShrink; - panelFooter.Controls.Add(buttonUpdates); - panelFooter.Controls.Add(buttonQuit); - panelFooter.Controls.Add(checkStartup); + panelFooter.Controls.Add(tableButtons); panelFooter.Dock = DockStyle.Top; panelFooter.Location = new Point(8, 1099); panelFooter.Margin = new Padding(0); panelFooter.Name = "panelFooter"; - panelFooter.Padding = new Padding(15); - panelFooter.Size = new Size(621, 69); + panelFooter.Padding = new Padding(20); + panelFooter.Size = new Size(621, 98); panelFooter.TabIndex = 7; // - // buttonUpdates + // tableButtons // - buttonUpdates.AccessibleName = "BIOS and Driver Updates"; - buttonUpdates.Activated = false; - buttonUpdates.Anchor = AnchorStyles.Top | AnchorStyles.Right; - buttonUpdates.BackColor = SystemColors.ControlLight; - buttonUpdates.BorderColor = Color.Transparent; - buttonUpdates.BorderRadius = 2; - buttonUpdates.FlatStyle = FlatStyle.Flat; - buttonUpdates.Location = new Point(322, 18); - buttonUpdates.Margin = new Padding(6, 3, 6, 3); - buttonUpdates.Name = "buttonUpdates"; - buttonUpdates.Secondary = true; - buttonUpdates.Size = new Size(135, 33); - buttonUpdates.TabIndex = 22; - buttonUpdates.Text = "Updates"; - buttonUpdates.UseVisualStyleBackColor = false; + 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(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; // // buttonQuit // @@ -380,20 +401,41 @@ namespace GHelper buttonQuit.BorderColor = Color.Transparent; buttonQuit.BorderRadius = 2; buttonQuit.FlatStyle = FlatStyle.Flat; - buttonQuit.Location = new Point(467, 18); - buttonQuit.Margin = new Padding(6, 3, 6, 3); + buttonQuit.Image = Properties.Resources.icons8_quit_32; + buttonQuit.Location = new Point(513, 4); + buttonQuit.Margin = new Padding(4); buttonQuit.Name = "buttonQuit"; buttonQuit.Secondary = true; - buttonQuit.Size = new Size(135, 33); + buttonQuit.Size = new Size(64, 50); buttonQuit.TabIndex = 23; - buttonQuit.Text = Properties.Strings.Quit; buttonQuit.UseVisualStyleBackColor = false; // + // buttonUpdates + // + buttonUpdates.AccessibleName = "BIOS and Driver Updates"; + buttonUpdates.Activated = false; + buttonUpdates.BackColor = SystemColors.ControlLight; + buttonUpdates.BorderColor = Color.Transparent; + buttonUpdates.BorderRadius = 2; + buttonUpdates.Dock = DockStyle.Top; + buttonUpdates.FlatStyle = FlatStyle.Flat; + buttonUpdates.Image = Properties.Resources.icons8_software_32_white; + buttonUpdates.ImageAlign = ContentAlignment.MiddleRight; + buttonUpdates.Location = new Point(197, 4); + buttonUpdates.Margin = new Padding(4); + buttonUpdates.Name = "buttonUpdates"; + buttonUpdates.Secondary = true; + buttonUpdates.Size = new Size(185, 50); + buttonUpdates.TabIndex = 22; + buttonUpdates.Text = "Updates"; + buttonUpdates.TextImageRelation = TextImageRelation.ImageBeforeText; + buttonUpdates.UseVisualStyleBackColor = false; + // // checkStartup // checkStartup.AutoSize = true; - checkStartup.Location = new Point(20, 21); - checkStartup.Margin = new Padding(6, 3, 6, 3); + checkStartup.Location = new Point(27, 12); + checkStartup.Margin = new Padding(8, 4, 8, 4); checkStartup.Name = "checkStartup"; checkStartup.Size = new Size(157, 29); checkStartup.TabIndex = 21; @@ -982,7 +1024,6 @@ 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; @@ -994,28 +1035,6 @@ namespace GHelper tableLayoutKeyboard.Size = new Size(591, 47); 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(397, 6); - buttonKeyboard.Margin = new Padding(3, 6, 3, 6); - buttonKeyboard.Name = "buttonKeyboard"; - buttonKeyboard.Secondary = true; - buttonKeyboard.Size = new Size(191, 33); - buttonKeyboard.TabIndex = 15; - buttonKeyboard.Text = Properties.Strings.Extra; - buttonKeyboard.TextImageRelation = TextImageRelation.ImageBeforeText; - buttonKeyboard.UseVisualStyleBackColor = false; - // // panelColor // panelColor.AutoSize = true; @@ -1118,32 +1137,22 @@ namespace GHelper // // labelVersion // + labelVersion.Anchor = AnchorStyles.Top | AnchorStyles.Right; labelVersion.Cursor = Cursors.Hand; labelVersion.Font = new Font("Segoe UI", 9F, FontStyle.Underline, GraphicsUnit.Point); labelVersion.ForeColor = SystemColors.ControlDark; - labelVersion.Location = new Point(21, 9); - labelVersion.Margin = new Padding(6, 0, 6, 0); + labelVersion.Location = new Point(396, 12); + labelVersion.Margin = new Padding(8, 0, 8, 0); labelVersion.Name = "labelVersion"; labelVersion.Size = new Size(225, 24); labelVersion.TabIndex = 37; labelVersion.Text = "v.0"; - // - // labelModel - // - labelModel.Anchor = AnchorStyles.Top | AnchorStyles.Right; - labelModel.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); - labelModel.ForeColor = SystemColors.ControlDark; - labelModel.Location = new Point(298, 9); - labelModel.Margin = new Padding(6, 0, 6, 0); - labelModel.Name = "labelModel"; - labelModel.Size = new Size(300, 24); - labelModel.TabIndex = 38; - labelModel.TextAlign = ContentAlignment.TopRight; + labelVersion.TextAlign = ContentAlignment.TopRight; // // panelVersion // panelVersion.Controls.Add(labelVersion); - panelVersion.Controls.Add(labelModel); + panelVersion.Controls.Add(checkStartup); panelVersion.Dock = DockStyle.Top; panelVersion.Location = new Point(8, 1057); panelVersion.Name = "panelVersion"; @@ -1325,6 +1334,7 @@ namespace GHelper ((System.ComponentModel.ISupportInitialize)pictureBattery).EndInit(); panelFooter.ResumeLayout(false); panelFooter.PerformLayout(); + tableButtons.ResumeLayout(false); panelPerformance.ResumeLayout(false); panelPerformance.PerformLayout(); tablePerf.ResumeLayout(false); @@ -1354,6 +1364,7 @@ namespace GHelper panelKeyboardTitle.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureKeyboard).EndInit(); panelVersion.ResumeLayout(false); + panelVersion.PerformLayout(); panelPeripherals.ResumeLayout(false); panelPeripherals.PerformLayout(); tableLayoutPeripherals.ResumeLayout(false); @@ -1401,7 +1412,6 @@ namespace GHelper private Label labelTipScreen; private RButton buttonMiniled; private RButton buttonMatrix; - private RButton buttonKeyboard; private RButton buttonKeyboardColor; private RButton buttonFans; private Slider sliderBattery; @@ -1430,7 +1440,6 @@ namespace GHelper private Label labelBatteryTitle; private Panel panelVersion; private Label labelVersion; - private Label labelModel; private RButton buttonStopGPU; private Panel panelPeripherals; private TableLayoutPanel tableLayoutPeripherals; @@ -1440,5 +1449,7 @@ namespace GHelper private RButton buttonPeripheral2; private RButton buttonPeripheral3; private RButton buttonPeripheral1; + private RButton buttonKeyboard; + private TableLayoutPanel tableButtons; } } \ No newline at end of file diff --git a/app/Settings.cs b/app/Settings.cs index 5e7f3e88..2be42d79 100644 --- a/app/Settings.cs +++ b/app/Settings.cs @@ -78,7 +78,7 @@ namespace GHelper checkStartup.Text = Properties.Strings.RunOnStartup; buttonMatrix.Text = Properties.Strings.PictureGif; - buttonQuit.Text = Properties.Strings.Quit; + //buttonQuit.Text = Properties.Strings.Quit; buttonUpdates.Text = Properties.Strings.Updates; FormClosing += SettingsForm_FormClosing; @@ -188,7 +188,7 @@ namespace GHelper buttonPeripheral2.Click += ButtonPeripheral_Click; buttonPeripheral3.Click += ButtonPeripheral_Click; - labelModel.Text = AppConfig.GetModelShort() + (ProcessHelper.IsUserAdministrator() ? "." : ""); + Text = "G-Helper " + (ProcessHelper.IsUserAdministrator() ? "—" : "-") + " " + AppConfig.GetModelShort(); TopMost = AppConfig.Is("topmost"); //This will auto position the window again when it resizes. Might mess with position if people drag the window somewhere else. @@ -631,7 +631,7 @@ namespace GHelper if (AppConfig.ContainsModel("GA401I")) { - comboKeyboard.Visible = false; + panelKeyboard.Visible = false; } VisualiseAura(); diff --git a/app/Updates.cs b/app/Updates.cs index 0c4499a7..b59a1d0d 100644 --- a/app/Updates.cs +++ b/app/Updates.cs @@ -25,10 +25,10 @@ namespace GHelper static int updatesCount = 0; private static long lastUpdate; - private void LoadUpdates() + private void LoadUpdates(bool force = false) { - if (Math.Abs(DateTimeOffset.Now.ToUnixTimeMilliseconds() - lastUpdate) < 5000) return; + if (!force && (Math.Abs(DateTimeOffset.Now.ToUnixTimeMilliseconds() - lastUpdate) < 5000)) return; lastUpdate = DateTimeOffset.Now.ToUnixTimeMilliseconds(); InitBiosAndModel(); @@ -77,7 +77,7 @@ namespace GHelper InitTheme(true); - LoadUpdates(); + LoadUpdates(true); //buttonRefresh.Visible = false; buttonRefresh.Click += ButtonRefresh_Click;