Click version/battleversion -> dropdown combobox

User error help
This commit is contained in:
Kurt 2020-07-25 09:58:21 -07:00
parent 6bb2612059
commit a221a27074
2 changed files with 93 additions and 82 deletions

View file

@ -120,9 +120,12 @@
this.CHK_Shadow = new System.Windows.Forms.CheckBox(); this.CHK_Shadow = new System.Windows.Forms.CheckBox();
this.FLP_ShinyLeaf = new System.Windows.Forms.FlowLayoutPanel(); this.FLP_ShinyLeaf = new System.Windows.Forms.FlowLayoutPanel();
this.L_ShinyLeaf = new System.Windows.Forms.Label(); this.L_ShinyLeaf = new System.Windows.Forms.Label();
this.ShinyLeaf = new PKHeX.WinForms.Controls.ShinyLeaf();
this.FLP_CatchRate = new System.Windows.Forms.FlowLayoutPanel(); this.FLP_CatchRate = new System.Windows.Forms.FlowLayoutPanel();
this.L_CatchRate = new System.Windows.Forms.Label(); this.L_CatchRate = new System.Windows.Forms.Label();
this.CR_PK1 = new PKHeX.WinForms.Controls.CatchRate();
this.FLP_SizeCP = new System.Windows.Forms.FlowLayoutPanel(); this.FLP_SizeCP = new System.Windows.Forms.FlowLayoutPanel();
this.SizeCP = new PKHeX.WinForms.Controls.SizeCP();
this.Tab_Met = new System.Windows.Forms.TabPage(); this.Tab_Met = new System.Windows.Forms.TabPage();
this.TB_HomeTracker = new System.Windows.Forms.TextBox(); this.TB_HomeTracker = new System.Windows.Forms.TextBox();
this.L_HomeTracker = new System.Windows.Forms.Label(); this.L_HomeTracker = new System.Windows.Forms.Label();
@ -163,6 +166,8 @@
this.L_MetTimeOfDay = new System.Windows.Forms.Label(); this.L_MetTimeOfDay = new System.Windows.Forms.Label();
this.CB_MetTimeOfDay = new System.Windows.Forms.ComboBox(); this.CB_MetTimeOfDay = new System.Windows.Forms.ComboBox();
this.Tab_Stats = new System.Windows.Forms.TabPage(); this.Tab_Stats = new System.Windows.Forms.TabPage();
this.Stats = new PKHeX.WinForms.Controls.StatEditor();
this.Contest = new PKHeX.WinForms.Controls.ContestStat();
this.Tab_Attacks = new System.Windows.Forms.TabPage(); this.Tab_Attacks = new System.Windows.Forms.TabPage();
this.B_Records = new System.Windows.Forms.Button(); this.B_Records = new System.Windows.Forms.Button();
this.PB_WarnMove4 = new System.Windows.Forms.PictureBox(); this.PB_WarnMove4 = new System.Windows.Forms.PictureBox();
@ -194,6 +199,7 @@
this.CB_Move2 = new System.Windows.Forms.ComboBox(); this.CB_Move2 = new System.Windows.Forms.ComboBox();
this.CB_Move1 = new System.Windows.Forms.ComboBox(); this.CB_Move1 = new System.Windows.Forms.ComboBox();
this.Tab_OTMisc = new System.Windows.Forms.TabPage(); this.Tab_OTMisc = new System.Windows.Forms.TabPage();
this.PB_BattleVersion = new System.Windows.Forms.PictureBox();
this.PB_Origin = new System.Windows.Forms.PictureBox(); this.PB_Origin = new System.Windows.Forms.PictureBox();
this.PB_Favorite = new System.Windows.Forms.PictureBox(); this.PB_Favorite = new System.Windows.Forms.PictureBox();
this.FLP_PKMEditors = new System.Windows.Forms.FlowLayoutPanel(); this.FLP_PKMEditors = new System.Windows.Forms.FlowLayoutPanel();
@ -220,6 +226,7 @@
this.TB_ExtraByte = new System.Windows.Forms.MaskedTextBox(); this.TB_ExtraByte = new System.Windows.Forms.MaskedTextBox();
this.CB_ExtraBytes = new System.Windows.Forms.ComboBox(); this.CB_ExtraBytes = new System.Windows.Forms.ComboBox();
this.GB_OT = new System.Windows.Forms.GroupBox(); this.GB_OT = new System.Windows.Forms.GroupBox();
this.TID_Trainer = new PKHeX.WinForms.Controls.TrainerID();
this.Label_OTGender = new System.Windows.Forms.Label(); this.Label_OTGender = new System.Windows.Forms.Label();
this.TB_OT = new System.Windows.Forms.TextBox(); this.TB_OT = new System.Windows.Forms.TextBox();
this.Label_OT = new System.Windows.Forms.Label(); this.Label_OT = new System.Windows.Forms.Label();
@ -227,13 +234,6 @@
this.SpeciesIDTip = new System.Windows.Forms.ToolTip(this.components); this.SpeciesIDTip = new System.Windows.Forms.ToolTip(this.components);
this.NatureTip = new System.Windows.Forms.ToolTip(this.components); this.NatureTip = new System.Windows.Forms.ToolTip(this.components);
this.Tip3 = new System.Windows.Forms.ToolTip(this.components); this.Tip3 = new System.Windows.Forms.ToolTip(this.components);
this.PB_BattleVersion = new System.Windows.Forms.PictureBox();
this.ShinyLeaf = new PKHeX.WinForms.Controls.ShinyLeaf();
this.CR_PK1 = new PKHeX.WinForms.Controls.CatchRate();
this.SizeCP = new PKHeX.WinForms.Controls.SizeCP();
this.Stats = new PKHeX.WinForms.Controls.StatEditor();
this.Contest = new PKHeX.WinForms.Controls.ContestStat();
this.TID_Trainer = new PKHeX.WinForms.Controls.TrainerID();
this.tabMain.SuspendLayout(); this.tabMain.SuspendLayout();
this.Tab_Main.SuspendLayout(); this.Tab_Main.SuspendLayout();
this.FLP_Main.SuspendLayout(); this.FLP_Main.SuspendLayout();
@ -302,6 +302,7 @@
((System.ComponentModel.ISupportInitialize)(this.PB_WarnRelearn1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_WarnRelearn1)).BeginInit();
this.GB_CurrentMoves.SuspendLayout(); this.GB_CurrentMoves.SuspendLayout();
this.Tab_OTMisc.SuspendLayout(); this.Tab_OTMisc.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.PB_BattleVersion)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.PB_Origin)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Origin)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.PB_Favorite)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Favorite)).BeginInit();
this.FLP_PKMEditors.SuspendLayout(); this.FLP_PKMEditors.SuspendLayout();
@ -317,7 +318,6 @@
((System.ComponentModel.ISupportInitialize)(this.PB_Mark4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Mark4)).BeginInit();
this.GB_ExtraBytes.SuspendLayout(); this.GB_ExtraBytes.SuspendLayout();
this.GB_OT.SuspendLayout(); this.GB_OT.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.PB_BattleVersion)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
// tabMain // tabMain
@ -1434,6 +1434,14 @@
this.L_ShinyLeaf.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.L_ShinyLeaf.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.L_ShinyLeaf.Click += new System.EventHandler(this.ClickShinyLeaf); this.L_ShinyLeaf.Click += new System.EventHandler(this.ClickShinyLeaf);
// //
// ShinyLeaf
//
this.ShinyLeaf.Location = new System.Drawing.Point(110, 0);
this.ShinyLeaf.Margin = new System.Windows.Forms.Padding(0);
this.ShinyLeaf.Name = "ShinyLeaf";
this.ShinyLeaf.Size = new System.Drawing.Size(140, 56);
this.ShinyLeaf.TabIndex = 116;
//
// FLP_CatchRate // FLP_CatchRate
// //
this.FLP_CatchRate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.FLP_CatchRate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
@ -1455,6 +1463,14 @@
this.L_CatchRate.Text = "Catch Rate:"; this.L_CatchRate.Text = "Catch Rate:";
this.L_CatchRate.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.L_CatchRate.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// CR_PK1
//
this.CR_PK1.Location = new System.Drawing.Point(110, 0);
this.CR_PK1.Margin = new System.Windows.Forms.Padding(0);
this.CR_PK1.Name = "CR_PK1";
this.CR_PK1.Size = new System.Drawing.Size(162, 25);
this.CR_PK1.TabIndex = 10;
//
// FLP_SizeCP // FLP_SizeCP
// //
this.FLP_SizeCP.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.FLP_SizeCP.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
@ -1465,6 +1481,15 @@
this.FLP_SizeCP.Size = new System.Drawing.Size(272, 72); this.FLP_SizeCP.Size = new System.Drawing.Size(272, 72);
this.FLP_SizeCP.TabIndex = 21; this.FLP_SizeCP.TabIndex = 21;
// //
// SizeCP
//
this.SizeCP.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.SizeCP.Location = new System.Drawing.Point(50, 0);
this.SizeCP.Margin = new System.Windows.Forms.Padding(50, 0, 0, 0);
this.SizeCP.Name = "SizeCP";
this.SizeCP.Size = new System.Drawing.Size(204, 68);
this.SizeCP.TabIndex = 0;
//
// Tab_Met // Tab_Met
// //
this.Tab_Met.AllowDrop = true; this.Tab_Met.AllowDrop = true;
@ -1476,7 +1501,7 @@
this.Tab_Met.Location = new System.Drawing.Point(4, 22); this.Tab_Met.Location = new System.Drawing.Point(4, 22);
this.Tab_Met.Name = "Tab_Met"; this.Tab_Met.Name = "Tab_Met";
this.Tab_Met.Padding = new System.Windows.Forms.Padding(3); this.Tab_Met.Padding = new System.Windows.Forms.Padding(3);
this.Tab_Met.Size = new System.Drawing.Size(307, 539); this.Tab_Met.Size = new System.Drawing.Size(192, 74);
this.Tab_Met.TabIndex = 1; this.Tab_Met.TabIndex = 1;
this.Tab_Met.Text = "Met"; this.Tab_Met.Text = "Met";
this.Tab_Met.UseVisualStyleBackColor = true; this.Tab_Met.UseVisualStyleBackColor = true;
@ -1922,11 +1947,38 @@
this.Tab_Stats.Location = new System.Drawing.Point(4, 22); this.Tab_Stats.Location = new System.Drawing.Point(4, 22);
this.Tab_Stats.Name = "Tab_Stats"; this.Tab_Stats.Name = "Tab_Stats";
this.Tab_Stats.Padding = new System.Windows.Forms.Padding(3); this.Tab_Stats.Padding = new System.Windows.Forms.Padding(3);
this.Tab_Stats.Size = new System.Drawing.Size(307, 539); this.Tab_Stats.Size = new System.Drawing.Size(192, 74);
this.Tab_Stats.TabIndex = 2; this.Tab_Stats.TabIndex = 2;
this.Tab_Stats.Text = "Stats"; this.Tab_Stats.Text = "Stats";
this.Tab_Stats.UseVisualStyleBackColor = true; this.Tab_Stats.UseVisualStyleBackColor = true;
// //
// Stats
//
this.Stats.EVsFishy = System.Drawing.Color.LightYellow;
this.Stats.EVsInvalid = System.Drawing.Color.Red;
this.Stats.EVsMaxed = System.Drawing.Color.Honeydew;
this.Stats.Location = new System.Drawing.Point(0, 0);
this.Stats.Name = "Stats";
this.Stats.Size = new System.Drawing.Size(270, 264);
this.Stats.StatDecreased = System.Drawing.Color.Blue;
this.Stats.StatHyperTrained = System.Drawing.Color.LightGreen;
this.Stats.StatIncreased = System.Drawing.Color.Red;
this.Stats.TabIndex = 1;
//
// Contest
//
this.Contest.CNT_Beauty = 0;
this.Contest.CNT_Cool = 0;
this.Contest.CNT_Cute = 0;
this.Contest.CNT_Sheen = 0;
this.Contest.CNT_Smart = 0;
this.Contest.CNT_Tough = 0;
this.Contest.Location = new System.Drawing.Point(21, 265);
this.Contest.Margin = new System.Windows.Forms.Padding(0);
this.Contest.Name = "Contest";
this.Contest.Size = new System.Drawing.Size(230, 50);
this.Contest.TabIndex = 2;
//
// Tab_Attacks // Tab_Attacks
// //
this.Tab_Attacks.AllowDrop = true; this.Tab_Attacks.AllowDrop = true;
@ -1940,7 +1992,7 @@
this.Tab_Attacks.Location = new System.Drawing.Point(4, 22); this.Tab_Attacks.Location = new System.Drawing.Point(4, 22);
this.Tab_Attacks.Name = "Tab_Attacks"; this.Tab_Attacks.Name = "Tab_Attacks";
this.Tab_Attacks.Padding = new System.Windows.Forms.Padding(3); this.Tab_Attacks.Padding = new System.Windows.Forms.Padding(3);
this.Tab_Attacks.Size = new System.Drawing.Size(307, 539); this.Tab_Attacks.Size = new System.Drawing.Size(192, 74);
this.Tab_Attacks.TabIndex = 3; this.Tab_Attacks.TabIndex = 3;
this.Tab_Attacks.Text = "Attacks"; this.Tab_Attacks.Text = "Attacks";
this.Tab_Attacks.UseVisualStyleBackColor = true; this.Tab_Attacks.UseVisualStyleBackColor = true;
@ -2345,6 +2397,18 @@
this.Tab_OTMisc.Text = "OT/Misc"; this.Tab_OTMisc.Text = "OT/Misc";
this.Tab_OTMisc.UseVisualStyleBackColor = true; this.Tab_OTMisc.UseVisualStyleBackColor = true;
// //
// PB_BattleVersion
//
this.PB_BattleVersion.Image = global::PKHeX.WinForms.Properties.Resources.icon_btlrom;
this.PB_BattleVersion.InitialImage = global::PKHeX.WinForms.Properties.Resources.icon_btlrom;
this.PB_BattleVersion.Location = new System.Drawing.Point(251, 228);
this.PB_BattleVersion.Name = "PB_BattleVersion";
this.PB_BattleVersion.Size = new System.Drawing.Size(40, 40);
this.PB_BattleVersion.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.PB_BattleVersion.TabIndex = 12;
this.PB_BattleVersion.TabStop = false;
this.PB_BattleVersion.Click += new System.EventHandler(this.ClickVersionMarking);
//
// PB_Origin // PB_Origin
// //
this.PB_Origin.Location = new System.Drawing.Point(209, 228); this.PB_Origin.Location = new System.Drawing.Point(209, 228);
@ -2353,6 +2417,7 @@
this.PB_Origin.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.PB_Origin.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.PB_Origin.TabIndex = 11; this.PB_Origin.TabIndex = 11;
this.PB_Origin.TabStop = false; this.PB_Origin.TabStop = false;
this.PB_Origin.Click += new System.EventHandler(this.ClickVersionMarking);
// //
// PB_Favorite // PB_Favorite
// //
@ -2670,6 +2735,13 @@
this.GB_OT.TabStop = false; this.GB_OT.TabStop = false;
this.GB_OT.Text = "Trainer Information"; this.GB_OT.Text = "Trainer Information";
// //
// TID_Trainer
//
this.TID_Trainer.Location = new System.Drawing.Point(13, 18);
this.TID_Trainer.Name = "TID_Trainer";
this.TID_Trainer.Size = new System.Drawing.Size(178, 27);
this.TID_Trainer.TabIndex = 57;
//
// Label_OTGender // Label_OTGender
// //
this.Label_OTGender.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label_OTGender.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@ -2710,76 +2782,6 @@
this.Label_EncryptionConstant.Text = "Encryption Constant:"; this.Label_EncryptionConstant.Text = "Encryption Constant:";
this.Label_EncryptionConstant.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.Label_EncryptionConstant.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// PB_BattleVersion
//
this.PB_BattleVersion.Image = global::PKHeX.WinForms.Properties.Resources.icon_btlrom;
this.PB_BattleVersion.InitialImage = global::PKHeX.WinForms.Properties.Resources.icon_btlrom;
this.PB_BattleVersion.Location = new System.Drawing.Point(251, 228);
this.PB_BattleVersion.Name = "PB_BattleVersion";
this.PB_BattleVersion.Size = new System.Drawing.Size(40, 40);
this.PB_BattleVersion.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.PB_BattleVersion.TabIndex = 12;
this.PB_BattleVersion.TabStop = false;
//
// ShinyLeaf
//
this.ShinyLeaf.Location = new System.Drawing.Point(110, 0);
this.ShinyLeaf.Margin = new System.Windows.Forms.Padding(0);
this.ShinyLeaf.Name = "ShinyLeaf";
this.ShinyLeaf.Size = new System.Drawing.Size(140, 56);
this.ShinyLeaf.TabIndex = 116;
//
// CR_PK1
//
this.CR_PK1.Location = new System.Drawing.Point(110, 0);
this.CR_PK1.Margin = new System.Windows.Forms.Padding(0);
this.CR_PK1.Name = "CR_PK1";
this.CR_PK1.Size = new System.Drawing.Size(162, 25);
this.CR_PK1.TabIndex = 10;
//
// SizeCP
//
this.SizeCP.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.SizeCP.Location = new System.Drawing.Point(50, 0);
this.SizeCP.Margin = new System.Windows.Forms.Padding(50, 0, 0, 0);
this.SizeCP.Name = "SizeCP";
this.SizeCP.Size = new System.Drawing.Size(204, 68);
this.SizeCP.TabIndex = 0;
//
// Stats
//
this.Stats.EVsFishy = System.Drawing.Color.LightYellow;
this.Stats.EVsInvalid = System.Drawing.Color.Red;
this.Stats.EVsMaxed = System.Drawing.Color.Honeydew;
this.Stats.Location = new System.Drawing.Point(0, 0);
this.Stats.Name = "Stats";
this.Stats.Size = new System.Drawing.Size(270, 264);
this.Stats.StatDecreased = System.Drawing.Color.Blue;
this.Stats.StatHyperTrained = System.Drawing.Color.LightGreen;
this.Stats.StatIncreased = System.Drawing.Color.Red;
this.Stats.TabIndex = 1;
//
// Contest
//
this.Contest.CNT_Beauty = 0;
this.Contest.CNT_Cool = 0;
this.Contest.CNT_Cute = 0;
this.Contest.CNT_Sheen = 0;
this.Contest.CNT_Smart = 0;
this.Contest.CNT_Tough = 0;
this.Contest.Location = new System.Drawing.Point(21, 265);
this.Contest.Margin = new System.Windows.Forms.Padding(0);
this.Contest.Name = "Contest";
this.Contest.Size = new System.Drawing.Size(230, 50);
this.Contest.TabIndex = 2;
//
// TID_Trainer
//
this.TID_Trainer.Location = new System.Drawing.Point(13, 18);
this.TID_Trainer.Name = "TID_Trainer";
this.TID_Trainer.Size = new System.Drawing.Size(178, 27);
this.TID_Trainer.TabIndex = 57;
//
// PKMEditor // PKMEditor
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
@ -2872,6 +2874,7 @@
this.GB_CurrentMoves.PerformLayout(); this.GB_CurrentMoves.PerformLayout();
this.Tab_OTMisc.ResumeLayout(false); this.Tab_OTMisc.ResumeLayout(false);
this.Tab_OTMisc.PerformLayout(); this.Tab_OTMisc.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.PB_BattleVersion)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.PB_Origin)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Origin)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.PB_Favorite)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Favorite)).EndInit();
this.FLP_PKMEditors.ResumeLayout(false); this.FLP_PKMEditors.ResumeLayout(false);
@ -2891,7 +2894,6 @@
this.GB_ExtraBytes.PerformLayout(); this.GB_ExtraBytes.PerformLayout();
this.GB_OT.ResumeLayout(false); this.GB_OT.ResumeLayout(false);
this.GB_OT.PerformLayout(); this.GB_OT.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.PB_BattleVersion)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
} }

View file

@ -1882,6 +1882,15 @@ namespace PKHeX.WinForms.Controls
return opaque ? sprite : ImageUtil.ChangeOpacity(sprite, trans); return opaque ? sprite : ImageUtil.ChangeOpacity(sprite, trans);
} }
private void ClickVersionMarking(object sender, EventArgs e)
{
tabMain.SelectedTab = Tab_Met;
if (sender == PB_BattleVersion)
CB_BattleVersion.DroppedDown = true;
else
CB_GameOrigin.DroppedDown = true;
}
public void ChangeLanguage(ITrainerInfo sav, PKM pk) public void ChangeLanguage(ITrainerInfo sav, PKM pk)
{ {
// Force an update to the met locations // Force an update to the met locations