All new ClassicTextBox

6 files changed, 127 insertions, 95 deletions

diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs
index 8939b84..153018a 100644
--- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs
@@ -30,10 +30,6 @@
         {
             this.components = new System.ComponentModel.Container();
             this.program = new System.Windows.Forms.Panel();
-            this.pnlSave = new System.Windows.Forms.Panel();
-            this.Button1 = new System.Windows.Forms.Button();
-            this.Label1 = new System.Windows.Forms.Label();
-            this.txtSave = new System.Windows.Forms.TextBox();
             this.mainView = new System.Windows.Forms.ListView();
             this.diskView = new System.Windows.Forms.TreeView();
             this.MenuStrip1 = new System.Windows.Forms.MenuStrip();
@@ -58,10 +54,16 @@
             this.bottomrightcorner = new System.Windows.Forms.Panel();
             this.bottomleftcorner = new System.Windows.Forms.Panel();
             this.topleftcorner = new System.Windows.Forms.Panel();
+            this.pnlSave = new System.Windows.Forms.Panel();
             this.refresh = new System.Windows.Forms.Timer(this.components);
+            this.classicLabel2 = new Histacom2.Engine.UI.ClassicLabel();
+            this.classicLabel1 = new Histacom2.Engine.UI.ClassicLabel();
+            this.classicButton1 = new Histacom2.Engine.UI.ClassicButton();
+            this.btnSave = new Histacom2.Engine.UI.ClassicButton();
+            this.txtSave = new Histacom2.Engine.UI.ClassicTextBox();
             this.program.SuspendLayout();
-            this.pnlSave.SuspendLayout();
             this.MenuStrip1.SuspendLayout();
+            this.pnlSave.SuspendLayout();
             this.SuspendLayout();
             // 
             // program
@@ -81,54 +83,12 @@
             this.program.Size = new System.Drawing.Size(704, 517);
             this.program.TabIndex = 13;
             // 
-            // pnlSave
-            // 
-            this.pnlSave.Controls.Add(this.Button1);
-            this.pnlSave.Controls.Add(this.Label1);
-            this.pnlSave.Controls.Add(this.txtSave);
-            this.pnlSave.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pnlSave.Location = new System.Drawing.Point(0, 482);
-            this.pnlSave.Name = "pnlSave";
-            this.pnlSave.Size = new System.Drawing.Size(704, 35);
-            this.pnlSave.TabIndex = 18;
-            this.pnlSave.Visible = false;
-            // 
-            // Button1
-            // 
-            this.Button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.Button1.Location = new System.Drawing.Point(629, 1);
-            this.Button1.Name = "Button1";
-            this.Button1.Size = new System.Drawing.Size(75, 23);
-            this.Button1.TabIndex = 17;
-            this.Button1.Text = "Save";
-            this.Button1.UseVisualStyleBackColor = true;
-            this.Button1.Click += new System.EventHandler(this.Button1_Click);
-            // 
-            // Label1
-            // 
-            this.Label1.AutoSize = true;
-            this.Label1.Location = new System.Drawing.Point(3, 6);
-            this.Label1.Name = "Label1";
-            this.Label1.Size = new System.Drawing.Size(57, 13);
-            this.Label1.TabIndex = 16;
-            this.Label1.Text = "File Name:";
-            // 
-            // txtSave
-            // 
-            this.txtSave.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtSave.Location = new System.Drawing.Point(60, 3);
-            this.txtSave.Name = "txtSave";
-            this.txtSave.Size = new System.Drawing.Size(563, 20);
-            this.txtSave.TabIndex = 15;
-            // 
             // mainView
             // 
             this.mainView.Dock = System.Windows.Forms.DockStyle.Fill;
             this.mainView.Location = new System.Drawing.Point(213, 24);
             this.mainView.Name = "mainView";
-            this.mainView.Size = new System.Drawing.Size(491, 458);
+            this.mainView.Size = new System.Drawing.Size(491, 439);
             this.mainView.TabIndex = 10;
             this.mainView.UseCompatibleStateImageBehavior = false;
             this.mainView.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.mainView_AfterLabelEdit);
@@ -139,7 +99,7 @@
             this.diskView.Dock = System.Windows.Forms.DockStyle.Left;
             this.diskView.Location = new System.Drawing.Point(0, 24);
             this.diskView.Name = "diskView";
