From 1f59dd91abdfc0a320e60cfcad2ef2917af7ddcf Mon Sep 17 00:00:00 2001 From: lempamo Date: Mon, 14 Aug 2017 13:13:53 -0400 Subject: wordpad gui improvement part 1 --- .../Win95Apps/WinClassicCalculator.Designer.cs | 646 --------------------- .../OS/Win95/Win95Apps/WinClassicCalculator.cs | 175 ------ .../OS/Win95/Win95Apps/WinClassicCalculator.resx | 126 ---- .../Win95/Win95Apps/WinClassicWordPad.Designer.cs | 243 ++++++-- .../OS/Win95/Win95Apps/WinClassicWordPad.cs | 57 +- .../OS/Win95/Win95Apps/WinClassicWordPad.resx | 3 + 6 files changed, 207 insertions(+), 1043 deletions(-) delete mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.Designer.cs delete mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.cs delete mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.resx (limited to 'TimeHACK.Main/OS') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.Designer.cs deleted file mode 100644 index 70ad0a2..0000000 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.Designer.cs +++ /dev/null @@ -1,646 +0,0 @@ -namespace TimeHACK.OS.Win95.Win95Apps -{ - partial class WinClassicCalculator - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - this.timer1 = new System.Windows.Forms.Timer(this.components); - this.HelpToolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem(); - this.AboutCalculatorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.StandardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ScientificToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.HelpToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); - this.PasteCtrlVToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.CopyCtrlCToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.EditToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.txtNumbers = new System.Windows.Forms.TextBox(); - this.Button27 = new System.Windows.Forms.Button(); - this.Button26 = new System.Windows.Forms.Button(); - this.Button1 = new System.Windows.Forms.Button(); - this.Button25 = new System.Windows.Forms.Button(); - this.Button2 = new System.Windows.Forms.Button(); - this.Button21 = new System.Windows.Forms.Button(); - this.Button3 = new System.Windows.Forms.Button(); - this.Button22 = new System.Windows.Forms.Button(); - this.Button4 = new System.Windows.Forms.Button(); - this.Button23 = new System.Windows.Forms.Button(); - this.Button11 = new System.Windows.Forms.Button(); - this.Button7 = new System.Windows.Forms.Button(); - this.Button16 = new System.Windows.Forms.Button(); - this.Button24 = new System.Windows.Forms.Button(); - this.Button12 = new System.Windows.Forms.Button(); - this.one = new System.Windows.Forms.Button(); - this.Button15 = new System.Windows.Forms.Button(); - this.Button17 = new System.Windows.Forms.Button(); - this.Button13 = new System.Windows.Forms.Button(); - this.Button5 = new System.Windows.Forms.Button(); - this.Button14 = new System.Windows.Forms.Button(); - this.Button18 = new System.Windows.Forms.Button(); - this.Button8 = new System.Windows.Forms.Button(); - this.Button10 = new System.Windows.Forms.Button(); - this.Button20 = new System.Windows.Forms.Button(); - this.Button19 = new System.Windows.Forms.Button(); - this.Button9 = new System.Windows.Forms.Button(); - this.MenuStrip2 = new System.Windows.Forms.MenuStrip(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.MenuStrip2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - this.SuspendLayout(); - // - // timer1 - // - this.timer1.Interval = 1; - // - // HelpToolStripMenuItem3 - // - this.HelpToolStripMenuItem3.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.AboutCalculatorToolStripMenuItem}); - this.HelpToolStripMenuItem3.Name = "HelpToolStripMenuItem3"; - this.HelpToolStripMenuItem3.Size = new System.Drawing.Size(41, 20); - this.HelpToolStripMenuItem3.Text = "Help"; - // - // AboutCalculatorToolStripMenuItem - // - this.AboutCalculatorToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.AboutCalculatorToolStripMenuItem.Name = "AboutCalculatorToolStripMenuItem"; - this.AboutCalculatorToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.AboutCalculatorToolStripMenuItem.Text = "About Calculator"; - this.AboutCalculatorToolStripMenuItem.Click += new System.EventHandler(this.AboutCalculatorToolStripMenuItem_Click); - // - // StandardToolStripMenuItem - // - this.StandardToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.StandardToolStripMenuItem.Name = "StandardToolStripMenuItem"; - this.StandardToolStripMenuItem.Size = new System.Drawing.Size(117, 22); - this.StandardToolStripMenuItem.Text = "Standard"; - // - // ScientificToolStripMenuItem - // - this.ScientificToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.ScientificToolStripMenuItem.Name = "ScientificToolStripMenuItem"; - this.ScientificToolStripMenuItem.Size = new System.Drawing.Size(117, 22); - this.ScientificToolStripMenuItem.Text = "Scientific"; - // - // HelpToolStripMenuItem2 - // - this.HelpToolStripMenuItem2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ScientificToolStripMenuItem, - this.StandardToolStripMenuItem}); - this.HelpToolStripMenuItem2.Name = "HelpToolStripMenuItem2"; - this.HelpToolStripMenuItem2.Size = new System.Drawing.Size(42, 20); - this.HelpToolStripMenuItem2.Text = "View"; - // - // PasteCtrlVToolStripMenuItem1 - // - this.PasteCtrlVToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; - this.PasteCtrlVToolStripMenuItem1.Name = "PasteCtrlVToolStripMenuItem1"; - this.PasteCtrlVToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); - this.PasteCtrlVToolStripMenuItem1.Text = "Paste Ctrl+V"; - this.PasteCtrlVToolStripMenuItem1.Click += new System.EventHandler(this.PasteCtrlVToolStripMenuItem1_Click); - // - // CopyCtrlCToolStripMenuItem1 - // - this.CopyCtrlCToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; - this.CopyCtrlCToolStripMenuItem1.Name = "CopyCtrlCToolStripMenuItem1"; - this.CopyCtrlCToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); - this.CopyCtrlCToolStripMenuItem1.Text = "Copy Ctrl+C"; - this.CopyCtrlCToolStripMenuItem1.Click += new System.EventHandler(this.CopyCtrlCToolStripMenuItem1_Click); - // - // EditToolStripMenuItem1 - // - this.EditToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; - this.EditToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.CopyCtrlCToolStripMenuItem1, - this.PasteCtrlVToolStripMenuItem1}); - this.EditToolStripMenuItem1.Name = "EditToolStripMenuItem1"; - this.EditToolStripMenuItem1.Size = new System.Drawing.Size(37, 20); - this.EditToolStripMenuItem1.Text = "Edit"; - // - // txtNumbers - // - this.txtNumbers.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.txtNumbers.BackColor = System.Drawing.Color.White; - this.txtNumbers.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); - this.txtNumbers.Location = new System.Drawing.Point(11, 39); - this.txtNumbers.Margin = new System.Windows.Forms.Padding(4); - this.txtNumbers.Multiline = true; - this.txtNumbers.Name = "txtNumbers"; - this.txtNumbers.ReadOnly = true; - this.txtNumbers.Size = new System.Drawing.Size(249, 26); - this.txtNumbers.TabIndex = 85; - this.txtNumbers.Text = "0"; - this.txtNumbers.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - // - // Button27 - // - this.Button27.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.Button27.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button27.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button27.ForeColor = System.Drawing.Color.Firebrick; - this.Button27.Location = new System.Drawing.Point(159, 71); - this.Button27.Name = "Button27"; - this.Button27.Size = new System.Drawing.Size(49, 28); - this.Button27.TabIndex = 84; - this.Button27.Text = "CE"; - this.Button27.UseVisualStyleBackColor = true; - this.Button27.Click += new System.EventHandler(this.Button27_Click); - // - // Button26 - // - this.Button26.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.Button26.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button26.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button26.ForeColor = System.Drawing.Color.Firebrick; - this.Button26.Location = new System.Drawing.Point(210, 71); - this.Button26.Name = "Button26"; - this.Button26.Size = new System.Drawing.Size(49, 28); - this.Button26.TabIndex = 83; - this.Button26.Text = "C"; - this.Button26.UseVisualStyleBackColor = true; - this.Button26.Click += new System.EventHandler(this.Button26_Click); - // - // Button1 - // - this.Button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button1.ForeColor = System.Drawing.Color.Red; - this.Button1.Location = new System.Drawing.Point(11, 139); - this.Button1.Name = "Button1"; - this.Button1.Size = new System.Drawing.Size(36, 28); - this.Button1.TabIndex = 58; - this.Button1.Text = "MR"; - this.Button1.UseVisualStyleBackColor = true; - // - // Button25 - // - this.Button25.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.Button25.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button25.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button25.ForeColor = System.Drawing.Color.Firebrick; - this.Button25.Location = new System.Drawing.Point(104, 71); - this.Button25.Name = "Button25"; - this.Button25.Size = new System.Drawing.Size(49, 28); - this.Button25.TabIndex = 82; - this.Button25.Text = "Back"; - this.Button25.UseVisualStyleBackColor = true; - this.Button25.Click += new System.EventHandler(this.Button25_Click); - // - // Button2 - // - this.Button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button2.ForeColor = System.Drawing.Color.Red; - this.Button2.Location = new System.Drawing.Point(11, 207); - this.Button2.Name = "Button2"; - this.Button2.Size = new System.Drawing.Size(36, 28); - this.Button2.TabIndex = 59; - this.Button2.Text = "M+"; - this.Button2.UseVisualStyleBackColor = true; - // - // Button21 - // - this.Button21.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button21.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button21.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button21.ForeColor = System.Drawing.Color.Red; - this.Button21.Location = new System.Drawing.Point(223, 207); - this.Button21.Name = "Button21"; - this.Button21.Size = new System.Drawing.Size(36, 28); - this.Button21.TabIndex = 81; - this.Button21.Text = "="; - this.Button21.UseVisualStyleBackColor = true; - this.Button21.Click += new System.EventHandler(this.Button21_Click); - // - // Button3 - // - this.Button3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button3.ForeColor = System.Drawing.Color.Red; - this.Button3.Location = new System.Drawing.Point(11, 173); - this.Button3.Name = "Button3"; - this.Button3.Size = new System.Drawing.Size(36, 28); - this.Button3.TabIndex = 60; - this.Button3.Text = "MS"; - this.Button3.UseVisualStyleBackColor = true; - // - // Button22 - // - this.Button22.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button22.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button22.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button22.ForeColor = System.Drawing.Color.MidnightBlue; - this.Button22.Location = new System.Drawing.Point(223, 105); - this.Button22.Name = "Button22"; - this.Button22.Size = new System.Drawing.Size(36, 28); - this.Button22.TabIndex = 80; - this.Button22.Text = "sqrt"; - this.Button22.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.Button22.UseVisualStyleBackColor = true; - this.Button22.Click += new System.EventHandler(this.arithmitic_click); - // - // Button4 - // - this.Button4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button4.ForeColor = System.Drawing.Color.Red; - this.Button4.Location = new System.Drawing.Point(11, 105); - this.Button4.Name = "Button4"; - this.Button4.Size = new System.Drawing.Size(36, 28); - this.Button4.TabIndex = 61; - this.Button4.Text = "MC"; - this.Button4.UseVisualStyleBackColor = true; - // - // Button23 - // - this.Button23.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button23.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button23.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button23.ForeColor = System.Drawing.Color.MidnightBlue; - this.Button23.Location = new System.Drawing.Point(223, 173); - this.Button23.Name = "Button23"; - this.Button23.Size = new System.Drawing.Size(36, 28); - this.Button23.TabIndex = 79; - this.Button23.Text = "1/x"; - this.Button23.UseVisualStyleBackColor = true; - this.Button23.Click += new System.EventHandler(this.arithmitic_click); - // - // Button11 - // - this.Button11.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button11.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button11.ForeColor = System.Drawing.Color.Blue; - this.Button11.Location = new System.Drawing.Point(143, 105); - this.Button11.Name = "Button11"; - this.Button11.Size = new System.Drawing.Size(36, 28); - this.Button11.TabIndex = 70; - this.Button11.Text = "9"; - this.Button11.UseVisualStyleBackColor = true; - this.Button11.Click += new System.EventHandler(this.number_click); - // - // Button7 - // - this.Button7.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button7.ForeColor = System.Drawing.Color.Blue; - this.Button7.Location = new System.Drawing.Point(63, 139); - this.Button7.Name = "Button7"; - this.Button7.Size = new System.Drawing.Size(36, 28); - this.Button7.TabIndex = 62; - this.Button7.Text = "4"; - this.Button7.UseVisualStyleBackColor = true; - this.Button7.Click += new System.EventHandler(this.number_click); - // - // Button16 - // - this.Button16.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button16.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button16.ForeColor = System.Drawing.Color.Blue; - this.Button16.Location = new System.Drawing.Point(63, 207); - this.Button16.Name = "Button16"; - this.Button16.Size = new System.Drawing.Size(36, 28); - this.Button16.TabIndex = 71; - this.Button16.Text = "0"; - this.Button16.UseVisualStyleBackColor = true; - this.Button16.Click += new System.EventHandler(this.number_click); - // - // Button24 - // - this.Button24.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button24.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button24.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button24.ForeColor = System.Drawing.Color.MidnightBlue; - this.Button24.Location = new System.Drawing.Point(223, 139); - this.Button24.Name = "Button24"; - this.Button24.Size = new System.Drawing.Size(36, 28); - this.Button24.TabIndex = 78; - this.Button24.Text = "%"; - this.Button24.UseVisualStyleBackColor = true; - this.Button24.Click += new System.EventHandler(this.arithmitic_click); - // - // Button12 - // - this.Button12.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button12.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button12.ForeColor = System.Drawing.Color.Blue; - this.Button12.Location = new System.Drawing.Point(143, 173); - this.Button12.Name = "Button12"; - this.Button12.Size = new System.Drawing.Size(36, 28); - this.Button12.TabIndex = 69; - this.Button12.Text = "3"; - this.Button12.UseVisualStyleBackColor = true; - this.Button12.Click += new System.EventHandler(this.number_click); - // - // one - // - this.one.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.one.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.one.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.one.ForeColor = System.Drawing.Color.Blue; - this.one.Location = new System.Drawing.Point(63, 173); - this.one.Name = "one"; - this.one.Size = new System.Drawing.Size(36, 28); - this.one.TabIndex = 63; - this.one.Text = "1"; - this.one.UseVisualStyleBackColor = true; - this.one.Click += new System.EventHandler(this.number_click); - // - // Button15 - // - this.Button15.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button15.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button15.ForeColor = System.Drawing.Color.Blue; - this.Button15.Location = new System.Drawing.Point(103, 207); - this.Button15.Name = "Button15"; - this.Button15.Size = new System.Drawing.Size(36, 28); - this.Button15.TabIndex = 72; - this.Button15.Text = "+/-"; - this.Button15.UseVisualStyleBackColor = true; - this.Button15.Click += new System.EventHandler(this.Button15_Click); - // - // Button17 - // - this.Button17.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button17.ForeColor = System.Drawing.Color.Red; - this.Button17.Location = new System.Drawing.Point(183, 207); - this.Button17.Name = "Button17"; - this.Button17.Size = new System.Drawing.Size(36, 28); - this.Button17.TabIndex = 77; - this.Button17.Text = "+"; - this.Button17.UseVisualStyleBackColor = true; - this.Button17.Click += new System.EventHandler(this.arithmitic_click); - // - // Button13 - // - this.Button13.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button13.ForeColor = System.Drawing.Color.Blue; - this.Button13.Location = new System.Drawing.Point(143, 139); - this.Button13.Name = "Button13"; - this.Button13.Size = new System.Drawing.Size(36, 28); - this.Button13.TabIndex = 68; - this.Button13.Text = "6"; - this.Button13.UseVisualStyleBackColor = true; - this.Button13.Click += new System.EventHandler(this.number_click); - // - // Button5 - // - this.Button5.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button5.ForeColor = System.Drawing.Color.Blue; - this.Button5.Location = new System.Drawing.Point(63, 105); - this.Button5.Name = "Button5"; - this.Button5.Size = new System.Drawing.Size(36, 28); - this.Button5.TabIndex = 64; - this.Button5.Text = "7"; - this.Button5.UseVisualStyleBackColor = true; - this.Button5.Click += new System.EventHandler(this.number_click); - // - // Button14 - // - this.Button14.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button14.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button14.ForeColor = System.Drawing.Color.Blue; - this.Button14.Location = new System.Drawing.Point(143, 207); - this.Button14.Name = "Button14"; - this.Button14.Size = new System.Drawing.Size(36, 28); - this.Button14.TabIndex = 73; - this.Button14.Text = "."; - this.Button14.UseVisualStyleBackColor = true; - this.Button14.Click += new System.EventHandler(this.number_click); - // - // Button18 - // - this.Button18.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button18.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button18.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button18.ForeColor = System.Drawing.Color.Red; - this.Button18.Location = new System.Drawing.Point(183, 105); - this.Button18.Name = "Button18"; - this.Button18.Size = new System.Drawing.Size(36, 28); - this.Button18.TabIndex = 76; - this.Button18.Text = "/"; - this.Button18.UseVisualStyleBackColor = true; - this.Button18.Click += new System.EventHandler(this.arithmitic_click); - // - // Button8 - // - this.Button8.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button8.ForeColor = System.Drawing.Color.Blue; - this.Button8.Location = new System.Drawing.Point(103, 105); - this.Button8.Name = "Button8"; - this.Button8.Size = new System.Drawing.Size(36, 28); - this.Button8.TabIndex = 67; - this.Button8.Text = "8"; - this.Button8.UseVisualStyleBackColor = true; - this.Button8.Click += new System.EventHandler(this.number_click); - // - // Button10 - // - this.Button10.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button10.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button10.ForeColor = System.Drawing.Color.Blue; - this.Button10.Location = new System.Drawing.Point(103, 139); - this.Button10.Name = "Button10"; - this.Button10.Size = new System.Drawing.Size(36, 28); - this.Button10.TabIndex = 65; - this.Button10.Text = "5"; - this.Button10.UseVisualStyleBackColor = true; - this.Button10.Click += new System.EventHandler(this.number_click); - // - // Button20 - // - this.Button20.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button20.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button20.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button20.ForeColor = System.Drawing.Color.Red; - this.Button20.Location = new System.Drawing.Point(183, 139); - this.Button20.Name = "Button20"; - this.Button20.Size = new System.Drawing.Size(36, 28); - this.Button20.TabIndex = 74; - this.Button20.Text = "*"; - this.Button20.UseVisualStyleBackColor = true; - this.Button20.Click += new System.EventHandler(this.arithmitic_click); - // - // Button19 - // - this.Button19.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button19.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button19.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button19.ForeColor = System.Drawing.Color.Red; - this.Button19.Location = new System.Drawing.Point(183, 173); - this.Button19.Name = "Button19"; - this.Button19.Size = new System.Drawing.Size(36, 28); - this.Button19.TabIndex = 75; - this.Button19.Text = "-"; - this.Button19.UseVisualStyleBackColor = true; - this.Button19.Click += new System.EventHandler(this.arithmitic_click); - // - // Button9 - // - this.Button9.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button9.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Button9.ForeColor = System.Drawing.Color.Blue; - this.Button9.Location = new System.Drawing.Point(103, 173); - this.Button9.Name = "Button9"; - this.Button9.Size = new System.Drawing.Size(36, 28); - this.Button9.TabIndex = 66; - this.Button9.Text = "2"; - this.Button9.UseVisualStyleBackColor = true; - this.Button9.Click += new System.EventHandler(this.number_click); - // - // MenuStrip2 - // - this.MenuStrip2.BackColor = System.Drawing.Color.Silver; - this.MenuStrip2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.MenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.EditToolStripMenuItem1, - this.HelpToolStripMenuItem2, - this.HelpToolStripMenuItem3}); - this.MenuStrip2.Location = new System.Drawing.Point(0, 0); - this.MenuStrip2.Name = "MenuStrip2"; - this.MenuStrip2.Size = new System.Drawing.Size(270, 24); - this.MenuStrip2.TabIndex = 86; - this.MenuStrip2.Text = "MenuStrip2"; - // - // pictureBox1 - // - this.pictureBox1.BackgroundImage = global::TimeHACK.Properties.Resources.ie4_hsplitter; - this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.pictureBox1.Location = new System.Drawing.Point(1, 24); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(268, 2); - this.pictureBox1.TabIndex = 87; - this.pictureBox1.TabStop = false; - // - // WinClassicCalculator - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.Silver; - this.Controls.Add(this.pictureBox1); - this.Controls.Add(this.txtNumbers); - this.Controls.Add(this.Button27); - this.Controls.Add(this.Button26); - this.Controls.Add(this.Button1); - this.Controls.Add(this.Button25); - this.Controls.Add(this.Button2); - this.Controls.Add(this.Button21); - this.Controls.Add(this.Button3); - this.Controls.Add(this.Button22); - this.Controls.Add(this.Button4); - this.Controls.Add(this.Button23); - this.Controls.Add(this.Button11); - this.Controls.Add(this.Button7); - this.Controls.Add(this.Button16); - this.Controls.Add(this.Button24); - this.Controls.Add(this.Button12); - this.Controls.Add(this.one); - this.Controls.Add(this.Button15); - this.Controls.Add(this.Button17); - this.Controls.Add(this.Button13); - this.Controls.Add(this.Button5); - this.Controls.Add(this.Button14); - this.Controls.Add(this.Button18); - this.Controls.Add(this.Button8); - this.Controls.Add(this.Button10); - this.Controls.Add(this.Button20); - this.Controls.Add(this.Button19); - this.Controls.Add(this.Button9); - this.Controls.Add(this.MenuStrip2); - this.Name = "WinClassicCalculator"; - this.Size = new System.Drawing.Size(270, 247); - this.MenuStrip2.ResumeLayout(false); - this.MenuStrip2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.Timer timer1; - internal System.Windows.Forms.ToolStripMenuItem HelpToolStripMenuItem3; - internal System.Windows.Forms.ToolStripMenuItem AboutCalculatorToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem StandardToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem ScientificToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem HelpToolStripMenuItem2; - internal System.Windows.Forms.ToolStripMenuItem PasteCtrlVToolStripMenuItem1; - internal System.Windows.Forms.ToolStripMenuItem CopyCtrlCToolStripMenuItem1; - internal System.Windows.Forms.ToolStripMenuItem EditToolStripMenuItem1; - internal System.Windows.Forms.TextBox txtNumbers; - internal System.Windows.Forms.Button Button27; - internal System.Windows.Forms.Button Button26; - internal System.Windows.Forms.Button Button1; - internal System.Windows.Forms.Button Button25; - internal System.Windows.Forms.Button Button2; - internal System.Windows.Forms.Button Button21; - internal System.Windows.Forms.Button Button3; - internal System.Windows.Forms.Button Button22; - internal System.Windows.Forms.Button Button4; - internal System.Windows.Forms.Button Button23; - internal System.Windows.Forms.Button Button11; - internal System.Windows.Forms.Button Button7; - internal System.Windows.Forms.Button Button16; - internal System.Windows.Forms.Button Button24; - internal System.Windows.Forms.Button Button12; - internal System.Windows.Forms.Button one; - internal System.Windows.Forms.Button Button15; - internal System.Windows.Forms.Button Button17; - internal System.Windows.Forms.Button Button13; - internal System.Windows.Forms.Button Button5; - internal System.Windows.Forms.Button Button14; - internal System.Windows.Forms.Button Button18; - internal System.Windows.Forms.Button Button8; - internal System.Windows.Forms.Button Button10; - internal System.Windows.Forms.Button Button20; - internal System.Windows.Forms.Button Button19; - internal System.Windows.Forms.Button Button9; - internal System.Windows.Forms.MenuStrip MenuStrip2; - private System.Windows.Forms.PictureBox pictureBox1; - } -} diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.cs deleted file mode 100644 index 71ded89..0000000 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.cs +++ /dev/null @@ -1,175 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Drawing; -using System.Data; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; -using TimeHACK.Engine; - -namespace TimeHACK.OS.Win95.Win95Apps -{ - public partial class WinClassicCalculator : UserControl - { - double prevnum = 0; - string operation = ""; - bool operation_pressed = false; - public WinClassicCalculator() - { - InitializeComponent(); - foreach (Control c in Controls) - { - if (c is Button) - { - c.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0))); - c.Paint += (sender, args) => Paintbrush.PaintClassicBorders(sender, args, 2); - } - else - { - c.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - } - } - txtNumbers.Paint += (sender, args) => Paintbrush.PaintClassicBordersIndented(sender, args, 2); - } - private void number_click(object sender, EventArgs e) - { - if (txtNumbers.Text.Contains("∞")) - txtNumbers.Clear(); - if ((txtNumbers.Text == "0") || (operation_pressed)) - txtNumbers.Text = ""; - operation_pressed = false; - Button num = (Button)sender; - if (num.Text == ".") - { - if (!txtNumbers.Text.Contains(".")) - txtNumbers.Text = txtNumbers.Text + num.Text; - } - else - txtNumbers.Text = txtNumbers.Text + num.Text; - } - - private void Button27_Click(object sender, EventArgs e) - { - txtNumbers.Text = "0"; - } - - private void Button26_Click(object sender, EventArgs e) - { - prevnum = 0; - operation = ""; - operation_pressed = false; - txtNumbers.Text = "0"; - } - - private void Button25_Click(object sender, EventArgs e) - { - if (txtNumbers.Text.Length>0) - { - txtNumbers.Text = txtNumbers.Text.Remove(txtNumbers.Text.Length - 1, 1); - } - if (txtNumbers.Text =="") - { - txtNumbers.Text = "0"; - } - } - - private void arithmitic_click(object sender, EventArgs e) - { - Button num = (Button)sender; - if (txtNumbers.Text.Contains("∞")) - txtNumbers.Clear(); - if (prevnum != 0) - { - if (num.Text == "sqrt") - prevnum = Math.Sqrt(double.Parse(txtNumbers.Text)); - if (num.Text == "1/x") - prevnum = Convert.ToDouble(1.0 / Convert.ToDouble(txtNumbers.Text)); - if (num.Text == "%") - prevnum = Convert.ToDouble(txtNumbers.Text) / 100; - Button21.PerformClick(); - operation = num.Text; - operation_pressed = true; - } - else if (num.Text == "sqrt") - { - prevnum = Math.Sqrt(double.Parse(txtNumbers.Text)); - txtNumbers.Text = prevnum.ToString(); - } - else if (num.Text == "1/x") - { - prevnum = Convert.ToDouble(1.0 / Convert.ToDouble(txtNumbers.Text)); - txtNumbers.Text = prevnum.ToString(); - } - else if (num.Text == "%") - { - prevnum = Convert.ToDouble(txtNumbers.Text) / 100; - txtNumbers.Text = prevnum.ToString(); - } - else - { - operation = num.Text; - prevnum = double.Parse(txtNumbers.Text); - txtNumbers.Text = "0"; - operation_pressed = true; - } - } - - private void Button21_Click(object sender, EventArgs e) - { - if (txtNumbers.Text.Contains("∞")) - txtNumbers.Clear(); - switch (operation) - { - case "+": - txtNumbers.Text = (prevnum + double.Parse(txtNumbers.Text)).ToString(); - break; - case "-": - txtNumbers.Text = (prevnum - double.Parse(txtNumbers.Text)).ToString(); - break; - case "*": - txtNumbers.Text = (prevnum * double.Parse(txtNumbers.Text)).ToString(); - break; - case "/": - txtNumbers.Text = (prevnum / double.Parse(txtNumbers.Text)).ToString(); - break; - } - prevnum = Int32.Parse(txtNumbers.Text); - operation = ""; - } - - private void AboutCalculatorToolStripMenuItem_Click(object sender, EventArgs e) - { - WindowManager wm = new WindowManager(); - wm.StartAboutBox95("Calculator", "Microsoft Calculator", Properties.Resources.WinClassicCalc); - } - - private void Button15_Click(object sender, EventArgs e) - { - - } - - private void CopyCtrlCToolStripMenuItem1_Click(object sender, EventArgs e) - { - txtNumbers.Copy(); - } - - private void PasteCtrlVToolStripMenuItem1_Click(object sender, EventArgs e) - { - string pasteText = Clipboard.GetText(); - string strippedText = ""; - for (int i = 0; i < pasteText.Length; i++) - { - if (char.IsDigit(pasteText[i])) - strippedText += pasteText[i].ToString(); - MessageBox.Show("Test"); - } - if (strippedText!=pasteText) - { - txtNumbers.Text = pasteText; - } - } - - } -} diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.resx deleted file mode 100644 index d7509b3..0000000 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - 219, 17 - - - 306, 17 - - \ No newline at end of file diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs index 710c51c..a3d3ab0 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs @@ -57,6 +57,11 @@ this.aboutWordpadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mainText = new System.Windows.Forms.RichTextBox(); this.pnlToolbar = new System.Windows.Forms.Panel(); + this.btnFind = new System.Windows.Forms.Button(); + this.btnPrintPreview = new System.Windows.Forms.Button(); + this.btnPrint = new System.Windows.Forms.Button(); + this.btnSave = new System.Windows.Forms.Button(); + this.btnOpen = new System.Windows.Forms.Button(); this.btnPaste = new System.Windows.Forms.Button(); this.btnCopy = new System.Windows.Forms.Button(); this.btnCut = new System.Windows.Forms.Button(); @@ -71,16 +76,21 @@ this.btnBold = new System.Windows.Forms.Button(); this.statusBar = new System.Windows.Forms.Panel(); this.lblStatus = new System.Windows.Forms.Label(); + this.pictureBox3 = new System.Windows.Forms.PictureBox(); + this.pictureBox4 = new System.Windows.Forms.PictureBox(); this.topmenu.SuspendLayout(); this.pnlToolbar.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.pnlFormatBar.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.statusBar.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); this.SuspendLayout(); // // topmenu // + this.topmenu.AutoSize = false; this.topmenu.BackColor = System.Drawing.Color.Silver; this.topmenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, @@ -91,42 +101,45 @@ this.helpToolStripMenuItem}); this.topmenu.Location = new System.Drawing.Point(0, 0); this.topmenu.Name = "topmenu"; - this.topmenu.Size = new System.Drawing.Size(593, 24); + this.topmenu.Padding = new System.Windows.Forms.Padding(0); + this.topmenu.Size = new System.Drawing.Size(593, 19); this.topmenu.TabIndex = 0; this.topmenu.Text = "menuStrip1"; // // fileToolStripMenuItem // + this.fileToolStripMenuItem.AutoSize = false; this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.newToolStripMenuItem, this.toolStripSeparator1, this.sendToolStripMenuItem, this.exitToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.fileToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(28, 18); this.fileToolStripMenuItem.Text = "File"; // // newToolStripMenuItem // this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.Size = new System.Drawing.Size(109, 22); + this.newToolStripMenuItem.Size = new System.Drawing.Size(114, 22); this.newToolStripMenuItem.Text = "New"; // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(106, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(111, 6); // // sendToolStripMenuItem // this.sendToolStripMenuItem.Name = "sendToolStripMenuItem"; - this.sendToolStripMenuItem.Size = new System.Drawing.Size(109, 22); + this.sendToolStripMenuItem.Size = new System.Drawing.Size(114, 22); this.sendToolStripMenuItem.Text = "Send..."; // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(109, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(114, 22); this.exitToolStripMenuItem.Text = "Exit"; // // editToolStripMenuItem @@ -141,53 +154,54 @@ this.clearToolStripMenuItem, this.selectAllToolStripMenuItem}); this.editToolStripMenuItem.Name = "editToolStripMenuItem"; - this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); + this.editToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); + this.editToolStripMenuItem.Size = new System.Drawing.Size(36, 19); this.editToolStripMenuItem.Text = "Edit"; // // undoToolStripMenuItem // this.undoToolStripMenuItem.Name = "undoToolStripMenuItem"; - this.undoToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.undoToolStripMenuItem.Size = new System.Drawing.Size(129, 22); this.undoToolStripMenuItem.Text = "Undo"; // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(119, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(126, 6); // // cutToolStripMenuItem // this.cutToolStripMenuItem.Name = "cutToolStripMenuItem"; - this.cutToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.cutToolStripMenuItem.Size = new System.Drawing.Size(129, 22); this.cutToolStripMenuItem.Text = "Cut"; // // copyToolStripMenuItem // this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; - this.copyToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.copyToolStripMenuItem.Size = new System.Drawing.Size(129, 22); this.copyToolStripMenuItem.Text = "Copy"; // // pasteToolStripMenuItem // this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem"; - this.pasteToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.pasteToolStripMenuItem.Size = new System.Drawing.Size(129, 22); this.pasteToolStripMenuItem.Text = "Paste"; // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(119, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(126, 6); // // clearToolStripMenuItem // this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; - this.clearToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.clearToolStripMenuItem.Size = new System.Drawing.Size(129, 22); this.clearToolStripMenuItem.Text = "Clear"; // // selectAllToolStripMenuItem // this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem"; - this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(129, 22); this.selectAllToolStripMenuItem.Text = "Select All"; // // viewToolStripMenuItem @@ -197,7 +211,8 @@ this.formatBarToolStripMenuItem, this.statusBarToolStripMenuItem}); this.viewToolStripMenuItem.Name = "viewToolStripMenuItem"; - this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 20); + this.viewToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); + this.viewToolStripMenuItem.Size = new System.Drawing.Size(40, 19); this.viewToolStripMenuItem.Text = "View"; // // toolbarToolStripMenuItem @@ -206,7 +221,7 @@ this.toolbarToolStripMenuItem.CheckOnClick = true; this.toolbarToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.toolbarToolStripMenuItem.Name = "toolbarToolStripMenuItem"; - this.toolbarToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.toolbarToolStripMenuItem.Size = new System.Drawing.Size(143, 22); this.toolbarToolStripMenuItem.Text = "Toolbar"; // // formatBarToolStripMenuItem @@ -215,7 +230,7 @@ this.formatBarToolStripMenuItem.CheckOnClick = true; this.formatBarToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.formatBarToolStripMenuItem.Name = "formatBarToolStripMenuItem"; - this.formatBarToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.formatBarToolStripMenuItem.Size = new System.Drawing.Size(143, 22); this.formatBarToolStripMenuItem.Text = "Format Bar"; // // statusBarToolStripMenuItem @@ -224,7 +239,7 @@ this.statusBarToolStripMenuItem.CheckOnClick = true; this.statusBarToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.statusBarToolStripMenuItem.Name = "statusBarToolStripMenuItem"; - this.statusBarToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.statusBarToolStripMenuItem.Size = new System.Drawing.Size(143, 22); this.statusBarToolStripMenuItem.Text = "Status Bar"; // // insertToolStripMenuItem @@ -232,13 +247,14 @@ this.insertToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.dateTimeToolStripMenuItem}); this.insertToolStripMenuItem.Name = "insertToolStripMenuItem"; - this.insertToolStripMenuItem.Size = new System.Drawing.Size(48, 20); + this.insertToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); + this.insertToolStripMenuItem.Size = new System.Drawing.Size(47, 19); this.insertToolStripMenuItem.Text = "Insert"; // // dateTimeToolStripMenuItem // this.dateTimeToolStripMenuItem.Name = "dateTimeToolStripMenuItem"; - this.dateTimeToolStripMenuItem.Size = new System.Drawing.Size(130, 22); + this.dateTimeToolStripMenuItem.Size = new System.Drawing.Size(137, 22); this.dateTimeToolStripMenuItem.Text = "Date/Time"; // // formatToolStripMenuItem @@ -246,14 +262,15 @@ this.formatToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.bulletStyleToolStripMenuItem}); this.formatToolStripMenuItem.Name = "formatToolStripMenuItem"; - this.formatToolStripMenuItem.Size = new System.Drawing.Size(57, 20); + this.formatToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); + this.formatToolStripMenuItem.Size = new System.Drawing.Size(57, 19); this.formatToolStripMenuItem.Text = "Format"; // // bulletStyleToolStripMenuItem // this.bulletStyleToolStripMenuItem.CheckOnClick = true; this.bulletStyleToolStripMenuItem.Name = "bulletStyleToolStripMenuItem"; - this.bulletStyleToolStripMenuItem.Size = new System.Drawing.Size(131, 22); + this.bulletStyleToolStripMenuItem.Size = new System.Drawing.Size(141, 22); this.bulletStyleToolStripMenuItem.Text = "Bullet style"; // // helpToolStripMenuItem @@ -263,86 +280,151 @@ this.toolStripSeparator4, this.aboutWordpadToolStripMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20); + this.helpToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(39, 19); this.helpToolStripMenuItem.Text = "Help"; // // helpTopicsToolStripMenuItem // this.helpTopicsToolStripMenuItem.Name = "helpTopicsToolStripMenuItem"; - this.helpTopicsToolStripMenuItem.Size = new System.Drawing.Size(159, 22); + this.helpTopicsToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.helpTopicsToolStripMenuItem.Text = "Help Topics"; // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(156, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(166, 6); // // aboutWordpadToolStripMenuItem // this.aboutWordpadToolStripMenuItem.Name = "aboutWordpadToolStripMenuItem"; - this.aboutWordpadToolStripMenuItem.Size = new System.Drawing.Size(159, 22); + this.aboutWordpadToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.aboutWordpadToolStripMenuItem.Text = "About Wordpad"; // // mainText // this.mainText.Dock = System.Windows.Forms.DockStyle.Fill; - this.mainText.Location = new System.Drawing.Point(0, 80); + this.mainText.Location = new System.Drawing.Point(0, 79); this.mainText.Name = "mainText"; - this.mainText.Size = new System.Drawing.Size(593, 290); + this.mainText.Size = new System.Drawing.Size(593, 274); this.mainText.TabIndex = 1; this.mainText.Text = ""; // // pnlToolbar // this.pnlToolbar.BackColor = System.Drawing.Color.Silver; + this.pnlToolbar.Controls.Add(this.btnFind); + this.pnlToolbar.Controls.Add(this.btnPrintPreview); + this.pnlToolbar.Controls.Add(this.btnPrint); + this.pnlToolbar.Controls.Add(this.btnSave); + this.pnlToolbar.Controls.Add(this.btnOpen); this.pnlToolbar.Controls.Add(this.btnPaste); this.pnlToolbar.Controls.Add(this.btnCopy); this.pnlToolbar.Controls.Add(this.btnCut); this.pnlToolbar.Controls.Add(this.btnNew); this.pnlToolbar.Controls.Add(this.pictureBox1); this.pnlToolbar.Dock = System.Windows.Forms.DockStyle.Top; - this.pnlToolbar.Location = new System.Drawing.Point(0, 24); + this.pnlToolbar.Location = new System.Drawing.Point(0, 21); this.pnlToolbar.Name = "pnlToolbar"; this.pnlToolbar.Size = new System.Drawing.Size(593, 28); this.pnlToolbar.TabIndex = 2; // + // btnFind + // + this.btnFind.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_find; + this.btnFind.FlatAppearance.BorderSize = 0; + this.btnFind.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnFind.Location = new System.Drawing.Point(137, 3); + this.btnFind.Name = "btnFind"; + this.btnFind.Size = new System.Drawing.Size(23, 22); + this.btnFind.TabIndex = 6; + this.btnFind.UseVisualStyleBackColor = true; + // + // btnPrintPreview + // + this.btnPrintPreview.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_printpreview; + this.btnPrintPreview.FlatAppearance.BorderSize = 0; + this.btnPrintPreview.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnPrintPreview.Location = new System.Drawing.Point(106, 3); + this.btnPrintPreview.Name = "btnPrintPreview"; + this.btnPrintPreview.Size = new System.Drawing.Size(23, 22); + this.btnPrintPreview.TabIndex = 5; + this.btnPrintPreview.UseVisualStyleBackColor = true; + // + // btnPrint + // + this.btnPrint.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_print; + this.btnPrint.FlatAppearance.BorderSize = 0; + this.btnPrint.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnPrint.Location = new System.Drawing.Point(83, 3); + this.btnPrint.Name = "btnPrint"; + this.btnPrint.Size = new System.Drawing.Size(23, 22); + this.btnPrint.TabIndex = 4; + this.btnPrint.UseVisualStyleBackColor = true; + // + // btnSave + // + this.btnSave.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_save; + this.btnSave.FlatAppearance.BorderSize = 0; + this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnSave.Location = new System.Drawing.Point(52, 3); + this.btnSave.Name = "btnSave"; + this.btnSave.Size = new System.Drawing.Size(23, 22); + this.btnSave.TabIndex = 3; + this.btnSave.UseVisualStyleBackColor = true; + // + // btnOpen + // + this.btnOpen.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_open; + this.btnOpen.FlatAppearance.BorderSize = 0; + this.btnOpen.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnOpen.Location = new System.Drawing.Point(29, 3); + this.btnOpen.Name = "btnOpen"; + this.btnOpen.Size = new System.Drawing.Size(23, 22); + this.btnOpen.TabIndex = 2; + this.btnOpen.UseVisualStyleBackColor = true; + // // btnPaste // - this.btnPaste.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; - this.btnPaste.Image = global::TimeHACK.Properties.Resources.WinClassicPaste; - this.btnPaste.Location = new System.Drawing.Point(102, 3); + this.btnPaste.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_paste; + this.btnPaste.FlatAppearance.BorderSize = 0; + this.btnPaste.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnPaste.Location = new System.Drawing.Point(214, 3); this.btnPaste.Name = "btnPaste"; - this.btnPaste.Size = new System.Drawing.Size(26, 23); + this.btnPaste.Size = new System.Drawing.Size(23, 22); this.btnPaste.TabIndex = 1; this.btnPaste.UseVisualStyleBackColor = true; // // btnCopy // - this.btnCopy.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; - this.btnCopy.Image = global::TimeHACK.Properties.Resources.WinClassicCopy; - this.btnCopy.Location = new System.Drawing.Point(70, 3); + this.btnCopy.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_copy; + this.btnCopy.FlatAppearance.BorderSize = 0; + this.btnCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnCopy.Location = new System.Drawing.Point(191, 3); this.btnCopy.Name = "btnCopy"; - this.btnCopy.Size = new System.Drawing.Size(26, 23); + this.btnCopy.Size = new System.Drawing.Size(23, 22); this.btnCopy.TabIndex = 1; this.btnCopy.UseVisualStyleBackColor = true; // // btnCut // - this.btnCut.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; - this.btnCut.Image = global::TimeHACK.Properties.Resources.WinClassicCut; - this.btnCut.Location = new System.Drawing.Point(38, 3); + this.btnCut.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_cut; + this.btnCut.FlatAppearance.BorderSize = 0; + this.btnCut.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnCut.Location = new System.Drawing.Point(168, 3); this.btnCut.Name = "btnCut"; - this.btnCut.Size = new System.Drawing.Size(26, 23); + this.btnCut.Size = new System.Drawing.Size(23, 22); this.btnCut.TabIndex = 1; this.btnCut.UseVisualStyleBackColor = true; // // btnNew // - this.btnNew.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; - this.btnNew.Image = global::TimeHACK.Properties.Resources.WinClassicNew; + this.btnNew.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_new; + this.btnNew.FlatAppearance.BorderSize = 0; + this.btnNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnNew.Location = new System.Drawing.Point(6, 3); this.btnNew.Name = "btnNew"; - this.btnNew.Size = new System.Drawing.Size(26, 23); + this.btnNew.Size = new System.Drawing.Size(23, 22); this.btnNew.TabIndex = 1; this.btnNew.UseVisualStyleBackColor = true; // @@ -367,7 +449,7 @@ this.pnlFormatBar.Controls.Add(this.btnItalic); this.pnlFormatBar.Controls.Add(this.btnBold); this.pnlFormatBar.Dock = System.Windows.Forms.DockStyle.Top; - this.pnlFormatBar.Location = new System.Drawing.Point(0, 52); + this.pnlFormatBar.Location = new System.Drawing.Point(0, 51); this.pnlFormatBar.Name = "pnlFormatBar"; this.pnlFormatBar.Size = new System.Drawing.Size(593, 28); this.pnlFormatBar.TabIndex = 3; @@ -393,7 +475,7 @@ "36", "48", "72"}); - this.comboSize.Location = new System.Drawing.Point(157, 3); + this.comboSize.Location = new System.Drawing.Point(252, 3); this.comboSize.Name = "comboSize"; this.comboSize.Size = new System.Drawing.Size(50, 21); this.comboSize.TabIndex = 1; @@ -404,7 +486,7 @@ this.comboFont.FormattingEnabled = true; this.comboFont.Location = new System.Drawing.Point(6, 3); this.comboFont.Name = "comboFont"; - this.comboFont.Size = new System.Drawing.Size(145, 21); + this.comboFont.Size = new System.Drawing.Size(240, 21); this.comboFont.TabIndex = 1; this.comboFont.Text = "Arial"; // @@ -422,13 +504,14 @@ // btnUnderline // this.btnUnderline.BackColor = System.Drawing.Color.DimGray; - this.btnUnderline.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; + this.btnUnderline.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_underline; + this.btnUnderline.FlatAppearance.BorderSize = 0; + this.btnUnderline.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUnderline.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnUnderline.Location = new System.Drawing.Point(277, 2); + this.btnUnderline.Location = new System.Drawing.Point(358, 3); this.btnUnderline.Name = "btnUnderline"; - this.btnUnderline.Size = new System.Drawing.Size(26, 23); + this.btnUnderline.Size = new System.Drawing.Size(23, 22); this.btnUnderline.TabIndex = 1; - this.btnUnderline.Text = "U"; this.btnUnderline.UseVisualStyleBackColor = false; this.btnUnderline.Click += new System.EventHandler(this.btnUnderline_Click); this.btnUnderline.MouseEnter += new System.EventHandler(this.btnUnderline_MouseEnter); @@ -437,13 +520,14 @@ // btnItalic // this.btnItalic.BackColor = System.Drawing.Color.DimGray; - this.btnItalic.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; + this.btnItalic.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_italic; + this.btnItalic.FlatAppearance.BorderSize = 0; + this.btnItalic.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnItalic.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnItalic.Location = new System.Drawing.Point(245, 2); + this.btnItalic.Location = new System.Drawing.Point(335, 3); this.btnItalic.Name = "btnItalic"; - this.btnItalic.Size = new System.Drawing.Size(26, 23); + this.btnItalic.Size = new System.Drawing.Size(23, 22); this.btnItalic.TabIndex = 1; - this.btnItalic.Text = "I"; this.btnItalic.UseVisualStyleBackColor = false; this.btnItalic.Click += new System.EventHandler(this.btnItalic_Click); this.btnItalic.MouseEnter += new System.EventHandler(this.btnItalic_MouseEnter); @@ -452,13 +536,14 @@ // btnBold // this.btnBold.BackColor = System.Drawing.Color.DimGray; - this.btnBold.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; + this.btnBold.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_bold; + this.btnBold.FlatAppearance.BorderSize = 0; + this.btnBold.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBold.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnBold.Location = new System.Drawing.Point(213, 2); + this.btnBold.Location = new System.Drawing.Point(312, 3); this.btnBold.Name = "btnBold"; - this.btnBold.Size = new System.Drawing.Size(26, 23); + this.btnBold.Size = new System.Drawing.Size(23, 22); this.btnBold.TabIndex = 1; - this.btnBold.Text = "B"; this.btnBold.UseVisualStyleBackColor = false; this.btnBold.Click += new System.EventHandler(this.btnBold_Click); this.btnBold.MouseEnter += new System.EventHandler(this.btnBold_MouseEnter); @@ -484,13 +569,39 @@ this.lblStatus.TabIndex = 0; this.lblStatus.Text = "For Help, go to Help -> Help topics"; // + // pictureBox3 + // + this.pictureBox3.BackgroundImage = global::TimeHACK.Properties.Resources.ie4_hsplitter; + this.pictureBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox3.Dock = System.Windows.Forms.DockStyle.Top; + this.pictureBox3.Location = new System.Drawing.Point(0, 19); + this.pictureBox3.Name = "pictureBox3"; + this.pictureBox3.Size = new System.Drawing.Size(593, 2); + this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox3.TabIndex = 5; + this.pictureBox3.TabStop = false; + // + // pictureBox4 + // + this.pictureBox4.BackgroundImage = global::TimeHACK.Properties.Resources.ie4_hsplitter; + this.pictureBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox4.Dock = System.Windows.Forms.DockStyle.Top; + this.pictureBox4.Location = new System.Drawing.Point(0, 49); + this.pictureBox4.Name = "pictureBox4"; + this.pictureBox4.Size = new System.Drawing.Size(593, 2); + this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox4.TabIndex = 6; + this.pictureBox4.TabStop = false; + // // WinClassicWordPad // this.BackColor = System.Drawing.Color.Silver; - this.Controls.Add(this.statusBar); this.Controls.Add(this.mainText); + this.Controls.Add(this.statusBar); this.Controls.Add(this.pnlFormatBar); + this.Controls.Add(this.pictureBox4); this.Controls.Add(this.pnlToolbar); + this.Controls.Add(this.pictureBox3); this.Controls.Add(this.topmenu); this.Name = "WinClassicWordPad"; this.Size = new System.Drawing.Size(593, 370); @@ -502,8 +613,9 @@ ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.statusBar.ResumeLayout(false); this.statusBar.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); this.ResumeLayout(false); - this.PerformLayout(); } @@ -551,5 +663,12 @@ private System.Windows.Forms.Button btnUnderline; private System.Windows.Forms.Button btnItalic; private System.Windows.Forms.Button btnBold; + private System.Windows.Forms.PictureBox pictureBox3; + private System.Windows.Forms.PictureBox pictureBox4; + private System.Windows.Forms.Button btnOpen; + private System.Windows.Forms.Button btnSave; + private System.Windows.Forms.Button btnPrint; + private System.Windows.Forms.Button btnPrintPreview; + private System.Windows.Forms.Button btnFind; } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs index 7d0dd1c..7d7956a 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs @@ -15,16 +15,15 @@ namespace TimeHACK.OS.Win95.Win95Apps public partial class WinClassicWordPad : UserControl { WindowManager wm = new WindowManager(); + + bool doBold = false; + bool doItalic = false; + bool doUnderline = false; - bool btnBoldSelected = true; - bool btnItalicSelected = true; - bool btnUnderlineSelected = true; - bool doBold; - bool doItalic; - bool doUnderline; public WinClassicWordPad() { InitializeComponent(); + foreach (ToolStripMenuItem item in topmenu.Items) { item.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((0))); @@ -35,13 +34,7 @@ namespace TimeHACK.OS.Win95.Win95Apps } // Time to prepare to load all the fonts up for the combo boxes - - foreach (FontFamily font in System.Drawing.FontFamily.Families) - { - // Added to the ComboBox here - - comboFont.Items.Add(font.Name); - } + foreach (FontFamily font in FontFamily.Families) comboFont.Items.Add(font.Name); // Handlers this.clearToolStripMenuItem.Click += (sender, args) => mainText.Text = mainText.Text.Remove(mainText.SelectionStart, mainText.SelectedText.Length); @@ -71,48 +64,44 @@ namespace TimeHACK.OS.Win95.Win95Apps private void btnBold_Click(object sender, EventArgs e) { - if (btnBoldSelected == false) + if (!doBold) { btnBold.BackgroundImage = null; - btnBoldSelected = true; - + doBold = true; } else { - btnBold.BackgroundImage = Properties.Resources.sliversilver; - btnBoldSelected = false; + btnBold.BackgroundImage = Properties.Resources.wordpad_bold; + doBold = false; } - doBold = btnBoldSelected; DoFontStyles(); } private void btnItalic_Click(object sender, EventArgs e) { - if (btnItalicSelected == false) + if (!doItalic) { - btnItalic.BackgroundImage = Properties.Resources.sliversilver; - btnItalicSelected = true; + btnItalic.BackgroundImage = null; + doItalic = true; } else { - btnItalic.BackgroundImage = null; - btnItalicSelected = false; + btnItalic.BackgroundImage = Properties.Resources.wordpad_italic; + doItalic = false; } - doItalic = btnItalicSelected; DoFontStyles(); } private void btnUnderline_Click(object sender, EventArgs e) { - if (btnUnderlineSelected == false) + if (!doUnderline) { - btnUnderline.BackgroundImage = Properties.Resources.sliversilver; - btnUnderlineSelected = true; + btnUnderline.BackgroundImage = null; + doUnderline = true; } else { - btnUnderline.BackgroundImage = null; - btnUnderlineSelected = false; + btnUnderline.BackgroundImage = Properties.Resources.wordpad_underline; + doUnderline = false; } - doUnderline = btnUnderlineSelected; DoFontStyles(); } @@ -175,9 +164,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) Bold = FontStyle.Bold; + if (doItalic) Italic = FontStyle.Italic; + if (doUnderline) Underline = FontStyle.Underline; mainText.SelectionFont = new Font(mainText.SelectionFont.FontFamily, mainText.SelectionFont.Size, Bold | Italic | Underline); } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.resx index 1af7de1..6dff4e6 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file -- cgit v1.2.3