From daf9364fb29be7f76e4ac6bf371c868012943d6b Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 19 Aug 2018 21:25:21 -0700 Subject: [PATCH] Alphebetize settings probably want to switch to a propertygrid later. --- PKHeX.Core/Resources/text/de/lang_de.txt | 2 +- PKHeX.Core/Resources/text/en/lang_en.txt | 2 +- PKHeX.Core/Resources/text/fr/lang_fr.txt | 2 +- PKHeX.Core/Resources/text/it/lang_it.txt | 2 +- PKHeX.Core/Resources/text/ko/lang_ko.txt | 2 +- PKHeX.WinForms/Subforms/SettingsEditor.Designer.cs | 12 ++++++------ PKHeX.WinForms/Subforms/SettingsEditor.cs | 5 +++++ 7 files changed, 16 insertions(+), 11 deletions(-) diff --git a/PKHeX.Core/Resources/text/de/lang_de.txt b/PKHeX.Core/Resources/text/de/lang_de.txt index d77cead0d..e0eab9e89 100644 --- a/PKHeX.Core/Resources/text/de/lang_de.txt +++ b/PKHeX.Core/Resources/text/de/lang_de.txt @@ -1104,7 +1104,7 @@ SAV_ZygardeCell.B_Save=Save SAV_ZygardeCell.L_Cells=Stored: SAV_ZygardeCell.L_Collected=Collected: SettingsEditor.ApplyMarkings=Apply Markings on Import -SettingsEditor.FlagIllegal=Flag Illegal +SettingsEditor.FlagIllegal=Flag Illegal Slots in Save File SettingsEditor.HideSAVDetails=Hide Save File Details in Program Title SettingsEditor.HideSecretDetails=Hide Secret Details in Editors SettingsEditor.HoverSlotGlowEdges=Show PKM Glow on Hover diff --git a/PKHeX.Core/Resources/text/en/lang_en.txt b/PKHeX.Core/Resources/text/en/lang_en.txt index 741fc835e..af5a5b77f 100644 --- a/PKHeX.Core/Resources/text/en/lang_en.txt +++ b/PKHeX.Core/Resources/text/en/lang_en.txt @@ -1100,7 +1100,7 @@ SAV_ZygardeCell.B_Save=Save SAV_ZygardeCell.L_Cells=Stored: SAV_ZygardeCell.L_Collected=Collected: SettingsEditor.ApplyMarkings=Apply Markings on Import -SettingsEditor.FlagIllegal=Flag Illegal +SettingsEditor.FlagIllegal=Flag Illegal Slots in Save File SettingsEditor.HideSAVDetails=Hide Save File Details in Program Title SettingsEditor.HideSecretDetails=Hide Secret Details in Editors SettingsEditor.HoverSlotGlowEdges=Show PKM Glow on Hover diff --git a/PKHeX.Core/Resources/text/fr/lang_fr.txt b/PKHeX.Core/Resources/text/fr/lang_fr.txt index b2a63d93e..a8d9b9e5e 100644 --- a/PKHeX.Core/Resources/text/fr/lang_fr.txt +++ b/PKHeX.Core/Resources/text/fr/lang_fr.txt @@ -1104,7 +1104,7 @@ SAV_ZygardeCell.B_Save=Save SAV_ZygardeCell.L_Cells=Stored: SAV_ZygardeCell.L_Collected=Collected: SettingsEditor.ApplyMarkings=Appliquer des marques de l'importation -SettingsEditor.FlagIllegal=Flag Illegal +SettingsEditor.FlagIllegal=Flag Illegal Slots in Save File SettingsEditor.HideSAVDetails=Hide Save File Details in Program Title SettingsEditor.HideSecretDetails=Hide Secret Details in Editors SettingsEditor.HoverSlotGlowEdges=Show PKM Glow on Hover diff --git a/PKHeX.Core/Resources/text/it/lang_it.txt b/PKHeX.Core/Resources/text/it/lang_it.txt index cb5fa8f39..c05bc68f9 100644 --- a/PKHeX.Core/Resources/text/it/lang_it.txt +++ b/PKHeX.Core/Resources/text/it/lang_it.txt @@ -1110,7 +1110,7 @@ SAV_ZygardeCell.B_Save=Save SAV_ZygardeCell.L_Cells=Stored: SAV_ZygardeCell.L_Collected=Collected: SettingsEditor.ApplyMarkings=Apply Markings on Import -SettingsEditor.FlagIllegal=Flag Illegal +SettingsEditor.FlagIllegal=Flag Illegal Slots in Save File SettingsEditor.HideSAVDetails=Hide Save File Details in Program Title SettingsEditor.HideSecretDetails=Hide Secret Details in Editors SettingsEditor.HoverSlotGlowEdges=Show PKM Glow on Hover diff --git a/PKHeX.Core/Resources/text/ko/lang_ko.txt b/PKHeX.Core/Resources/text/ko/lang_ko.txt index 52ac489a2..4d5c7370d 100644 --- a/PKHeX.Core/Resources/text/ko/lang_ko.txt +++ b/PKHeX.Core/Resources/text/ko/lang_ko.txt @@ -1100,7 +1100,7 @@ SAV_ZygardeCell.B_Save=Save SAV_ZygardeCell.L_Cells=Stored: SAV_ZygardeCell.L_Collected=Collected: SettingsEditor.ApplyMarkings=가져오기 중 마킹하기 -SettingsEditor.FlagIllegal=Flag Illegal +SettingsEditor.FlagIllegal=Flag Illegal Slots in Save File SettingsEditor.HideSAVDetails=Hide Save File Details in Program Title SettingsEditor.HideSecretDetails=Hide Secret Details in Editors SettingsEditor.HoverSlotGlowEdges=Show PKM Glow on Hover diff --git a/PKHeX.WinForms/Subforms/SettingsEditor.Designer.cs b/PKHeX.WinForms/Subforms/SettingsEditor.Designer.cs index 7d71fdc70..8483f56dc 100644 --- a/PKHeX.WinForms/Subforms/SettingsEditor.Designer.cs +++ b/PKHeX.WinForms/Subforms/SettingsEditor.Designer.cs @@ -31,21 +31,21 @@ private void InitializeComponent() System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SettingsEditor)); this.FLP_Settings = new System.Windows.Forms.FlowLayoutPanel(); this.SuspendLayout(); - // + // // FLP_Settings - // + // this.FLP_Settings.AutoScroll = true; this.FLP_Settings.Dock = System.Windows.Forms.DockStyle.Fill; this.FLP_Settings.Location = new System.Drawing.Point(0, 0); this.FLP_Settings.Name = "FLP_Settings"; - this.FLP_Settings.Size = new System.Drawing.Size(306, 161); + this.FLP_Settings.Size = new System.Drawing.Size(306, 311); this.FLP_Settings.TabIndex = 0; - // + // // SettingsEditor - // + // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.AutoSize = true; - this.ClientSize = new System.Drawing.Size(306, 161); + this.ClientSize = new System.Drawing.Size(306, 311); this.Controls.Add(this.FLP_Settings); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; diff --git a/PKHeX.WinForms/Subforms/SettingsEditor.cs b/PKHeX.WinForms/Subforms/SettingsEditor.cs index db1e096b8..bf61b4275 100644 --- a/PKHeX.WinForms/Subforms/SettingsEditor.cs +++ b/PKHeX.WinForms/Subforms/SettingsEditor.cs @@ -17,6 +17,11 @@ public SettingsEditor(object obj, params string[] blacklist) LoadSettings(blacklist); WinFormsUtil.TranslateInterface(this, Main.CurrentLanguage); + // reorder checkboxes + int ctr = 0; + foreach (var c in FLP_Settings.Controls.OfType().OrderBy(z => z.Text).ToList()) + FLP_Settings.Controls.SetChildIndex(c, ctr++); + this.CenterToForm(FindForm()); } private void SettingsEditor_FormClosing(object sender, FormClosingEventArgs e) => SaveSettings();