From 5602d385f670130b49aad6d4fd418595d9cd8425 Mon Sep 17 00:00:00 2001
From: Serge <5920850+seerge@users.noreply.github.com>
Date: Sun, 31 Dec 2023 15:28:22 +0100
Subject: [PATCH] Translations for accessible labels
https://github.com/seerge/g-helper/issues/1823
---
app/Extra.Designer.cs | 20 --------------------
app/Extra.cs | 28 ++++++++++++++++++++++++++++
app/Properties/Strings.Designer.cs | 18 ++++++++++++++++++
app/Properties/Strings.resx | 6 ++++++
app/Settings.Designer.cs | 25 -------------------------
app/Settings.cs | 29 ++++++++++++++++++++++++++++-
6 files changed, 80 insertions(+), 46 deletions(-)
diff --git a/app/Extra.Designer.cs b/app/Extra.Designer.cs
index ad3c315f..6602ff8f 100644
--- a/app/Extra.Designer.cs
+++ b/app/Extra.Designer.cs
@@ -148,7 +148,6 @@ namespace GHelper
//
// panelServices
//
- panelServices.AccessibleName = "Asus Services";
panelServices.AccessibleRole = AccessibleRole.Grouping;
panelServices.Controls.Add(pictureService);
panelServices.Controls.Add(labelServices);
@@ -245,7 +244,6 @@ namespace GHelper
//
// panelBindings
//
- panelBindings.AccessibleName = "Key Bindings";
panelBindings.AutoSize = true;
panelBindings.AutoSizeMode = AutoSizeMode.GrowAndShrink;
panelBindings.Controls.Add(tableBindings);
@@ -259,7 +257,6 @@ namespace GHelper
//
// tableBindings
//
- tableBindings.AccessibleName = "Keyboard Bindings";
tableBindings.AccessibleRole = AccessibleRole.Table;
tableBindings.AutoSize = true;
tableBindings.AutoSizeMode = AutoSizeMode.GrowAndShrink;
@@ -318,7 +315,6 @@ namespace GHelper
//
// comboFNE
//
- comboFNE.AccessibleName = "Fn+Numpad Action";
comboFNE.BorderColor = Color.White;
comboFNE.ButtonColor = Color.FromArgb(255, 255, 255);
comboFNE.Dock = DockStyle.Top;
@@ -375,7 +371,6 @@ namespace GHelper
//
// comboM1
//
- comboM1.AccessibleName = "M1 Action";
comboM1.BorderColor = Color.White;
comboM1.ButtonColor = Color.FromArgb(255, 255, 255);
comboM1.Dock = DockStyle.Top;
@@ -400,7 +395,6 @@ namespace GHelper
//
// comboM4
//
- comboM4.AccessibleName = "M4 Action";
comboM4.BorderColor = Color.White;
comboM4.ButtonColor = Color.FromArgb(255, 255, 255);
comboM4.Dock = DockStyle.Top;
@@ -414,7 +408,6 @@ namespace GHelper
//
// comboM3
//
- comboM3.AccessibleName = "M3 Action";
comboM3.BorderColor = Color.White;
comboM3.ButtonColor = Color.FromArgb(255, 255, 255);
comboM3.Dock = DockStyle.Top;
@@ -483,7 +476,6 @@ namespace GHelper
//
// comboM2
//
- comboM2.AccessibleName = "M2 Action";
comboM2.BorderColor = Color.White;
comboM2.ButtonColor = Color.FromArgb(255, 255, 255);
comboM2.Dock = DockStyle.Top;
@@ -508,7 +500,6 @@ namespace GHelper
//
// comboFNF4
//
- comboFNF4.AccessibleName = "Fn+F4 Action";
comboFNF4.BorderColor = Color.White;
comboFNF4.ButtonColor = Color.FromArgb(255, 255, 255);
comboFNF4.Dock = DockStyle.Top;
@@ -532,7 +523,6 @@ namespace GHelper
//
// comboFNC
//
- comboFNC.AccessibleName = "Fn+C Action";
comboFNC.BorderColor = Color.White;
comboFNC.ButtonColor = Color.FromArgb(255, 255, 255);
comboFNC.Dock = DockStyle.Top;
@@ -653,7 +643,6 @@ 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);
@@ -664,7 +653,6 @@ namespace GHelper
//
// 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);
@@ -693,7 +681,6 @@ namespace GHelper
//
// comboKeyboardSpeed
//
- comboKeyboardSpeed.AccessibleName = "Keyboard Animation Speed";
comboKeyboardSpeed.Anchor = AnchorStyles.Top | AnchorStyles.Right;
comboKeyboardSpeed.BorderColor = Color.White;
comboKeyboardSpeed.ButtonColor = SystemColors.ControlLight;
@@ -786,7 +773,6 @@ 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);
@@ -799,7 +785,6 @@ 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);
@@ -812,7 +797,6 @@ 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);
@@ -825,7 +809,6 @@ 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);
@@ -1065,7 +1048,6 @@ namespace GHelper
//
// panelSettings
//
- panelSettings.AccessibleName = "Extra Settings";
panelSettings.AccessibleRole = AccessibleRole.Grouping;
panelSettings.AutoSize = true;
panelSettings.AutoSizeMode = AutoSizeMode.GrowAndShrink;
@@ -1200,7 +1182,6 @@ namespace GHelper
//
// numericHibernateAfter
//
- numericHibernateAfter.AccessibleName = "Minutes till Hibernation in sleep";
numericHibernateAfter.Anchor = AnchorStyles.Top | AnchorStyles.Right;
numericHibernateAfter.Increment = new decimal(new int[] { 10, 0, 0, 0 });
numericHibernateAfter.Location = new Point(810, 7);
@@ -1247,7 +1228,6 @@ namespace GHelper
//
// comboAPU
//
- comboAPU.AccessibleName = "Keyboard Animation Speed";
comboAPU.Anchor = AnchorStyles.Top | AnchorStyles.Right;
comboAPU.BorderColor = Color.White;
comboAPU.ButtonColor = SystemColors.ControlLight;
diff --git a/app/Extra.cs b/app/Extra.cs
index 2246c9c8..3f10c886 100644
--- a/app/Extra.cs
+++ b/app/Extra.cs
@@ -143,6 +143,34 @@ namespace GHelper
Text = Properties.Strings.ExtraSettings;
+ // Accessible Labels
+
+ panelServices.AccessibleName = Properties.Strings.AsusServicesRunning;
+ panelBindings.AccessibleName = Properties.Strings.KeyBindings;
+ tableBindings.AccessibleName = Properties.Strings.KeyBindings;
+
+ comboM1.AccessibleName = "M1 Action";
+ comboM2.AccessibleName = "M2 Action";
+ comboM3.AccessibleName = "M3 Action";
+ comboM4.AccessibleName = "M4 Action";
+ comboFNF4.AccessibleName = "Fn+F4 Action";
+ comboFNC.AccessibleName = "Fn+C Action";
+ comboFNE.AccessibleName = "Fn+Numpad Action";
+
+ numericBacklightPluggedTime.AccessibleName = Properties.Strings.BacklightTimeoutPlugged;
+ numericBacklightTime.AccessibleName = Properties.Strings.BacklightTimeoutBattery;
+
+ comboKeyboardSpeed.AccessibleName = Properties.Strings.LaptopBacklight + " " +Properties.Strings.AnimationSpeed;
+ comboAPU.AccessibleName = Properties.Strings.LaptopBacklight + " " + Properties.Strings.AnimationSpeed;
+
+ checkBoot.AccessibleName = Properties.Strings.Boot + " " + Properties.Strings.LaptopBacklight;
+ checkAwake.AccessibleName = Properties.Strings.Awake + " " + Properties.Strings.LaptopBacklight;
+ checkSleep.AccessibleName = Properties.Strings.Sleep + " " + Properties.Strings.LaptopBacklight;
+ checkShutdown.AccessibleName = Properties.Strings.Shutdown + " " + Properties.Strings.LaptopBacklight;
+
+ panelSettings.AccessibleName = Properties.Strings.ExtraSettings;
+ numericHibernateAfter.AccessibleName = Properties.Strings.HibernateAfter;
+
if (AppConfig.IsARCNM())
{
labelM3.Text = "FN+F6";
diff --git a/app/Properties/Strings.Designer.cs b/app/Properties/Strings.Designer.cs
index 3b5fce55..84e33216 100644
--- a/app/Properties/Strings.Designer.cs
+++ b/app/Properties/Strings.Designer.cs
@@ -456,6 +456,24 @@ namespace GHelper.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to Backlight Timeout when on battery.
+ ///
+ internal static string BacklightTimeoutBattery {
+ get {
+ return ResourceManager.GetString("BacklightTimeoutBattery", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Backlight Timeout when plugged.
+ ///
+ internal static string BacklightTimeoutPlugged {
+ get {
+ return ResourceManager.GetString("BacklightTimeoutPlugged", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Balanced.
///
diff --git a/app/Properties/Strings.resx b/app/Properties/Strings.resx
index e0a762d2..f039488f 100644
--- a/app/Properties/Strings.resx
+++ b/app/Properties/Strings.resx
@@ -249,6 +249,12 @@
Timeout plugged / on battery (0 - ON)
+
+ Backlight Timeout when on battery
+
+
+ Backlight Timeout when plugged
+
Balanced
diff --git a/app/Settings.Designer.cs b/app/Settings.Designer.cs
index 1392e3a2..3b1b9088 100644
--- a/app/Settings.Designer.cs
+++ b/app/Settings.Designer.cs
@@ -145,7 +145,6 @@ namespace GHelper
//
// panelMatrix
//
- panelMatrix.AccessibleName = "Anime Matrix";
panelMatrix.AccessibleRole = AccessibleRole.Grouping;
panelMatrix.AutoSize = true;
panelMatrix.AutoSizeMode = AutoSizeMode.GrowAndShrink;
@@ -312,7 +311,6 @@ namespace GHelper
//
// sliderBattery
//
- sliderBattery.AccessibleName = "Battery Charge Limit";
sliderBattery.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
sliderBattery.Location = new Point(20, 65);
sliderBattery.Margin = new Padding(4);
@@ -420,7 +418,6 @@ namespace GHelper
//
// buttonQuit
//
- buttonQuit.AccessibleName = "Quit Application";
buttonQuit.Activated = false;
buttonQuit.BackColor = SystemColors.ControlLight;
buttonQuit.BorderColor = Color.Transparent;
@@ -441,7 +438,6 @@ namespace GHelper
//
// buttonUpdates
//
- buttonUpdates.AccessibleName = "BIOS and Driver Updates";
buttonUpdates.Activated = false;
buttonUpdates.BackColor = SystemColors.ControlLight;
buttonUpdates.BorderColor = Color.Transparent;
@@ -473,7 +469,6 @@ namespace GHelper
//
// panelPerformance
//
- panelPerformance.AccessibleName = "Performance";
panelPerformance.AccessibleRole = AccessibleRole.Grouping;
panelPerformance.AutoSize = true;
panelPerformance.AutoSizeMode = AutoSizeMode.GrowAndShrink;
@@ -512,7 +507,6 @@ namespace GHelper
//
// buttonSilent
//
- buttonSilent.AccessibleName = "Silent Mode";
buttonSilent.Activated = false;
buttonSilent.BackColor = SystemColors.ControlLightLight;
buttonSilent.BackgroundImageLayout = ImageLayout.None;
@@ -536,7 +530,6 @@ namespace GHelper
//
// buttonBalanced
//
- buttonBalanced.AccessibleName = "Balanced Mode";
buttonBalanced.Activated = false;
buttonBalanced.BackColor = SystemColors.ControlLightLight;
buttonBalanced.BorderColor = Color.Transparent;
@@ -559,7 +552,6 @@ namespace GHelper
//
// buttonTurbo
//
- buttonTurbo.AccessibleName = "Turbo Mode";
buttonTurbo.Activated = false;
buttonTurbo.BackColor = SystemColors.ControlLightLight;
buttonTurbo.BorderColor = Color.Transparent;
@@ -582,7 +574,6 @@ namespace GHelper
//
// buttonFans
//
- buttonFans.AccessibleName = "Fans and Power Settings";
buttonFans.Activated = false;
buttonFans.BackColor = SystemColors.ControlLight;
buttonFans.BorderColor = Color.Transparent;
@@ -654,7 +645,6 @@ namespace GHelper
//
// panelGPU
//
- panelGPU.AccessibleName = "GPU";
panelGPU.AccessibleRole = AccessibleRole.Grouping;
panelGPU.AutoSize = true;
panelGPU.AutoSizeMode = AutoSizeMode.GrowAndShrink;
@@ -731,7 +721,6 @@ namespace GHelper
//
// buttonEco
//
- buttonEco.AccessibleName = "Eco GPU Mode";
buttonEco.Activated = false;
buttonEco.BackColor = SystemColors.ControlLightLight;
buttonEco.BorderColor = Color.Transparent;
@@ -755,7 +744,6 @@ namespace GHelper
//
// buttonStandard
//
- buttonStandard.AccessibleName = "Standard GPU Mode";
buttonStandard.Activated = false;
buttonStandard.BackColor = SystemColors.ControlLightLight;
buttonStandard.BorderColor = Color.Transparent;
@@ -801,7 +789,6 @@ namespace GHelper
//
// buttonOptimized
//
- buttonOptimized.AccessibleName = "Optimized GPU Mode";
buttonOptimized.Activated = false;
buttonOptimized.BackColor = SystemColors.ControlLightLight;
buttonOptimized.BorderColor = Color.Transparent;
@@ -824,7 +811,6 @@ namespace GHelper
//
// buttonUltimate
//
- buttonUltimate.AccessibleName = "Ultimate GPU Mode";
buttonUltimate.Activated = false;
buttonUltimate.BackColor = SystemColors.ControlLightLight;
buttonUltimate.BorderColor = Color.Transparent;
@@ -892,7 +878,6 @@ namespace GHelper
//
// panelScreen
//
- panelScreen.AccessibleName = "Screen";
panelScreen.AccessibleRole = AccessibleRole.Grouping;
panelScreen.AutoSize = true;
panelScreen.AutoSizeMode = AutoSizeMode.GrowAndShrink;
@@ -942,7 +927,6 @@ namespace GHelper
//
// buttonScreenAuto
//
- buttonScreenAuto.AccessibleName = "Auto Screen Refresh Rate";
buttonScreenAuto.Activated = false;
buttonScreenAuto.BackColor = SystemColors.ControlLightLight;
buttonScreenAuto.BorderColor = Color.Transparent;
@@ -962,7 +946,6 @@ namespace GHelper
//
// button60Hz
//
- button60Hz.AccessibleName = "60Hz Refresh Rate";
button60Hz.Activated = false;
button60Hz.BackColor = SystemColors.ControlLightLight;
button60Hz.BorderColor = Color.Transparent;
@@ -983,7 +966,6 @@ namespace GHelper
//
// button120Hz
//
- button120Hz.AccessibleName = "Maximum Refresh Rate";
button120Hz.Activated = false;
button120Hz.BackColor = SystemColors.ControlLightLight;
button120Hz.BorderColor = Color.Transparent;
@@ -1068,7 +1050,6 @@ namespace GHelper
//
// panelKeyboard
//
- panelKeyboard.AccessibleName = "Keyboard";
panelKeyboard.AccessibleRole = AccessibleRole.Grouping;
panelKeyboard.AutoSize = true;
panelKeyboard.AutoSizeMode = AutoSizeMode.GrowAndShrink;
@@ -1105,7 +1086,6 @@ namespace GHelper
//
// buttonKeyboard
//
- buttonKeyboard.AccessibleName = "Extra Settings";
buttonKeyboard.Activated = false;
buttonKeyboard.BackColor = SystemColors.ControlLight;
buttonKeyboard.BorderColor = Color.Transparent;
@@ -1160,7 +1140,6 @@ namespace GHelper
//
// buttonKeyboardColor
//
- buttonKeyboardColor.AccessibleName = "Keyboard Color";
buttonKeyboardColor.Activated = false;
buttonKeyboardColor.BackColor = SystemColors.ButtonHighlight;
buttonKeyboardColor.BorderColor = Color.Transparent;
@@ -1179,7 +1158,6 @@ namespace GHelper
//
// comboKeyboard
//
- comboKeyboard.AccessibleName = "Keyboard Backlight Mode";
comboKeyboard.BorderColor = Color.White;
comboKeyboard.ButtonColor = Color.FromArgb(255, 255, 255);
comboKeyboard.Dock = DockStyle.Top;
@@ -1310,7 +1288,6 @@ namespace GHelper
//
// buttonPeripheral3
//
- buttonPeripheral3.AccessibleName = "Peripheral 3";
buttonPeripheral3.Activated = false;
buttonPeripheral3.BackColor = SystemColors.ControlLightLight;
buttonPeripheral3.BorderColor = Color.Transparent;
@@ -1335,7 +1312,6 @@ namespace GHelper
//
// buttonPeripheral2
//
- buttonPeripheral2.AccessibleName = "Peripheral 2";
buttonPeripheral2.Activated = false;
buttonPeripheral2.BackColor = SystemColors.ControlLightLight;
buttonPeripheral2.BorderColor = Color.Transparent;
@@ -1360,7 +1336,6 @@ namespace GHelper
//
// buttonPeripheral1
//
- buttonPeripheral1.AccessibleName = "Peripheral 1";
buttonPeripheral1.Activated = false;
buttonPeripheral1.BackColor = SystemColors.ControlLightLight;
buttonPeripheral1.BorderColor = Color.Transparent;
diff --git a/app/Settings.cs b/app/Settings.cs
index e49ace88..ddbbe764 100644
--- a/app/Settings.cs
+++ b/app/Settings.cs
@@ -87,6 +87,33 @@ namespace GHelper
buttonQuit.Text = Properties.Strings.Quit;
buttonUpdates.Text = Properties.Strings.Updates;
+ // Accessible Labels
+
+ panelMatrix.AccessibleName = Properties.Strings.AnimeMatrix;
+ sliderBattery.AccessibleName = Properties.Strings.BatteryChargeLimit;
+ buttonQuit.AccessibleName = Properties.Strings.Quit;
+ buttonUpdates.AccessibleName = Properties.Strings.BiosAndDriverUpdates;
+ panelPerformance.AccessibleName = Properties.Strings.PerformanceMode;
+ buttonSilent.AccessibleName = Properties.Strings.Silent;
+ buttonBalanced.AccessibleName = Properties.Strings.Balanced;
+ buttonTurbo.AccessibleName = Properties.Strings.Turbo;
+ buttonFans.AccessibleName = Properties.Strings.FansAndPower;
+ panelGPU.AccessibleName = Properties.Strings.GPUMode;
+ buttonEco.AccessibleName = Properties.Strings.EcoMode;
+ buttonStandard.AccessibleName = Properties.Strings.StandardMode;
+ buttonOptimized.AccessibleName = Properties.Strings.Optimized;
+ buttonUltimate.AccessibleName = Properties.Strings.UltimateMode;
+ panelScreen.AccessibleName = Properties.Strings.LaptopScreen;
+
+ buttonScreenAuto.AccessibleName = Properties.Strings.AutoMode;
+ //button60Hz.AccessibleName = "60Hz Refresh Rate";
+ //button120Hz.AccessibleName = "Maximum Refresh Rate";
+
+ panelKeyboard.AccessibleName = Properties.Strings.LaptopKeyboard;
+ buttonKeyboard.AccessibleName = Properties.Strings.ExtraSettings;
+ buttonKeyboardColor.AccessibleName = Properties.Strings.LaptopKeyboard + " " + Properties.Strings.Color;
+ comboKeyboard.AccessibleName = Properties.Strings.LaptopBacklight;
+
FormClosing += SettingsForm_FormClosing;
Deactivate += SettingsForm_LostFocus;
@@ -1044,7 +1071,7 @@ namespace GHelper
Invoke(delegate
{
labelPerf.Text = modeText;
- panelPerformance.AccessibleName = labelPerf.Text; // + ". " + Program.trayIcon.Text;
+ panelPerformance.AccessibleName = labelPerf.Text;
});
}