diff --git a/BizHawk.MultiClient/config/PathConfig.Designer.cs b/BizHawk.MultiClient/config/PathConfig.Designer.cs index 87f046a385..7fae42dc41 100644 --- a/BizHawk.MultiClient/config/PathConfig.Designer.cs +++ b/BizHawk.MultiClient/config/PathConfig.Designer.cs @@ -361,17 +361,7 @@ this.C64SavestatesBox = new System.Windows.Forms.TextBox(); this.C64ROMsBox = new System.Windows.Forms.TextBox(); this.C64BaseBox = new System.Windows.Forms.TextBox(); - this.BasePathBox = new System.Windows.Forms.TextBox(); - this.BrowseBase = new System.Windows.Forms.Button(); - this.BaseDescription = new System.Windows.Forms.Label(); - this.RecentForROMs = new System.Windows.Forms.CheckBox(); - this.SaveButton = new System.Windows.Forms.Button(); - this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog(); - this.button1 = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); - this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.tabPageN64 = new System.Windows.Forms.TabPage(); - this.tabPageSaturn = new System.Windows.Forms.TabPage(); this.N64BaseBox = new System.Windows.Forms.TextBox(); this.N64CheatsDescription = new System.Windows.Forms.Label(); this.N64BrowseCheats = new System.Windows.Forms.Button(); @@ -390,6 +380,34 @@ this.N64BrowseSaveRAM = new System.Windows.Forms.Button(); this.N64SaveRAMDescription = new System.Windows.Forms.Label(); this.N64SaveRAMBox = new System.Windows.Forms.TextBox(); + this.tabPageSaturn = new System.Windows.Forms.TabPage(); + this.SaturnBaseBox = new System.Windows.Forms.TextBox(); + this.SaturnCheatsDescription = new System.Windows.Forms.Label(); + this.SaturnBrowseCheats = new System.Windows.Forms.Button(); + this.SaturnCheatsBox = new System.Windows.Forms.TextBox(); + this.SaturnScreenshotsBox = new System.Windows.Forms.TextBox(); + this.SaturnBaseDescription = new System.Windows.Forms.Label(); + this.SaturnScreenshotsDescription = new System.Windows.Forms.Label(); + this.SaturnBrowseBase = new System.Windows.Forms.Button(); + this.SaturnBrowseScreenshots = new System.Windows.Forms.Button(); + this.SaturnROMsBox = new System.Windows.Forms.TextBox(); + this.SaturnBrowseSavestates = new System.Windows.Forms.Button(); + this.SaturnSavestatesDescription = new System.Windows.Forms.Label(); + this.SaturnROMsDescription = new System.Windows.Forms.Label(); + this.SaturnSavestatesBox = new System.Windows.Forms.TextBox(); + this.SaturnBrowseROMs = new System.Windows.Forms.Button(); + this.SaturnBrowseSaveRAM = new System.Windows.Forms.Button(); + this.SaturnSaveRAMDescription = new System.Windows.Forms.Label(); + this.SaturnSaveRAMBox = new System.Windows.Forms.TextBox(); + this.BasePathBox = new System.Windows.Forms.TextBox(); + this.BrowseBase = new System.Windows.Forms.Button(); + this.BaseDescription = new System.Windows.Forms.Label(); + this.RecentForROMs = new System.Windows.Forms.CheckBox(); + this.SaveButton = new System.Windows.Forms.Button(); + this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog(); + this.button1 = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.tabControl1.SuspendLayout(); this.tabPageGlobal.SuspendLayout(); this.tabPageNES.SuspendLayout(); @@ -408,6 +426,7 @@ this.tabPageColeco.SuspendLayout(); this.tabPageC64.SuspendLayout(); this.tabPageN64.SuspendLayout(); + this.tabPageSaturn.SuspendLayout(); this.SuspendLayout(); // // Cancel @@ -1007,10 +1026,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, 306); + this.tabPageNES.Size = new System.Drawing.Size(566, 288); this.tabPageNES.TabIndex = 0; this.tabPageNES.Text = "NES"; this.tabPageNES.UseVisualStyleBackColor = true; @@ -1158,9 +1177,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, 306); + this.tabPageSNES.Size = new System.Drawing.Size(566, 288); this.tabPageSNES.TabIndex = 11; this.tabPageSNES.Text = "SNES"; this.tabPageSNES.UseVisualStyleBackColor = true; @@ -1366,10 +1385,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, 306); + this.tabPageSMS.Size = new System.Drawing.Size(566, 288); this.tabPageSMS.TabIndex = 1; this.tabPageSMS.Text = "SMS"; this.tabPageSMS.UseVisualStyleBackColor = true; @@ -1454,9 +1473,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, 306); + this.tabPageSG1000.Size = new System.Drawing.Size(566, 288); this.tabPageSG1000.TabIndex = 8; this.tabPageSG1000.Text = "SG-1000"; this.tabPageSG1000.UseVisualStyleBackColor = true; @@ -1662,9 +1681,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, 306); + this.tabPageGGear.Size = new System.Drawing.Size(566, 288); this.tabPageGGear.TabIndex = 7; this.tabPageGGear.Text = "G. Gear"; this.tabPageGGear.UseVisualStyleBackColor = true; @@ -1869,9 +1888,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, 306); + this.tabPageGenesis.Size = new System.Drawing.Size(566, 288); this.tabPageGenesis.TabIndex = 2; this.tabPageGenesis.Text = "Genesis"; this.tabPageGenesis.UseVisualStyleBackColor = true; @@ -2079,9 +2098,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, 306); + this.tabPagePCE.Size = new System.Drawing.Size(566, 288); this.tabPagePCE.TabIndex = 3; this.tabPagePCE.Text = "PC Engine"; this.tabPagePCE.UseVisualStyleBackColor = true; @@ -2322,9 +2341,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, 306); + this.tabPageGameboy.Size = new System.Drawing.Size(566, 288); this.tabPageGameboy.TabIndex = 4; this.tabPageGameboy.Text = "Gameboy"; this.tabPageGameboy.UseVisualStyleBackColor = true; @@ -2799,9 +2818,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, 306); + this.tabPageTI83.Size = new System.Drawing.Size(566, 288); this.tabPageTI83.TabIndex = 5; this.tabPageTI83.Text = "TI83"; this.tabPageTI83.UseVisualStyleBackColor = true; @@ -4067,78 +4086,6 @@ this.C64BaseBox.Size = new System.Drawing.Size(421, 20); this.C64BaseBox.TabIndex = 28; // - // BasePathBox - // - this.BasePathBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.BasePathBox.Location = new System.Drawing.Point(29, 27); - this.BasePathBox.Name = "BasePathBox"; - this.BasePathBox.Size = new System.Drawing.Size(456, 20); - this.BasePathBox.TabIndex = 0; - // - // BrowseBase - // - this.BrowseBase.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BrowseBase.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; - this.BrowseBase.Location = new System.Drawing.Point(494, 27); - this.BrowseBase.Name = "BrowseBase"; - this.BrowseBase.Size = new System.Drawing.Size(26, 23); - this.BrowseBase.TabIndex = 1; - this.BrowseBase.UseVisualStyleBackColor = true; - this.BrowseBase.Click += new System.EventHandler(this.BrowseBase_Click); - // - // BaseDescription - // - this.BaseDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BaseDescription.AutoSize = true; - this.BaseDescription.Location = new System.Drawing.Point(526, 30); - this.BaseDescription.Name = "BaseDescription"; - this.BaseDescription.Size = new System.Drawing.Size(64, 13); - this.BaseDescription.TabIndex = 25; - this.BaseDescription.Text = "Global Base"; - // - // RecentForROMs - // - this.RecentForROMs.AutoSize = true; - this.RecentForROMs.Location = new System.Drawing.Point(29, 63); - this.RecentForROMs.Name = "RecentForROMs"; - this.RecentForROMs.Size = new System.Drawing.Size(184, 17); - this.RecentForROMs.TabIndex = 2; - this.RecentForROMs.Text = "Always use recent path for ROMs"; - this.RecentForROMs.UseVisualStyleBackColor = true; - this.RecentForROMs.CheckedChanged += new System.EventHandler(this.RecentForROMs_CheckedChanged); - // - // SaveButton - // - this.SaveButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.SaveButton.Location = new System.Drawing.Point(12, 435); - this.SaveButton.Name = "SaveButton"; - this.SaveButton.Size = new System.Drawing.Size(75, 23); - this.SaveButton.TabIndex = 200; - this.SaveButton.Text = "&Save"; - this.SaveButton.UseVisualStyleBackColor = true; - this.SaveButton.Click += new System.EventHandler(this.SaveButton_Click); - // - // button1 - // - this.button1.Image = global::BizHawk.MultiClient.Properties.Resources.Help; - this.button1.Location = new System.Drawing.Point(459, 57); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(26, 23); - this.button1.TabIndex = 203; - this.toolTip1.SetToolTip(this.button1, "A list of special symbols useable for paths"); - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(491, 64); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(97, 13); - this.label1.TabIndex = 204; - this.label1.Text = "Special Commands"; - // // tabPageN64 // this.tabPageN64.Controls.Add(this.N64BaseBox); @@ -4166,15 +4113,6 @@ this.tabPageN64.Text = "N64"; this.tabPageN64.UseVisualStyleBackColor = true; // - // tabPageSaturn - // - this.tabPageSaturn.Location = new System.Drawing.Point(4, 40); - this.tabPageSaturn.Name = "tabPageSaturn"; - this.tabPageSaturn.Size = new System.Drawing.Size(566, 288); - this.tabPageSaturn.TabIndex = 17; - this.tabPageSaturn.Text = "Saturn"; - this.tabPageSaturn.UseVisualStyleBackColor = true; - // // N64BaseBox // this.N64BaseBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -4355,6 +4293,284 @@ this.N64SaveRAMBox.Size = new System.Drawing.Size(421, 20); this.N64SaveRAMBox.TabIndex = 135; // + // tabPageSaturn + // + this.tabPageSaturn.Controls.Add(this.SaturnBaseBox); + this.tabPageSaturn.Controls.Add(this.SaturnCheatsDescription); + this.tabPageSaturn.Controls.Add(this.SaturnBrowseCheats); + this.tabPageSaturn.Controls.Add(this.SaturnCheatsBox); + this.tabPageSaturn.Controls.Add(this.SaturnScreenshotsBox); + this.tabPageSaturn.Controls.Add(this.SaturnBaseDescription); + this.tabPageSaturn.Controls.Add(this.SaturnScreenshotsDescription); + this.tabPageSaturn.Controls.Add(this.SaturnBrowseBase); + this.tabPageSaturn.Controls.Add(this.SaturnBrowseScreenshots); + this.tabPageSaturn.Controls.Add(this.SaturnROMsBox); + this.tabPageSaturn.Controls.Add(this.SaturnBrowseSavestates); + this.tabPageSaturn.Controls.Add(this.SaturnSavestatesDescription); + this.tabPageSaturn.Controls.Add(this.SaturnROMsDescription); + this.tabPageSaturn.Controls.Add(this.SaturnSavestatesBox); + this.tabPageSaturn.Controls.Add(this.SaturnBrowseROMs); + this.tabPageSaturn.Controls.Add(this.SaturnBrowseSaveRAM); + this.tabPageSaturn.Controls.Add(this.SaturnSaveRAMDescription); + this.tabPageSaturn.Controls.Add(this.SaturnSaveRAMBox); + this.tabPageSaturn.Location = new System.Drawing.Point(4, 40); + this.tabPageSaturn.Name = "tabPageSaturn"; + this.tabPageSaturn.Size = new System.Drawing.Size(566, 288); + this.tabPageSaturn.TabIndex = 17; + this.tabPageSaturn.Text = "Saturn"; + this.tabPageSaturn.UseVisualStyleBackColor = true; + // + // SaturnBaseBox + // + this.SaturnBaseBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.SaturnBaseBox.Location = new System.Drawing.Point(13, 21); + this.SaturnBaseBox.Name = "SaturnBaseBox"; + this.SaturnBaseBox.Size = new System.Drawing.Size(421, 20); + this.SaturnBaseBox.TabIndex = 147; + // + // SaturnCheatsDescription + // + this.SaturnCheatsDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.SaturnCheatsDescription.AutoSize = true; + this.SaturnCheatsDescription.Location = new System.Drawing.Point(474, 183); + this.SaturnCheatsDescription.Name = "SaturnCheatsDescription"; + this.SaturnCheatsDescription.Size = new System.Drawing.Size(40, 13); + this.SaturnCheatsDescription.TabIndex = 146; + this.SaturnCheatsDescription.Text = "Cheats"; + // + // SaturnBrowseCheats + // + this.SaturnBrowseCheats.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.SaturnBrowseCheats.Image = ((System.Drawing.Image)(resources.GetObject("SaturnBrowseCheats.Image"))); + this.SaturnBrowseCheats.Location = new System.Drawing.Point(442, 179); + this.SaturnBrowseCheats.Name = "SaturnBrowseCheats"; + this.SaturnBrowseCheats.Size = new System.Drawing.Size(26, 23); + this.SaturnBrowseCheats.TabIndex = 158; + this.SaturnBrowseCheats.UseVisualStyleBackColor = true; + // + // SaturnCheatsBox + // + this.SaturnCheatsBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.SaturnCheatsBox.Location = new System.Drawing.Point(13, 179); + this.SaturnCheatsBox.Name = "SaturnCheatsBox"; + this.SaturnCheatsBox.Size = new System.Drawing.Size(421, 20); + this.SaturnCheatsBox.TabIndex = 157; + // + // SaturnScreenshotsBox + // + this.SaturnScreenshotsBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.SaturnScreenshotsBox.Location = new System.Drawing.Point(13, 149); + this.SaturnScreenshotsBox.Name = "SaturnScreenshotsBox"; + this.SaturnScreenshotsBox.Size = new System.Drawing.Size(421, 20); + this.SaturnScreenshotsBox.TabIndex = 155; + // + // SaturnBaseDescription + // + this.SaturnBaseDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.SaturnBaseDescription.AutoSize = true; + this.SaturnBaseDescription.Location = new System.Drawing.Point(474, 25); + this.SaturnBaseDescription.Name = "SaturnBaseDescription"; + this.SaturnBaseDescription.Size = new System.Drawing.Size(31, 13); + this.SaturnBaseDescription.TabIndex = 145; + this.SaturnBaseDescription.Text = "Base"; + // + // SaturnScreenshotsDescription + // + this.SaturnScreenshotsDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.SaturnScreenshotsDescription.AutoSize = true; + this.SaturnScreenshotsDescription.Location = new System.Drawing.Point(474, 153); + this.SaturnScreenshotsDescription.Name = "SaturnScreenshotsDescription"; + this.SaturnScreenshotsDescription.Size = new System.Drawing.Size(66, 13); + this.SaturnScreenshotsDescription.TabIndex = 144; + this.SaturnScreenshotsDescription.Text = "Screenshots"; + // + // SaturnBrowseBase + // + this.SaturnBrowseBase.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.SaturnBrowseBase.Image = ((System.Drawing.Image)(resources.GetObject("SaturnBrowseBase.Image"))); + this.SaturnBrowseBase.Location = new System.Drawing.Point(442, 21); + this.SaturnBrowseBase.Name = "SaturnBrowseBase"; + this.SaturnBrowseBase.Size = new System.Drawing.Size(26, 23); + this.SaturnBrowseBase.TabIndex = 148; + this.SaturnBrowseBase.UseVisualStyleBackColor = true; + this.SaturnBrowseBase.Click += new System.EventHandler(this.SaturnBrowseBase_Click); + // + // SaturnBrowseScreenshots + // + this.SaturnBrowseScreenshots.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.SaturnBrowseScreenshots.Image = ((System.Drawing.Image)(resources.GetObject("SaturnBrowseScreenshots.Image"))); + this.SaturnBrowseScreenshots.Location = new System.Drawing.Point(442, 149); + this.SaturnBrowseScreenshots.Name = "SaturnBrowseScreenshots"; + this.SaturnBrowseScreenshots.Size = new System.Drawing.Size(26, 23); + this.SaturnBrowseScreenshots.TabIndex = 156; + this.SaturnBrowseScreenshots.UseVisualStyleBackColor = true; + this.SaturnBrowseScreenshots.Click += new System.EventHandler(this.SaturnBrowseScreenshots_Click); + // + // SaturnROMsBox + // + this.SaturnROMsBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.SaturnROMsBox.Location = new System.Drawing.Point(13, 59); + this.SaturnROMsBox.Name = "SaturnROMsBox"; + this.SaturnROMsBox.Size = new System.Drawing.Size(421, 20); + this.SaturnROMsBox.TabIndex = 149; + // + // SaturnBrowseSavestates + // + this.SaturnBrowseSavestates.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.SaturnBrowseSavestates.Image = ((System.Drawing.Image)(resources.GetObject("SaturnBrowseSavestates.Image"))); + this.SaturnBrowseSavestates.Location = new System.Drawing.Point(442, 89); + this.SaturnBrowseSavestates.Name = "SaturnBrowseSavestates"; + this.SaturnBrowseSavestates.Size = new System.Drawing.Size(26, 23); + this.SaturnBrowseSavestates.TabIndex = 152; + this.SaturnBrowseSavestates.UseVisualStyleBackColor = true; + this.SaturnBrowseSavestates.Click += new System.EventHandler(this.SaturnBrowseSavestates_Click); + // + // SaturnSavestatesDescription + // + this.SaturnSavestatesDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.SaturnSavestatesDescription.AutoSize = true; + this.SaturnSavestatesDescription.Location = new System.Drawing.Point(474, 93); + this.SaturnSavestatesDescription.Name = "SaturnSavestatesDescription"; + this.SaturnSavestatesDescription.Size = new System.Drawing.Size(60, 13); + this.SaturnSavestatesDescription.TabIndex = 141; + this.SaturnSavestatesDescription.Text = "Savestates"; + // + // SaturnROMsDescription + // + this.SaturnROMsDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.SaturnROMsDescription.AutoSize = true; + this.SaturnROMsDescription.Location = new System.Drawing.Point(474, 63); + this.SaturnROMsDescription.Name = "SaturnROMsDescription"; + this.SaturnROMsDescription.Size = new System.Drawing.Size(37, 13); + this.SaturnROMsDescription.TabIndex = 143; + this.SaturnROMsDescription.Text = "ROMs"; + // + // SaturnSavestatesBox + // + this.SaturnSavestatesBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.SaturnSavestatesBox.Location = new System.Drawing.Point(13, 89); + this.SaturnSavestatesBox.Name = "SaturnSavestatesBox"; + this.SaturnSavestatesBox.Size = new System.Drawing.Size(421, 20); + this.SaturnSavestatesBox.TabIndex = 151; + // + // SaturnBrowseROMs + // + this.SaturnBrowseROMs.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.SaturnBrowseROMs.Image = ((System.Drawing.Image)(resources.GetObject("SaturnBrowseROMs.Image"))); + this.SaturnBrowseROMs.Location = new System.Drawing.Point(442, 59); + this.SaturnBrowseROMs.Name = "SaturnBrowseROMs"; + this.SaturnBrowseROMs.Size = new System.Drawing.Size(26, 23); + this.SaturnBrowseROMs.TabIndex = 150; + this.SaturnBrowseROMs.UseVisualStyleBackColor = true; + this.SaturnBrowseROMs.Click += new System.EventHandler(this.button9_Click); + // + // SaturnBrowseSaveRAM + // + this.SaturnBrowseSaveRAM.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.SaturnBrowseSaveRAM.Image = ((System.Drawing.Image)(resources.GetObject("SaturnBrowseSaveRAM.Image"))); + this.SaturnBrowseSaveRAM.Location = new System.Drawing.Point(442, 119); + this.SaturnBrowseSaveRAM.Name = "SaturnBrowseSaveRAM"; + this.SaturnBrowseSaveRAM.Size = new System.Drawing.Size(26, 23); + this.SaturnBrowseSaveRAM.TabIndex = 154; + this.SaturnBrowseSaveRAM.UseVisualStyleBackColor = true; + this.SaturnBrowseSaveRAM.Click += new System.EventHandler(this.SaturnBrowseSaveRAM_Click); + // + // SaturnSaveRAMDescription + // + this.SaturnSaveRAMDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.SaturnSaveRAMDescription.AutoSize = true; + this.SaturnSaveRAMDescription.Location = new System.Drawing.Point(474, 123); + this.SaturnSaveRAMDescription.Name = "SaturnSaveRAMDescription"; + this.SaturnSaveRAMDescription.Size = new System.Drawing.Size(59, 13); + this.SaturnSaveRAMDescription.TabIndex = 142; + this.SaturnSaveRAMDescription.Text = "Save RAM"; + // + // SaturnSaveRAMBox + // + this.SaturnSaveRAMBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.SaturnSaveRAMBox.Location = new System.Drawing.Point(13, 119); + this.SaturnSaveRAMBox.Name = "SaturnSaveRAMBox"; + this.SaturnSaveRAMBox.Size = new System.Drawing.Size(421, 20); + this.SaturnSaveRAMBox.TabIndex = 153; + // + // BasePathBox + // + this.BasePathBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.BasePathBox.Location = new System.Drawing.Point(29, 27); + this.BasePathBox.Name = "BasePathBox"; + this.BasePathBox.Size = new System.Drawing.Size(456, 20); + this.BasePathBox.TabIndex = 0; + // + // BrowseBase + // + this.BrowseBase.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.BrowseBase.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; + this.BrowseBase.Location = new System.Drawing.Point(494, 27); + this.BrowseBase.Name = "BrowseBase"; + this.BrowseBase.Size = new System.Drawing.Size(26, 23); + this.BrowseBase.TabIndex = 1; + this.BrowseBase.UseVisualStyleBackColor = true; + this.BrowseBase.Click += new System.EventHandler(this.BrowseBase_Click); + // + // BaseDescription + // + this.BaseDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.BaseDescription.AutoSize = true; + this.BaseDescription.Location = new System.Drawing.Point(526, 30); + this.BaseDescription.Name = "BaseDescription"; + this.BaseDescription.Size = new System.Drawing.Size(64, 13); + this.BaseDescription.TabIndex = 25; + this.BaseDescription.Text = "Global Base"; + // + // RecentForROMs + // + this.RecentForROMs.AutoSize = true; + this.RecentForROMs.Location = new System.Drawing.Point(29, 63); + this.RecentForROMs.Name = "RecentForROMs"; + this.RecentForROMs.Size = new System.Drawing.Size(184, 17); + this.RecentForROMs.TabIndex = 2; + this.RecentForROMs.Text = "Always use recent path for ROMs"; + this.RecentForROMs.UseVisualStyleBackColor = true; + this.RecentForROMs.CheckedChanged += new System.EventHandler(this.RecentForROMs_CheckedChanged); + // + // SaveButton + // + this.SaveButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.SaveButton.Location = new System.Drawing.Point(12, 435); + this.SaveButton.Name = "SaveButton"; + this.SaveButton.Size = new System.Drawing.Size(75, 23); + this.SaveButton.TabIndex = 200; + this.SaveButton.Text = "&Save"; + this.SaveButton.UseVisualStyleBackColor = true; + this.SaveButton.Click += new System.EventHandler(this.SaveButton_Click); + // + // button1 + // + this.button1.Image = global::BizHawk.MultiClient.Properties.Resources.Help; + this.button1.Location = new System.Drawing.Point(459, 57); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(26, 23); + this.button1.TabIndex = 203; + this.toolTip1.SetToolTip(this.button1, "A list of special symbols useable for paths"); + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(491, 64); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(97, 13); + this.label1.TabIndex = 204; + this.label1.Text = "Special Commands"; + // // PathConfig // this.AcceptButton = this.OK; @@ -4412,6 +4628,8 @@ this.tabPageC64.PerformLayout(); this.tabPageN64.ResumeLayout(false); this.tabPageN64.PerformLayout(); + this.tabPageSaturn.ResumeLayout(false); + this.tabPageSaturn.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -4779,5 +4997,23 @@ private System.Windows.Forms.Button N64BrowseSaveRAM; private System.Windows.Forms.Label N64SaveRAMDescription; private System.Windows.Forms.TextBox N64SaveRAMBox; + private System.Windows.Forms.TextBox SaturnBaseBox; + private System.Windows.Forms.Label SaturnCheatsDescription; + private System.Windows.Forms.Button SaturnBrowseCheats; + private System.Windows.Forms.TextBox SaturnCheatsBox; + private System.Windows.Forms.TextBox SaturnScreenshotsBox; + private System.Windows.Forms.Label SaturnBaseDescription; + private System.Windows.Forms.Label SaturnScreenshotsDescription; + private System.Windows.Forms.Button SaturnBrowseBase; + private System.Windows.Forms.Button SaturnBrowseScreenshots; + private System.Windows.Forms.TextBox SaturnROMsBox; + private System.Windows.Forms.Button SaturnBrowseSavestates; + private System.Windows.Forms.Label SaturnSavestatesDescription; + private System.Windows.Forms.Label SaturnROMsDescription; + private System.Windows.Forms.TextBox SaturnSavestatesBox; + private System.Windows.Forms.Button SaturnBrowseROMs; + private System.Windows.Forms.Button SaturnBrowseSaveRAM; + private System.Windows.Forms.Label SaturnSaveRAMDescription; + private System.Windows.Forms.TextBox SaturnSaveRAMBox; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/config/PathConfig.cs b/BizHawk.MultiClient/config/PathConfig.cs index d006d12883..230df250c7 100644 --- a/BizHawk.MultiClient/config/PathConfig.cs +++ b/BizHawk.MultiClient/config/PathConfig.cs @@ -157,6 +157,13 @@ namespace BizHawk.MultiClient N64ScreenshotsBox.Text = Global.Config.PathN64Screenshots; N64CheatsBox.Text = Global.Config.PathN64Cheats; + SaturnBaseBox.Text = Global.Config.BaseSaturn; + SaturnROMsBox.Text = Global.Config.PathSaturnROMs; + SaturnSavestatesBox.Text = Global.Config.PathSaturnSavestates; + SaturnSaveRAMBox.Text = Global.Config.PathSaturnSaveRAM; + SaturnScreenshotsBox.Text = Global.Config.PathSaturnScreenshots; + SaturnCheatsBox.Text = Global.Config.PathSaturnCheats; + MoviesBox.Text = Global.Config.MoviesPath; MovieBackupsBox.Text = Global.Config.MoviesBackupPath; LuaBox.Text = Global.Config.LuaPath; @@ -237,6 +244,9 @@ namespace BizHawk.MultiClient case "N64": tabControl1.SelectTab(tabPageN64); break; + case "SAT": + tabControl1.SelectTab(tabPageSaturn); + break; case "NULL": tabControl1.SelectTab(tabPageGlobal); break; @@ -362,6 +372,13 @@ namespace BizHawk.MultiClient Global.Config.PathN64Screenshots = N64ScreenshotsBox.Text; Global.Config.PathN64Cheats = N64CheatsBox.Text; + Global.Config.BaseSaturn = SaturnBaseBox.Text; + Global.Config.PathSaturnROMs = SaturnROMsBox.Text; + Global.Config.PathSaturnSavestates = SaturnSavestatesBox.Text; + Global.Config.PathSaturnSaveRAM = SaturnSaveRAMBox.Text; + Global.Config.PathSaturnScreenshots = SaturnScreenshotsBox.Text; + Global.Config.PathSaturnCheats = SaturnCheatsBox.Text; + Global.Config.MoviesPath = MoviesBox.Text; Global.Config.MoviesBackupPath = MovieBackupsBox.Text; Global.Config.LuaPath = LuaBox.Text; @@ -466,6 +483,10 @@ namespace BizHawk.MultiClient N64BrowseROMs.Enabled = !RecentForROMs.Checked; N64ROMsDescription.Enabled = !RecentForROMs.Checked; + SaturnROMsBox.Enabled = !RecentForROMs.Checked; + SaturnBrowseROMs.Enabled = !RecentForROMs.Checked; + SaturnROMsDescription.Enabled = !RecentForROMs.Checked; + BaseROMSBox.Enabled = !RecentForROMs.Checked; BrowseBaseROM.Enabled = !RecentForROMs.Checked; BaseROMLabel.Enabled = !RecentForROMs.Checked; @@ -1130,5 +1151,30 @@ namespace BizHawk.MultiClient { BrowseFolder(N64CheatsBox, N64CheatsDescription.Text, "N64"); } + + private void button9_Click(object sender, EventArgs e) + { + BrowseFolder(SaturnROMsBox, SaturnROMsDescription.Text, "SAT"); + } + + private void SaturnBrowseBase_Click(object sender, EventArgs e) + { + BrowseFolder(SaturnBaseBox, SaturnBaseDescription.Text); + } + + private void SaturnBrowseSavestates_Click(object sender, EventArgs e) + { + BrowseFolder(SaturnSavestatesBox, SaturnSavestatesDescription.Text, "SAT"); + } + + private void SaturnBrowseSaveRAM_Click(object sender, EventArgs e) + { + BrowseFolder(SaturnSaveRAMBox, SaturnSaveRAMDescription.Text, "SAT"); + } + + private void SaturnBrowseScreenshots_Click(object sender, EventArgs e) + { + BrowseFolder(SaturnScreenshotsBox, SaturnScreenshotsDescription.Text, "SAT"); + } } } diff --git a/BizHawk.MultiClient/config/PathConfig.resx b/BizHawk.MultiClient/config/PathConfig.resx index d0d6df76dc..3f3bbcee29 100644 --- a/BizHawk.MultiClient/config/PathConfig.resx +++ b/BizHawk.MultiClient/config/PathConfig.resx @@ -325,7 +325,7 @@ True - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACeUlE @@ -342,7 +342,7 @@ OB2x46CdNbZWFljuNGP7NhN2mJqIuRX/YOXm30H4A70P0TsBWkcYAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACeUlE @@ -359,7 +359,7 @@ OB2x46CdNbZWFljuNGP7NhN2mJqIuRX/YOXm30H4A70P0TsBWkcYAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACeUlE @@ -376,7 +376,7 @@ OB2x46CdNbZWFljuNGP7NhN2mJqIuRX/YOXm30H4A70P0TsBWkcYAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACeUlE @@ -393,7 +393,7 @@ OB2x46CdNbZWFljuNGP7NhN2mJqIuRX/YOXm30H4A70P0TsBWkcYAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACeUlE @@ -410,7 +410,7 @@ OB2x46CdNbZWFljuNGP7NhN2mJqIuRX/YOXm30H4A70P0TsBWkcYAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACeUlE @@ -1856,6 +1856,108 @@ KxxsTGwMAlVmLN3NiTzQZkJ/IrwR233tzUyLG5PPHRmrP8Sw3o4vmr30yE2RBO/Bfp9Fg/EV8tKjqSnL oOdxGO3ZgpE2+SaaZZtpSNpCdbw56mgLbt/YhZ/L7oVD9pYuRkF2ShTZksukxwQSd813cbJc9HHm7MnD OB2x46CdNbZWFljuNGP7NhN2mJqIuRX/YOXm30H4A70P0TsBWkcYAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACeUlE + QVQ4T6WSWUiUURiG/4suurJIjUIwskQsEAMjqosQpUVNKbdCSRPKrQVDMddmXEedGdcpFXNGnUYdrSzF + sEIoFInQcqHE1CwoKsXUUMnt6XfEye0munjgnO+c9+HjO0cA/osNi2tJLdA6SXN13MwoI12lJ06uiV8+ + W3d5IwIjVXiGKvwX11djSs2TRFlUito7ILIAoVab7SvCWhqrZYq1omXC4gpPe4Ur8AjNMQjo69IwPVZj + 4PeojtlhNfoyBXXalKSNBJ5hSjxCcnELzkeoKVcyNVq5Kjz/rZDZnggqSzOoKEpDXZBEcU4id+Sx5Mui + RcdfmVClyWLqh8YYXhDD9MVCT/CGrBPcK5Hx62uxMdxUm2XgiT6Tep2MhxVp6NXJ6IqllKlucTc3niJl + LKqsGINMqChOY+JTnqHtwRYJdZVK5gelMJSymo9ibSAOeiPhXTid1T5cD3IvF9SqZMb7M+CznEdVCtqe + ypcurWz9bQC0ezHX6sr0M0c+lNtx5cKJcVGwXyjJlfDzvZSh1gTqdHIWBiTQHbIU7AwSg+eYa3Nnuvk4 + E41HGak9gDTUmvPOZjmGGRQqExjpiuG+NouOl2InvRGi4BJ0+LPw6gwzL04x2XSM0ToHvlfZ0p66FT9X + KxxsTGwMAlVmLN3NiTzQZkJ/IrwR233tzUyLG5PPHRmrP8Sw3o4vmr30yE2RBO/Bfp9Fg/EV8tKjqSnL + oOdxGO3ZgpE2+SaaZZtpSNpCdbw56mgLbt/YhZ/L7oVD9pYuRkF2ShTZksukxwQSd813cbJc9HHm7MnD + OB2x46CdNbZWFljuNGP7NhN2mJqIuRX/YOXm30H4A70P0TsBWkcYAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACeUlE + QVQ4T6WSWUiUURiG/4suurJIjUIwskQsEAMjqosQpUVNKbdCSRPKrQVDMddmXEedGdcpFXNGnUYdrSzF + sEIoFInQcqHE1CwoKsXUUMnt6XfEye0munjgnO+c9+HjO0cA/osNi2tJLdA6SXN13MwoI12lJ06uiV8+ + W3d5IwIjVXiGKvwX11djSs2TRFlUito7ILIAoVab7SvCWhqrZYq1omXC4gpPe4Ur8AjNMQjo69IwPVZj + 4PeojtlhNfoyBXXalKSNBJ5hSjxCcnELzkeoKVcyNVq5Kjz/rZDZnggqSzOoKEpDXZBEcU4id+Sx5Mui + RcdfmVClyWLqh8YYXhDD9MVCT/CGrBPcK5Hx62uxMdxUm2XgiT6Tep2MhxVp6NXJ6IqllKlucTc3niJl + LKqsGINMqChOY+JTnqHtwRYJdZVK5gelMJSymo9ibSAOeiPhXTid1T5cD3IvF9SqZMb7M+CznEdVCtqe + ypcurWz9bQC0ezHX6sr0M0c+lNtx5cKJcVGwXyjJlfDzvZSh1gTqdHIWBiTQHbIU7AwSg+eYa3Nnuvk4 + E41HGak9gDTUmvPOZjmGGRQqExjpiuG+NouOl2InvRGi4BJ0+LPw6gwzL04x2XSM0ToHvlfZ0p66FT9X + KxxsTGwMAlVmLN3NiTzQZkJ/IrwR233tzUyLG5PPHRmrP8Sw3o4vmr30yE2RBO/Bfp9Fg/EV8tKjqSnL + oOdxGO3ZgpE2+SaaZZtpSNpCdbw56mgLbt/YhZ/L7oVD9pYuRkF2ShTZksukxwQSd813cbJc9HHm7MnD + OB2x46CdNbZWFljuNGP7NhN2mJqIuRX/YOXm30H4A70P0TsBWkcYAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACeUlE + QVQ4T6WSWUiUURiG/4suurJIjUIwskQsEAMjqosQpUVNKbdCSRPKrQVDMddmXEedGdcpFXNGnUYdrSzF + sEIoFInQcqHE1CwoKsXUUMnt6XfEye0munjgnO+c9+HjO0cA/osNi2tJLdA6SXN13MwoI12lJ06uiV8+ + W3d5IwIjVXiGKvwX11djSs2TRFlUito7ILIAoVab7SvCWhqrZYq1omXC4gpPe4Ur8AjNMQjo69IwPVZj + 4PeojtlhNfoyBXXalKSNBJ5hSjxCcnELzkeoKVcyNVq5Kjz/rZDZnggqSzOoKEpDXZBEcU4id+Sx5Mui + RcdfmVClyWLqh8YYXhDD9MVCT/CGrBPcK5Hx62uxMdxUm2XgiT6Tep2MhxVp6NXJ6IqllKlucTc3niJl + LKqsGINMqChOY+JTnqHtwRYJdZVK5gelMJSymo9ibSAOeiPhXTid1T5cD3IvF9SqZMb7M+CznEdVCtqe + ypcurWz9bQC0ezHX6sr0M0c+lNtx5cKJcVGwXyjJlfDzvZSh1gTqdHIWBiTQHbIU7AwSg+eYa3Nnuvk4 + E41HGak9gDTUmvPOZjmGGRQqExjpiuG+NouOl2InvRGi4BJ0+LPw6gwzL04x2XSM0ToHvlfZ0p66FT9X + KxxsTGwMAlVmLN3NiTzQZkJ/IrwR233tzUyLG5PPHRmrP8Sw3o4vmr30yE2RBO/Bfp9Fg/EV8tKjqSnL + oOdxGO3ZgpE2+SaaZZtpSNpCdbw56mgLbt/YhZ/L7oVD9pYuRkF2ShTZksukxwQSd813cbJc9HHm7MnD + OB2x46CdNbZWFljuNGP7NhN2mJqIuRX/YOXm30H4A70P0TsBWkcYAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACeUlE + QVQ4T6WSWUiUURiG/4suurJIjUIwskQsEAMjqosQpUVNKbdCSRPKrQVDMddmXEedGdcpFXNGnUYdrSzF + sEIoFInQcqHE1CwoKsXUUMnt6XfEye0munjgnO+c9+HjO0cA/osNi2tJLdA6SXN13MwoI12lJ06uiV8+ + W3d5IwIjVXiGKvwX11djSs2TRFlUito7ILIAoVab7SvCWhqrZYq1omXC4gpPe4Ur8AjNMQjo69IwPVZj + 4PeojtlhNfoyBXXalKSNBJ5hSjxCcnELzkeoKVcyNVq5Kjz/rZDZnggqSzOoKEpDXZBEcU4id+Sx5Mui + RcdfmVClyWLqh8YYXhDD9MVCT/CGrBPcK5Hx62uxMdxUm2XgiT6Tep2MhxVp6NXJ6IqllKlucTc3niJl + LKqsGINMqChOY+JTnqHtwRYJdZVK5gelMJSymo9ibSAOeiPhXTid1T5cD3IvF9SqZMb7M+CznEdVCtqe + ypcurWz9bQC0ezHX6sr0M0c+lNtx5cKJcVGwXyjJlfDzvZSh1gTqdHIWBiTQHbIU7AwSg+eYa3Nnuvk4 + E41HGak9gDTUmvPOZjmGGRQqExjpiuG+NouOl2InvRGi4BJ0+LPw6gwzL04x2XSM0ToHvlfZ0p66FT9X + KxxsTGwMAlVmLN3NiTzQZkJ/IrwR233tzUyLG5PPHRmrP8Sw3o4vmr30yE2RBO/Bfp9Fg/EV8tKjqSnL + oOdxGO3ZgpE2+SaaZZtpSNpCdbw56mgLbt/YhZ/L7oVD9pYuRkF2ShTZksukxwQSd813cbJc9HHm7MnD + OB2x46CdNbZWFljuNGP7NhN2mJqIuRX/YOXm30H4A70P0TsBWkcYAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACeUlE + QVQ4T6WSWUiUURiG/4suurJIjUIwskQsEAMjqosQpUVNKbdCSRPKrQVDMddmXEedGdcpFXNGnUYdrSzF + sEIoFInQcqHE1CwoKsXUUMnt6XfEye0munjgnO+c9+HjO0cA/osNi2tJLdA6SXN13MwoI12lJ06uiV8+ + W3d5IwIjVXiGKvwX11djSs2TRFlUito7ILIAoVab7SvCWhqrZYq1omXC4gpPe4Ur8AjNMQjo69IwPVZj + 4PeojtlhNfoyBXXalKSNBJ5hSjxCcnELzkeoKVcyNVq5Kjz/rZDZnggqSzOoKEpDXZBEcU4id+Sx5Mui + RcdfmVClyWLqh8YYXhDD9MVCT/CGrBPcK5Hx62uxMdxUm2XgiT6Tep2MhxVp6NXJ6IqllKlucTc3niJl + LKqsGINMqChOY+JTnqHtwRYJdZVK5gelMJSymo9ibSAOeiPhXTid1T5cD3IvF9SqZMb7M+CznEdVCtqe + ypcurWz9bQC0ezHX6sr0M0c+lNtx5cKJcVGwXyjJlfDzvZSh1gTqdHIWBiTQHbIU7AwSg+eYa3Nnuvk4 + E41HGak9gDTUmvPOZjmGGRQqExjpiuG+NouOl2InvRGi4BJ0+LPw6gwzL04x2XSM0ToHvlfZ0p66FT9X + KxxsTGwMAlVmLN3NiTzQZkJ/IrwR233tzUyLG5PPHRmrP8Sw3o4vmr30yE2RBO/Bfp9Fg/EV8tKjqSnL + oOdxGO3ZgpE2+SaaZZtpSNpCdbw56mgLbt/YhZ/L7oVD9pYuRkF2ShTZksukxwQSd813cbJc9HHm7MnD + OB2x46CdNbZWFljuNGP7NhN2mJqIuRX/YOXm30H4A70P0TsBWkcYAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACeUlE + QVQ4T6WSWUiUURiG/4suurJIjUIwskQsEAMjqosQpUVNKbdCSRPKrQVDMddmXEedGdcpFXNGnUYdrSzF + sEIoFInQcqHE1CwoKsXUUMnt6XfEye0munjgnO+c9+HjO0cA/osNi2tJLdA6SXN13MwoI12lJ06uiV8+ + W3d5IwIjVXiGKvwX11djSs2TRFlUito7ILIAoVab7SvCWhqrZYq1omXC4gpPe4Ur8AjNMQjo69IwPVZj + 4PeojtlhNfoyBXXalKSNBJ5hSjxCcnELzkeoKVcyNVq5Kjz/rZDZnggqSzOoKEpDXZBEcU4id+Sx5Mui + RcdfmVClyWLqh8YYXhDD9MVCT/CGrBPcK5Hx62uxMdxUm2XgiT6Tep2MhxVp6NXJ6IqllKlucTc3niJl + LKqsGINMqChOY+JTnqHtwRYJdZVK5gelMJSymo9ibSAOeiPhXTid1T5cD3IvF9SqZMb7M+CznEdVCtqe + ypcurWz9bQC0ezHX6sr0M0c+lNtx5cKJcVGwXyjJlfDzvZSh1gTqdHIWBiTQHbIU7AwSg+eYa3Nnuvk4 + E41HGak9gDTUmvPOZjmGGRQqExjpiuG+NouOl2InvRGi4BJ0+LPw6gwzL04x2XSM0ToHvlfZ0p66FT9X + KxxsTGwMAlVmLN3NiTzQZkJ/IrwR233tzUyLG5PPHRmrP8Sw3o4vmr30yE2RBO/Bfp9Fg/EV8tKjqSnL + oOdxGO3ZgpE2+SaaZZtpSNpCdbw56mgLbt/YhZ/L7oVD9pYuRkF2ShTZksukxwQSd813cbJc9HHm7MnD + OB2x46CdNbZWFljuNGP7NhN2mJqIuRX/YOXm30H4A70P0TsBWkcYAAAAAElFTkSuQmCC diff --git a/BizHawk.MultiClient/config/PathManager.cs b/BizHawk.MultiClient/config/PathManager.cs index 192909f7af..3796d442e5 100644 --- a/BizHawk.MultiClient/config/PathManager.cs +++ b/BizHawk.MultiClient/config/PathManager.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; using System.IO; using System.Reflection; @@ -111,7 +109,7 @@ namespace BizHawk.MultiClient return Global.Config.BaseGBA; case "N64": return Global.Config.BaseN64; - case "SATURN": + case "SAT": return Global.Config.BaseSaturn; case "NULL": default: @@ -235,7 +233,7 @@ namespace BizHawk.MultiClient public static string GetRomsPath(string sysID) { - string path = ""; + string path; if (Global.Config.UseRecentForROMs) return Environment.SpecialFolder.Recent.ToString(); @@ -243,57 +241,63 @@ namespace BizHawk.MultiClient switch (sysID) { case "C64": - path = PathManager.MakeAbsolutePath(Global.Config.PathC64ROMs, "C64"); + path = MakeAbsolutePath(Global.Config.PathC64ROMs, "C64"); break; case "PSX": - path = PathManager.MakeAbsolutePath(Global.Config.PathPSXROMs, "PSX"); + path = MakeAbsolutePath(Global.Config.PathPSXROMs, "PSX"); break; case "INTV": - path = PathManager.MakeAbsolutePath(Global.Config.PathINTVROMs, "INTV"); + path = MakeAbsolutePath(Global.Config.PathINTVROMs, "INTV"); break; case "SNES": - path = PathManager.MakeAbsolutePath(Global.Config.PathSNESROMs, "SNES"); + path = MakeAbsolutePath(Global.Config.PathSNESROMs, "SNES"); break; case "A26": - path = PathManager.MakeAbsolutePath(Global.Config.PathAtari2600ROMs, "A26"); + path = MakeAbsolutePath(Global.Config.PathAtari2600ROMs, "A26"); break; case "A78": - path = PathManager.MakeAbsolutePath(Global.Config.PathAtari7800ROMs, "A78"); + path = MakeAbsolutePath(Global.Config.PathAtari7800ROMs, "A78"); break; case "NES": - path = PathManager.MakeAbsolutePath(Global.Config.PathNESROMs, "NES"); + path = MakeAbsolutePath(Global.Config.PathNESROMs, "NES"); break; case "SMS": - path = PathManager.MakeAbsolutePath(Global.Config.PathSMSROMs, "SMS"); + path = MakeAbsolutePath(Global.Config.PathSMSROMs, "SMS"); break; case "SG": - path = PathManager.MakeAbsolutePath(Global.Config.PathSGROMs, "SG"); + path = MakeAbsolutePath(Global.Config.PathSGROMs, "SG"); break; case "GG": - path = PathManager.MakeAbsolutePath(Global.Config.PathGGROMs, "GG"); + path = MakeAbsolutePath(Global.Config.PathGGROMs, "GG"); break; case "GEN": - path = PathManager.MakeAbsolutePath(Global.Config.PathGenesisROMs, "GEN"); + path = MakeAbsolutePath(Global.Config.PathGenesisROMs, "GEN"); break; case "SFX": case "PCE": case "PCECD": - path = PathManager.MakeAbsolutePath(Global.Config.PathPCEROMs, "PCE"); + path = MakeAbsolutePath(Global.Config.PathPCEROMs, "PCE"); break; case "GB": - path = PathManager.MakeAbsolutePath(Global.Config.PathGBROMs, "GB"); + path = MakeAbsolutePath(Global.Config.PathGBROMs, "GB"); break; case "GBA": - path = PathManager.MakeAbsolutePath(Global.Config.PathGBAROMs, "GBA"); + path = MakeAbsolutePath(Global.Config.PathGBAROMs, "GBA"); break; case "TI83": - path = PathManager.MakeAbsolutePath(Global.Config.PathTI83ROMs, "TI83"); + path = MakeAbsolutePath(Global.Config.PathTI83ROMs, "TI83"); break; case "Coleco": - path = PathManager.MakeAbsolutePath(Global.Config.PathCOLROMs, "Coleco"); + path = MakeAbsolutePath(Global.Config.PathCOLROMs, "Coleco"); + break; + case "N64": + path = MakeAbsolutePath(Global.Config.PathN64ROMs, "N64"); + break; + case "SAT": + path = MakeAbsolutePath(Global.Config.PathSaturnROMs, "SAT"); break; default: - path = PathManager.MakeAbsolutePath(Global.Config.BaseROMPath); + path = MakeAbsolutePath(Global.Config.BaseROMPath); break; } @@ -304,11 +308,7 @@ namespace BizHawk.MultiClient { string newStr = name; char[] chars = Path.GetInvalidFileNameChars(); - foreach (char c in chars) - { - newStr = newStr.Replace(c.ToString(), ""); - } - return newStr; + return chars.Aggregate(newStr, (current, c) => current.Replace(c.ToString(), "")); } public static string FilesystemSafeName(GameInfo game)