From 8d9999c6c737c7f30bd8da8746f997bdea0c515c Mon Sep 17 00:00:00 2001 From: Kate Temkin Date: Wed, 2 Aug 2023 20:44:09 -0600 Subject: [PATCH] add as much button support as we can to the RC71 (ROG Ally) --- app/Extra.Designer.cs | 555 +++++++++++++++++------------------ app/Extra.cs | 25 ++ app/Input/InputDispatcher.cs | 105 ++++--- 3 files changed, 369 insertions(+), 316 deletions(-) diff --git a/app/Extra.Designer.cs b/app/Extra.Designer.cs index 92e757b1..c42ad145 100644 --- a/app/Extra.Designer.cs +++ b/app/Extra.Designer.cs @@ -45,7 +45,7 @@ namespace GHelper comboFNE = new RComboBox(); textFNE = new TextBox(); labelFNC = new Label(); - textBox1 = new TextBox(); + textM2 = new TextBox(); textM1 = new TextBox(); comboM1 = new RComboBox(); labelM1 = new Label(); @@ -63,7 +63,6 @@ namespace GHelper comboFNC = new RComboBox(); textFNC = new TextBox(); tableKeys = new TableLayoutPanel(); - textM2 = new TextBox(); panelBacklightHeader = new Panel(); sliderBrightness = new Slider(); pictureBacklight = new PictureBox(); @@ -138,18 +137,20 @@ namespace GHelper panelServices.Controls.Add(labelServices); panelServices.Controls.Add(buttonServices); panelServices.Dock = DockStyle.Top; - panelServices.Location = new Point(15, 1262); + panelServices.Location = new Point(11, 1011); + panelServices.Margin = new Padding(2); panelServices.Name = "panelServices"; - panelServices.Size = new Size(983, 75); + panelServices.Size = new Size(712, 56); panelServices.TabIndex = 3; // // pictureService // pictureService.BackgroundImage = Resources.icons8_automation_32; pictureService.BackgroundImageLayout = ImageLayout.Zoom; - pictureService.Location = new Point(20, 19); + pictureService.Location = new Point(15, 14); + pictureService.Margin = new Padding(2); pictureService.Name = "pictureService"; - pictureService.Size = new Size(32, 32); + pictureService.Size = new Size(24, 24); pictureService.TabIndex = 21; pictureService.TabStop = false; // @@ -157,9 +158,10 @@ namespace GHelper // labelServices.AutoSize = true; labelServices.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - labelServices.Location = new Point(57, 18); + labelServices.Location = new Point(43, 14); + labelServices.Margin = new Padding(2, 0, 2, 0); labelServices.Name = "labelServices"; - labelServices.Size = new Size(273, 32); + labelServices.Size = new Size(204, 25); labelServices.TabIndex = 20; labelServices.Text = "Asus Services Running"; // @@ -171,11 +173,11 @@ namespace GHelper buttonServices.BorderColor = Color.Transparent; buttonServices.BorderRadius = 2; buttonServices.FlatStyle = FlatStyle.Flat; - buttonServices.Location = new Point(713, 12); - buttonServices.Margin = new Padding(4, 3, 4, 3); + buttonServices.Location = new Point(535, 9); + buttonServices.Margin = new Padding(3, 2, 3, 2); buttonServices.Name = "buttonServices"; buttonServices.Secondary = false; - buttonServices.Size = new Size(256, 52); + buttonServices.Size = new Size(192, 39); buttonServices.TabIndex = 19; buttonServices.Text = "Start Services"; buttonServices.UseVisualStyleBackColor = false; @@ -188,19 +190,21 @@ namespace GHelper panelBindingsHeader.Controls.Add(pictureHelp); panelBindingsHeader.Controls.Add(labelBindings); panelBindingsHeader.Dock = DockStyle.Top; - panelBindingsHeader.Location = new Point(15, 15); + panelBindingsHeader.Location = new Point(11, 11); + panelBindingsHeader.Margin = new Padding(2); panelBindingsHeader.Name = "panelBindingsHeader"; - panelBindingsHeader.Padding = new Padding(10, 5, 10, 5); - panelBindingsHeader.Size = new Size(983, 50); + panelBindingsHeader.Padding = new Padding(8, 4, 8, 4); + panelBindingsHeader.Size = new Size(712, 38); panelBindingsHeader.TabIndex = 4; // // pictureBindings // pictureBindings.BackgroundImage = Resources.icons8_keyboard_32; pictureBindings.BackgroundImageLayout = ImageLayout.Zoom; - pictureBindings.Location = new Point(20, 10); + pictureBindings.Location = new Point(15, 8); + pictureBindings.Margin = new Padding(2); pictureBindings.Name = "pictureBindings"; - pictureBindings.Size = new Size(32, 32); + pictureBindings.Size = new Size(24, 24); pictureBindings.TabIndex = 1; pictureBindings.TabStop = false; // @@ -210,10 +214,10 @@ namespace GHelper pictureHelp.BackgroundImage = Resources.icons8_help_32; pictureHelp.BackgroundImageLayout = ImageLayout.Zoom; pictureHelp.Cursor = Cursors.Hand; - pictureHelp.Location = new Point(930, 10); - pictureHelp.Margin = new Padding(4, 3, 4, 3); + pictureHelp.Location = new Point(673, 8); + pictureHelp.Margin = new Padding(3, 2, 3, 2); pictureHelp.Name = "pictureHelp"; - pictureHelp.Size = new Size(32, 32); + pictureHelp.Size = new Size(24, 24); pictureHelp.TabIndex = 11; pictureHelp.TabStop = false; // @@ -221,9 +225,10 @@ namespace GHelper // labelBindings.AutoSize = true; labelBindings.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - labelBindings.Location = new Point(56, 8); + labelBindings.Location = new Point(42, 6); + labelBindings.Margin = new Padding(2, 0, 2, 0); labelBindings.Name = "labelBindings"; - labelBindings.Size = new Size(114, 32); + labelBindings.Size = new Size(86, 25); labelBindings.TabIndex = 0; labelBindings.Text = "Bindings"; // @@ -233,10 +238,11 @@ namespace GHelper panelBindings.AutoSizeMode = AutoSizeMode.GrowAndShrink; panelBindings.Controls.Add(tableBindings); panelBindings.Dock = DockStyle.Top; - panelBindings.Location = new Point(15, 65); + panelBindings.Location = new Point(11, 49); + panelBindings.Margin = new Padding(2); panelBindings.Name = "panelBindings"; - panelBindings.Padding = new Padding(0, 0, 10, 5); - panelBindings.Size = new Size(983, 351); + panelBindings.Padding = new Padding(0, 0, 8, 4); + panelBindings.Size = new Size(712, 301); panelBindings.TabIndex = 5; // // tableBindings @@ -251,7 +257,7 @@ namespace GHelper tableBindings.Controls.Add(comboFNE, 0, 6); tableBindings.Controls.Add(textFNE, 0, 6); tableBindings.Controls.Add(labelFNC, 0, 5); - tableBindings.Controls.Add(textBox1, 2, 1); + tableBindings.Controls.Add(textM2, 2, 1); tableBindings.Controls.Add(textM1, 2, 0); tableBindings.Controls.Add(comboM1, 1, 0); tableBindings.Controls.Add(labelM1, 0, 0); @@ -270,10 +276,10 @@ namespace GHelper tableBindings.Controls.Add(textFNC, 2, 5); tableBindings.Dock = DockStyle.Top; tableBindings.Location = new Point(0, 0); - tableBindings.Margin = new Padding(0, 3, 4, 3); + tableBindings.Margin = new Padding(0, 2, 3, 2); tableBindings.Name = "tableBindings"; - tableBindings.Padding = new Padding(16, 12, 0, 12); - tableBindings.RowCount = 7; + tableBindings.Padding = new Padding(12, 9, 0, 9); + tableBindings.RowCount = 8; tableBindings.RowStyles.Add(new RowStyle()); tableBindings.RowStyles.Add(new RowStyle()); tableBindings.RowStyles.Add(new RowStyle()); @@ -281,17 +287,18 @@ namespace GHelper tableBindings.RowStyles.Add(new RowStyle()); tableBindings.RowStyles.Add(new RowStyle()); tableBindings.RowStyles.Add(new RowStyle()); - tableBindings.Size = new Size(973, 346); + tableBindings.RowStyles.Add(new RowStyle(SizeType.Absolute, 20F)); + tableBindings.Size = new Size(704, 318); tableBindings.TabIndex = 12; // // labelFNE // labelFNE.AutoSize = true; - labelFNE.Location = new Point(16, 288); + labelFNE.Location = new Point(12, 231); labelFNE.Margin = new Padding(0); labelFNE.Name = "labelFNE"; - labelFNE.Padding = new Padding(5, 10, 0, 0); - labelFNE.Size = new Size(143, 42); + labelFNE.Padding = new Padding(4, 8, 0, 0); + labelFNE.Size = new Size(104, 58); labelFNE.TabIndex = 20; labelFNE.Text = "FN+NmEnt:"; // @@ -301,51 +308,51 @@ namespace GHelper comboFNE.ButtonColor = Color.FromArgb(255, 255, 255); comboFNE.Dock = DockStyle.Top; comboFNE.FormattingEnabled = true; - comboFNE.Location = new Point(167, 291); - comboFNE.Margin = new Padding(4, 3, 4, 3); + comboFNE.Location = new Point(121, 233); + comboFNE.Margin = new Padding(3, 2, 3, 2); comboFNE.Name = "comboFNE"; - comboFNE.Size = new Size(383, 40); + comboFNE.Size = new Size(277, 33); comboFNE.TabIndex = 19; // // textFNE // textFNE.Dock = DockStyle.Top; - textFNE.Location = new Point(558, 291); - textFNE.Margin = new Padding(4, 3, 4, 3); + textFNE.Location = new Point(404, 233); + textFNE.Margin = new Padding(3, 2, 3, 2); textFNE.Name = "textFNE"; textFNE.PlaceholderText = "action"; - textFNE.Size = new Size(411, 39); + textFNE.Size = new Size(297, 31); textFNE.TabIndex = 18; // // labelFNC // labelFNC.AutoSize = true; - labelFNC.Location = new Point(16, 242); + labelFNC.Location = new Point(12, 194); labelFNC.Margin = new Padding(0); labelFNC.Name = "labelFNC"; - labelFNC.Padding = new Padding(5, 10, 0, 0); - labelFNC.Size = new Size(85, 42); + labelFNC.Padding = new Padding(4, 8, 0, 0); + labelFNC.Size = new Size(65, 33); labelFNC.TabIndex = 15; labelFNC.Text = "FN+C:"; // - // textBox1 + // textM2 // - textBox1.Dock = DockStyle.Top; - textBox1.Location = new Point(558, 61); - textBox1.Margin = new Padding(4, 3, 4, 3); - textBox1.Name = "textBox1"; - textBox1.PlaceholderText = "action"; - textBox1.Size = new Size(411, 39); - textBox1.TabIndex = 14; + textM2.Dock = DockStyle.Top; + textM2.Location = new Point(405, 48); + textM2.Margin = new Padding(4, 2, 4, 2); + textM2.Name = "textM2"; + textM2.PlaceholderText = "action"; + textM2.Size = new Size(295, 31); + textM2.TabIndex = 14; // // textM1 // textM1.Dock = DockStyle.Top; - textM1.Location = new Point(558, 15); - textM1.Margin = new Padding(4, 3, 4, 3); + textM1.Location = new Point(404, 11); + textM1.Margin = new Padding(3, 2, 3, 2); textM1.Name = "textM1"; textM1.PlaceholderText = "action"; - textM1.Size = new Size(411, 39); + textM1.Size = new Size(297, 31); textM1.TabIndex = 13; // // comboM1 @@ -355,20 +362,20 @@ namespace GHelper comboM1.Dock = DockStyle.Top; comboM1.FormattingEnabled = true; comboM1.Items.AddRange(new object[] { Strings.Default, Strings.VolumeMute, Strings.PlayPause, Strings.PrintScreen, Strings.ToggleAura, Strings.Custom }); - comboM1.Location = new Point(167, 15); - comboM1.Margin = new Padding(4, 3, 4, 3); + comboM1.Location = new Point(121, 11); + comboM1.Margin = new Padding(3, 2, 3, 2); comboM1.Name = "comboM1"; - comboM1.Size = new Size(383, 40); + comboM1.Size = new Size(277, 33); comboM1.TabIndex = 11; // // labelM1 // labelM1.AutoSize = true; - labelM1.Location = new Point(16, 12); + labelM1.Location = new Point(12, 9); labelM1.Margin = new Padding(0); labelM1.Name = "labelM1"; - labelM1.Padding = new Padding(5, 10, 0, 0); - labelM1.Size = new Size(59, 42); + labelM1.Padding = new Padding(4, 8, 0, 0); + labelM1.Size = new Size(46, 33); labelM1.TabIndex = 9; labelM1.Text = "M1:"; // @@ -379,10 +386,10 @@ namespace GHelper comboM4.Dock = DockStyle.Top; comboM4.FormattingEnabled = true; comboM4.Items.AddRange(new object[] { Strings.PerformanceMode, Strings.OpenGHelper, Strings.Custom }); - comboM4.Location = new Point(167, 153); - comboM4.Margin = new Padding(4, 3, 4, 3); + comboM4.Location = new Point(121, 122); + comboM4.Margin = new Padding(3, 2, 3, 2); comboM4.Name = "comboM4"; - comboM4.Size = new Size(383, 40); + comboM4.Size = new Size(277, 33); comboM4.TabIndex = 3; // // comboM3 @@ -392,62 +399,62 @@ namespace GHelper comboM3.Dock = DockStyle.Top; comboM3.FormattingEnabled = true; comboM3.Items.AddRange(new object[] { Strings.Default, Strings.VolumeMute, Strings.PlayPause, Strings.PrintScreen, Strings.ToggleAura, Strings.Custom }); - comboM3.Location = new Point(167, 107); - comboM3.Margin = new Padding(4, 3, 4, 3); + comboM3.Location = new Point(121, 85); + comboM3.Margin = new Padding(3, 2, 3, 2); comboM3.Name = "comboM3"; - comboM3.Size = new Size(383, 40); + comboM3.Size = new Size(277, 33); comboM3.TabIndex = 1; // // textM4 // textM4.Dock = DockStyle.Top; - textM4.Location = new Point(558, 153); - textM4.Margin = new Padding(4, 3, 4, 3); + textM4.Location = new Point(404, 122); + textM4.Margin = new Padding(3, 2, 3, 2); textM4.Name = "textM4"; textM4.PlaceholderText = "action"; - textM4.Size = new Size(411, 39); + textM4.Size = new Size(297, 31); textM4.TabIndex = 5; // // textM3 // textM3.Dock = DockStyle.Top; - textM3.Location = new Point(558, 107); - textM3.Margin = new Padding(4, 3, 4, 3); + textM3.Location = new Point(404, 85); + textM3.Margin = new Padding(3, 2, 3, 2); textM3.Name = "textM3"; textM3.PlaceholderText = "action"; - textM3.Size = new Size(411, 39); + textM3.Size = new Size(297, 31); textM3.TabIndex = 4; // // labelM4 // labelM4.AutoSize = true; - labelM4.Location = new Point(16, 150); + labelM4.Location = new Point(12, 120); labelM4.Margin = new Padding(0); labelM4.Name = "labelM4"; - labelM4.Padding = new Padding(5, 10, 0, 0); - labelM4.Size = new Size(116, 42); + labelM4.Padding = new Padding(4, 8, 0, 0); + labelM4.Size = new Size(90, 33); labelM4.TabIndex = 2; labelM4.Text = "M4/ROG:"; // // labelM3 // labelM3.AutoSize = true; - labelM3.Location = new Point(16, 104); + labelM3.Location = new Point(12, 83); labelM3.Margin = new Padding(0); labelM3.Name = "labelM3"; - labelM3.Padding = new Padding(5, 10, 0, 0); - labelM3.Size = new Size(59, 42); + labelM3.Padding = new Padding(4, 8, 0, 0); + labelM3.Size = new Size(46, 33); labelM3.TabIndex = 0; labelM3.Text = "M3:"; // // labelM2 // labelM2.AutoSize = true; - labelM2.Location = new Point(16, 58); + labelM2.Location = new Point(12, 46); labelM2.Margin = new Padding(0); labelM2.Name = "labelM2"; - labelM2.Padding = new Padding(5, 10, 0, 0); - labelM2.Size = new Size(59, 42); + labelM2.Padding = new Padding(4, 8, 0, 0); + labelM2.Size = new Size(46, 33); labelM2.TabIndex = 10; labelM2.Text = "M2:"; // @@ -458,20 +465,20 @@ namespace GHelper comboM2.Dock = DockStyle.Top; comboM2.FormattingEnabled = true; comboM2.Items.AddRange(new object[] { Strings.Default, Strings.VolumeMute, Strings.PlayPause, Strings.PrintScreen, Strings.ToggleAura, Strings.Custom }); - comboM2.Location = new Point(167, 61); - comboM2.Margin = new Padding(4, 3, 4, 3); + comboM2.Location = new Point(121, 48); + comboM2.Margin = new Padding(3, 2, 3, 2); comboM2.Name = "comboM2"; - comboM2.Size = new Size(383, 40); + comboM2.Size = new Size(277, 33); comboM2.TabIndex = 12; // // labelFNF4 // labelFNF4.AutoSize = true; - labelFNF4.Location = new Point(16, 196); + labelFNF4.Location = new Point(12, 157); labelFNF4.Margin = new Padding(0); labelFNF4.Name = "labelFNF4"; - labelFNF4.Padding = new Padding(5, 10, 0, 0); - labelFNF4.Size = new Size(95, 42); + labelFNF4.Padding = new Padding(4, 8, 0, 0); + labelFNF4.Size = new Size(73, 33); labelFNF4.TabIndex = 6; labelFNF4.Text = "FN+F4:"; // @@ -481,20 +488,20 @@ namespace GHelper comboFNF4.ButtonColor = Color.FromArgb(255, 255, 255); comboFNF4.Dock = DockStyle.Top; comboFNF4.FormattingEnabled = true; - comboFNF4.Location = new Point(167, 199); - comboFNF4.Margin = new Padding(4, 3, 4, 3); + comboFNF4.Location = new Point(121, 159); + comboFNF4.Margin = new Padding(3, 2, 3, 2); comboFNF4.Name = "comboFNF4"; - comboFNF4.Size = new Size(383, 40); + comboFNF4.Size = new Size(277, 33); comboFNF4.TabIndex = 7; // // textFNF4 // textFNF4.Dock = DockStyle.Top; - textFNF4.Location = new Point(558, 199); - textFNF4.Margin = new Padding(4, 3, 4, 3); + textFNF4.Location = new Point(404, 159); + textFNF4.Margin = new Padding(3, 2, 3, 2); textFNF4.Name = "textFNF4"; textFNF4.PlaceholderText = "action"; - textFNF4.Size = new Size(411, 39); + textFNF4.Size = new Size(297, 31); textFNF4.TabIndex = 8; // // comboFNC @@ -503,20 +510,20 @@ namespace GHelper comboFNC.ButtonColor = Color.FromArgb(255, 255, 255); comboFNC.Dock = DockStyle.Top; comboFNC.FormattingEnabled = true; - comboFNC.Location = new Point(167, 245); - comboFNC.Margin = new Padding(4, 3, 4, 3); + comboFNC.Location = new Point(121, 196); + comboFNC.Margin = new Padding(3, 2, 3, 2); comboFNC.Name = "comboFNC"; - comboFNC.Size = new Size(383, 40); + comboFNC.Size = new Size(277, 33); comboFNC.TabIndex = 16; // // textFNC // textFNC.Dock = DockStyle.Top; - textFNC.Location = new Point(558, 245); - textFNC.Margin = new Padding(4, 3, 4, 3); + textFNC.Location = new Point(404, 196); + textFNC.Margin = new Padding(3, 2, 3, 2); textFNC.Name = "textFNC"; textFNC.PlaceholderText = "action"; - textFNC.Size = new Size(411, 39); + textFNC.Size = new Size(297, 31); textFNC.TabIndex = 17; // // tableKeys @@ -537,16 +544,6 @@ namespace GHelper tableKeys.Size = new Size(200, 100); tableKeys.TabIndex = 0; // - // textM2 - // - textM2.Dock = DockStyle.Top; - textM2.Location = new Point(124, 2); - textM2.Margin = new Padding(4, 2, 4, 2); - textM2.Name = "textM2"; - textM2.PlaceholderText = "action"; - textM2.Size = new Size(72, 39); - textM2.TabIndex = 14; - // // panelBacklightHeader // panelBacklightHeader.AutoSize = true; @@ -555,16 +552,17 @@ namespace GHelper panelBacklightHeader.Controls.Add(pictureBacklight); panelBacklightHeader.Controls.Add(labelBacklightTitle); panelBacklightHeader.Dock = DockStyle.Top; - panelBacklightHeader.Location = new Point(15, 416); + panelBacklightHeader.Location = new Point(11, 350); + panelBacklightHeader.Margin = new Padding(2); panelBacklightHeader.Name = "panelBacklightHeader"; - panelBacklightHeader.Padding = new Padding(10, 5, 10, 5); - panelBacklightHeader.Size = new Size(983, 50); + panelBacklightHeader.Padding = new Padding(8, 4, 8, 4); + panelBacklightHeader.Size = new Size(712, 50); panelBacklightHeader.TabIndex = 44; // // sliderBrightness // sliderBrightness.Anchor = AnchorStyles.Top | AnchorStyles.Right; - sliderBrightness.Location = new Point(546, 6); + sliderBrightness.Location = new Point(660, 7); sliderBrightness.Max = 3; sliderBrightness.Min = 0; sliderBrightness.Name = "sliderBrightness"; @@ -578,9 +576,10 @@ namespace GHelper // pictureBacklight.BackgroundImage = Resources.backlight; pictureBacklight.BackgroundImageLayout = ImageLayout.Zoom; - pictureBacklight.Location = new Point(20, 10); + pictureBacklight.Location = new Point(15, 8); + pictureBacklight.Margin = new Padding(2); pictureBacklight.Name = "pictureBacklight"; - pictureBacklight.Size = new Size(32, 32); + pictureBacklight.Size = new Size(24, 24); pictureBacklight.TabIndex = 3; pictureBacklight.TabStop = false; // @@ -588,9 +587,10 @@ namespace GHelper // labelBacklightTitle.AutoSize = true; labelBacklightTitle.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - labelBacklightTitle.Location = new Point(56, 8); + labelBacklightTitle.Location = new Point(42, 6); + labelBacklightTitle.Margin = new Padding(2, 0, 2, 0); labelBacklightTitle.Name = "labelBacklightTitle"; - labelBacklightTitle.Size = new Size(119, 32); + labelBacklightTitle.Size = new Size(92, 25); labelBacklightTitle.TabIndex = 2; labelBacklightTitle.Text = "Backlight"; // @@ -601,10 +601,11 @@ namespace GHelper panelBacklight.Controls.Add(panelXMG); panelBacklight.Controls.Add(tableBacklight); panelBacklight.Dock = DockStyle.Top; - panelBacklight.Location = new Point(15, 466); + panelBacklight.Location = new Point(11, 400); + panelBacklight.Margin = new Padding(2); panelBacklight.Name = "panelBacklight"; - panelBacklight.Padding = new Padding(0, 5, 0, 5); - panelBacklight.Size = new Size(983, 402); + panelBacklight.Padding = new Padding(0, 4, 0, 4); + panelBacklight.Size = new Size(712, 301); panelBacklight.TabIndex = 6; // // panelBacklightExtra @@ -617,48 +618,46 @@ namespace GHelper panelBacklightExtra.Controls.Add(labelSpeed); panelBacklightExtra.Controls.Add(comboKeyboardSpeed); panelBacklightExtra.Dock = DockStyle.Top; - panelBacklightExtra.Location = new Point(0, 282); - panelBacklightExtra.Margin = new Padding(4, 3, 4, 3); + panelBacklightExtra.Location = new Point(0, 211); + panelBacklightExtra.Margin = new Padding(3, 2, 3, 2); panelBacklightExtra.Name = "panelBacklightExtra"; - panelBacklightExtra.Padding = new Padding(0, 0, 0, 5); - panelBacklightExtra.Size = new Size(983, 115); + panelBacklightExtra.Padding = new Padding(0, 0, 0, 4); + panelBacklightExtra.Size = new Size(712, 86); panelBacklightExtra.TabIndex = 46; // // numericBacklightPluggedTime // numericBacklightPluggedTime.Anchor = AnchorStyles.Top | AnchorStyles.Right; - numericBacklightPluggedTime.Location = new Point(670, 63); - numericBacklightPluggedTime.Margin = new Padding(4, 3, 4, 3); + numericBacklightPluggedTime.Location = new Point(477, 47); + numericBacklightPluggedTime.Margin = new Padding(3, 2, 3, 2); numericBacklightPluggedTime.Maximum = new decimal(new int[] { 3600, 0, 0, 0 }); numericBacklightPluggedTime.Name = "numericBacklightPluggedTime"; - numericBacklightPluggedTime.Size = new Size(140, 39); + numericBacklightPluggedTime.Size = new Size(105, 31); numericBacklightPluggedTime.TabIndex = 49; // // numericBacklightTime // numericBacklightTime.Anchor = AnchorStyles.Top | AnchorStyles.Right; - numericBacklightTime.Location = new Point(822, 63); - numericBacklightTime.Margin = new Padding(4, 3, 4, 3); + numericBacklightTime.Location = new Point(591, 47); + numericBacklightTime.Margin = new Padding(3, 2, 3, 2); numericBacklightTime.Maximum = new decimal(new int[] { 3600, 0, 0, 0 }); numericBacklightTime.Name = "numericBacklightTime"; - numericBacklightTime.Size = new Size(140, 39); + numericBacklightTime.Size = new Size(105, 31); numericBacklightTime.TabIndex = 47; // // labelBacklightTimeout // - labelBacklightTimeout.Location = new Point(16, 63); - labelBacklightTimeout.Margin = new Padding(4, 0, 4, 0); + labelBacklightTimeout.Location = new Point(12, 47); labelBacklightTimeout.Name = "labelBacklightTimeout"; - labelBacklightTimeout.Size = new Size(646, 47); + labelBacklightTimeout.Size = new Size(484, 35); labelBacklightTimeout.TabIndex = 46; labelBacklightTimeout.Text = "Timeout when plugged / on battery"; // // labelSpeed // - labelSpeed.Location = new Point(16, 16); - labelSpeed.Margin = new Padding(4, 0, 4, 0); + labelSpeed.Location = new Point(12, 12); labelSpeed.Name = "labelSpeed"; - labelSpeed.Size = new Size(646, 43); + labelSpeed.Size = new Size(484, 32); labelSpeed.TabIndex = 44; labelSpeed.Text = "Animation Speed"; // @@ -670,12 +669,12 @@ namespace GHelper comboKeyboardSpeed.FlatStyle = FlatStyle.Flat; comboKeyboardSpeed.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); comboKeyboardSpeed.FormattingEnabled = true; - comboKeyboardSpeed.ItemHeight = 32; + comboKeyboardSpeed.ItemHeight = 25; comboKeyboardSpeed.Items.AddRange(new object[] { "Slow", "Normal", "Fast" }); - comboKeyboardSpeed.Location = new Point(670, 13); - comboKeyboardSpeed.Margin = new Padding(4, 12, 4, 9); + comboKeyboardSpeed.Location = new Point(477, 10); + comboKeyboardSpeed.Margin = new Padding(3, 9, 3, 7); comboKeyboardSpeed.Name = "comboKeyboardSpeed"; - comboKeyboardSpeed.Size = new Size(293, 40); + comboKeyboardSpeed.Size = new Size(221, 33); comboKeyboardSpeed.TabIndex = 43; comboKeyboardSpeed.TabStop = false; // @@ -683,20 +682,20 @@ namespace GHelper // panelXMG.Controls.Add(checkXMG); panelXMG.Dock = DockStyle.Top; - panelXMG.Location = new Point(0, 222); - panelXMG.Margin = new Padding(4, 3, 4, 3); + panelXMG.Location = new Point(0, 166); + panelXMG.Margin = new Padding(3, 2, 3, 2); panelXMG.Name = "panelXMG"; - panelXMG.Size = new Size(983, 60); + panelXMG.Size = new Size(712, 45); panelXMG.TabIndex = 45; // // checkXMG // checkXMG.AutoSize = true; - checkXMG.Location = new Point(4, 10); - checkXMG.Margin = new Padding(4, 3, 4, 3); + checkXMG.Location = new Point(3, 8); + checkXMG.Margin = new Padding(3, 2, 3, 2); checkXMG.Name = "checkXMG"; - checkXMG.Padding = new Padding(16, 3, 7, 3); - checkXMG.Size = new Size(181, 42); + checkXMG.Padding = new Padding(12, 2, 5, 2); + checkXMG.Size = new Size(138, 33); checkXMG.TabIndex = 2; checkXMG.Text = "XG Mobile"; checkXMG.UseVisualStyleBackColor = true; @@ -730,7 +729,7 @@ namespace GHelper tableBacklight.Controls.Add(checkSleepLid, 3, 3); tableBacklight.Controls.Add(checkShutdownLid, 3, 4); tableBacklight.Dock = DockStyle.Top; - tableBacklight.Location = new Point(0, 5); + tableBacklight.Location = new Point(0, 4); tableBacklight.Margin = new Padding(0); tableBacklight.Name = "tableBacklight"; tableBacklight.RowCount = 5; @@ -739,29 +738,28 @@ namespace GHelper tableBacklight.RowStyles.Add(new RowStyle()); tableBacklight.RowStyles.Add(new RowStyle()); tableBacklight.RowStyles.Add(new RowStyle()); - tableBacklight.Size = new Size(983, 217); + tableBacklight.Size = new Size(712, 162); tableBacklight.TabIndex = 44; // // labelBacklightKeyboard // labelBacklightKeyboard.Dock = DockStyle.Fill; labelBacklightKeyboard.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - labelBacklightKeyboard.Location = new Point(4, 0); - labelBacklightKeyboard.Margin = new Padding(4, 0, 4, 0); + labelBacklightKeyboard.Location = new Point(3, 0); labelBacklightKeyboard.Name = "labelBacklightKeyboard"; - labelBacklightKeyboard.Padding = new Padding(9, 4, 7, 4); - labelBacklightKeyboard.Size = new Size(237, 45); + labelBacklightKeyboard.Padding = new Padding(7, 3, 5, 3); + labelBacklightKeyboard.Size = new Size(172, 34); labelBacklightKeyboard.TabIndex = 6; labelBacklightKeyboard.Text = "Keyboard"; // // checkAwake // checkAwake.Dock = DockStyle.Fill; - checkAwake.Location = new Point(4, 45); - checkAwake.Margin = new Padding(4, 0, 4, 0); + checkAwake.Location = new Point(3, 34); + checkAwake.Margin = new Padding(3, 0, 3, 0); checkAwake.Name = "checkAwake"; - checkAwake.Padding = new Padding(16, 3, 7, 3); - checkAwake.Size = new Size(237, 43); + checkAwake.Padding = new Padding(12, 2, 5, 2); + checkAwake.Size = new Size(172, 32); checkAwake.TabIndex = 1; checkAwake.Text = Strings.Awake; checkAwake.UseVisualStyleBackColor = true; @@ -769,11 +767,11 @@ namespace GHelper // checkBoot // checkBoot.Dock = DockStyle.Fill; - checkBoot.Location = new Point(4, 88); - checkBoot.Margin = new Padding(4, 0, 4, 0); + checkBoot.Location = new Point(3, 66); + checkBoot.Margin = new Padding(3, 0, 3, 0); checkBoot.Name = "checkBoot"; - checkBoot.Padding = new Padding(16, 3, 7, 3); - checkBoot.Size = new Size(237, 43); + checkBoot.Padding = new Padding(12, 2, 5, 2); + checkBoot.Size = new Size(172, 32); checkBoot.TabIndex = 2; checkBoot.Text = Strings.Boot; checkBoot.UseVisualStyleBackColor = true; @@ -781,11 +779,11 @@ namespace GHelper // checkSleep // checkSleep.Dock = DockStyle.Fill; - checkSleep.Location = new Point(4, 131); - checkSleep.Margin = new Padding(4, 0, 4, 0); + checkSleep.Location = new Point(3, 98); + checkSleep.Margin = new Padding(3, 0, 3, 0); checkSleep.Name = "checkSleep"; - checkSleep.Padding = new Padding(16, 3, 7, 3); - checkSleep.Size = new Size(237, 43); + checkSleep.Padding = new Padding(12, 2, 5, 2); + checkSleep.Size = new Size(172, 32); checkSleep.TabIndex = 3; checkSleep.Text = "Sleep"; checkSleep.UseVisualStyleBackColor = true; @@ -793,11 +791,11 @@ namespace GHelper // checkShutdown // checkShutdown.Dock = DockStyle.Fill; - checkShutdown.Location = new Point(4, 174); - checkShutdown.Margin = new Padding(4, 0, 4, 0); + checkShutdown.Location = new Point(3, 130); + checkShutdown.Margin = new Padding(3, 0, 3, 0); checkShutdown.Name = "checkShutdown"; - checkShutdown.Padding = new Padding(16, 3, 7, 3); - checkShutdown.Size = new Size(237, 43); + checkShutdown.Padding = new Padding(12, 2, 5, 2); + checkShutdown.Size = new Size(172, 32); checkShutdown.TabIndex = 4; checkShutdown.Text = Strings.Shutdown; checkShutdown.UseVisualStyleBackColor = true; @@ -806,22 +804,21 @@ namespace GHelper // labelBacklightLogo.Dock = DockStyle.Fill; labelBacklightLogo.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - labelBacklightLogo.Location = new Point(249, 0); - labelBacklightLogo.Margin = new Padding(4, 0, 4, 0); + labelBacklightLogo.Location = new Point(181, 0); labelBacklightLogo.Name = "labelBacklightLogo"; - labelBacklightLogo.Padding = new Padding(9, 4, 7, 4); - labelBacklightLogo.Size = new Size(237, 45); + labelBacklightLogo.Padding = new Padding(7, 3, 5, 3); + labelBacklightLogo.Size = new Size(172, 34); labelBacklightLogo.TabIndex = 21; labelBacklightLogo.Text = "Logo"; // // checkAwakeLogo // checkAwakeLogo.Dock = DockStyle.Fill; - checkAwakeLogo.Location = new Point(249, 45); - checkAwakeLogo.Margin = new Padding(4, 0, 4, 0); + checkAwakeLogo.Location = new Point(181, 34); + checkAwakeLogo.Margin = new Padding(3, 0, 3, 0); checkAwakeLogo.Name = "checkAwakeLogo"; - checkAwakeLogo.Padding = new Padding(16, 3, 7, 3); - checkAwakeLogo.Size = new Size(237, 43); + checkAwakeLogo.Padding = new Padding(12, 2, 5, 2); + checkAwakeLogo.Size = new Size(172, 32); checkAwakeLogo.TabIndex = 17; checkAwakeLogo.Text = Strings.Awake; checkAwakeLogo.UseVisualStyleBackColor = true; @@ -829,11 +826,11 @@ namespace GHelper // checkBootLogo // checkBootLogo.Dock = DockStyle.Fill; - checkBootLogo.Location = new Point(249, 88); - checkBootLogo.Margin = new Padding(4, 0, 4, 0); + checkBootLogo.Location = new Point(181, 66); + checkBootLogo.Margin = new Padding(3, 0, 3, 0); checkBootLogo.Name = "checkBootLogo"; - checkBootLogo.Padding = new Padding(16, 3, 7, 3); - checkBootLogo.Size = new Size(237, 43); + checkBootLogo.Padding = new Padding(12, 2, 5, 2); + checkBootLogo.Size = new Size(172, 32); checkBootLogo.TabIndex = 18; checkBootLogo.Text = Strings.Boot; checkBootLogo.UseVisualStyleBackColor = true; @@ -841,11 +838,11 @@ namespace GHelper // checkSleepLogo // checkSleepLogo.Dock = DockStyle.Fill; - checkSleepLogo.Location = new Point(249, 131); - checkSleepLogo.Margin = new Padding(4, 0, 4, 0); + checkSleepLogo.Location = new Point(181, 98); + checkSleepLogo.Margin = new Padding(3, 0, 3, 0); checkSleepLogo.Name = "checkSleepLogo"; - checkSleepLogo.Padding = new Padding(16, 3, 7, 3); - checkSleepLogo.Size = new Size(237, 43); + checkSleepLogo.Padding = new Padding(12, 2, 5, 2); + checkSleepLogo.Size = new Size(172, 32); checkSleepLogo.TabIndex = 19; checkSleepLogo.Text = Strings.Sleep; checkSleepLogo.UseVisualStyleBackColor = true; @@ -853,11 +850,11 @@ namespace GHelper // checkShutdownLogo // checkShutdownLogo.Dock = DockStyle.Fill; - checkShutdownLogo.Location = new Point(249, 174); - checkShutdownLogo.Margin = new Padding(4, 0, 4, 0); + checkShutdownLogo.Location = new Point(181, 130); + checkShutdownLogo.Margin = new Padding(3, 0, 3, 0); checkShutdownLogo.Name = "checkShutdownLogo"; - checkShutdownLogo.Padding = new Padding(16, 3, 7, 3); - checkShutdownLogo.Size = new Size(237, 43); + checkShutdownLogo.Padding = new Padding(12, 2, 5, 2); + checkShutdownLogo.Size = new Size(172, 32); checkShutdownLogo.TabIndex = 20; checkShutdownLogo.Text = Strings.Shutdown; checkShutdownLogo.UseVisualStyleBackColor = true; @@ -866,22 +863,21 @@ namespace GHelper // labelBacklightBar.Dock = DockStyle.Fill; labelBacklightBar.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - labelBacklightBar.Location = new Point(494, 0); - labelBacklightBar.Margin = new Padding(4, 0, 4, 0); + labelBacklightBar.Location = new Point(359, 0); labelBacklightBar.Name = "labelBacklightBar"; - labelBacklightBar.Padding = new Padding(9, 4, 7, 4); - labelBacklightBar.Size = new Size(237, 45); + labelBacklightBar.Padding = new Padding(7, 3, 5, 3); + labelBacklightBar.Size = new Size(172, 34); labelBacklightBar.TabIndex = 11; labelBacklightBar.Text = "Lightbar"; // // checkAwakeBar // checkAwakeBar.Dock = DockStyle.Fill; - checkAwakeBar.Location = new Point(494, 45); - checkAwakeBar.Margin = new Padding(4, 0, 4, 0); + checkAwakeBar.Location = new Point(359, 34); + checkAwakeBar.Margin = new Padding(3, 0, 3, 0); checkAwakeBar.Name = "checkAwakeBar"; - checkAwakeBar.Padding = new Padding(16, 3, 7, 3); - checkAwakeBar.Size = new Size(237, 43); + checkAwakeBar.Padding = new Padding(12, 2, 5, 2); + checkAwakeBar.Size = new Size(172, 32); checkAwakeBar.TabIndex = 7; checkAwakeBar.Text = Strings.Awake; checkAwakeBar.UseVisualStyleBackColor = true; @@ -889,11 +885,11 @@ namespace GHelper // checkBootBar // checkBootBar.Dock = DockStyle.Fill; - checkBootBar.Location = new Point(494, 88); - checkBootBar.Margin = new Padding(4, 0, 4, 0); + checkBootBar.Location = new Point(359, 66); + checkBootBar.Margin = new Padding(3, 0, 3, 0); checkBootBar.Name = "checkBootBar"; - checkBootBar.Padding = new Padding(16, 3, 7, 3); - checkBootBar.Size = new Size(237, 43); + checkBootBar.Padding = new Padding(12, 2, 5, 2); + checkBootBar.Size = new Size(172, 32); checkBootBar.TabIndex = 8; checkBootBar.Text = Strings.Boot; checkBootBar.UseVisualStyleBackColor = true; @@ -901,11 +897,11 @@ namespace GHelper // checkSleepBar // checkSleepBar.Dock = DockStyle.Fill; - checkSleepBar.Location = new Point(494, 131); - checkSleepBar.Margin = new Padding(4, 0, 4, 0); + checkSleepBar.Location = new Point(359, 98); + checkSleepBar.Margin = new Padding(3, 0, 3, 0); checkSleepBar.Name = "checkSleepBar"; - checkSleepBar.Padding = new Padding(16, 3, 7, 3); - checkSleepBar.Size = new Size(237, 43); + checkSleepBar.Padding = new Padding(12, 2, 5, 2); + checkSleepBar.Size = new Size(172, 32); checkSleepBar.TabIndex = 9; checkSleepBar.Text = Strings.Sleep; checkSleepBar.UseVisualStyleBackColor = true; @@ -913,11 +909,11 @@ namespace GHelper // checkShutdownBar // checkShutdownBar.Dock = DockStyle.Fill; - checkShutdownBar.Location = new Point(494, 174); - checkShutdownBar.Margin = new Padding(4, 0, 4, 0); + checkShutdownBar.Location = new Point(359, 130); + checkShutdownBar.Margin = new Padding(3, 0, 3, 0); checkShutdownBar.Name = "checkShutdownBar"; - checkShutdownBar.Padding = new Padding(16, 3, 7, 3); - checkShutdownBar.Size = new Size(237, 43); + checkShutdownBar.Padding = new Padding(12, 2, 5, 2); + checkShutdownBar.Size = new Size(172, 32); checkShutdownBar.TabIndex = 10; checkShutdownBar.Text = Strings.Shutdown; checkShutdownBar.UseVisualStyleBackColor = true; @@ -926,22 +922,21 @@ namespace GHelper // labelBacklightLid.Dock = DockStyle.Fill; labelBacklightLid.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - labelBacklightLid.Location = new Point(739, 0); - labelBacklightLid.Margin = new Padding(4, 0, 4, 0); + labelBacklightLid.Location = new Point(537, 0); labelBacklightLid.Name = "labelBacklightLid"; - labelBacklightLid.Padding = new Padding(9, 4, 7, 4); - labelBacklightLid.Size = new Size(240, 45); + labelBacklightLid.Padding = new Padding(7, 3, 5, 3); + labelBacklightLid.Size = new Size(172, 34); labelBacklightLid.TabIndex = 16; labelBacklightLid.Text = "Lid"; // // checkAwakeLid // checkAwakeLid.Dock = DockStyle.Fill; - checkAwakeLid.Location = new Point(739, 45); - checkAwakeLid.Margin = new Padding(4, 0, 4, 0); + checkAwakeLid.Location = new Point(537, 34); + checkAwakeLid.Margin = new Padding(3, 0, 3, 0); checkAwakeLid.Name = "checkAwakeLid"; - checkAwakeLid.Padding = new Padding(16, 3, 7, 3); - checkAwakeLid.Size = new Size(240, 43); + checkAwakeLid.Padding = new Padding(12, 2, 5, 2); + checkAwakeLid.Size = new Size(172, 32); checkAwakeLid.TabIndex = 12; checkAwakeLid.Text = Strings.Awake; checkAwakeLid.UseVisualStyleBackColor = true; @@ -949,11 +944,11 @@ namespace GHelper // checkBootLid // checkBootLid.Dock = DockStyle.Fill; - checkBootLid.Location = new Point(739, 88); - checkBootLid.Margin = new Padding(4, 0, 4, 0); + checkBootLid.Location = new Point(537, 66); + checkBootLid.Margin = new Padding(3, 0, 3, 0); checkBootLid.Name = "checkBootLid"; - checkBootLid.Padding = new Padding(16, 3, 7, 3); - checkBootLid.Size = new Size(240, 43); + checkBootLid.Padding = new Padding(12, 2, 5, 2); + checkBootLid.Size = new Size(172, 32); checkBootLid.TabIndex = 13; checkBootLid.Text = Strings.Boot; checkBootLid.UseVisualStyleBackColor = true; @@ -961,11 +956,11 @@ namespace GHelper // checkSleepLid // checkSleepLid.Dock = DockStyle.Fill; - checkSleepLid.Location = new Point(739, 131); - checkSleepLid.Margin = new Padding(4, 0, 4, 0); + checkSleepLid.Location = new Point(537, 98); + checkSleepLid.Margin = new Padding(3, 0, 3, 0); checkSleepLid.Name = "checkSleepLid"; - checkSleepLid.Padding = new Padding(16, 3, 7, 3); - checkSleepLid.Size = new Size(240, 43); + checkSleepLid.Padding = new Padding(12, 2, 5, 2); + checkSleepLid.Size = new Size(172, 32); checkSleepLid.TabIndex = 14; checkSleepLid.Text = Strings.Sleep; checkSleepLid.UseVisualStyleBackColor = true; @@ -973,11 +968,11 @@ namespace GHelper // checkShutdownLid // checkShutdownLid.Dock = DockStyle.Fill; - checkShutdownLid.Location = new Point(739, 174); - checkShutdownLid.Margin = new Padding(4, 0, 4, 0); + checkShutdownLid.Location = new Point(537, 130); + checkShutdownLid.Margin = new Padding(3, 0, 3, 0); checkShutdownLid.Name = "checkShutdownLid"; - checkShutdownLid.Padding = new Padding(16, 3, 7, 3); - checkShutdownLid.Size = new Size(240, 43); + checkShutdownLid.Padding = new Padding(12, 2, 5, 2); + checkShutdownLid.Size = new Size(172, 32); checkShutdownLid.TabIndex = 15; checkShutdownLid.Text = Strings.Shutdown; checkShutdownLid.UseVisualStyleBackColor = true; @@ -990,10 +985,11 @@ namespace GHelper panelSettingsHeader.Controls.Add(pictureSettings); panelSettingsHeader.Controls.Add(labelSettings); panelSettingsHeader.Dock = DockStyle.Top; - panelSettingsHeader.Location = new Point(15, 868); + panelSettingsHeader.Location = new Point(11, 701); + panelSettingsHeader.Margin = new Padding(2); panelSettingsHeader.Name = "panelSettingsHeader"; - panelSettingsHeader.Padding = new Padding(10, 5, 10, 5); - panelSettingsHeader.Size = new Size(983, 50); + panelSettingsHeader.Padding = new Padding(8, 4, 8, 4); + panelSettingsHeader.Size = new Size(712, 38); panelSettingsHeader.TabIndex = 45; // // pictureLog @@ -1002,10 +998,10 @@ namespace GHelper pictureLog.BackgroundImage = Resources.icons8_log_32; pictureLog.BackgroundImageLayout = ImageLayout.Zoom; pictureLog.Cursor = Cursors.Hand; - pictureLog.Location = new Point(930, 10); - pictureLog.Margin = new Padding(4, 3, 4, 3); + pictureLog.Location = new Point(673, 8); + pictureLog.Margin = new Padding(3, 2, 3, 2); pictureLog.Name = "pictureLog"; - pictureLog.Size = new Size(32, 32); + pictureLog.Size = new Size(24, 24); pictureLog.TabIndex = 12; pictureLog.TabStop = false; // @@ -1013,9 +1009,10 @@ namespace GHelper // pictureSettings.BackgroundImage = Resources.icons8_settings_32; pictureSettings.BackgroundImageLayout = ImageLayout.Zoom; - pictureSettings.Location = new Point(20, 10); + pictureSettings.Location = new Point(15, 8); + pictureSettings.Margin = new Padding(2); pictureSettings.Name = "pictureSettings"; - pictureSettings.Size = new Size(32, 32); + pictureSettings.Size = new Size(24, 24); pictureSettings.TabIndex = 1; pictureSettings.TabStop = false; // @@ -1023,9 +1020,10 @@ namespace GHelper // labelSettings.AutoSize = true; labelSettings.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - labelSettings.Location = new Point(56, 9); + labelSettings.Location = new Point(42, 7); + labelSettings.Margin = new Padding(2, 0, 2, 0); labelSettings.Name = "labelSettings"; - labelSettings.Size = new Size(78, 32); + labelSettings.Size = new Size(61, 25); labelSettings.TabIndex = 0; labelSettings.Text = "Other"; // @@ -1042,21 +1040,22 @@ namespace GHelper panelSettings.Controls.Add(checkGpuApps); panelSettings.Controls.Add(checkFnLock); panelSettings.Dock = DockStyle.Top; - panelSettings.Location = new Point(15, 918); + panelSettings.Location = new Point(11, 739); + panelSettings.Margin = new Padding(2); panelSettings.Name = "panelSettings"; - panelSettings.Padding = new Padding(20, 5, 10, 5); - panelSettings.Size = new Size(983, 344); + panelSettings.Padding = new Padding(15, 4, 8, 4); + panelSettings.Size = new Size(712, 272); panelSettings.TabIndex = 46; // // checkAutoToggleClamshellMode // checkAutoToggleClamshellMode.AutoSize = true; checkAutoToggleClamshellMode.Dock = DockStyle.Top; - checkAutoToggleClamshellMode.Location = new Point(20, 299); + checkAutoToggleClamshellMode.Location = new Point(15, 235); checkAutoToggleClamshellMode.Margin = new Padding(2); checkAutoToggleClamshellMode.Name = "checkAutoToggleClamshellMode"; checkAutoToggleClamshellMode.Padding = new Padding(2); - checkAutoToggleClamshellMode.Size = new Size(953, 40); + checkAutoToggleClamshellMode.Size = new Size(689, 33); checkAutoToggleClamshellMode.TabIndex = 58; checkAutoToggleClamshellMode.Text = "Auto Toggle Clamshell Mode"; checkAutoToggleClamshellMode.UseVisualStyleBackColor = true; @@ -1065,11 +1064,11 @@ namespace GHelper // checkAutoApplyWindowsPowerMode.AutoSize = true; checkAutoApplyWindowsPowerMode.Dock = DockStyle.Top; - checkAutoApplyWindowsPowerMode.Location = new Point(20, 257); - checkAutoApplyWindowsPowerMode.Margin = new Padding(4, 3, 4, 3); + checkAutoApplyWindowsPowerMode.Location = new Point(15, 202); + checkAutoApplyWindowsPowerMode.Margin = new Padding(3, 2, 3, 2); checkAutoApplyWindowsPowerMode.Name = "checkAutoApplyWindowsPowerMode"; - checkAutoApplyWindowsPowerMode.Padding = new Padding(3); - checkAutoApplyWindowsPowerMode.Size = new Size(953, 42); + checkAutoApplyWindowsPowerMode.Padding = new Padding(2); + checkAutoApplyWindowsPowerMode.Size = new Size(689, 33); checkAutoApplyWindowsPowerMode.TabIndex = 54; checkAutoApplyWindowsPowerMode.Text = "Auto Adjust Windows Power Mode"; checkAutoApplyWindowsPowerMode.UseVisualStyleBackColor = true; @@ -1078,11 +1077,11 @@ namespace GHelper // checkTopmost.AutoSize = true; checkTopmost.Dock = DockStyle.Top; - checkTopmost.Location = new Point(20, 215); - checkTopmost.Margin = new Padding(4, 3, 4, 3); + checkTopmost.Location = new Point(15, 169); + checkTopmost.Margin = new Padding(3, 2, 3, 2); checkTopmost.Name = "checkTopmost"; - checkTopmost.Padding = new Padding(3); - checkTopmost.Size = new Size(953, 42); + checkTopmost.Padding = new Padding(2); + checkTopmost.Size = new Size(689, 33); checkTopmost.TabIndex = 51; checkTopmost.Text = Strings.WindowTop; checkTopmost.UseVisualStyleBackColor = true; @@ -1091,11 +1090,11 @@ namespace GHelper // checkNoOverdrive.AutoSize = true; checkNoOverdrive.Dock = DockStyle.Top; - checkNoOverdrive.Location = new Point(20, 173); - checkNoOverdrive.Margin = new Padding(4, 3, 4, 3); + checkNoOverdrive.Location = new Point(15, 136); + checkNoOverdrive.Margin = new Padding(3, 2, 3, 2); checkNoOverdrive.Name = "checkNoOverdrive"; - checkNoOverdrive.Padding = new Padding(3); - checkNoOverdrive.Size = new Size(953, 42); + checkNoOverdrive.Padding = new Padding(2); + checkNoOverdrive.Size = new Size(689, 33); checkNoOverdrive.TabIndex = 52; checkNoOverdrive.Text = Strings.DisableOverdrive; checkNoOverdrive.UseVisualStyleBackColor = true; @@ -1104,11 +1103,11 @@ namespace GHelper // checkUSBC.AutoSize = true; checkUSBC.Dock = DockStyle.Top; - checkUSBC.Location = new Point(20, 131); - checkUSBC.Margin = new Padding(4, 3, 4, 3); + checkUSBC.Location = new Point(15, 103); + checkUSBC.Margin = new Padding(3, 2, 3, 2); checkUSBC.Name = "checkUSBC"; - checkUSBC.Padding = new Padding(3); - checkUSBC.Size = new Size(953, 42); + checkUSBC.Padding = new Padding(2); + checkUSBC.Size = new Size(689, 33); checkUSBC.TabIndex = 53; checkUSBC.Text = "Keep GPU disabled on USB-C charger in Optimized mode"; checkUSBC.UseVisualStyleBackColor = true; @@ -1117,11 +1116,11 @@ namespace GHelper // checkVariBright.AutoSize = true; checkVariBright.Dock = DockStyle.Top; - checkVariBright.Location = new Point(20, 89); - checkVariBright.Margin = new Padding(4, 3, 4, 3); + checkVariBright.Location = new Point(15, 70); + checkVariBright.Margin = new Padding(3, 2, 3, 2); checkVariBright.Name = "checkVariBright"; - checkVariBright.Padding = new Padding(3); - checkVariBright.Size = new Size(953, 42); + checkVariBright.Padding = new Padding(2); + checkVariBright.Size = new Size(689, 33); checkVariBright.TabIndex = 57; checkVariBright.Text = "AMD Display VariBright"; checkVariBright.UseVisualStyleBackColor = true; @@ -1130,11 +1129,11 @@ namespace GHelper // checkGpuApps.AutoSize = true; checkGpuApps.Dock = DockStyle.Top; - checkGpuApps.Location = new Point(20, 47); - checkGpuApps.Margin = new Padding(4, 3, 4, 3); + checkGpuApps.Location = new Point(15, 37); + checkGpuApps.Margin = new Padding(3, 2, 3, 2); checkGpuApps.Name = "checkGpuApps"; - checkGpuApps.Padding = new Padding(3); - checkGpuApps.Size = new Size(953, 42); + checkGpuApps.Padding = new Padding(2); + checkGpuApps.Size = new Size(689, 33); checkGpuApps.TabIndex = 55; checkGpuApps.Text = "Stop all apps using GPU when switching to Eco"; checkGpuApps.UseVisualStyleBackColor = true; @@ -1143,24 +1142,24 @@ namespace GHelper // checkFnLock.AutoSize = true; checkFnLock.Dock = DockStyle.Top; - checkFnLock.Location = new Point(20, 5); - checkFnLock.Margin = new Padding(4, 3, 4, 3); - checkFnLock.MaximumSize = new Size(800, 0); + checkFnLock.Location = new Point(15, 4); + checkFnLock.Margin = new Padding(3, 2, 3, 2); + checkFnLock.MaximumSize = new Size(600, 0); checkFnLock.Name = "checkFnLock"; - checkFnLock.Padding = new Padding(3); - checkFnLock.Size = new Size(800, 42); + checkFnLock.Padding = new Padding(2); + checkFnLock.Size = new Size(600, 33); checkFnLock.TabIndex = 56; checkFnLock.Text = "Process Fn+F hotkeys without Fn"; checkFnLock.UseVisualStyleBackColor = true; // // Extra // - AutoScaleDimensions = new SizeF(192F, 192F); + AutoScaleDimensions = new SizeF(144F, 144F); AutoScaleMode = AutoScaleMode.Dpi; AutoScroll = true; AutoSize = true; AutoSizeMode = AutoSizeMode.GrowAndShrink; - ClientSize = new Size(1013, 1355); + ClientSize = new Size(760, 788); Controls.Add(panelServices); Controls.Add(panelSettings); Controls.Add(panelSettingsHeader); @@ -1169,13 +1168,13 @@ namespace GHelper Controls.Add(panelBindings); Controls.Add(panelBindingsHeader); FormBorderStyle = FormBorderStyle.FixedSingle; - Margin = new Padding(4, 3, 4, 3); + Margin = new Padding(3, 2, 3, 2); MaximizeBox = false; MdiChildrenMinimizedAnchorBottom = false; MinimizeBox = false; - MinimumSize = new Size(1034, 71); + MinimumSize = new Size(781, 67); Name = "Extra"; - Padding = new Padding(15); + Padding = new Padding(11); ShowIcon = false; ShowInTaskbar = false; Text = "Extra Settings"; @@ -1219,7 +1218,7 @@ namespace GHelper private Panel panelBindings; private TableLayoutPanel tableBindings; private Label labelFNC; - private TextBox textBox1; + private TextBox textM2; private TextBox textM1; private RComboBox comboM1; private Label labelM1; @@ -1238,7 +1237,6 @@ namespace GHelper private TextBox textFNC; private PictureBox pictureHelp; private TableLayoutPanel tableKeys; - private TextBox textM2; private PictureBox pictureBindings; private Label labelBindings; private Panel panelBacklightHeader; @@ -1292,5 +1290,6 @@ namespace GHelper private Label labelFNE; private RComboBox comboFNE; private TextBox textFNE; + private Slider slider1; } } \ No newline at end of file diff --git a/app/Extra.cs b/app/Extra.cs index 07740941..74721dbc 100644 --- a/app/Extra.cs +++ b/app/Extra.cs @@ -90,6 +90,31 @@ namespace GHelper { InitializeComponent(); + // Change text and hide irrelevant options on the ROG Ally, + // which is a bit of a special case piece of hardware. + if (AppConfig.ContainsModel("RC71")) + { + // The back paddles both seem to issue the same code; + // so we'll replace "M1/M2" with one field, for now. + // (Eventually, we should learn how Asus' software tells the difference.) + labelM1.Text = "Back Paddles"; + labelM2.Visible = false; + comboM2.Visible = false; + textM2.Visible = false; + + // Re-label M3 and M4 to match the front labels. + labelM3.Text = "Ctrl Center"; + labelM4.Text = "ROG"; + + // Hide all of the FN options, as the Ally has no special keyboard FN key. + labelFNC.Visible = false; + comboFNC.Visible = false; + textFNC.Visible = false; + labelFNF4.Visible = false; + comboFNF4.Visible = false; + textFNF4.Visible = false; + } + labelBindings.Text = Properties.Strings.KeyBindings; labelBacklightTitle.Text = Properties.Strings.LaptopBacklight; labelSettings.Text = Properties.Strings.Other; diff --git a/app/Input/InputDispatcher.cs b/app/Input/InputDispatcher.cs index 46ea5604..fd23543b 100644 --- a/app/Input/InputDispatcher.cs +++ b/app/Input/InputDispatcher.cs @@ -428,45 +428,74 @@ namespace GHelper.Input static void HandleEvent(int EventID) { - switch (EventID) + // The ROG Ally uses different M-key codes. + // We'll special-case the translation of those. + if (AppConfig.ContainsModel("RC71")) { - case 124: // M3 - KeyProcess("m3"); - return; - case 56: // M4 / Rog button - KeyProcess("m4"); - return; - case 181: // FN + Numpad Enter - KeyProcess("fne"); - return; - case 174: // FN+F5 - modeControl.CyclePerformanceMode(); - return; - case 179: // FN+F4 - case 178: // FN+F4 - KeyProcess("fnf4"); - return; - case 158: // Fn + C - KeyProcess("fnc"); - return; - case 78: // Fn + ESC - ToggleFnLock(); - return; - case 189: // Tablet mode - TabletMode(); - return; - case 197: // FN+F2 - SetBacklight(-1); - return; - case 196: // FN+F3 - SetBacklight(1); - return; - case 199: // ON Z13 - FN+F11 - cycles backlight - SetBacklight(4); - return; - case 53: // FN+F6 on GA-502DU model - NativeMethods.TurnOffScreen(Program.settingsForm.Handle); - return; + switch(EventID) + { + + // This is both the M1 and M2 keys. + // There's a way to differentiate, apparently, but it isn't over USB or any other obvious protocol. + case 165: + KeyProcess("m1"); + return; + // The Command Center ("play-looking") button below the select key. + // We'll call this M3. + case 166: + KeyProcess("m3"); + return; + // The M4/ROG key. + case 56: + KeyProcess("m4"); + return; + + } + } + // All other devices seem to use the same HID key-codes, + // so we can process them all the same. + else + { + switch (EventID) + { + case 124: // M3 + KeyProcess("m3"); + return; + case 56: // M4 / Rog button + KeyProcess("m4"); + return; + case 181: // FN + Numpad Enter + KeyProcess("fne"); + return; + case 174: // FN+F5 + modeControl.CyclePerformanceMode(); + return; + case 179: // FN+F4 + case 178: // FN+F4 + KeyProcess("fnf4"); + return; + case 158: // Fn + C + KeyProcess("fnc"); + return; + case 78: // Fn + ESC + ToggleFnLock(); + return; + case 189: // Tablet mode + TabletMode(); + return; + case 197: // FN+F2 + SetBacklight(-1); + return; + case 196: // FN+F3 + SetBacklight(1); + return; + case 199: // ON Z13 - FN+F11 - cycles backlight + SetBacklight(4); + return; + case 53: // FN+F6 on GA-502DU model + NativeMethods.TurnOffScreen(Program.settingsForm.Handle); + return; + } } if (!OptimizationService.IsRunning())