AM2R-Community-Developers
/
AM2RModPacker
mirror of https://github.com/AM2R-Community-Developers/AM2RModPacker
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make messageboxes have a parent

Browse Source
pull/16/head
Miepee 3 years ago
parent b30c3c6340
commit 2dbda2cd5a
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File

21
Atomic/ModPacker.cs
Unescape View File

@ -13,7 +13,6 @@ namespace Atomic;
public partial class ModPacker : Form public partial class ModPacker : Form
{ {
// TODO: make sure all messageboxes have this form as parent
private const string Version = Core.Version; private const string Version = Core.Version;
private readonly FileFilter apkFileFilter = new FileFilter(Text.APKFileFilter, ".apk"); private readonly FileFilter apkFileFilter = new FileFilter(Text.APKFileFilter, ".apk");
@ -72,7 +71,7 @@ public partial class ModPacker : Form
if (match.Success == false) if (match.Success == false)
{ {
MessageBox.Show(Text.InvalidSaveDirectory); MessageBox.Show(this, Text.InvalidSaveDirectory);
} }
else else
{ {
@ -122,7 +121,7 @@ public partial class ModPacker : Form
} }
else if (macCheckBox.Checked.Value) else if (macCheckBox.Checked.Value)
{ {
MessageBox.Show(Text.YYCMacUnsupported, Text.Warning, MessageBoxButtons.OK, MessageBoxType.Warning); MessageBox.Show(this, Text.YYCMacUnsupported, Text.Warning, MessageBoxButtons.OK, MessageBoxType.Warning);
macCheckBox.Checked = false; macCheckBox.Checked = false;
} }
} }
@ -140,7 +139,7 @@ public partial class ModPacker : Form
// TODO: use string.isnullorwhitespace // TODO: use string.isnullorwhitespace
if (nameTextBox.Text == "" || authorTextBox.Text == "" || versionTextBox.Text == "") if (nameTextBox.Text == "" || authorTextBox.Text == "" || versionTextBox.Text == "")
{ {
MessageBox.Show(Text.FieldsMissing, Text.Error, MessageBoxButtons.OK, MessageBoxType.Error); MessageBox.Show(this, Text.FieldsMissing, Text.Error, MessageBoxButtons.OK, MessageBoxType.Error);
return; return;
} }
@ -150,7 +149,7 @@ public partial class ModPacker : Form
if (Path.GetInvalidFileNameChars().Any(nameTextBox.Text.Contains)) if (Path.GetInvalidFileNameChars().Any(nameTextBox.Text.Contains))
{ {
MessageBox.Show(Text.NameInvalidCharacters + "\n" + String.Join("\n", Path.GetInvalidFileNameChars())); MessageBox.Show(this, Text.NameInvalidCharacters + "\n" + String.Join("\n", Path.GetInvalidFileNameChars()));
return; return;
} }
@ -158,7 +157,7 @@ public partial class ModPacker : Form
IsZipAM2R11ReturnCodes result11 = Core.CheckIfZipIsAM2R11(modInfo.AM2R11Path); IsZipAM2R11ReturnCodes result11 = Core.CheckIfZipIsAM2R11(modInfo.AM2R11Path);
if (result11 != IsZipAM2R11ReturnCodes.Successful) if (result11 != IsZipAM2R11ReturnCodes.Successful)
{ {
MessageBox.Show(Text.AM2R11Invalid + " " + result11); MessageBox.Show(this, Text.AM2R11Invalid + " " + result11);
AbortPatch(); AbortPatch();
return; return;
} }
@ -193,7 +192,7 @@ public partial class ModPacker : Form
} }
catch (Exception exception) catch (Exception exception)
{ {
MessageBox.Show(exception.ToString(), Text.Error, MessageBoxButtons.OK, MessageBoxType.Error); MessageBox.Show(this, exception.ToString(), Text.Error, MessageBoxButtons.OK, MessageBoxType.Error);
AbortPatch(); AbortPatch();
return false; return false;
} }
@ -205,7 +204,7 @@ public partial class ModPacker : Form
{ {
if (zipFile.Entries.All(f => f.Name != "profile.xml")) if (zipFile.Entries.All(f => f.Name != "profile.xml"))
return true; return true;
DialogResult result = MessageBox.Show(Text.ProfileXMLFound, Text.Warning, MessageBoxButtons.YesNo, MessageBoxType.Warning); DialogResult result = MessageBox.Show(this, Text.ProfileXMLFound, Text.Warning, MessageBoxButtons.YesNo, MessageBoxType.Warning);
if (result == DialogResult.Yes) if (result == DialogResult.Yes)
return true; return true;
AbortPatch(); AbortPatch();
@ -219,7 +218,7 @@ public partial class ModPacker : Form
if (windowsZip.Entries.All(f => f.FullName != "AM2R.exe")) if (windowsZip.Entries.All(f => f.FullName != "AM2R.exe"))
{ {
// TODO: make method for these $1 replacements // TODO: make method for these $1 replacements
DialogResult result = MessageBox.Show(Text.ModdedGameNotFound.Replace("$1", Text.Windows), Text.Warning, MessageBoxButtons.YesNo, MessageBoxType.Warning); DialogResult result = MessageBox.Show(this, Text.ModdedGameNotFound.Replace("$1", Text.Windows), Text.Warning, MessageBoxButtons.YesNo, MessageBoxType.Warning);
if (result != DialogResult.Yes) if (result != DialogResult.Yes)
{ {
AbortPatch(); AbortPatch();
@ -239,7 +238,7 @@ public partial class ModPacker : Form
ZipArchive linuxZip = ZipFile.Open(modInfo.LinuxModPath, ZipArchiveMode.Read); ZipArchive linuxZip = ZipFile.Open(modInfo.LinuxModPath, ZipArchiveMode.Read);
if (linuxZip.Entries.All(f => f.FullName != "AM2R") && linuxZip.Entries.All(f => f.FullName != "runner")) if (linuxZip.Entries.All(f => f.FullName != "AM2R") && linuxZip.Entries.All(f => f.FullName != "runner"))
{ {
DialogResult result = MessageBox.Show(Text.ModdedGameNotFound.Replace("$1", Text.Linux), Text.Warning, MessageBoxButtons.YesNo, MessageBoxType.Warning); DialogResult result = MessageBox.Show(this, Text.ModdedGameNotFound.Replace("$1", Text.Linux), Text.Warning, MessageBoxButtons.YesNo, MessageBoxType.Warning);
if (result != DialogResult.Yes) if (result != DialogResult.Yes)
{ {
AbortPatch(); AbortPatch();
@ -259,7 +258,7 @@ public partial class ModPacker : Form
ZipArchive macZip = ZipFile.Open(modInfo.MacModPath, ZipArchiveMode.Read); ZipArchive macZip = ZipFile.Open(modInfo.MacModPath, ZipArchiveMode.Read);
if (macZip.Entries.All(f => f.FullName != "AM2R.app/Contents/MacOS/Mac_Runner")) if (macZip.Entries.All(f => f.FullName != "AM2R.app/Contents/MacOS/Mac_Runner"))
{ {
DialogResult result = MessageBox.Show(Text.ModdedGameNotFound.Replace("$1", Text.Mac), Text.Warning, MessageBoxButtons.YesNo, MessageBoxType.Warning); DialogResult result = MessageBox.Show(this, Text.ModdedGameNotFound.Replace("$1", Text.Mac), Text.Warning, MessageBoxButtons.YesNo, MessageBoxType.Warning);
if (result != DialogResult.Yes) if (result != DialogResult.Yes)
AbortPatch(); AbortPatch();
} }

Write Preview
Loading…
Cancel
Save