diff --git a/app/GHelper.csproj b/app/GHelper.csproj index 745a26e8..7376d742 100644 --- a/app/GHelper.csproj +++ b/app/GHelper.csproj @@ -16,7 +16,7 @@ x64 False True - 0.29 + 0.30 diff --git a/app/Program.cs b/app/Program.cs index 602ed9dd..8e1f7027 100644 --- a/app/Program.cs +++ b/app/Program.cs @@ -60,8 +60,6 @@ namespace GHelper settingsForm.InitAura(); settingsForm.InitMatrix(); - settingsForm.VisualiseGPUAuto(config.getConfig("gpu_auto")); - settingsForm.VisualiseScreenAuto(config.getConfig("screen_auto")); settingsForm.SetStartupCheck(Startup.IsScheduled()); SetAutoModes(); diff --git a/app/Properties/Resources.Designer.cs b/app/Properties/Resources.Designer.cs index 82636674..2b9dfe3d 100644 --- a/app/Properties/Resources.Designer.cs +++ b/app/Properties/Resources.Designer.cs @@ -80,6 +80,26 @@ namespace GHelper.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_balance_symbol_96 { + get { + object obj = ResourceManager.GetObject("icons8-balance-symbol-96", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_bicycle_48__1_ { + get { + object obj = ResourceManager.GetObject("icons8-bicycle-48 (1)", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -90,6 +110,16 @@ namespace GHelper.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_fan_48 { + get { + object obj = ResourceManager.GetObject("icons8-fan-48", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -100,6 +130,36 @@ namespace GHelper.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_fan_speed_48 { + get { + object obj = ResourceManager.GetObject("icons8-fan-speed-48", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_fiat_500_48 { + get { + object obj = ResourceManager.GetObject("icons8-fiat-500-48", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_game_controller_48 { + get { + object obj = ResourceManager.GetObject("icons8-game-controller-48", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -120,6 +180,36 @@ namespace GHelper.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_launch_96 { + get { + object obj = ResourceManager.GetObject("icons8-launch-96", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_leaf_48 { + get { + object obj = ResourceManager.GetObject("icons8-leaf-48", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_leaf_96 { + get { + object obj = ResourceManager.GetObject("icons8-leaf-96", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -130,6 +220,26 @@ namespace GHelper.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_organic_food_96 { + get { + object obj = ResourceManager.GetObject("icons8-organic-food-96", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_organic_food_961 { + get { + object obj = ResourceManager.GetObject("icons8-organic-food-961", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -140,6 +250,56 @@ namespace GHelper.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_project_management_48 { + get { + object obj = ResourceManager.GetObject("icons8-project-management-48", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_project_management_48__1_ { + get { + object obj = ResourceManager.GetObject("icons8-project-management-48 (1)", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_rocket_48 { + get { + object obj = ResourceManager.GetObject("icons8-rocket-48", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_spa_flower_48 { + get { + object obj = ResourceManager.GetObject("icons8-spa-flower-48", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_spa_flower_96 { + get { + object obj = ResourceManager.GetObject("icons8-spa-flower-96", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -170,6 +330,16 @@ namespace GHelper.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_xbox_controller_96 { + get { + object obj = ResourceManager.GetObject("icons8-xbox-controller-96", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// diff --git a/app/Properties/Resources.resx b/app/Properties/Resources.resx index c08865b5..12794545 100644 --- a/app/Properties/Resources.resx +++ b/app/Properties/Resources.resx @@ -118,43 +118,94 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\eco.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-leaf-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-matrix-desktop-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-launch-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-charging-battery-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-organic-food-96.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-video-card-48.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 + + + ..\Resources\icons8-bicycle-48 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-fan-head-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-processor-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-spa-flower-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-spa-flower-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\standard.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\icons8-keyboard-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-fan-speed-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-speed-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\eco.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-laptop-48.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-organic-food-961.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-balance-symbol-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-fan-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-matrix-desktop-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-xbox-controller-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-project-management-48.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 + ..\Resources\ultimate.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\standard.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\icons8-speed-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\everything-is-fine-itsfine.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-speed-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\icons8-video-card-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\icons8-fan-head-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\icons8-charging-battery-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\icons8-laptop-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\icons8-processor-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-game-controller-48.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-balance-symbol-96.png b/app/Resources/icons8-balance-symbol-96.png new file mode 100644 index 00000000..e1ad7907 Binary files /dev/null and b/app/Resources/icons8-balance-symbol-96.png differ diff --git a/app/Resources/icons8-bicycle-48 (1).png b/app/Resources/icons8-bicycle-48 (1).png new file mode 100644 index 00000000..bdc94b80 Binary files /dev/null and b/app/Resources/icons8-bicycle-48 (1).png differ diff --git a/app/Resources/icons8-fan-48.png b/app/Resources/icons8-fan-48.png new file mode 100644 index 00000000..f1ca3a72 Binary files /dev/null and b/app/Resources/icons8-fan-48.png differ diff --git a/app/Resources/icons8-fan-speed-48.png b/app/Resources/icons8-fan-speed-48.png new file mode 100644 index 00000000..573458ba Binary files /dev/null and b/app/Resources/icons8-fan-speed-48.png differ diff --git a/app/Resources/icons8-fiat-500-48.png b/app/Resources/icons8-fiat-500-48.png new file mode 100644 index 00000000..41de2987 Binary files /dev/null and b/app/Resources/icons8-fiat-500-48.png differ diff --git a/app/Resources/icons8-game-controller-48.png b/app/Resources/icons8-game-controller-48.png new file mode 100644 index 00000000..501f46a0 Binary files /dev/null and b/app/Resources/icons8-game-controller-48.png differ diff --git a/app/Resources/icons8-launch-96.png b/app/Resources/icons8-launch-96.png new file mode 100644 index 00000000..a59eeb58 Binary files /dev/null and b/app/Resources/icons8-launch-96.png differ diff --git a/app/Resources/icons8-leaf-48.png b/app/Resources/icons8-leaf-48.png new file mode 100644 index 00000000..559bed1b Binary files /dev/null and b/app/Resources/icons8-leaf-48.png differ diff --git a/app/Resources/icons8-leaf-96.png b/app/Resources/icons8-leaf-96.png new file mode 100644 index 00000000..f005f855 Binary files /dev/null and b/app/Resources/icons8-leaf-96.png differ diff --git a/app/Resources/icons8-organic-food-96.png b/app/Resources/icons8-organic-food-96.png new file mode 100644 index 00000000..09abca8c Binary files /dev/null and b/app/Resources/icons8-organic-food-96.png differ diff --git a/app/Resources/icons8-organic-food-961.png b/app/Resources/icons8-organic-food-961.png new file mode 100644 index 00000000..9b448557 Binary files /dev/null and b/app/Resources/icons8-organic-food-961.png differ diff --git a/app/Resources/icons8-project-management-48 (1).png b/app/Resources/icons8-project-management-48 (1).png new file mode 100644 index 00000000..0bf8a033 Binary files /dev/null and b/app/Resources/icons8-project-management-48 (1).png differ diff --git a/app/Resources/icons8-project-management-48.png b/app/Resources/icons8-project-management-48.png new file mode 100644 index 00000000..44f2af0f Binary files /dev/null and b/app/Resources/icons8-project-management-48.png differ diff --git a/app/Resources/icons8-rocket-48.png b/app/Resources/icons8-rocket-48.png new file mode 100644 index 00000000..2b04feb8 Binary files /dev/null and b/app/Resources/icons8-rocket-48.png differ diff --git a/app/Resources/icons8-spa-flower-48.png b/app/Resources/icons8-spa-flower-48.png new file mode 100644 index 00000000..8a10e765 Binary files /dev/null and b/app/Resources/icons8-spa-flower-48.png differ diff --git a/app/Resources/icons8-spa-flower-96.png b/app/Resources/icons8-spa-flower-96.png new file mode 100644 index 00000000..b353220b Binary files /dev/null and b/app/Resources/icons8-spa-flower-96.png differ diff --git a/app/Resources/icons8-xbox-controller-96.png b/app/Resources/icons8-xbox-controller-96.png new file mode 100644 index 00000000..e428d922 Binary files /dev/null and b/app/Resources/icons8-xbox-controller-96.png differ diff --git a/app/RoundedButton.cs b/app/RoundedButton.cs index f8ecfabf..5f33d1b9 100644 --- a/app/RoundedButton.cs +++ b/app/RoundedButton.cs @@ -29,6 +29,7 @@ namespace CustomControls if (activated != value) this.Invalidate(); activated = value; + } } diff --git a/app/Settings.Designer.cs b/app/Settings.Designer.cs index 8b0bea00..6c2c6376 100644 --- a/app/Settings.Designer.cs +++ b/app/Settings.Designer.cs @@ -49,28 +49,28 @@ namespace GHelper buttonQuit = new Button(); checkStartup = new CheckBox(); panelPerformance = new Panel(); - buttonFans = new Button(); picturePerf = new PictureBox(); labelPerf = new Label(); labelCPUFan = new Label(); tablePerf = new TableLayoutPanel(); - buttonTurbo = new RoundedButton(); - buttonBalanced = new RoundedButton(); buttonSilent = new RoundedButton(); + buttonBalanced = new RoundedButton(); + buttonTurbo = new RoundedButton(); + buttonFans = new Button(); panelGPU = new Panel(); - checkGPU = new CheckBox(); pictureGPU = new PictureBox(); labelGPU = new Label(); labelGPUFan = new Label(); tableGPU = new TableLayoutPanel(); - buttonUltimate = new RoundedButton(); - buttonStandard = new RoundedButton(); + buttonOptimized = new RoundedButton(); buttonEco = new RoundedButton(); + buttonStandard = new RoundedButton(); + buttonUltimate = new RoundedButton(); panelScreen = new Panel(); - checkScreen = new CheckBox(); tableScreen = new TableLayoutPanel(); - button120Hz = new RoundedButton(); + buttonScreenAuto = new RoundedButton(); button60Hz = new RoundedButton(); + button120Hz = new RoundedButton(); pictureScreen = new PictureBox(); labelSreen = new Label(); panelKeyboard = new Panel(); @@ -114,10 +114,10 @@ namespace GHelper panelMatrix.Controls.Add(pictureMatrix); panelMatrix.Controls.Add(labelMatrix); panelMatrix.Dock = DockStyle.Top; - panelMatrix.Location = new Point(16, 806); + panelMatrix.Location = new Point(16, 764); panelMatrix.Margin = new Padding(4); panelMatrix.Name = "panelMatrix"; - panelMatrix.Size = new Size(722, 180); + panelMatrix.Size = new Size(818, 180); panelMatrix.TabIndex = 33; // // checkMatrix @@ -135,10 +135,11 @@ namespace GHelper // tableLayoutMatrix // tableLayoutMatrix.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - tableLayoutMatrix.ColumnCount = 3; - tableLayoutMatrix.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F)); - tableLayoutMatrix.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F)); - tableLayoutMatrix.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F)); + tableLayoutMatrix.ColumnCount = 4; + tableLayoutMatrix.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tableLayoutMatrix.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tableLayoutMatrix.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tableLayoutMatrix.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); tableLayoutMatrix.Controls.Add(buttonMatrix, 0, 0); tableLayoutMatrix.Controls.Add(comboMatrixRunning, 0, 0); tableLayoutMatrix.Controls.Add(comboMatrix, 0, 0); @@ -147,7 +148,7 @@ namespace GHelper tableLayoutMatrix.Name = "tableLayoutMatrix"; tableLayoutMatrix.RowCount = 1; tableLayoutMatrix.RowStyles.Add(new RowStyle(SizeType.Percent, 100F)); - tableLayoutMatrix.Size = new Size(684, 62); + tableLayoutMatrix.Size = new Size(780, 62); tableLayoutMatrix.TabIndex = 43; // // buttonMatrix @@ -155,10 +156,10 @@ namespace GHelper buttonMatrix.BackColor = SystemColors.ButtonFace; buttonMatrix.Dock = DockStyle.Top; buttonMatrix.FlatAppearance.BorderSize = 0; - buttonMatrix.Location = new Point(466, 10); - buttonMatrix.Margin = new Padding(10); + buttonMatrix.Location = new Point(395, 10); + buttonMatrix.Margin = new Padding(5, 10, 5, 10); buttonMatrix.Name = "buttonMatrix"; - buttonMatrix.Size = new Size(208, 42); + buttonMatrix.Size = new Size(185, 42); buttonMatrix.TabIndex = 43; buttonMatrix.Text = "Picture / Gif"; buttonMatrix.UseVisualStyleBackColor = false; @@ -170,10 +171,10 @@ namespace GHelper comboMatrixRunning.FormattingEnabled = true; comboMatrixRunning.ItemHeight = 32; comboMatrixRunning.Items.AddRange(new object[] { "Binary Banner", "Rog Logo", "Picture" }); - comboMatrixRunning.Location = new Point(238, 10); - comboMatrixRunning.Margin = new Padding(10); + comboMatrixRunning.Location = new Point(200, 10); + comboMatrixRunning.Margin = new Padding(5, 10, 5, 10); comboMatrixRunning.Name = "comboMatrixRunning"; - comboMatrixRunning.Size = new Size(208, 40); + comboMatrixRunning.Size = new Size(185, 40); comboMatrixRunning.TabIndex = 42; comboMatrixRunning.TabStop = false; // @@ -184,10 +185,10 @@ namespace GHelper comboMatrix.FormattingEnabled = true; comboMatrix.ItemHeight = 32; comboMatrix.Items.AddRange(new object[] { "Off", "Dim", "Medium", "Bright" }); - comboMatrix.Location = new Point(10, 10); - comboMatrix.Margin = new Padding(10); + comboMatrix.Location = new Point(5, 10); + comboMatrix.Margin = new Padding(5, 10, 5, 10); comboMatrix.Name = "comboMatrix"; - comboMatrix.Size = new Size(208, 40); + comboMatrix.Size = new Size(185, 40); comboMatrix.TabIndex = 41; comboMatrix.TabStop = false; // @@ -221,10 +222,10 @@ namespace GHelper panelBattery.Controls.Add(labelBatteryTitle); panelBattery.Controls.Add(trackBattery); panelBattery.Dock = DockStyle.Top; - panelBattery.Location = new Point(16, 986); + panelBattery.Location = new Point(16, 944); panelBattery.Margin = new Padding(4); panelBattery.Name = "panelBattery"; - panelBattery.Size = new Size(722, 148); + panelBattery.Size = new Size(818, 148); panelBattery.TabIndex = 34; // // labelVersion @@ -242,7 +243,7 @@ namespace GHelper // labelBattery // labelBattery.Anchor = AnchorStyles.Top | AnchorStyles.Right; - labelBattery.Location = new Point(432, 12); + labelBattery.Location = new Point(528, 12); labelBattery.Margin = new Padding(4, 0, 4, 0); labelBattery.Name = "labelBattery"; labelBattery.Size = new Size(258, 32); @@ -280,7 +281,7 @@ namespace GHelper trackBattery.Maximum = 100; trackBattery.Minimum = 50; trackBattery.Name = "trackBattery"; - trackBattery.Size = new Size(684, 90); + trackBattery.Size = new Size(780, 90); trackBattery.SmallChange = 10; trackBattery.TabIndex = 33; trackBattery.TickFrequency = 10; @@ -292,17 +293,17 @@ namespace GHelper panelFooter.Controls.Add(buttonQuit); panelFooter.Controls.Add(checkStartup); panelFooter.Dock = DockStyle.Top; - panelFooter.Location = new Point(16, 1134); + panelFooter.Location = new Point(16, 1092); panelFooter.Margin = new Padding(4); panelFooter.Name = "panelFooter"; - panelFooter.Size = new Size(722, 64); + panelFooter.Size = new Size(818, 64); panelFooter.TabIndex = 35; // // buttonQuit // buttonQuit.Anchor = AnchorStyles.Top | AnchorStyles.Right; buttonQuit.BackColor = SystemColors.ButtonFace; - buttonQuit.Location = new Point(588, 9); + buttonQuit.Location = new Point(684, 9); buttonQuit.Margin = new Padding(4, 2, 4, 2); buttonQuit.Name = "buttonQuit"; buttonQuit.Size = new Size(116, 40); @@ -323,7 +324,6 @@ namespace GHelper // // panelPerformance // - panelPerformance.Controls.Add(buttonFans); panelPerformance.Controls.Add(picturePerf); panelPerformance.Controls.Add(labelPerf); panelPerformance.Controls.Add(labelCPUFan); @@ -332,22 +332,9 @@ namespace GHelper panelPerformance.Location = new Point(16, 16); panelPerformance.Margin = new Padding(0); panelPerformance.Name = "panelPerformance"; - panelPerformance.Size = new Size(722, 220); + panelPerformance.Size = new Size(818, 210); panelPerformance.TabIndex = 36; // - // buttonFans - // - buttonFans.Anchor = AnchorStyles.Top | AnchorStyles.Right; - buttonFans.BackColor = SystemColors.ButtonFace; - buttonFans.FlatAppearance.BorderSize = 0; - buttonFans.Location = new Point(479, 161); - buttonFans.Margin = new Padding(4, 2, 4, 2); - buttonFans.Name = "buttonFans"; - buttonFans.Size = new Size(213, 48); - buttonFans.TabIndex = 34; - buttonFans.Text = "Fans and Power"; - buttonFans.UseVisualStyleBackColor = false; - // // picturePerf // picturePerf.BackgroundImage = (Image)resources.GetObject("picturePerf.BackgroundImage"); @@ -374,7 +361,7 @@ namespace GHelper // labelCPUFan // labelCPUFan.Anchor = AnchorStyles.Top | AnchorStyles.Right; - labelCPUFan.Location = new Point(326, 10); + labelCPUFan.Location = new Point(422, 10); labelCPUFan.Margin = new Padding(4, 0, 4, 0); labelCPUFan.Name = "labelCPUFan"; labelCPUFan.Size = new Size(366, 32); @@ -387,38 +374,45 @@ namespace GHelper tablePerf.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; tablePerf.AutoScroll = true; tablePerf.AutoSizeMode = AutoSizeMode.GrowAndShrink; - tablePerf.ColumnCount = 3; - tablePerf.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.33333F)); - tablePerf.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.33333F)); - tablePerf.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.33333F)); - tablePerf.Controls.Add(buttonTurbo, 2, 0); - tablePerf.Controls.Add(buttonBalanced, 1, 0); + tablePerf.ColumnCount = 4; + tablePerf.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tablePerf.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tablePerf.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tablePerf.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); tablePerf.Controls.Add(buttonSilent, 0, 0); + tablePerf.Controls.Add(buttonBalanced, 1, 0); + tablePerf.Controls.Add(buttonTurbo, 2, 0); + tablePerf.Controls.Add(buttonFans, 3, 0); tablePerf.Location = new Point(15, 48); tablePerf.Margin = new Padding(4, 2, 4, 2); tablePerf.Name = "tablePerf"; tablePerf.RowCount = 1; tablePerf.RowStyles.Add(new RowStyle(SizeType.Absolute, 108F)); - tablePerf.Size = new Size(684, 108); + tablePerf.Size = new Size(780, 150); tablePerf.TabIndex = 29; // - // buttonTurbo + // buttonSilent // - buttonTurbo.Activated = false; - buttonTurbo.BackColor = SystemColors.ControlLightLight; - buttonTurbo.BorderColor = Color.Transparent; - buttonTurbo.Dock = DockStyle.Fill; - buttonTurbo.FlatAppearance.BorderColor = Color.FromArgb(192, 0, 0); - buttonTurbo.FlatAppearance.BorderSize = 0; - buttonTurbo.FlatStyle = FlatStyle.Flat; - buttonTurbo.ForeColor = SystemColors.ControlText; - buttonTurbo.Location = new Point(464, 12); - buttonTurbo.Margin = new Padding(8, 12, 8, 12); - buttonTurbo.Name = "buttonTurbo"; - buttonTurbo.Size = new Size(212, 84); - buttonTurbo.TabIndex = 2; - buttonTurbo.Text = "Turbo"; - buttonTurbo.UseVisualStyleBackColor = false; + buttonSilent.Activated = false; + buttonSilent.BackColor = SystemColors.ControlLightLight; + buttonSilent.BackgroundImageLayout = ImageLayout.None; + buttonSilent.BorderColor = Color.Transparent; + buttonSilent.CausesValidation = false; + buttonSilent.Dock = DockStyle.Fill; + buttonSilent.FlatAppearance.BorderColor = Color.FromArgb(0, 192, 192); + buttonSilent.FlatAppearance.BorderSize = 0; + buttonSilent.FlatStyle = FlatStyle.Flat; + buttonSilent.ForeColor = SystemColors.ControlText; + buttonSilent.Image = Properties.Resources.icons8_bicycle_48__1_; + buttonSilent.ImageAlign = ContentAlignment.BottomCenter; + buttonSilent.Location = new Point(4, 12); + buttonSilent.Margin = new Padding(4, 12, 4, 12); + buttonSilent.Name = "buttonSilent"; + buttonSilent.Size = new Size(187, 126); + buttonSilent.TabIndex = 0; + buttonSilent.Text = "Silent"; + buttonSilent.TextImageRelation = TextImageRelation.ImageAboveText; + buttonSilent.UseVisualStyleBackColor = false; // // buttonBalanced // @@ -430,59 +424,67 @@ namespace GHelper buttonBalanced.FlatAppearance.BorderSize = 0; buttonBalanced.FlatStyle = FlatStyle.Flat; buttonBalanced.ForeColor = SystemColors.ControlText; - buttonBalanced.Location = new Point(236, 12); - buttonBalanced.Margin = new Padding(8, 12, 8, 12); + buttonBalanced.Image = Properties.Resources.icons8_fiat_500_48; + buttonBalanced.ImageAlign = ContentAlignment.BottomCenter; + buttonBalanced.Location = new Point(199, 12); + buttonBalanced.Margin = new Padding(4, 12, 4, 12); buttonBalanced.Name = "buttonBalanced"; - buttonBalanced.Size = new Size(212, 84); + buttonBalanced.Size = new Size(187, 126); buttonBalanced.TabIndex = 1; buttonBalanced.Text = "Balanced"; + buttonBalanced.TextImageRelation = TextImageRelation.ImageAboveText; buttonBalanced.UseVisualStyleBackColor = false; // - // buttonSilent + // buttonTurbo // - buttonSilent.Activated = false; - buttonSilent.BackColor = SystemColors.ControlLightLight; - buttonSilent.BorderColor = Color.Transparent; - buttonSilent.CausesValidation = false; - buttonSilent.Dock = DockStyle.Fill; - buttonSilent.FlatAppearance.BorderColor = Color.FromArgb(0, 192, 192); - buttonSilent.FlatAppearance.BorderSize = 0; - buttonSilent.FlatStyle = FlatStyle.Flat; - buttonSilent.ForeColor = SystemColors.ControlText; - buttonSilent.Location = new Point(8, 12); - buttonSilent.Margin = new Padding(8, 12, 8, 12); - buttonSilent.Name = "buttonSilent"; - buttonSilent.Size = new Size(212, 84); - buttonSilent.TabIndex = 0; - buttonSilent.Text = "Silent"; - buttonSilent.UseVisualStyleBackColor = false; + buttonTurbo.Activated = false; + buttonTurbo.BackColor = SystemColors.ControlLightLight; + buttonTurbo.BorderColor = Color.Transparent; + buttonTurbo.Dock = DockStyle.Fill; + buttonTurbo.FlatAppearance.BorderColor = Color.FromArgb(192, 0, 0); + buttonTurbo.FlatAppearance.BorderSize = 0; + buttonTurbo.FlatStyle = FlatStyle.Flat; + buttonTurbo.ForeColor = SystemColors.ControlText; + buttonTurbo.Image = Properties.Resources.icons8_rocket_48; + buttonTurbo.ImageAlign = ContentAlignment.BottomCenter; + buttonTurbo.Location = new Point(394, 12); + buttonTurbo.Margin = new Padding(4, 12, 4, 12); + buttonTurbo.Name = "buttonTurbo"; + buttonTurbo.Size = new Size(187, 126); + buttonTurbo.TabIndex = 2; + buttonTurbo.Text = "Turbo"; + buttonTurbo.TextImageRelation = TextImageRelation.ImageAboveText; + buttonTurbo.UseVisualStyleBackColor = false; + // + // buttonFans + // + buttonFans.BackColor = SystemColors.ButtonFace; + buttonFans.Dock = DockStyle.Fill; + buttonFans.FlatAppearance.BorderSize = 0; + buttonFans.Image = Properties.Resources.icons8_fan_48; + buttonFans.ImageAlign = ContentAlignment.BottomCenter; + buttonFans.Location = new Point(589, 12); + buttonFans.Margin = new Padding(4, 12, 4, 12); + buttonFans.Name = "buttonFans"; + buttonFans.Size = new Size(187, 126); + buttonFans.TabIndex = 35; + buttonFans.Text = "Fans + Power"; + buttonFans.TextImageRelation = TextImageRelation.ImageAboveText; + buttonFans.UseVisualStyleBackColor = false; // // panelGPU // - panelGPU.Controls.Add(checkGPU); panelGPU.Controls.Add(pictureGPU); panelGPU.Controls.Add(labelGPU); panelGPU.Controls.Add(labelGPUFan); panelGPU.Controls.Add(tableGPU); panelGPU.Dock = DockStyle.Top; - panelGPU.Location = new Point(16, 236); + panelGPU.Location = new Point(16, 226); panelGPU.Margin = new Padding(4); panelGPU.Name = "panelGPU"; - panelGPU.Size = new Size(722, 216); + panelGPU.Size = new Size(818, 210); panelGPU.TabIndex = 37; // - // checkGPU - // - checkGPU.AutoSize = true; - checkGPU.ForeColor = SystemColors.GrayText; - checkGPU.Location = new Point(27, 155); - checkGPU.Margin = new Padding(4, 2, 4, 2); - checkGPU.Name = "checkGPU"; - checkGPU.Size = new Size(550, 36); - checkGPU.TabIndex = 20; - checkGPU.Text = "Set Eco on battery and Standard when plugged"; - checkGPU.UseVisualStyleBackColor = true; - // // pictureGPU // pictureGPU.BackgroundImage = (Image)resources.GetObject("pictureGPU.BackgroundImage"); @@ -508,7 +510,7 @@ namespace GHelper // labelGPUFan // labelGPUFan.Anchor = AnchorStyles.Top | AnchorStyles.Right; - labelGPUFan.Location = new Point(346, 10); + labelGPUFan.Location = new Point(442, 10); labelGPUFan.Margin = new Padding(4, 0, 4, 0); labelGPUFan.Name = "labelGPUFan"; labelGPUFan.Size = new Size(348, 32); @@ -519,56 +521,44 @@ namespace GHelper // tableGPU // tableGPU.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - tableGPU.AutoSize = true; + tableGPU.AutoScroll = true; tableGPU.AutoSizeMode = AutoSizeMode.GrowAndShrink; - tableGPU.ColumnCount = 3; - tableGPU.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.33333F)); - tableGPU.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.33333F)); - tableGPU.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.33333F)); - tableGPU.Controls.Add(buttonUltimate, 2, 0); - tableGPU.Controls.Add(buttonStandard, 1, 0); - tableGPU.Controls.Add(buttonEco, 0, 0); + tableGPU.ColumnCount = 4; + tableGPU.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tableGPU.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tableGPU.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tableGPU.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tableGPU.Controls.Add(buttonOptimized, 0, 0); + tableGPU.Controls.Add(buttonEco, 1, 0); + tableGPU.Controls.Add(buttonStandard, 2, 0); + tableGPU.Controls.Add(buttonUltimate, 3, 0); tableGPU.Location = new Point(15, 48); tableGPU.Margin = new Padding(4, 2, 4, 2); tableGPU.Name = "tableGPU"; tableGPU.RowCount = 1; tableGPU.RowStyles.Add(new RowStyle(SizeType.Absolute, 108F)); - tableGPU.Size = new Size(684, 108); + tableGPU.Size = new Size(776, 150); tableGPU.TabIndex = 16; // - // buttonUltimate + // buttonOptimized // - buttonUltimate.Activated = false; - buttonUltimate.BackColor = SystemColors.ControlLightLight; - buttonUltimate.BorderColor = Color.Transparent; - buttonUltimate.Dock = DockStyle.Fill; - buttonUltimate.FlatAppearance.BorderSize = 0; - buttonUltimate.FlatStyle = FlatStyle.Flat; - buttonUltimate.ForeColor = SystemColors.ControlText; - buttonUltimate.Location = new Point(464, 12); - buttonUltimate.Margin = new Padding(8, 12, 8, 12); - buttonUltimate.Name = "buttonUltimate"; - buttonUltimate.Size = new Size(212, 84); - buttonUltimate.TabIndex = 2; - buttonUltimate.Text = "Ultimate"; - buttonUltimate.UseVisualStyleBackColor = false; - // - // buttonStandard - // - buttonStandard.Activated = false; - buttonStandard.BackColor = SystemColors.ControlLightLight; - buttonStandard.BorderColor = Color.Transparent; - buttonStandard.Dock = DockStyle.Fill; - buttonStandard.FlatAppearance.BorderSize = 0; - buttonStandard.FlatStyle = FlatStyle.Flat; - buttonStandard.ForeColor = SystemColors.ControlText; - buttonStandard.Location = new Point(236, 12); - buttonStandard.Margin = new Padding(8, 12, 8, 12); - buttonStandard.Name = "buttonStandard"; - buttonStandard.Size = new Size(212, 84); - buttonStandard.TabIndex = 1; - buttonStandard.Text = "Standard"; - buttonStandard.UseVisualStyleBackColor = false; + buttonOptimized.Activated = false; + buttonOptimized.BackColor = SystemColors.ControlLightLight; + buttonOptimized.BorderColor = Color.Transparent; + buttonOptimized.Dock = DockStyle.Fill; + buttonOptimized.FlatAppearance.BorderSize = 0; + buttonOptimized.FlatStyle = FlatStyle.Flat; + buttonOptimized.ForeColor = SystemColors.ControlText; + buttonOptimized.Image = Properties.Resources.icons8_project_management_48__1_; + buttonOptimized.ImageAlign = ContentAlignment.BottomCenter; + buttonOptimized.Location = new Point(4, 12); + buttonOptimized.Margin = new Padding(4, 12, 4, 12); + buttonOptimized.Name = "buttonOptimized"; + buttonOptimized.Size = new Size(186, 126); + buttonOptimized.TabIndex = 3; + buttonOptimized.Text = "Optimized"; + buttonOptimized.TextImageRelation = TextImageRelation.ImageAboveText; + buttonOptimized.UseVisualStyleBackColor = false; // // buttonEco // @@ -580,74 +570,106 @@ namespace GHelper buttonEco.FlatAppearance.BorderSize = 0; buttonEco.FlatStyle = FlatStyle.Flat; buttonEco.ForeColor = SystemColors.ControlText; - buttonEco.Location = new Point(8, 12); - buttonEco.Margin = new Padding(8, 12, 8, 12); + buttonEco.Image = Properties.Resources.icons8_leaf_48; + buttonEco.ImageAlign = ContentAlignment.BottomCenter; + buttonEco.Location = new Point(198, 12); + buttonEco.Margin = new Padding(4, 12, 4, 12); buttonEco.Name = "buttonEco"; - buttonEco.Size = new Size(212, 84); + buttonEco.Size = new Size(186, 126); buttonEco.TabIndex = 0; buttonEco.Text = "Eco"; + buttonEco.TextImageRelation = TextImageRelation.ImageAboveText; buttonEco.UseVisualStyleBackColor = false; // + // buttonStandard + // + buttonStandard.Activated = false; + buttonStandard.BackColor = SystemColors.ControlLightLight; + buttonStandard.BorderColor = Color.Transparent; + buttonStandard.Dock = DockStyle.Fill; + buttonStandard.FlatAppearance.BorderSize = 0; + buttonStandard.FlatStyle = FlatStyle.Flat; + buttonStandard.ForeColor = SystemColors.ControlText; + buttonStandard.Image = Properties.Resources.icons8_spa_flower_48; + buttonStandard.ImageAlign = ContentAlignment.BottomCenter; + buttonStandard.Location = new Point(392, 12); + buttonStandard.Margin = new Padding(4, 12, 4, 12); + buttonStandard.Name = "buttonStandard"; + buttonStandard.Size = new Size(186, 126); + buttonStandard.TabIndex = 1; + buttonStandard.Text = "Standard"; + buttonStandard.TextImageRelation = TextImageRelation.ImageAboveText; + buttonStandard.UseVisualStyleBackColor = false; + // + // buttonUltimate + // + buttonUltimate.Activated = false; + buttonUltimate.BackColor = SystemColors.ControlLightLight; + buttonUltimate.BorderColor = Color.Transparent; + buttonUltimate.Dock = DockStyle.Fill; + buttonUltimate.FlatAppearance.BorderSize = 0; + buttonUltimate.FlatStyle = FlatStyle.Flat; + buttonUltimate.ForeColor = SystemColors.ControlText; + buttonUltimate.Image = Properties.Resources.icons8_game_controller_48; + buttonUltimate.ImageAlign = ContentAlignment.BottomCenter; + buttonUltimate.Location = new Point(586, 12); + buttonUltimate.Margin = new Padding(4, 12, 4, 12); + buttonUltimate.Name = "buttonUltimate"; + buttonUltimate.Size = new Size(186, 126); + buttonUltimate.TabIndex = 2; + buttonUltimate.Text = "Ultimate"; + buttonUltimate.TextImageRelation = TextImageRelation.ImageAboveText; + buttonUltimate.UseVisualStyleBackColor = false; + // // panelScreen // - panelScreen.Controls.Add(checkScreen); panelScreen.Controls.Add(tableScreen); panelScreen.Controls.Add(pictureScreen); panelScreen.Controls.Add(labelSreen); panelScreen.Dock = DockStyle.Top; - panelScreen.Location = new Point(16, 452); + panelScreen.Location = new Point(16, 436); panelScreen.Margin = new Padding(4); panelScreen.Name = "panelScreen"; - panelScreen.Size = new Size(722, 200); + panelScreen.Size = new Size(818, 182); panelScreen.TabIndex = 38; // - // checkScreen - // - checkScreen.AutoSize = true; - checkScreen.ForeColor = SystemColors.GrayText; - checkScreen.Location = new Point(27, 154); - checkScreen.Margin = new Padding(4, 2, 4, 2); - checkScreen.Name = "checkScreen"; - checkScreen.Size = new Size(527, 36); - checkScreen.TabIndex = 24; - checkScreen.Text = "Set 60Hz on battery, and back when plugged"; - checkScreen.UseVisualStyleBackColor = true; - // // tableScreen // tableScreen.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; tableScreen.AutoSize = true; tableScreen.AutoSizeMode = AutoSizeMode.GrowAndShrink; - tableScreen.ColumnCount = 3; - tableScreen.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.33333F)); - tableScreen.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.33333F)); - tableScreen.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.33333F)); - tableScreen.Controls.Add(button120Hz, 1, 0); - tableScreen.Controls.Add(button60Hz, 0, 0); + tableScreen.ColumnCount = 4; + tableScreen.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tableScreen.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tableScreen.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tableScreen.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tableScreen.Controls.Add(buttonScreenAuto, 0, 0); + tableScreen.Controls.Add(button60Hz, 1, 0); + tableScreen.Controls.Add(button120Hz, 2, 0); tableScreen.Location = new Point(15, 48); tableScreen.Margin = new Padding(4, 2, 4, 2); tableScreen.Name = "tableScreen"; tableScreen.RowCount = 1; tableScreen.RowStyles.Add(new RowStyle(SizeType.Absolute, 108F)); - tableScreen.Size = new Size(684, 108); + tableScreen.Size = new Size(776, 108); tableScreen.TabIndex = 23; // - // button120Hz + // buttonScreenAuto // - button120Hz.Activated = false; - button120Hz.BackColor = SystemColors.ControlLightLight; - button120Hz.BorderColor = Color.Transparent; - button120Hz.Dock = DockStyle.Fill; - button120Hz.FlatAppearance.BorderSize = 0; - button120Hz.FlatStyle = FlatStyle.Flat; - button120Hz.ForeColor = SystemColors.ControlText; - button120Hz.Location = new Point(236, 12); - button120Hz.Margin = new Padding(8, 12, 8, 12); - button120Hz.Name = "button120Hz"; - button120Hz.Size = new Size(212, 84); - button120Hz.TabIndex = 1; - button120Hz.Text = "120Hz + OD"; - button120Hz.UseVisualStyleBackColor = false; + buttonScreenAuto.Activated = false; + buttonScreenAuto.BackColor = SystemColors.ControlLightLight; + buttonScreenAuto.BorderColor = Color.Transparent; + buttonScreenAuto.Dock = DockStyle.Fill; + buttonScreenAuto.FlatAppearance.BorderSize = 0; + buttonScreenAuto.FlatStyle = FlatStyle.Flat; + buttonScreenAuto.ForeColor = SystemColors.ControlText; + buttonScreenAuto.Location = new Point(4, 12); + buttonScreenAuto.Margin = new Padding(4, 12, 4, 12); + buttonScreenAuto.Name = "buttonScreenAuto"; + buttonScreenAuto.Size = new Size(186, 84); + buttonScreenAuto.TabIndex = 0; + buttonScreenAuto.Text = "Auto"; + buttonScreenAuto.UseVisualStyleBackColor = false; // // button60Hz // @@ -659,14 +681,31 @@ namespace GHelper button60Hz.FlatAppearance.BorderSize = 0; button60Hz.FlatStyle = FlatStyle.Flat; button60Hz.ForeColor = SystemColors.ControlText; - button60Hz.Location = new Point(8, 12); - button60Hz.Margin = new Padding(8, 12, 8, 12); + button60Hz.Location = new Point(198, 12); + button60Hz.Margin = new Padding(4, 12, 4, 12); button60Hz.Name = "button60Hz"; - button60Hz.Size = new Size(212, 84); - button60Hz.TabIndex = 0; + button60Hz.Size = new Size(186, 84); + button60Hz.TabIndex = 1; button60Hz.Text = "60Hz"; button60Hz.UseVisualStyleBackColor = false; // + // button120Hz + // + button120Hz.Activated = false; + button120Hz.BackColor = SystemColors.ControlLightLight; + button120Hz.BorderColor = Color.Transparent; + button120Hz.Dock = DockStyle.Fill; + button120Hz.FlatAppearance.BorderSize = 0; + button120Hz.FlatStyle = FlatStyle.Flat; + button120Hz.ForeColor = SystemColors.ControlText; + button120Hz.Location = new Point(392, 12); + button120Hz.Margin = new Padding(4, 12, 4, 12); + button120Hz.Name = "button120Hz"; + button120Hz.Size = new Size(186, 84); + button120Hz.TabIndex = 2; + button120Hz.Text = "120Hz + OD"; + button120Hz.UseVisualStyleBackColor = false; + // // pictureScreen // pictureScreen.BackgroundImage = (Image)resources.GetObject("pictureScreen.BackgroundImage"); @@ -695,19 +734,20 @@ namespace GHelper panelKeyboard.Controls.Add(pictureKeyboard); panelKeyboard.Controls.Add(label1); panelKeyboard.Dock = DockStyle.Top; - panelKeyboard.Location = new Point(16, 652); + panelKeyboard.Location = new Point(16, 618); panelKeyboard.Margin = new Padding(4); panelKeyboard.Name = "panelKeyboard"; - panelKeyboard.Size = new Size(722, 154); + panelKeyboard.Size = new Size(818, 146); panelKeyboard.TabIndex = 39; // // tableLayoutKeyboard // tableLayoutKeyboard.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - tableLayoutKeyboard.ColumnCount = 3; - tableLayoutKeyboard.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.33333F)); - tableLayoutKeyboard.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F)); - tableLayoutKeyboard.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F)); + tableLayoutKeyboard.ColumnCount = 4; + tableLayoutKeyboard.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tableLayoutKeyboard.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tableLayoutKeyboard.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tableLayoutKeyboard.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); tableLayoutKeyboard.Controls.Add(buttonKeyboard, 2, 0); tableLayoutKeyboard.Controls.Add(comboKeyboard, 0, 0); tableLayoutKeyboard.Controls.Add(panelColor, 1, 0); @@ -716,7 +756,7 @@ namespace GHelper tableLayoutKeyboard.Name = "tableLayoutKeyboard"; tableLayoutKeyboard.RowCount = 1; tableLayoutKeyboard.RowStyles.Add(new RowStyle(SizeType.Percent, 100F)); - tableLayoutKeyboard.Size = new Size(684, 66); + tableLayoutKeyboard.Size = new Size(780, 66); tableLayoutKeyboard.TabIndex = 39; // // buttonKeyboard @@ -724,10 +764,10 @@ namespace GHelper buttonKeyboard.BackColor = SystemColors.ButtonFace; buttonKeyboard.Dock = DockStyle.Top; buttonKeyboard.FlatAppearance.BorderSize = 0; - buttonKeyboard.Location = new Point(466, 10); - buttonKeyboard.Margin = new Padding(10); + buttonKeyboard.Location = new Point(395, 10); + buttonKeyboard.Margin = new Padding(5, 10, 5, 10); buttonKeyboard.Name = "buttonKeyboard"; - buttonKeyboard.Size = new Size(208, 42); + buttonKeyboard.Size = new Size(185, 42); buttonKeyboard.TabIndex = 37; buttonKeyboard.Text = "Extra"; buttonKeyboard.UseVisualStyleBackColor = false; @@ -739,10 +779,10 @@ namespace GHelper comboKeyboard.FormattingEnabled = true; comboKeyboard.ItemHeight = 32; comboKeyboard.Items.AddRange(new object[] { "Static", "Breathe", "Strobe", "Rainbow", "Dingding" }); - comboKeyboard.Location = new Point(10, 10); - comboKeyboard.Margin = new Padding(10); + comboKeyboard.Location = new Point(5, 10); + comboKeyboard.Margin = new Padding(5, 10, 5, 10); comboKeyboard.Name = "comboKeyboard"; - comboKeyboard.Size = new Size(208, 40); + comboKeyboard.Size = new Size(185, 40); comboKeyboard.TabIndex = 35; comboKeyboard.TabStop = false; // @@ -752,16 +792,16 @@ namespace GHelper panelColor.Controls.Add(pictureColor); panelColor.Controls.Add(buttonKeyboardColor); panelColor.Dock = DockStyle.Fill; - panelColor.Location = new Point(238, 10); - panelColor.Margin = new Padding(10); + panelColor.Location = new Point(200, 10); + panelColor.Margin = new Padding(5, 10, 5, 10); panelColor.Name = "panelColor"; - panelColor.Size = new Size(208, 46); + panelColor.Size = new Size(185, 46); panelColor.TabIndex = 36; // // pictureColor2 // pictureColor2.Anchor = AnchorStyles.Top | AnchorStyles.Right; - pictureColor2.Location = new Point(148, 12); + pictureColor2.Location = new Point(125, 12); pictureColor2.Margin = new Padding(4); pictureColor2.Name = "pictureColor2"; pictureColor2.Size = new Size(20, 20); @@ -771,7 +811,7 @@ namespace GHelper // pictureColor // pictureColor.Anchor = AnchorStyles.Top | AnchorStyles.Right; - pictureColor.Location = new Point(176, 12); + pictureColor.Location = new Point(153, 12); pictureColor.Margin = new Padding(4); pictureColor.Name = "pictureColor"; pictureColor.Size = new Size(20, 20); @@ -788,7 +828,7 @@ namespace GHelper buttonKeyboardColor.Location = new Point(0, 0); buttonKeyboardColor.Margin = new Padding(0); buttonKeyboardColor.Name = "buttonKeyboardColor"; - buttonKeyboardColor.Size = new Size(208, 42); + buttonKeyboardColor.Size = new Size(185, 42); buttonKeyboardColor.TabIndex = 39; buttonKeyboardColor.Text = "Color "; buttonKeyboardColor.UseVisualStyleBackColor = false; @@ -821,7 +861,7 @@ namespace GHelper AutoScaleMode = AutoScaleMode.Dpi; AutoSize = true; AutoSizeMode = AutoSizeMode.GrowAndShrink; - ClientSize = new Size(754, 1217); + ClientSize = new Size(850, 1217); Controls.Add(panelFooter); Controls.Add(panelBattery); Controls.Add(panelMatrix); @@ -833,7 +873,7 @@ namespace GHelper MaximizeBox = false; MdiChildrenMinimizedAnchorBottom = false; MinimizeBox = false; - MinimumSize = new Size(780, 0); + MinimumSize = new Size(850, 0); Name = "SettingsForm"; Padding = new Padding(16); ShowIcon = false; @@ -886,7 +926,6 @@ namespace GHelper private Button buttonQuit; private CheckBox checkStartup; private Panel panelPerformance; - private Button buttonFans; private PictureBox picturePerf; private Label labelPerf; private Label labelCPUFan; @@ -895,7 +934,6 @@ namespace GHelper private RoundedButton buttonBalanced; private RoundedButton buttonSilent; private Panel panelGPU; - private CheckBox checkGPU; private PictureBox pictureGPU; private Label labelGPU; private Label labelGPUFan; @@ -904,9 +942,8 @@ namespace GHelper private RoundedButton buttonStandard; private RoundedButton buttonEco; private Panel panelScreen; - private CheckBox checkScreen; private TableLayoutPanel tableScreen; - private RoundedButton button120Hz; + private RoundedButton buttonScreenAuto; private RoundedButton button60Hz; private PictureBox pictureScreen; private Label labelSreen; @@ -925,5 +962,8 @@ namespace GHelper private PictureBox pictureColor; private Button buttonKeyboardColor; private CheckBox checkMatrix; + private RoundedButton button120Hz; + private Button buttonFans; + private RoundedButton buttonOptimized; } } \ No newline at end of file diff --git a/app/Settings.cs b/app/Settings.cs index 4f9ddafd..ce9df821 100644 --- a/app/Settings.cs +++ b/app/Settings.cs @@ -36,6 +36,7 @@ namespace GHelper buttonSilent.BorderColor = colorEco; buttonBalanced.BorderColor = colorStandard; buttonTurbo.BorderColor = colorTurbo; + buttonOptimized.BorderColor = colorEco; buttonEco.BorderColor = colorEco; buttonStandard.BorderColor = colorStandard; @@ -43,7 +44,9 @@ namespace GHelper button60Hz.BorderColor = SystemColors.ActiveBorder; button120Hz.BorderColor = SystemColors.ActiveBorder; + buttonScreenAuto.BorderColor = colorEco; + buttonOptimized.Click += ButtonOptimized_Click; buttonSilent.Click += ButtonSilent_Click; buttonBalanced.Click += ButtonBalanced_Click; buttonTurbo.Click += ButtonTurbo_Click; @@ -58,13 +61,10 @@ namespace GHelper button60Hz.Click += Button60Hz_Click; button120Hz.Click += Button120Hz_Click; + buttonScreenAuto.Click += ButtonScreenAuto_Click; buttonQuit.Click += ButtonQuit_Click; - checkGPU.CheckedChanged += CheckGPU_CheckedChanged; - - checkScreen.CheckedChanged += checkScreen_CheckedChanged; - comboKeyboard.DropDownStyle = ComboBoxStyle.DropDownList; comboKeyboard.SelectedIndex = 0; comboKeyboard.SelectedValueChanged += ComboKeyboard_SelectedValueChanged; @@ -98,6 +98,19 @@ namespace GHelper } + private void ButtonOptimized_Click(object? sender, EventArgs e) + { + Program.config.setConfig("gpu_auto", (Program.config.getConfig("gpu_auto") == 1) ? 0 : 1); + VisualiseGPUMode(); + AutoGPUMode(SystemInformation.PowerStatus.PowerLineStatus); + } + + private void ButtonScreenAuto_Click(object? sender, EventArgs e) + { + Program.config.setConfig("screen_auto", 1); + InitScreen(); + AutoScreen(SystemInformation.PowerStatus.PowerLineStatus); + } protected override void WndProc(ref Message m) { @@ -130,12 +143,6 @@ namespace GHelper base.WndProc(ref m); } - private void CheckGPU_CheckedChanged(object? sender, EventArgs e) - { - if (sender is null) return; - CheckBox check = (CheckBox)sender; - Program.config.setConfig("gpu_auto", check.Checked ? 1 : 0); - } public void SetVersionLabel(string label, string url = null) { @@ -528,11 +535,13 @@ namespace GHelper private void Button120Hz_Click(object? sender, EventArgs e) { + Program.config.setConfig("screen_auto", 0); SetScreen(1000, 1); } private void Button60Hz_Click(object? sender, EventArgs e) { + Program.config.setConfig("screen_auto", 0); SetScreen(60, 0); } @@ -561,7 +570,9 @@ namespace GHelper if (overdrive > 0) Program.wmi.DeviceSet(ASUSWmi.ScreenOverdrive, overdrive); + //Program.config.setConfig("screen_auto", 0); InitScreen(); + Logger.WriteLine("Screen " + frequency.ToString() + "Hz"); } @@ -572,6 +583,8 @@ namespace GHelper int frequency = NativeMethods.GetRefreshRate(); int maxFrequency = Program.config.getConfig("max_frequency"); + bool screenAuto = (Program.config.getConfig("screen_auto") == 1); + if (frequency < 0) { button60Hz.Enabled = false; @@ -586,7 +599,7 @@ namespace GHelper button120Hz.Enabled = true; button60Hz.BackColor = SystemColors.ControlLightLight; button120Hz.BackColor = SystemColors.ControlLightLight; - labelSreen.Text = "Laptop Screen"; + labelSreen.Text = "Laptop Screen: " + frequency + "Hz"; } int overdrive = 0; @@ -601,8 +614,13 @@ namespace GHelper button60Hz.Activated = false; button120Hz.Activated = false; + buttonScreenAuto.Activated = false; - if (frequency == 60) + if (screenAuto) + { + buttonScreenAuto.Activated = true; + } + else if (frequency == 60) { button60Hz.Activated = true; } @@ -857,8 +875,7 @@ namespace GHelper public void AutoScreen(PowerLineStatus Plugged = PowerLineStatus.Online) { - int ScreenAuto = Program.config.getConfig("screen_auto"); - if (ScreenAuto != 1) return; + if (Program.config.getConfig("screen_auto") != 1) return; if (Plugged == PowerLineStatus.Online) SetScreen(1000, 1); @@ -871,8 +888,8 @@ namespace GHelper public bool AutoGPUMode(PowerLineStatus Plugged = PowerLineStatus.Online) { - int GpuAuto = Program.config.getConfig("gpu_auto"); - if (GpuAuto != 1) return false; + bool GpuAuto = Program.config.getConfig("gpu_auto") == 1; + if (!GpuAuto) return false; int eco = Program.wmi.DeviceGet(ASUSWmi.GPUEco); int mux = Program.wmi.DeviceGet(ASUSWmi.GPUMux); @@ -917,6 +934,7 @@ namespace GHelper buttonUltimate.Visible = (mux == 1); } + ButtonEnabled(buttonOptimized, true); ButtonEnabled(buttonEco, true); ButtonEnabled(buttonStandard, true); ButtonEnabled(buttonUltimate, true); @@ -932,6 +950,7 @@ namespace GHelper public void SetEcoGPU(int eco) { + ButtonEnabled(buttonOptimized, false); ButtonEnabled(buttonEco, false); ButtonEnabled(buttonStandard, false); ButtonEnabled(buttonUltimate, false); @@ -968,9 +987,13 @@ namespace GHelper { int CurrentGPU = Program.config.getConfig("gpu_mode"); + Program.config.setConfig("gpu_auto", 0); if (CurrentGPU == GPUMode) + { + VisualiseGPUMode(); return; + } var restart = false; var changed = false; @@ -987,7 +1010,7 @@ namespace GHelper } else if (GPUMode == ASUSWmi.GPUModeUltimate) { - DialogResult dialogResult = MessageBox.Show(" Ultimate Mode requires restart", "Reboot now?", MessageBoxButtons.YesNo); + DialogResult dialogResult = MessageBox.Show("Ultimate Mode requires restart", "Reboot now?", MessageBoxButtons.YesNo); if (dialogResult == DialogResult.Yes) { Program.wmi.DeviceSet(ASUSWmi.GPUMux, 0); @@ -1012,60 +1035,55 @@ namespace GHelper if (changed) { Program.config.setConfig("gpu_mode", GPUMode); - HardwareMonitor.RecreateGpuTemperatureProviderWithRetry(); } if (restart) { - VisualiseGPUMode(GPUMode); + VisualiseGPUMode(); Process.Start("shutdown", "/r /t 1"); } } - public void VisualiseGPUAuto(int GPUAuto) - { - checkGPU.Checked = (GPUAuto == 1); - } - - public void VisualiseScreenAuto(int ScreenAuto) - { - checkScreen.Checked = (ScreenAuto == 1); - } - public void VisualiseGPUMode(int GPUMode = -1) { if (GPUMode == -1) - { GPUMode = Program.config.getConfig("gpu_mode"); - } + + bool GPUAuto = (Program.config.getConfig("gpu_auto") == 1); buttonEco.Activated = false; buttonStandard.Activated = false; buttonUltimate.Activated = false; + buttonOptimized.Activated = false; switch (GPUMode) { case ASUSWmi.GPUModeEco: - buttonEco.Activated = true; + buttonOptimized.BorderColor = colorEco; + buttonEco.Activated = !GPUAuto; + buttonOptimized.Activated = GPUAuto; labelGPU.Text = "GPU Mode: iGPU only"; - Program.trayIcon.Icon = GHelper.Properties.Resources.eco; + Program.trayIcon.Icon = Properties.Resources.eco; break; case ASUSWmi.GPUModeUltimate: buttonUltimate.Activated = true; labelGPU.Text = "GPU Mode: dGPU exclusive"; - Program.trayIcon.Icon = GHelper.Properties.Resources.ultimate; + Program.trayIcon.Icon = Properties.Resources.ultimate; break; default: - buttonStandard.Activated = true; + buttonOptimized.BorderColor = colorStandard; + buttonStandard.Activated = !GPUAuto; + buttonOptimized.Activated = GPUAuto; labelGPU.Text = "GPU Mode: iGPU + dGPU"; - Program.trayIcon.Icon = GHelper.Properties.Resources.standard; + Program.trayIcon.Icon = Properties.Resources.standard; break; } + } @@ -1123,14 +1141,6 @@ namespace GHelper } - private void checkScreen_CheckedChanged(object? sender, EventArgs e) - { - if (sender is null) return; - CheckBox check = (CheckBox)sender; - Program.config.setConfig("screen_auto", check.Checked ? 1 : 0); - } - - }