-            this.diskView.Size = new System.Drawing.Size(213, 458);
+            this.diskView.Size = new System.Drawing.Size(213, 439);
             this.diskView.TabIndex = 13;
             this.diskView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.diskView_AfterSelect);
             // 
@@ -321,11 +281,84 @@
             this.topleftcorner.Size = new System.Drawing.Size(4, 4);
             this.topleftcorner.TabIndex = 1;
             // 
+            // pnlSave
+            // 
+            this.pnlSave.Controls.Add(this.txtSave);
+            this.pnlSave.Controls.Add(this.classicLabel2);
+            this.pnlSave.Controls.Add(this.classicLabel1);
+            this.pnlSave.Controls.Add(this.classicButton1);
+            this.pnlSave.Controls.Add(this.btnSave);
+            this.pnlSave.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pnlSave.Location = new System.Drawing.Point(0, 463);
+            this.pnlSave.Name = "pnlSave";
+            this.pnlSave.Size = new System.Drawing.Size(704, 54);
+            this.pnlSave.TabIndex = 18;
+            this.pnlSave.Visible = false;
+            // 
             // refresh
             // 
             this.refresh.Interval = 15000;
             this.refresh.Tick += new System.EventHandler(this.refresh_Tick);
             // 
+            // classicLabel2
+            // 
+            this.classicLabel2.Location = new System.Drawing.Point(3, 32);
+            this.classicLabel2.Name = "classicLabel2";
+            this.classicLabel2.Size = new System.Drawing.Size(64, 13);
+            this.classicLabel2.TabIndex = 19;
+            this.classicLabel2.Text = "File name:";
+            // 
+            // classicLabel1
+            // 
+            this.classicLabel1.Location = new System.Drawing.Point(3, 6);
+            this.classicLabel1.Name = "classicLabel1";
+            this.classicLabel1.Size = new System.Drawing.Size(64, 13);
+            this.classicLabel1.TabIndex = 19;
+            this.classicLabel1.Text = "File name:";
+            // 
+            // classicButton1
+            // 
+            this.classicButton1.AdaptBackColorWithTheme = true;
+            this.classicButton1.AdaptFontWithTheme = true;
+            this.classicButton1.AdaptForeColorWithTheme = true;
+            this.classicButton1.BackColor = System.Drawing.Color.Silver;
+            this.classicButton1.DialogResult = System.Windows.Forms.DialogResult.None;
+            this.classicButton1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.classicButton1.ForeColor = System.Drawing.Color.Black;
+            this.classicButton1.Location = new System.Drawing.Point(611, 29);
+            this.classicButton1.Name = "classicButton1";
+            this.classicButton1.Size = new System.Drawing.Size(75, 23);
+            this.classicButton1.TabIndex = 17;
+            this.classicButton1.Text = "Cancel";
+            this.classicButton1.Click += new System.EventHandler(this.btnSave_Click);
+            // 
+            // btnSave
+            // 
+            this.btnSave.AdaptBackColorWithTheme = true;
+            this.btnSave.AdaptFontWithTheme = true;
+            this.btnSave.AdaptForeColorWithTheme = true;
+            this.btnSave.BackColor = System.Drawing.Color.Silver;
+            this.btnSave.DialogResult = System.Windows.Forms.DialogResult.None;
+            this.btnSave.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.btnSave.ForeColor = System.Drawing.Color.Black;
+            this.btnSave.Location = new System.Drawing.Point(611, 1);
+            this.btnSave.Name = "btnSave";
+            this.btnSave.Size = new System.Drawing.Size(75, 25);
+            this.btnSave.TabIndex = 17;
+            this.btnSave.Text = "Save";
+            this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
+            // 
+            // txtSave
+            // 
+            this.txtSave.BackColor = System.Drawing.Color.White;
+            this.txtSave.Location = new System.Drawing.Point(56, 6);
+            this.txtSave.MaximumSize = new System.Drawing.Size(0, 17);
+            this.txtSave.MinimumSize = new System.Drawing.Size(100, 17);
+            this.txtSave.Name = "txtSave";
+            this.txtSave.Size = new System.Drawing.Size(549, 17);
+            this.txtSave.TabIndex = 22;
+            this.txtSave.UseSystemPasswordChar = false;
+            // 
             // Win95WindowsExplorer
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -336,10 +369,9 @@
             this.Load += new System.EventHandler(this.WinClassicWindowsExplorer_Load);
             this.program.ResumeLayout(false);
             this.program.PerformLayout();
