From ed76235e9adfcf37fa9091ffddd71b47de8fae14 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 5 Sep 2016 15:46:38 -0700 Subject: [PATCH] Minor hax tweaks Display overrides for visual neatness why resx do you keep modifying yourself --- PKHeX/MainWindow/Main.Designer.cs | 4 +-- PKHeX/MainWindow/Main.cs | 5 +++ PKHeX/MainWindow/Main.resx | 60 +++++++++++++++---------------- 3 files changed, 37 insertions(+), 32 deletions(-) diff --git a/PKHeX/MainWindow/Main.Designer.cs b/PKHeX/MainWindow/Main.Designer.cs index 6c9e18c95..287945846 100644 --- a/PKHeX/MainWindow/Main.Designer.cs +++ b/PKHeX/MainWindow/Main.Designer.cs @@ -1157,14 +1157,14 @@ public void InitializeComponent() this.DEV_Ability.Location = new System.Drawing.Point(0, 21); this.DEV_Ability.Margin = new System.Windows.Forms.Padding(0); this.DEV_Ability.Name = "DEV_Ability"; - this.DEV_Ability.Size = new System.Drawing.Size(122, 21); + this.DEV_Ability.Size = new System.Drawing.Size(126, 21); this.DEV_Ability.TabIndex = 14; this.DEV_Ability.Visible = false; // // TB_AbilityNumber // this.TB_AbilityNumber.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_AbilityNumber.Location = new System.Drawing.Point(122, 21); + this.TB_AbilityNumber.Location = new System.Drawing.Point(126, 21); this.TB_AbilityNumber.Margin = new System.Windows.Forms.Padding(0); this.TB_AbilityNumber.Mask = "0"; this.TB_AbilityNumber.Name = "TB_AbilityNumber"; diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 99995e4c7..eab904893 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -870,6 +870,8 @@ private void loadSAV(SaveFile sav, string path) GB_nOT.Visible = GB_RelearnMoves.Visible = BTN_Medals.Visible = BTN_History.Visible = SAV.Generation >= 6; PB_Legal.Visible = PB_WarnMove1.Visible = PB_WarnMove2.Visible = PB_WarnMove3.Visible = PB_WarnMove4.Visible = SAV.Generation >= 6; TB_AbilityNumber.Visible = SAV.Generation >= 6 && DEV_Ability.Enabled; + if (HaX && SAV.Generation >= 6) + TB_AbilityNumber.Visible = true; PB_MarkPentagon.Visible = SAV.Generation == 6; TB_GameSync.Visible = TB_Secure1.Visible = TB_Secure2.Visible = L_GameSync.Visible = L_Secure1.Visible = L_Secure2.Visible = SAV.Exportable && SAV.Generation == 6; @@ -1414,6 +1416,9 @@ private void setForms() CB_Form.Enabled = CB_Form.Visible = Label_Form.Visible = hasForms; if (SAV.Generation == 2) CB_Form.Enabled = false; + + if (HaX) + Label_Form.Visible = true; if (!hasForms) return; diff --git a/PKHeX/MainWindow/Main.resx b/PKHeX/MainWindow/Main.resx index 3cf020fe4..b8929a07f 100644 --- a/PKHeX/MainWindow/Main.resx +++ b/PKHeX/MainWindow/Main.resx @@ -144,6 +144,24 @@ True + + True + + + True + + + True + + + True + + + True + + + True + True @@ -326,36 +344,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -428,6 +416,18 @@ True + + True + + + True + + + True + + + True + True