diff --git a/Histacom2/OS/Win95/Win95.Designer.cs b/Histacom2/OS/Win95/Win95.Designer.cs
index 8e17941..f393333 100644
--- a/Histacom2/OS/Win95/Win95.Designer.cs
+++ b/Histacom2/OS/Win95/Win95.Designer.cs
@@ -35,10 +35,10 @@ private void InitializeComponent()
this.panel1 = new System.Windows.Forms.Panel();
this.panel2 = new System.Windows.Forms.Panel();
this.taskbar = new System.Windows.Forms.Panel();
+ this.startbutton = new System.Windows.Forms.PictureBox();
this.clockPanel = new System.Windows.Forms.Panel();
this.taskbartime = new System.Windows.Forms.Label();
this.taskbarItems = new System.Windows.Forms.Panel();
- this.startbutton = new System.Windows.Forms.PictureBox();
this.startmenu = new System.Windows.Forms.Panel();
this.startmenuitems = new System.Windows.Forms.MenuStrip();
this.ProgramsToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem();
@@ -83,9 +83,6 @@ private void InitializeComponent()
this.TimeDistorterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.FTPClientToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.DocumentsToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem();
- this.downloaderTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.installerTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.storyTest1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.SettingsToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem();
this.ControlPanelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PrintersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -113,8 +110,8 @@ private void InitializeComponent()
this.desktopupdate = new System.Windows.Forms.Timer(this.components);
this.panel1.SuspendLayout();
this.taskbar.SuspendLayout();
- this.clockPanel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.startbutton)).BeginInit();
+ this.clockPanel.SuspendLayout();
this.startmenu.SuspendLayout();
this.startmenuitems.SuspendLayout();
this.ossidestartmenu.SuspendLayout();
@@ -154,6 +151,16 @@ private void InitializeComponent()
this.taskbar.TabIndex = 2;
this.taskbar.Paint += new System.Windows.Forms.PaintEventHandler(this.taskbar_Paint);
//
+ // startbutton
+ //
+ this.startbutton.Image = global::Histacom2.Properties.Resources.WinClassicStart;
+ this.startbutton.Location = new System.Drawing.Point(2, 4);
+ this.startbutton.Name = "startbutton";
+ this.startbutton.Size = new System.Drawing.Size(54, 22);
+ this.startbutton.TabIndex = 3;
+ this.startbutton.TabStop = false;
+ this.startbutton.Click += new System.EventHandler(this.startbutton_Click);
+ //
// clockPanel
//
this.clockPanel.BackgroundImage = global::Histacom2.Properties.Resources.WinClassicTime;
@@ -185,16 +192,6 @@ private void InitializeComponent()
this.taskbarItems.Size = new System.Drawing.Size(3648, 22);
this.taskbarItems.TabIndex = 5;
//
- // startbutton
- //
- this.startbutton.Image = global::Histacom2.Properties.Resources.WinClassicStart;
- this.startbutton.Location = new System.Drawing.Point(2, 4);
- this.startbutton.Name = "startbutton";
- this.startbutton.Size = new System.Drawing.Size(54, 22);
- this.startbutton.TabIndex = 3;
- this.startbutton.TabStop = false;
- this.startbutton.Click += new System.EventHandler(this.startbutton_Click);
- //
// startmenu
//
this.startmenu.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -239,6 +236,7 @@ private void InitializeComponent()
this.ProgramsToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
this.ProgramsToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
this.ProgramsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ this.ProgramsToolStripMenuItem.DoBackColorAdapt = false;
this.ProgramsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.AccessoriesToolStripMenuItem,
this.StartUpToolStripMenuItem,
@@ -257,9 +255,11 @@ private void InitializeComponent()
this.ProgramsToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicPrograms;
this.ProgramsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.ProgramsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.ProgramsToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle;
this.ProgramsToolStripMenuItem.Name = "ProgramsToolStripMenuItem";
this.ProgramsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
this.ProgramsToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+ this.ProgramsToolStripMenuItem.SubTitle = "Subtitle";
this.ProgramsToolStripMenuItem.Text = "&Programs";
//
// AccessoriesToolStripMenuItem
@@ -686,6 +686,7 @@ private void InitializeComponent()
this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
this.StartRunnerToolStripMenuItem.Text = "Start Runner";
this.StartRunnerToolStripMenuItem.Visible = false;
+ this.StartRunnerToolStripMenuItem.Click += new System.EventHandler(this.StartRunnerToolStripMenuItem_Click);
//
// ErrorBlasterToolStripMenuItem
//
@@ -750,48 +751,22 @@ private void InitializeComponent()
this.DocumentsToolStripMenuItem.AutoSize = false;
this.DocumentsToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
this.DocumentsToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
- this.DocumentsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.downloaderTestToolStripMenuItem,
- this.installerTestToolStripMenuItem,
- this.storyTest1ToolStripMenuItem});
+ this.DocumentsToolStripMenuItem.DoBackColorAdapt = false;
this.DocumentsToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicDocuments;
this.DocumentsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.DocumentsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.DocumentsToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle;
this.DocumentsToolStripMenuItem.Name = "DocumentsToolStripMenuItem";
this.DocumentsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+ this.DocumentsToolStripMenuItem.SubTitle = "Subtitle";
this.DocumentsToolStripMenuItem.Text = "&Documents";
//
- // downloaderTestToolStripMenuItem
- //
- this.downloaderTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
- this.downloaderTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("downloaderTestToolStripMenuItem.BackgroundImage")));
- this.downloaderTestToolStripMenuItem.Name = "downloaderTestToolStripMenuItem";
- this.downloaderTestToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
- this.downloaderTestToolStripMenuItem.Text = "DownloaderTest";
- this.downloaderTestToolStripMenuItem.Click += new System.EventHandler(this.downloaderTestToolStripMenuItem_Click);
- //
- // installerTestToolStripMenuItem
- //
- this.installerTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
- this.installerTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("installerTestToolStripMenuItem.BackgroundImage")));
- this.installerTestToolStripMenuItem.Name = "installerTestToolStripMenuItem";
- this.installerTestToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
- this.installerTestToolStripMenuItem.Text = "InstallerTest";
- this.installerTestToolStripMenuItem.Click += new System.EventHandler(this.installerTestToolStripMenuItem_Click);
- //
- // storyTest1ToolStripMenuItem
- //
- this.storyTest1ToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
- this.storyTest1ToolStripMenuItem.Name = "storyTest1ToolStripMenuItem";
- this.storyTest1ToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
- this.storyTest1ToolStripMenuItem.Text = "StoryTest1";
- this.storyTest1ToolStripMenuItem.Click += new System.EventHandler(this.storyTest1ToolStripMenuItem_Click);
- //
// SettingsToolStripMenuItem
//
this.SettingsToolStripMenuItem.AutoSize = false;
this.SettingsToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+ this.SettingsToolStripMenuItem.DoBackColorAdapt = false;
this.SettingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ControlPanelToolStripMenuItem,
this.PrintersToolStripMenuItem,
@@ -799,9 +774,11 @@ private void InitializeComponent()
this.SettingsToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicSettings;
this.SettingsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.SettingsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.SettingsToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle;
this.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem";
this.SettingsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+ this.SettingsToolStripMenuItem.SubTitle = "Subtitle";
this.SettingsToolStripMenuItem.Text = "&Settings";
//
// ControlPanelToolStripMenuItem
@@ -811,7 +788,7 @@ private void InitializeComponent()
this.ControlPanelToolStripMenuItem.Image = global::Histacom2.Properties.Resources.Win95ControlPanelIcon;
this.ControlPanelToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.ControlPanelToolStripMenuItem.Name = "ControlPanelToolStripMenuItem";
- this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+ this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.ControlPanelToolStripMenuItem.Text = "Control Panel";
//
// PrintersToolStripMenuItem
@@ -821,7 +798,7 @@ private void InitializeComponent()
this.PrintersToolStripMenuItem.Image = global::Histacom2.Properties.Resources.Win95PrintersFolder;
this.PrintersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.PrintersToolStripMenuItem.Name = "PrintersToolStripMenuItem";
- this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+ this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.PrintersToolStripMenuItem.Text = "Printers";
this.PrintersToolStripMenuItem.Click += new System.EventHandler(this.infoboxTestToolStripMenuItem_Click);
//
@@ -831,7 +808,7 @@ private void InitializeComponent()
this.TaskbarToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("TaskbarToolStripMenuItem.BackgroundImage")));
this.TaskbarToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.TaskbarToolStripMenuItem.Name = "TaskbarToolStripMenuItem";
- this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+ this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.TaskbarToolStripMenuItem.Text = "Taskbar";
//
// FindToolStripMenuItem
@@ -839,6 +816,7 @@ private void InitializeComponent()
this.FindToolStripMenuItem.AutoSize = false;
this.FindToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
this.FindToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("FindToolStripMenuItem.BackgroundImage")));
+ this.FindToolStripMenuItem.DoBackColorAdapt = false;
this.FindToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FilesOrFoldersToolStripMenuItem,
this.ComputerToolStripMenuItem,
@@ -847,10 +825,12 @@ private void InitializeComponent()
this.FindToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicFind;
this.FindToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.FindToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.FindToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle;
this.FindToolStripMenuItem.Name = "FindToolStripMenuItem";
this.FindToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
this.FindToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.FindToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+ this.FindToolStripMenuItem.SubTitle = "Subtitle";
this.FindToolStripMenuItem.Text = "&Find";
//
// FilesOrFoldersToolStripMenuItem
@@ -861,7 +841,6 @@ private void InitializeComponent()
this.FilesOrFoldersToolStripMenuItem.Name = "FilesOrFoldersToolStripMenuItem";
this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
this.FilesOrFoldersToolStripMenuItem.Text = "Files or Folders...";
- this.FilesOrFoldersToolStripMenuItem.Click += new System.EventHandler(this.FilesOrFoldersToolStripMenuItem_Click);
//
// ComputerToolStripMenuItem
//
@@ -894,50 +873,62 @@ private void InitializeComponent()
//
this.HelpToolStripMenuItem.AutoSize = false;
this.HelpToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+ this.HelpToolStripMenuItem.DoBackColorAdapt = false;
this.HelpToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicHelp;
this.HelpToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.HelpToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.HelpToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle;
this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem";
this.HelpToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
this.HelpToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.HelpToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+ this.HelpToolStripMenuItem.SubTitle = "Subtitle";
this.HelpToolStripMenuItem.Text = "&Help";
//
// RunToolStripMenuItem
//
this.RunToolStripMenuItem.AutoSize = false;
this.RunToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+ this.RunToolStripMenuItem.DoBackColorAdapt = false;
this.RunToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicRun;
this.RunToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.RunToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.RunToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle;
this.RunToolStripMenuItem.Name = "RunToolStripMenuItem";
this.RunToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
this.RunToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.RunToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+ this.RunToolStripMenuItem.SubTitle = "Subtitle";
this.RunToolStripMenuItem.Text = "&Run...";
//
// SuspendToolStripMenuItem
//
this.SuspendToolStripMenuItem.AutoSize = false;
this.SuspendToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+ this.SuspendToolStripMenuItem.DoBackColorAdapt = false;
this.SuspendToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicSuspend;
this.SuspendToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.SuspendToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.SuspendToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle;
this.SuspendToolStripMenuItem.Name = "SuspendToolStripMenuItem";
this.SuspendToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
this.SuspendToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+ this.SuspendToolStripMenuItem.SubTitle = "Subtitle";
this.SuspendToolStripMenuItem.Text = "Suspe&nd";
//
// ShutdownToolStripMenuItem
//
this.ShutdownToolStripMenuItem.AutoSize = false;
this.ShutdownToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+ this.ShutdownToolStripMenuItem.DoBackColorAdapt = false;
this.ShutdownToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicShutdown;
this.ShutdownToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.ShutdownToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.ShutdownToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle;
this.ShutdownToolStripMenuItem.Name = "ShutdownToolStripMenuItem";
this.ShutdownToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
this.ShutdownToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+ this.ShutdownToolStripMenuItem.SubTitle = "Subtitle";
this.ShutdownToolStripMenuItem.Text = "Sh&ut Down...";
this.ShutdownToolStripMenuItem.Click += new System.EventHandler(this.ShutdownToolStripMenuItem_Click);
//
@@ -1078,9 +1069,9 @@ private void InitializeComponent()
this.Load += new System.EventHandler(this.Desktop_Load);
this.panel1.ResumeLayout(false);
this.taskbar.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.startbutton)).EndInit();
this.clockPanel.ResumeLayout(false);
this.clockPanel.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.startbutton)).EndInit();
this.startmenu.ResumeLayout(false);
this.startmenuitems.ResumeLayout(false);
this.startmenuitems.PerformLayout();
@@ -1162,10 +1153,7 @@ private void InitializeComponent()
internal System.Windows.Forms.ToolStripMenuItem TextDocumentToolStripMenuItem;
internal System.Windows.Forms.ToolStripMenuItem PropertiesToolStripMenuItem1;
internal System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Windows95));
- private System.Windows.Forms.ToolStripMenuItem downloaderTestToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem installerTestToolStripMenuItem;
private System.Windows.Forms.Panel taskbarItems;
- private System.Windows.Forms.ToolStripMenuItem storyTest1ToolStripMenuItem;
internal System.Windows.Forms.ToolStripMenuItem FTPClientToolStripMenuItem;
private System.Windows.Forms.Timer desktopupdate;
private System.Windows.Forms.ToolStripMenuItem deleteToolStripMenuItem;
diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs
index e330ea0..ff60c42 100644
--- a/Histacom2/OS/Win95/Win95.cs
+++ b/Histacom2/OS/Win95/Win95.cs
@@ -235,29 +235,6 @@ private void NotePadToolStripMenuItem_Click(object sender, EventArgs e)
app.BringToFront();
startmenu.Hide();
}
- private void downloaderTestToolStripMenuItem_Click(object sender, EventArgs e)
- {
- WinClassicDownloader opendownload = new WinClassicDownloader();
- WinClassic app = wm.Init(opendownload, "Downloader", null, false, true, resize: false);
- opendownload.appName.Text = "Downloading: Survive The Day";
-
- AddTaskBarItem(app, app.Tag.ToString(), "Downloader", null);
-
- app.BringToFront();
- startmenu.Hide();
- }
-
- private void installerTestToolStripMenuItem_Click(object sender, EventArgs e)
- {
- Win95Installer openinstaller = new Win95Installer("Testing");
- WinClassic app = wm.Init(openinstaller, "Installer", null, false, true, resize: false);
-
- AddTaskBarItem(app, app.Tag.ToString(), "Installer", null);
-
- app.BringToFront();
- startmenu.Hide();
- }
-
private void InternetExplorerToolStripMenuItem_Click(object sender, EventArgs e)
{
if (ie != null) { wm.StartInfobox95("Error Opening Internet Explorer", "An instance of Internet Explorer 4 is already open.", InfoboxType.Warning, InfoboxButtons.OK); return; }
@@ -432,20 +409,6 @@ private void storyTest1ToolStripMenuItem_Click(object sender, EventArgs e)
Hack1.StartObjective();
}
- private void temp_for_std(object sender, EventArgs e)
- {
- Win2K.Win2KApps.SurviveTheDay std = new Win2K.Win2KApps.SurviveTheDay();
- WinClassic app = wm.Init(std, "Survive The Day", null, false, false);
- AddTaskBarItem(app, app.Tag.ToString(), "Survive The Day", null);
-
- nonimportantapps.Add(app);
- nonimportantapps[nonimportantapps.Count - 1].BringToFront();
- nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing);
-
- app.BringToFront();
- startmenu.Hide();
- }
-
private void MSDOSPromptToolStripMenuItem1_Click (object sender, EventArgs e)
{
WinClassicTerminal msdos = new WinClassicTerminal(false);
@@ -673,7 +636,7 @@ private void ErrorBlasterToolStripMenuItem_Click(object sender, EventArgs e)
startmenu.Hide();
}
- private void FilesOrFoldersToolStripMenuItem_Click(object sender, EventArgs e)
+ private void StartRunnerToolStripMenuItem_Click(object sender, EventArgs e)
{
WinClassic app = wm.Init(new StartRunner95(), "Welcome to Start Runner 95!", null, false, false, false, false);
AddTaskBarItem(app, app.Tag.ToString(), "Welcome to Start Runner 95!", null);
@@ -684,6 +647,7 @@ private void FilesOrFoldersToolStripMenuItem_Click(object sender, EventArgs e)
app.BringToFront();
startmenu.Hide();
+
}
}
}
diff --git a/Histacom2/OS/Win95/Win95.resx b/Histacom2/OS/Win95/Win95.resx
index 3aabd22..ab9cdf4 100644
--- a/Histacom2/OS/Win95/Win95.resx
+++ b/Histacom2/OS/Win95/Win95.resx
@@ -121,41 +121,6 @@
17, 17
-
-
- iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
- 4AAABIQCQUtXaBsAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
- 4AAABIQCQUtXaBsAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
- 4AAABIQCQUtXaBsAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
- 4AAABIQCQUtXaBsAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
- 4AAABIQCQUtXaBsAAAAASUVORK5CYII=
-
-
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAALRJREFUOE+N
@@ -326,20 +291,6 @@
wQAADsEBuJFr7QAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh
EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK
6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
- 4AAABIQCQUtXaBsAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
- 4AAABIQCQUtXaBsAAAAASUVORK5CYII=
@@ -361,6 +312,41 @@
iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
4AAABIQCQUtXaBsAAAAASUVORK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+ 4AAABIQCQUtXaBsAAAAASUVORK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+ 4AAABIQCQUtXaBsAAAAASUVORK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+ 4AAABIQCQUtXaBsAAAAASUVORK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+ 4AAABIQCQUtXaBsAAAAASUVORK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+ 4AAABIQCQUtXaBsAAAAASUVORK5CYII=
@@ -374,7 +360,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACO
- hAAAAk1TRnQBSQFMAgEBDQEAASwBAwEsAQMBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
+ hAAAAk1TRnQBSQFMAgEBDQEAATwBAwE8AQMBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
AwABgAMAAQEBAAEgBwABASQAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH//wChAAOAAf8DwAH/
A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs
index de2e4b0..34828cc 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs
@@ -34,6 +34,7 @@ public WinClassicIE3()
public static async void GoToPage(string url)
{
+ string newURL = url;
UserControl uc = new UserControl();
switch (url)
@@ -50,12 +51,24 @@ public static async void GoToPage(string url)
case "www.12padams.com":
uc = new _12padams1998();
break;
+ case "12padams.com":
+ uc = new _12padams1998();
+ newURL = "www.12padams.com";
+ break;
+ case "google.com":
+ uc = new GoogleHome();
+ newURL = "www.google.com";
+ break;
+ case "google.stanford.edu":
+ uc = new GooglePrototype();
+ newURL = "www.google.stanford.edu";
+ break;
default:
uc = new IENoPage();
break;
}
- addressbar.Text = url;
+ addressbar.Text = newURL;
uc.Dock = DockStyle.Fill;
await Task.Delay(new Random().Next(500, 1500));
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs
index 33ab4f2..9421bdc 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs
@@ -104,10 +104,17 @@ private void InitializeComponent()
//
// btnGo
//
- this.btnGo.Location = new System.Drawing.Point(162, 133);
+ this.btnGo.AdaptBackColorWithTheme = true;
+ this.btnGo.AdaptFontWithTheme = true;
+ this.btnGo.AdaptForeColorWithTheme = true;
+ this.btnGo.BackColor = System.Drawing.Color.Silver;
+ this.btnGo.DialogResult = System.Windows.Forms.DialogResult.None;
+ this.btnGo.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+ this.btnGo.ForeColor = System.Drawing.Color.Black;
+ this.btnGo.Location = new System.Drawing.Point(155, 133);
this.btnGo.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.btnGo.Name = "btnGo";
- this.btnGo.Size = new System.Drawing.Size(124, 23);
+ this.btnGo.Size = new System.Drawing.Size(131, 23);
this.btnGo.TabIndex = 7;
this.btnGo.Text = "Go To Destination Year";
this.btnGo.Click += new System.EventHandler(this.btnGo_Click);