-            this.pnlSave.ResumeLayout(false);
-            this.pnlSave.PerformLayout();
             this.MenuStrip1.ResumeLayout(false);
             this.MenuStrip1.PerformLayout();
+            this.pnlSave.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -372,9 +404,11 @@
         internal System.Windows.Forms.Panel topleftcorner;
         internal System.Windows.Forms.ListView mainView;
         internal System.Windows.Forms.Panel pnlSave;
-        internal System.Windows.Forms.Button Button1;
-        internal System.Windows.Forms.Label Label1;
-        internal System.Windows.Forms.TextBox txtSave;
         private System.Windows.Forms.Timer refresh;
+        private Engine.UI.ClassicButton btnSave;
+        private Engine.UI.ClassicButton classicButton1;
+        private Engine.UI.ClassicLabel classicLabel2;
+        private Engine.UI.ClassicLabel classicLabel1;
+        private Engine.UI.ClassicTextBox txtSave;
     }
 }
diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
index fa1e0ce..9038a96 100644
--- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
@@ -36,6 +36,16 @@ namespace Histacom2.OS.Win95.Win95Apps
         public Win95WindowsExplorer()
         {
             InitializeComponent();
+
+
+            // Fonts! yoy!
+
+            foreach (Control ctrl in this.Controls)
+            {
+                ctrl.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
+            }
+
+            //Histacom2.Engine.UI.CustomTextBox ctb = new Histacom2.Engine.UI.CustomTextBox(textBox1);
         }
 
         void WinClassicWindowsExplorer_Load(object sender, EventArgs e)
@@ -100,14 +110,14 @@ namespace Histacom2.OS.Win95.Win95Apps
             if (IsFileOpenDialog == true)
             {
                 pnlSave.Show();
-                Button1.Text = "Open";
+                btnSave.Text = "Open";
             }
             else
             {
                 if (IsFileSaveDialog == true)
                 {
                     pnlSave.Show();
-                    Button1.Text = "Save";
+                    btnSave.Text = "Save";
                 }
             }
 
@@ -701,7 +711,7 @@ namespace Histacom2.OS.Win95.Win95Apps
             RefreshTreeNode();
         }
 
-        private void Button1_Click(object sender, EventArgs e)
+        private void btnSave_Click(object sender, EventArgs e)
         {
             try
             {
@@ -728,9 +738,8 @@ namespace Histacom2.OS.Win95.Win95Apps
                         ((Form)this.TopLevelControl).Close();
                     }
                 }
-            } catch {
-
             }
+            catch { }
         }
 
         private void DeleteToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/Histacom2/SaveDialogs/SaveFileTroubleShooter.Designer.cs b/Histacom2/SaveDialogs/SaveFileTroubleShooter.Designer.cs
index 85c04fb..ff7b5c0 100644
--- a/Histacom2/SaveDialogs/SaveFileTroubleShooter.Designer.cs
+++ b/Histacom2/SaveDialogs/SaveFileTroubleShooter.Designer.cs
@@ -59,7 +59,7 @@
             this.pnlResolved.Controls.Add(this.label2);
             this.pnlResolved.Location = new System.Drawing.Point(12, 38);
             this.pnlResolved.Name = "pnlResolved";
-            this.pnlResolved.Size = new System.Drawing.Size(589, 275);
+            this.pnlResolved.Size = new System.Drawing.Size(518, 243);
             this.pnlResolved.TabIndex = 1;
             this.pnlResolved.Visible = false;
             // 
@@ -73,7 +73,7 @@
             this.textBox1.Name = "textBox1";
             this.textBox1.ReadOnly = true;
             this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.textBox1.Size = new System.Drawing.Size(567, 208);
+            this.textBox1.Size = new System.Drawing.Size(496, 176);
             this.textBox1.TabIndex = 3;
             // 
             // label3
@@ -100,15 +100,15 @@
             this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.panel2.Controls.Add(this.btnClose);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panel2.Location = new System.Drawing.Point(0, 315);
+            this.panel2.Location = new System.Drawing.Point(0, 283);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(612, 30);
+            this.panel2.Size = new System.Drawing.Size(541, 30);
             this.panel2.TabIndex = 2;
             // 
             // btnClose
             // 
             this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnClose.Location = new System.Drawing.Point(526, 4);
+            this.btnClose.Location = new System.Drawing.Point(455, 4);
             this.btnClose.Name = "btnClose";
             this.btnClose.Size = new System.Drawing.Size(75, 23);
             this.btnClose.TabIndex = 0;
