Leahnaya/pkNX
1
0
Fork 0
mirror of https://github.com/kwsch/pkNX.git synced 2026-04-25 07:16:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

misc gui qol improvements

Browse Source 
min sizes, control anchoring for resizing, error on bad json
This commit is contained in:
Kurt 2018-12-11 19:12:39 -08:00
parent 22151cefef
commit e1d7b1966d
6 changed files with 103 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkNX.WinForms/Subforms/BTTE.designer.cs generated
View File

@ -85,7 +85,6 @@ private void InitializeComponent()
this.CHK_CanMega = new System.Windows.Forms.CheckBox();
this.NUD_MegaForm = new System.Windows.Forms.NumericUpDown();
this.Tab_Stats = new System.Windows.Forms.TabPage();
this.Stats = new pkNX.WinForms.Controls.StatEditor();
this.Tab_Moves = new System.Windows.Forms.TabPage();
this.B_Clear = new System.Windows.Forms.Button();
this.B_CurrentAttack = new System.Windows.Forms.Button();
@ -123,6 +122,7 @@ private void InitializeComponent()
this.Tab_RMoves = new System.Windows.Forms.TabPage();
this.PG_Moves = new System.Windows.Forms.PropertyGrid();
this.B_Save = new System.Windows.Forms.Button();
this.Stats = new pkNX.WinForms.Controls.StatEditor();
((System.ComponentModel.ISupportInitialize)(this.PB_Team1)).BeginInit();
this.mnuVSD.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.PB_Team2)).BeginInit();
@ -753,14 +753,6 @@ private void InitializeComponent()
this.Tab_Stats.Text = "Stats";
this.Tab_Stats.UseVisualStyleBackColor = true;
//
// Stats
//
this.Stats.Location = new System.Drawing.Point(1, 1);
this.Stats.Name = "Stats";
this.Stats.PKM = null;
this.Stats.Size = new System.Drawing.Size(222, 195);
this.Stats.TabIndex = 0;
//
// Tab_Moves
//
this.Tab_Moves.Controls.Add(this.B_Clear);
@ -1174,6 +1166,14 @@ private void InitializeComponent()
this.B_Save.UseVisualStyleBackColor = true;
this.B_Save.Click += new System.EventHandler(this.B_Save_Click);
//
// Stats
//
this.Stats.Location = new System.Drawing.Point(1, 1);
this.Stats.Name = "Stats";
this.Stats.PKM = null;
this.Stats.Size = new System.Drawing.Size(222, 195);
this.Stats.TabIndex = 0;
//
// BTTE
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

109
pkNX.WinForms/Subforms/GGWE.Designer.cs generated
View File

