From 18384bbddcfb1a4c5618fafd28d935530a65988a Mon Sep 17 00:00:00 2001 From: IceStormNG Date: Sun, 23 Jul 2023 11:57:44 +0200 Subject: [PATCH] Added Peripherals Panel to main window (buttons have no function yet... coming soon) --- app/Properties/Strings.Designer.cs | 18 + app/Properties/Strings.resx | 6 + app/Settings.Designer.cs | 561 ++++++++++++++++++----------- app/Settings.cs | 69 ++++ 4 files changed, 441 insertions(+), 213 deletions(-) diff --git a/app/Properties/Strings.Designer.cs b/app/Properties/Strings.Designer.cs index 76e439e1..a5c19305 100644 --- a/app/Properties/Strings.Designer.cs +++ b/app/Properties/Strings.Designer.cs @@ -916,6 +916,15 @@ namespace GHelper.Properties { return ResourceManager.GetString("NoNewUpdates", resourceCulture); } } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Not Connected ähnelt. + /// + internal static string NotConnected { + get { + return ResourceManager.GetString("NotConnected", resourceCulture); + } + } /// /// Looks up a localized string similar to Open G-Helper window. @@ -980,6 +989,15 @@ namespace GHelper.Properties { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Peripherals ähnelt. + /// + internal static string Peripherals { + get { + return ResourceManager.GetString("Peripherals", resourceCulture); + } + } + /// /// Looks up a localized string similar to Picture / Gif. /// diff --git a/app/Properties/Strings.resx b/app/Properties/Strings.resx index 2675997c..aa381582 100644 --- a/app/Properties/Strings.resx +++ b/app/Properties/Strings.resx @@ -404,6 +404,9 @@ Do you still want to continue? No new updates + + Not Connected + Open G-Helper window @@ -425,6 +428,9 @@ Do you still want to continue? Mode + + Peripherals + Picture / Gif diff --git a/app/Settings.Designer.cs b/app/Settings.Designer.cs index 17a31b32..78308abd 100644 --- a/app/Settings.Designer.cs +++ b/app/Settings.Designer.cs @@ -97,6 +97,14 @@ namespace GHelper labelVersion = new Label(); labelModel = new Label(); panelVersion = new Panel(); + panelPeripherals = new Panel(); + tableLayoutPeripherals = new TableLayoutPanel(); + buttonPeripheral3 = new RButton(); + buttonPeripheral2 = new RButton(); + buttonPeripheral1 = new RButton(); + panelPeripheralsTile = new Panel(); + picturePeripherals = new PictureBox(); + labelPeripherals = new Label(); panelMatrix.SuspendLayout(); tableLayoutMatrix.SuspendLayout(); panelMatrixTitle.SuspendLayout(); @@ -125,6 +133,10 @@ namespace GHelper panelKeyboardTitle.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureKeyboard).BeginInit(); panelVersion.SuspendLayout(); + panelPeripherals.SuspendLayout(); + tableLayoutPeripherals.SuspendLayout(); + panelPeripheralsTile.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)picturePeripherals).BeginInit(); SuspendLayout(); // // panelMatrix @@ -135,11 +147,11 @@ namespace GHelper panelMatrix.Controls.Add(panelMatrixTitle); panelMatrix.Controls.Add(checkMatrix); panelMatrix.Dock = DockStyle.Top; - panelMatrix.Location = new Point(11, 898); + panelMatrix.Location = new Point(8, 675); panelMatrix.Margin = new Padding(0); panelMatrix.Name = "panelMatrix"; - panelMatrix.Padding = new Padding(20, 20, 20, 11); - panelMatrix.Size = new Size(811, 171); + panelMatrix.Padding = new Padding(15, 15, 15, 8); + panelMatrix.Size = new Size(621, 130); panelMatrix.TabIndex = 4; // // tableLayoutMatrix @@ -155,12 +167,12 @@ namespace GHelper tableLayoutMatrix.Controls.Add(comboMatrixRunning, 1, 0); tableLayoutMatrix.Controls.Add(buttonMatrix, 2, 0); tableLayoutMatrix.Dock = DockStyle.Top; - tableLayoutMatrix.Location = new Point(20, 60); - tableLayoutMatrix.Margin = new Padding(8); + tableLayoutMatrix.Location = new Point(15, 45); + tableLayoutMatrix.Margin = new Padding(6); tableLayoutMatrix.Name = "tableLayoutMatrix"; tableLayoutMatrix.RowCount = 1; tableLayoutMatrix.RowStyles.Add(new RowStyle(SizeType.Percent, 100F)); - tableLayoutMatrix.Size = new Size(771, 60); + tableLayoutMatrix.Size = new Size(591, 47); tableLayoutMatrix.TabIndex = 43; // // comboMatrix @@ -170,12 +182,12 @@ namespace GHelper comboMatrix.Dock = DockStyle.Top; comboMatrix.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); comboMatrix.FormattingEnabled = true; - comboMatrix.ItemHeight = 32; + comboMatrix.ItemHeight = 25; comboMatrix.Items.AddRange(new object[] { Properties.Strings.MatrixOff, Properties.Strings.MatrixDim, Properties.Strings.MatrixMedium, Properties.Strings.MatrixBright }); - comboMatrix.Location = new Point(4, 11); - comboMatrix.Margin = new Padding(4, 11, 4, 8); + comboMatrix.Location = new Point(3, 8); + comboMatrix.Margin = new Padding(3, 8, 3, 6); comboMatrix.Name = "comboMatrix"; - comboMatrix.Size = new Size(249, 40); + comboMatrix.Size = new Size(191, 33); comboMatrix.TabIndex = 16; // // comboMatrixRunning @@ -185,12 +197,12 @@ namespace GHelper comboMatrixRunning.Dock = DockStyle.Top; comboMatrixRunning.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); comboMatrixRunning.FormattingEnabled = true; - comboMatrixRunning.ItemHeight = 32; + comboMatrixRunning.ItemHeight = 25; comboMatrixRunning.Items.AddRange(new object[] { Properties.Strings.MatrixBanner, Properties.Strings.MatrixLogo, Properties.Strings.MatrixPicture, Properties.Strings.MatrixClock, Properties.Strings.MatrixAudio }); - comboMatrixRunning.Location = new Point(261, 11); - comboMatrixRunning.Margin = new Padding(4, 11, 4, 8); + comboMatrixRunning.Location = new Point(200, 8); + comboMatrixRunning.Margin = new Padding(3, 8, 3, 6); comboMatrixRunning.Name = "comboMatrixRunning"; - comboMatrixRunning.Size = new Size(249, 40); + comboMatrixRunning.Size = new Size(191, 33); comboMatrixRunning.TabIndex = 17; // // buttonMatrix @@ -202,11 +214,11 @@ namespace GHelper buttonMatrix.Dock = DockStyle.Top; buttonMatrix.FlatAppearance.BorderSize = 0; buttonMatrix.FlatStyle = FlatStyle.Flat; - buttonMatrix.Location = new Point(518, 8); - buttonMatrix.Margin = new Padding(4, 8, 4, 8); + buttonMatrix.Location = new Point(397, 6); + buttonMatrix.Margin = new Padding(3, 6, 3, 6); buttonMatrix.Name = "buttonMatrix"; buttonMatrix.Secondary = true; - buttonMatrix.Size = new Size(249, 44); + buttonMatrix.Size = new Size(191, 33); buttonMatrix.TabIndex = 18; buttonMatrix.Text = Properties.Strings.PictureGif; buttonMatrix.UseVisualStyleBackColor = false; @@ -216,20 +228,18 @@ namespace GHelper panelMatrixTitle.Controls.Add(pictureMatrix); panelMatrixTitle.Controls.Add(labelMatrix); panelMatrixTitle.Dock = DockStyle.Top; - panelMatrixTitle.Location = new Point(20, 20); - panelMatrixTitle.Margin = new Padding(4); + panelMatrixTitle.Location = new Point(15, 15); panelMatrixTitle.Name = "panelMatrixTitle"; - panelMatrixTitle.Size = new Size(771, 40); + panelMatrixTitle.Size = new Size(591, 30); panelMatrixTitle.TabIndex = 45; // // pictureMatrix // pictureMatrix.BackgroundImage = Properties.Resources.icons8_matrix_32; pictureMatrix.BackgroundImageLayout = ImageLayout.Zoom; - pictureMatrix.Location = new Point(5, 0); - pictureMatrix.Margin = new Padding(4); + pictureMatrix.Location = new Point(4, 0); pictureMatrix.Name = "pictureMatrix"; - pictureMatrix.Size = new Size(32, 32); + pictureMatrix.Size = new Size(24, 24); pictureMatrix.TabIndex = 41; pictureMatrix.TabStop = false; // @@ -237,10 +247,10 @@ namespace GHelper // labelMatrix.AutoSize = true; labelMatrix.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - labelMatrix.Location = new Point(44, 0); - labelMatrix.Margin = new Padding(8, 0, 8, 0); + labelMatrix.Location = new Point(33, 0); + labelMatrix.Margin = new Padding(6, 0, 6, 0); labelMatrix.Name = "labelMatrix"; - labelMatrix.Size = new Size(170, 32); + labelMatrix.Size = new Size(128, 25); labelMatrix.TabIndex = 40; labelMatrix.Text = "Anime Matrix"; // @@ -248,10 +258,10 @@ namespace GHelper // checkMatrix.AutoSize = true; checkMatrix.ForeColor = SystemColors.GrayText; - checkMatrix.Location = new Point(27, 120); - checkMatrix.Margin = new Padding(8, 4, 8, 4); + checkMatrix.Location = new Point(20, 90); + checkMatrix.Margin = new Padding(6, 3, 6, 3); checkMatrix.Name = "checkMatrix"; - checkMatrix.Size = new Size(249, 36); + checkMatrix.Size = new Size(188, 29); checkMatrix.TabIndex = 19; checkMatrix.Text = Properties.Strings.TurnOffOnBattery; checkMatrix.UseVisualStyleBackColor = true; @@ -263,23 +273,22 @@ namespace GHelper panelBattery.Controls.Add(sliderBattery); panelBattery.Controls.Add(panelBatteryTitle); panelBattery.Dock = DockStyle.Top; - panelBattery.Location = new Point(11, 1069); + panelBattery.Location = new Point(8, 974); panelBattery.Margin = new Padding(0); panelBattery.Name = "panelBattery"; - panelBattery.Padding = new Padding(20, 20, 20, 7); - panelBattery.Size = new Size(811, 111); + panelBattery.Padding = new Padding(15, 15, 15, 5); + panelBattery.Size = new Size(621, 83); panelBattery.TabIndex = 5; // // sliderBattery // sliderBattery.AccessibleName = "Battery Charge Limit"; sliderBattery.Dock = DockStyle.Top; - sliderBattery.Location = new Point(20, 64); - sliderBattery.Margin = new Padding(4); + sliderBattery.Location = new Point(15, 48); sliderBattery.Max = 100; sliderBattery.Min = 40; sliderBattery.Name = "sliderBattery"; - sliderBattery.Size = new Size(771, 40); + sliderBattery.Size = new Size(591, 30); sliderBattery.Step = 5; sliderBattery.TabIndex = 20; sliderBattery.TabStop = false; @@ -292,20 +301,19 @@ namespace GHelper panelBatteryTitle.Controls.Add(pictureBattery); panelBatteryTitle.Controls.Add(labelBatteryTitle); panelBatteryTitle.Dock = DockStyle.Top; - panelBatteryTitle.Location = new Point(20, 20); - panelBatteryTitle.Margin = new Padding(4); + panelBatteryTitle.Location = new Point(15, 15); panelBatteryTitle.Name = "panelBatteryTitle"; - panelBatteryTitle.Padding = new Padding(0, 0, 0, 4); - panelBatteryTitle.Size = new Size(771, 44); + panelBatteryTitle.Padding = new Padding(0, 0, 0, 3); + panelBatteryTitle.Size = new Size(591, 33); panelBatteryTitle.TabIndex = 40; // // labelBattery // labelBattery.Anchor = AnchorStyles.Top | AnchorStyles.Right; - labelBattery.Location = new Point(432, 0); - labelBattery.Margin = new Padding(8, 0, 8, 0); + labelBattery.Location = new Point(337, 0); + labelBattery.Margin = new Padding(6, 0, 6, 0); labelBattery.Name = "labelBattery"; - labelBattery.Size = new Size(324, 36); + labelBattery.Size = new Size(243, 27); labelBattery.TabIndex = 39; labelBattery.Text = " "; labelBattery.TextAlign = ContentAlignment.TopRight; @@ -314,20 +322,19 @@ namespace GHelper // pictureBattery.BackgroundImage = Properties.Resources.icons8_charging_battery_32; pictureBattery.BackgroundImageLayout = ImageLayout.Zoom; - pictureBattery.Location = new Point(4, 2); - pictureBattery.Margin = new Padding(4); + pictureBattery.Location = new Point(3, 2); pictureBattery.Name = "pictureBattery"; - pictureBattery.Size = new Size(32, 32); + pictureBattery.Size = new Size(24, 24); pictureBattery.TabIndex = 38; pictureBattery.TabStop = false; // // labelBatteryTitle // labelBatteryTitle.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - labelBatteryTitle.Location = new Point(43, 0); - labelBatteryTitle.Margin = new Padding(8, 0, 8, 0); + labelBatteryTitle.Location = new Point(32, 0); + labelBatteryTitle.Margin = new Padding(6, 0, 6, 0); labelBatteryTitle.Name = "labelBatteryTitle"; - labelBatteryTitle.Size = new Size(467, 32); + labelBatteryTitle.Size = new Size(350, 24); labelBatteryTitle.TabIndex = 37; labelBatteryTitle.Text = "Battery Charge Limit"; // @@ -339,11 +346,11 @@ namespace GHelper panelFooter.Controls.Add(buttonQuit); panelFooter.Controls.Add(checkStartup); panelFooter.Dock = DockStyle.Top; - panelFooter.Location = new Point(11, 1236); + panelFooter.Location = new Point(8, 1099); panelFooter.Margin = new Padding(0); panelFooter.Name = "panelFooter"; - panelFooter.Padding = new Padding(20); - panelFooter.Size = new Size(811, 92); + panelFooter.Padding = new Padding(15); + panelFooter.Size = new Size(621, 69); panelFooter.TabIndex = 7; // // buttonUpdates @@ -355,11 +362,11 @@ namespace GHelper buttonUpdates.BorderColor = Color.Transparent; buttonUpdates.BorderRadius = 2; buttonUpdates.FlatStyle = FlatStyle.Flat; - buttonUpdates.Location = new Point(412, 24); - buttonUpdates.Margin = new Padding(8, 4, 8, 4); + buttonUpdates.Location = new Point(322, 18); + buttonUpdates.Margin = new Padding(6, 3, 6, 3); buttonUpdates.Name = "buttonUpdates"; buttonUpdates.Secondary = true; - buttonUpdates.Size = new Size(180, 44); + buttonUpdates.Size = new Size(135, 33); buttonUpdates.TabIndex = 22; buttonUpdates.Text = "Updates"; buttonUpdates.UseVisualStyleBackColor = false; @@ -373,11 +380,11 @@ namespace GHelper buttonQuit.BorderColor = Color.Transparent; buttonQuit.BorderRadius = 2; buttonQuit.FlatStyle = FlatStyle.Flat; - buttonQuit.Location = new Point(606, 24); - buttonQuit.Margin = new Padding(8, 4, 8, 4); + buttonQuit.Location = new Point(467, 18); + buttonQuit.Margin = new Padding(6, 3, 6, 3); buttonQuit.Name = "buttonQuit"; buttonQuit.Secondary = true; - buttonQuit.Size = new Size(180, 44); + buttonQuit.Size = new Size(135, 33); buttonQuit.TabIndex = 23; buttonQuit.Text = Properties.Strings.Quit; buttonQuit.UseVisualStyleBackColor = false; @@ -385,10 +392,10 @@ namespace GHelper // checkStartup // checkStartup.AutoSize = true; - checkStartup.Location = new Point(27, 28); - checkStartup.Margin = new Padding(8, 4, 8, 4); + checkStartup.Location = new Point(20, 21); + checkStartup.Margin = new Padding(6, 3, 6, 3); checkStartup.Name = "checkStartup"; - checkStartup.Size = new Size(206, 36); + checkStartup.Size = new Size(157, 29); checkStartup.TabIndex = 21; checkStartup.Text = Properties.Strings.RunOnStartup; checkStartup.UseVisualStyleBackColor = true; @@ -400,11 +407,11 @@ namespace GHelper panelPerformance.Controls.Add(tablePerf); panelPerformance.Controls.Add(panelCPUTitle); panelPerformance.Dock = DockStyle.Top; - panelPerformance.Location = new Point(11, 11); + panelPerformance.Location = new Point(8, 8); panelPerformance.Margin = new Padding(0); panelPerformance.Name = "panelPerformance"; - panelPerformance.Padding = new Padding(20); - panelPerformance.Size = new Size(811, 208); + panelPerformance.Padding = new Padding(15); + panelPerformance.Size = new Size(621, 156); panelPerformance.TabIndex = 0; // // tablePerf @@ -421,12 +428,12 @@ namespace GHelper tablePerf.Controls.Add(buttonTurbo, 2, 0); tablePerf.Controls.Add(buttonFans, 3, 0); tablePerf.Dock = DockStyle.Top; - tablePerf.Location = new Point(20, 60); - tablePerf.Margin = new Padding(8, 4, 8, 4); + tablePerf.Location = new Point(15, 45); + tablePerf.Margin = new Padding(6, 3, 6, 3); tablePerf.Name = "tablePerf"; tablePerf.RowCount = 1; - tablePerf.RowStyles.Add(new RowStyle(SizeType.Absolute, 128F)); - tablePerf.Size = new Size(771, 128); + tablePerf.RowStyles.Add(new RowStyle(SizeType.Absolute, 96F)); + tablePerf.Size = new Size(591, 96); tablePerf.TabIndex = 29; // // buttonSilent @@ -443,11 +450,10 @@ namespace GHelper buttonSilent.ForeColor = SystemColors.ControlText; buttonSilent.Image = Properties.Resources.icons8_bicycle_48__1_; buttonSilent.ImageAlign = ContentAlignment.BottomCenter; - buttonSilent.Location = new Point(4, 4); - buttonSilent.Margin = new Padding(4); + buttonSilent.Location = new Point(3, 3); buttonSilent.Name = "buttonSilent"; buttonSilent.Secondary = false; - buttonSilent.Size = new Size(184, 120); + buttonSilent.Size = new Size(141, 90); buttonSilent.TabIndex = 1; buttonSilent.Text = Properties.Strings.Silent; buttonSilent.TextImageRelation = TextImageRelation.ImageAboveText; @@ -466,11 +472,10 @@ namespace GHelper buttonBalanced.ForeColor = SystemColors.ControlText; buttonBalanced.Image = Properties.Resources.icons8_fiat_500_48; buttonBalanced.ImageAlign = ContentAlignment.BottomCenter; - buttonBalanced.Location = new Point(196, 4); - buttonBalanced.Margin = new Padding(4); + buttonBalanced.Location = new Point(150, 3); buttonBalanced.Name = "buttonBalanced"; buttonBalanced.Secondary = false; - buttonBalanced.Size = new Size(184, 120); + buttonBalanced.Size = new Size(141, 90); buttonBalanced.TabIndex = 1; buttonBalanced.Text = Properties.Strings.Balanced; buttonBalanced.TextImageRelation = TextImageRelation.ImageAboveText; @@ -489,11 +494,10 @@ namespace GHelper buttonTurbo.ForeColor = SystemColors.ControlText; buttonTurbo.Image = Properties.Resources.icons8_rocket_48; buttonTurbo.ImageAlign = ContentAlignment.BottomCenter; - buttonTurbo.Location = new Point(388, 4); - buttonTurbo.Margin = new Padding(4); + buttonTurbo.Location = new Point(297, 3); buttonTurbo.Name = "buttonTurbo"; buttonTurbo.Secondary = false; - buttonTurbo.Size = new Size(184, 120); + buttonTurbo.Size = new Size(141, 90); buttonTurbo.TabIndex = 2; buttonTurbo.Text = Properties.Strings.Turbo; buttonTurbo.TextImageRelation = TextImageRelation.ImageAboveText; @@ -511,11 +515,10 @@ namespace GHelper buttonFans.FlatStyle = FlatStyle.Flat; buttonFans.Image = Properties.Resources.icons8_fan_48; buttonFans.ImageAlign = ContentAlignment.BottomCenter; - buttonFans.Location = new Point(580, 4); - buttonFans.Margin = new Padding(4); + buttonFans.Location = new Point(444, 3); buttonFans.Name = "buttonFans"; buttonFans.Secondary = true; - buttonFans.Size = new Size(187, 120); + buttonFans.Size = new Size(144, 90); buttonFans.TabIndex = 3; buttonFans.Text = Properties.Strings.FansPower; buttonFans.TextImageRelation = TextImageRelation.ImageAboveText; @@ -527,10 +530,9 @@ namespace GHelper panelCPUTitle.Controls.Add(labelPerf); panelCPUTitle.Controls.Add(labelCPUFan); panelCPUTitle.Dock = DockStyle.Top; - panelCPUTitle.Location = new Point(20, 20); - panelCPUTitle.Margin = new Padding(4); + panelCPUTitle.Location = new Point(15, 15); panelCPUTitle.Name = "panelCPUTitle"; - panelCPUTitle.Size = new Size(771, 40); + panelCPUTitle.Size = new Size(591, 30); panelCPUTitle.TabIndex = 30; // // picturePerf @@ -538,10 +540,9 @@ namespace GHelper picturePerf.BackgroundImage = Properties.Resources.icons8_gauge_32; picturePerf.BackgroundImageLayout = ImageLayout.Zoom; picturePerf.InitialImage = null; - picturePerf.Location = new Point(8, 0); - picturePerf.Margin = new Padding(4); + picturePerf.Location = new Point(6, 0); picturePerf.Name = "picturePerf"; - picturePerf.Size = new Size(32, 32); + picturePerf.Size = new Size(24, 24); picturePerf.TabIndex = 35; picturePerf.TabStop = false; // @@ -549,10 +550,10 @@ namespace GHelper // labelPerf.AutoSize = true; labelPerf.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - labelPerf.Location = new Point(40, 0); - labelPerf.Margin = new Padding(8, 0, 8, 0); + labelPerf.Location = new Point(30, 0); + labelPerf.Margin = new Padding(6, 0, 6, 0); labelPerf.Name = "labelPerf"; - labelPerf.Size = new Size(234, 32); + labelPerf.Size = new Size(174, 25); labelPerf.TabIndex = 0; labelPerf.Text = "Performance Mode"; // @@ -560,10 +561,10 @@ namespace GHelper // labelCPUFan.Anchor = AnchorStyles.Top | AnchorStyles.Right; labelCPUFan.Cursor = Cursors.Hand; - labelCPUFan.Location = new Point(371, 0); - labelCPUFan.Margin = new Padding(8, 0, 8, 0); + labelCPUFan.Location = new Point(291, 0); + labelCPUFan.Margin = new Padding(6, 0, 6, 0); labelCPUFan.Name = "labelCPUFan"; - labelCPUFan.Size = new Size(400, 36); + labelCPUFan.Size = new Size(300, 27); labelCPUFan.TabIndex = 33; labelCPUFan.Text = " "; labelCPUFan.TextAlign = ContentAlignment.TopRight; @@ -576,21 +577,20 @@ namespace GHelper panelGPU.Controls.Add(tableGPU); panelGPU.Controls.Add(panelGPUTitle); panelGPU.Dock = DockStyle.Top; - panelGPU.Location = new Point(11, 219); + panelGPU.Location = new Point(8, 164); panelGPU.Margin = new Padding(0); panelGPU.Name = "panelGPU"; - panelGPU.Padding = new Padding(20, 20, 20, 0); - panelGPU.Size = new Size(811, 352); + panelGPU.Padding = new Padding(15, 15, 15, 0); + panelGPU.Size = new Size(621, 264); panelGPU.TabIndex = 1; // // labelTipGPU // labelTipGPU.Dock = DockStyle.Top; labelTipGPU.ForeColor = SystemColors.GrayText; - labelTipGPU.Location = new Point(20, 316); - labelTipGPU.Margin = new Padding(4, 0, 4, 0); + labelTipGPU.Location = new Point(15, 237); labelTipGPU.Name = "labelTipGPU"; - labelTipGPU.Size = new Size(771, 36); + labelTipGPU.Size = new Size(591, 27); labelTipGPU.TabIndex = 20; // // tableGPU @@ -609,13 +609,13 @@ namespace GHelper tableGPU.Controls.Add(buttonOptimized, 2, 0); tableGPU.Controls.Add(buttonUltimate, 2, 0); tableGPU.Dock = DockStyle.Top; - tableGPU.Location = new Point(20, 60); - tableGPU.Margin = new Padding(8, 4, 8, 4); + tableGPU.Location = new Point(15, 45); + tableGPU.Margin = new Padding(6, 3, 6, 3); tableGPU.Name = "tableGPU"; tableGPU.RowCount = 1; - tableGPU.RowStyles.Add(new RowStyle(SizeType.Absolute, 128F)); - tableGPU.RowStyles.Add(new RowStyle(SizeType.Absolute, 128F)); - tableGPU.Size = new Size(771, 256); + tableGPU.RowStyles.Add(new RowStyle(SizeType.Absolute, 96F)); + tableGPU.RowStyles.Add(new RowStyle(SizeType.Absolute, 96F)); + tableGPU.Size = new Size(591, 192); tableGPU.TabIndex = 16; // // buttonStopGPU @@ -631,11 +631,10 @@ namespace GHelper buttonStopGPU.ForeColor = SystemColors.ControlText; buttonStopGPU.Image = Properties.Resources.icons8_leaf_48; buttonStopGPU.ImageAlign = ContentAlignment.BottomCenter; - buttonStopGPU.Location = new Point(196, 4); - buttonStopGPU.Margin = new Padding(4); + buttonStopGPU.Location = new Point(150, 3); buttonStopGPU.Name = "buttonStopGPU"; buttonStopGPU.Secondary = false; - buttonStopGPU.Size = new Size(184, 120); + buttonStopGPU.Size = new Size(141, 90); buttonStopGPU.TabIndex = 4; buttonStopGPU.Text = "Stop GPU applications"; buttonStopGPU.TextImageRelation = TextImageRelation.ImageAboveText; @@ -656,11 +655,10 @@ namespace GHelper buttonEco.ForeColor = SystemColors.ControlText; buttonEco.Image = Properties.Resources.icons8_leaf_48; buttonEco.ImageAlign = ContentAlignment.BottomCenter; - buttonEco.Location = new Point(4, 4); - buttonEco.Margin = new Padding(4); + buttonEco.Location = new Point(3, 3); buttonEco.Name = "buttonEco"; buttonEco.Secondary = false; - buttonEco.Size = new Size(184, 120); + buttonEco.Size = new Size(141, 90); buttonEco.TabIndex = 4; buttonEco.Text = Properties.Strings.EcoMode; buttonEco.TextImageRelation = TextImageRelation.ImageAboveText; @@ -679,11 +677,10 @@ namespace GHelper buttonStandard.ForeColor = SystemColors.ControlText; buttonStandard.Image = Properties.Resources.icons8_spa_flower_48; buttonStandard.ImageAlign = ContentAlignment.BottomCenter; - buttonStandard.Location = new Point(388, 4); - buttonStandard.Margin = new Padding(4); + buttonStandard.Location = new Point(297, 3); buttonStandard.Name = "buttonStandard"; buttonStandard.Secondary = false; - buttonStandard.Size = new Size(184, 120); + buttonStandard.Size = new Size(141, 90); buttonStandard.TabIndex = 5; buttonStandard.Text = Properties.Strings.StandardMode; buttonStandard.TextImageRelation = TextImageRelation.ImageAboveText; @@ -701,11 +698,10 @@ namespace GHelper buttonXGM.ForeColor = SystemColors.ControlText; buttonXGM.Image = Properties.Resources.icons8_video_48; buttonXGM.ImageAlign = ContentAlignment.BottomCenter; - buttonXGM.Location = new Point(196, 132); - buttonXGM.Margin = new Padding(4); + buttonXGM.Location = new Point(150, 99); buttonXGM.Name = "buttonXGM"; buttonXGM.Secondary = false; - buttonXGM.Size = new Size(184, 120); + buttonXGM.Size = new Size(141, 90); buttonXGM.TabIndex = 8; buttonXGM.Text = "XG Mobile"; buttonXGM.TextImageRelation = TextImageRelation.ImageAboveText; @@ -724,11 +720,10 @@ namespace GHelper buttonOptimized.ForeColor = SystemColors.ControlText; buttonOptimized.Image = Properties.Resources.icons8_project_management_48__1_; buttonOptimized.ImageAlign = ContentAlignment.BottomCenter; - buttonOptimized.Location = new Point(4, 132); - buttonOptimized.Margin = new Padding(4); + buttonOptimized.Location = new Point(3, 99); buttonOptimized.Name = "buttonOptimized"; buttonOptimized.Secondary = false; - buttonOptimized.Size = new Size(184, 120); + buttonOptimized.Size = new Size(141, 90); buttonOptimized.TabIndex = 7; buttonOptimized.Text = Properties.Strings.Optimized; buttonOptimized.TextImageRelation = TextImageRelation.ImageAboveText; @@ -747,11 +742,10 @@ namespace GHelper buttonUltimate.ForeColor = SystemColors.ControlText; buttonUltimate.Image = Properties.Resources.icons8_game_controller_48; buttonUltimate.ImageAlign = ContentAlignment.BottomCenter; - buttonUltimate.Location = new Point(580, 4); - buttonUltimate.Margin = new Padding(4); + buttonUltimate.Location = new Point(444, 3); buttonUltimate.Name = "buttonUltimate"; buttonUltimate.Secondary = false; - buttonUltimate.Size = new Size(187, 120); + buttonUltimate.Size = new Size(144, 90); buttonUltimate.TabIndex = 6; buttonUltimate.Text = Properties.Strings.UltimateMode; buttonUltimate.TextImageRelation = TextImageRelation.ImageAboveText; @@ -763,20 +757,18 @@ namespace GHelper panelGPUTitle.Controls.Add(labelGPU); panelGPUTitle.Controls.Add(labelGPUFan); panelGPUTitle.Dock = DockStyle.Top; - panelGPUTitle.Location = new Point(20, 20); - panelGPUTitle.Margin = new Padding(4); + panelGPUTitle.Location = new Point(15, 15); panelGPUTitle.Name = "panelGPUTitle"; - panelGPUTitle.Size = new Size(771, 40); + panelGPUTitle.Size = new Size(591, 30); panelGPUTitle.TabIndex = 21; // // pictureGPU // pictureGPU.BackgroundImage = Properties.Resources.icons8_video_card_32; pictureGPU.BackgroundImageLayout = ImageLayout.Zoom; - pictureGPU.Location = new Point(8, 0); - pictureGPU.Margin = new Padding(4); + pictureGPU.Location = new Point(6, 0); pictureGPU.Name = "pictureGPU"; - pictureGPU.Size = new Size(32, 32); + pictureGPU.Size = new Size(24, 24); pictureGPU.TabIndex = 22; pictureGPU.TabStop = false; // @@ -784,20 +776,20 @@ namespace GHelper // labelGPU.AutoSize = true; labelGPU.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - labelGPU.Location = new Point(40, 0); - labelGPU.Margin = new Padding(8, 0, 8, 0); + labelGPU.Location = new Point(30, 0); + labelGPU.Margin = new Padding(6, 0, 6, 0); labelGPU.Name = "labelGPU"; - labelGPU.Size = new Size(136, 32); + labelGPU.Size = new Size(103, 25); labelGPU.TabIndex = 21; labelGPU.Text = "GPU Mode"; // // labelGPUFan // labelGPUFan.Anchor = AnchorStyles.Top | AnchorStyles.Right; - labelGPUFan.Location = new Point(371, 0); - labelGPUFan.Margin = new Padding(8, 0, 8, 0); + labelGPUFan.Location = new Point(291, 0); + labelGPUFan.Margin = new Padding(6, 0, 6, 0); labelGPUFan.Name = "labelGPUFan"; - labelGPUFan.Size = new Size(400, 35); + labelGPUFan.Size = new Size(300, 26); labelGPUFan.TabIndex = 20; labelGPUFan.Text = " "; labelGPUFan.TextAlign = ContentAlignment.TopRight; @@ -810,21 +802,20 @@ namespace GHelper panelScreen.Controls.Add(tableScreen); panelScreen.Controls.Add(panelScreenTitle); panelScreen.Dock = DockStyle.Top; - panelScreen.Location = new Point(11, 571); + panelScreen.Location = new Point(8, 428); panelScreen.Margin = new Padding(0); panelScreen.Name = "panelScreen"; - panelScreen.Padding = new Padding(20, 20, 20, 11); - panelScreen.Size = new Size(811, 187); + panelScreen.Padding = new Padding(15, 15, 15, 8); + panelScreen.Size = new Size(621, 140); panelScreen.TabIndex = 2; // // labelTipScreen // labelTipScreen.Dock = DockStyle.Top; labelTipScreen.ForeColor = SystemColors.GrayText; - labelTipScreen.Location = new Point(20, 140); - labelTipScreen.Margin = new Padding(4, 0, 4, 0); + labelTipScreen.Location = new Point(15, 105); labelTipScreen.Name = "labelTipScreen"; - labelTipScreen.Size = new Size(771, 36); + labelTipScreen.Size = new Size(591, 27); labelTipScreen.TabIndex = 24; // // tableScreen @@ -841,12 +832,12 @@ namespace GHelper tableScreen.Controls.Add(button120Hz, 2, 0); tableScreen.Controls.Add(buttonMiniled, 3, 0); tableScreen.Dock = DockStyle.Top; - tableScreen.Location = new Point(20, 60); - tableScreen.Margin = new Padding(8, 4, 8, 4); + tableScreen.Location = new Point(15, 45); + tableScreen.Margin = new Padding(6, 3, 6, 3); tableScreen.Name = "tableScreen"; tableScreen.RowCount = 1; - tableScreen.RowStyles.Add(new RowStyle(SizeType.Absolute, 80F)); - tableScreen.Size = new Size(771, 80); + tableScreen.RowStyles.Add(new RowStyle(SizeType.Absolute, 60F)); + tableScreen.Size = new Size(591, 60); tableScreen.TabIndex = 23; // // buttonScreenAuto @@ -860,11 +851,10 @@ namespace GHelper buttonScreenAuto.FlatAppearance.BorderSize = 0; buttonScreenAuto.FlatStyle = FlatStyle.Flat; buttonScreenAuto.ForeColor = SystemColors.ControlText; - buttonScreenAuto.Location = new Point(4, 4); - buttonScreenAuto.Margin = new Padding(4); + buttonScreenAuto.Location = new Point(3, 3); buttonScreenAuto.Name = "buttonScreenAuto"; buttonScreenAuto.Secondary = false; - buttonScreenAuto.Size = new Size(184, 72); + buttonScreenAuto.Size = new Size(141, 54); buttonScreenAuto.TabIndex = 9; buttonScreenAuto.Text = Properties.Strings.AutoMode; buttonScreenAuto.UseVisualStyleBackColor = false; @@ -881,11 +871,10 @@ namespace GHelper button60Hz.FlatAppearance.BorderSize = 0; button60Hz.FlatStyle = FlatStyle.Flat; button60Hz.ForeColor = SystemColors.ControlText; - button60Hz.Location = new Point(196, 4); - button60Hz.Margin = new Padding(4); + button60Hz.Location = new Point(150, 3); button60Hz.Name = "button60Hz"; button60Hz.Secondary = false; - button60Hz.Size = new Size(184, 72); + button60Hz.Size = new Size(141, 54); button60Hz.TabIndex = 10; button60Hz.Text = "60Hz"; button60Hz.UseVisualStyleBackColor = false; @@ -901,11 +890,10 @@ namespace GHelper button120Hz.FlatAppearance.BorderSize = 0; button120Hz.FlatStyle = FlatStyle.Flat; button120Hz.ForeColor = SystemColors.ControlText; - button120Hz.Location = new Point(388, 4); - button120Hz.Margin = new Padding(4); + button120Hz.Location = new Point(297, 3); button120Hz.Name = "button120Hz"; button120Hz.Secondary = false; - button120Hz.Size = new Size(184, 72); + button120Hz.Size = new Size(141, 54); button120Hz.TabIndex = 11; button120Hz.Text = "120Hz + OD"; button120Hz.UseVisualStyleBackColor = false; @@ -921,11 +909,10 @@ namespace GHelper buttonMiniled.FlatAppearance.BorderSize = 0; buttonMiniled.FlatStyle = FlatStyle.Flat; buttonMiniled.ForeColor = SystemColors.ControlText; - buttonMiniled.Location = new Point(580, 4); - buttonMiniled.Margin = new Padding(4); + buttonMiniled.Location = new Point(444, 3); buttonMiniled.Name = "buttonMiniled"; buttonMiniled.Secondary = false; - buttonMiniled.Size = new Size(187, 72); + buttonMiniled.Size = new Size(144, 54); buttonMiniled.TabIndex = 12; buttonMiniled.Text = Properties.Strings.Multizone; buttonMiniled.UseVisualStyleBackColor = false; @@ -936,19 +923,18 @@ namespace GHelper panelScreenTitle.Controls.Add(pictureScreen); panelScreenTitle.Controls.Add(labelSreen); panelScreenTitle.Dock = DockStyle.Top; - panelScreenTitle.Location = new Point(20, 20); - panelScreenTitle.Margin = new Padding(4); + panelScreenTitle.Location = new Point(15, 15); panelScreenTitle.Name = "panelScreenTitle"; - panelScreenTitle.Size = new Size(771, 40); + panelScreenTitle.Size = new Size(591, 30); panelScreenTitle.TabIndex = 25; // // labelMidFan // labelMidFan.Anchor = AnchorStyles.Top | AnchorStyles.Right; - labelMidFan.Location = new Point(516, -3); - labelMidFan.Margin = new Padding(8, 0, 8, 0); + labelMidFan.Location = new Point(400, -2); + labelMidFan.Margin = new Padding(6, 0, 6, 0); labelMidFan.Name = "labelMidFan"; - labelMidFan.Size = new Size(253, 35); + labelMidFan.Size = new Size(190, 26); labelMidFan.TabIndex = 28; labelMidFan.Text = " "; labelMidFan.TextAlign = ContentAlignment.TopRight; @@ -957,10 +943,9 @@ namespace GHelper // pictureScreen.BackgroundImage = Properties.Resources.icons8_laptop_32; pictureScreen.BackgroundImageLayout = ImageLayout.Zoom; - pictureScreen.Location = new Point(5, 0); - pictureScreen.Margin = new Padding(4); + pictureScreen.Location = new Point(4, 0); pictureScreen.Name = "pictureScreen"; - pictureScreen.Size = new Size(32, 32); + pictureScreen.Size = new Size(24, 24); pictureScreen.TabIndex = 27; pictureScreen.TabStop = false; // @@ -968,10 +953,10 @@ namespace GHelper // labelSreen.AutoSize = true; labelSreen.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - labelSreen.Location = new Point(40, 0); - labelSreen.Margin = new Padding(8, 0, 8, 0); + labelSreen.Location = new Point(30, 0); + labelSreen.Margin = new Padding(6, 0, 6, 0); labelSreen.Name = "labelSreen"; - labelSreen.Size = new Size(176, 32); + labelSreen.Size = new Size(133, 25); labelSreen.TabIndex = 26; labelSreen.Text = "Laptop Screen"; // @@ -982,11 +967,11 @@ namespace GHelper panelKeyboard.Controls.Add(tableLayoutKeyboard); panelKeyboard.Controls.Add(panelKeyboardTitle); panelKeyboard.Dock = DockStyle.Top; - panelKeyboard.Location = new Point(11, 758); + panelKeyboard.Location = new Point(8, 568); panelKeyboard.Margin = new Padding(0); panelKeyboard.Name = "panelKeyboard"; - panelKeyboard.Padding = new Padding(20); - panelKeyboard.Size = new Size(811, 140); + panelKeyboard.Padding = new Padding(15); + panelKeyboard.Size = new Size(621, 107); panelKeyboard.TabIndex = 3; // // tableLayoutKeyboard @@ -1001,12 +986,12 @@ namespace GHelper tableLayoutKeyboard.Controls.Add(panelColor, 0, 0); tableLayoutKeyboard.Controls.Add(comboKeyboard, 0, 0); tableLayoutKeyboard.Dock = DockStyle.Top; - tableLayoutKeyboard.Location = new Point(20, 60); - tableLayoutKeyboard.Margin = new Padding(8); + tableLayoutKeyboard.Location = new Point(15, 45); + tableLayoutKeyboard.Margin = new Padding(6); tableLayoutKeyboard.Name = "tableLayoutKeyboard"; tableLayoutKeyboard.RowCount = 1; tableLayoutKeyboard.RowStyles.Add(new RowStyle(SizeType.Percent, 100F)); - tableLayoutKeyboard.Size = new Size(771, 60); + tableLayoutKeyboard.Size = new Size(591, 47); tableLayoutKeyboard.TabIndex = 39; // // buttonKeyboard @@ -1021,11 +1006,11 @@ namespace GHelper buttonKeyboard.FlatStyle = FlatStyle.Flat; buttonKeyboard.Image = Properties.Resources.icons8_settings_32; buttonKeyboard.ImageAlign = ContentAlignment.MiddleRight; - buttonKeyboard.Location = new Point(518, 8); - buttonKeyboard.Margin = new Padding(4, 8, 4, 8); + buttonKeyboard.Location = new Point(397, 6); + buttonKeyboard.Margin = new Padding(3, 6, 3, 6); buttonKeyboard.Name = "buttonKeyboard"; buttonKeyboard.Secondary = true; - buttonKeyboard.Size = new Size(249, 44); + buttonKeyboard.Size = new Size(191, 33); buttonKeyboard.TabIndex = 15; buttonKeyboard.Text = Properties.Strings.Extra; buttonKeyboard.TextImageRelation = TextImageRelation.ImageBeforeText; @@ -1038,29 +1023,29 @@ namespace GHelper panelColor.Controls.Add(pictureColor); panelColor.Controls.Add(buttonKeyboardColor); panelColor.Dock = DockStyle.Fill; - panelColor.Location = new Point(261, 8); - panelColor.Margin = new Padding(4, 8, 4, 8); + panelColor.Location = new Point(200, 6); + panelColor.Margin = new Padding(3, 6, 3, 6); panelColor.Name = "panelColor"; - panelColor.Size = new Size(249, 44); + panelColor.Size = new Size(191, 35); panelColor.TabIndex = 36; // // pictureColor2 // pictureColor2.Anchor = AnchorStyles.Top | AnchorStyles.Right; - pictureColor2.Location = new Point(189, 12); - pictureColor2.Margin = new Padding(8); + pictureColor2.Location = new Point(146, 9); + pictureColor2.Margin = new Padding(6); pictureColor2.Name = "pictureColor2"; - pictureColor2.Size = new Size(20, 20); + pictureColor2.Size = new Size(15, 15); pictureColor2.TabIndex = 41; pictureColor2.TabStop = false; // // pictureColor // pictureColor.Anchor = AnchorStyles.Top | AnchorStyles.Right; - pictureColor.Location = new Point(214, 12); - pictureColor.Margin = new Padding(8); + pictureColor.Location = new Point(164, 9); + pictureColor.Margin = new Padding(6); pictureColor.Name = "pictureColor"; - pictureColor.Size = new Size(20, 20); + pictureColor.Size = new Size(15, 15); pictureColor.TabIndex = 40; pictureColor.TabStop = false; // @@ -1075,10 +1060,10 @@ namespace GHelper buttonKeyboardColor.FlatStyle = FlatStyle.Flat; buttonKeyboardColor.ForeColor = SystemColors.ControlText; buttonKeyboardColor.Location = new Point(0, 0); - buttonKeyboardColor.Margin = new Padding(4, 8, 4, 8); + buttonKeyboardColor.Margin = new Padding(3, 6, 3, 6); buttonKeyboardColor.Name = "buttonKeyboardColor"; buttonKeyboardColor.Secondary = false; - buttonKeyboardColor.Size = new Size(249, 44); + buttonKeyboardColor.Size = new Size(191, 33); buttonKeyboardColor.TabIndex = 14; buttonKeyboardColor.Text = Properties.Strings.Color; buttonKeyboardColor.UseVisualStyleBackColor = false; @@ -1092,12 +1077,12 @@ namespace GHelper comboKeyboard.FlatStyle = FlatStyle.Flat; comboKeyboard.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); comboKeyboard.FormattingEnabled = true; - comboKeyboard.ItemHeight = 32; + comboKeyboard.ItemHeight = 25; comboKeyboard.Items.AddRange(new object[] { "Static", "Breathe", "Rainbow", "Strobe" }); - comboKeyboard.Location = new Point(4, 11); - comboKeyboard.Margin = new Padding(4, 11, 4, 8); + comboKeyboard.Location = new Point(3, 8); + comboKeyboard.Margin = new Padding(3, 8, 3, 6); comboKeyboard.Name = "comboKeyboard"; - comboKeyboard.Size = new Size(249, 40); + comboKeyboard.Size = new Size(191, 33); comboKeyboard.TabIndex = 13; // // panelKeyboardTitle @@ -1105,20 +1090,18 @@ namespace GHelper panelKeyboardTitle.Controls.Add(pictureKeyboard); panelKeyboardTitle.Controls.Add(labelKeyboard); panelKeyboardTitle.Dock = DockStyle.Top; - panelKeyboardTitle.Location = new Point(20, 20); - panelKeyboardTitle.Margin = new Padding(4); + panelKeyboardTitle.Location = new Point(15, 15); panelKeyboardTitle.Name = "panelKeyboardTitle"; - panelKeyboardTitle.Size = new Size(771, 40); + panelKeyboardTitle.Size = new Size(591, 30); panelKeyboardTitle.TabIndex = 40; // // pictureKeyboard // pictureKeyboard.BackgroundImage = Properties.Resources.icons8_keyboard_32__1_; pictureKeyboard.BackgroundImageLayout = ImageLayout.Zoom; - pictureKeyboard.Location = new Point(5, 0); - pictureKeyboard.Margin = new Padding(4); + pictureKeyboard.Location = new Point(4, 0); pictureKeyboard.Name = "pictureKeyboard"; - pictureKeyboard.Size = new Size(32, 32); + pictureKeyboard.Size = new Size(24, 24); pictureKeyboard.TabIndex = 35; pictureKeyboard.TabStop = false; // @@ -1126,10 +1109,10 @@ namespace GHelper // labelKeyboard.AutoSize = true; labelKeyboard.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - labelKeyboard.Location = new Point(44, 0); - labelKeyboard.Margin = new Padding(8, 0, 8, 0); + labelKeyboard.Location = new Point(33, 0); + labelKeyboard.Margin = new Padding(6, 0, 6, 0); labelKeyboard.Name = "labelKeyboard"; - labelKeyboard.Size = new Size(210, 32); + labelKeyboard.Size = new Size(158, 25); labelKeyboard.TabIndex = 34; labelKeyboard.Text = "Laptop Keyboard"; // @@ -1138,10 +1121,10 @@ namespace GHelper labelVersion.Cursor = Cursors.Hand; labelVersion.Font = new Font("Segoe UI", 9F, FontStyle.Underline, GraphicsUnit.Point); labelVersion.ForeColor = SystemColors.ControlDark; - labelVersion.Location = new Point(28, 12); - labelVersion.Margin = new Padding(8, 0, 8, 0); + labelVersion.Location = new Point(21, 9); + labelVersion.Margin = new Padding(6, 0, 6, 0); labelVersion.Name = "labelVersion"; - labelVersion.Size = new Size(300, 32); + labelVersion.Size = new Size(225, 24); labelVersion.TabIndex = 37; labelVersion.Text = "v.0"; // @@ -1150,10 +1133,10 @@ namespace GHelper 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(380, 12); - labelModel.Margin = new Padding(8, 0, 8, 0); + labelModel.Location = new Point(298, 9); + labelModel.Margin = new Padding(6, 0, 6, 0); labelModel.Name = "labelModel"; - labelModel.Size = new Size(400, 32); + labelModel.Size = new Size(300, 24); labelModel.TabIndex = 38; labelModel.TextAlign = ContentAlignment.TopRight; // @@ -1162,34 +1145,172 @@ namespace GHelper panelVersion.Controls.Add(labelVersion); panelVersion.Controls.Add(labelModel); panelVersion.Dock = DockStyle.Top; - panelVersion.Location = new Point(11, 1180); - panelVersion.Margin = new Padding(4); + panelVersion.Location = new Point(8, 1057); panelVersion.Name = "panelVersion"; - panelVersion.Size = new Size(811, 56); + panelVersion.Size = new Size(621, 42); panelVersion.TabIndex = 6; // + // panelPeripherals + // + panelPeripherals.AutoSize = true; + panelPeripherals.AutoSizeMode = AutoSizeMode.GrowAndShrink; + panelPeripherals.Controls.Add(tableLayoutPeripherals); + panelPeripherals.Controls.Add(panelPeripheralsTile); + panelPeripherals.Dock = DockStyle.Top; + panelPeripherals.Location = new Point(8, 805); + panelPeripherals.Margin = new Padding(0); + panelPeripherals.Name = "panelPeripherals"; + panelPeripherals.Padding = new Padding(15, 15, 15, 8); + panelPeripherals.Size = new Size(621, 169); + panelPeripherals.TabIndex = 4; + // + // tableLayoutPeripherals + // + tableLayoutPeripherals.AutoSize = true; + tableLayoutPeripherals.AutoSizeMode = AutoSizeMode.GrowAndShrink; + tableLayoutPeripherals.ColumnCount = 3; + tableLayoutPeripherals.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tableLayoutPeripherals.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tableLayoutPeripherals.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tableLayoutPeripherals.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tableLayoutPeripherals.Controls.Add(buttonPeripheral3, 0, 0); + tableLayoutPeripherals.Controls.Add(buttonPeripheral2, 0, 0); + tableLayoutPeripherals.Controls.Add(buttonPeripheral1, 0, 0); + tableLayoutPeripherals.Dock = DockStyle.Top; + tableLayoutPeripherals.Location = new Point(15, 45); + tableLayoutPeripherals.Margin = new Padding(6); + tableLayoutPeripherals.Name = "tableLayoutPeripherals"; + tableLayoutPeripherals.RowCount = 1; + tableLayoutPeripherals.RowStyles.Add(new RowStyle(SizeType.Percent, 100F)); + tableLayoutPeripherals.Size = new Size(591, 116); + tableLayoutPeripherals.TabIndex = 43; + // + // buttonPeripheral3 + // + buttonPeripheral3.AccessibleName = "Peripheral 3"; + buttonPeripheral3.Activated = false; + buttonPeripheral3.BackColor = SystemColors.ControlLightLight; + buttonPeripheral3.BorderColor = Color.Transparent; + buttonPeripheral3.BorderRadius = 5; + buttonPeripheral3.CausesValidation = false; + buttonPeripheral3.Dock = DockStyle.Top; + buttonPeripheral3.FlatAppearance.BorderSize = 0; + buttonPeripheral3.FlatStyle = FlatStyle.Flat; + buttonPeripheral3.Font = new Font("Segoe UI", 8F, FontStyle.Regular, GraphicsUnit.Point); + buttonPeripheral3.ForeColor = SystemColors.ControlText; + buttonPeripheral3.Image = Properties.Resources.icons8_maus_32; + buttonPeripheral3.ImageAlign = ContentAlignment.BottomCenter; + buttonPeripheral3.Location = new Point(397, 3); + buttonPeripheral3.Name = "buttonPeripheral3"; + buttonPeripheral3.Secondary = false; + buttonPeripheral3.Size = new Size(191, 110); + buttonPeripheral3.TabIndex = 22; + buttonPeripheral3.Text = "Mouse 3"; + buttonPeripheral3.TextImageRelation = TextImageRelation.ImageAboveText; + buttonPeripheral3.UseVisualStyleBackColor = false; + // + // buttonPeripheral2 + // + buttonPeripheral2.AccessibleName = "Peripheral 2"; + buttonPeripheral2.Activated = false; + buttonPeripheral2.BackColor = SystemColors.ControlLightLight; + buttonPeripheral2.BorderColor = Color.Transparent; + buttonPeripheral2.BorderRadius = 5; + buttonPeripheral2.CausesValidation = false; + buttonPeripheral2.Dock = DockStyle.Top; + buttonPeripheral2.FlatAppearance.BorderSize = 0; + buttonPeripheral2.FlatStyle = FlatStyle.Flat; + buttonPeripheral2.Font = new Font("Segoe UI", 8F, FontStyle.Regular, GraphicsUnit.Point); + buttonPeripheral2.ForeColor = SystemColors.ControlText; + buttonPeripheral2.Image = Properties.Resources.icons8_maus_32; + buttonPeripheral2.ImageAlign = ContentAlignment.BottomCenter; + buttonPeripheral2.Location = new Point(200, 3); + buttonPeripheral2.Name = "buttonPeripheral2"; + buttonPeripheral2.Secondary = false; + buttonPeripheral2.Size = new Size(191, 110); + buttonPeripheral2.TabIndex = 19; + buttonPeripheral2.Text = "Mouse 2"; + buttonPeripheral2.TextImageRelation = TextImageRelation.ImageAboveText; + buttonPeripheral2.UseVisualStyleBackColor = false; + // + // buttonPeripheral1 + // + buttonPeripheral1.AccessibleName = "Peripheral 1"; + buttonPeripheral1.Activated = false; + buttonPeripheral1.BackColor = SystemColors.ControlLightLight; + buttonPeripheral1.BorderColor = Color.Transparent; + buttonPeripheral1.BorderRadius = 5; + buttonPeripheral1.CausesValidation = false; + buttonPeripheral1.Dock = DockStyle.Top; + buttonPeripheral1.FlatAppearance.BorderSize = 0; + buttonPeripheral1.FlatStyle = FlatStyle.Flat; + buttonPeripheral1.Font = new Font("Segoe UI", 8F, FontStyle.Regular, GraphicsUnit.Point); + buttonPeripheral1.ForeColor = SystemColors.ControlText; + buttonPeripheral1.Image = Properties.Resources.icons8_maus_32; + buttonPeripheral1.ImageAlign = ContentAlignment.BottomCenter; + buttonPeripheral1.Location = new Point(3, 3); + buttonPeripheral1.Name = "buttonPeripheral1"; + buttonPeripheral1.Secondary = false; + buttonPeripheral1.Size = new Size(191, 110); + buttonPeripheral1.TabIndex = 20; + buttonPeripheral1.Text = "Mouse 1"; + buttonPeripheral1.TextImageRelation = TextImageRelation.ImageAboveText; + buttonPeripheral1.UseVisualStyleBackColor = false; + // + // panelPeripheralsTile + // + panelPeripheralsTile.Controls.Add(picturePeripherals); + panelPeripheralsTile.Controls.Add(labelPeripherals); + panelPeripheralsTile.Dock = DockStyle.Top; + panelPeripheralsTile.Location = new Point(15, 15); + panelPeripheralsTile.Name = "panelPeripheralsTile"; + panelPeripheralsTile.Size = new Size(591, 30); + panelPeripheralsTile.TabIndex = 45; + // + // picturePeripherals + // + picturePeripherals.BackgroundImage = Properties.Resources.icons8_maus_48; + picturePeripherals.BackgroundImageLayout = ImageLayout.Zoom; + picturePeripherals.Location = new Point(4, 0); + picturePeripherals.Name = "picturePeripherals"; + picturePeripherals.Size = new Size(24, 24); + picturePeripherals.TabIndex = 41; + picturePeripherals.TabStop = false; + // + // labelPeripherals + // + labelPeripherals.AutoSize = true; + labelPeripherals.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); + labelPeripherals.Location = new Point(33, 0); + labelPeripherals.Margin = new Padding(6, 0, 6, 0); + labelPeripherals.Name = "labelPeripherals"; + labelPeripherals.Size = new Size(106, 25); + labelPeripherals.TabIndex = 40; + labelPeripherals.Text = "Peripherals"; + // // SettingsForm // - AutoScaleDimensions = new SizeF(192F, 192F); + AutoScaleDimensions = new SizeF(144F, 144F); AutoScaleMode = AutoScaleMode.Dpi; AutoSize = true; AutoSizeMode = AutoSizeMode.GrowAndShrink; - ClientSize = new Size(833, 1320); + ClientSize = new Size(637, 1185); Controls.Add(panelFooter); Controls.Add(panelVersion); Controls.Add(panelBattery); + Controls.Add(panelPeripherals); Controls.Add(panelMatrix); Controls.Add(panelKeyboard); Controls.Add(panelScreen); Controls.Add(panelGPU); Controls.Add(panelPerformance); - Margin = new Padding(8, 4, 8, 4); + Margin = new Padding(6, 3, 6, 3); MaximizeBox = false; MdiChildrenMinimizedAnchorBottom = false; MinimizeBox = false; - MinimumSize = new Size(823, 71); + MinimumSize = new Size(623, 67); Name = "SettingsForm"; - Padding = new Padding(11); + Padding = new Padding(8); ShowIcon = false; StartPosition = FormStartPosition.CenterScreen; Text = "G-Helper"; @@ -1233,6 +1354,12 @@ namespace GHelper panelKeyboardTitle.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureKeyboard).EndInit(); panelVersion.ResumeLayout(false); + panelPeripherals.ResumeLayout(false); + panelPeripherals.PerformLayout(); + tableLayoutPeripherals.ResumeLayout(false); + panelPeripheralsTile.ResumeLayout(false); + panelPeripheralsTile.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)picturePeripherals).EndInit(); ResumeLayout(false); PerformLayout(); } @@ -1305,5 +1432,13 @@ namespace GHelper private Label labelVersion; private Label labelModel; private RButton buttonStopGPU; + private Panel panelPeripherals; + private TableLayoutPanel tableLayoutPeripherals; + private Panel panelPeripheralsTile; + private PictureBox picturePeripherals; + private Label labelPeripherals; + private RButton buttonPeripheral2; + private RButton buttonPeripheral3; + private RButton buttonPeripheral1; } } \ No newline at end of file diff --git a/app/Settings.cs b/app/Settings.cs index ac9dbcee..efb2b9ea 100644 --- a/app/Settings.cs +++ b/app/Settings.cs @@ -6,6 +6,8 @@ using GHelper.Gpu; using GHelper.Helpers; using GHelper.Input; using GHelper.Mode; +using GHelper.Peripherals; +using GHelper.Peripherals.Mouse; using GHelper.UI; using System.Diagnostics; using System.Timers; @@ -71,6 +73,7 @@ namespace GHelper labelKeyboard.Text = Properties.Strings.LaptopKeyboard; labelMatrix.Text = Properties.Strings.AnimeMatrix; labelBatteryTitle.Text = Properties.Strings.BatteryChargeLimit; + labelPeripherals.Text = Properties.Strings.Peripherals; checkMatrix.Text = Properties.Strings.TurnOffOnBattery; checkStartup.Text = Properties.Strings.RunOnStartup; @@ -182,6 +185,10 @@ namespace GHelper labelBattery.MouseLeave += PanelBattery_MouseLeave; labelBatteryTitle.MouseLeave += PanelBattery_MouseLeave; + buttonPeripheral1.Click += ButtonPeripheral_Click; + buttonPeripheral2.Click += ButtonPeripheral_Click; + buttonPeripheral3.Click += ButtonPeripheral_Click; + labelModel.Text = AppConfig.GetModelShort() + (ProcessHelper.IsUserAdministrator() ? "." : ""); TopMost = AppConfig.Is("topmost"); @@ -816,6 +823,7 @@ namespace GHelper gpuTemp = $": {HardwareControl.gpuTemp}°C"; } + PeripheralsProvider.RefreshBatteryForAllDevices(); Program.settingsForm.BeginInvoke(delegate { @@ -825,6 +833,7 @@ namespace GHelper labelMidFan.Text = "Mid " + HardwareControl.midFan; if (!batteryMouseOver) labelBattery.Text = battery; + VisualizePeripherals(); }); string trayTip = "CPU" + cpuTemp + " " + HardwareControl.cpuFan; @@ -1056,6 +1065,66 @@ namespace GHelper } + public void VisualizePeripherals() + { + if (!PeripheralsProvider.IsAnyPeripheralConnect()) + { + panelPeripherals.Visible = false; + return; + } + + Button[] buttons = new Button[] { buttonPeripheral1, buttonPeripheral2, buttonPeripheral3 }; + + //we only support 4 devces for now. Who has more than 4 mice connected to the same PC anyways.... + List lp = PeripheralsProvider.AllPeripherals(); + + for (int i = 0; i < lp.Count && i < buttons.Length; ++i) + { + IPeripheral m = lp.ElementAt(i); + Button b = buttons[i]; + + if (m.IsDeviceReady) + { + b.Text = m.GetDisplayName() + "\n" + m.Battery + "%" + + (m.Charging ? "(" + Properties.Strings.Charging + ")" : ""); + } + else + { + //Mouse is either not connected or in standby + b.Text = m.GetDisplayName() + "\n(" + Properties.Strings.NotConnected + ")"; + } + + switch (m.DeviceType()) + { + case PeripheralType.Mouse: + b.Image = ControlHelper.TintImage(Properties.Resources.icons8_maus_32, b.ForeColor); + break; + + case PeripheralType.Keyboard: + b.Image = ControlHelper.TintImage(Properties.Resources.icons8_keyboard_32, b.ForeColor); + break; + } + + b.Visible = true; + } + + for (int i = lp.Count; i < buttons.Length; ++i) + { + buttons[i].Visible = false; + } + + panelPeripherals.Visible = true; + } + + private void ButtonPeripheral_Click(object? sender, EventArgs e) + { + int index = 0; + if (sender == buttonPeripheral2) index = 1; + if (sender == buttonPeripheral3) index = 2; + + //TODO: Open Configuration Panel + + } }