diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index bed09d3d97..31cac3d371 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -220,6 +220,9 @@ namespace BizHawk.MultiClient public string FilenameGBABIOS = "gbabios.rom"; public string FilenameCOLBios = "ColecoBios.bin"; public string FilenameINTVGROM = "grom.bin"; + public string FilenameA78NTSCBios = "7800NTSCBIOS.bin"; + public string FilenameA78PALBios = "7800PALBIOS.bin"; + public string FilenameA78HSCBios = "7800highscore.bin"; public string FilenameINTVEROM = "erom.bin"; public string FFMpegPath = "%exe%/dll/ffmpeg.exe"; diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index b3ad2974e6..ef690d796e 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -2043,9 +2043,9 @@ namespace BizHawk.MultiClient } break; case "A78": - string ntsc_biospath = Path.Combine(Global.Config.FirmwaresPath, "7800NTSCBIOS.bin"); - string pal_biospath = Path.Combine(Global.Config.FirmwaresPath, "7800PALBIOS.bin"); - string hsbiospath = Path.Combine(Global.Config.FirmwaresPath, "7800highscore.bin"); + string ntsc_biospath = Path.Combine(Global.Config.FirmwaresPath, Global.Config.FilenameA78NTSCBios); + string pal_biospath = Path.Combine(Global.Config.FirmwaresPath, Global.Config.FilenameA78PALBios); + string hsbiospath = Path.Combine(Global.Config.FirmwaresPath, Global.Config.FilenameA78HSCBios); FileInfo ntscfile = new FileInfo(ntsc_biospath); FileInfo palfile = new FileInfo(pal_biospath); diff --git a/BizHawk.MultiClient/config/PathConfig.Designer.cs b/BizHawk.MultiClient/config/PathConfig.Designer.cs index fe99480632..c47b828c65 100644 --- a/BizHawk.MultiClient/config/PathConfig.Designer.cs +++ b/BizHawk.MultiClient/config/PathConfig.Designer.cs @@ -69,6 +69,19 @@ this.AVIDescription = new System.Windows.Forms.Label(); this.BrowseAVI = new System.Windows.Forms.Button(); this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPageGlobal = new System.Windows.Forms.TabPage(); + this.BaseROMLabel = new System.Windows.Forms.Label(); + this.BrowseBaseROM = new System.Windows.Forms.Button(); + this.BaseROMSBox = new System.Windows.Forms.TextBox(); + this.labelFirmware = new System.Windows.Forms.Label(); + this.buttonFirmware = new System.Windows.Forms.Button(); + this.textBoxFirmware = new System.Windows.Forms.TextBox(); + this.LogDescription = new System.Windows.Forms.Label(); + this.BrowseLog = new System.Windows.Forms.Button(); + this.LogBox = new System.Windows.Forms.TextBox(); + this.MovieBackupsBox = new System.Windows.Forms.TextBox(); + this.BrowseMovieBackups = new System.Windows.Forms.Button(); + this.MovieBackupsDescription = new System.Windows.Forms.Label(); this.tabPageNES = new System.Windows.Forms.TabPage(); this.label3 = new System.Windows.Forms.Label(); this.NESBrowseFDSBIOS = new System.Windows.Forms.Button(); @@ -339,19 +352,6 @@ this.C64SavestatesBox = new System.Windows.Forms.TextBox(); this.C64ROMsBox = new System.Windows.Forms.TextBox(); this.C64BaseBox = new System.Windows.Forms.TextBox(); - this.tabPageGlobal = new System.Windows.Forms.TabPage(); - this.BaseROMLabel = new System.Windows.Forms.Label(); - this.BrowseBaseROM = new System.Windows.Forms.Button(); - this.BaseROMSBox = new System.Windows.Forms.TextBox(); - this.labelFirmware = new System.Windows.Forms.Label(); - this.buttonFirmware = new System.Windows.Forms.Button(); - this.textBoxFirmware = new System.Windows.Forms.TextBox(); - this.LogDescription = new System.Windows.Forms.Label(); - this.BrowseLog = new System.Windows.Forms.Button(); - this.LogBox = new System.Windows.Forms.TextBox(); - this.MovieBackupsBox = new System.Windows.Forms.TextBox(); - this.BrowseMovieBackups = new System.Windows.Forms.Button(); - this.MovieBackupsDescription = new System.Windows.Forms.Label(); this.BasePathBox = new System.Windows.Forms.TextBox(); this.BrowseBase = new System.Windows.Forms.Button(); this.BaseDescription = new System.Windows.Forms.Label(); @@ -361,7 +361,17 @@ this.button1 = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.Atari7800NTSCBIOSBox = new System.Windows.Forms.TextBox(); + this.Atari7800PALBIOSBox = new System.Windows.Forms.TextBox(); + this.Atari7800HighScoreBIOSBox = new System.Windows.Forms.TextBox(); + this.Atari7800BrowseNTSCBIOS = new System.Windows.Forms.Button(); + this.Atari7800BrowsePALBIOS = new System.Windows.Forms.Button(); + this.Atari7800BrowseHSCBIOS = new System.Windows.Forms.Button(); + this.label6 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); this.tabControl1.SuspendLayout(); + this.tabPageGlobal.SuspendLayout(); this.tabPageNES.SuspendLayout(); this.tabPageSNES.SuspendLayout(); this.tabPageSMS.SuspendLayout(); @@ -377,7 +387,6 @@ this.tabPageIntellivision.SuspendLayout(); this.tabPageColeco.SuspendLayout(); this.tabPageC64.SuspendLayout(); - this.tabPageGlobal.SuspendLayout(); this.SuspendLayout(); // // Cancel @@ -789,10 +798,166 @@ this.tabControl1.Multiline = true; this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(574, 322); + this.tabControl1.Size = new System.Drawing.Size(574, 332); this.tabControl1.TabIndex = 23; this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged); // + // tabPageGlobal + // + this.tabPageGlobal.Controls.Add(this.BaseROMLabel); + this.tabPageGlobal.Controls.Add(this.BrowseBaseROM); + this.tabPageGlobal.Controls.Add(this.BaseROMSBox); + this.tabPageGlobal.Controls.Add(this.labelFirmware); + this.tabPageGlobal.Controls.Add(this.buttonFirmware); + this.tabPageGlobal.Controls.Add(this.textBoxFirmware); + this.tabPageGlobal.Controls.Add(this.LogDescription); + this.tabPageGlobal.Controls.Add(this.BrowseLog); + this.tabPageGlobal.Controls.Add(this.LogBox); + this.tabPageGlobal.Controls.Add(this.MoviesBox); + this.tabPageGlobal.Controls.Add(this.MovieBackupsBox); + this.tabPageGlobal.Controls.Add(this.BrowseMovieBackups); + this.tabPageGlobal.Controls.Add(this.MovieBackupsDescription); + this.tabPageGlobal.Controls.Add(this.AVIBox); + this.tabPageGlobal.Controls.Add(this.AVIDescription); + this.tabPageGlobal.Controls.Add(this.BrowseAVI); + this.tabPageGlobal.Controls.Add(this.WatchBox); + this.tabPageGlobal.Controls.Add(this.BrowseLua); + this.tabPageGlobal.Controls.Add(this.WatchDescription); + this.tabPageGlobal.Controls.Add(this.LuaDescription); + this.tabPageGlobal.Controls.Add(this.BrowseWatch); + this.tabPageGlobal.Controls.Add(this.LuaBox); + this.tabPageGlobal.Controls.Add(this.BrowseMovies); + this.tabPageGlobal.Controls.Add(this.MoviesDescription); + this.tabPageGlobal.Location = new System.Drawing.Point(4, 40); + this.tabPageGlobal.Name = "tabPageGlobal"; + this.tabPageGlobal.Size = new System.Drawing.Size(566, 278); + this.tabPageGlobal.TabIndex = 6; + this.tabPageGlobal.Text = "Global"; + this.tabPageGlobal.UseVisualStyleBackColor = true; + // + // BaseROMLabel + // + this.BaseROMLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.BaseROMLabel.AutoSize = true; + this.BaseROMLabel.Location = new System.Drawing.Point(474, 235); + this.BaseROMLabel.Name = "BaseROMLabel"; + this.BaseROMLabel.Size = new System.Drawing.Size(59, 13); + this.BaseROMLabel.TabIndex = 154; + this.BaseROMLabel.Text = "Base ROM"; + // + // BrowseBaseROM + // + this.BrowseBaseROM.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.BrowseBaseROM.Image = ((System.Drawing.Image)(resources.GetObject("BrowseBaseROM.Image"))); + this.BrowseBaseROM.Location = new System.Drawing.Point(442, 231); + this.BrowseBaseROM.Name = "BrowseBaseROM"; + this.BrowseBaseROM.Size = new System.Drawing.Size(26, 23); + this.BrowseBaseROM.TabIndex = 153; + this.BrowseBaseROM.UseVisualStyleBackColor = true; + this.BrowseBaseROM.Click += new System.EventHandler(this.BrowseBaseROM_Click); + // + // BaseROMSBox + // + this.BaseROMSBox.AcceptsReturn = true; + this.BaseROMSBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.BaseROMSBox.Location = new System.Drawing.Point(12, 231); + this.BaseROMSBox.Name = "BaseROMSBox"; + this.BaseROMSBox.Size = new System.Drawing.Size(421, 20); + this.BaseROMSBox.TabIndex = 152; + // + // labelFirmware + // + this.labelFirmware.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.labelFirmware.AutoSize = true; + this.labelFirmware.Location = new System.Drawing.Point(474, 205); + this.labelFirmware.Name = "labelFirmware"; + this.labelFirmware.Size = new System.Drawing.Size(49, 13); + this.labelFirmware.TabIndex = 151; + this.labelFirmware.Text = "Firmware"; + // + // buttonFirmware + // + this.buttonFirmware.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonFirmware.Image = ((System.Drawing.Image)(resources.GetObject("buttonFirmware.Image"))); + this.buttonFirmware.Location = new System.Drawing.Point(442, 201); + this.buttonFirmware.Name = "buttonFirmware"; + this.buttonFirmware.Size = new System.Drawing.Size(26, 23); + this.buttonFirmware.TabIndex = 150; + this.buttonFirmware.UseVisualStyleBackColor = true; + this.buttonFirmware.Click += new System.EventHandler(this.buttonFirmware_Click); + // + // textBoxFirmware + // + this.textBoxFirmware.AcceptsReturn = true; + this.textBoxFirmware.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxFirmware.Location = new System.Drawing.Point(13, 201); + this.textBoxFirmware.Name = "textBoxFirmware"; + this.textBoxFirmware.Size = new System.Drawing.Size(421, 20); + this.textBoxFirmware.TabIndex = 149; + // + // LogDescription + // + this.LogDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.LogDescription.AutoSize = true; + this.LogDescription.Location = new System.Drawing.Point(474, 175); + this.LogDescription.Name = "LogDescription"; + this.LogDescription.Size = new System.Drawing.Size(65, 13); + this.LogDescription.TabIndex = 148; + this.LogDescription.Text = "Debug Logs"; + // + // BrowseLog + // + this.BrowseLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.BrowseLog.Image = ((System.Drawing.Image)(resources.GetObject("BrowseLog.Image"))); + this.BrowseLog.Location = new System.Drawing.Point(442, 171); + this.BrowseLog.Name = "BrowseLog"; + this.BrowseLog.Size = new System.Drawing.Size(26, 23); + this.BrowseLog.TabIndex = 147; + this.BrowseLog.UseVisualStyleBackColor = true; + this.BrowseLog.Click += new System.EventHandler(this.BrowseLog_Click); + // + // LogBox + // + this.LogBox.AcceptsReturn = true; + this.LogBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.LogBox.Location = new System.Drawing.Point(13, 171); + this.LogBox.Name = "LogBox"; + this.LogBox.Size = new System.Drawing.Size(421, 20); + this.LogBox.TabIndex = 146; + // + // MovieBackupsBox + // + this.MovieBackupsBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.MovieBackupsBox.Location = new System.Drawing.Point(13, 51); + this.MovieBackupsBox.Name = "MovieBackupsBox"; + this.MovieBackupsBox.Size = new System.Drawing.Size(421, 20); + this.MovieBackupsBox.TabIndex = 125; + // + // BrowseMovieBackups + // + this.BrowseMovieBackups.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.BrowseMovieBackups.Image = ((System.Drawing.Image)(resources.GetObject("BrowseMovieBackups.Image"))); + this.BrowseMovieBackups.Location = new System.Drawing.Point(442, 51); + this.BrowseMovieBackups.Name = "BrowseMovieBackups"; + this.BrowseMovieBackups.Size = new System.Drawing.Size(26, 23); + this.BrowseMovieBackups.TabIndex = 128; + this.BrowseMovieBackups.UseVisualStyleBackColor = true; + this.BrowseMovieBackups.Click += new System.EventHandler(this.BrowseMovieBackups_Click); + // + // MovieBackupsDescription + // + this.MovieBackupsDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.MovieBackupsDescription.AutoSize = true; + this.MovieBackupsDescription.Location = new System.Drawing.Point(474, 55); + this.MovieBackupsDescription.Name = "MovieBackupsDescription"; + this.MovieBackupsDescription.Size = new System.Drawing.Size(80, 13); + this.MovieBackupsDescription.TabIndex = 128; + this.MovieBackupsDescription.Text = "Movie backups"; + // // tabPageNES // this.tabPageNES.Controls.Add(this.label3); @@ -819,10 +984,10 @@ this.tabPageNES.Controls.Add(this.NESROMsDescription); this.tabPageNES.Controls.Add(this.NESSaveRAMBox); this.tabPageNES.Controls.Add(this.NESBrowseROMs); - this.tabPageNES.Location = new System.Drawing.Point(4, 22); + this.tabPageNES.Location = new System.Drawing.Point(4, 40); this.tabPageNES.Name = "tabPageNES"; this.tabPageNES.Padding = new System.Windows.Forms.Padding(3); - this.tabPageNES.Size = new System.Drawing.Size(566, 296); + this.tabPageNES.Size = new System.Drawing.Size(566, 278); this.tabPageNES.TabIndex = 0; this.tabPageNES.Text = "NES"; this.tabPageNES.UseVisualStyleBackColor = true; @@ -970,9 +1135,9 @@ this.tabPageSNES.Controls.Add(this.SNESROMsDescription); this.tabPageSNES.Controls.Add(this.SNESSaveRAMBox); this.tabPageSNES.Controls.Add(this.SNESBrowseROMs); - this.tabPageSNES.Location = new System.Drawing.Point(4, 22); + this.tabPageSNES.Location = new System.Drawing.Point(4, 40); this.tabPageSNES.Name = "tabPageSNES"; - this.tabPageSNES.Size = new System.Drawing.Size(566, 296); + this.tabPageSNES.Size = new System.Drawing.Size(566, 278); this.tabPageSNES.TabIndex = 11; this.tabPageSNES.Text = "SNES"; this.tabPageSNES.UseVisualStyleBackColor = true; @@ -1178,10 +1343,10 @@ this.tabPageSMS.Controls.Add(this.Sega8BrowseSaveRAM); this.tabPageSMS.Controls.Add(this.Sega8SaveRAMDescription); this.tabPageSMS.Controls.Add(this.Sega8SaveRAMBox); - this.tabPageSMS.Location = new System.Drawing.Point(4, 22); + this.tabPageSMS.Location = new System.Drawing.Point(4, 40); this.tabPageSMS.Name = "tabPageSMS"; this.tabPageSMS.Padding = new System.Windows.Forms.Padding(3); - this.tabPageSMS.Size = new System.Drawing.Size(566, 296); + this.tabPageSMS.Size = new System.Drawing.Size(566, 278); this.tabPageSMS.TabIndex = 1; this.tabPageSMS.Text = "SMS"; this.tabPageSMS.UseVisualStyleBackColor = true; @@ -1266,9 +1431,9 @@ this.tabPageSG1000.Controls.Add(this.SGROMsDescription); this.tabPageSG1000.Controls.Add(this.SGSaveRAMBox); this.tabPageSG1000.Controls.Add(this.SGBrowseROMs); - this.tabPageSG1000.Location = new System.Drawing.Point(4, 22); + this.tabPageSG1000.Location = new System.Drawing.Point(4, 40); this.tabPageSG1000.Name = "tabPageSG1000"; - this.tabPageSG1000.Size = new System.Drawing.Size(566, 296); + this.tabPageSG1000.Size = new System.Drawing.Size(566, 278); this.tabPageSG1000.TabIndex = 8; this.tabPageSG1000.Text = "SG-1000"; this.tabPageSG1000.UseVisualStyleBackColor = true; @@ -1474,9 +1639,9 @@ this.tabPageGGear.Controls.Add(this.GGBrowseSaveRAM); this.tabPageGGear.Controls.Add(this.GGSaveRAMDescription); this.tabPageGGear.Controls.Add(this.GGSaveRAMBox); - this.tabPageGGear.Location = new System.Drawing.Point(4, 22); + this.tabPageGGear.Location = new System.Drawing.Point(4, 40); this.tabPageGGear.Name = "tabPageGGear"; - this.tabPageGGear.Size = new System.Drawing.Size(566, 296); + this.tabPageGGear.Size = new System.Drawing.Size(566, 278); this.tabPageGGear.TabIndex = 7; this.tabPageGGear.Text = "G. Gear"; this.tabPageGGear.UseVisualStyleBackColor = true; @@ -1681,9 +1846,9 @@ this.tabPageGenesis.Controls.Add(this.GenesisBrowseSavestates); this.tabPageGenesis.Controls.Add(this.GenesisBrowseScreenshots); this.tabPageGenesis.Controls.Add(this.GenesisROMsBox); - this.tabPageGenesis.Location = new System.Drawing.Point(4, 22); + this.tabPageGenesis.Location = new System.Drawing.Point(4, 40); this.tabPageGenesis.Name = "tabPageGenesis"; - this.tabPageGenesis.Size = new System.Drawing.Size(566, 296); + this.tabPageGenesis.Size = new System.Drawing.Size(566, 278); this.tabPageGenesis.TabIndex = 2; this.tabPageGenesis.Text = "Genesis"; this.tabPageGenesis.UseVisualStyleBackColor = true; @@ -1891,9 +2056,9 @@ this.tabPagePCE.Controls.Add(this.PCEBrowseSaveRAM); this.tabPagePCE.Controls.Add(this.PCESaveRAMDescription); this.tabPagePCE.Controls.Add(this.PCESaveRAMBox); - this.tabPagePCE.Location = new System.Drawing.Point(4, 22); + this.tabPagePCE.Location = new System.Drawing.Point(4, 40); this.tabPagePCE.Name = "tabPagePCE"; - this.tabPagePCE.Size = new System.Drawing.Size(566, 296); + this.tabPagePCE.Size = new System.Drawing.Size(566, 278); this.tabPagePCE.TabIndex = 3; this.tabPagePCE.Text = "PC Engine"; this.tabPagePCE.UseVisualStyleBackColor = true; @@ -2134,9 +2299,9 @@ this.tabPageGameboy.Controls.Add(this.GBBrowseSaveRAM); this.tabPageGameboy.Controls.Add(this.GBSaveRAMDescription); this.tabPageGameboy.Controls.Add(this.GBSaveRAMBox); - this.tabPageGameboy.Location = new System.Drawing.Point(4, 22); + this.tabPageGameboy.Location = new System.Drawing.Point(4, 40); this.tabPageGameboy.Name = "tabPageGameboy"; - this.tabPageGameboy.Size = new System.Drawing.Size(566, 296); + this.tabPageGameboy.Size = new System.Drawing.Size(566, 278); this.tabPageGameboy.TabIndex = 4; this.tabPageGameboy.Text = "Gameboy"; this.tabPageGameboy.UseVisualStyleBackColor = true; @@ -2374,9 +2539,9 @@ this.tabPageGBA.Controls.Add(this.GBABrowseSaveRAM); this.tabPageGBA.Controls.Add(this.GBASaveRAMDescription); this.tabPageGBA.Controls.Add(this.GBASaveRAMBox); - this.tabPageGBA.Location = new System.Drawing.Point(4, 22); + this.tabPageGBA.Location = new System.Drawing.Point(4, 40); this.tabPageGBA.Name = "tabPageGBA"; - this.tabPageGBA.Size = new System.Drawing.Size(566, 296); + this.tabPageGBA.Size = new System.Drawing.Size(566, 278); this.tabPageGBA.TabIndex = 14; this.tabPageGBA.Text = "GBA"; this.tabPageGBA.UseVisualStyleBackColor = true; @@ -2611,9 +2776,9 @@ this.tabPageTI83.Controls.Add(this.TI83BrowseSaveRAM); this.tabPageTI83.Controls.Add(this.TI83SaveRAMDescription); this.tabPageTI83.Controls.Add(this.TI83SaveRAMBox); - this.tabPageTI83.Location = new System.Drawing.Point(4, 22); + this.tabPageTI83.Location = new System.Drawing.Point(4, 40); this.tabPageTI83.Name = "tabPageTI83"; - this.tabPageTI83.Size = new System.Drawing.Size(566, 296); + this.tabPageTI83.Size = new System.Drawing.Size(566, 278); this.tabPageTI83.TabIndex = 5; this.tabPageTI83.Text = "TI83"; this.tabPageTI83.UseVisualStyleBackColor = true; @@ -2977,6 +3142,15 @@ // // tabPageAtari7800 // + this.tabPageAtari7800.Controls.Add(this.label8); + this.tabPageAtari7800.Controls.Add(this.label7); + this.tabPageAtari7800.Controls.Add(this.label6); + this.tabPageAtari7800.Controls.Add(this.Atari7800BrowseHSCBIOS); + this.tabPageAtari7800.Controls.Add(this.Atari7800BrowsePALBIOS); + this.tabPageAtari7800.Controls.Add(this.Atari7800BrowseNTSCBIOS); + this.tabPageAtari7800.Controls.Add(this.Atari7800HighScoreBIOSBox); + this.tabPageAtari7800.Controls.Add(this.Atari7800PALBIOSBox); + this.tabPageAtari7800.Controls.Add(this.Atari7800NTSCBIOSBox); this.tabPageAtari7800.Controls.Add(this.Atari7800SaveRAMsDescription); this.tabPageAtari7800.Controls.Add(this.BrowseAtari7800SaveRAM); this.tabPageAtari7800.Controls.Add(this.Atari7800SaveRAMBox); @@ -2997,7 +3171,7 @@ this.tabPageAtari7800.Controls.Add(this.Atari7800BrowseROMs); this.tabPageAtari7800.Location = new System.Drawing.Point(4, 40); this.tabPageAtari7800.Name = "tabPageAtari7800"; - this.tabPageAtari7800.Size = new System.Drawing.Size(566, 278); + this.tabPageAtari7800.Size = new System.Drawing.Size(566, 288); this.tabPageAtari7800.TabIndex = 15; this.tabPageAtari7800.Text = "A. 7800"; this.tabPageAtari7800.UseVisualStyleBackColor = true; @@ -3777,162 +3951,6 @@ this.C64BaseBox.Size = new System.Drawing.Size(421, 20); this.C64BaseBox.TabIndex = 28; // - // tabPageTools - // - this.tabPageGlobal.Controls.Add(this.BaseROMLabel); - this.tabPageGlobal.Controls.Add(this.BrowseBaseROM); - this.tabPageGlobal.Controls.Add(this.BaseROMSBox); - this.tabPageGlobal.Controls.Add(this.labelFirmware); - this.tabPageGlobal.Controls.Add(this.buttonFirmware); - this.tabPageGlobal.Controls.Add(this.textBoxFirmware); - this.tabPageGlobal.Controls.Add(this.LogDescription); - this.tabPageGlobal.Controls.Add(this.BrowseLog); - this.tabPageGlobal.Controls.Add(this.LogBox); - this.tabPageGlobal.Controls.Add(this.MoviesBox); - this.tabPageGlobal.Controls.Add(this.MovieBackupsBox); - this.tabPageGlobal.Controls.Add(this.BrowseMovieBackups); - this.tabPageGlobal.Controls.Add(this.MovieBackupsDescription); - this.tabPageGlobal.Controls.Add(this.AVIBox); - this.tabPageGlobal.Controls.Add(this.AVIDescription); - this.tabPageGlobal.Controls.Add(this.BrowseAVI); - this.tabPageGlobal.Controls.Add(this.WatchBox); - this.tabPageGlobal.Controls.Add(this.BrowseLua); - this.tabPageGlobal.Controls.Add(this.WatchDescription); - this.tabPageGlobal.Controls.Add(this.LuaDescription); - this.tabPageGlobal.Controls.Add(this.BrowseWatch); - this.tabPageGlobal.Controls.Add(this.LuaBox); - this.tabPageGlobal.Controls.Add(this.BrowseMovies); - this.tabPageGlobal.Controls.Add(this.MoviesDescription); - this.tabPageGlobal.Location = new System.Drawing.Point(4, 40); - this.tabPageGlobal.Name = "tabPageTools"; - this.tabPageGlobal.Size = new System.Drawing.Size(566, 278); - this.tabPageGlobal.TabIndex = 6; - this.tabPageGlobal.Text = "Global"; - this.tabPageGlobal.UseVisualStyleBackColor = true; - // - // BaseROMLabel - // - this.BaseROMLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BaseROMLabel.AutoSize = true; - this.BaseROMLabel.Location = new System.Drawing.Point(474, 235); - this.BaseROMLabel.Name = "BaseROMLabel"; - this.BaseROMLabel.Size = new System.Drawing.Size(59, 13); - this.BaseROMLabel.TabIndex = 154; - this.BaseROMLabel.Text = "Base ROM"; - // - // BrowseBaseROM - // - this.BrowseBaseROM.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BrowseBaseROM.Image = ((System.Drawing.Image)(resources.GetObject("BrowseBaseROM.Image"))); - this.BrowseBaseROM.Location = new System.Drawing.Point(442, 231); - this.BrowseBaseROM.Name = "BrowseBaseROM"; - this.BrowseBaseROM.Size = new System.Drawing.Size(26, 23); - this.BrowseBaseROM.TabIndex = 153; - this.BrowseBaseROM.UseVisualStyleBackColor = true; - this.BrowseBaseROM.Click += new System.EventHandler(this.BrowseBaseROM_Click); - // - // BaseROMSBox - // - this.BaseROMSBox.AcceptsReturn = true; - this.BaseROMSBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.BaseROMSBox.Location = new System.Drawing.Point(12, 231); - this.BaseROMSBox.Name = "BaseROMSBox"; - this.BaseROMSBox.Size = new System.Drawing.Size(421, 20); - this.BaseROMSBox.TabIndex = 152; - // - // labelFirmware - // - this.labelFirmware.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.labelFirmware.AutoSize = true; - this.labelFirmware.Location = new System.Drawing.Point(474, 205); - this.labelFirmware.Name = "labelFirmware"; - this.labelFirmware.Size = new System.Drawing.Size(49, 13); - this.labelFirmware.TabIndex = 151; - this.labelFirmware.Text = "Firmware"; - // - // buttonFirmware - // - this.buttonFirmware.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.buttonFirmware.Image = ((System.Drawing.Image)(resources.GetObject("buttonFirmware.Image"))); - this.buttonFirmware.Location = new System.Drawing.Point(442, 201); - this.buttonFirmware.Name = "buttonFirmware"; - this.buttonFirmware.Size = new System.Drawing.Size(26, 23); - this.buttonFirmware.TabIndex = 150; - this.buttonFirmware.UseVisualStyleBackColor = true; - this.buttonFirmware.Click += new System.EventHandler(this.buttonFirmware_Click); - // - // textBoxFirmware - // - this.textBoxFirmware.AcceptsReturn = true; - this.textBoxFirmware.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.textBoxFirmware.Location = new System.Drawing.Point(13, 201); - this.textBoxFirmware.Name = "textBoxFirmware"; - this.textBoxFirmware.Size = new System.Drawing.Size(421, 20); - this.textBoxFirmware.TabIndex = 149; - // - // LogDescription - // - this.LogDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.LogDescription.AutoSize = true; - this.LogDescription.Location = new System.Drawing.Point(474, 175); - this.LogDescription.Name = "LogDescription"; - this.LogDescription.Size = new System.Drawing.Size(65, 13); - this.LogDescription.TabIndex = 148; - this.LogDescription.Text = "Debug Logs"; - // - // BrowseLog - // - this.BrowseLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BrowseLog.Image = ((System.Drawing.Image)(resources.GetObject("BrowseLog.Image"))); - this.BrowseLog.Location = new System.Drawing.Point(442, 171); - this.BrowseLog.Name = "BrowseLog"; - this.BrowseLog.Size = new System.Drawing.Size(26, 23); - this.BrowseLog.TabIndex = 147; - this.BrowseLog.UseVisualStyleBackColor = true; - this.BrowseLog.Click += new System.EventHandler(this.BrowseLog_Click); - // - // LogBox - // - this.LogBox.AcceptsReturn = true; - this.LogBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.LogBox.Location = new System.Drawing.Point(13, 171); - this.LogBox.Name = "LogBox"; - this.LogBox.Size = new System.Drawing.Size(421, 20); - this.LogBox.TabIndex = 146; - // - // MovieBackupsBox - // - this.MovieBackupsBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.MovieBackupsBox.Location = new System.Drawing.Point(13, 51); - this.MovieBackupsBox.Name = "MovieBackupsBox"; - this.MovieBackupsBox.Size = new System.Drawing.Size(421, 20); - this.MovieBackupsBox.TabIndex = 125; - // - // BrowseMovieBackups - // - this.BrowseMovieBackups.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BrowseMovieBackups.Image = ((System.Drawing.Image)(resources.GetObject("BrowseMovieBackups.Image"))); - this.BrowseMovieBackups.Location = new System.Drawing.Point(442, 51); - this.BrowseMovieBackups.Name = "BrowseMovieBackups"; - this.BrowseMovieBackups.Size = new System.Drawing.Size(26, 23); - this.BrowseMovieBackups.TabIndex = 128; - this.BrowseMovieBackups.UseVisualStyleBackColor = true; - this.BrowseMovieBackups.Click += new System.EventHandler(this.BrowseMovieBackups_Click); - // - // MovieBackupsDescription - // - this.MovieBackupsDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.MovieBackupsDescription.AutoSize = true; - this.MovieBackupsDescription.Location = new System.Drawing.Point(474, 55); - this.MovieBackupsDescription.Name = "MovieBackupsDescription"; - this.MovieBackupsDescription.Size = new System.Drawing.Size(80, 13); - this.MovieBackupsDescription.TabIndex = 128; - this.MovieBackupsDescription.Text = "Movie backups"; - // // BasePathBox // this.BasePathBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -4005,6 +4023,99 @@ this.label1.TabIndex = 204; this.label1.Text = "Special Commands"; // + // Atari7800NTSCBIOSBox + // + this.Atari7800NTSCBIOSBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.Atari7800NTSCBIOSBox.Location = new System.Drawing.Point(13, 206); + this.Atari7800NTSCBIOSBox.Name = "Atari7800NTSCBIOSBox"; + this.Atari7800NTSCBIOSBox.Size = new System.Drawing.Size(421, 20); + this.Atari7800NTSCBIOSBox.TabIndex = 102; + // + // Atari7800PALBIOSBox + // + this.Atari7800PALBIOSBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.Atari7800PALBIOSBox.Location = new System.Drawing.Point(13, 232); + this.Atari7800PALBIOSBox.Name = "Atari7800PALBIOSBox"; + this.Atari7800PALBIOSBox.Size = new System.Drawing.Size(421, 20); + this.Atari7800PALBIOSBox.TabIndex = 103; + // + // Atari7800HighScoreBIOSBox + // + this.Atari7800HighScoreBIOSBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.Atari7800HighScoreBIOSBox.Location = new System.Drawing.Point(13, 259); + this.Atari7800HighScoreBIOSBox.Name = "Atari7800HighScoreBIOSBox"; + this.Atari7800HighScoreBIOSBox.Size = new System.Drawing.Size(421, 20); + this.Atari7800HighScoreBIOSBox.TabIndex = 104; + // + // Atari7800BrowseNTSCBIOS + // + this.Atari7800BrowseNTSCBIOS.AccessibleName = "Atari7800BrowseCheats"; + this.Atari7800BrowseNTSCBIOS.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.Atari7800BrowseNTSCBIOS.Image = ((System.Drawing.Image)(resources.GetObject("Atari7800BrowseNTSCBIOS.Image"))); + this.Atari7800BrowseNTSCBIOS.Location = new System.Drawing.Point(442, 206); + this.Atari7800BrowseNTSCBIOS.Name = "Atari7800BrowseNTSCBIOS"; + this.Atari7800BrowseNTSCBIOS.Size = new System.Drawing.Size(26, 23); + this.Atari7800BrowseNTSCBIOS.TabIndex = 105; + this.Atari7800BrowseNTSCBIOS.UseVisualStyleBackColor = true; + this.Atari7800BrowseNTSCBIOS.Click += new System.EventHandler(this.Atari7800BrowseNTSCBIOS_Click); + // + // Atari7800BrowsePALBIOS + // + this.Atari7800BrowsePALBIOS.AccessibleName = "Atari7800BrowseCheats"; + this.Atari7800BrowsePALBIOS.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.Atari7800BrowsePALBIOS.Image = ((System.Drawing.Image)(resources.GetObject("Atari7800BrowsePALBIOS.Image"))); + this.Atari7800BrowsePALBIOS.Location = new System.Drawing.Point(442, 232); + this.Atari7800BrowsePALBIOS.Name = "Atari7800BrowsePALBIOS"; + this.Atari7800BrowsePALBIOS.Size = new System.Drawing.Size(26, 23); + this.Atari7800BrowsePALBIOS.TabIndex = 106; + this.Atari7800BrowsePALBIOS.UseVisualStyleBackColor = true; + this.Atari7800BrowsePALBIOS.Click += new System.EventHandler(this.Atari7800BrowsePALBIOS_Click); + // + // Atari7800BrowseHSCBIOS + // + this.Atari7800BrowseHSCBIOS.AccessibleName = "Atari7800BrowseCheats"; + this.Atari7800BrowseHSCBIOS.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.Atari7800BrowseHSCBIOS.Image = ((System.Drawing.Image)(resources.GetObject("Atari7800BrowseHSCBIOS.Image"))); + this.Atari7800BrowseHSCBIOS.Location = new System.Drawing.Point(442, 259); + this.Atari7800BrowseHSCBIOS.Name = "Atari7800BrowseHSCBIOS"; + this.Atari7800BrowseHSCBIOS.Size = new System.Drawing.Size(26, 23); + this.Atari7800BrowseHSCBIOS.TabIndex = 107; + this.Atari7800BrowseHSCBIOS.UseVisualStyleBackColor = true; + this.Atari7800BrowseHSCBIOS.Click += new System.EventHandler(this.Atari7800BrowseHSCBIOS_Click); + // + // label6 + // + this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(474, 209); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(64, 13); + this.label6.TabIndex = 108; + this.label6.Text = "NTSC BIOS"; + // + // label7 + // + this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(474, 235); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(55, 13); + this.label7.TabIndex = 109; + this.label7.Text = "PAL BIOS"; + // + // label8 + // + this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(474, 264); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(83, 13); + this.label8.TabIndex = 110; + this.label8.Text = "Highscore BIOS"; + // // PathConfig // this.AcceptButton = this.OK; @@ -4028,6 +4139,8 @@ this.Text = "Path Configuration"; this.Load += new System.EventHandler(this.PathConfig_Load); this.tabControl1.ResumeLayout(false); + this.tabPageGlobal.ResumeLayout(false); + this.tabPageGlobal.PerformLayout(); this.tabPageNES.ResumeLayout(false); this.tabPageNES.PerformLayout(); this.tabPageSNES.ResumeLayout(false); @@ -4058,8 +4171,6 @@ this.tabPageColeco.PerformLayout(); this.tabPageC64.ResumeLayout(false); this.tabPageC64.PerformLayout(); - this.tabPageGlobal.ResumeLayout(false); - this.tabPageGlobal.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -4398,5 +4509,14 @@ private System.Windows.Forms.TextBox BaseROMSBox; private System.Windows.Forms.Label BaseROMLabel; private System.Windows.Forms.Button BrowseBaseROM; + private System.Windows.Forms.TextBox Atari7800PALBIOSBox; + private System.Windows.Forms.TextBox Atari7800NTSCBIOSBox; + private System.Windows.Forms.TextBox Atari7800HighScoreBIOSBox; + private System.Windows.Forms.Button Atari7800BrowseHSCBIOS; + private System.Windows.Forms.Button Atari7800BrowsePALBIOS; + private System.Windows.Forms.Button Atari7800BrowseNTSCBIOS; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label6; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/config/PathConfig.cs b/BizHawk.MultiClient/config/PathConfig.cs index 27d6252c52..64b355e41e 100644 --- a/BizHawk.MultiClient/config/PathConfig.cs +++ b/BizHawk.MultiClient/config/PathConfig.cs @@ -145,7 +145,9 @@ namespace BizHawk.MultiClient Atari7800SaveRAMBox.Text = Global.Config.PathAtari7800SaveRAM; Atari7800ScreenshotsBox.Text = Global.Config.PathAtari7800Screenshots; Atari7800CheatsBox.Text = Global.Config.PathAtari7800Cheats; - //Atari7800FirmwaresBox.Text = Global.Config.PathAtari7800Firmwares; + Atari7800NTSCBIOSBox.Text = Global.Config.FilenameA78NTSCBios; + Atari7800PALBIOSBox.Text = Global.Config.FilenameA78PALBios; + Atari7800HighScoreBIOSBox.Text = Global.Config.FilenameA78HSCBios; C64BaseBox.Text = Global.Config.BaseC64; C64ROMsBox.Text = Global.Config.PathC64ROMs; @@ -342,7 +344,9 @@ namespace BizHawk.MultiClient Global.Config.PathAtari7800SaveRAM = Atari7800SaveRAMBox.Text; Global.Config.PathAtari7800Screenshots = Atari7800ScreenshotsBox.Text; Global.Config.PathAtari7800Cheats = Atari7800CheatsBox.Text; - //Global.Config.PathAtari7800Firmwares = Atari7800FirmwaresBox.Text; + Global.Config.FilenameA78NTSCBios = Atari7800NTSCBIOSBox.Text; + Global.Config.FilenameA78PALBios = Atari7800PALBIOSBox.Text; + Global.Config.FilenameA78HSCBios = Atari7800HighScoreBIOSBox.Text; Global.Config.BaseC64 = C64BaseBox.Text; Global.Config.PathC64ROMs = C64ROMsBox.Text; @@ -1133,5 +1137,47 @@ namespace BizHawk.MultiClient { BrowseFolder(BaseROMSBox, BaseROMLabel.Text, ""); } + + private void Atari7800BrowseNTSCBIOS_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); + Atari7800NTSCBIOSBox.Text = file.Name; + } + } + + private void Atari7800BrowsePALBIOS_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); + Atari7800PALBIOSBox.Text = file.Name; + } + } + + private void Atari7800BrowseHSCBIOS_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); + Atari7800HighScoreBIOSBox.Text = file.Name; + } + } } } diff --git a/BizHawk.MultiClient/config/PathConfig.resx b/BizHawk.MultiClient/config/PathConfig.resx index 919efa1637..876f315cdc 100644 --- a/BizHawk.MultiClient/config/PathConfig.resx +++ b/BizHawk.MultiClient/config/PathConfig.resx @@ -320,6 +320,145 @@ KxxsTGwMAlVmLN3NiTzQZkJ/IrwR233tzUyLG5PPHRmrP8Sw3o4vmr30yE2RBO/Bfp9Fg/EV8tKjqSnL oOdxGO3ZgpE2+SaaZZtpSNpCdbw56mgLbt/YhZ/L7oVD9pYuRkF2ShTZksukxwQSd813cbJc9HHm7MnD OB2x46CdNbZWFljuNGP7NhN2mJqIuRX/YOXm30H4A70P0TsBWkcYAAAAAElFTkSuQmCC + + + + True + + + + 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 @@ -1377,91 +1516,6 @@ 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 @@ -1708,4 +1762,7 @@ 186, 17 + + 186, 17 + \ No newline at end of file