aboutsummaryrefslogtreecommitdiff
path: root/TimeHACK.Main/OS
diff options
context:
space:
mode:
authorAShifter <[email protected]>2017-04-01 20:01:39 -0600
committerGitHub <[email protected]>2017-04-01 20:01:39 -0600
commit4df4250f29c2fb19f547b9a7e28de72b265eb1b1 (patch)
tree3e56fa83746cef51ff7daecaed8d437ff5bb4a17 /TimeHACK.Main/OS
parentef8f165210c792e3e8241b84d555bcaed9b55fd0 (diff)
parent49907c5f3a594ab3b2385d1d7dec8015c19a5aae (diff)
downloadhistacom2-4df4250f29c2fb19f547b9a7e28de72b265eb1b1.tar.gz
histacom2-4df4250f29c2fb19f547b9a7e28de72b265eb1b1.tar.bz2
histacom2-4df4250f29c2fb19f547b9a7e28de72b265eb1b1.zip
Merge pull request #28 from lempamo/master
errors for infoboxes
Diffstat (limited to 'TimeHACK.Main/OS')
-rw-r--r--TimeHACK.Main/OS/Win95/Win95.cs2
-rw-r--r--TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs
index 8efa6d3..85039ef 100644
--- a/TimeHACK.Main/OS/Win95/Win95.cs
+++ b/TimeHACK.Main/OS/Win95/Win95.cs
@@ -201,7 +201,7 @@ namespace TimeHACK.OS.Win95
private void infoboxTestToolStripMenuItem_Click(object sender, EventArgs e)
{
- wm.startInfobox95("AShifter's Infobox", "This is the very first TimeHACK Infobox. It's really easy to call, too! \n Just use wm.startInfobox95(String title, String text)!");
+ wm.startInfobox95("AShifter's Infobox", "This is the very first TimeHACK Infobox. It's really easy to call, too! \n Just use wm.startInfobox95(String title, String text, Image erroricon)!", Properties.Resources.Win95Info);
}
private void WebChatToolStripMenuItem_Click(object sender, EventArgs e)
{
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
index a259fa5..7679c7a 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
@@ -35,13 +35,13 @@ namespace TimeHACK.OS.Win95.Win95Apps
if (txtscreenname.Text == "")
{
WindowManager wm = new WindowManager();
- wm.startInfobox95("Invalid Username", "Your username cannot be blank.");
+ wm.startInfobox95("Invalid Username", "Your username cannot be blank.", Properties.Resources.Win95Warning);
return;
}
else if (txtscreenname.Text.Length > 12)
{
WindowManager wm = new WindowManager();
- wm.startInfobox95("Invalid Username", "Your username needs to be less than 12 characters.");
+ wm.startInfobox95("Invalid Username", "Your username needs to be less than 12 characters.", Properties.Resources.Win95Warning);
return;
}
ParentForm.AcceptButton = button2;