Skip to content

Commit

Permalink
Enabled managing multiple windows
Browse files Browse the repository at this point in the history
  • Loading branch information
Nifyr committed Aug 25, 2022
1 parent 2483574 commit 523a193
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
26 changes: 13 additions & 13 deletions Forms/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ private void OpenNumericDistributionForm(object sender, EventArgs e)
{
NumericDistributionControl ndc = (NumericDistributionControl)((Button)sender).Parent;
NumericDistributionForm form = new(ndc);
form.ShowDialog();
form.Show();
ndc.UpdateTextBox();
}

Expand All @@ -309,7 +309,7 @@ private void OpenItemDistributionForm(object sender, EventArgs e)
{
ItemDistributionControl idc = (ItemDistributionControl)sender;
ItemDistributionForm form = new(idc);
form.ShowDialog();
form.Show();
}

private void DataError(object sender, DataGridViewDataErrorEventArgs e)
Expand Down Expand Up @@ -403,77 +403,77 @@ private void Export(object sender, EventArgs e)
private void OpenPokemonEditor(object sender, EventArgs e)
{
PokemonEditorForm pef = new();
pef.ShowDialog();
pef.Show();
gameData.SetModified(GameDataSet.DataField.PersonalEntries);
}

private void OpenMoveEditor(object sender, EventArgs e)
{
MoveEditorForm mef = new();
mef.ShowDialog();
mef.Show();
gameData.SetModified(GameDataSet.DataField.Moves);
}

private void OpenTMEditor(object sender, EventArgs e)
{
TMEditorForm tmef = new();
tmef.ShowDialog();
tmef.Show();
gameData.SetModified(GameDataSet.DataField.TMs);
gameData.SetModified(GameDataSet.DataField.Items);
}

private void OpenItemEditor(object sender, EventArgs e)
{
ItemEditorForm ief = new();
ief.ShowDialog();
ief.Show();
gameData.SetModified(GameDataSet.DataField.Items);
}

private void OpenPickupEditor(object sender, EventArgs e)
{
PickupEditorForm pef = new();
pef.ShowDialog();
pef.Show();
gameData.SetModified(GameDataSet.DataField.PickupItems);
}

private void OpenShopEditor(object sender, EventArgs e)
{
ShopEditorForm sef = new();
sef.ShowDialog();
sef.Show();
gameData.SetModified(GameDataSet.DataField.ShopTables);
}

private void OpenWildEncounterEditors(object sender, EventArgs e)
{
WildEncounterForm wef = new();
wef.ShowDialog();
wef.Show();
}

private void OpenTrainerEditor(object sender, EventArgs e)
{
TrainerEditorForm tef = new();
tef.ShowDialog();
tef.Show();
gameData.SetModified(GameDataSet.DataField.Trainers);
}

private void OpenTypeMatchupEditor(object sender, EventArgs e)
{
TypeMatchupEditorForm tmef = new();
tmef.ShowDialog();
tmef.Show();
gameData.SetModified(GameDataSet.DataField.GlobalMetadata);
}

private void OpenGlobalMetadataEditor(object sender, EventArgs e)
{
GlobalMetadataEditorForm gmef = new();
gmef.ShowDialog();
gmef.Show();
gameData.SetModified(GameDataSet.DataField.GlobalMetadata);
}

private void OpenPokemonInserter(object sender, EventArgs e)
{
PokemonInserterForm pif = new();
pif.ShowDialog();
pif.Show();
}
}
}
2 changes: 1 addition & 1 deletion Forms/MoveEditorForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ private void OpenAnimationEditor(object sender, EventArgs e)
moveSequences.AddRange(fileManager.GetMoveSequences());
}
MoveAnimationEditorForm maef = new(m, moveSequences);
maef.ShowDialog();
maef.Show();
}
}
}
2 changes: 1 addition & 1 deletion Forms/PokemonEditorForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ private void EggMoveDefaultValuesNeeded(object sender, DataGridViewRowEventArgs
private void OpenEvolutionEditor(object sender, EventArgs e)
{
EvolutionEditorForm eef = new(this);
eef.ShowDialog();
eef.Show();
}
}
}
6 changes: 3 additions & 3 deletions Forms/WildEncounterForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ public WildEncounterForm()
private void OpenEcounterTableEditor(object sender, EventArgs e)
{
EncounterTableEditorForm etef = new();
etef.ShowDialog();
etef.Show();
gameData.SetModified(GameDataSet.DataField.EncounterTableFiles);
}

private void OpenUndergroundEncounterEditor(object sender, EventArgs e)
{
UgEncounterEditorForm ueef = new();
ueef.ShowDialog();
ueef.Show();
gameData.SetModified(GameDataSet.DataField.UgAreas);
gameData.SetModified(GameDataSet.DataField.UgEncounterFiles);
gameData.SetModified(GameDataSet.DataField.UgEncounterLevelSets);
Expand All @@ -38,7 +38,7 @@ private void OpenUndergroundEncounterEditor(object sender, EventArgs e)
private void OpenMiscEncounterEditor(object sender, EventArgs e)
{
MiscEncounterEditorForm meef = new();
meef.ShowDialog();
meef.Show();
gameData.SetModified(GameDataSet.DataField.EncounterTableFiles);
}
}
Expand Down

0 comments on commit 523a193

Please sign in to comment.