Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-26 14:00:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

More accessibility tweaks

Browse source 
#3758
This commit is contained in:
Kurt 2023-02-05 15:00:31 -08:00
parent c6e133cff8
commit dde075432b
7 changed files with 77 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
PKHeX.WinForms/Controls/PKM Editor/ContestStat.cs
View file

@ -59,11 +59,11 @@ public partial class ContestStat : UserControl, IContestStats
{
if (o is not IContestStatsReadOnly)
{
Visible = false;
Visible = TabStop = false;
return;
}
Visible = true;
Visible = TabStop = true;
bool smart = context.Generation() < 6;
Label_Smart.Visible = smart; // show smart gen3-5
Label_Clever.Visible = !smart; // show clever gen6+

30
PKHeX.WinForms/Controls/PKM Editor/GenderToggle.cs
View file

@ -20,6 +20,36 @@ public partial class GenderToggle : UserControl, IGenderToggle
}
public GenderToggle() => InitializeComponent();
protected override void OnMouseDown(MouseEventArgs e)
{
Focus();
base.OnMouseDown(e);
}
protected override void OnEnter(EventArgs e)
{
Invalidate();
base.OnEnter(e);
AccessibilityObject.RaiseAutomationNotification(AutomationNotificationKind.Other,
AutomationNotificationProcessing.All, AccessibleDescription ?? AccessibleName ?? "");
}
protected override void OnLeave(EventArgs e)
{
Invalidate();
base.OnLeave(e);
}
protected override void OnPaint(PaintEventArgs pe)
{
base.OnPaint(pe);
if (!Focused)
return;
var rc = ClientRectangle;
rc.Inflate(-2, -2);
ControlPaint.DrawFocusRectangle(pe.Graphics, rc);
}
private static readonly Image[] GenderImages =
{

16
PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs generated
View file

@ -503,8 +503,8 @@ namespace PKHeX.WinForms.Controls
//
// UC_Gender
//
this.UC_Gender.AccessibleDescription = "Entity Gender Pane";
this.UC_Gender.AccessibleName = "Entity Gender Pane";
this.UC_Gender.AccessibleDescription = "Entity Gender Pane (0) (0)";
this.UC_Gender.AccessibleName = "Entity Gender Pane (0) (0)";
this.UC_Gender.AccessibleRole = System.Windows.Forms.AccessibleRole.Graphic;
this.UC_Gender.AllowClick = false;
this.UC_Gender.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("UC_Gender.BackgroundImage")));
@ -838,6 +838,8 @@ namespace PKHeX.WinForms.Controls
//
// FA_Form
//
this.FA_Form.AccessibleDescription = "Form Argument Info";
this.FA_Form.AccessibleName = "Form Argument Info";
this.FA_Form.Location = new System.Drawing.Point(128, 0);
this.FA_Form.Margin = new System.Windows.Forms.Padding(0);
this.FA_Form.Name = "FA_Form";
@ -1008,6 +1010,8 @@ namespace PKHeX.WinForms.Controls
//
// TB_Friendship
//
this.TB_Friendship.AccessibleDescription = "Friendship and Hatch Counter";
this.TB_Friendship.AccessibleName = "Friendship and Hatch Counter";
this.TB_Friendship.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.TB_Friendship.Location = new System.Drawing.Point(0, 0);
this.TB_Friendship.Margin = new System.Windows.Forms.Padding(0);
@ -2510,8 +2514,8 @@ namespace PKHeX.WinForms.Controls
//
// UC_OTGender
//
this.UC_OTGender.AccessibleDescription = "Trainer Gender Pane";
this.UC_OTGender.AccessibleName = "Trainer Gender Pane";
this.UC_OTGender.AccessibleDescription = "Trainer Gender Pane (0) (0)";
this.UC_OTGender.AccessibleName = "Trainer Gender Pane (0) (0)";
this.UC_OTGender.AccessibleRole = System.Windows.Forms.AccessibleRole.Graphic;
this.UC_OTGender.AllowClick = true;
this.UC_OTGender.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("UC_OTGender.BackgroundImage")));
@ -2706,8 +2710,8 @@ namespace PKHeX.WinForms.Controls
//
// UC_HTGender
//
this.UC_HTGender.AccessibleDescription = "Handling Trainer Gender Pane";
this.UC_HTGender.AccessibleName = "Handling Trainer Gender Pane";
this.UC_HTGender.AccessibleDescription = "Handling Trainer Gender Pane (0) (0)";
this.UC_HTGender.AccessibleName = "Handling Trainer Gender Pane (0) (0)";
this.UC_HTGender.AccessibleRole = System.Windows.Forms.AccessibleRole.Graphic;
this.UC_HTGender.AllowClick = true;
this.UC_HTGender.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("UC_HTGender.BackgroundImage")));

