From f6da3b0cfd6c63c5d1d07df8b7e41f499de645fa Mon Sep 17 00:00:00 2001 From: jtsshieh Date: Mon, 23 Oct 2017 22:11:09 -0400 Subject: Added in Welcome Screen for win98 (not tested) --- Histacom2/OS/Win95/Win95.cs | 2 +- .../OS/Win95/Win95Apps/Win95Welcome.Designer.cs | 132 +++++++++++++++++++++ Histacom2/OS/Win95/Win95Apps/Win95Welcome.cs | 25 ++++ Histacom2/OS/Win95/Win95Apps/Win95Welcome.resx | 120 +++++++++++++++++++ .../Win95/Win95Apps/WinClassicWelcome.Designer.cs | 132 --------------------- Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs | 25 ---- .../OS/Win95/Win95Apps/WinClassicWelcome.resx | 120 ------------------- 7 files changed, 278 insertions(+), 278 deletions(-) create mode 100644 Histacom2/OS/Win95/Win95Apps/Win95Welcome.Designer.cs create mode 100644 Histacom2/OS/Win95/Win95Apps/Win95Welcome.cs create mode 100644 Histacom2/OS/Win95/Win95Apps/Win95Welcome.resx delete mode 100644 Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs delete mode 100644 Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs delete mode 100644 Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.resx (limited to 'Histacom2/OS/Win95') diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index 38129ab..e330ea0 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -118,7 +118,7 @@ namespace Histacom2.OS.Win95 { CurrentSave.FTime95 = true; SaveGame(); - welcome = wm.Init(new WinClassicWelcome(), "Welcome", null, false, false, resize: false); + welcome = wm.Init(new Win95Welcome(), "Welcome", null, false, false, resize: false); AddTaskBarItem(welcome, welcome.Tag.ToString(), "Welcome", null); nonimportantapps.Add(welcome); diff --git a/Histacom2/OS/Win95/Win95Apps/Win95Welcome.Designer.cs b/Histacom2/OS/Win95/Win95Apps/Win95Welcome.Designer.cs new file mode 100644 index 0000000..d9110f7 --- /dev/null +++ b/Histacom2/OS/Win95/Win95Apps/Win95Welcome.Designer.cs @@ -0,0 +1,132 @@ +namespace Histacom2.OS.Win95.Win95Apps +{ + partial class Win95Welcome + { + /// + /// 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.imgTip = new System.Windows.Forms.PictureBox(); + this.imgPnl = new System.Windows.Forms.PictureBox(); + this.imgWelcome = new System.Windows.Forms.PictureBox(); + this.btnClose = new Histacom2.Engine.UI.ClassicButton(); + this.btnOnline = new Histacom2.Engine.UI.ClassicButton(); + this.btnTour = new Histacom2.Engine.UI.ClassicButton(); + ((System.ComponentModel.ISupportInitialize)(this.imgTip)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.imgPnl)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.imgWelcome)).BeginInit(); + this.SuspendLayout(); + // + // imgTip + // + this.imgTip.BackgroundImage = global::Histacom2.Properties.Resources.win95_welcometip; + this.imgTip.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.imgTip.Location = new System.Drawing.Point(16, 49); + this.imgTip.Name = "imgTip"; + this.imgTip.Size = new System.Drawing.Size(330, 255); + this.imgTip.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.imgTip.TabIndex = 17; + this.imgTip.TabStop = false; + // + // imgPnl + // + this.imgPnl.Image = global::Histacom2.Properties.Resources.win95_splitter; + this.imgPnl.Location = new System.Drawing.Point(358, 142); + this.imgPnl.Name = "imgPnl"; + this.imgPnl.Size = new System.Drawing.Size(112, 2); + this.imgPnl.TabIndex = 16; + this.imgPnl.TabStop = false; + // + // imgWelcome + // + this.imgWelcome.BackgroundImage = global::Histacom2.Properties.Resources.win95_welcome; + this.imgWelcome.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.imgWelcome.Location = new System.Drawing.Point(19, 17); + this.imgWelcome.Name = "imgWelcome"; + this.imgWelcome.Size = new System.Drawing.Size(292, 19); + this.imgWelcome.TabIndex = 18; + this.imgWelcome.TabStop = false; + // + // btnClose + // + this.btnClose.BackColor = System.Drawing.Color.Silver; + this.btnClose.ForeColor = System.Drawing.Color.Black; + this.btnClose.Location = new System.Drawing.Point(358, 156); + this.btnClose.Name = "btnClose"; + this.btnClose.Size = new System.Drawing.Size(115, 26); + this.btnClose.TabIndex = 15; + this.btnClose.Text = "Close"; + this.btnClose.Click += new System.EventHandler(this.btnClose_Click); + // + // btnOnline + // + this.btnOnline.BackColor = System.Drawing.Color.Silver; + this.btnOnline.ForeColor = System.Drawing.Color.Black; + this.btnOnline.Location = new System.Drawing.Point(356, 78); + this.btnOnline.Name = "btnOnline"; + this.btnOnline.Size = new System.Drawing.Size(115, 26); + this.btnOnline.TabIndex = 14; + this.btnOnline.Text = "&Online Registration"; + // + // btnTour + // + this.btnTour.BackColor = System.Drawing.Color.Silver; + this.btnTour.ForeColor = System.Drawing.Color.Black; + this.btnTour.Location = new System.Drawing.Point(356, 49); + this.btnTour.Name = "btnTour"; + this.btnTour.Size = new System.Drawing.Size(115, 26); + this.btnTour.TabIndex = 12; + this.btnTour.Text = "What\'s &New"; + // + // WinClassicWelcome + // + 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.imgWelcome); + this.Controls.Add(this.imgTip); + this.Controls.Add(this.imgPnl); + this.Controls.Add(this.btnClose); + this.Controls.Add(this.btnOnline); + this.Controls.Add(this.btnTour); + this.Name = "WinClassicWelcome"; + this.Size = new System.Drawing.Size(483, 322); + ((System.ComponentModel.ISupportInitialize)(this.imgTip)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.imgPnl)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.imgWelcome)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.PictureBox imgTip; + private System.Windows.Forms.PictureBox imgPnl; + private Histacom2.Engine.UI.ClassicButton btnClose; + private Histacom2.Engine.UI.ClassicButton btnOnline; + private Histacom2.Engine.UI.ClassicButton btnTour; + private System.Windows.Forms.PictureBox imgWelcome; + } +} diff --git a/Histacom2/OS/Win95/Win95Apps/Win95Welcome.cs b/Histacom2/OS/Win95/Win95Apps/Win95Welcome.cs new file mode 100644 index 0000000..9b7280b --- /dev/null +++ b/Histacom2/OS/Win95/Win95Apps/Win95Welcome.cs @@ -0,0 +1,25 @@ +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; + +namespace Histacom2.OS.Win95.Win95Apps +{ + public partial class Win95Welcome : UserControl + { + public Win95Welcome() + { + InitializeComponent(); + } + + private void btnClose_Click(object sender, EventArgs e) + { + ParentForm.Close(); + } + } +} diff --git a/Histacom2/OS/Win95/Win95Apps/Win95Welcome.resx b/Histacom2/OS/Win95/Win95Apps/Win95Welcome.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Histacom2/OS/Win95/Win95Apps/Win95Welcome.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs deleted file mode 100644 index 8c1f84a..0000000 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs +++ /dev/null @@ -1,132 +0,0 @@ -namespace Histacom2.OS.Win95.Win95Apps -{ - partial class WinClassicWelcome - { - /// - /// 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.imgTip = new System.Windows.Forms.PictureBox(); - this.imgPnl = new System.Windows.Forms.PictureBox(); - this.imgWelcome = new System.Windows.Forms.PictureBox(); - this.btnClose = new Histacom2.Engine.UI.ClassicButton(); - this.btnOnline = new Histacom2.Engine.UI.ClassicButton(); - this.btnTour = new Histacom2.Engine.UI.ClassicButton(); - ((System.ComponentModel.ISupportInitialize)(this.imgTip)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.imgPnl)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.imgWelcome)).BeginInit(); - this.SuspendLayout(); - // - // imgTip - // - this.imgTip.BackgroundImage = global::Histacom2.Properties.Resources.win95_welcometip; - this.imgTip.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.imgTip.Location = new System.Drawing.Point(16, 49); - this.imgTip.Name = "imgTip"; - this.imgTip.Size = new System.Drawing.Size(330, 255); - this.imgTip.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.imgTip.TabIndex = 17; - this.imgTip.TabStop = false; - // - // imgPnl - // - this.imgPnl.Image = global::Histacom2.Properties.Resources.win95_splitter; - this.imgPnl.Location = new System.Drawing.Point(358, 142); - this.imgPnl.Name = "imgPnl"; - this.imgPnl.Size = new System.Drawing.Size(112, 2); - this.imgPnl.TabIndex = 16; - this.imgPnl.TabStop = false; - // - // imgWelcome - // - this.imgWelcome.BackgroundImage = global::Histacom2.Properties.Resources.win95_welcome; - this.imgWelcome.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.imgWelcome.Location = new System.Drawing.Point(19, 17); - this.imgWelcome.Name = "imgWelcome"; - this.imgWelcome.Size = new System.Drawing.Size(292, 19); - this.imgWelcome.TabIndex = 18; - this.imgWelcome.TabStop = false; - // - // btnClose - // - this.btnClose.BackColor = System.Drawing.Color.Silver; - this.btnClose.ForeColor = System.Drawing.Color.Black; - this.btnClose.Location = new System.Drawing.Point(358, 156); - this.btnClose.Name = "btnClose"; - this.btnClose.Size = new System.Drawing.Size(115, 26); - this.btnClose.TabIndex = 15; - this.btnClose.Text = "Close"; - this.btnClose.Click += new System.EventHandler(this.btnClose_Click); - // - // btnOnline - // - this.btnOnline.BackColor = System.Drawing.Color.Silver; - this.btnOnline.ForeColor = System.Drawing.Color.Black; - this.btnOnline.Location = new System.Drawing.Point(356, 78); - this.btnOnline.Name = "btnOnline"; - this.btnOnline.Size = new System.Drawing.Size(115, 26); - this.btnOnline.TabIndex = 14; - this.btnOnline.Text = "&Online Registration"; - // - // btnTour - // - this.btnTour.BackColor = System.Drawing.Color.Silver; - this.btnTour.ForeColor = System.Drawing.Color.Black; - this.btnTour.Location = new System.Drawing.Point(356, 49); - this.btnTour.Name = "btnTour"; - this.btnTour.Size = new System.Drawing.Size(115, 26); - this.btnTour.TabIndex = 12; - this.btnTour.Text = "What\'s &New"; - // - // WinClassicWelcome - // - 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.imgWelcome); - this.Controls.Add(this.imgTip); - this.Controls.Add(this.imgPnl); - this.Controls.Add(this.btnClose); - this.Controls.Add(this.btnOnline); - this.Controls.Add(this.btnTour); - this.Name = "WinClassicWelcome"; - this.Size = new System.Drawing.Size(483, 322); - ((System.ComponentModel.ISupportInitialize)(this.imgTip)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.imgPnl)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.imgWelcome)).EndInit(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.PictureBox imgTip; - private System.Windows.Forms.PictureBox imgPnl; - private Histacom2.Engine.UI.ClassicButton btnClose; - private Histacom2.Engine.UI.ClassicButton btnOnline; - private Histacom2.Engine.UI.ClassicButton btnTour; - private System.Windows.Forms.PictureBox imgWelcome; - } -} diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs deleted file mode 100644 index 6ec79a4..0000000 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs +++ /dev/null @@ -1,25 +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; - -namespace Histacom2.OS.Win95.Win95Apps -{ - public partial class WinClassicWelcome : UserControl - { - public WinClassicWelcome() - { - InitializeComponent(); - } - - private void btnClose_Click(object sender, EventArgs e) - { - ParentForm.Close(); - } - } -} diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.resx b/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.resx deleted file mode 100644 index 1af7de1..0000000 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.resx +++ /dev/null @@ -1,120 +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 - - \ No newline at end of file -- cgit v1.2.3