From e3ba1b61492351f56df9aaa24cb27e9028a9b2c8 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 23 Dec 2012 02:15:20 +0000 Subject: [PATCH] Path Config - BIOS Filename config for Coleco and GBA --- BizHawk.MultiClient/Config.cs | 5 +- BizHawk.MultiClient/MainForm.cs | 4 +- .../config/PathConfig.Designer.cs | 184 +++++++++++++----- BizHawk.MultiClient/config/PathConfig.cs | 41 +++- BizHawk.MultiClient/config/PathConfig.resx | 36 ++++ 5 files changed, 206 insertions(+), 64 deletions(-) diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index bc1aa2ed86..84d6abb515 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -216,9 +216,8 @@ namespace BizHawk.MultiClient //BIOS Paths public string FilenamePCEBios = "[BIOS] Super CD-ROM System (Japan) (v3.0).pce"; public string FilenameFDSBios = "disksys.rom"; - //public string PathGBABIOS = Path.Combine(".", "gbabios.rom"); - - //public string PathCOLBios = Path.Combine(".", "ColecoBios.bin"); + public string FilenameGBABIOS = "gbabios.rom"; + public string FilenameCOLBios = "ColecoBios.bin"; //public string PathINTVGROM = Path.Combine(".", "grom.bin"); //public string PathINTVEROM = Path.Combine(".", "erom.bin"); diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index c8c143f1b6..c0a6c7fec2 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -1976,7 +1976,7 @@ namespace BizHawk.MultiClient } break; case "Coleco": - string colbiosPath = Path.Combine(Global.Config.FirmwaresPath, "ColecoBios.bin"); // PathManager.MakeAbsolutePath(Global.Config.PathCOLBios, "Coleco"); + string colbiosPath = Path.Combine(Global.Config.FirmwaresPath, Global.Config.FilenameCOLBios); FileInfo colfile = new FileInfo(colbiosPath); if (!colfile.Exists) { @@ -2047,7 +2047,7 @@ namespace BizHawk.MultiClient case "GBA": if (INTERIM) { - string gbabiospath = Path.Combine(Global.Config.FirmwaresPath, "gbabios.rom"); //PathManager.MakeAbsolutePath(Global.Config.PathGBABIOS, "GBA"); + string gbabiospath = Path.Combine(Global.Config.FirmwaresPath, Global.Config.FilenameGBABIOS); byte[] gbabios = null; if (File.Exists(gbabiospath)) diff --git a/BizHawk.MultiClient/config/PathConfig.Designer.cs b/BizHawk.MultiClient/config/PathConfig.Designer.cs index dc440fb2e4..8aff9e15cc 100644 --- a/BizHawk.MultiClient/config/PathConfig.Designer.cs +++ b/BizHawk.MultiClient/config/PathConfig.Designer.cs @@ -70,6 +70,9 @@ this.BrowseAVI = new System.Windows.Forms.Button(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPageNES = new System.Windows.Forms.TabPage(); + this.label3 = new System.Windows.Forms.Label(); + this.NESBrowseFDSBIOS = new System.Windows.Forms.Button(); + this.FDSBIOSBox = new System.Windows.Forms.TextBox(); this.NESBaseBox = new System.Windows.Forms.TextBox(); this.NESPaletteDescription = new System.Windows.Forms.Label(); this.NESBrowsePalette = new System.Windows.Forms.Button(); @@ -163,6 +166,9 @@ this.GenesisBrowseScreenshots = new System.Windows.Forms.Button(); this.GenesisROMsBox = new System.Windows.Forms.TextBox(); this.tabPagePCE = new System.Windows.Forms.TabPage(); + this.button2 = new System.Windows.Forms.Button(); + this.label2 = new System.Windows.Forms.Label(); + this.PCEBIOSBox = new System.Windows.Forms.TextBox(); this.PCEBaseBox = new System.Windows.Forms.TextBox(); this.PCECheatsDescription = new System.Windows.Forms.Label(); this.PCEBrowseCheats = new System.Windows.Forms.Button(); @@ -346,12 +352,12 @@ this.button1 = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.PCEBIOSBox = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.button2 = new System.Windows.Forms.Button(); - this.FDSBIOSBox = new System.Windows.Forms.TextBox(); - this.NESBrowseFDSBIOS = new System.Windows.Forms.Button(); - this.label3 = new System.Windows.Forms.Label(); + this.ColecoBIOSBox = new System.Windows.Forms.TextBox(); + this.button3 = new System.Windows.Forms.Button(); + this.label4 = new System.Windows.Forms.Label(); + this.GBABIOSBox = new System.Windows.Forms.TextBox(); + this.button4 = new System.Windows.Forms.Button(); + this.label5 = new System.Windows.Forms.Label(); this.tabControl1.SuspendLayout(); this.tabPageNES.SuspendLayout(); this.tabPageSNES.SuspendLayout(); @@ -818,6 +824,37 @@ this.tabPageNES.Text = "NES"; this.tabPageNES.UseVisualStyleBackColor = true; // + // label3 + // + this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(474, 242); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(56, 13); + this.label3.TabIndex = 29; + this.label3.Text = "FDS BIOS"; + // + // NESBrowseFDSBIOS + // + this.NESBrowseFDSBIOS.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.NESBrowseFDSBIOS.Image = ((System.Drawing.Image)(resources.GetObject("NESBrowseFDSBIOS.Image"))); + this.NESBrowseFDSBIOS.Location = new System.Drawing.Point(442, 239); + this.NESBrowseFDSBIOS.Name = "NESBrowseFDSBIOS"; + this.NESBrowseFDSBIOS.Size = new System.Drawing.Size(26, 23); + this.NESBrowseFDSBIOS.TabIndex = 28; + this.NESBrowseFDSBIOS.UseVisualStyleBackColor = true; + this.NESBrowseFDSBIOS.Click += new System.EventHandler(this.NESBrowseFDSBIOS_Click); + // + // FDSBIOSBox + // + this.FDSBIOSBox.AcceptsTab = true; + this.FDSBIOSBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.FDSBIOSBox.Location = new System.Drawing.Point(13, 239); + this.FDSBIOSBox.Name = "FDSBIOSBox"; + this.FDSBIOSBox.Size = new System.Drawing.Size(421, 20); + this.FDSBIOSBox.TabIndex = 27; + // // NESBaseBox // this.NESBaseBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -1858,6 +1895,36 @@ this.tabPagePCE.Text = "PC Engine"; this.tabPagePCE.UseVisualStyleBackColor = true; // + // button2 + // + this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.button2.Image = ((System.Drawing.Image)(resources.GetObject("button2.Image"))); + this.button2.Location = new System.Drawing.Point(442, 209); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(26, 23); + this.button2.TabIndex = 91; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); + // + // label2 + // + this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(474, 213); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(32, 13); + this.label2.TabIndex = 90; + this.label2.Text = "BIOS"; + // + // PCEBIOSBox + // + this.PCEBIOSBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.PCEBIOSBox.Location = new System.Drawing.Point(12, 209); + this.PCEBIOSBox.Name = "PCEBIOSBox"; + this.PCEBIOSBox.Size = new System.Drawing.Size(421, 20); + this.PCEBIOSBox.TabIndex = 89; + // // PCEBaseBox // this.PCEBaseBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -2283,6 +2350,9 @@ // // tabPageGBA // + this.tabPageGBA.Controls.Add(this.label5); + this.tabPageGBA.Controls.Add(this.button4); + this.tabPageGBA.Controls.Add(this.GBABIOSBox); this.tabPageGBA.Controls.Add(this.GBABaseBox); this.tabPageGBA.Controls.Add(this.GBACheatsDescription); this.tabPageGBA.Controls.Add(this.GBABrowseCheats); @@ -3292,6 +3362,9 @@ // // tabPageColeco // + this.tabPageColeco.Controls.Add(this.label4); + this.tabPageColeco.Controls.Add(this.button3); + this.tabPageColeco.Controls.Add(this.ColecoBIOSBox); this.tabPageColeco.Controls.Add(this.COLBaseBox); this.tabPageColeco.Controls.Add(this.COLCheatsDescription); this.tabPageColeco.Controls.Add(this.COLBrowseCheats); @@ -3835,66 +3908,65 @@ this.label1.TabIndex = 204; this.label1.Text = "Special Commands"; // - // PCEBIOSBox + // ColecoBIOSBox // - this.PCEBIOSBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.ColecoBIOSBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.PCEBIOSBox.Location = new System.Drawing.Point(12, 209); - this.PCEBIOSBox.Name = "PCEBIOSBox"; - this.PCEBIOSBox.Size = new System.Drawing.Size(421, 20); - this.PCEBIOSBox.TabIndex = 89; + this.ColecoBIOSBox.Location = new System.Drawing.Point(13, 179); + this.ColecoBIOSBox.Name = "ColecoBIOSBox"; + this.ColecoBIOSBox.Size = new System.Drawing.Size(421, 20); + this.ColecoBIOSBox.TabIndex = 110; // - // label2 + // button3 // - this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(474, 213); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(32, 13); - this.label2.TabIndex = 90; - this.label2.Text = "BIOS"; + this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.button3.Image = ((System.Drawing.Image)(resources.GetObject("button3.Image"))); + this.button3.Location = new System.Drawing.Point(442, 179); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(26, 23); + this.button3.TabIndex = 111; + this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.button3_Click); // - // button2 + // label4 // - this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.button2.Image = ((System.Drawing.Image)(resources.GetObject("button2.Image"))); - this.button2.Location = new System.Drawing.Point(442, 209); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(26, 23); - this.button2.TabIndex = 91; - this.button2.UseVisualStyleBackColor = true; - this.button2.Click += new System.EventHandler(this.button2_Click); + this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(474, 183); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(32, 13); + this.label4.TabIndex = 112; + this.label4.Text = "BIOS"; // - // FDSBIOSBox + // GBABIOSBox // - this.FDSBIOSBox.AcceptsTab = true; - this.FDSBIOSBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.GBABIOSBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.FDSBIOSBox.Location = new System.Drawing.Point(13, 239); - this.FDSBIOSBox.Name = "FDSBIOSBox"; - this.FDSBIOSBox.Size = new System.Drawing.Size(421, 20); - this.FDSBIOSBox.TabIndex = 27; + this.GBABIOSBox.Location = new System.Drawing.Point(13, 209); + this.GBABIOSBox.Name = "GBABIOSBox"; + this.GBABIOSBox.Size = new System.Drawing.Size(421, 20); + this.GBABIOSBox.TabIndex = 123; // - // NESBrowseFDSBIOS + // button4 // - this.NESBrowseFDSBIOS.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.NESBrowseFDSBIOS.Image = ((System.Drawing.Image)(resources.GetObject("NESBrowseFDSBIOS.Image"))); - this.NESBrowseFDSBIOS.Location = new System.Drawing.Point(442, 239); - this.NESBrowseFDSBIOS.Name = "NESBrowseFDSBIOS"; - this.NESBrowseFDSBIOS.Size = new System.Drawing.Size(26, 23); - this.NESBrowseFDSBIOS.TabIndex = 28; - this.NESBrowseFDSBIOS.UseVisualStyleBackColor = true; - this.NESBrowseFDSBIOS.Click += new System.EventHandler(this.NESBrowseFDSBIOS_Click); + this.button4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.button4.Image = ((System.Drawing.Image)(resources.GetObject("button4.Image"))); + this.button4.Location = new System.Drawing.Point(440, 209); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(26, 23); + this.button4.TabIndex = 124; + this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.button4_Click); // - // label3 + // label5 // - this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(474, 242); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(56, 13); - this.label3.TabIndex = 29; - this.label3.Text = "FDS BIOS"; + this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(474, 213); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(32, 13); + this.label5.TabIndex = 125; + this.label5.Text = "BIOS"; // // PathConfig // @@ -4280,5 +4352,11 @@ private System.Windows.Forms.TextBox FDSBIOSBox; private System.Windows.Forms.Label label3; private System.Windows.Forms.Button NESBrowseFDSBIOS; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Button button3; + private System.Windows.Forms.TextBox ColecoBIOSBox; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Button button4; + private System.Windows.Forms.TextBox GBABIOSBox; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/config/PathConfig.cs b/BizHawk.MultiClient/config/PathConfig.cs index 40ff8d4714..bd8f711023 100644 --- a/BizHawk.MultiClient/config/PathConfig.cs +++ b/BizHawk.MultiClient/config/PathConfig.cs @@ -125,7 +125,6 @@ namespace BizHawk.MultiClient GBASaveRAMBox.Text = Global.Config.PathGBASaveRAM; GBAScreenshotsBox.Text = Global.Config.PathGBAScreenshots; GBACheatsBox.Text = Global.Config.PathGBACheats; - //GBAFirmwaresBox.Text = Global.Config.PathGBABIOS; TI83BaseBox.Text = Global.Config.BaseTI83; TI83ROMsBox.Text = Global.Config.PathTI83ROMs; @@ -160,7 +159,6 @@ namespace BizHawk.MultiClient COLSavestatesBox.Text = Global.Config.PathCOLSavestates; COLScreenshotsBox.Text = Global.Config.PathCOLScreenshots; COLCheatsBox.Text = Global.Config.PathCOLCheats; - //COLBiosBox.Text = Global.Config.PathCOLBios; MoviesBox.Text = Global.Config.MoviesPath; MovieBackupsBox.Text = Global.Config.MoviesBackupPath; @@ -172,6 +170,8 @@ namespace BizHawk.MultiClient PCEBIOSBox.Text = Global.Config.FilenamePCEBios; FDSBIOSBox.Text = Global.Config.FilenameFDSBios; + ColecoBIOSBox.Text = Global.Config.FilenameCOLBios; + GBABIOSBox.Text = Global.Config.FilenameGBABIOS; SetTabByPlatform(); @@ -321,7 +321,7 @@ namespace BizHawk.MultiClient Global.Config.PathGBASaveRAM = GBASaveRAMBox.Text; Global.Config.PathGBAScreenshots = GBAScreenshotsBox.Text; Global.Config.PathGBACheats = GBACheatsBox.Text; - //Global.Config.PathGBABIOS = GBAFirmwaresBox.Text; + Global.Config.FilenameGBABIOS = GBABIOSBox.Text; Global.Config.BaseTI83 = TI83BaseBox.Text; Global.Config.PathTI83ROMs = TI83ROMsBox.Text; @@ -356,7 +356,6 @@ namespace BizHawk.MultiClient Global.Config.PathCOLSavestates = COLSavestatesBox.Text; Global.Config.PathCOLScreenshots = COLScreenshotsBox.Text; Global.Config.PathCOLCheats = COLCheatsBox.Text; - //Global.Config.PathCOLBios = COLBiosBox.Text; Global.Config.MoviesPath = MoviesBox.Text; Global.Config.MoviesBackupPath = MovieBackupsBox.Text; @@ -368,6 +367,8 @@ namespace BizHawk.MultiClient Global.Config.FilenamePCEBios = PCEBIOSBox.Text; Global.Config.FilenameFDSBios = FDSBIOSBox.Text; + Global.Config.FilenameCOLBios = ColecoBIOSBox.Text; + Global.Config.FilenameGBABIOS = GBABIOSBox.Text; BasePathBox.Focus(); Global.MainForm.UpdateStatusSlots(); @@ -1071,7 +1072,7 @@ namespace BizHawk.MultiClient { OpenFileDialog ofd = new OpenFileDialog(); ofd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.FirmwaresPath, ""); - ofd.Filter = "BIOS Files (*.bin)|*.bin|All Files|*.*"; + ofd.Filter = "Binary Files (*.rom,*.bin,*.pce)|*.rom;*.bin;*.pce|All Files|*.*"; ofd.RestoreDirectory = false; DialogResult result = ofd.ShowDialog(); if (result == DialogResult.OK) @@ -1085,7 +1086,7 @@ namespace BizHawk.MultiClient { OpenFileDialog ofd = new OpenFileDialog(); ofd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.FirmwaresPath, ""); - ofd.Filter = "FDS BIOS Files (*.rom)|*.rom|All Files|*.*"; + ofd.Filter = "Binary Files (*.rom,*.bin)|*.rom;*.bin|All Files|*.*"; ofd.RestoreDirectory = false; DialogResult result = ofd.ShowDialog(); if (result == DialogResult.OK) @@ -1094,5 +1095,33 @@ namespace BizHawk.MultiClient FDSBIOSBox.Text = file.Name; } } + + private void button3_Click(object sender, EventArgs e) + { + OpenFileDialog ofd = new OpenFileDialog(); + ofd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.FirmwaresPath, ""); + ofd.Filter = "Binary Files (*.rom,*.bin)|*.rom;*.bin|All Files|*.*"; + ofd.RestoreDirectory = false; + DialogResult result = ofd.ShowDialog(); + if (result == DialogResult.OK) + { + var file = new FileInfo(ofd.FileName); + ColecoBIOSBox.Text = file.Name; + } + } + + private void button4_Click(object sender, EventArgs e) + { + OpenFileDialog ofd = new OpenFileDialog(); + ofd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.FirmwaresPath, ""); + ofd.Filter = "Binary Files (*.rom,*.bin)|*.rom;*.bin|All Files|*.*"; + ofd.RestoreDirectory = false; + DialogResult result = ofd.ShowDialog(); + if (result == DialogResult.OK) + { + var file = new FileInfo(ofd.FileName); + GBABIOSBox.Text = file.Name; + } + } } } diff --git a/BizHawk.MultiClient/config/PathConfig.resx b/BizHawk.MultiClient/config/PathConfig.resx index a7a6c87e98..f4d0baf684 100644 --- a/BizHawk.MultiClient/config/PathConfig.resx +++ b/BizHawk.MultiClient/config/PathConfig.resx @@ -1073,6 +1073,24 @@ hOzCfo9F4/JTzs+IobY8k94H4XTkCMu0yzfQIttIY/ImahLMUcdYcOPqDvxddy462lu6LgtyUqPJkVwg IzaI+Mt+hslyzteFU8cO4HzQjv121thaWWC53YytW0zYZmqy8iGt5ysbsj8BvQ/ROxW7aPkAAAAASUVO RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK9gAA + CvYBwq9wAwAAAnpJREFUOE+lk1lIlFEYhv+LLrqySI1CMLJELBADQ6qLEKVFTSm3QkkTyq0FQzHXZlxH + nRnXKRVzRp1GHa0sxbBCKBSJ0HKhxNQsKCrF1FDJ7emfkSzLQPDiuTmc9znv+ThHAIT1sKZwWqHWWZqn + 41pmORkqPfFyTcKvQ9ckCIpS4RWmCDCELsWWmSeLsuhUtU9gVCFCnTbHT4S/aaqRKf53tfD4ohPeEQo8 + w3KNAvq7NcyM1xr5MaZjbkSNvlxBvTY1eTWJV7gSz9A83EMKEGorlEyPVa0IL3wuYq43kqqyTCqL01EX + JlOSm8RNeRwFshjR+XvwQrUmm+mvmuWTF8Uw/XHQG7Iq/whul8r4/qnEWNsQbq7LNvJQn0WDTsa9ynT0 + 6hR0JVLKVde5lZdAsTIOVXassY1QWZLO5Pt8DLWHWiXUVylZGJLCcOpK3olrg/HQFwWvI+iq8eVKsEeF + oFalMDGQCR/k3K9W0P5IvrTpzyu8CoQOb+bb3Jh57MTbCjsunj06IQr2CqV5Er69kTLclki9Ts7ioAR6 + QpcEXcFi8DTz7R7MtBxhsukQo3X7kIZZc8bFLNcwTKFImchodyx3tNl0PhOb9EWKgvPQGcDi85PMPj3O + VPNhxuod+FJtS0faZvzdrHCwMbExClRZcfS0JHFXmwUDSfBSrPvCh9lWd6aeODHe4MiI3o6Pmt30yk2R + hOzCfo9F4/JTzs+IobY8k94H4XTkCMu0yzfQIttIY/ImahLMUcdYcOPqDvxddy462lu6LgtyUqPJkVwg + IzaI+Mt+hslyzteFU8cO4HzQjv121thaWWC53YytW0zYZmqy8iGt5ysbsj8BvQ/ROxW7aPkAAAAASUVO + RK5CYII= @@ -1559,6 +1577,24 @@ hOzCfo9F4/JTzs+IobY8k94H4XTkCMu0yzfQIttIY/ImahLMUcdYcOPqDvxddy462lu6LgtyUqPJkVwg IzaI+Mt+hslyzteFU8cO4HzQjv121thaWWC53YytW0zYZmqy8iGt5ysbsj8BvQ/ROxW7aPkAAAAASUVO RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK9gAA + CvYBwq9wAwAAAnpJREFUOE+lk1lIlFEYhv+LLrqySI1CMLJELBADQ6qLEKVFTSm3QkkTyq0FQzHXZlxH + nRnXKRVzRp1GHa0sxbBCKBSJ0HKhxNQsKCrF1FDJ7emfkSzLQPDiuTmc9znv+ThHAIT1sKZwWqHWWZqn + 41pmORkqPfFyTcKvQ9ckCIpS4RWmCDCELsWWmSeLsuhUtU9gVCFCnTbHT4S/aaqRKf53tfD4ohPeEQo8 + w3KNAvq7NcyM1xr5MaZjbkSNvlxBvTY1eTWJV7gSz9A83EMKEGorlEyPVa0IL3wuYq43kqqyTCqL01EX + JlOSm8RNeRwFshjR+XvwQrUmm+mvmuWTF8Uw/XHQG7Iq/whul8r4/qnEWNsQbq7LNvJQn0WDTsa9ynT0 + 6hR0JVLKVde5lZdAsTIOVXassY1QWZLO5Pt8DLWHWiXUVylZGJLCcOpK3olrg/HQFwWvI+iq8eVKsEeF + oFalMDGQCR/k3K9W0P5IvrTpzyu8CoQOb+bb3Jh57MTbCjsunj06IQr2CqV5Er69kTLclki9Ts7ioAR6 + QpcEXcFi8DTz7R7MtBxhsukQo3X7kIZZc8bFLNcwTKFImchodyx3tNl0PhOb9EWKgvPQGcDi85PMPj3O + VPNhxuod+FJtS0faZvzdrHCwMbExClRZcfS0JHFXmwUDSfBSrPvCh9lWd6aeODHe4MiI3o6Pmt30yk2R + hOzCfo9F4/JTzs+IobY8k94H4XTkCMu0yzfQIttIY/ImahLMUcdYcOPqDvxddy462lu6LgtyUqPJkVwg + IzaI+Mt+hslyzteFU8cO4HzQjv121thaWWC53YytW0zYZmqy8iGt5ysbsj8BvQ/ROxW7aPkAAAAASUVO + RK5CYII=