From 48674dcf9024766d2c1a1bb6e8ed00b7ff424c1b Mon Sep 17 00:00:00 2001
From: Serge <5920850+seerge@users.noreply.github.com>
Date: Tue, 8 Aug 2023 01:03:06 +0200
Subject: [PATCH] Accessible controls
---
app/Extra.Designer.cs | 74 ++++++++++++++++++++++++++++------------
app/Extra.resx | 2 +-
app/Fans.cs | 2 +-
app/Settings.Designer.cs | 42 ++++++++++++++++-------
app/Settings.cs | 12 +++++--
5 files changed, 93 insertions(+), 39 deletions(-)
diff --git a/app/Extra.Designer.cs b/app/Extra.Designer.cs
index 17a1595e..b5210eb0 100644
--- a/app/Extra.Designer.cs
+++ b/app/Extra.Designer.cs
@@ -133,6 +133,8 @@ namespace GHelper
//
// panelServices
//
+ panelServices.AccessibleName = "Asus Services";
+ panelServices.AccessibleRole = AccessibleRole.Grouping;
panelServices.Controls.Add(pictureService);
panelServices.Controls.Add(labelServices);
panelServices.Controls.Add(buttonServices);
@@ -140,7 +142,7 @@ namespace GHelper
panelServices.Location = new Point(15, 1267);
panelServices.Name = "panelServices";
panelServices.Size = new Size(983, 75);
- panelServices.TabIndex = 3;
+ panelServices.TabIndex = 4;
//
// pictureService
//
@@ -228,6 +230,7 @@ namespace GHelper
//
// panelBindings
//
+ panelBindings.AccessibleName = "Key Bindings";
panelBindings.AutoSize = true;
panelBindings.AutoSizeMode = AutoSizeMode.GrowAndShrink;
panelBindings.Controls.Add(tableBindings);
@@ -236,10 +239,13 @@ namespace GHelper
panelBindings.Name = "panelBindings";
panelBindings.Padding = new Padding(0, 0, 11, 5);
panelBindings.Size = new Size(983, 351);
- panelBindings.TabIndex = 5;
+ panelBindings.TabIndex = 1;
+ panelBindings.TabStop = true;
//
// tableBindings
//
+ tableBindings.AccessibleName = "Keyboard Bindings";
+ tableBindings.AccessibleRole = AccessibleRole.Table;
tableBindings.AutoSize = true;
tableBindings.AutoSizeMode = AutoSizeMode.GrowAndShrink;
tableBindings.ColumnCount = 3;
@@ -297,6 +303,7 @@ namespace GHelper
//
// comboFNE
//
+ comboFNE.AccessibleName = "Fn+Numpad Action";
comboFNE.BorderColor = Color.White;
comboFNE.ButtonColor = Color.FromArgb(255, 255, 255);
comboFNE.Dock = DockStyle.Top;
@@ -305,7 +312,7 @@ namespace GHelper
comboFNE.Margin = new Padding(4, 3, 4, 3);
comboFNE.Name = "comboFNE";
comboFNE.Size = new Size(374, 40);
- comboFNE.TabIndex = 19;
+ comboFNE.TabIndex = 7;
//
// textFNE
//
@@ -316,6 +323,7 @@ namespace GHelper
textFNE.PlaceholderText = "action";
textFNE.Size = new Size(375, 39);
textFNE.TabIndex = 18;
+ textFNE.TabStop = false;
//
// labelFNC
//
@@ -337,6 +345,7 @@ namespace GHelper
textM2.PlaceholderText = "action";
textM2.Size = new Size(373, 39);
textM2.TabIndex = 14;
+ textM2.TabStop = false;
//
// textM1
//
@@ -347,9 +356,11 @@ namespace GHelper
textM1.PlaceholderText = "action";
textM1.Size = new Size(375, 39);
textM1.TabIndex = 13;
+ textM1.TabStop = false;
//
// comboM1
//
+ comboM1.AccessibleName = "M1 Action";
comboM1.BorderColor = Color.White;
comboM1.ButtonColor = Color.FromArgb(255, 255, 255);
comboM1.Dock = DockStyle.Top;
@@ -359,7 +370,7 @@ namespace GHelper
comboM1.Margin = new Padding(4, 3, 4, 3);
comboM1.Name = "comboM1";
comboM1.Size = new Size(374, 40);
- comboM1.TabIndex = 11;
+ comboM1.TabIndex = 1;
//
// labelM1
//
@@ -374,6 +385,7 @@ namespace GHelper
//
// comboM4
//
+ comboM4.AccessibleName = "M4 Action";
comboM4.BorderColor = Color.White;
comboM4.ButtonColor = Color.FromArgb(255, 255, 255);
comboM4.Dock = DockStyle.Top;
@@ -383,10 +395,11 @@ namespace GHelper
comboM4.Margin = new Padding(4, 3, 4, 3);
comboM4.Name = "comboM4";
comboM4.Size = new Size(374, 40);
- comboM4.TabIndex = 3;
+ comboM4.TabIndex = 4;
//
// comboM3
//
+ comboM3.AccessibleName = "M3 Action";
comboM3.BorderColor = Color.White;
comboM3.ButtonColor = Color.FromArgb(255, 255, 255);
comboM3.Dock = DockStyle.Top;
@@ -396,7 +409,7 @@ namespace GHelper
comboM3.Margin = new Padding(4, 3, 4, 3);
comboM3.Name = "comboM3";
comboM3.Size = new Size(374, 40);
- comboM3.TabIndex = 1;
+ comboM3.TabIndex = 3;
//
// textM4
//
@@ -407,6 +420,7 @@ namespace GHelper
textM4.PlaceholderText = "action";
textM4.Size = new Size(375, 39);
textM4.TabIndex = 5;
+ textM4.TabStop = false;
//
// textM3
//
@@ -417,6 +431,7 @@ namespace GHelper
textM3.PlaceholderText = "action";
textM3.Size = new Size(375, 39);
textM3.TabIndex = 4;
+ textM3.TabStop = false;
//
// labelM4
//
@@ -453,6 +468,7 @@ namespace GHelper
//
// comboM2
//
+ comboM2.AccessibleName = "M2 Action";
comboM2.BorderColor = Color.White;
comboM2.ButtonColor = Color.FromArgb(255, 255, 255);
comboM2.Dock = DockStyle.Top;
@@ -462,7 +478,7 @@ namespace GHelper
comboM2.Margin = new Padding(4, 3, 4, 3);
comboM2.Name = "comboM2";
comboM2.Size = new Size(374, 40);
- comboM2.TabIndex = 12;
+ comboM2.TabIndex = 2;
//
// labelFNF4
//
@@ -477,6 +493,7 @@ namespace GHelper
//
// comboFNF4
//
+ comboFNF4.AccessibleName = "Fn+F4 Action";
comboFNF4.BorderColor = Color.White;
comboFNF4.ButtonColor = Color.FromArgb(255, 255, 255);
comboFNF4.Dock = DockStyle.Top;
@@ -485,7 +502,7 @@ namespace GHelper
comboFNF4.Margin = new Padding(4, 3, 4, 3);
comboFNF4.Name = "comboFNF4";
comboFNF4.Size = new Size(374, 40);
- comboFNF4.TabIndex = 7;
+ comboFNF4.TabIndex = 5;
//
// textFNF4
//
@@ -496,9 +513,11 @@ namespace GHelper
textFNF4.PlaceholderText = "action";
textFNF4.Size = new Size(375, 39);
textFNF4.TabIndex = 8;
+ textFNF4.TabStop = false;
//
// comboFNC
//
+ comboFNC.AccessibleName = "Fn+C Action";
comboFNC.BorderColor = Color.White;
comboFNC.ButtonColor = Color.FromArgb(255, 255, 255);
comboFNC.Dock = DockStyle.Top;
@@ -507,7 +526,7 @@ namespace GHelper
comboFNC.Margin = new Padding(4, 3, 4, 3);
comboFNC.Name = "comboFNC";
comboFNC.Size = new Size(374, 40);
- comboFNC.TabIndex = 16;
+ comboFNC.TabIndex = 6;
//
// textFNC
//
@@ -518,6 +537,7 @@ namespace GHelper
textFNC.PlaceholderText = "action";
textFNC.Size = new Size(375, 39);
textFNC.TabIndex = 17;
+ textFNC.TabStop = false;
//
// tableKeys
//
@@ -562,6 +582,7 @@ namespace GHelper
sliderBrightness.Size = new Size(500, 40);
sliderBrightness.Step = 1;
sliderBrightness.TabIndex = 50;
+ sliderBrightness.TabStop = false;
sliderBrightness.Text = "sliderBrightness";
sliderBrightness.Value = 3;
//
@@ -596,7 +617,7 @@ namespace GHelper
panelBacklight.Name = "panelBacklight";
panelBacklight.Padding = new Padding(0, 5, 0, 5);
panelBacklight.Size = new Size(983, 402);
- panelBacklight.TabIndex = 6;
+ panelBacklight.TabIndex = 2;
//
// panelBacklightExtra
//
@@ -617,23 +638,25 @@ namespace GHelper
//
// numericBacklightPluggedTime
//
+ numericBacklightPluggedTime.AccessibleName = "Backlight Timeout when plugged";
numericBacklightPluggedTime.Anchor = AnchorStyles.Top | AnchorStyles.Right;
numericBacklightPluggedTime.Location = new Point(670, 63);
numericBacklightPluggedTime.Margin = new Padding(4, 3, 4, 3);
numericBacklightPluggedTime.Maximum = new decimal(new int[] { 3600, 0, 0, 0 });
numericBacklightPluggedTime.Name = "numericBacklightPluggedTime";
numericBacklightPluggedTime.Size = new Size(140, 39);
- numericBacklightPluggedTime.TabIndex = 49;
+ numericBacklightPluggedTime.TabIndex = 1;
//
// numericBacklightTime
//
+ numericBacklightTime.AccessibleName = "Backlight Timeout when on battery";
numericBacklightTime.Anchor = AnchorStyles.Top | AnchorStyles.Right;
numericBacklightTime.Location = new Point(822, 63);
numericBacklightTime.Margin = new Padding(4, 3, 4, 3);
numericBacklightTime.Maximum = new decimal(new int[] { 3600, 0, 0, 0 });
numericBacklightTime.Name = "numericBacklightTime";
numericBacklightTime.Size = new Size(140, 39);
- numericBacklightTime.TabIndex = 47;
+ numericBacklightTime.TabIndex = 2;
//
// labelBacklightTimeout
//
@@ -655,6 +678,7 @@ namespace GHelper
//
// comboKeyboardSpeed
//
+ comboKeyboardSpeed.AccessibleName = "Keyboard Animation Speed";
comboKeyboardSpeed.Anchor = AnchorStyles.Top | AnchorStyles.Right;
comboKeyboardSpeed.BorderColor = Color.White;
comboKeyboardSpeed.ButtonColor = SystemColors.ControlLight;
@@ -667,7 +691,7 @@ namespace GHelper
comboKeyboardSpeed.Margin = new Padding(4, 12, 4, 9);
comboKeyboardSpeed.Name = "comboKeyboardSpeed";
comboKeyboardSpeed.Size = new Size(293, 40);
- comboKeyboardSpeed.TabIndex = 43;
+ comboKeyboardSpeed.TabIndex = 0;
comboKeyboardSpeed.TabStop = false;
//
// panelXMG
@@ -747,6 +771,7 @@ namespace GHelper
//
// checkAwake
//
+ checkAwake.AccessibleName = "Awake Backlight";
checkAwake.Dock = DockStyle.Fill;
checkAwake.Location = new Point(4, 45);
checkAwake.Margin = new Padding(4, 0, 4, 0);
@@ -759,6 +784,7 @@ namespace GHelper
//
// checkBoot
//
+ checkBoot.AccessibleName = "Boot Backlight";
checkBoot.Dock = DockStyle.Fill;
checkBoot.Location = new Point(4, 88);
checkBoot.Margin = new Padding(4, 0, 4, 0);
@@ -771,6 +797,7 @@ namespace GHelper
//
// checkSleep
//
+ checkSleep.AccessibleName = "Sleep Backlight";
checkSleep.Dock = DockStyle.Fill;
checkSleep.Location = new Point(4, 131);
checkSleep.Margin = new Padding(4, 0, 4, 0);
@@ -783,6 +810,7 @@ namespace GHelper
//
// checkShutdown
//
+ checkShutdown.AccessibleName = "Shutdown Backlight";
checkShutdown.Dock = DockStyle.Fill;
checkShutdown.Location = new Point(4, 174);
checkShutdown.Margin = new Padding(4, 0, 4, 0);
@@ -1022,6 +1050,8 @@ namespace GHelper
//
// panelSettings
//
+ panelSettings.AccessibleName = "Extra Settings";
+ panelSettings.AccessibleRole = AccessibleRole.Grouping;
panelSettings.AutoSize = true;
panelSettings.AutoSizeMode = AutoSizeMode.GrowAndShrink;
panelSettings.Controls.Add(checkAutoToggleClamshellMode);
@@ -1037,7 +1067,7 @@ namespace GHelper
panelSettings.Name = "panelSettings";
panelSettings.Padding = new Padding(20, 5, 11, 5);
panelSettings.Size = new Size(983, 346);
- panelSettings.TabIndex = 46;
+ panelSettings.TabIndex = 3;
//
// checkAutoToggleClamshellMode
//
@@ -1047,7 +1077,7 @@ namespace GHelper
checkAutoToggleClamshellMode.Name = "checkAutoToggleClamshellMode";
checkAutoToggleClamshellMode.Padding = new Padding(3);
checkAutoToggleClamshellMode.Size = new Size(952, 42);
- checkAutoToggleClamshellMode.TabIndex = 58;
+ checkAutoToggleClamshellMode.TabIndex = 8;
checkAutoToggleClamshellMode.Text = "Auto Toggle Clamshell Mode";
checkAutoToggleClamshellMode.UseVisualStyleBackColor = true;
//
@@ -1060,7 +1090,7 @@ namespace GHelper
checkAutoApplyWindowsPowerMode.Name = "checkAutoApplyWindowsPowerMode";
checkAutoApplyWindowsPowerMode.Padding = new Padding(3);
checkAutoApplyWindowsPowerMode.Size = new Size(952, 42);
- checkAutoApplyWindowsPowerMode.TabIndex = 54;
+ checkAutoApplyWindowsPowerMode.TabIndex = 7;
checkAutoApplyWindowsPowerMode.Text = "Auto Adjust Windows Power Mode";
checkAutoApplyWindowsPowerMode.UseVisualStyleBackColor = true;
//
@@ -1073,7 +1103,7 @@ namespace GHelper
checkTopmost.Name = "checkTopmost";
checkTopmost.Padding = new Padding(3);
checkTopmost.Size = new Size(952, 42);
- checkTopmost.TabIndex = 51;
+ checkTopmost.TabIndex = 6;
checkTopmost.Text = Strings.WindowTop;
checkTopmost.UseVisualStyleBackColor = true;
//
@@ -1086,7 +1116,7 @@ namespace GHelper
checkNoOverdrive.Name = "checkNoOverdrive";
checkNoOverdrive.Padding = new Padding(3);
checkNoOverdrive.Size = new Size(952, 42);
- checkNoOverdrive.TabIndex = 52;
+ checkNoOverdrive.TabIndex = 5;
checkNoOverdrive.Text = Strings.DisableOverdrive;
checkNoOverdrive.UseVisualStyleBackColor = true;
//
@@ -1099,7 +1129,7 @@ namespace GHelper
checkUSBC.Name = "checkUSBC";
checkUSBC.Padding = new Padding(3);
checkUSBC.Size = new Size(952, 42);
- checkUSBC.TabIndex = 53;
+ checkUSBC.TabIndex = 4;
checkUSBC.Text = "Keep GPU disabled on USB-C charger in Optimized mode";
checkUSBC.UseVisualStyleBackColor = true;
//
@@ -1112,7 +1142,7 @@ namespace GHelper
checkVariBright.Name = "checkVariBright";
checkVariBright.Padding = new Padding(3);
checkVariBright.Size = new Size(952, 42);
- checkVariBright.TabIndex = 57;
+ checkVariBright.TabIndex = 3;
checkVariBright.Text = "AMD Display VariBright";
checkVariBright.UseVisualStyleBackColor = true;
//
@@ -1125,7 +1155,7 @@ namespace GHelper
checkGpuApps.Name = "checkGpuApps";
checkGpuApps.Padding = new Padding(3);
checkGpuApps.Size = new Size(952, 42);
- checkGpuApps.TabIndex = 55;
+ checkGpuApps.TabIndex = 2;
checkGpuApps.Text = "Stop all apps using GPU when switching to Eco";
checkGpuApps.UseVisualStyleBackColor = true;
//
@@ -1139,7 +1169,7 @@ namespace GHelper
checkFnLock.Name = "checkFnLock";
checkFnLock.Padding = new Padding(3);
checkFnLock.Size = new Size(800, 42);
- checkFnLock.TabIndex = 56;
+ checkFnLock.TabIndex = 1;
checkFnLock.Text = "Process Fn+F hotkeys without Fn";
checkFnLock.UseVisualStyleBackColor = true;
//
diff --git a/app/Extra.resx b/app/Extra.resx
index af32865e..a395bffc 100644
--- a/app/Extra.resx
+++ b/app/Extra.resx
@@ -18,7 +18,7 @@
System.Resources.ResXResourceReader, System.Windows.Forms, ...
System.Resources.ResXResourceWriter, System.Windows.Forms, ...
this is my long stringthis is a comment
- Blue
+ Blue
[base64 mime encoded serialized .NET Framework object]
diff --git a/app/Fans.cs b/app/Fans.cs
index b29c79f4..16798313 100644
--- a/app/Fans.cs
+++ b/app/Fans.cs
@@ -293,7 +293,7 @@ namespace GHelper
panelUViGPU.Visible = false;
}
- if (!RyzenControl.IsSupportedUV())
+ if (!RyzenControl.IsSupportedUViGPU())
{
panelUViGPU.Visible = false;
}
diff --git a/app/Settings.Designer.cs b/app/Settings.Designer.cs
index 0059972f..ca7d1df8 100644
--- a/app/Settings.Designer.cs
+++ b/app/Settings.Designer.cs
@@ -143,6 +143,8 @@ namespace GHelper
//
// panelMatrix
//
+ panelMatrix.AccessibleName = "Anime Matrix";
+ panelMatrix.AccessibleRole = AccessibleRole.Grouping;
panelMatrix.AutoSize = true;
panelMatrix.AutoSizeMode = AutoSizeMode.GrowAndShrink;
panelMatrix.Controls.Add(tableLayoutMatrix);
@@ -154,7 +156,8 @@ namespace GHelper
panelMatrix.Name = "panelMatrix";
panelMatrix.Padding = new Padding(20, 20, 20, 10);
panelMatrix.Size = new Size(827, 176);
- panelMatrix.TabIndex = 4;
+ panelMatrix.TabIndex = 3;
+ panelMatrix.TabStop = true;
//
// tableLayoutMatrix
//
@@ -296,7 +299,6 @@ namespace GHelper
sliderBattery.Size = new Size(787, 40);
sliderBattery.Step = 5;
sliderBattery.TabIndex = 20;
- sliderBattery.TabStop = false;
sliderBattery.Text = "sliderBattery";
sliderBattery.Value = 80;
//
@@ -408,8 +410,8 @@ namespace GHelper
buttonQuit.Name = "buttonQuit";
buttonQuit.Secondary = true;
buttonQuit.Size = new Size(255, 48);
- buttonQuit.TabIndex = 23;
- buttonQuit.Text = "Quit";
+ buttonQuit.TabIndex = 2;
+ buttonQuit.Text = "&Quit";
buttonQuit.TextAlign = ContentAlignment.MiddleRight;
buttonQuit.TextImageRelation = TextImageRelation.ImageBeforeText;
buttonQuit.UseVisualStyleBackColor = false;
@@ -430,8 +432,8 @@ namespace GHelper
buttonUpdates.Name = "buttonUpdates";
buttonUpdates.Secondary = true;
buttonUpdates.Size = new Size(254, 48);
- buttonUpdates.TabIndex = 24;
- buttonUpdates.Text = "Updates";
+ buttonUpdates.TabIndex = 1;
+ buttonUpdates.Text = "&Updates";
buttonUpdates.TextImageRelation = TextImageRelation.ImageBeforeText;
buttonUpdates.UseVisualStyleBackColor = false;
//
@@ -448,6 +450,8 @@ namespace GHelper
//
// panelPerformance
//
+ panelPerformance.AccessibleName = "Performance";
+ panelPerformance.AccessibleRole = AccessibleRole.Grouping;
panelPerformance.AutoSize = true;
panelPerformance.AutoSizeMode = AutoSizeMode.GrowAndShrink;
panelPerformance.Controls.Add(tablePerf);
@@ -459,6 +463,7 @@ namespace GHelper
panelPerformance.Padding = new Padding(20);
panelPerformance.Size = new Size(827, 208);
panelPerformance.TabIndex = 0;
+ panelPerformance.TabStop = true;
//
// tablePerf
//
@@ -502,7 +507,7 @@ namespace GHelper
buttonSilent.Secondary = false;
buttonSilent.Size = new Size(188, 120);
buttonSilent.TabIndex = 1;
- buttonSilent.Text = Properties.Strings.Silent;
+ buttonSilent.Text = "&Silent";
buttonSilent.TextImageRelation = TextImageRelation.ImageAboveText;
buttonSilent.UseVisualStyleBackColor = false;
//
@@ -525,7 +530,7 @@ namespace GHelper
buttonBalanced.Secondary = false;
buttonBalanced.Size = new Size(188, 120);
buttonBalanced.TabIndex = 1;
- buttonBalanced.Text = Properties.Strings.Balanced;
+ buttonBalanced.Text = "&Balanced";
buttonBalanced.TextImageRelation = TextImageRelation.ImageAboveText;
buttonBalanced.UseVisualStyleBackColor = false;
//
@@ -548,7 +553,7 @@ namespace GHelper
buttonTurbo.Secondary = false;
buttonTurbo.Size = new Size(188, 120);
buttonTurbo.TabIndex = 2;
- buttonTurbo.Text = Properties.Strings.Turbo;
+ buttonTurbo.Text = "&Turbo";
buttonTurbo.TextImageRelation = TextImageRelation.ImageAboveText;
buttonTurbo.UseVisualStyleBackColor = false;
//
@@ -570,7 +575,7 @@ namespace GHelper
buttonFans.Secondary = true;
buttonFans.Size = new Size(191, 120);
buttonFans.TabIndex = 3;
- buttonFans.Text = Properties.Strings.FansPower;
+ buttonFans.Text = "&Fans + Power";
buttonFans.TextImageRelation = TextImageRelation.ImageAboveText;
buttonFans.UseVisualStyleBackColor = false;
//
@@ -600,8 +605,10 @@ namespace GHelper
//
// labelPerf
//
+ labelPerf.AccessibleRole = AccessibleRole.Caret;
labelPerf.AutoSize = true;
labelPerf.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point);
+ labelPerf.LiveSetting = System.Windows.Forms.Automation.AutomationLiveSetting.Polite;
labelPerf.Location = new Point(40, 0);
labelPerf.Margin = new Padding(8, 0, 8, 0);
labelPerf.Name = "labelPerf";
@@ -611,6 +618,7 @@ namespace GHelper
//
// labelCPUFan
//
+ labelCPUFan.AccessibleRole = AccessibleRole.TitleBar;
labelCPUFan.Anchor = AnchorStyles.Top | AnchorStyles.Right;
labelCPUFan.Cursor = Cursors.Hand;
labelCPUFan.Location = new Point(387, 0);
@@ -623,6 +631,8 @@ namespace GHelper
//
// panelGPU
//
+ panelGPU.AccessibleName = "GPU";
+ panelGPU.AccessibleRole = AccessibleRole.Grouping;
panelGPU.AutoSize = true;
panelGPU.AutoSizeMode = AutoSizeMode.GrowAndShrink;
panelGPU.Controls.Add(labelTipGPU);
@@ -635,6 +645,7 @@ namespace GHelper
panelGPU.Padding = new Padding(20, 20, 20, 0);
panelGPU.Size = new Size(827, 352);
panelGPU.TabIndex = 1;
+ panelGPU.TabStop = true;
//
// labelTipGPU
//
@@ -767,6 +778,7 @@ namespace GHelper
//
// buttonOptimized
//
+ buttonOptimized.AccessibleName = "Optimized GPU Mode";
buttonOptimized.Activated = false;
buttonOptimized.BackColor = SystemColors.ControlLightLight;
buttonOptimized.BorderColor = Color.Transparent;
@@ -857,6 +869,8 @@ namespace GHelper
//
// panelScreen
//
+ panelScreen.AccessibleName = "Screen";
+ panelScreen.AccessibleRole = AccessibleRole.Grouping;
panelScreen.AutoSize = true;
panelScreen.AutoSizeMode = AutoSizeMode.GrowAndShrink;
panelScreen.Controls.Add(labelTipScreen);
@@ -869,6 +883,7 @@ namespace GHelper
panelScreen.Padding = new Padding(20, 20, 20, 0);
panelScreen.Size = new Size(827, 176);
panelScreen.TabIndex = 2;
+ panelScreen.TabStop = true;
//
// labelTipScreen
//
@@ -1030,6 +1045,8 @@ namespace GHelper
//
// panelKeyboard
//
+ panelKeyboard.AccessibleName = "Keyboard";
+ panelKeyboard.AccessibleRole = AccessibleRole.Grouping;
panelKeyboard.AutoSize = true;
panelKeyboard.AutoSizeMode = AutoSizeMode.GrowAndShrink;
panelKeyboard.Controls.Add(tableLayoutKeyboard);
@@ -1040,7 +1057,8 @@ namespace GHelper
panelKeyboard.Name = "panelKeyboard";
panelKeyboard.Padding = new Padding(20);
panelKeyboard.Size = new Size(827, 144);
- panelKeyboard.TabIndex = 3;
+ panelKeyboard.TabIndex = 4;
+ panelKeyboard.TabStop = true;
//
// tableLayoutKeyboard
//
@@ -1080,7 +1098,7 @@ namespace GHelper
buttonKeyboard.Secondary = true;
buttonKeyboard.Size = new Size(255, 48);
buttonKeyboard.TabIndex = 37;
- buttonKeyboard.Text = Properties.Strings.Extra;
+ buttonKeyboard.Text = "&Extra";
buttonKeyboard.TextImageRelation = TextImageRelation.ImageBeforeText;
buttonKeyboard.UseVisualStyleBackColor = false;
//
diff --git a/app/Settings.cs b/app/Settings.cs
index 139c2ed6..1d454a4d 100644
--- a/app/Settings.cs
+++ b/app/Settings.cs
@@ -195,6 +195,8 @@ namespace GHelper
//This will auto position the window again when it resizes. Might mess with position if people drag the window somewhere else.
this.Resize += SettingsForm_Resize;
SetContextMenu();
+
+ panelPerformance.Focus();
}
private void SettingsForm_Resize(object? sender, EventArgs e)
@@ -841,6 +843,10 @@ namespace GHelper
gpuTemp = $": {HardwareControl.gpuTemp}°C";
}
+ string trayTip = "CPU" + cpuTemp + " " + HardwareControl.cpuFan;
+ if (gpuTemp.Length > 0) trayTip += "\nGPU" + gpuTemp + " " + HardwareControl.gpuFan;
+ if (battery.Length > 0) trayTip += "\n" + battery;
+
Program.settingsForm.BeginInvoke(delegate
{
labelCPUFan.Text = "CPU" + cpuTemp + " " + HardwareControl.cpuFan;
@@ -850,11 +856,10 @@ namespace GHelper
labelBattery.Text = battery;
if (!batteryMouseOver) labelCharge.Text = charge;
+
+ panelPerformance.AccessibleName = labelPerf.Text + " " + trayTip;
});
- string trayTip = "CPU" + cpuTemp + " " + HardwareControl.cpuFan;
- if (gpuTemp.Length > 0) trayTip += "\nGPU" + gpuTemp + " " + HardwareControl.gpuFan;
- if (battery.Length > 0) trayTip += "\n" + battery;
Program.trayIcon.Text = trayTip;
@@ -912,6 +917,7 @@ namespace GHelper
Invoke(delegate
{
labelPerf.Text = modeText;
+ panelPerformance.AccessibleName = labelPerf.Text + ". " + Program.trayIcon.Text;
});
}