@@ -120,12 +120,11 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(612, 345);
+            this.ClientSize = new System.Drawing.Size(541, 313);
             this.Controls.Add(this.panel2);
             this.Controls.Add(this.pnlResolved);
             this.Controls.Add(this.label1);
             this.Name = "SaveFileTroubleShooter";
-            this.Text = "Save File Troubleshooter";
             this.Load += new System.EventHandler(this.SaveFileTroubleShooter_Load);
             this.pnlResolved.ResumeLayout(false);
             this.pnlResolved.PerformLayout();
diff --git a/Histacom2/TitleScreen.Designer.cs b/Histacom2/TitleScreen.Designer.cs
index 3d3ef0c..d73f29f 100644
--- a/Histacom2/TitleScreen.Designer.cs
+++ b/Histacom2/TitleScreen.Designer.cs
@@ -30,7 +30,6 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TitleScreen));
-            this.vmModeTimer = new System.Windows.Forms.Timer(this.components);
             this.program = new System.Windows.Forms.Panel();
             this.programContent = new System.Windows.Forms.Panel();
             this.pictureBox3 = new System.Windows.Forms.PictureBox();
@@ -72,10 +71,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
             this.SuspendLayout();
             // 
-            // vmModeTimer
-            // 
-            this.vmModeTimer.Tick += new System.EventHandler(this.vmModeTimer_Tick);
-            // 
             // program
             // 
             this.program.BackColor = System.Drawing.Color.Silver;
@@ -148,6 +143,7 @@
             0,
             0,
             0});
+            this.VM_Height.Visible = false;
             // 
             // VM_Width
             // 
@@ -170,6 +166,7 @@
             0,
             0,
             0});
+            this.VM_Width.Visible = false;
             // 
             // vm_mode
             // 
@@ -182,6 +179,7 @@
             this.vm_mode.TabIndex = 4;
             this.vm_mode.Text = "VM Mode";
             this.vm_mode.UseVisualStyleBackColor = false;
+            this.vm_mode.CheckStateChanged += new System.EventHandler(this.vm_mode_CheckStateChanged);
             // 
             // pictureBox1
             // 
@@ -427,7 +425,6 @@
         }
 
         #endregion
-        private System.Windows.Forms.Timer vmModeTimer;
         internal System.Windows.Forms.Panel program;
         internal System.Windows.Forms.Panel toprightcorner;
         internal System.Windows.Forms.Panel bottomrightcorner;
diff --git a/Histacom2/TitleScreen.cs b/Histacom2/TitleScreen.cs
index 37539d9..ea06ce2 100644
--- a/Histacom2/TitleScreen.cs
+++ b/Histacom2/TitleScreen.cs
@@ -137,9 +137,6 @@ namespace Histacom2
             SettingsToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
             HelpToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
             ShutdownToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
-
-            // Start the VM Mode timer
-            vmModeTimer.Start();
         }
 
         private static void leet()
@@ -155,23 +152,6 @@ namespace Histacom2
             wm.Init(leet, "Thank You", null, true, true);
         }
 
-        // The VM Mode timer / checker. Updates every 100ms
-        private void vmModeTimer_Tick(object sender, EventArgs e)
-        {
-            // Check for VM mode
-            if (vm_mode.Checked == true)
-            {
-                VM_Width.Visible = true;
-                VM_Height.Visible = true;
-            }
-            // If VM Mode is disabled
-            else
-            {
-                VM_Width.Visible = false;
-                VM_Height.Visible = false;
-            }
-        }
-
         #region Menu Buttons
 
         #region NewGame
@@ -296,5 +276,21 @@ namespace Histacom2
             AchievementScreen achievelist = new AchievementScreen();
             achievelist.ShowDialog();
         }
+
+        private void vm_mode_CheckStateChanged(object sender, EventArgs e)
+        {
+            // Check for VM mode
+            if (vm_mode.Checked == true)
+            {
+                VM_Width.Visible = true;
+                VM_Height.Visible = true;
+            }
+            // If VM Mode is disabled
+            else
+            {
+                VM_Width.Visible = false;
+                VM_Height.Visible = false;
+            }
+        }
     }
 }
diff --git a/Histacom2/TitleScreen.resx b/Histacom2/TitleScreen.resx
index 435fff8..ba800cd 100644
--- a/Histacom2/TitleScreen.resx
+++ b/Histacom2/TitleScreen.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="vmModeTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="panel2.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>