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.Designer.cs | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs index 6f4f161..db9a7e9 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs @@ -152,7 +152,6 @@ this.undoToolStripMenuItem.Name = "undoToolStripMenuItem"; this.undoToolStripMenuItem.Size = new System.Drawing.Size(122, 22); this.undoToolStripMenuItem.Text = "Undo"; - this.undoToolStripMenuItem.Click += new System.EventHandler(this.undoToolStripMenuItem_Click); // // toolStripSeparator2 // @@ -164,21 +163,18 @@ this.cutToolStripMenuItem.Name = "cutToolStripMenuItem"; this.cutToolStripMenuItem.Size = new System.Drawing.Size(122, 22); this.cutToolStripMenuItem.Text = "Cut"; - this.cutToolStripMenuItem.Click += new System.EventHandler(this.cutToolStripMenuItem_Click); // // copyToolStripMenuItem // this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; this.copyToolStripMenuItem.Size = new System.Drawing.Size(122, 22); this.copyToolStripMenuItem.Text = "Copy"; - this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click); // // pasteToolStripMenuItem // this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem"; this.pasteToolStripMenuItem.Size = new System.Drawing.Size(122, 22); this.pasteToolStripMenuItem.Text = "Paste"; - this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Click); // // toolStripSeparator3 // @@ -190,14 +186,12 @@ this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; this.clearToolStripMenuItem.Size = new System.Drawing.Size(122, 22); this.clearToolStripMenuItem.Text = "Clear"; - this.clearToolStripMenuItem.Click += new System.EventHandler(this.clearToolStripMenuItem_Click); // // selectAllToolStripMenuItem // this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem"; this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(122, 22); this.selectAllToolStripMenuItem.Text = "Select All"; - this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click); // // viewToolStripMenuItem // @@ -217,7 +211,6 @@ this.toolbarToolStripMenuItem.Name = "toolbarToolStripMenuItem"; this.toolbarToolStripMenuItem.Size = new System.Drawing.Size(132, 22); this.toolbarToolStripMenuItem.Text = "Toolbar"; - this.toolbarToolStripMenuItem.Click += new System.EventHandler(this.toolbarToolStripMenuItem_Click); // // formatBarToolStripMenuItem // @@ -227,7 +220,6 @@ this.formatBarToolStripMenuItem.Name = "formatBarToolStripMenuItem"; this.formatBarToolStripMenuItem.Size = new System.Drawing.Size(132, 22); this.formatBarToolStripMenuItem.Text = "Format Bar"; - this.formatBarToolStripMenuItem.Click += new System.EventHandler(this.formatBarToolStripMenuItem_Click); // // statusBarToolStripMenuItem // @@ -237,7 +229,6 @@ this.statusBarToolStripMenuItem.Name = "statusBarToolStripMenuItem"; this.statusBarToolStripMenuItem.Size = new System.Drawing.Size(132, 22); this.statusBarToolStripMenuItem.Text = "Status Bar"; - this.statusBarToolStripMenuItem.Click += new System.EventHandler(this.statusBarToolStripMenuItem_Click); // // insertToolStripMenuItem // @@ -252,7 +243,6 @@ this.dateTimeToolStripMenuItem.Name = "dateTimeToolStripMenuItem"; this.dateTimeToolStripMenuItem.Size = new System.Drawing.Size(130, 22); this.dateTimeToolStripMenuItem.Text = "Date/Time"; - this.dateTimeToolStripMenuItem.Click += new System.EventHandler(this.dateTimeToolStripMenuItem_Click); // // formatToolStripMenuItem // @@ -330,7 +320,6 @@ this.btnPaste.Size = new System.Drawing.Size(26, 23); this.btnPaste.TabIndex = 1; this.btnPaste.UseVisualStyleBackColor = true; - this.btnPaste.Click += new System.EventHandler(this.btnPaste_Click); // // btnCopy // @@ -341,7 +330,6 @@ this.btnCopy.Size = new System.Drawing.Size(26, 23); this.btnCopy.TabIndex = 1; this.btnCopy.UseVisualStyleBackColor = true; - this.btnCopy.Click += new System.EventHandler(this.btnCopy_Click); // // btnCut // @@ -352,7 +340,6 @@ this.btnCut.Size = new System.Drawing.Size(26, 23); this.btnCut.TabIndex = 1; this.btnCut.UseVisualStyleBackColor = true; - this.btnCut.Click += new System.EventHandler(this.btnCut_Click); // // btnNew // @@ -507,7 +494,7 @@ // // WinClassicWordPad // - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.Color.Silver; this.Controls.Add(this.statusBar); this.Controls.Add(this.mainText); this.Controls.Add(this.pnlFormatBar); -- 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.Designer.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