From 4a5a6d38a4cfd35e384f30410c7b94e911a1b0c1 Mon Sep 17 00:00:00 2001 From: lempamo Date: Mon, 10 Jul 2017 23:02:08 -0400 Subject: fix up notepad + wordpad --- .../OS/Win95/Win95Apps/WinClassicWordPad.cs | 133 +++------------------ 1 file changed, 17 insertions(+), 116 deletions(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs index 4d2fbf1..e7647dc 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs @@ -42,6 +42,20 @@ namespace TimeHACK.OS.Win95.Win95Apps comboFont.Items.Add(font.Name); } + + this.clearToolStripMenuItem.Click += (sender, args) => mainText.Text = mainText.Text.Remove(mainText.SelectionStart, mainText.SelectedText.Length); + this.pasteToolStripMenuItem.Click += (sender, args) => mainText.Paste(); + this.btnPaste.Click += (sender, args) => mainText.Paste(); + this.btnCopy.Click += (sender, args) => { if (mainText.SelectedText.Length >= 0) mainText.Copy(); }; + this.copyToolStripMenuItem.Click += (sender, args) => { if (mainText.SelectedText.Length >= 0) mainText.Copy(); }; + this.cutToolStripMenuItem.Click += (sender, args) => { if (mainText.SelectedText.Length >= 0) mainText.Cut(); }; + this.btnCut.Click += (sender, args) => { if (mainText.SelectedText.Length >= 0) mainText.Cut(); }; + this.undoToolStripMenuItem.Click += (sender, args) => mainText.Undo(); + this.selectAllToolStripMenuItem.Click += (sender, args) => mainText.SelectAll(); + this.dateTimeToolStripMenuItem.Click += (sender, args) => mainText.AppendText(DateTime.Now.ToString("HH:mm tt dd/MM/yyyy")); + this.toolbarToolStripMenuItem.Click += (sender, args) => pnlToolbar.Visible = toolbarToolStripMenuItem.Checked; + this.formatBarToolStripMenuItem.Click += (sender, args) => pnlFormatBar.Visible = formatBarToolStripMenuItem.Checked; + this.statusBarToolStripMenuItem.Click += (sender, args) => statusBar.Visible = statusBarToolStripMenuItem.Checked; } #region Format_Buttons @@ -96,24 +110,6 @@ namespace TimeHACK.OS.Win95.Win95Apps #endregion #region Designer-Stuff - private void dateTimeToolStripMenuItem_Click(object sender, EventArgs e) - { - InsertDateTime(); - } - private void toolbarToolStripMenuItem_Click(object sender, EventArgs e) - { - pnlToolbar.Visible = toolbarToolStripMenuItem.Checked; - } - - private void formatBarToolStripMenuItem_Click(object sender, EventArgs e) - { - pnlFormatBar.Visible = formatBarToolStripMenuItem.Checked; - } - - private void statusBarToolStripMenuItem_Click(object sender, EventArgs e) - { - statusBar.Visible = statusBarToolStripMenuItem.Checked; - } private void exitToolStripMenuItem_Click(object sender, EventArgs e) { @@ -140,81 +136,6 @@ namespace TimeHACK.OS.Win95.Win95Apps wm.StartInfobox95("Wordpad", "An error occured opening send option.", null); } - void Cut() - { - if (mainText.SelectedText.Length >= 0) { - mainText.Cut(); - } - } - - void Copy() - { - if (mainText.SelectedText.Length >= 0) - { - mainText.Copy(); - } - } - - void Paste() - { - mainText.Paste(); - } - - void Clear() - { - mainText.Text = mainText.Text.Remove(mainText.SelectionStart, mainText.SelectedText.Length); - } - - void SelectAll() - { - mainText.SelectAll(); - } - - private void undoToolStripMenuItem_Click(object sender, EventArgs e) - { - Undo(); - } - - private void cutToolStripMenuItem_Click(object sender, EventArgs e) - { - Cut(); - } - - private void copyToolStripMenuItem_Click(object sender, EventArgs e) - { - Copy(); - } - - private void pasteToolStripMenuItem_Click(object sender, EventArgs e) - { - Paste(); - } - - private void selectAllToolStripMenuItem_Click(object sender, EventArgs e) - { - SelectAll(); - } - - private void clearToolStripMenuItem_Click(object sender, EventArgs e) - { - Clear(); - } - - private void btnCut_Click(object sender, EventArgs e) - { - Cut(); - } - - private void btnCopy_Click(object sender, EventArgs e) - { - Copy(); - } - - private void btnPaste_Click(object sender, EventArgs e) - { - Paste(); - } - private void bulletStyleToolStripMenuItem_Click(object sender, EventArgs e) { mainText.SelectionBullet = bulletStyleToolStripMenuItem.Checked; @@ -265,17 +186,6 @@ namespace TimeHACK.OS.Win95.Win95Apps mainText.Text = ""; } - void Undo() - { - mainText.Undo(); - } - - void InsertDateTime() - { - string DateTime = System.DateTime.Now.ToString("HH:mm tt dd/MM/yyyy"); - mainText.AppendText(DateTime); - } - // Things for Cut/Copy/Paste have been placed in the "Designer-Stuff" region! void SetSelectedTextFont(String font) @@ -300,18 +210,9 @@ namespace TimeHACK.OS.Win95.Win95Apps FontStyle Bold = FontStyle.Regular; FontStyle Italic = FontStyle.Regular; FontStyle Underline = FontStyle.Regular; - if (doBold == true) - { - Bold = FontStyle.Bold; - } - if (doItalic == true) - { - Italic = FontStyle.Italic; - } - if (doUnderline == true) - { - Underline = FontStyle.Underline; - } + if (doBold == true) Bold = FontStyle.Bold; + if (doItalic == true) Italic = FontStyle.Italic; + if (doUnderline == true)Underline = FontStyle.Underline; mainText.SelectionFont = new Font(mainText.SelectionFont.FontFamily, mainText.SelectionFont.Size, Bold | Italic | Underline); } } -- cgit v1.2.3 From 9065529f5cb1125b437367fec76ef19027207ad4 Mon Sep 17 00:00:00 2001 From: lempamo Date: Tue, 11 Jul 2017 18:15:43 -0400 Subject: fixed up wordpad a bit more --- .../Win95/Win95Apps/WinClassicWordPad.Designer.cs | 8 --- .../OS/Win95/Win95Apps/WinClassicWordPad.cs | 59 +++++----------------- 2 files changed, 12 insertions(+), 55 deletions(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs index db9a7e9..465e375 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs @@ -111,7 +111,6 @@ this.newToolStripMenuItem.Name = "newToolStripMenuItem"; this.newToolStripMenuItem.Size = new System.Drawing.Size(109, 22); this.newToolStripMenuItem.Text = "New"; - this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click); // // toolStripSeparator1 // @@ -123,14 +122,12 @@ this.sendToolStripMenuItem.Name = "sendToolStripMenuItem"; this.sendToolStripMenuItem.Size = new System.Drawing.Size(109, 22); this.sendToolStripMenuItem.Text = "Send..."; - this.sendToolStripMenuItem.Click += new System.EventHandler(this.sendToolStripMenuItem_Click); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.Size = new System.Drawing.Size(109, 22); this.exitToolStripMenuItem.Text = "Exit"; - this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // // editToolStripMenuItem // @@ -258,7 +255,6 @@ this.bulletStyleToolStripMenuItem.Name = "bulletStyleToolStripMenuItem"; this.bulletStyleToolStripMenuItem.Size = new System.Drawing.Size(131, 22); this.bulletStyleToolStripMenuItem.Text = "Bullet style"; - this.bulletStyleToolStripMenuItem.Click += new System.EventHandler(this.bulletStyleToolStripMenuItem_Click); // // helpToolStripMenuItem // @@ -286,7 +282,6 @@ this.aboutWordpadToolStripMenuItem.Name = "aboutWordpadToolStripMenuItem"; this.aboutWordpadToolStripMenuItem.Size = new System.Drawing.Size(159, 22); this.aboutWordpadToolStripMenuItem.Text = "About Wordpad"; - this.aboutWordpadToolStripMenuItem.Click += new System.EventHandler(this.aboutWordpadToolStripMenuItem_Click); // // mainText // @@ -350,7 +345,6 @@ this.btnNew.Size = new System.Drawing.Size(26, 23); this.btnNew.TabIndex = 1; this.btnNew.UseVisualStyleBackColor = true; - this.btnNew.Click += new System.EventHandler(this.btnNew_Click); // // pictureBox1 // @@ -404,7 +398,6 @@ this.comboSize.Size = new System.Drawing.Size(50, 21); this.comboSize.TabIndex = 1; this.comboSize.Text = "12"; - this.comboSize.SelectedIndexChanged += new System.EventHandler(this.comboSize_SelectedIndexChanged); // // comboFont // @@ -414,7 +407,6 @@ this.comboFont.Size = new System.Drawing.Size(145, 21); this.comboFont.TabIndex = 1; this.comboFont.Text = "Arial"; - this.comboFont.SelectedIndexChanged += new System.EventHandler(this.comboFont_SelectedIndexChanged); // // pictureBox2 // diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs index e7647dc..bf0cb16 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs @@ -43,6 +43,7 @@ namespace TimeHACK.OS.Win95.Win95Apps comboFont.Items.Add(font.Name); } + // Handlers this.clearToolStripMenuItem.Click += (sender, args) => mainText.Text = mainText.Text.Remove(mainText.SelectionStart, mainText.SelectedText.Length); this.pasteToolStripMenuItem.Click += (sender, args) => mainText.Paste(); this.btnPaste.Click += (sender, args) => mainText.Paste(); @@ -56,6 +57,14 @@ namespace TimeHACK.OS.Win95.Win95Apps this.toolbarToolStripMenuItem.Click += (sender, args) => pnlToolbar.Visible = toolbarToolStripMenuItem.Checked; this.formatBarToolStripMenuItem.Click += (sender, args) => pnlFormatBar.Visible = formatBarToolStripMenuItem.Checked; this.statusBarToolStripMenuItem.Click += (sender, args) => statusBar.Visible = statusBarToolStripMenuItem.Checked; + this.exitToolStripMenuItem.Click += (sender, args) => ((Form)this.TopLevelControl).Close(); + this.aboutWordpadToolStripMenuItem.Click += (sender, args) => wm.StartAboutBox95("Wordpad", "Microsoft Wordpad", Properties.Resources.Win95IconWordpad); + this.btnNew.Click += (sender, args) => mainText.Text = ""; + this.newToolStripMenuItem.Click += (sender, args) => mainText.Text = ""; + this.sendToolStripMenuItem.Click += (sender, args) => wm.StartInfobox95("Wordpad", "An error occured opening send option.", null); + this.bulletStyleToolStripMenuItem.Click += (sender, args) => mainText.SelectionBullet = bulletStyleToolStripMenuItem.Checked; + this.comboFont.SelectedIndexChanged += (sender, args) => SetSelectedTextFont(comboFont.Text); + this.comboSize.SelectedIndexChanged += (sender, args) => SetSelectedTextSize(comboSize.Text); } #region Format_Buttons @@ -110,46 +119,7 @@ namespace TimeHACK.OS.Win95.Win95Apps #endregion #region Designer-Stuff - - private void exitToolStripMenuItem_Click(object sender, EventArgs e) - { - ((Form)this.TopLevelControl).Close(); - } - - private void aboutWordpadToolStripMenuItem_Click(object sender, EventArgs e) - { - wm.StartAboutBox95("Wordpad", "Microsoft Wordpad", Properties.Resources.Win95IconWordpad); - } - - private void newToolStripMenuItem_Click(object sender, EventArgs e) - { - NewFile(); - } - - private void btnNew_Click(object sender, EventArgs e) - { - NewFile(); - } - - private void sendToolStripMenuItem_Click(object sender, EventArgs e) - { - wm.StartInfobox95("Wordpad", "An error occured opening send option.", null); - } - - private void bulletStyleToolStripMenuItem_Click(object sender, EventArgs e) - { - mainText.SelectionBullet = bulletStyleToolStripMenuItem.Checked; - } - - private void comboFont_SelectedIndexChanged(object sender, EventArgs e) - { - SetSelectedTextFont(comboFont.Text); - } - - private void comboSize_SelectedIndexChanged(object sender, EventArgs e) - { - SetSelectedTextSize(comboSize.Text); - } + private void btnBold_MouseEnter(object sender, EventArgs e) { lblStatus.Text = "Makes the selected text Bold. (toggle)"; @@ -181,14 +151,9 @@ namespace TimeHACK.OS.Win95.Win95Apps } #endregion - void NewFile() - { - mainText.Text = ""; - } - // Things for Cut/Copy/Paste have been placed in the "Designer-Stuff" region! - void SetSelectedTextFont(String font) + void SetSelectedTextFont(string font) { // The next two lines convert a String to a Font var cvt = new FontConverter(); @@ -197,7 +162,7 @@ namespace TimeHACK.OS.Win95.Win95Apps mainText.SelectionFont = f; } - void SetSelectedTextSize(String size) + void SetSelectedTextSize(string size) { // The next few lines will ATTEMPT to convert a String to an Integer int SizeInt = Convert.ToInt32(size); -- cgit v1.2.3 From 264deb3774935da3faba95fef55a94227e3f2368 Mon Sep 17 00:00:00 2001 From: JayXKanz666 Date: Thu, 13 Jul 2017 16:46:24 +0200 Subject: Fixed type names -`String` replaced with `string` -`Boolean` replaced with `bool` --- TimeHACK.Engine/FileDialogBoxManager.cs | 12 +-- TimeHACK.Engine/Template/WinClassic.cs | 2 +- TimeHACK.Engine/WindowManager.cs | 6 +- TimeHACK.Main/OS/Win95/Win95.Designer.cs | 1 + TimeHACK.Main/OS/Win95/Win95.cs | 2 +- TimeHACK.Main/OS/Win95/Win95.resx | 86 +++++++-------- .../FRMWinClassicAddressBookNewContact.cs | 2 +- .../Win95Apps/AddressBook/WinClassicAddressBook.cs | 4 +- .../OS/Win95/Win95Apps/IE4Sites/IE4Start.resx | 120 +++++++++++++++++++++ .../OS/Win95/Win95Apps/WinClassicTerminal.cs | 2 +- .../Win95/Win95Apps/WinClassicWindowsExplorer.cs | 24 ++--- .../OS/Win95/Win95Apps/WinClassicWordPad.cs | 4 +- TimeHACK.Main/OS/Win98/Win98.cs | 2 +- TimeHACK.Main/Program.cs | 4 +- TimeHACK.Main/Properties/Resources.resx | 6 +- TimeHACK.Main/Resources/msdosprompt.png | Bin 0 -> 41974 bytes TimeHACK.Main/SaveDialogs/LoadGameDialog.cs | 2 +- TimeHACK.Main/SaveDialogs/LoadGameProfileItem.cs | 6 +- TimeHACK.Main/SaveDialogs/NewGameDialog.cs | 2 +- .../SaveDialogs/SaveFileTroubleShooter.cs | 6 +- TimeHACK.Main/TimeHACK.Main.csproj | 1 + TimeHACK.Main/TitleScreen.cs | 2 +- 22 files changed, 209 insertions(+), 87 deletions(-) create mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.resx create mode 100644 TimeHACK.Main/Resources/msdosprompt.png (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs') diff --git a/TimeHACK.Engine/FileDialogBoxManager.cs b/TimeHACK.Engine/FileDialogBoxManager.cs index 334ebdd..f6d30ae 100644 --- a/TimeHACK.Engine/FileDialogBoxManager.cs +++ b/TimeHACK.Engine/FileDialogBoxManager.cs @@ -10,24 +10,24 @@ namespace TimeHACK.Engine { public static class FileDialogBoxManager { - public static Boolean IsInOpenDialog = false; - public static Boolean IsInSaveDialog = false; - public static String OnlyViewExtension = ""; - public static void ActivateOpenFileDialog(String ExtensionToView) + public static bool IsInOpenDialog = false; + public static bool IsInSaveDialog = false; + public static string OnlyViewExtension = ""; + public static void ActivateOpenFileDialog(string ExtensionToView) { IsInOpenDialog = true; IsInSaveDialog = false; OnlyViewExtension = ExtensionToView; } - public static void ActivateSaveFileDialog(String ExtensionToView) + public static void ActivateSaveFileDialog(string ExtensionToView) { IsInOpenDialog = false; IsInSaveDialog = true; OnlyViewExtension = ExtensionToView; } - public static String ReadTextFile(String path) + public static string ReadTextFile(string path) { try { diff --git a/TimeHACK.Engine/Template/WinClassic.cs b/TimeHACK.Engine/Template/WinClassic.cs index f5737aa..554d6be 100644 --- a/TimeHACK.Engine/Template/WinClassic.cs +++ b/TimeHACK.Engine/Template/WinClassic.cs @@ -39,7 +39,7 @@ namespace TimeHACK.Engine.Template if (!closeDisabled) this.Close(); } - public Boolean max = false; + public bool max = false; private void maximizebutton_Click(object sender, EventArgs e) { diff --git a/TimeHACK.Engine/WindowManager.cs b/TimeHACK.Engine/WindowManager.cs index 9e96673..156da2f 100644 --- a/TimeHACK.Engine/WindowManager.cs +++ b/TimeHACK.Engine/WindowManager.cs @@ -10,7 +10,7 @@ namespace TimeHACK.Engine { public static System.Drawing.Text.PrivateFontCollection pfc = new System.Drawing.Text.PrivateFontCollection(); - public WinClassic StartWin95(UserControl content, String title, Image icon, Boolean MaxButton, Boolean MinButton, Boolean ShowApplicationAsDialog = false) + public WinClassic StartWin95(UserControl content, string title, Image icon, bool MaxButton, bool MinButton, bool ShowApplicationAsDialog = false) { // Setup Window WinClassic app = new WinClassic(); @@ -72,7 +72,7 @@ namespace TimeHACK.Engine return app; } - public WinClassic StartInfobox95(String title, String text, Image erroricon) + public WinClassic StartInfobox95(string title, string text, Image erroricon) { Infobox95 app = new Infobox95(); app.infoText.Text = text; @@ -82,7 +82,7 @@ namespace TimeHACK.Engine return StartWin95(app, title, null, false, false); } - public WinClassic StartAboutBox95(String shortname, String longname, Image appicon) + public WinClassic StartAboutBox95(string shortname, string longname, Image appicon) { AboutBox95 uc = new AboutBox95(); uc.pictureBox1.Image = appicon; diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index 144b0c9..15f4feb 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -717,6 +717,7 @@ namespace TimeHACK.OS.Win95 this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.WebChatToolStripMenuItem.Text = "Web Chat"; this.WebChatToolStripMenuItem.Visible = false; + this.WebChatToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click); // // TimeDistorterToolStripMenuItem // diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index a170f7f..d681c58 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -289,7 +289,7 @@ namespace TimeHACK.OS.Win95 private void infoboxTestToolStripMenuItem_Click(object sender, EventArgs e) { - WinClassic app = 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); + WinClassic app = 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); app.BringToFront(); startmenu.Hide(); diff --git a/TimeHACK.Main/OS/Win95/Win95.resx b/TimeHACK.Main/OS/Win95/Win95.resx index ec161c8..ba695aa 100644 --- a/TimeHACK.Main/OS/Win95/Win95.resx +++ b/TimeHACK.Main/OS/Win95/Win95.resx @@ -121,6 +121,48 @@ 17, 17 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ + 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME + Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu + QmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN + upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9 + NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j + Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I + gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m + M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu + QmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh + EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK + 6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAALRJREFUOE+N @@ -264,41 +306,6 @@ DsAgCAN9Ok/zZ4yiEINsMkkKRNezWWNmlZSM84wabVwyEX3ODNLCZXWiyUrsgEr13h2gZlmvAGZGKQAX VRlAzfcJIAB+/gMiM5smIMbMBLO8uUMqCcxsOzww4/AIiGZ7eR4OQBYZ2uIGswOyWj72ArQMyOoVsMY+ aQNok1HVambm9gBAYeI/oBSQZwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ - 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME - Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu - QmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN - upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9 - NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j - Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I - gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m - M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu - QmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh - EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK - 6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC @@ -334,13 +341,6 @@ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= @@ -382,7 +382,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq - ggAAAk1TRnQBSQFMAgEBDAEAAZgBAQGYAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + ggAAAk1TRnQBSQFMAgEBDAEAAbABAQGwAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA AwABgAMAAQEBAAEgBwABAf8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AXAAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/x8AAf8DAAH/ diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs index fe75e83..482d54c 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs @@ -57,7 +57,7 @@ namespace TimeHACK.OS.Win95.Win95Apps txtLast.Text = toSet.LastName; if (toSet.Emails != null) { - foreach (String email in toSet.Emails) + foreach (string email in toSet.Emails) { emails.Items.Add(email); } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs index 24404bf..95ee509 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs @@ -282,12 +282,12 @@ namespace TimeHACK.OS.Win95.Win95Apps public string FirstName; public string MiddleName; public string LastName; - public List Emails = new List(); + public List Emails = new List(); } public class AddressBookContactList { - public String AttachedNode; + public string AttachedNode; public List Contacts = new List(); } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.resx b/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs index 70cd0f9..a754ed0 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs @@ -71,7 +71,7 @@ namespace TimeHACK.OS.Win95.Win95Apps /// Write text to the Terminal. Very similar to the Win32 Console.Write Function. /// /// - public void Write(String Text) + public void Write(string Text) { cmdPrompt.AppendText(Text); cmdPrompt.Update(); diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs index e4f98ff..98dc4ff 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs @@ -45,9 +45,9 @@ namespace TimeHACK.OS.Win95.Win95Apps //' Next //'End Sub - String ReadDataFile(String reqDirectory, Boolean returnYesIfProtected = false) { - String Val = ""; - String directoryFileInfo; + string ReadDataFile(string reqDirectory, bool returnYesIfProtected = false) { + string Val = ""; + string directoryFileInfo; directoryFileInfo = File.ReadAllText(Path.Combine(reqDirectory, "_data.info")); FileSystemFolderInfo toRead = new FileSystemFolderInfo(); toRead = JsonConvert.DeserializeObject(directoryFileInfo); @@ -70,14 +70,14 @@ namespace TimeHACK.OS.Win95.Win95Apps try { // Refresh the right listview this.mainView.Items.Clear(); - // For Each drive As String In My.Computer.FileSystem.GetDirectories(GameMain.MyDocuments & "\HistacomVB\" & GameMain.SaveProfile & "\HistacomVB\Folders") + // For Each drive As string In My.Computer.FileSystem.GetDirectories(GameMain.MyDocuments & "\HistacomVB\" & GameMain.SaveProfile & "\HistacomVB\Folders") // If GetPropetiesForDir(drive)(4) = "isMyDocuments" Then // diskView.Items.Add("", 0) // End If //Next - foreach (String str in Directory.GetDirectories(currentDirectory)) + foreach (string str in Directory.GetDirectories(currentDirectory)) { - String label = ReadDataFile(str, false); + string label = ReadDataFile(str, false); if (label == "") { this.mainView.Items.Add(Path.GetFileName(str)); @@ -87,7 +87,7 @@ namespace TimeHACK.OS.Win95.Win95Apps this.mainView.FindItemWithText(label).Tag = Path.GetFileName(str); } } - foreach (String str in Directory.GetFiles(currentDirectory)) + foreach (string str in Directory.GetFiles(currentDirectory)) { // Get app Icon @@ -96,7 +96,7 @@ namespace TimeHACK.OS.Win95.Win95Apps switch (new FileInfo(str).Extension) { case ".exe": - String contents; + string contents; contents = File.ReadAllText(str); @@ -492,7 +492,7 @@ namespace TimeHACK.OS.Win95.Win95Apps { try { - if ((String)mainView.FocusedItem.Tag != "") { // If it isn't a file + if ((string)mainView.FocusedItem.Tag != "") { // If it isn't a file GoToDir(currentDirectory + "\\" + mainView.FocusedItem.Tag); } else { // If it is a file if (new FileInfo(Path.Combine(currentDirectory, txtSave.Text)).Extension == onlyViewExtension) @@ -547,10 +547,10 @@ namespace TimeHACK.OS.Win95.Win95Apps { try { - Boolean OpenFile = false; + bool OpenFile = false; if (mainView.FocusedItem != null) { - if ((String)mainView.FocusedItem.Tag != "") + if ((string)mainView.FocusedItem.Tag != "") { // If it isn't a file GoToDir(currentDirectory + "\\" + mainView.FocusedItem.Tag); } @@ -632,7 +632,7 @@ namespace TimeHACK.OS.Win95.Win95Apps private void mainView_AfterLabelEdit(object sender, LabelEditEventArgs e) { - String setText; + string setText; setText = mainView.FocusedItem.Text; if (setText == "") { diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs index bf0cb16..2453abc 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs @@ -155,7 +155,7 @@ namespace TimeHACK.OS.Win95.Win95Apps void SetSelectedTextFont(string font) { - // The next two lines convert a String to a Font + // The next two lines convert a string to a Font var cvt = new FontConverter(); Font f = cvt.ConvertFromString(font) as Font; @@ -164,7 +164,7 @@ namespace TimeHACK.OS.Win95.Win95Apps void SetSelectedTextSize(string size) { - // The next few lines will ATTEMPT to convert a String to an Integer + // The next few lines will ATTEMPT to convert a string to an Integer int SizeInt = Convert.ToInt32(size); mainText.SelectionFont = new Font(mainText.SelectionFont.FontFamily, SizeInt, mainText.SelectionFont.Style); diff --git a/TimeHACK.Main/OS/Win98/Win98.cs b/TimeHACK.Main/OS/Win98/Win98.cs index a249ba3..d65a9ed 100644 --- a/TimeHACK.Main/OS/Win98/Win98.cs +++ b/TimeHACK.Main/OS/Win98/Win98.cs @@ -261,7 +261,7 @@ namespace TimeHACK.OS.Win98 private void infoboxTestToolStripMenuItem_Click(object sender, EventArgs e) { - WinClassic app = 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); + WinClassic app = 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); app.BringToFront(); startmenu.Hide(); diff --git a/TimeHACK.Main/Program.cs b/TimeHACK.Main/Program.cs index e2a4be6..3f8d10c 100644 --- a/TimeHACK.Main/Program.cs +++ b/TimeHACK.Main/Program.cs @@ -51,7 +51,7 @@ namespace TimeHACK //TimeHACK.Engine.GameSave.SaveData MySaveData = new TimeHACK.Engine.GameSave.SaveData() //{ // OS = 60, - // MyStringList = new List + // MystringList = new List // { // "Item1", // "Item2" @@ -69,7 +69,7 @@ namespace TimeHACK Application.Run(title); } - public static String OpenFileExplorerAsDialogAndReturnGivenPath() + public static string OpenFileExplorerAsDialogAndReturnGivenPath() { WinClassicWindowsExplorer we = new WinClassicWindowsExplorer(); diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx index bf5c1c6..6cf824c 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -456,9 +456,6 @@ ..\resources\winclassic\winclassicstart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\MS-DOS-logo-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\winclassic\winclassictaskbaritem.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -603,4 +600,7 @@ ..\Resources\IE4\start_padamslink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\msdosprompt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/TimeHACK.Main/Resources/msdosprompt.png b/TimeHACK.Main/Resources/msdosprompt.png new file mode 100644 index 0000000..2f3fe85 Binary files /dev/null and b/TimeHACK.Main/Resources/msdosprompt.png differ diff --git a/TimeHACK.Main/SaveDialogs/LoadGameDialog.cs b/TimeHACK.Main/SaveDialogs/LoadGameDialog.cs index b31bc50..89e875e 100644 --- a/TimeHACK.Main/SaveDialogs/LoadGameDialog.cs +++ b/TimeHACK.Main/SaveDialogs/LoadGameDialog.cs @@ -14,7 +14,7 @@ namespace TimeHACK { public partial class LoadGameDialog : Form { - public Boolean successful = false; + public bool successful = false; public LoadGameDialog() { InitializeComponent(); diff --git a/TimeHACK.Main/SaveDialogs/LoadGameProfileItem.cs b/TimeHACK.Main/SaveDialogs/LoadGameProfileItem.cs index 5e1ccf4..10d1a25 100644 --- a/TimeHACK.Main/SaveDialogs/LoadGameProfileItem.cs +++ b/TimeHACK.Main/SaveDialogs/LoadGameProfileItem.cs @@ -14,9 +14,9 @@ namespace TimeHACK { public partial class LoadGameProfileItem : UserControl, IMessageFilter { - public Boolean OnceRemoveHeight = false; - public Boolean OnceAddHeight = false; - public Boolean RequestingNewName = false; + public bool OnceRemoveHeight = false; + public bool OnceAddHeight = false; + public bool RequestingNewName = false; public LoadGameProfileItem() { InitializeComponent(); diff --git a/TimeHACK.Main/SaveDialogs/NewGameDialog.cs b/TimeHACK.Main/SaveDialogs/NewGameDialog.cs index 0e6f346..e9af8cb 100644 --- a/TimeHACK.Main/SaveDialogs/NewGameDialog.cs +++ b/TimeHACK.Main/SaveDialogs/NewGameDialog.cs @@ -16,7 +16,7 @@ namespace TimeHACK { public partial class NewGameDialog : Form { - public Boolean Successful = false; + public bool Successful = false; public NewGameDialog() { InitializeComponent(); diff --git a/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs b/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs index 4ada932..bcd60d1 100644 --- a/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs +++ b/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs @@ -14,9 +14,9 @@ namespace TimeHACK.SaveDialogs { public partial class SaveFileTroubleShooter : Form { - public String log; + public string log; Save savedata = new Save(); - String json; + string json; public SaveFileTroubleShooter() { InitializeComponent(); @@ -32,7 +32,7 @@ namespace TimeHACK.SaveDialogs BeginScan(); } - void WriteToLog(String toWrite) + void WriteToLog(string toWrite) { log += toWrite + Environment.NewLine; } diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index dca45e5..6533e05 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -471,6 +471,7 @@ + diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs index 1b7d006..d13fd90 100644 --- a/TimeHACK.Main/TitleScreen.cs +++ b/TimeHACK.Main/TitleScreen.cs @@ -31,7 +31,7 @@ namespace TimeHACK // Border stuff - public Boolean max = false; + public bool max = false; public const int WM_NCLBUTTONDOWN = 0xA1; public const int HT_CAPTION = 0x2; -- cgit v1.2.3