diff --git a/Histacom2/OS/Win95/Win95.Designer.cs b/Histacom2/OS/Win95/Win95.Designer.cs
index 12c1509..ed21560 100644
--- a/Histacom2/OS/Win95/Win95.Designer.cs
+++ b/Histacom2/OS/Win95/Win95.Designer.cs
@@ -108,6 +108,7 @@ private void InitializeComponent()
this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PropertiesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.desktopupdate = new System.Windows.Forms.Timer(this.components);
+ this.waitUntil95Loaded = new System.Windows.Forms.Timer(this.components);
this.panel1.SuspendLayout();
this.taskbar.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.startbutton)).BeginInit();
@@ -285,7 +286,7 @@ private void InitializeComponent()
this.AccessoriesToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.AccessoriesToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.AccessoriesToolStripMenuItem.Name = "AccessoriesToolStripMenuItem";
- this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
this.AccessoriesToolStripMenuItem.Text = "Accessories";
//
// CommunicationsToolStripMenuItem
@@ -299,7 +300,7 @@ private void InitializeComponent()
this.CommunicationsToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem;
this.CommunicationsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.CommunicationsToolStripMenuItem.Name = "CommunicationsToolStripMenuItem";
- this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(169, 28);
this.CommunicationsToolStripMenuItem.Text = "Communications";
//
// InternetConnectionWizardToolStripMenuItem
@@ -337,7 +338,7 @@ private void InitializeComponent()
this.MultimediaToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem;
this.MultimediaToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.MultimediaToolStripMenuItem.Name = "MultimediaToolStripMenuItem";
- this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(169, 28);
this.MultimediaToolStripMenuItem.Text = "Multimedia";
//
// CDPlayerToolStripMenuItem
@@ -395,7 +396,7 @@ private void InitializeComponent()
this.toolStripMenuItem1.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem;
this.toolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
- this.toolStripMenuItem1.Size = new System.Drawing.Size(186, 28);
+ this.toolStripMenuItem1.Size = new System.Drawing.Size(169, 28);
this.toolStripMenuItem1.Text = "System Tools";
//
// toolStripMenuItem2
@@ -406,7 +407,7 @@ private void InitializeComponent()
this.toolStripMenuItem2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem2.Image")));
this.toolStripMenuItem2.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
- this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 22);
+ this.toolStripMenuItem2.Size = new System.Drawing.Size(162, 22);
this.toolStripMenuItem2.Text = "Disk Defragmenter";
//
// toolStripMenuItem3
@@ -417,7 +418,7 @@ private void InitializeComponent()
this.toolStripMenuItem3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem3.Image")));
this.toolStripMenuItem3.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
- this.toolStripMenuItem3.Size = new System.Drawing.Size(180, 22);
+ this.toolStripMenuItem3.Size = new System.Drawing.Size(162, 22);
this.toolStripMenuItem3.Text = "ScanDisk";
//
// GamesToolStripMenuItem
@@ -430,7 +431,7 @@ private void InitializeComponent()
this.GamesToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem;
this.GamesToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.GamesToolStripMenuItem.Name = "GamesToolStripMenuItem";
- this.GamesToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.GamesToolStripMenuItem.Size = new System.Drawing.Size(169, 28);
this.GamesToolStripMenuItem.Text = "Games";
//
// MinsweeperToolStripMenuItem
@@ -440,7 +441,7 @@ private void InitializeComponent()
this.MinsweeperToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.MinsweeperToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicMinesweeper;
this.MinsweeperToolStripMenuItem.Name = "MinsweeperToolStripMenuItem";
- this.MinsweeperToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.MinsweeperToolStripMenuItem.Size = new System.Drawing.Size(137, 22);
this.MinsweeperToolStripMenuItem.Text = "Minesweeper";
this.MinsweeperToolStripMenuItem.Click += new System.EventHandler(this.MinsweeperToolStripMenuItem_Click);
//
@@ -452,7 +453,7 @@ private void InitializeComponent()
this.CalculatorToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("CalculatorToolStripMenuItem.Image")));
this.CalculatorToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.CalculatorToolStripMenuItem.Name = "CalculatorToolStripMenuItem";
- this.CalculatorToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.CalculatorToolStripMenuItem.Size = new System.Drawing.Size(169, 28);
this.CalculatorToolStripMenuItem.Text = "Calculator";
this.CalculatorToolStripMenuItem.Click += new System.EventHandler(this.CalculatorToolStripMenuItem_Click);
//
@@ -464,7 +465,7 @@ private void InitializeComponent()
this.HyperTerminalToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicFolderSmall;
this.HyperTerminalToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.HyperTerminalToolStripMenuItem.Name = "HyperTerminalToolStripMenuItem";
- this.HyperTerminalToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.HyperTerminalToolStripMenuItem.Size = new System.Drawing.Size(169, 28);
this.HyperTerminalToolStripMenuItem.Text = "HyperTerminal";
//
// ImagingToolStripMenuItem
@@ -475,7 +476,7 @@ private void InitializeComponent()
this.ImagingToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("ImagingToolStripMenuItem.Image")));
this.ImagingToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.ImagingToolStripMenuItem.Name = "ImagingToolStripMenuItem";
- this.ImagingToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.ImagingToolStripMenuItem.Size = new System.Drawing.Size(169, 28);
this.ImagingToolStripMenuItem.Text = "Imaging";
//
// NotePadToolStripMenuItem
@@ -486,7 +487,7 @@ private void InitializeComponent()
this.NotePadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("NotePadToolStripMenuItem.Image")));
this.NotePadToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.NotePadToolStripMenuItem.Name = "NotePadToolStripMenuItem";
- this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(169, 28);
this.NotePadToolStripMenuItem.Text = "Notepad";
this.NotePadToolStripMenuItem.Click += new System.EventHandler(this.NotePadToolStripMenuItem_Click);
//
@@ -498,7 +499,7 @@ private void InitializeComponent()
this.OnlineRegistrationToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("OnlineRegistrationToolStripMenuItem.Image")));
this.OnlineRegistrationToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.OnlineRegistrationToolStripMenuItem.Name = "OnlineRegistrationToolStripMenuItem";
- this.OnlineRegistrationToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.OnlineRegistrationToolStripMenuItem.Size = new System.Drawing.Size(169, 28);
this.OnlineRegistrationToolStripMenuItem.Text = "Online Registration";
//
// PaintToolStripMenuItem
@@ -509,7 +510,7 @@ private void InitializeComponent()
this.PaintToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("PaintToolStripMenuItem.Image")));
this.PaintToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.PaintToolStripMenuItem.Name = "PaintToolStripMenuItem";
- this.PaintToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.PaintToolStripMenuItem.Size = new System.Drawing.Size(169, 28);
this.PaintToolStripMenuItem.Text = "Paintbrush";
//
// PhoneDialerToolStripMenuItem
@@ -520,7 +521,7 @@ private void InitializeComponent()
this.PhoneDialerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("PhoneDialerToolStripMenuItem.Image")));
this.PhoneDialerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.PhoneDialerToolStripMenuItem.Name = "PhoneDialerToolStripMenuItem";
- this.PhoneDialerToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.PhoneDialerToolStripMenuItem.Size = new System.Drawing.Size(169, 28);
this.PhoneDialerToolStripMenuItem.Text = "Phone Dialer";
//
// WordPadToolStripMenuItem
@@ -531,7 +532,7 @@ private void InitializeComponent()
this.WordPadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("WordPadToolStripMenuItem.Image")));
this.WordPadToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.WordPadToolStripMenuItem.Name = "WordPadToolStripMenuItem";
- this.WordPadToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.WordPadToolStripMenuItem.Size = new System.Drawing.Size(169, 28);
this.WordPadToolStripMenuItem.Text = "WordPad";
this.WordPadToolStripMenuItem.Click += new System.EventHandler(this.WordPadToolStripMenuItem_Click);
//
@@ -549,7 +550,7 @@ private void InitializeComponent()
this.StartUpToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.StartUpToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.StartUpToolStripMenuItem.Name = "StartUpToolStripMenuItem";
- this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
this.StartUpToolStripMenuItem.Text = "Online Services";
//
// AOLInternetFREETrialToolStripMenuItem
@@ -602,7 +603,7 @@ private void InitializeComponent()
this.MSDOSPromptToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.MSDOSPromptToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.MSDOSPromptToolStripMenuItem.Name = "MSDOSPromptToolStripMenuItem";
- this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
this.MSDOSPromptToolStripMenuItem.Text = "StartUp";
//
// EmptyToolStripMenuItem
@@ -611,7 +612,7 @@ private void InitializeComponent()
this.EmptyToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
this.EmptyToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.EmptyToolStripMenuItem.Name = "EmptyToolStripMenuItem";
- this.EmptyToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.EmptyToolStripMenuItem.Size = new System.Drawing.Size(109, 22);
this.EmptyToolStripMenuItem.Text = "(Empty)";
//
// InternetExplorerToolStripMenuItem
@@ -623,7 +624,7 @@ private void InitializeComponent()
this.InternetExplorerToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.InternetExplorerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.InternetExplorerToolStripMenuItem.Name = "InternetExplorerToolStripMenuItem";
- this.InternetExplorerToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.InternetExplorerToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
this.InternetExplorerToolStripMenuItem.Text = "Internet Explorer";
this.InternetExplorerToolStripMenuItem.Click += new System.EventHandler(this.InternetExplorerToolStripMenuItem_Click);
//
@@ -636,7 +637,7 @@ private void InitializeComponent()
this.MSDOSPromptToolStripMenuItem1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.MSDOSPromptToolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.MSDOSPromptToolStripMenuItem1.Name = "MSDOSPromptToolStripMenuItem1";
- this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(186, 28);
+ this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(172, 28);
this.MSDOSPromptToolStripMenuItem1.Text = "MS-DOS Prompt";
this.MSDOSPromptToolStripMenuItem1.Click += new System.EventHandler(this.MSDOSPromptToolStripMenuItem1_Click);
//
@@ -649,7 +650,7 @@ private void InitializeComponent()
this.OutlookExpressToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.OutlookExpressToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.OutlookExpressToolStripMenuItem.Name = "OutlookExpressToolStripMenuItem";
- this.OutlookExpressToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.OutlookExpressToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
this.OutlookExpressToolStripMenuItem.Text = "Outlook Express";
//
// WindowsExplorerToolStripMenuItem1
@@ -661,7 +662,7 @@ private void InitializeComponent()
this.WindowsExplorerToolStripMenuItem1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.WindowsExplorerToolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.WindowsExplorerToolStripMenuItem1.Name = "WindowsExplorerToolStripMenuItem1";
- this.WindowsExplorerToolStripMenuItem1.Size = new System.Drawing.Size(186, 28);
+ this.WindowsExplorerToolStripMenuItem1.Size = new System.Drawing.Size(172, 28);
this.WindowsExplorerToolStripMenuItem1.Text = "Windows Explorer";
this.WindowsExplorerToolStripMenuItem1.Click += new System.EventHandler(this.WindowsExplorerToolStripMenuItem1_Click);
//
@@ -672,7 +673,7 @@ private void InitializeComponent()
this.GuessTheNumberToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.GuessTheNumberToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicGTNIcon;
this.GuessTheNumberToolStripMenuItem.Name = "GuessTheNumberToolStripMenuItem";
- this.GuessTheNumberToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.GuessTheNumberToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
this.GuessTheNumberToolStripMenuItem.Text = "Guess The Number";
this.GuessTheNumberToolStripMenuItem.Visible = false;
this.GuessTheNumberToolStripMenuItem.Click += new System.EventHandler(this.GuessTheNumberToolStripMenuItem_Click);
@@ -683,7 +684,7 @@ private void InitializeComponent()
this.StartRunnerToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
this.StartRunnerToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.StartRunnerToolStripMenuItem.Name = "StartRunnerToolStripMenuItem";
- this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
this.StartRunnerToolStripMenuItem.Text = "Start Runner";
this.StartRunnerToolStripMenuItem.Visible = false;
this.StartRunnerToolStripMenuItem.Click += new System.EventHandler(this.StartRunnerToolStripMenuItem_Click);
@@ -695,7 +696,7 @@ private void InitializeComponent()
this.ErrorBlasterToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.ErrorBlasterToolStripMenuItem.Image = global::Histacom2.Properties.Resources.Win95Error;
this.ErrorBlasterToolStripMenuItem.Name = "ErrorBlasterToolStripMenuItem";
- this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
this.ErrorBlasterToolStripMenuItem.Text = "Error Blaster 95";
this.ErrorBlasterToolStripMenuItem.Visible = false;
this.ErrorBlasterToolStripMenuItem.Click += new System.EventHandler(this.ErrorBlasterToolStripMenuItem_Click);
@@ -706,7 +707,7 @@ private void InitializeComponent()
this.SkindowsToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
this.SkindowsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.SkindowsToolStripMenuItem.Name = "SkindowsToolStripMenuItem";
- this.SkindowsToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.SkindowsToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
this.SkindowsToolStripMenuItem.Text = "Skindows 95";
this.SkindowsToolStripMenuItem.Visible = false;
//
@@ -717,7 +718,7 @@ private void InitializeComponent()
this.WebChatToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.WebChatToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicWebchat;
this.WebChatToolStripMenuItem.Name = "WebChatToolStripMenuItem";
- this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
this.WebChatToolStripMenuItem.Text = "Web Chat";
this.WebChatToolStripMenuItem.Visible = false;
this.WebChatToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click);
@@ -729,7 +730,7 @@ private void InitializeComponent()
this.TimeDistorterToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.TimeDistorterToolStripMenuItem.Image = global::Histacom2.Properties.Resources.TimeDistorter1Icon;
this.TimeDistorterToolStripMenuItem.Name = "TimeDistorterToolStripMenuItem";
- this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
this.TimeDistorterToolStripMenuItem.Text = "Time Distorter";
this.TimeDistorterToolStripMenuItem.Visible = false;
this.TimeDistorterToolStripMenuItem.Click += new System.EventHandler(this.TimeDistorterToolStripMenuItem_Click);
@@ -741,7 +742,7 @@ private void InitializeComponent()
this.FTPClientToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.FTPClientToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicFTPIcon;
this.FTPClientToolStripMenuItem.Name = "FTPClientToolStripMenuItem";
- this.FTPClientToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+ this.FTPClientToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
this.FTPClientToolStripMenuItem.Text = "FTP Client";
this.FTPClientToolStripMenuItem.Visible = false;
this.FTPClientToolStripMenuItem.Click += new System.EventHandler(this.FTPClientToolStripMenuItem_Click);
@@ -790,7 +791,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(180, 22);
+ this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(137, 22);
this.ControlPanelToolStripMenuItem.Text = "Control Panel";
//
// PrintersToolStripMenuItem
@@ -800,7 +801,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(180, 22);
+ this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(137, 22);
this.PrintersToolStripMenuItem.Text = "Printers";
//
// TaskbarToolStripMenuItem
@@ -809,7 +810,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(180, 22);
+ this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(137, 22);
this.TaskbarToolStripMenuItem.Text = "Taskbar";
//
// FindToolStripMenuItem
@@ -841,7 +842,7 @@ private void InitializeComponent()
this.FilesOrFoldersToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("FilesOrFoldersToolStripMenuItem.BackgroundImage")));
this.FilesOrFoldersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.FilesOrFoldersToolStripMenuItem.Name = "FilesOrFoldersToolStripMenuItem";
- this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
this.FilesOrFoldersToolStripMenuItem.Text = "Files or Folders...";
//
// ComputerToolStripMenuItem
@@ -850,7 +851,7 @@ private void InitializeComponent()
this.ComputerToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ComputerToolStripMenuItem.BackgroundImage")));
this.ComputerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.ComputerToolStripMenuItem.Name = "ComputerToolStripMenuItem";
- this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
this.ComputerToolStripMenuItem.Text = "Computer...";
//
// OnTheInternetToolStripMenuItem
@@ -859,7 +860,7 @@ private void InitializeComponent()
this.OnTheInternetToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("OnTheInternetToolStripMenuItem.BackgroundImage")));
this.OnTheInternetToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.OnTheInternetToolStripMenuItem.Name = "OnTheInternetToolStripMenuItem";
- this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
this.OnTheInternetToolStripMenuItem.Text = "On the Internet...";
//
// PeopleToolStripMenuItem
@@ -868,7 +869,7 @@ private void InitializeComponent()
this.PeopleToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PeopleToolStripMenuItem.BackgroundImage")));
this.PeopleToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.PeopleToolStripMenuItem.Name = "PeopleToolStripMenuItem";
- this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
this.PeopleToolStripMenuItem.Text = "People...";
//
// HelpToolStripMenuItem
@@ -1056,6 +1057,11 @@ private void InitializeComponent()
this.desktopupdate.Interval = 10000;
this.desktopupdate.Tick += new System.EventHandler(this.desktopupdate_Tick);
//
+ // waitUntil95Loaded
+ //
+ this.waitUntil95Loaded.Enabled = true;
+ this.waitUntil95Loaded.Tick += new System.EventHandler(this.waitUntil95Loaded_Tick);
+ //
// Windows95
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1168,5 +1174,6 @@ private void InitializeComponent()
internal System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3;
public System.Windows.Forms.Panel clockPanel;
public System.Windows.Forms.PictureBox startbutton;
+ private System.Windows.Forms.Timer waitUntil95Loaded;
}
}
\ No newline at end of file
diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs
index ad828ba..c0f3622 100644
--- a/Histacom2/OS/Win95/Win95.cs
+++ b/Histacom2/OS/Win95/Win95.cs
@@ -36,6 +36,17 @@ public partial class Windows95 : Form
ListViewItem heldDownItem;
Point heldDownPoint;
+
+ // Overrides the Painting function of the Form, so that you don't see all that crap drawing.
+ protected override CreateParams CreateParams
+ {
+ get
+ {
+ CreateParams cp = base.CreateParams;
+ cp.ExStyle |= 0x02000000; // Turn on WS_EX_COMPOSITED
+ return cp;
+ }
+ }
// Init the form
public Windows95()
@@ -113,22 +124,6 @@ private void Desktop_Load(object sender, EventArgs e)
// Bring to this the front
this.BringToFront();
- //Check if it is the first time
- if (!CurrentSave.FTime95)
- {
- CurrentSave.FTime95 = true;
- SaveGame();
- welcome = wm.Init(new Win95Welcome(), "Welcome", null, false, false, resize: false);
- AddTaskBarItem(welcome, welcome.Tag.ToString(), "Welcome", null);
-
- nonimportantapps.Add(welcome);
- nonimportantapps[nonimportantapps.Count - 1].BringToFront();
- nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing);
-
- welcome.BringToFront();
- welcome.Activate();
- }
-
// Update the Desktop icons
DesktopController.RefreshDesktopIcons(new ListViewItem[] { new ListViewItem("My Computer", 0),
@@ -648,6 +643,30 @@ private void desktopicons_Click(object sender, EventArgs e)
{
startmenu.Hide();
}
+
+ private void waitUntil95Loaded_Tick(object sender, EventArgs e)
+ {
+ if (Visible)
+ {
+ //Check if it is the first time
+ if (!CurrentSave.FTime95)
+ {
+ CurrentSave.FTime95 = true;
+ SaveGame();
+ welcome = wm.Init(new Win95Welcome(), "Welcome", null, false, false, resize: false);
+ AddTaskBarItem(welcome, welcome.Tag.ToString(), "Welcome", null);
+
+ nonimportantapps.Add(welcome);
+ nonimportantapps[nonimportantapps.Count - 1].BringToFront();
+ nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing);
+
+ welcome.BringToFront();
+ welcome.Activate();
+
+ waitUntil95Loaded.Enabled = false;
+ }
+ }
+ }
}
}
diff --git a/Histacom2/OS/Win95/Win95.resx b/Histacom2/OS/Win95/Win95.resx
index 5e48cce..c1da639 100644
--- a/Histacom2/OS/Win95/Win95.resx
+++ b/Histacom2/OS/Win95/Win95.resx
@@ -360,7 +360,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACO
- hAAAAk1TRnQBSQFMAgEBDQEAAVQBAwFUAQMBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
+ hAAAAk1TRnQBSQFMAgEBDQEAAVwBAwFcAQMBIAEAASABAAT/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/
@@ -934,6 +934,9 @@
580, 17
+
+ 714, 17
+
92
diff --git a/Histacom2/OS/Win98/Win98.Designer.cs b/Histacom2/OS/Win98/Win98.Designer.cs
index b6ba606..b8fc6ea 100644
--- a/Histacom2/OS/Win98/Win98.Designer.cs
+++ b/Histacom2/OS/Win98/Win98.Designer.cs
@@ -109,6 +109,7 @@ private void InitializeComponent()
this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PropertiesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.desktopupdate = new System.Windows.Forms.Timer(this.components);
+ this.waitUntil98Loaded = new System.Windows.Forms.Timer(this.components);
this.panel1.SuspendLayout();
this.taskbar.SuspendLayout();
this.clockPanel.SuspendLayout();
@@ -770,7 +771,7 @@ private void InitializeComponent()
this.ControlPanelToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ControlPanelToolStripMenuItem.BackgroundImage")));
this.ControlPanelToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.ControlPanelToolStripMenuItem.Name = "ControlPanelToolStripMenuItem";
- this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
this.ControlPanelToolStripMenuItem.Text = "Control Panel";
//
// PrintersToolStripMenuItem
@@ -779,7 +780,7 @@ private void InitializeComponent()
this.PrintersToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PrintersToolStripMenuItem.BackgroundImage")));
this.PrintersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.PrintersToolStripMenuItem.Name = "PrintersToolStripMenuItem";
- this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
this.PrintersToolStripMenuItem.Text = "Printers";
//
// TaskbarToolStripMenuItem
@@ -788,7 +789,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(180, 22);
+ this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
this.TaskbarToolStripMenuItem.Text = "Taskbar";
//
// FindToolStripMenuItem
@@ -815,7 +816,7 @@ private void InitializeComponent()
this.FilesOrFoldersToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("FilesOrFoldersToolStripMenuItem.BackgroundImage")));
this.FilesOrFoldersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.FilesOrFoldersToolStripMenuItem.Name = "FilesOrFoldersToolStripMenuItem";
- this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
this.FilesOrFoldersToolStripMenuItem.Text = "Files or Folders...";
//
// ComputerToolStripMenuItem
@@ -824,7 +825,7 @@ private void InitializeComponent()
this.ComputerToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ComputerToolStripMenuItem.BackgroundImage")));
this.ComputerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.ComputerToolStripMenuItem.Name = "ComputerToolStripMenuItem";
- this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
this.ComputerToolStripMenuItem.Text = "Computer...";
//
// OnTheInternetToolStripMenuItem
@@ -833,7 +834,7 @@ private void InitializeComponent()
this.OnTheInternetToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("OnTheInternetToolStripMenuItem.BackgroundImage")));
this.OnTheInternetToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.OnTheInternetToolStripMenuItem.Name = "OnTheInternetToolStripMenuItem";
- this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
this.OnTheInternetToolStripMenuItem.Text = "On the Internet...";
//
// PeopleToolStripMenuItem
@@ -842,7 +843,7 @@ private void InitializeComponent()
this.PeopleToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PeopleToolStripMenuItem.BackgroundImage")));
this.PeopleToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.PeopleToolStripMenuItem.Name = "PeopleToolStripMenuItem";
- this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
this.PeopleToolStripMenuItem.Text = "People...";
//
// HelpToolStripMenuItem
@@ -1006,6 +1007,11 @@ private void InitializeComponent()
this.desktopupdate.Interval = 5000;
this.desktopupdate.Tick += new System.EventHandler(this.desktopupdate_Tick);
//
+ // waitUntil98Loaded
+ //
+ this.waitUntil98Loaded.Enabled = true;
+ this.waitUntil98Loaded.Tick += new System.EventHandler(this.waitUntil98Loaded_Tick);
+ //
// Windows98
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1118,5 +1124,6 @@ private void InitializeComponent()
private System.Windows.Forms.ToolStripMenuItem storyTest1ToolStripMenuItem;
private System.Windows.Forms.Timer desktopupdate;
private System.Windows.Forms.ToolStripMenuItem deleteToolStripMenuItem;
+ private System.Windows.Forms.Timer waitUntil98Loaded;
}
}
\ No newline at end of file
diff --git a/Histacom2/OS/Win98/Win98.cs b/Histacom2/OS/Win98/Win98.cs
index e9a7d60..3a0b216 100644
--- a/Histacom2/OS/Win98/Win98.cs
+++ b/Histacom2/OS/Win98/Win98.cs
@@ -33,6 +33,17 @@ public partial class Windows98 : Form
public bool hiddenpadamsFound = false;
public WinClassicTimeDistorter2 distort;
+
+ // Overrides the Painting function of the Form, so that you don't see all that crap drawing.
+ protected override CreateParams CreateParams
+ {
+ get
+ {
+ CreateParams cp = base.CreateParams;
+ cp.ExStyle |= 0x02000000; // Turn on WS_EX_COMPOSITED
+ return cp;
+ }
+ }
// Init the form
public Windows98()
@@ -115,22 +126,6 @@ private void Desktop_Load(object sender, EventArgs e)
// Bring to this the front
this.BringToFront();
- //Check if it is the first time
- if (!CurrentSave.FTime98)
- {
- CurrentSave.FTime98 = true;
- SaveGame();
- welcome = wm.Init(new Win98Welcome(), "Welcome", null, false, false, resize: false);
- AddTaskBarItem(welcome, welcome.Tag.ToString(), "Welcome", null);
-
- nonimportantapps.Add(welcome);
- nonimportantapps[nonimportantapps.Count - 1].BringToFront();
- nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing);
-
- welcome.BringToFront();
- welcome.Activate();
- }
-
// Update the desktop Icons!
DesktopController.RefreshDesktopIcons(new ListViewItem[] { new System.Windows.Forms.ListViewItem("My Computer", 0),
@@ -572,6 +567,31 @@ private void deleteToolStripMenuItem_Click(object sender, EventArgs e)
}
}
}
+
+ private void waitUntil98Loaded_Tick(object sender, EventArgs e)
+ {
+ if (Visible)
+ {
+ //Check if it is the first time
+ if (!CurrentSave.FTime98)
+ {
+ CurrentSave.FTime98 = true;
+ SaveGame();
+ welcome = wm.Init(new Win98Welcome(), "Welcome", null, false, false, resize: false);
+ AddTaskBarItem(welcome, welcome.Tag.ToString(), "Welcome", null);
+
+ nonimportantapps.Add(welcome);
+ nonimportantapps[nonimportantapps.Count - 1].BringToFront();
+ nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing);
+
+ welcome.BringToFront();
+ welcome.Activate();
+
+ waitUntil98Loaded.Enabled = false;
+ }
+
+ }
+ }
}
}
diff --git a/Histacom2/OS/Win98/Win98.resx b/Histacom2/OS/Win98/Win98.resx
index 7f02550..28744a3 100644
--- a/Histacom2/OS/Win98/Win98.resx
+++ b/Histacom2/OS/Win98/Win98.resx
@@ -382,7 +382,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq
- ggAAAk1TRnQBSQFMAgEBDAEAAbABAQGwAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
+ ggAAAk1TRnQBSQFMAgEBDAEAAbgBAQG4AQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
AwABgAMAAQEBAAEgBwABAf8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AXAAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/x8AAf8DAAH/
@@ -949,6 +949,9 @@
714, 17
+
+ 848, 17
+
63
diff --git a/Histacom2/OS/WinXPBad/WinXPBad.Designer.cs b/Histacom2/OS/WinXPBad/WinXPBad.Designer.cs
index 09901bd..110a112 100644
--- a/Histacom2/OS/WinXPBad/WinXPBad.Designer.cs
+++ b/Histacom2/OS/WinXPBad/WinXPBad.Designer.cs
@@ -57,6 +57,7 @@ private void InitializeComponent()
this.panel3 = new System.Windows.Forms.Panel();
this.picWinXPStartTop = new System.Windows.Forms.Panel();
this.lblUsername = new Histacom2.Engine.UI.ClassicLabel();
+ this.picProfilePicture = new System.Windows.Forms.PictureBox();
this.picWinXPStartRight = new System.Windows.Forms.PictureBox();
this.picWinXPStartLeft = new System.Windows.Forms.PictureBox();
this.xpMenuStripLeft = new System.Windows.Forms.MenuStrip();
@@ -87,7 +88,7 @@ private void InitializeComponent()
this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PropertiesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.desktopupdate = new System.Windows.Forms.Timer(this.components);
- this.picProfilePicture = new System.Windows.Forms.PictureBox();
+ this.waitUntilLoaded = new System.Windows.Forms.Timer(this.components);
this.panel1.SuspendLayout();
this.taskbar.SuspendLayout();
this.clockPanel.SuspendLayout();
@@ -108,12 +109,12 @@ private void InitializeComponent()
((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
this.panel3.SuspendLayout();
this.picWinXPStartTop.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.picProfilePicture)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picWinXPStartRight)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picWinXPStartLeft)).BeginInit();
this.xpMenuStripLeft.SuspendLayout();
this.xpMenuStripRight.SuspendLayout();
this.rightclickbackproperties.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.picProfilePicture)).BeginInit();
this.SuspendLayout();
//
// panel1
@@ -406,6 +407,17 @@ private void InitializeComponent()
this.lblUsername.TabIndex = 3;
this.lblUsername.Text = "Username";
//
+ // picProfilePicture
+ //
+ this.picProfilePicture.BackColor = System.Drawing.Color.Transparent;
+ this.picProfilePicture.BackgroundImage = global::Histacom2.Properties.Resources.WinXPProfilePictureChess;
+ this.picProfilePicture.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+ this.picProfilePicture.Location = new System.Drawing.Point(0, 9);
+ this.picProfilePicture.Name = "picProfilePicture";
+ this.picProfilePicture.Size = new System.Drawing.Size(48, 48);
+ this.picProfilePicture.TabIndex = 7;
+ this.picProfilePicture.TabStop = false;
+ //
// picWinXPStartRight
//
this.picWinXPStartRight.BackColor = System.Drawing.Color.SkyBlue;
@@ -779,16 +791,10 @@ private void InitializeComponent()
this.desktopupdate.Interval = 5000;
this.desktopupdate.Tick += new System.EventHandler(this.desktopupdate_Tick);
//
- // picProfilePicture
+ // waitUntilLoaded
//
- this.picProfilePicture.BackColor = System.Drawing.Color.Transparent;
- this.picProfilePicture.BackgroundImage = global::Histacom2.Properties.Resources.WinXPProfilePictureChess;
- this.picProfilePicture.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
- this.picProfilePicture.Location = new System.Drawing.Point(0, 9);
- this.picProfilePicture.Name = "picProfilePicture";
- this.picProfilePicture.Size = new System.Drawing.Size(48, 48);
- this.picProfilePicture.TabIndex = 7;
- this.picProfilePicture.TabStop = false;
+ this.waitUntilLoaded.Enabled = true;
+ this.waitUntilLoaded.Tick += new System.EventHandler(this.waitUntilLoaded_Tick);
//
// WindowsXPBad
//
@@ -828,6 +834,7 @@ private void InitializeComponent()
((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
this.panel3.ResumeLayout(false);
this.picWinXPStartTop.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.picProfilePicture)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picWinXPStartRight)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picWinXPStartLeft)).EndInit();
this.xpMenuStripLeft.ResumeLayout(false);
@@ -835,7 +842,6 @@ private void InitializeComponent()
this.xpMenuStripRight.ResumeLayout(false);
this.xpMenuStripRight.PerformLayout();
this.rightclickbackproperties.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.picProfilePicture)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -900,5 +906,6 @@ private void InitializeComponent()
private System.Windows.Forms.MenuStrip xpMenuStripBottom;
private Engine.UI.ClassicStartMenuItem xpStartBottomTurnOff;
private System.Windows.Forms.PictureBox picProfilePicture;
+ private System.Windows.Forms.Timer waitUntilLoaded;
}
}
\ No newline at end of file
diff --git a/Histacom2/OS/WinXPBad/WinXPBad.cs b/Histacom2/OS/WinXPBad/WinXPBad.cs
index cf49e15..61c69e1 100644
--- a/Histacom2/OS/WinXPBad/WinXPBad.cs
+++ b/Histacom2/OS/WinXPBad/WinXPBad.cs
@@ -13,6 +13,7 @@
using Histacom2.OS.Win98.Win98Apps;
using Histacom2.GlobalPrograms;
using Histacom2.OS.WinXPBad.Story;
+using System.Threading.Tasks;
namespace Histacom2.OS.WinXPBad
{
@@ -24,6 +25,17 @@ public partial class WindowsXPBad : Form
public TaskBarController tb = new TaskBarController();
public int currentappcount = 0;
+
+ // Overrides the Painting function of the Form, so that you don't see all that crap drawing.
+ protected override CreateParams CreateParams
+ {
+ get
+ {
+ CreateParams cp = base.CreateParams;
+ cp.ExStyle |= 0x02000000; // Turn on WS_EX_COMPOSITED
+ return cp;
+ }
+ }
// Init the form
public WindowsXPBad()
@@ -76,8 +88,6 @@ private void Desktop_Load(object sender, EventArgs e)
lv.Position = new Point(20, 20);
desktopicons.Invalidate();
//DesktopController.RefreshDesktopIcons(new ListViewItem[] { new System.Windows.Forms.ListViewItem("Recycle Bin", 7) }, ref desktopicons, Path.Combine(ProfileWindowsDirectory, "Desktop"));
-
- Hack4.StartObjective();
}
private void fontLoad()
@@ -290,6 +300,15 @@ private void classicStartMenuItem1_Click(object sender, EventArgs e)
startbutton.Enabled = false;
clockTimer.Enabled = false;
}
+
+ private void waitUntilLoaded_Tick(object sender, EventArgs e)
+ {
+ if (Visible)
+ {
+ Hack4.StartObjective();
+ waitUntilLoaded.Enabled = false;
+ }
+ }
}
}
diff --git a/Histacom2/OS/WinXPBad/WinXPBad.resx b/Histacom2/OS/WinXPBad/WinXPBad.resx
index a1c791d..256833d 100644
--- a/Histacom2/OS/WinXPBad/WinXPBad.resx
+++ b/Histacom2/OS/WinXPBad/WinXPBad.resx
@@ -137,111 +137,111 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAi
- ogAAAk1TRnQBSQFMAgEBDQEAAYgBAwGIAQMBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
- AwABgAMAAQEBAAEgBwABASkAAwEBAgMHAQkDEgEZAyEBMAMzAVMDTAGSAVcCWQHCAVgCYgHjATABeQF7
- AfYBAAGdAaQB/wEAAZYBnAH/ATABbQFuAfYBWAJfAeMBVwFZAVcBwgNMAZIDMwFTAyEBMAMSARkDBwEJ
- AwEBAv8ArQADAwEEAw0BEQMfASwDOwFkAVYCWAHBASMBkgGNAfkBAAHNAdMB/wEAAcoB4AH/AQABxgHm
- Af8BAAHCAegB/wEAAb8B5gH/AQABugHgAf8BAAG0AdUB/wEAAawBxQH/AQABpgGzAf8BAAGeAZsB/wEj
- AXcBagH5AVYBWAFWAcEDOwFkAx8BLAMNAREDAwEE/wCkAAEBAwQBBgMSARgDKgFBA1YBswEXAZoBlAH7
- AQAB1QHTAf8BAAHUAeEB/wELAdEB6AH/ASAB0gHrAf8BLQHQAesB/wE4AcsB5QH/AT0BxQHfAf8BOgHC
- AdsB/wE6AcMB3AH/ATIBxAHbAf8BKQHCAdUB/wEWAbsByAH/AQEBtAG4Af8BAAGqAZ8B/wEXAYwBYgH7
- A1UBsgMqAUEDEgEYAwQBBQMAAQH/AJkAAwQBBgMUARsDNwFbAVgBZAFiAeMBAAHRAcMB/wEAAtoB/wEb
- AdwB5QH/AToB2gHlAf8BXgHKAdMB/wGOAcIByAH/AbABxQHIAf8BxQLOAf8BzgLUAf8BtQK6Af8BwALH
- Af8BsQHFAcYB/wGOAb0BwQH/AV8BvgHEAf8BRQHLAdEB/wEyAcsBzAH/AQsBvQG1Af8BAAGuAZkB/wFX
- AmEB4gM3AVoDFAEbAwQBBv8AlQADAwEEAxIBGAM6AWIBQAF9AXkB8gEAAdEBxwH/AQ0C2wH/ATkB4AHk
- Af8BZgHLAc8B/wGqAsEB/wHaAeAB3wH/AesC8QH/AfIC+QH/AfUC/AH/AfYC/QH/AeAC5QH/AdYC2AH/
- AfMB+AH5Af8B7AHyAfEB/wHbAeAB3wH/AbQCxQH/AYkCygH/AYEB3wHdAf8BMQHOAcUB/wEAAbsBpwH/
- AUMBdAFuAfEDOgFhAxIBGAMDAQT/AI0AAwEBAgMNAREDMwFTAUMBewF3AfEBAAHOAcYB/wEaAtoB/wFK
+ ogAAAk1TRnQBSQFMAgEBDQEAAZABAwGQAQMBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
+ AwABgAMAAQEBAAEgBwABASkAAwEBAgMHAQkDEgEZAyEBMAMzAVMDTAGSAVcCWQHCAVgCYAHjATEBdwF5
+ AfYBAAGdAaQB/wEAAZYBnAH/ATEBagFrAfYBWAJfAeMBVwFZAVcBwgNMAZIDMwFTAyEBMAMSARkDBwEJ
+ AwEBAv8ArQADAwEEAw0BEQMfASwDOwFkAVYCWAHBASQBkAGMAfkBAAHNAdMB/wEAAcoB4AH/AQABxgHm
+ Af8BAAHCAegB/wEAAb8B5gH/AQABugHgAf8BAAG0AdUB/wEAAawBxQH/AQABpgGzAf8BAAGeAZsB/wEk
+ AXQBagH5AVYBWAFWAcEDOwFkAx8BLAMNAREDAwEE/wCkAAEBAwQBBgMSARgDKgFBA1YBswEZAZgBkwH7
+ AQAB1QHTAf8BAAHUAeEB/wEKAdEB6AH/AR8B0gHrAf8BLAHQAesB/wE3AcsB5QH/ATwBxQHfAf8BOQHC
+ AdsB/wE5AcMB3AH/ATEBxAHbAf8BKAHCAdUB/wEVAbsByAH/AQABtAG4Af8BAAGqAZ8B/wEZAYsBYAH7
+ A1UBsgMqAUEDEgEYAwQBBQMAAQH/AJkAAwQBBgMUARsDNwFbAVgBYgFgAeMBAAHRAcMB/wEAAtoB/wEa
+ AdwB5QH/ATkB2gHlAf8BXQHKAdMB/wGOAcIByAH/AbABxQHIAf8BxQLOAf8BzgLUAf8BtQK6Af8BwALH
+ Af8BsQHFAcYB/wGOAb0BwQH/AV4BvgHEAf8BRAHLAdEB/wExAcsBzAH/AQoBvQG1Af8BAAGuAZkB/wFY
+ AmEB4gM3AVoDFAEbAwQBBv8AlQADAwEEAxIBGAM6AWIBRAF7AXcB8gEAAdEBxwH/AQwC2wH/ATgB4AHk
+ Af8BZQHLAc8B/wGqAsEB/wHaAeAB3wH/AesC8QH/AfIC+QH/AfUC/AH/AfYC/QH/AeAC5QH/AdYC2AH/
+ AfMB+AH5Af8B7AHyAfEB/wHbAeAB3wH/AbQCxQH/AYkCygH/AYEB3wHdAf8BMAHOAcUB/wEAAbsBpwH/
+ AUUBcgFtAfEDOgFhAxIBGAMDAQT/AI0AAwEBAgMNAREDMwFTAUUBdwF0AfEBAAHOAcYB/wEZAtoB/wFJ
AdsB3QH/AZgCxQH/AdYB4AHfAf8BzwLYAf8B1AHZAdgB/wHwAfkB+gH/AfQB/QH+Af8B9AH9Af4B/wH1
Af0B/gH/AfUB/QH+Af8B6ALuAf8B9gL9Af8B9wL9Af8B9gH8Af0B/wHwAvcB/wHJAc8BzgH/Ab8B1AHS
- Af8BmwHiAd8B/wE3AdQBywH/AQABxAGyAf8BQwF3AXAB8QMzAVMDDQERAwEBAv8AiAABAQMHAQkDIgEy
- AVoCZAHgAQABzQHEAf8BGgHYAdYB/wFTAdcB2gH/Aa0ByAHHAf8B4ALtAf8B7gH8Af0B/wHuAfwB/gH/
+ Af8BmwHiAd8B/wE2AdQBywH/AQABxAGyAf8BRQF0AW8B8QMzAVMDDQERAwEBAv8AiAABAQMHAQkDIgEy
+ AVsCYwHgAQABzQHEAf8BGQHYAdYB/wFSAdcB2gH/Aa0ByAHHAf8B4ALtAf8B7gH8Af0B/wHuAfwB/gH/
AewB+gH8Af8B7QH8Af4B/wHuAfwC/wHuAf0C/wHvAf0C/wHwAf0C/wHxAf0C/wHzAf0C/wH0Av4B/wH0
- Af4C/wH0Af4C/wHPAtQB/wHkAuwB/wHAAdIBzwH/AWgB1gHRAf8BIwHVAcwB/wEAAckBuQH/AVcBYAFf
- Ad8DIQExAwcBCQMAAQH/AIEAAwIBAwMSARgBUgJTAagBAAHNAcUB/wEPAdUB0wH/AUsB2QHaAf8BqgHH
+ Af4C/wH0Af4C/wHPAtQB/wHkAuwB/wHAAdIBzwH/AWcB1gHRAf8BIgHVAcwB/wEAAckBuQH/AVcBXwFe
+ Ad8DIQExAwcBCQMAAQH/AIEAAwIBAwMSARgBUgJTAagBAAHNAcUB/wEOAdUB0wH/AUoB2QHaAf8BqgHH
AcYB/wHhAvAB/wHsAfwB/QH/AewB/QH+Af8B7AH+Av8B6wH9Av8B6wH8Av8B6wH8Av8B6wH8Av8B6wH8
Av8B7AH8Av8B7QH8Av8B7gH8Av8B7wH9Av8B8QH+Av8B8gH9Af4B/wHlAu0B/wHxAfwB/QH/AeUB8wHy
- Af8BrgHIAcYB/wFKAdYB0AH/ARMB1gHPAf8BAAHLAb0B/wFRAlIBpwMSARgDAgED/wCBAAMHAQkDMAFL
- AQsBrwGtAfwBAAHTAdQB/wE8Ad0B3gH/AZQCwwH/AdsC6wH/AekB/AH9Af8B6QH9Af4B/wHnAf0C/wHm
+ Af8BrgHIAcYB/wFJAdYB0AH/ARIB1gHPAf8BAAHLAb0B/wFRAlIBpwMSARgDAgED/wCBAAMHAQkDMAFL
+ AQwBrQGrAfwBAAHTAdQB/wE7Ad0B3gH/AZQCwwH/AdsC6wH/AekB/AH9Af8B6QH9Af4B/wHnAf0C/wHm
Af0C/wHlAf0C/wHkAfwC/wHlAfsC/wHlAfsC/wHmAfsC/wHoAfsC/wHqAfsC/wHsAfwC/wHtAfwC/wHu
- AfwC/wHuAf0C/wHuAfwB/gH/Ae8B/QH+Af8B7gH9Af4B/wHfAewB7QH/AZMBwwHAAf8BPAHeAdoB/wEA
- AdQB0QH/ARcBmgGWAfsDLwFKAwcBCf8AgQADDgETA1YBswEAAdMB3AH/AR0B2AHdAf8BYwHMAc4B/wG9
+ AfwC/wHuAf0C/wHuAfwB/gH/Ae8B/QH+Af8B7gH9Af4B/wHfAewB7QH/AZMBwwHAAf8BOwHeAdoB/wEA
+ AdQB0QH/ARkBmAGVAfsDLwFKAwcBCf8AgQADDgETA1YBswEAAdMB3AH/ARwB2AHdAf8BYgHMAc4B/wG9
Ac0BywH/AcgC1QH/AdcB6gHrAf8B5AH9Af4B/wHjAf0C/wHhAfwC/wHfAfwC/wHfAfsC/wHfAfsC/wHf
AfoC/wHhAfoC/wHiAfoC/wHlAfoC/wHoAfsC/wHrAfwC/wHtAfwC/wHsAf0C/wHtAfwC/wHsAf4C/wHs
- Av4B/wHsAv0B/wHQAeAB3wH/AV8ByQHIAf8BIQHbAdwB/wEAAdQB0gH/A1YBswMOARP/AIEAAyABLgEm
- AZoBoQH4AQAB0wHiAf8BPgHcAeMB/wGkAsUB/wHeAfQB9QH/AeQB/AH9Af8B4QH9Af4B/wHfAf0C/wHc
+ Av4B/wHsAv0B/wHQAeAB3wH/AV4ByQHIAf8BIAHbAdwB/wEAAdQB0gH/A1YBswMOARP/AIEAAyABLgEp
+ AZgBngH4AQAB0wHiAf8BPQHcAeMB/wGkAsUB/wHeAfQB9QH/AeQB/AH9Af8B4QH9Af4B/wHfAf0C/wHc
AfwC/wHbAfsC/wHZAfsC/wHZAfoC/wHYAfoC/wHZAfkC/wHbAfkC/wHdAfkC/wHgAfkC/wHjAfkC/wHn
- AfoC/wHqAfsC/wHsAfwC/wHsAf0C/wHsA/8B7AH+Av8B6wH+Av8ByALXAf8BoAHBAcAB/wE9AtwB/wEA
- AdYB2wH/ATEClgH3Ax8BLP8AgQABQQJCAXMBAAHVAfUB/wEMAdoB6wH/AVgBzgHWAf8BxgLcAf8B4AH7
+ AfoC/wHqAfsC/wHsAfwC/wHsAf0C/wHsA/8B7AH+Av8B6wH+Av8ByALXAf8BoAHBAcAB/wE8AtwB/wEA
+ AdYB2wH/ATMCkgH3Ax8BLP8AgQABQQJCAXMBAAHVAfUB/wELAdoB6wH/AVcBzgHWAf8BxgLcAf8B4AH7
AfwB/wHfAfwB/gH/Ad0B/QH+Af8B2QH8Af4B/wHYAfwC/wHWAfsC/wHTAfoC/wHSAfoC/wHSAfoC/wHT
AfkC/wHVAfgC/wHXAfgC/wHbAfgC/wHgAfkC/wHjAfkC/wHmAfoC/wHpAfsC/wHqAfwC/wHrAf0C/wHp
- Af0C/wHmAfsB/QH/AcsC2AH/AcsB3wHeAf8BWQLMAf8BEgHYAd8B/wEAAd0B4AH/AUECQgFz/wCBAAFT
- AlUBrQEAAdEB/AH/AR8B3QHxAf8BdAHHAcwB/wHSAfAB8QH/AdwB/AH+Af8B2gH8Af4B/wHXAfsB/gH/
+ Af0C/wHmAfsB/QH/AcsC2AH/AcsB3wHeAf8BWALMAf8BEQHYAd8B/wEAAd0B4AH/AUECQgFz/wCBAAFT
+ AlUBrQEAAdEB/AH/AR4B3QHxAf8BcwHHAcwB/wHSAfAB8QH/AdwB/AH+Af8B2gH8Af4B/wHXAfsB/gH/
AdUB+gL/AdIB+QL/Ac8B9wL/Ac4B9gL/Ac0B9gL/Ac0B9wL/Ac8B9wL/AdEB9wL/AdMB9wL/AdcB+AL/
AdwB9wL/AeAB+AL/AeQB+AL/AecB+QL/AekB+wL/AegB/AL/AecB/AL/AeQB+wH+Af8B4QH4AfoB/wHY
- AfAB8QH/AYECxQH/ASkB2wHjAf8BAAHdAecB/wFTAlUBrf8AgQABWQFfAWAB1wEEAc8B/gH/AS0B3wH1
+ AfAB8QH/AYECxQH/ASgB2wHjAf8BAAHdAecB/wFTAlUBrf8AgQABWQFeAV8B1wEDAc8B/gH/ASwB3wH1
Af8BmQHGAckB/wHUAfcB+QH/AdgB/AL/AdYB+wL/AdIB+gL/Ac8B+AL/Ac0B9wL/AcsB9wL/AcoB9QL/
AcoB9AL/AcsB9QL/AcQB7wH2Af8BygH0AfsB/wHRAfcC/wHVAfcC/wHZAfcC/wHfAfcC/wHiAfgC/wHl
- AfgC/wHnAfsC/wHmAfsC/wHkAfsC/wHjAf0C/wHiAv4B/wHcAfcB+AH/AZwCxgH/ATMB3AHkAf8BAAHd
- AesB/wFZAl8B1/8AgQABRAGEAYgB8wEbAdEC/wE2AdoB9AH/AaYByAHKAf8BvwHWAdgB/wHBAeAB4wH/
- AdEB+gL/Ac8B+QL/Ac0B+AL/AckB9gL/AccB9QL/AcYB9AL/Aa0B1AHcAf8BUwFfAWAB/wEpAioB/wEu
- AjMB/wGYAbUBugH/AdEB9gH9Af8BzQHuAfUB/wHeAfcC/wHhAfgC/wHjAfcC/wHkAfkC/wHkAfoC/wHj
- AfsC/wHiAfwC/wHgAf0C/wHcAfoB/AH/Aa0BzgHNAf8BOgHaAeIB/wEAAd0B7QH/ATsBgwGHAfP/AIEA
- ASMBywHaAf8BMQHTAv8BOgHSAfEB/wGkAcMBxQH/AckB5gHoAf8B0AH6Af4B/wHPAfkC/wHMAfkC/wHI
- AfgC/wHGAfYC/wHGAfYC/wGzAd4B5gH/AUcBSwFMAf8BPAFIAUoB/wEFAQYBBwH/AQEBEQESAf8BEwFP
- AVEB/wFMAV0BXwH/AYwBoQGmAf8B3QH2Av8B4AH4Av8B4wH5Av8B4wH5Av8B4gH6Av8B4AH7Av8B3gH8
- Av8B3AH9Av8B2QH7Af0B/wGzAtMB/wE7AdkB4QH/AQAB2wHvAf8BAAHGAdQB//8AgQABMQHNAdkB/wFI
- AdcC/wFGAdEB8wH/AakB0AHUAf8BzgH4Af0B/wHPAfoC/wHMAfkC/wHIAfgC/wHHAfcC/wHFAfYC/wHE
- AfUC/wF0AZEBlAH/AWwBkAGSAf8BNwFGAUgB/wGuAdAB1wH/AVIBZwFqAf8BJAE5ATsB/wFnAYUBiAH/
+ AfgC/wHnAfsC/wHmAfsC/wHkAfsC/wHjAf0C/wHiAv4B/wHcAfcB+AH/AZwCxgH/ATIB3AHkAf8BAAHd
+ AesB/wFZAl4B1/8AgQABRwGCAYUB8wEaAdEC/wE1AdoB9AH/AaYByAHKAf8BvwHWAdgB/wHBAeAB4wH/
+ AdEB+gL/Ac8B+QL/Ac0B+AL/AckB9gL/AccB9QL/AcYB9AL/Aa0B1AHcAf8BUgFeAV8B/wEoAikB/wEt
+ AjIB/wGYAbUBugH/AdEB9gH9Af8BzQHuAfUB/wHeAfcC/wHhAfgC/wHjAfcC/wHkAfkC/wHkAfoC/wHj
+ AfsC/wHiAfwC/wHgAf0C/wHcAfoB/AH/Aa0BzgHNAf8BOQHaAeIB/wEAAd0B7QH/AT0BgQGEAfP/AIEA
+ ASIBywHaAf8BMAHTAv8BOQHSAfEB/wGkAcMBxQH/AckB5gHoAf8B0AH6Af4B/wHPAfkC/wHMAfkC/wHI
+ AfgC/wHGAfYC/wHGAfYC/wGzAd4B5gH/AUYBSgFLAf8BOwFHAUkB/wEEAQUBBgH/AQABEAERAf8BEgFO
+ AVAB/wFLAVwBXgH/AYwBoQGmAf8B3QH2Av8B4AH4Av8B4wH5Av8B4wH5Av8B4gH6Av8B4AH7Av8B3gH8
+ Av8B3AH9Av8B2QH7Af0B/wGzAtMB/wE6AdkB4QH/AQAB2wHvAf8BAAHGAdQB//8AgQABMAHNAdkB/wFH
+ AdcC/wFFAdEB8wH/AakB0AHUAf8BzgH4Af0B/wHPAfoC/wHMAfkC/wHIAfgC/wHHAfcC/wHFAfYC/wHE
+ AfUC/wFzAZEBlAH/AWsBkAGSAf8BNgFFAUcB/wGuAdAB1wH/AVEBZgFpAf8BIwE4AToB/wFmAYUBiAH/
AdMB8AH5Af8B3QH2Av8B4AH4Av8B4QH5Av8B4QH5Av8B3wH6Av8B3QH7Av8B2wH8Av8B2QH8Af4B/wHE
- AeAB4QH/AaABvwHAAf8BNgHYAeIB/wEAAdkB8gH/AQABxQHVAf//AIEAAUwBhgGIAfMBYQHcAv8BUwHV
- AfgB/wGhAcgBzgH/AcsB9wH8Af8BywH5Av8ByAH4Av8BxgH4Av8BxAH3Av8BwgH2Av8BvAHuAfcB/wFY
- AlwB/wGuAdkB4AH/AUkBWwFdAf8B0QH2Av8B0wH1Af4B/wHUAfQB/QH/AdcB9QL/AdoB9QL/Ad0B9gL/
+ AeAB4QH/AaABvwHAAf8BNQHYAeIB/wEAAdkB8gH/AQABxQHVAf//AIEAAUwBgwGFAfMBYAHcAv8BUgHV
+ AfgB/wGhAcgBzgH/AcsB9wH8Af8BywH5Av8ByAH4Av8BxgH4Av8BxAH3Av8BwgH2Av8BvAHuAfcB/wFX
+ AlsB/wGuAdkB4AH/AUgBWgFcAf8B0QH2Av8B0wH1Af4B/wHUAfQB/QH/AdcB9QL/AdoB9QL/Ad0B9gL/
Ad8B9wL/Ad8B+AL/Ad4B+QL/AdwB+gL/AdoB+wL/AdgB/AL/AcoB5wHpAf8BxgHdAd4B/wGiAcoBzAH/
- ATUB3AHoAf8BAAHXAfYB/wFAAYEBiAHy/wCBAAFaAl8B1QGGAeMB/gH/AWAB2wH+Af8BkwHCAcsB/wHE
- AfQB+gH/AcgB+AL/AcYB+AL/AcMB9wL/AcIB9wL/AcIB9gL/AbIB4QHoAf8BZwFxAXIB/wG6AegB8gH/
- AVABZAFnAf8B0QH2Av8B1AH1Av8B1gH1Av8B2AH1Av8B2wH2Av8B3AH3Av8B3AH3Av8B3AH4Av8B2gH5
- Av8B2QH6Av8B1wH7Av8B1gH8Av8B0wH7Af4B/wHMAfcB+gH/AZABxwHKAf8BLQHfAe8B/wEAAdQB+gH/
- AVoCXwHV/wCBAAFSAlQBpgGcAeoB+wH/AXEB3wL/AYMBwgHSAf8BvAHrAfIB/wHCAfMB+wH/AcIB9gH+
- Af8BwQH3Av8BwQH3Av8BwAH3Av8BswHjAekB/wFyAYgBiQH/AcMB9AH+Af8BRQFaAVwB/wHMAfUB/QH/
+ ATQB3AHoAf8BAAHXAfYB/wFEAX0BhAHy/wCBAAFaAl4B1QGGAeMB/gH/AV8B2wH+Af8BkwHCAcsB/wHE
+ AfQB+gH/AcgB+AL/AcYB+AL/AcMB9wL/AcIB9wL/AcIB9gL/AbIB4QHoAf8BZgFwAXEB/wG6AegB8gH/
+ AU8BYwFmAf8B0QH2Av8B1AH1Av8B1gH1Av8B2AH1Av8B2wH2Av8B3AH3Av8B3AH3Av8B3AH4Av8B2gH5
+ Av8B2QH6Av8B1wH7Av8B1gH8Av8B0wH7Af4B/wHMAfcB+gH/AZABxwHKAf8BLAHfAe8B/wEAAdQB+gH/
+ AVoCXgHV/wCBAAFSAlQBpgGcAeoB+wH/AXAB3wL/AYMBwgHSAf8BvAHrAfIB/wHCAfMB+wH/AcIB9gH+
+ Af8BwQH3Av8BwQH3Av8BwAH3Av8BswHjAekB/wFxAYgBiQH/AcMB9AH+Af8BRAFZAVsB/wHMAfUB/QH/
AdIB9gL/AdUB9gL/AdYB9gL/AdcB9gL/AdgB9wL/AdgB+AL/AdcB+QL/AdYB+gL/AdUB+wL/AdMB/AL/
- AdEB/AH+Af8BzgH8Av8BwgHvAfIB/wFnAcUBywH/AR8B3AHzAf8BAAHTAfwB/wFRAlIBp/8AgQADPAFm
- AZgB6wHzAf8BkgHkAv8BcwHMAeMB/wGuAdkB4QH/AasBzQHSAf8BvgHzAfoB/wHBAfcC/wG/AfcC/wG+
+ AdEB/AH+Af8BzgH8Av8BwgHvAfIB/wFmAcUBywH/AR4B3AHzAf8BAAHTAfwB/wFRAlIBp/8AgQADPAFm
+ AZgB6wHzAf8BkgHkAv8BcgHMAeMB/wGuAdkB4QH/AasBzQHSAf8BvgHzAfoB/wHBAfcC/wG/AfcC/wG+
AfYC/wG4Ae8B9gH/AYMBhwGIAf8BvgHyAfwB/wGKAa8BtQH/AYUBowGmAf8BzgH4Av8B0QH3Av8B0wH3
Av8B1AH3Av8B1AH4Av8B0wH5Av8B0wH6Av8B0QH7Av8B0AH7Av8BzgH7Af4B/wHMAfsC/wHJAfoB/gH/
- AbAB3QHgAf8BSgHMAdcB/wELAdUB+gH/AQAB0gH1Af8DOwFl/wCBAAMTARoBXAGhAaIB+AGwAewB/gH/
+ AbAB3QHgAf8BSQHMAdcB/wEKAdUB+gH/AQAB0gH1Af8DOwFl/wCBAAMTARoBXAGeAZ8B+AGwAewB/gH/
AYsB4AH8Af8BlAHAAcoB/wG2AdoB4QH/Ab8B9gL/Ab4B9gL/Ab0B9gL/Ab0B9wL/Ab0B9wL/AZsBqQGq
- Af8BqAHTAdkB/wHBAfQB/gH/AVwBgwGGAf8BlQG5Ab0B/wHMAfkC/wHOAfkC/wHPAfkC/wHQAfkC/wHP
- AfoC/wHOAfsC/wHNAfsC/wHKAfoC/wHJAfkC/wHIAfkC/wHAAfMB+AH/AYoBxQHJAf8BMgHaAfAB/wEA
- AdAB/gH/AS4BjQGTAfYDEgEZ/wCBAAMCAQMBUQJSAacBvAHyAfgB/wGkAekC/wGJAcwB3wH/Aa4B2AHh
+ Af8BqAHTAdkB/wHBAfQB/gH/AVsBgwGGAf8BlQG5Ab0B/wHMAfkC/wHOAfkC/wHPAfkC/wHQAfkC/wHP
+ AfoC/wHOAfsC/wHNAfsC/wHKAfoC/wHJAfkC/wHIAfkC/wHAAfMB+AH/AYoBxQHJAf8BMQHaAfAB/wEA
+ AdAB/gH/ATABiQGQAfYDEgEZ/wCBAAMCAQMBUQJSAacBvAHyAfgB/wGkAekC/wGJAcwB3wH/Aa4B2AHh
Af8BvQHzAf4B/wG7AfUC/wG7AfYC/wG7AfYC/wG7AfYC/wGwAdUB2QH/AZ0BsgG1Af8BvwH2Av8BvwH1
- Af0B/wFrAZgBmwH/AV8BhQGIAf8BuAHmAewB/wHIAfgC/wHJAfgC/wHJAfgC/wHIAfkC/wHGAfkC/wHG
- AfoC/wGzAd4B4gH/AbUB1QHYAf8BpAHQAdQB/wFMAcYB0wH/AR4B1gH8Af8BAAHOAfoB/wFSAlQBpgMC
- AQP/AIQAAQEDIQEwAV8CtwH7AcUB8QH+Af8BoQHnAf0B/wGZAcUB0AH/Ab0B5wHxAf8BvwHzAv8BugH1
- Av8BugH3Av8BugH3Av8BuQH2Af4B/wGlAc8B0wH/AbcB8wH6Af8BvQH3Av8BvwH3Av8BqQHaAeAB/wFe
- AYUBhwH/AVsBcwGAAf8BjgGxAbUB/wGvAd8B5AH/AcAB9wH9Af8BwgH5Av8BwQH5Av8BvwH3Af4B/wGx
- AeYB7AH/AWkBvwHHAf8BNQHZAfcB/wENAdEB/gH/AR8BoQGuAfoDIAEuAwABAf8AhQADAQECAU0CTgGV
+ Af0B/wFqAZgBmwH/AV4BhQGIAf8BuAHmAewB/wHIAfgC/wHJAfgC/wHJAfgC/wHIAfkC/wHGAfkC/wHG
+ AfoC/wGzAd4B4gH/AbUB1QHYAf8BpAHQAdQB/wFLAcYB0wH/AR0B1gH8Af8BAAHOAfoB/wFSAlQBpgMC
+ AQP/AIQAAQEDIQEwAV8CswH7AcUB8QH+Af8BoQHnAf0B/wGZAcUB0AH/Ab0B5wHxAf8BvwHzAv8BugH1
+ Av8BugH3Av8BugH3Av8BuQH2Af4B/wGlAc8B0wH/AbcB8wH6Af8BvQH3Av8BvwH3Av8BqQHaAeAB/wFd
+ AYUBhwH/AVoBcgGAAf8BjgGxAbUB/wGvAd8B5AH/AcAB9wH9Af8BwgH5Av8BwQH5Av8BvwH3Af4B/wGx
+ AeYB7AH/AWgBvwHHAf8BNAHZAfcB/wEMAdEB/gH/ASABnwGrAfoDIAEuAwABAf8AhQADAQECAU0CTgGV
AbgB8AHyAf8BwwHwAf4B/wGvAeYB9gH/AbcB1QHbAf8BygHvAfcB/wHCAfMB/gH/AaMB1gHdAf8BtwH2
Av8BuAH3Av8BuQH4Av8BugH3Av8BuwH3Av8BvAH3Av8BvAH3Av8BvQH3Av8BtgHvAfUB/wGSAb0BwQH/
- AWkBjwGRAf8BWgFrAW0B/wFrAYkBiwH/AY4BsgG1Af8BsAHrAfAB/wGDAcEByQH/AUAB0gHuAf8BIAHU
- Av8BCAHPAfUB/wFNAk4BlQMBAQL/AI0AAwwBEAFbAl8B2QHQAfQB+AH/Ac4B8wL/AcwB7QH3Af8B1wHn
+ AWgBjwGRAf8BWQFqAWwB/wFqAYkBiwH/AY4BsgG1Af8BsAHrAfAB/wGDAcEByQH/AT8B0gHuAf8BHwHU
+ Av8BBwHPAfUB/wFNAk4BlQMBAQL/AI0AAwwBEAFbAl4B2QHQAfQB+AH/Ac4B8wL/AcwB7QH3Af8B1wHn
AesB/wHVAfEB9wH/AbwB2QHfAf8BtwH0Av8BtQH2Av8BtQH2Av8BtgH2Av8BtwH3Av8BuQH4Av8BuQH4
Av8BugH4Av8BugH4Av8BuQH3Af4B/wG3AfQB+gH/AbkB9gH9Af8BpwHeAeQB/wGYAcoBzwH/AYQBwAHJ
- Af8BSgHPAeoB/wEwAdcB/gH/ARcB0QH5Af8BWQFfAWAB1wMLAQ//AJUAAx8BLAFdAnoB7QHbAfcB+gH/
+ Af8BSQHPAeoB/wEvAdcB/gH/ARYB0QH5Af8BWQFeAV8B1wMLAQ//AJUAAx8BLAFdAnUB7QHbAfcB+gH/
Ad4B9wL/AfYB/AH+Af8B9wH6AfsB/wHbAewB8AH/AcUB8AH7Af8BtwHxAv8BswHyAf4B/wGyAfQB/gH/
AZ0B0wHaAf8BswH1Af4B/wG0AfYC/wG1AfYC/wG2AfYC/wGyAfIB+gH/AaQBzAHRAf8BrAHbAeEB/wGf
- AdcB3wH/AWoBvAHJAf8BTAHTAfAB/wE6AdgB/gH/ASUB0wH7Af8BTgF1AXoB7QMfASz/AJ0AAyUBNwFg
- AnoB7QHZAfYB+QH/AewB+gL/AfwB/gL/AfkC+wH/Ac8B4gHnAf8BuQHfAegB/wGyAecB8wH/AbIB7QH6
+ AdcB3wH/AWkBvAHJAf8BSwHTAfAB/wE5AdgB/gH/ASQB0wH7Af8BUAFyAXUB7QMfASz/AJ0AAyUBNwFf
+ AnUB7QHZAfYB+QH/AewB+gL/AfwB/gL/AfkC+wH/Ac8B4gHnAf8BuQHfAegB/wGyAecB8wH/AbIB7QH6
Af8BrQHUAd0B/wGuAdwB5AH/AbIB8gH+Af8BsQHzAf0B/wGuAe8B+gH/AakB5wHyAf8BngHWAeAB/wGC
- Ab0ByAH/AVwBxAHaAf8BUQHbAfsB/wE/AdgC/wEuAdQB+QH/AVEBdAF5AewDJAE2/wClAAMeASsBWgJe
+ Ab0ByAH/AVsBxAHaAf8BUAHbAfsB/wE+AdgC/wEtAdQB+QH/AVMBcAF2AewDJAE2/wClAAMeASsBWgJe
AdgBxgHyAfMB/wHpAfkB/gH/Ae8B+wL/Ad0B9QH8Af8BuAHgAeoB/wGaAcsB1gH/AZEBwAHLAf8BlgHD
- Ac0B/wGYAcAByQH/AZgBygHUAf8BkgHEAc8B/wGGAb8BywH/AW0BvwHPAf8BZAHJAeAB/wFdAdsB+QH/
- AVQB3AL/AUYB2QH+Af8BMwHVAfMB/wFZAV8BYAHXAx0BKv8ArQADCgEOA0wBkwF5ArcB+wHRAfQB+AH/
- AdkB9gH+Af8BygHyAv8BtAHtAv8BnAHnAf0B/wGNAd8B9wH/AYIB2QHxAf8BdAHYAfEB/wFzAdwB9gH/
- AXAB4AH9Af8BbAHgAv8BYwHeAv8BWgHcAf4B/wFMAdoB+AH/ATEBpwG3AfsDTAGTAwoBDv8AuQADHwEt
- AU8CUwGlAWcCogH4Aa0B7QHxAf8BvAHwAfkB/wGzAe0B/QH/AaUB6gH+Af8BmwHnAf4B/wGTAeYC/wGL
- AeQB/gH/AYMB4wH9Af8BbAHgAfoB/wFTAdwB8AH/AUQBmgGhAfcBUAJSAaQDHwEt/wDJAAMQARUBOQI6
- AWADUQGiAVkCXQHSAVcBgwGGAfEBRwHRAdcB/wFCAdEB1wH/AVMBgwGGAfEBWQJdAdIDUQGiATkCOgFg
+ Ac0B/wGYAcAByQH/AZgBygHUAf8BkgHEAc8B/wGGAb8BywH/AWwBvwHPAf8BYwHJAeAB/wFcAdsB+QH/
+ AVMB3AL/AUUB2QH+Af8BMgHVAfMB/wFZAV4BXwHXAx0BKv8ArQADCgEOA0wBkwF2ArMB+wHRAfQB+AH/
+ AdkB9gH+Af8BygHyAv8BtAHtAv8BnAHnAf0B/wGNAd8B9wH/AYIB2QHxAf8BcwHYAfEB/wFyAdwB9gH/
+ AW8B4AH9Af8BawHgAv8BYgHeAv8BWQHcAf4B/wFLAdoB+AH/ATEBowGzAfsDTAGTAwoBDv8AuQADHwEt
+ AU8CUwGlAWUCnwH4Aa0B7QHxAf8BvAHwAfkB/wGzAe0B/QH/AaUB6gH+Af8BmwHnAf4B/wGTAeYC/wGL
+ AeQB/gH/AYMB4wH9Af8BawHgAfoB/wFSAdwB8AH/AUYBlgGeAfcBUAJSAaQDHwEt/wDJAAMQARUBOQI6
+ AWADUQGiAVkCXQHSAVcBgAGDAfEBRgHRAdcB/wFBAdEB1wH/AVMBgAGDAfEBWQJdAdIDUQGiATkCOgFg
AxABFf8AtAAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/x8AAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMA
Af8DAAH/AwAB/wMAAf8jAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/HwAB/wMAAf8DAAH/AwAB/wMA
Af8DAAH/AwAB/wMAAf8DAAH/AwAB/yMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8fAAH/AwAB/wMA
@@ -464,36 +464,36 @@
A4QB/wOEAf8DhAH/A8YB/wOEAf8DAAH/A4QR/wMAAf8DAAH/AwAJ/wMAAf8DhAH/A4QB/wOEAf8DhAH/
A4QB/wOEAf8DhAH/A4QB/wOEAv8CAAP/AQAD/wEAA/8BAAP/AQAD/wEAA/8BAAH/AYQCAAH/A4QB/wOE
Af8DhAH/AwAB/xAAAwkBDANlAfQB/wH6AdgC/wHuAcgC/wHpAcAC/wHiAbgC/wHhAbUC/wHbAa0C/wHX
- AagC/wHTAaMC/wHxAdoB/wEzAb4BLwL/AfMB0AL/AfsB3gP/AesD/wHzAv8B/QHzAv8B9wHgAv8B9wHS
+ AagC/wHTAaMC/wHxAdoB/wEyAb4BLgL/AfMB0AL/AfsB3gP/AesD/wHzAv8B/QHzAv8B9wHgAv8B9wHS
Av8B/AHZAf8DXwHzA1QBrgM/AW0DGgEkAwIBAwwAA4QN/wMAAf8DAAH/AwAB/wMACf8DAAH/A4QB/wGE
AgAF/wGEAgAF/wGEAgAB/wOEBf8DxgH/A4QB/wPGAf8DhAn/AgABhAX/AwAF/wOEAf8DAAH/A4QB/xQA
A4QB/wPGAf8DAAH/FAADhAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMA
Af8DAAH/AwAB/wMAAf8DhAH/A4QB/wPGAf8DAAH/A4QN/wMAAf8DAAH/AwAB/wMACf8DAA3/AQAP/wEA
- B/8BAAT/AgAD/wEAA/8BAAP/AQAD/wEAA/8BAAH/AYQCAAX/AQAD/wOEAf8DAAH/EAADMwFTAe4BtgFB
+ B/8BAAT/AgAD/wEAA/8BAAP/AQAD/wEAA/8BAAH/AYQCAAX/AQAD/wOEAf8DAAH/EAADMwFTAe4BtgFA
Af8B+gHrAcAC/wH1AdAC/wHpAcAC/wHiAbcC/wHfAbIC/wHbAa0C/wHTAaMC/wHRAaAC/wHxAdoB/wEA
- AZkBAAH/AYABywFPAf8BEwGzARMB/wEAAZkBAAH/AQABmQEAAf8BIwG5ASMB/wHPAewBzQL/AfwB5QL/
+ AZkBAAH/AYABywFOAf8BEgGzARIB/wEAAZkBAAH/AQABmQEAAf8BIgG5ASIB/wHPAewBzQL/AfwB5QL/
AfoB1wP/Ad4B/wNhAe4DTgGUAyoBQQMHAQoMAAOEJf8DAAH/AYQCAAH/A4QB/wGEAgAF/wGEAgAB/wOE
Av8CAAH/A8YF/wPGBf8Dxgn/A8YB/wMABf8DxgH/A4QB/wMAAf8DhAH/FAADhAH/A8YB/wMAAf8UAAOE
Af8DxgH/A8YB/wPGAf8DxgH/A8YB/wPGAf8DxgH/A8YB/wPGAf8DxgH/A8YB/wPGAf8DxgH/A4QB/wMA
Af8DhAH/A4QB/wQAA4Ql/wMAAf8BABP/AQAT/wEABP8CAAP/AQAD/wEAA/8BAAP/AQAB/wGEAgAB/wEA
- B/8DhAH/AwAB/w8AAQEDUQGgAe8BswE+Af8B8AG4AUUB/wH6AecBugL/AfoB1wL/AekBwQL/Ad8BsgL/
+ B/8DhAH/AwAB/w8AAQEDUQGgAe8BswE9Af8B8AG4AUQB/wH6AecBugL/AfoB1wL/AekBwQL/Ad8BsgL/
AdsBrQL/AdMBowL/AdYBpgL/AfEB2gH/AQABmQEAAf8BAAGZAQAB/wEAAZkBAAH/AQABmQEAAf8BAAGZ
AQAB/wEAAZkBAAH/AQABmQEAAf8BnwHZAZsC/wH+AeED/wHeA/8B3gH/AlgBVgG5AzMBUwMNARIMAAOE
Af8DhAH/A4QB/wOEAf8DhAH/A4QB/wOEAf8DhAH/A4QB/wOEAf8DAAL/AgAC/wIAAf8DhAL/AgAG/wIA
Af8DxgX/A8YF/wPGEf8DAAn/A4QB/wMAAf8DhAH/FAADhAH/A8YB/wMAAf8UAAOEMf8DxgH/A4QB/wOE
Af8DAAH/CAADhAH/A4QB/wOEAf8DhAH/A4QB/wOEAf8DhAH/A4QB/wOEAf8DhAH/AwAd/wEADP8CAAP/
- AQAD/wEAA/8BAAP/AQAD/wEAAf8BhAIABf8BAAP/A4QB/wMAAf8MAAMEAQUDXgHZAfIBuAFHAf8B8gG4
- AUcB/wHyAbgBRwH/AfYBygGQAf8B/AHuAcQC/wH5AdYC/wHrAcIC/wHbAa4C/wHXAacC/wHxAdoB/wEA
+ AQAD/wEAA/8BAAP/AQAD/wEAAf8BhAIABf8BAAP/A4QB/wMAAf8MAAMEAQUDXgHZAfIBuAFGAf8B8gG4
+ AUYB/wHyAbgBRgH/AfYBygGQAf8B/AHuAcQC/wH5AdYC/wHrAcIC/wHbAa4C/wHXAacC/wHxAdoB/wEA
AZkBAAH/AQABmQEAAf8BAAGZAQAB/wEAAZkBAAH/AQABmQEAAf8BAAGZAQAB/wEAAZkBAAH/AQABnwEA
Af8B3wHyAdEC/wH+Ad0B/wH8Ae4BxAH/A1wByQM6AWIDEgEZDwAB/wPGDf8DhAH/A8YF/wPGBf8DxgX/
A4QD/wEAAf8DxgL/AgAB/wPGAv8CAAH/A8YC/wIAAf8DxhH/AwAJ/wPGAf8DhAH/AwAB/wOEAf8HAAH/
AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DhAX/A4QB/wOEAf8DhAH/
A4QB/wOEAf8DhAH/A4QB/wOEAf8DhAH/A4QF/wPGAf8DhAH/A4QB/wMAAf8IAAOEAf8Dxin/AYQCAAH/
AYQCAAH/AYQCAAH/AYQCAAH/AYQCAAH/AYQCAAH/AYQCAAH/AYQCAAL/AgAC/wIAAv8CAAL/AgAC/wIA
- Av8CAAL/AgAB/wGEAgAB/wEAB/8DhAH/AwAB/wwAAxUBHQH4AcgBjwH/AfUBvAFQAf8B9QG8AVAB/wH1
- AbwBUAH/AfUBvAFQAf8B9QG8AVAB/wH3AcUBiQH/AfoB2wGqAf8B/QHvAccC/wH1AdAC/wHxAdoB/wEA
+ Av8CAAL/AgAB/wGEAgAB/wEAB/8DhAH/AwAB/wwAAxUBHQH4AcgBjwH/AfUBvAFPAf8B9QG8AU8B/wH1
+ AbwBTwH/AfUBvAFPAf8B9QG8AU8B/wH3AcUBiQH/AfoB2wGqAf8B/QHvAccC/wH1AdAC/wHxAdoB/wEA
AZkBAAH/AQABmQEAAf8BAAGZAQAB/wEAAaYBAAH/Ae8B+QHoAf8B7wH5AewB/wGAAcwBgAH/AQABmQEA
- Af8BEwGzARMC/wH3AdcB/wH2AcABgwH/A14B2ANBAXMDGAEhDwAB/wPGEf8DhAH/A8YF/wPGBf8DxgX/
+ Af8BEgGzARIC/wH3AdcB/wH2AcABgwH/A14B2ANBAXMDGAEhDwAB/wPGEf8DhAH/A8YF/wPGBf8DxgX/
A8YD/wEAAf8DxgP/AQAB/wPGAv8CAAH/A8YF/wPGCf8DABH/A4QB/wMAAf8DhAH/A4QB/wOEAf8DhAH/
A4QB/wOEAf8DhAH/A4QB/wOEAf8DhAH/A4QB/wOEAf8DhAH/A4QB/wOEBf8DhAH/AwAd/wOEBf8DxgH/
A4QB/wOEAf8DAAH/CAADhAH/A8ZN/wEAE/8BAAv/AQAD/wOEAf8DAAH/DAADOgFiAfgBwQGFAf8B9wG/
@@ -506,8 +506,8 @@
AYQCAAH/AYQCAAH/AYQCAAH/AYQCAAH/AYQCAAH/AYQCAAH/AYQCAAH/AYQCAAH/AYQCAAH/AYQCAAH/
AYQCAAH/AYQCAAH/AYQCAAH/AYQCAAH/AQAH/wOEAf8DAAH/CwABAQNRAaAB+wHGAY4B/wH7AcYBjgH/
AfsBxgGOAf8B+wHGAY4B/wH7AcYBjgH/AfsBxgGOAf8B+wHGAY4B/wH7AcYBjgH/AfsBxgGOAv8B5wHC
- Av8B9AHjAf8BEwGzARMB/wEAAZkBAAH/AQABmQEAAf8BAAGZAQAB/wEAAZ8BAAH/Ae8B+QHtAf8B/AH2
- AdcB/wH8AfYB2QH/AY8B0gGMAf8BjwHNAVIB/wH9AdYBpAH/A18B8wNKAYwDIQEwAwABAQsAAf8Dxh3/
+ Av8B9AHjAf8BEgGzARIB/wEAAZkBAAH/AQABmQEAAf8BAAGZAQAB/wEAAZ8BAAH/Ae8B+QHtAf8B/AH2
+ AdcB/wH8AfYB2QH/AY8B0gGMAf8BjwHNAVEB/wH9AdYBpAH/A18B8wNKAYwDIQEwAwABAQsAAf8Dxh3/
A4QB/wOEAf8DxgX/A8YF/wPGBf8DxgX/A8YB/wMAAf8DAB3/A4QB/wMAAf8DhAH/A4QF/wPGAf8BAAH/
AQAB/wEAAf8BAAH/A8YB/wPGAf8DxgH/A8YB/wPGAf8DxgH/AwAB/wMAAf8DhAX/A4QB/wMAB/8BABX/
A4QF/wPGAf8DhAH/A4QB/wMAAf8IAAOEAf8Dxjn/AQAn/wEAC/8BAAP/A4QB/wMAAf8IAAMDAQQDXgHZ
@@ -519,24 +519,24 @@
AQAV/wOEBf8DxgH/A4QB/wOEAf8DAAH/CAADhAH/A8Yp/wGEAgAB/wGEAgAB/wGEAgAB/wGEAgAB/wGE
AgAB/wGEAgAB/wGEAgAB/wGEAgAB/wGEAgAB/wGEAgAB/wGEAgAB/wGEAgAB/wGEAgAB/wGEAgAB/wGE
AgAB/wGEAgAJ/wOEAf8DAAH/CAADFAEcAf8B0AGeAv8BzAGZAv8BzAGZAv8BzAGZAv8BzAGZAv8BzAGZ
- Av8BzAGZAv8BzAGZAv8BzAGZAv8BzAGZAv8B7QHQAf8BIwG5ASMC/wHtAcoB/wH7Ae8BxQL/AfwB2wH/
- AUMBxgFBAf8BEwGzARMB/wETAbMBEwH/AUMBxgFDAf8BgAHMAVAB/wGvAd8BpgH/Ac8B6AG9Av8B3QGu
+ Av8BzAGZAv8BzAGZAv8BzAGZAv8BzAGZAv8B7QHQAf8BIgG5ASIC/wHtAcoB/wH7Ae8BxQL/AfwB2wH/
+ AUIBxgFAAf8BEgGzARIB/wESAbMBEgH/AUIBxgFCAf8BgAHMAU8B/wGvAd8BpgH/Ac8B6AG9Av8B3QGu
Av8B2QGqAf8DUgGoAy4BRwMJAQwLAAH/A8Zt/wOEAf8DAAH/A4QB/wOEMf8DhAX/A4QB/wMAHf8DhAX/
A8YB/wOEAf8DhAH/AwAB/wgAA4QB/wPGQf8BABP/AQAT/wEAB/8DhAH/AwAB/wgAAzIBUQH/AdQBpQL/
AdQBpAL/AdQBpAL/AdQBpAL/AdQBpAL/AdQBpAL/AdQBpAL/AdQBpAL/AdQBpAL/AdQBpAL/AeEBuAH/
- ASMBuQEjAf8BjwHOAYMB/wH+AfEBygH/Af0B+AHTA/8B6QH/AQMBrAEDAf8BAAGZAQAB/wEAAZkBAAH/
- AQABmQEAAf8BEwGzARMC/wHxAcoC/wHVAaYC/wHUAaQB/wJYAVYBuQMzAVMDDQESCwAB/wPGaf8DxgH/
+ ASIBuQEiAf8BjwHOAYMB/wH+AfEBygH/Af0B+AHTA/8B6QH/AQIBrAECAf8BAAGZAQAB/wEAAZkBAAH/
+ AQABmQEAAf8BEgGzARIC/wHxAcoC/wHVAaYC/wHUAaQB/wJYAVYBuQMzAVMDDQESCwAB/wPGaf8DxgH/
A4QB/wMAAf8DhAH/BAADhAH/A4QB/wOEAf8DhAH/A4QB/wOEAf8DhAH/A4QB/wOEAf8DhAH/A4QB/wOE
Af8DhAX/A4QB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/A4QF/wPGAf8DhAH/A4QB/wMA
Af8IAAOEAf8Dxk3/AQAL/wEAC/8BAAf/AQAD/wOEAf8DAAH/CAADTQGRAf8B2wGuAv8B2wGuAv8B2wGu
Av8B2wGuAv8B2wGuAv8B2wGuAv8B2wGuAv8B2wGuAv8B2wGuAv8B2wGuAv8B3gGxAf8BnwHSAY0B/wEA
- AZkBAAH/AY8B0QGJAv8B+gHfAv8B/QHeAf8BzwHsAccB/wEAAZkBAAH/AQABmQEAAf8BAAGZAQAB/wET
- AbMBEwL/AfEBygL/AdsBrgL/AdsBrgH/A1sByAM5AV8DEQEXCwAB/wPGbf8DhAH/AwAB/wOEAf8IAAOE
+ AZkBAAH/AY8B0QGJAv8B+gHfAv8B/QHeAf8BzwHsAccB/wEAAZkBAAH/AQABmQEAAf8BAAGZAQAB/wES
+ AbMBEgL/AfEBygL/AdsBrgL/AdsBrgH/A1sByAM5AV8DEQEXCwAB/wPGbf8DhAH/AwAB/wOEAf8IAAOE
Af8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/A4QF/wOEAf8DhAH/A4QB/wOE
Af8DhAH/A4QB/wOEAf8DhAH/A4QB/wOEBf8DxgH/A4QB/wOEAf8DAAH/CAADhAH/A8ZJ/wEAE/8CAAL/
AgABhAH/AgABhAH/AgABhAX/A4QB/wMAAf8HAAEBA10BygH/AeABtQL/AeABtQL/AeABtQL/AeABtQL/
- AeABtQL/AeABtQL/AeABtQL/AeABtQL/AeABtQL/AeABtQL/AeABtQL/AekBxwH/AQMBrAEDAf8BAAGZ
- AQAB/wEAAaYBAAH/AYABzAGAAf8BEwGzARMB/wEAAZkBAAH/AQABmQEAAf8BAAGZAQAB/wETAbMBEwL/
+ AeABtQL/AeABtQL/AeABtQL/AeABtQL/AeABtQL/AeABtQL/AeABtQL/AekBxwH/AQIBrAECAf8BAAGZ
+ AQAB/wEAAaYBAAH/AYABzAGAAf8BEgGzARIB/wEAAZkBAAH/AQABmQEAAf8BAAGZAQAB/wESAbMBEgL/
AfIBzAL/AeABtQL/AeABtQH/A2AB1gM+AWsDFQEdCwAB/wPGCf8DAAH/AwAF/wMAAf8DAAX/AwAB/wMA
Cf8DAAH/AwAJ/wIAAv8CAAL/AgAG/wIAAv8CAAL/AgAC/wMAAf8DAAX/A8YB/wOEAf8DAAH/A4QB/wgA
A4QB/wPGAf8DxgH/A8YB/wPGAf8DxgH/A8YB/wPGAf8DxgH/A8YB/wPGAf8DhDX/A4QB/wOEAf8DAAH/
@@ -544,21 +544,21 @@
A/8CAAL/AgAC/wIAAYQB/wIAAYQB/wEAA/8DhAH/AwAB/wQAAwMBBANnAfIB/wHrAcIC/wHrAcIC/wHr
AcIC/wHrAcIC/wHrAcIC/wHrAcIC/wHrAcIC/wHrAcIC/wHrAcIC/wHrAcIC/wHrAcIC/wHpAb8B/wHP
AeQBtwH/AQABnwEAAf8BAAGZAQAB/wEAAZkBAAH/AQABmQEAAf8BAAGZAQAB/wEAAZkBAAH/AQABmQEA
- Af8BEwGzARMC/wH1Ac8C/wHrAcIC/wHrAcIB/wNhAeIDQgF2AxgBIgsAAf8Dxgn/AwAB/wMABf8DAAH/
+ Af8BEgGzARIC/wH1Ac8C/wHrAcIC/wHrAcIB/wNhAeIDQgF2AxgBIgsAAf8Dxgn/AwAB/wMABf8DAAH/
AwAF/wMAAf8DAAX/AwAB/wMAAf8DAAH/AwAF/wIAAv8CAAL/AgAG/wIAAv8CAAL/AgAC/wMAAf8DAAn/
A4QB/wMAAf8DhAH/CAADhC3/A4QB/wPGAf8DxgH/A8YB/wPGAf8DxgH/A8YB/wPGAf8DxgH/A8YB/wPG
Af8DxgH/A8YB/wPGAf8DhAH/AwAB/wgAA4QB/wPGCv8CAAH/AYQCAAH/AYQCAAL/AgAC/wIAAv8CAAH/
AYQCAC3/AQAL/wIAAv8CAAL/AgAC/wIAAYQF/wOEAf8DAAH/BAADEwEaAf8B6gHBAv8B8wHNAv8B8wHN
Av8B8wHNAv8B8wHNAv8B8wHNAv8B8wHNAv8B8wHNAv8B8wHNAv8B8wHNAv8B8wHNAv8B8wHNAv8B8wHN
Av8B8AHJAf8BzwHnAbsB/wEAAaYBAAH/AQABmQEAAf8BAAGZAQAB/wEAAZkBAAH/AQABmQEAAf8BAAGm
- AQAB/wETAbMBEwL/AfcB0gL/AfMBzQL/AfMBzQH/A10B7QNGAYADHAEoCwAB/wPGCf8DAAH/AwAF/wMA
+ AQAB/wESAbMBEgL/AfcB0gL/AfMBzQL/AfMBzQH/A10B7QNGAYADHAEoCwAB/wPGCf8DAAH/AwAF/wMA
Af8DAAX/AwAB/wMAAf8DAAH/AwAJ/wMAAf8DAAH/AgAC/wIAAv8CAAb/AgAC/wIAAv8CAA7/A8YB/wOE
Af8DAAH/A4QB/wgAA4QF/wOEAf8BhAIAAf8BhAIAAf8BhAIAAf8BhAIAAf8BhAIAAf8BhAIAAf8BhAIA
Af8BhAIAAf8BhAIABf8DhAH/A4QB/wOEAf8DhAH/A4QB/wOEAf8DhAH/A4QB/wOEAf8DhAH/A4QB/wOE
Af8DhAH/A4QB/wwAA4QB/wPGCv8CAAH/AYQCAAL/AgAC/wIAAv8CAAH/AYQCAD3/AgAC/wIAAv8CAAL/
AgAG/wOEAf8DAAH/BAADMQFNAf8B8gHNAv8B+gHXAv8B+gHXAv8B+gHXAv8B+gHXAv8B+gHXAv8B+gHX
Av8B+gHXAv8B+gHXAv8B+gHXAv8B+gHXAv8B+gHXAv8B+gHXAv8B+gHXAv8B+gHXAv8B/AHhAf8BrwHf
- AaMB/wGAAcwBTgH/AY8B0gGOAf8B3wHyAdsB/wHPAewByQH/ARMBswETAv8B+QHVAv8B+gHXAv8B+gHX
+ AaMB/wGAAcwBTQH/AY8B0gGOAf8B3wHyAdsB/wHPAewByQH/ARIBswESAv8B+QHVAv8B+gHXAv8B+gHX
Af8DXwHzA0oBiwMfAS0LAAH/A8YJ/wMAAf8DAAX/AwAB/wMABf8DAAH/AwAN/wMAAf8DAAH/AwAB/wIA
Av8CAAL/AgAG/wIAAv8CAAL/AgAS/wOEAf8DAAH/A4QB/wgAA4QF/wOEAf8DAAL/AgAC/wIAAv8CAAL/
AgAC/wIAAv8CAAL/AgAB/wGEAgAF/wPGAf8DhAH/A4QB/wMAAf80AAOEAf8Dxgr/AgAC/wIAAv8CAAL/
@@ -583,18 +583,18 @@
CAADhAX/A4QB/wMAAv8CAAP/AQAC/wIAAv8CAAL/AgAC/wIAAv8CAAH/AYQCAAX/A8YB/wOEAf8DhAH/
AwAB/0QAAf8CAAH/AYQCAAH/BAAB/wIAFf8BhAIAAf8UAAGEAgAB/wGEAgAB/zAAAw0BEQNdAfAB/wH5
AdUD/wHeA/8B3gP/Ad4D/wHeAv8B+wHYAv8B9AHPAf8B/gHqAcIB/wH5AdYBowH/AfQBxgGIAf8B7gG0
- AT8B/wHvAbIBPQH/Ae8BtAE/Af8B8AG2AUQB/wHwAbcBRQH/AfIBuQFJAf8B8wG6AUsB/wH0AbsBTgH/
- AfUBvAFQAf8B9wHCAYYB/wH6AdgBpQH/Af4B9wHTA/8B3gP/Ad4D/wHeAf8DVgG2AzABTAMKAQ4HAAH/
+ AT4B/wHvAbIBPAH/Ae8BtAE+Af8B8AG2AUMB/wHwAbcBRAH/AfIBuQFIAf8B8wG6AUoB/wH0AbsBTQH/
+ AfUBvAFPAf8B9wHCAYYB/wH6AdgBpQH/Af4B9wHTA/8B3gP/Ad4D/wHeAf8DVgG2AzABTAMKAQ4HAAH/
A8YJ/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAX/AwAB/wMAAf8DAAH/AwAF/wIAAv8CAAL/
AgAC/wIAAv8CAAL/AgAC/wIAEv8DhAH/AwAB/wOEAf8IAAOEBf8DhAH/AwAC/wIAAv8CAAL/AgAC/wIA
Av8CAAL/AgAC/wIAAf8BhAIABf8DxgH/A4QB/wOEAf8DAAH/RAAB/wIAAf8MAAH/AgAL/wEAB/8BAAH/
AYQCAAH/DAABhAIABf8BhAIAAf80AAMiATIDUgGjA2AB1ANkAfEDXAHJA1gBuwH2AdsBugH/AfYB2wG6
- Af8DSAGGA1cBuANkAfEB7wGyAT0B/wHvAbQBPwH/AfABtgFEAf8B8AG3AUUB/wHyAbkBSQH/AfMBugFL
- Af8B9AG7AU4B/wH1AbwBUAH/AfYBvgGAAf8B9wHAAYMB/wH4AcEBhQH/AfkBwwGIAf8B/AHeAa8C/wH7
+ Af8DSAGGA1cBuANkAfEB7wGyATwB/wHvAbQBPgH/AfABtgFDAf8B8AG3AUQB/wHyAbkBSAH/AfMBugFK
+ Af8B9AG7AU0B/wH1AbwBTwH/AfYBvgGAAf8B9wHAAYMB/wH4AcEBhQH/AfkBwwGIAf8B/AHeAa8C/wH7
AdkD/wHeAf8CVwFVAboDNQFWAw4BEwcAAf8Dxgn/AwAF/wMAAf8DAAX/AwAB/wMADf8DAAH/AwAJ/wIA
Av8CAAb/AgAC/wIAAv8CABL/A8YB/wOEAf8DAAH/A4QB/wgAA4QF/wOEAf8DAAH/AwAB/wMAAf8DAAH/
AwAB/wMAAf8DAAH/AwAB/wGEAgAF/wPGAf8DhAH/A4QB/wMAAf9YAAH/AgAD/wEAB/8BAAf/AQAB/wGE
- AgAC/wIAAv8CAAb/AgAB/2QAAyIBMgNCAXYDXQHTAfIBuQFJAf8B8wG6AUsB/wH0AbsBTgH/AfUBvAFQ
+ AgAC/wIAAv8CAAb/AgAB/2QAAyIBMgNCAXYDXQHTAfIBuQFIAf8B8wG6AUoB/wH0AbsBTQH/AfUBvAFP
Af8B9gG+AYAB/wH3AcABgwH/AfgBwQGFAf8B+QHDAYgB/wH6AcQBigH/AfsBxgGOAf8B/AHRAZ4C/wH8
AdkB/wNcAcwDNgFZAxABFQcAAf8Dxm3/A4QB/wMAAf8DhAH/CAADhAX/A4QB/wOEAf8DhAH/A4QB/wOE
Af8DhAH/A4QB/wOEAf8DhAH/A4QF/wPGAf8DhAH/A4QB/wMAAf9cAAb/AQAD/wEAA/8BAAP/AQAD/wEA
@@ -835,7 +835,10 @@
398, 17
- 714, 17
+ 617, 15
+
+
+ 17, 56
63