14
PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
View file

@ -1825,7 +1825,7 @@ public sealed partial class PKMEditor : UserControl, IMainEditor
int gen = t.Format;
FLP_Purification.Visible = FLP_ShadowID.Visible = t is IShadowCapture;
bool sizeCP = gen >= 8 || pb7;
SizeCP.Visible = sizeCP;
SizeCP.Visible = SizeCP.TabStop = sizeCP;
if (sizeCP)
SizeCP.ToggleVisibility(t);
PB_Favorite.Visible = t is IFavorite;
@ -1865,20 +1865,20 @@ public sealed partial class PKMEditor : UserControl, IMainEditor
CHK_AsEgg.Visible = GB_EggConditions.Visible = PB_Mark5.Visible = PB_Mark6.Visible = gen >= 4;
ShinyLeaf.Visible = gen == 4;
DEV_Ability.Enabled = DEV_Ability.Visible = gen > 3 && HaX;
CB_Ability.Visible = !DEV_Ability.Enabled && gen >= 3;
DEV_Ability.Enabled = DEV_Ability.Visible = DEV_Ability.TabStop = gen > 3 && HaX;
CB_Ability.Visible = CB_Ability.TabStop = !DEV_Ability.Enabled && gen >= 3;
FLP_Nature.Visible = gen >= 3;
FLP_Ability.Visible = gen >= 3;
FLP_ExtraBytes.Visible = gen >= 3;
GB_Markings.Visible = gen >= 3;
GB_Markings.Visible = GB_Markings.TabStop = gen >= 3;
CB_Form.Enabled = gen >= 3;
FA_Form.Visible = gen >= 6;
FA_Form.Visible = FA_Form.TabStop = gen >= 6;
FLP_Friendship.Visible = FLP_Form.Visible = gen >= 2;
FLP_HeldItem.Visible = gen >= 2;
CHK_IsEgg.Visible = gen >= 2;
CHK_IsEgg.Visible = CHK_IsEgg.TabStop = gen >= 2;
FLP_PKRS.Visible = FLP_EggPKRSRight.Visible = gen >= 2;
UC_Gender.Visible = UC_OTGender.Visible = gen >= 2;
UC_Gender.Visible = UC_OTGender.Visible = UC_OTGender.TabStop = gen >= 2;
FLP_CatchRate.Visible = gen == 1;
// HaX override, needs to be after DEV_Ability enabled assignment.

36
PKHeX.WinForms/MainWindow/Main.Designer.cs generated
View file

