From b5cc523276755aa0171705bb65beabf9ddd825d7 Mon Sep 17 00:00:00 2001 From: jtsshieh Date: Sat, 28 Oct 2017 20:17:22 -0400 Subject: Fixed up time distorter bug, 95 desktop cleanup and ie3 supporting links wihtout www --- Histacom2/OS/Win95/Win95.cs | 40 ++-------------------------------------- 1 file changed, 2 insertions(+), 38 deletions(-) (limited to 'Histacom2/OS/Win95/Win95.cs') 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 @@ namespace Histacom2.OS.Win95 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 @@ namespace Histacom2.OS.Win95 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 @@ namespace Histacom2.OS.Win95 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 @@ namespace Histacom2.OS.Win95 app.BringToFront(); startmenu.Hide(); + } } } -- cgit v1.2.3 From a853570320fd443e3f717f9733af5602bc3580ad Mon Sep 17 00:00:00 2001 From: jtsshieh Date: Sat, 28 Oct 2017 20:21:42 -0400 Subject: Cleanup --- Histacom2/OS/Win95/Win95.Designer.cs | 1 - Histacom2/OS/Win95/Win95.cs | 7 ------- 2 files changed, 8 deletions(-) (limited to 'Histacom2/OS/Win95/Win95.cs') diff --git a/Histacom2/OS/Win95/Win95.Designer.cs b/Histacom2/OS/Win95/Win95.Designer.cs index ea667d9..17034c4 100644 --- a/Histacom2/OS/Win95/Win95.Designer.cs +++ b/Histacom2/OS/Win95/Win95.Designer.cs @@ -799,7 +799,6 @@ namespace Histacom2.OS.Win95 this.PrintersToolStripMenuItem.Name = "PrintersToolStripMenuItem"; this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.PrintersToolStripMenuItem.Text = "Printers"; - this.PrintersToolStripMenuItem.Click += new System.EventHandler(this.infoboxTestToolStripMenuItem_Click); // // TaskbarToolStripMenuItem // diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index ff60c42..d244e7d 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -324,13 +324,6 @@ namespace Histacom2.OS.Win95 } } - private void infoboxTestToolStripMenuItem_Click(object sender, EventArgs e) - { - WinClassic app = wm.StartInfobox95("AShifter's Infobox", "This is the very first Histacom2 Infobox. It's really easy to call, too! \nJust use wm.startInfobox95(string title, string text, InfoboxType type, InfoboxButtons btns)!", InfoboxType.Info, InfoboxButtons.OK); - - app.BringToFront(); - startmenu.Hide(); - } private void WebChatToolStripMenuItem_Click(object sender, EventArgs e) { webchat = wm.Init(new WebChat1998(), "Web Chat 1998", null, true, true); -- cgit v1.2.3 From 72d675a5fc9979daae4151c0c3bf0230d547b585 Mon Sep 17 00:00:00 2001 From: jtsshieh Date: Sat, 28 Oct 2017 20:27:55 -0400 Subject: Start Menu hides when ever mouse goes up --- Histacom2/OS/Win95/Win95.Designer.cs | 6 +++--- Histacom2/OS/Win95/Win95.cs | 6 ++++++ Histacom2/OS/Win95/Win95.resx | 5 ++++- 3 files changed, 13 insertions(+), 4 deletions(-) (limited to 'Histacom2/OS/Win95/Win95.cs') diff --git a/Histacom2/OS/Win95/Win95.Designer.cs b/Histacom2/OS/Win95/Win95.Designer.cs index 17034c4..53295f8 100644 --- a/Histacom2/OS/Win95/Win95.Designer.cs +++ b/Histacom2/OS/Win95/Win95.Designer.cs @@ -787,7 +787,7 @@ namespace Histacom2.OS.Win95 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(152, 22); + this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.ControlPanelToolStripMenuItem.Text = "Control Panel"; // // PrintersToolStripMenuItem @@ -797,7 +797,7 @@ namespace Histacom2.OS.Win95 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(152, 22); + this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.PrintersToolStripMenuItem.Text = "Printers"; // // TaskbarToolStripMenuItem @@ -806,7 +806,7 @@ namespace Histacom2.OS.Win95 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(152, 22); + this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.TaskbarToolStripMenuItem.Text = "Taskbar"; // // FindToolStripMenuItem diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index d244e7d..84c9421 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -554,6 +554,7 @@ namespace Histacom2.OS.Win95 private void desktopicons_MouseUp(object sender, MouseEventArgs e) { heldDownItem = null; + startmenu.Hide(); } private void GuessTheNumberToolStripMenuItem_Click(object sender, EventArgs e) @@ -642,6 +643,11 @@ namespace Histacom2.OS.Win95 startmenu.Hide(); } + + private void desktopicons_Click(object sender, EventArgs e) + { + startmenu.Hide(); + } } } diff --git a/Histacom2/OS/Win95/Win95.resx b/Histacom2/OS/Win95/Win95.resx index ab9cdf4..a40158b 100644 --- a/Histacom2/OS/Win95/Win95.resx +++ b/Histacom2/OS/Win95/Win95.resx @@ -120,6 +120,9 @@ 17, 17 + + 17, 17 + @@ -360,7 +363,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACO - hAAAAk1TRnQBSQFMAgEBDQEAATwBAwE8AQMBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + hAAAAk1TRnQBSQFMAgEBDQEAAUQBAwFEAQMBIAEAASABAAT/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/ -- cgit v1.2.3 From 4083f6792dd1414312afbcf8f7924590e037b339 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 29 Oct 2017 18:12:51 -0400 Subject: installed apps in 95 will persist after reboot --- Histacom2.Engine/SaveSystem.cs | 5 +++++ Histacom2/OS/Win95/Win95.cs | 9 +++++++++ Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs | 11 +++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) (limited to 'Histacom2/OS/Win95/Win95.cs') diff --git a/Histacom2.Engine/SaveSystem.cs b/Histacom2.Engine/SaveSystem.cs index 70609a2..6ae32de 100644 --- a/Histacom2.Engine/SaveSystem.cs +++ b/Histacom2.Engine/SaveSystem.cs @@ -810,7 +810,12 @@ namespace Histacom2.Engine [Order] public Theme customTheme { get; set; } + + [Order] public bool FTime98 { get; set; } + + [Order] + public bool[] installed95 { get; set; } = new bool[7]; // 0: WC98, 1: FTP, 2: SR, 3: EB, 4: SKNDWS, 5: TD0.1, 6: GTN } public class FileSystemFolderInfo diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index 84c9421..1299617 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -140,6 +140,15 @@ namespace Histacom2.OS.Win95 new ListViewItem("Set Up The Microsoft Network", 4), new ListViewItem("Outlook Express", 6) }, ref desktopicons, Path.Combine(ProfileWindowsDirectory, "Desktop")); desktopicons.AutoArrange = false; + + // Enable installed programs + + if (CurrentSave.installed95[0]) WebChatToolStripMenuItem.Visible = true; + if (CurrentSave.installed95[1]) FTPClientToolStripMenuItem.Visible = true; + if (CurrentSave.installed95[2]) StartRunnerToolStripMenuItem.Visible = true; + if (CurrentSave.installed95[3]) ErrorBlasterToolStripMenuItem.Visible = true; + if (CurrentSave.installed95[5]) TimeDistorterToolStripMenuItem.Visible = true; + if (CurrentSave.installed95[6]) GuessTheNumberToolStripMenuItem.Visible = true; } private void fontLoad() diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs index fa1e0ce..4502cd1 100644 --- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs +++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs @@ -292,7 +292,7 @@ namespace Histacom2.OS.Win95.Win95Apps break; case "web chat setup": Win95Installer inst = new Win95Installer("Web Chat 1998"); - inst.InstallCompleted += (sendr, args) => TitleScreen.frm95.WebChatToolStripMenuItem.Visible = true; + inst.InstallCompleted += (sendr, args) => { TitleScreen.frm95.WebChatToolStripMenuItem.Visible = true; CurrentSave.installed95[0] = true; }; WinClassic appInstaller = wm.Init(inst, "Web Chat Setup", null, true, true); Program.AddTaskbarItem(appInstaller, appInstaller.Tag.ToString(), "Web Chat Setup", null); appInstaller.BringToFront(); @@ -306,6 +306,7 @@ namespace Histacom2.OS.Win95.Win95Apps SaveDirectoryInfo(Path.Combine(ProfileProgramsDirectory, "12padams"), "FTP Client", true, "FTP Client", true); CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "12padams", "FTP Client"), "ftpclint.exe", "ftp client", 19, 58395); TitleScreen.frm95.FTPClientToolStripMenuItem.Visible = true; + CurrentSave.installed95[1] = true; }; WinClassic appFtp = wm.Init(instFtp, "FTP Client Setup", null, true, true); Program.AddTaskbarItem(appFtp, appFtp.Tag.ToString(), "FTP Client Setup", null); @@ -320,6 +321,7 @@ namespace Histacom2.OS.Win95.Win95Apps SaveDirectoryInfo(Path.Combine(ProfileProgramsDirectory, "12padams"), "Time Distorter 0.1", true, "Time Distorter 0.1", true); CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "12padams", "Time Distorter 0.1"), "tdistort.exe", "time distorter", 17, 23895); TitleScreen.frm95.TimeDistorterToolStripMenuItem.Visible = true; + CurrentSave.installed95[5] = true; }; WinClassic appTd = wm.Init(instTd, "Time Distorter Setup", null, true, true); Program.AddTaskbarItem(appTd, appTd.Tag.ToString(), "Time Distorter Setup", null); @@ -338,6 +340,7 @@ namespace Histacom2.OS.Win95.Win95Apps SaveDirectoryInfo(Path.Combine(ProfileProgramsDirectory, "12padams"), "Guess The Number V1", true, "Guess The Number V1", true); CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "12padams", "Guess The Number V1"), "guessnum.exe", "guess number", 18, 17483); TitleScreen.frm95.GuessTheNumberToolStripMenuItem.Visible = true; + CurrentSave.installed95[6] = true; }; WinClassic appGtn = wm.Init(instGtn, "Guess The Number Setup", null, true, true); Program.AddTaskbarItem(appGtn, appGtn.Tag.ToString(), "Guess The Number Setup", null); @@ -355,7 +358,7 @@ namespace Histacom2.OS.Win95.Win95Apps break; case "eb95 setup": Win95Installer ebInstall = new Win95Installer("Error Blaster 95"); - ebInstall.InstallCompleted += (sender, args) => TitleScreen.frm95.ErrorBlasterToolStripMenuItem.Visible = true; + ebInstall.InstallCompleted += (sender, args) => { TitleScreen.frm95.ErrorBlasterToolStripMenuItem.Visible = true; CurrentSave.installed95[3] = true; }; WinClassic installer = wm.Init(ebInstall, "Error Blaster 95 Setup", null, true, true); Program.AddTaskbarItem(installer, installer.Tag.ToString(), "Error Blaster 95 Setup", null); installer.BringToFront(); @@ -368,9 +371,9 @@ namespace Histacom2.OS.Win95.Win95Apps break; case "sr95 setup": Win95Installer srInstall = new Win95Installer("Start Runner 95"); - srInstall.InstallCompleted += (sender, args) => TitleScreen.frm95.ErrorBlasterToolStripMenuItem.Visible = true; + srInstall.InstallCompleted += (sender, args) => { TitleScreen.frm95.StartRunnerToolStripMenuItem.Visible = true; CurrentSave.installed95[2] = true; }; WinClassic install = wm.Init(srInstall, "Start Runner 95 Setup", null, true, true); - Program.AddTaskbarItem(install, install.Tag.ToString(), "Error Blaster 95 Setup", null); + Program.AddTaskbarItem(install, install.Tag.ToString(), "Start Runner 95 Setup", null); install.BringToFront(); break; default: -- cgit v1.2.3 From 49e30d88787458779ec80a7cbc97d55a09bf67c9 Mon Sep 17 00:00:00 2001 From: lempamo Date: Mon, 30 Oct 2017 22:24:16 -0400 Subject: webchat 99 will now open in the start menu --- Histacom2/OS/Win95/Win95.cs | 2 +- Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs | 2 + Histacom2/OS/Win98/Win98.Designer.cs | 3 +- Histacom2/OS/Win98/Win98.cs | 4 +- Histacom2/OS/Win98/Win98.resx | 72 ++++++++++++++--------------- 5 files changed, 43 insertions(+), 40 deletions(-) (limited to 'Histacom2/OS/Win95/Win95.cs') diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index 1299617..0e2ac3b 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -114,7 +114,7 @@ namespace Histacom2.OS.Win95 this.BringToFront(); //Check if it is the first time - if (CurrentSave.FTime95 == false) + if (!CurrentSave.FTime95) { CurrentSave.FTime95 = true; SaveGame(); diff --git a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs index 577b38a..9dcebfc 100644 --- a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs +++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs @@ -10,6 +10,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story { public class Hack2 : object { + public static bool Upgraded = false; static WindowManager wm = new WindowManager(); public static async void StartObjective() @@ -273,6 +274,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story SaveSystem.CurrentSave.CurrentOS = "98"; SaveSystem.currentTheme = new Default98Theme(); SaveSystem.CurrentSave.ThemeName = "default98"; + Upgraded = true; TitleScreen.frm95.distort.ParentForm.Close(); foreach (Form frm in Application.OpenForms) if (frm is WinClassic) frm.Close(); Program.title.StartGame(); diff --git a/Histacom2/OS/Win98/Win98.Designer.cs b/Histacom2/OS/Win98/Win98.Designer.cs index 30b31bb..788505b 100644 --- a/Histacom2/OS/Win98/Win98.Designer.cs +++ b/Histacom2/OS/Win98/Win98.Designer.cs @@ -694,6 +694,7 @@ namespace Histacom2.OS.Win98 this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.WebChatToolStripMenuItem.Text = "Web Chat"; this.WebChatToolStripMenuItem.Visible = false; + this.WebChatToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click); // // TimeDistorterToolStripMenuItem // @@ -704,7 +705,7 @@ namespace Histacom2.OS.Win98 this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.TimeDistorterToolStripMenuItem.Text = "Time Distorter"; this.TimeDistorterToolStripMenuItem.Visible = false; - this.TimeDistorterToolStripMenuItem.Click += new System.EventHandler(TimeDistorterToolStripMenuItem_Click); + this.TimeDistorterToolStripMenuItem.Click += new System.EventHandler(this.TimeDistorterToolStripMenuItem_Click); // // DocumentsToolStripMenuItem // diff --git a/Histacom2/OS/Win98/Win98.cs b/Histacom2/OS/Win98/Win98.cs index e10904e..26e203c 100644 --- a/Histacom2/OS/Win98/Win98.cs +++ b/Histacom2/OS/Win98/Win98.cs @@ -76,7 +76,7 @@ namespace Histacom2.OS.Win98 // When New Game is clicked in TitleScreen.cs private void Desktop_Load(object sender, EventArgs e) { - UpgradeFileSystem( "98"); + if (!CurrentSave.FTime95) UpgradeFileSystem( "98"); if (currentTheme.defaultWallpaper != null) desktopicons.BackgroundImage = new Bitmap(currentTheme.defaultWallpaper, Width, Height); //Start Menu Color - Commented until it works reliably @@ -116,7 +116,7 @@ namespace Histacom2.OS.Win98 this.BringToFront(); //Check if it is the first time - if (CurrentSave.FTime98 == false) + if (!CurrentSave.FTime98) { CurrentSave.FTime98 = true; SaveGame(); diff --git a/Histacom2/OS/Win98/Win98.resx b/Histacom2/OS/Win98/Win98.resx index 2a3433f..e82f924 100644 --- a/Histacom2/OS/Win98/Win98.resx +++ b/Histacom2/OS/Win98/Win98.resx @@ -121,6 +121,41 @@ 17, 17 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ + 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME + Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu + QmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN + upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9 + NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j + Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I + gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m + M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu + QmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh + EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK + 6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -271,41 +306,6 @@ DsAgCAN9Ok/zZ4yiEINsMkkKRNezWWNmlZSM84wabVwyEX3ODNLCZXWiyUrsgEr13h2gZlmvAGZGKQAX VRlAzfcJIAB+/gMiM5smIMbMBLO8uUMqCcxsOzww4/AIiGZ7eR4OQBYZ2uIGswOyWj72ArQMyOoVsMY+ aQNok1HVambm9gBAYeI/oBSQZwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ - 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME - Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu - QmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN - upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9 - NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j - Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I - gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m - M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu - QmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh - EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK - 6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC @@ -382,7 +382,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq - ggAAAk1TRnQBSQFMAgEBDAEAAaABAQGgAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + ggAAAk1TRnQBSQFMAgEBDAEAAagBAQGoAQEBIAEAASABAAT/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/ -- cgit v1.2.3