@ -34,17 +34,11 @@ private void InitializeComponent()
this.L_Rank = new System.Windows.Forms.Label();
this.TC_Tables = new System.Windows.Forms.TabControl();
this.Tab_Ground = new System.Windows.Forms.TabPage();
this.EL_Ground = new pkNX.WinForms.EncounterList();
this.Tab_Water = new System.Windows.Forms.TabPage();
this.EL_Water = new pkNX.WinForms.EncounterList();
this.Tab_Old = new System.Windows.Forms.TabPage();
this.EL_Old = new pkNX.WinForms.EncounterList();
this.Tab_Good = new System.Windows.Forms.TabPage();
this.EL_Good = new pkNX.WinForms.EncounterList();
this.Tab_Super = new System.Windows.Forms.TabPage();
this.EL_Super = new pkNX.WinForms.EncounterList();
this.Tab_Sky = new System.Windows.Forms.TabPage();
this.EL_Sky = new pkNX.WinForms.EncounterList();
this.Tab_Rand = new System.Windows.Forms.TabPage();
this.CHK_ForceType = new System.Windows.Forms.CheckBox();
this.L_SpawnDuration = new System.Windows.Forms.Label();
@ -61,6 +55,12 @@ private void InitializeComponent()
this.B_ModSpawn = new System.Windows.Forms.Button();
this.L_Hash = new System.Windows.Forms.Label();
this.B_Save = new System.Windows.Forms.Button();
this.EL_Ground = new pkNX.WinForms.EncounterList();
this.EL_Water = new pkNX.WinForms.EncounterList();
this.EL_Old = new pkNX.WinForms.EncounterList();
this.EL_Good = new pkNX.WinForms.EncounterList();
this.EL_Super = new pkNX.WinForms.EncounterList();
this.EL_Sky = new pkNX.WinForms.EncounterList();
((System.ComponentModel.ISupportInitialize)(this.NUD_RankMin)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.NUD_RankMax)).BeginInit();
this.TC_Tables.SuspendLayout();
@ -138,14 +138,6 @@ private void InitializeComponent()
this.Tab_Ground.Text = "Ground";
this.Tab_Ground.UseVisualStyleBackColor = true;
//
// EL_Ground
//
this.EL_Ground.Dock = System.Windows.Forms.DockStyle.Fill;
this.EL_Ground.Location = new System.Drawing.Point(0, 0);
this.EL_Ground.Name = "EL_Ground";
this.EL_Ground.Size = new System.Drawing.Size(313, 400);
this.EL_Ground.TabIndex = 14;
//
// Tab_Water
//
this.Tab_Water.Controls.Add(this.EL_Water);
@ -156,14 +148,6 @@ private void InitializeComponent()
this.Tab_Water.Text = "Water";
this.Tab_Water.UseVisualStyleBackColor = true;
//
// EL_Water
//
this.EL_Water.Dock = System.Windows.Forms.DockStyle.Fill;
this.EL_Water.Location = new System.Drawing.Point(0, 0);
this.EL_Water.Name = "EL_Water";
this.EL_Water.Size = new System.Drawing.Size(313, 400);
this.EL_Water.TabIndex = 13;
//
// Tab_Old
//
this.Tab_Old.Controls.Add(this.EL_Old);
@ -174,14 +158,6 @@ private void InitializeComponent()
this.Tab_Old.Text = "Old";
this.Tab_Old.UseVisualStyleBackColor = true;
//
// EL_Old
//
this.EL_Old.Dock = System.Windows.Forms.DockStyle.Fill;
this.EL_Old.Location = new System.Drawing.Point(0, 0);
this.EL_Old.Name = "EL_Old";
this.EL_Old.Size = new System.Drawing.Size(313, 400);
this.EL_Old.TabIndex = 13;
//
// Tab_Good
//
this.Tab_Good.Controls.Add(this.EL_Good);
@ -192,14 +168,6 @@ private void InitializeComponent()
this.Tab_Good.Text = "Good";
this.Tab_Good.UseVisualStyleBackColor = true;
//
// EL_Good
//
this.EL_Good.Dock = System.Windows.Forms.DockStyle.Fill;
this.EL_Good.Location = new System.Drawing.Point(0, 0);
this.EL_Good.Name = "EL_Good";
this.EL_Good.Size = new System.Drawing.Size(313, 400);
this.EL_Good.TabIndex = 13;
//
// Tab_Super
//
this.Tab_Super.Controls.Add(this.EL_Super);
@ -210,14 +178,6 @@ private void InitializeComponent()
this.Tab_Super.Text = "Super";
this.Tab_Super.UseVisualStyleBackColor = true;
//
// EL_Super
//
this.EL_Super.Dock = System.Windows.Forms.DockStyle.Fill;
this.EL_Super.Location = new System.Drawing.Point(0, 0);
this.EL_Super.Name = "EL_Super";
this.EL_Super.Size = new System.Drawing.Size(313, 400);
this.EL_Super.TabIndex = 12;
//
// Tab_Sky
//
this.Tab_Sky.Controls.Add(this.EL_Sky);
@ -228,14 +188,6 @@ private void InitializeComponent()
this.Tab_Sky.Text = "Sky";
this.Tab_Sky.UseVisualStyleBackColor = true;
//
// EL_Sky
//
this.EL_Sky.Dock = System.Windows.Forms.DockStyle.Fill;
this.EL_Sky.Location = new System.Drawing.Point(0, 0);
this.EL_Sky.Name = "EL_Sky";
this.EL_Sky.Size = new System.Drawing.Size(313, 400);
this.EL_Sky.TabIndex = 12;
//
// Tab_Rand
//
this.Tab_Rand.Controls.Add(this.CHK_ForceType);
@ -424,6 +376,54 @@ private void InitializeComponent()
this.B_Save.UseVisualStyleBackColor = true;
this.B_Save.Click += new System.EventHandler(this.B_Save_Click);
//
// EL_Ground
//
this.EL_Ground.Dock = System.Windows.Forms.DockStyle.Fill;
this.EL_Ground.Location = new System.Drawing.Point(0, 0);
this.EL_Ground.Name = "EL_Ground";
this.EL_Ground.Size = new System.Drawing.Size(313, 400);
this.EL_Ground.TabIndex = 14;
//
// EL_Water
//
this.EL_Water.Dock = System.Windows.Forms.DockStyle.Fill;
this.EL_Water.Location = new System.Drawing.Point(0, 0);
this.EL_Water.Name = "EL_Water";
this.EL_Water.Size = new System.Drawing.Size(313, 400);
this.EL_Water.TabIndex = 13;
//
// EL_Old
//
this.EL_Old.Dock = System.Windows.Forms.DockStyle.Fill;
this.EL_Old.Location = new System.Drawing.Point(0, 0);
this.EL_Old.Name = "EL_Old";
this.EL_Old.Size = new System.Drawing.Size(313, 400);
this.EL_Old.TabIndex = 13;
//
// EL_Good
//
this.EL_Good.Dock = System.Windows.Forms.DockStyle.Fill;
this.EL_Good.Location = new System.Drawing.Point(0, 0);
this.EL_Good.Name = "EL_Good";
this.EL_Good.Size = new System.Drawing.Size(313, 400);
this.EL_Good.TabIndex = 13;
//
// EL_Super
//
this.EL_Super.Dock = System.Windows.Forms.DockStyle.Fill;
this.EL_Super.Location = new System.Drawing.Point(0, 0);
this.EL_Super.Name = "EL_Super";
this.EL_Super.Size = new System.Drawing.Size(313, 400);
this.EL_Super.TabIndex = 12;
//
// EL_Sky
//
this.EL_Sky.Dock = System.Windows.Forms.DockStyle.Fill;
this.EL_Sky.Location = new System.Drawing.Point(0, 0);
this.EL_Sky.Name = "EL_Sky";
this.EL_Sky.Size = new System.Drawing.Size(313, 400);
this.EL_Sky.TabIndex = 12;
//
// GGWE
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -436,6 +436,7 @@ private void InitializeComponent()
this.Controls.Add(this.NUD_RankMax);
this.Controls.Add(this.NUD_RankMin);
this.Controls.Add(this.CB_Location);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.MaximizeBox = false;
this.Name = "GGWE";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