@ -82,6 +82,8 @@ namespace PKHeX.WinForms
//
// menuStrip1
//
this.menuStrip1.AccessibleDescription = "Main Window Menustrip";
this.menuStrip1.AccessibleName = "Main Window Menustrip";
this.menuStrip1.BackColor = System.Drawing.Color.Transparent;
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.Menu_File,
@ -111,7 +113,7 @@ namespace PKHeX.WinForms
this.Menu_Open.Name = "Menu_Open";
this.Menu_Open.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
this.Menu_Open.ShowShortcutKeys = false;
this.Menu_Open.Size = new System.Drawing.Size(133, 22);
this.Menu_Open.Size = new System.Drawing.Size(180, 22);
this.Menu_Open.Text = "&Open...";
this.Menu_Open.Click += new System.EventHandler(this.MainMenuOpen);
//
@ -121,7 +123,7 @@ namespace PKHeX.WinForms
this.Menu_Save.Name = "Menu_Save";
this.Menu_Save.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
this.Menu_Save.ShowShortcutKeys = false;
this.Menu_Save.Size = new System.Drawing.Size(133, 22);
this.Menu_Save.Size = new System.Drawing.Size(180, 22);
this.Menu_Save.Text = "&Save PKM...";
this.Menu_Save.Click += new System.EventHandler(this.MainMenuSave);
//
@ -131,7 +133,7 @@ namespace PKHeX.WinForms
this.Menu_ExportSAV.Name = "Menu_ExportSAV";
this.Menu_ExportSAV.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E)));
this.Menu_ExportSAV.ShowShortcutKeys = false;
this.Menu_ExportSAV.Size = new System.Drawing.Size(133, 22);
this.Menu_ExportSAV.Size = new System.Drawing.Size(180, 22);
this.Menu_ExportSAV.Text = "&Export SAV...";
this.Menu_ExportSAV.Click += new System.EventHandler(this.ClickExportSAV);
//
@ -141,7 +143,7 @@ namespace PKHeX.WinForms
this.Menu_Exit.Name = "Menu_Exit";
this.Menu_Exit.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q)));
this.Menu_Exit.ShowShortcutKeys = false;
this.Menu_Exit.Size = new System.Drawing.Size(133, 22);
this.Menu_Exit.Size = new System.Drawing.Size(180, 22);
this.Menu_Exit.Text = "&Quit";
this.Menu_Exit.Click += new System.EventHandler(this.MainMenuExit);
//
@ -164,7 +166,7 @@ namespace PKHeX.WinForms
this.Menu_ShowdownExportCurrentBox});
this.Menu_Showdown.Image = global::PKHeX.WinForms.Properties.Resources.showdown;
this.Menu_Showdown.Name = "Menu_Showdown";
this.Menu_Showdown.Size = new System.Drawing.Size(133, 22);
this.Menu_Showdown.Size = new System.Drawing.Size(180, 22);
this.Menu_Showdown.Text = "Showdown";
//
// Menu_ShowdownImportPKM
@ -217,7 +219,7 @@ namespace PKHeX.WinForms
this.Menu_BatchEditor});
this.Menu_Data.Image = global::PKHeX.WinForms.Properties.Resources.data;
this.Menu_Data.Name = "Menu_Data";
this.Menu_Data.Size = new System.Drawing.Size(133, 22);
this.Menu_Data.Size = new System.Drawing.Size(180, 22);
this.Menu_Data.Text = "Data";
//
// Menu_LoadBoxes
@ -300,7 +302,7 @@ namespace PKHeX.WinForms
this.Menu_Folder.Name = "Menu_Folder";
this.Menu_Folder.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F)));
this.Menu_Folder.ShowShortcutKeys = false;
this.Menu_Folder.Size = new System.Drawing.Size(133, 22);
this.Menu_Folder.Size = new System.Drawing.Size(180, 22);
this.Menu_Folder.Text = "Open Folder";
this.Menu_Folder.Click += new System.EventHandler(this.MainMenuFolder);
//
@ -322,7 +324,7 @@ namespace PKHeX.WinForms
this.CB_MainLanguage});
this.Menu_Language.Image = global::PKHeX.WinForms.Properties.Resources.language;
this.Menu_Language.Name = "Menu_Language";
this.Menu_Language.Size = new System.Drawing.Size(164, 22);
this.Menu_Language.Size = new System.Drawing.Size(180, 22);
this.Menu_Language.Text = "Language";
//
// CB_MainLanguage
@ -339,7 +341,7 @@ namespace PKHeX.WinForms
this.Menu_Undo.Name = "Menu_Undo";
this.Menu_Undo.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U)));
this.Menu_Undo.ShowShortcutKeys = false;
this.Menu_Undo.Size = new System.Drawing.Size(164, 22);
this.Menu_Undo.Size = new System.Drawing.Size(180, 22);
this.Menu_Undo.Text = "Undo Last Change";
this.Menu_Undo.Click += new System.EventHandler(this.ClickUndo);
//
@ -350,7 +352,7 @@ namespace PKHeX.WinForms
this.Menu_Redo.Name = "Menu_Redo";
this.Menu_Redo.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y)));
this.Menu_Redo.ShowShortcutKeys = false;
this.Menu_Redo.Size = new System.Drawing.Size(164, 22);
this.Menu_Redo.Size = new System.Drawing.Size(180, 22);
this.Menu_Redo.Text = "Redo Last Change";
this.Menu_Redo.Click += new System.EventHandler(this.ClickRedo);
//
@ -361,7 +363,7 @@ namespace PKHeX.WinForms
this.Menu_Settings.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.S)));
this.Menu_Settings.ShowShortcutKeys = false;
this.Menu_Settings.Size = new System.Drawing.Size(164, 22);
this.Menu_Settings.Size = new System.Drawing.Size(180, 22);
this.Menu_Settings.Text = "Settings";
this.Menu_Settings.Click += new System.EventHandler(this.MainMenuSettings);
//
@ -371,20 +373,22 @@ namespace PKHeX.WinForms
this.Menu_About.Name = "Menu_About";
this.Menu_About.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P)));
this.Menu_About.ShowShortcutKeys = false;
this.Menu_About.Size = new System.Drawing.Size(164, 22);
this.Menu_About.Size = new System.Drawing.Size(180, 22);
this.Menu_About.Text = "About &PKHeX";
this.Menu_About.Click += new System.EventHandler(this.MainMenuAbout);
//
// L_UpdateAvailable
//
this.L_UpdateAvailable.AccessibleDescription = "If an update is available, link label can be clicked to open new download link.";
this.L_UpdateAvailable.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.L_UpdateAvailable.Enabled = false;
this.L_UpdateAvailable.Location = new System.Drawing.Point(564, 0);
this.L_UpdateAvailable.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.L_UpdateAvailable.Name = "L_UpdateAvailable";
this.L_UpdateAvailable.Size = new System.Drawing.Size(288, 24);
this.L_UpdateAvailable.TabIndex = 102;
this.L_UpdateAvailable.TabStop = true;
this.L_UpdateAvailable.Text = "New Update Available!";
this.L_UpdateAvailable.Text = "You are using the latest version!";
this.L_UpdateAvailable.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.L_UpdateAvailable.Visible = false;
//
@ -397,6 +401,8 @@ namespace PKHeX.WinForms
//
// splitContainer1.Panel1
//
this.splitContainer1.Panel1.AccessibleDescription = "Main Window Split Pane";
this.splitContainer1.Panel1.AccessibleName = "Main Window Split Pane";
this.splitContainer1.Panel1.Controls.Add(this.dragout);
this.splitContainer1.Panel1.Controls.Add(this.PB_Legal);
this.splitContainer1.Panel1.Controls.Add(this.PKME_Tabs);
@ -441,6 +447,8 @@ namespace PKHeX.WinForms
//
// PKME_Tabs
//
this.PKME_Tabs.AccessibleDescription = "Pokémon Editor Pane";
this.PKME_Tabs.AccessibleName = "Pokémon Editor Pane";
this.PKME_Tabs.ChangingFields = false;
this.PKME_Tabs.Data = null;
this.PKME_Tabs.Dock = System.Windows.Forms.DockStyle.Fill;
@ -459,6 +467,8 @@ namespace PKHeX.WinForms
//
// C_SAV
//
this.C_SAV.AccessibleDescription = "Save File Editor Pane";
this.C_SAV.AccessibleName = "Save File Editor Pane";
this.C_SAV.Dock = System.Windows.Forms.DockStyle.Fill;
this.C_SAV.FlagIllegal = false;
this.C_SAV.Location = new System.Drawing.Point(0, 0);

7
PKHeX.WinForms/MainWindow/Main.cs
View file

@ -211,9 +211,10 @@ public partial class Main : Form
private void NotifyNewVersionAvailable(Version ver)
{
var date = $"{2000 + ver.Major:00}{ver.Minor:00}{ver.Build:00}";
L_UpdateAvailable.Text = $"{MsgProgramUpdateAvailable} {date}";
L_UpdateAvailable.Click += (_, _) => Process.Start(new ProcessStartInfo(ThreadPath) { UseShellExecute = true });
L_UpdateAvailable.Visible = true;
var lbl = L_UpdateAvailable;
lbl.Text = $"{MsgProgramUpdateAvailable} {date}";
lbl.Click += (_, _) => Process.Start(new ProcessStartInfo(ThreadPath) { UseShellExecute = true });
lbl.Visible = lbl.TabStop = lbl.Enabled = true;
}
private static void FormLoadConfig(out bool BAKprompt, out bool showChangelog)

2
PKHeX.WinForms/MainWindow/Main.resx
View file

@ -66,4 +66,4 @@
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>56</value>
</metadata>
</root>
</root>