8
pkNX.WinForms/Subforms/GGWE.cs
View File

@ -9,7 +9,7 @@
namespace pkNX.WinForms
{
public partial class GGWE : Form
public sealed partial class GGWE : Form
{
private readonly EncounterArchive Tables;
private readonly GameManager ROM;
@ -19,6 +19,12 @@ public GGWE(GameManager rom, string json)
{
InitializeComponent();
EncounterArchive obj = EncounterArchive.ReadJson(json);
if (obj?.EncounterTables?[0]?.GroundTable == null)
{
WinFormsUtil.Error("Bad json data provided.", $"Unable to parse to {nameof(EncounterArchive)} data.");
Close();
}
ROM = rom;
var spec = rom.GetStrings(TextName.SpeciesNames);

3
pkNX.WinForms/Subforms/GenericEditor.Designer.cs generated
View File

@ -45,6 +45,7 @@ private void InitializeComponent()
//
// B_Save
//
this.B_Save.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.B_Save.Location = new System.Drawing.Point(401, 0);
this.B_Save.Name = "B_Save";
this.B_Save.Size = new System.Drawing.Size(60, 23);
@ -64,6 +65,7 @@ private void InitializeComponent()
//
// B_Dump
//
this.B_Dump.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.B_Dump.Location = new System.Drawing.Point(342, 0);
this.B_Dump.Name = "B_Dump";
this.B_Dump.Size = new System.Drawing.Size(53, 23);
@ -91,6 +93,7 @@ private void InitializeComponent()
this.Controls.Add(this.CB_EntryName);
this.Controls.Add(this.B_Save);
this.Controls.Add(this.Grid);
this.MinimumSize = new System.Drawing.Size(450, 300);
this.Name = "GenericEditor";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "GenericEditor";

1
pkNX.WinForms/Subforms/PokeDataUI.Designer.cs generated
View File

@ -1344,6 +1344,7 @@ private void InitializeComponent()
this.Controls.Add(this.CB_Species);
this.Controls.Add(this.B_Save);
this.Controls.Add(this.tabControl1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.MaximizeBox = false;
this.Name = "PokeDataUI";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

56
pkNX.WinForms/Subforms/TextEditor.designer.cs generated
View File

@ -39,23 +39,23 @@ private void InitializeComponent()
this.B_Save = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.dgv)).BeginInit();
this.SuspendLayout();
//
//
// CB_Entry
//
//
this.CB_Entry.FormattingEnabled = true;
this.CB_Entry.Location = new System.Drawing.Point(68, 7);
this.CB_Entry.Name = "CB_Entry";
this.CB_Entry.Size = new System.Drawing.Size(152, 21);
this.CB_Entry.TabIndex = 5;
this.CB_Entry.SelectedIndexChanged += new System.EventHandler(this.ChangeEntry);
//
//
// dgv
//
//
this.dgv.AllowUserToAddRows = false;
this.dgv.AllowUserToDeleteRows = false;
this.dgv.AllowUserToResizeRows = false;
this.dgv.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
this.dgv.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.dgv.BackgroundColor = System.Drawing.SystemColors.Control;
this.dgv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
@ -65,33 +65,33 @@ private void InitializeComponent()
this.dgv.RowHeadersVisible = false;
this.dgv.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
this.dgv.ShowEditingIcon = false;
this.dgv.Size = new System.Drawing.Size(854, 367);
this.dgv.Size = new System.Drawing.Size(790, 366);
this.dgv.TabIndex = 0;
//
//
// B_AddLine
//
//
this.B_AddLine.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.B_AddLine.Location = new System.Drawing.Point(598, 5);
this.B_AddLine.Location = new System.Drawing.Point(534, 7);
this.B_AddLine.Name = "B_AddLine";
this.B_AddLine.Size = new System.Drawing.Size(90, 23);
this.B_AddLine.TabIndex = 6;
this.B_AddLine.Text = "Add Line After";
this.B_AddLine.UseVisualStyleBackColor = true;
this.B_AddLine.Click += new System.EventHandler(this.B_AddLine_Click);
//
//
// B_RemoveLine
//
//
this.B_RemoveLine.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.B_RemoveLine.Location = new System.Drawing.Point(694, 5);
this.B_RemoveLine.Location = new System.Drawing.Point(630, 7);
this.B_RemoveLine.Name = "B_RemoveLine";
this.B_RemoveLine.Size = new System.Drawing.Size(90, 23);
this.B_RemoveLine.TabIndex = 7;
this.B_RemoveLine.Text = "Remove Line";
this.B_RemoveLine.UseVisualStyleBackColor = true;
this.B_RemoveLine.Click += new System.EventHandler(this.B_RemoveLine_Click);
//
//
// B_Export
//
//
this.B_Export.Location = new System.Drawing.Point(226, 7);
this.B_Export.Name = "B_Export";
this.B_Export.Size = new System.Drawing.Size(90, 23);
@ -99,18 +99,18 @@ private void InitializeComponent()
this.B_Export.Text = "Export All (.txt)";
this.B_Export.UseVisualStyleBackColor = true;
this.B_Export.Click += new System.EventHandler(this.B_Export_Click);
//
//
// label1
//
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(12, 10);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(50, 13);
this.label1.TabIndex = 9;
this.label1.Text = "Text File:";
//
//
// B_Import
//
//
this.B_Import.Location = new System.Drawing.Point(317, 7);
this.B_Import.Name = "B_Import";
this.B_Import.Size = new System.Drawing.Size(90, 23);
@ -118,9 +118,9 @@ private void InitializeComponent()
this.B_Import.Text = "Import All (.txt)";
this.B_Import.UseVisualStyleBackColor = true;
this.B_Import.Click += new System.EventHandler(this.B_Import_Click);
//
//
// B_Randomize
//
//
this.B_Randomize.Location = new System.Drawing.Point(413, 7);
this.B_Randomize.Name = "B_Randomize";
this.B_Randomize.Size = new System.Drawing.Size(70, 23);
@ -128,23 +128,23 @@ private void InitializeComponent()
this.B_Randomize.Text = "Randomize";
this.B_Randomize.UseVisualStyleBackColor = true;
this.B_Randomize.Click += new System.EventHandler(this.B_Randomize_Click);
//
//
// B_Save
//
//
this.B_Save.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.B_Save.Location = new System.Drawing.Point(790, 5);
this.B_Save.Location = new System.Drawing.Point(726, 7);
this.B_Save.Name = "B_Save";
this.B_Save.Size = new System.Drawing.Size(76, 23);
this.B_Save.TabIndex = 12;
this.B_Save.Text = "Save";
this.B_Save.UseVisualStyleBackColor = true;
this.B_Save.Click += new System.EventHandler(this.B_Save_Click);
//
//
// TextEditor
//
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(878, 412);
this.ClientSize = new System.Drawing.Size(814, 411);
this.Controls.Add(this.B_Save);
this.Controls.Add(this.B_Randomize);
this.Controls.Add(this.B_Import);
@ -154,7 +154,7 @@ private void InitializeComponent()
this.Controls.Add(this.B_AddLine);
this.Controls.Add(this.dgv);
this.Controls.Add(this.CB_Entry);
this.MinimumSize = new System.Drawing.Size(650, 300);
this.MinimumSize = new System.Drawing.Size(785, 300);
this.Name = "TextEditor";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Text Editor";