Path Config - fix behavior of the folder browser dialog

This commit is contained in:
adelikat 2012-09-29 20:00:00 +00:00
parent 4fc714d0ad
commit 5f4ad0242f
3 changed files with 993 additions and 987 deletions

View File

@ -79,6 +79,9 @@
this.NESBaseDescription = new System.Windows.Forms.Label();
this.BrowseNESBase = new System.Windows.Forms.Button();
this.tabPage12 = new System.Windows.Forms.TabPage();
this.SNESFirmwaresDescription = new System.Windows.Forms.Label();
this.SNESBrowseFirmwares = new System.Windows.Forms.Button();
this.SNESFirmwaresBox = new System.Windows.Forms.TextBox();
this.SNESBaseBox = new System.Windows.Forms.TextBox();
this.SNESSGBDescription = new System.Windows.Forms.Label();
this.SNESBrowseSGB = new System.Windows.Forms.Button();
@ -280,9 +283,7 @@
this.BaseDescription = new System.Windows.Forms.Label();
this.RecentForROMs = new System.Windows.Forms.CheckBox();
this.SaveButton = new System.Windows.Forms.Button();
this.SNESFirmwaresDescription = new System.Windows.Forms.Label();
this.SNESBrowseFirmwares = new System.Windows.Forms.Button();
this.SNESFirmwaresBox = new System.Windows.Forms.TextBox();
this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.tabPage12.SuspendLayout();
@ -863,6 +864,36 @@
this.tabPage12.Text = "SNES";
this.tabPage12.UseVisualStyleBackColor = true;
//
// SNESFirmwaresDescription
//
this.SNESFirmwaresDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.SNESFirmwaresDescription.AutoSize = true;
this.SNESFirmwaresDescription.Location = new System.Drawing.Point(474, 240);
this.SNESFirmwaresDescription.Name = "SNESFirmwaresDescription";
this.SNESFirmwaresDescription.Size = new System.Drawing.Size(54, 13);
this.SNESFirmwaresDescription.TabIndex = 94;
this.SNESFirmwaresDescription.Text = "Firmwares";
//
// SNESBrowseFirmwares
//
this.SNESBrowseFirmwares.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.SNESBrowseFirmwares.Image = ((System.Drawing.Image)(resources.GetObject("SNESBrowseFirmwares.Image")));
this.SNESBrowseFirmwares.Location = new System.Drawing.Point(442, 237);
this.SNESBrowseFirmwares.Name = "SNESBrowseFirmwares";
this.SNESBrowseFirmwares.Size = new System.Drawing.Size(26, 23);
this.SNESBrowseFirmwares.TabIndex = 93;
this.SNESBrowseFirmwares.UseVisualStyleBackColor = true;
this.SNESBrowseFirmwares.Click += new System.EventHandler(this.SNESBrowseFirmwares_Click);
//
// SNESFirmwaresBox
//
this.SNESFirmwaresBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.SNESFirmwaresBox.Location = new System.Drawing.Point(13, 237);
this.SNESFirmwaresBox.Name = "SNESFirmwaresBox";
this.SNESFirmwaresBox.Size = new System.Drawing.Size(421, 20);
this.SNESFirmwaresBox.TabIndex = 92;
//
// SNESBaseBox
//
this.SNESBaseBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
@ -3064,36 +3095,6 @@
this.SaveButton.UseVisualStyleBackColor = true;
this.SaveButton.Click += new System.EventHandler(this.SaveButton_Click);
//
// SNESFirmwaresDescription
//
this.SNESFirmwaresDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.SNESFirmwaresDescription.AutoSize = true;
this.SNESFirmwaresDescription.Location = new System.Drawing.Point(474, 240);
this.SNESFirmwaresDescription.Name = "SNESFirmwaresDescription";
this.SNESFirmwaresDescription.Size = new System.Drawing.Size(54, 13);
this.SNESFirmwaresDescription.TabIndex = 94;
this.SNESFirmwaresDescription.Text = "Firmwares";
//
// SNESBrowseFirmwares
//
this.SNESBrowseFirmwares.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.SNESBrowseFirmwares.Image = ((System.Drawing.Image)(resources.GetObject("SNESBrowseFirmwares.Image")));
this.SNESBrowseFirmwares.Location = new System.Drawing.Point(442, 237);
this.SNESBrowseFirmwares.Name = "SNESBrowseFirmwares";
this.SNESBrowseFirmwares.Size = new System.Drawing.Size(26, 23);
this.SNESBrowseFirmwares.TabIndex = 93;
this.SNESBrowseFirmwares.UseVisualStyleBackColor = true;
this.SNESBrowseFirmwares.Click += new System.EventHandler(this.SNESBrowseFirmwares_Click);
//
// SNESFirmwaresBox
//
this.SNESFirmwaresBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.SNESFirmwaresBox.Location = new System.Drawing.Point(13, 237);
this.SNESFirmwaresBox.Name = "SNESFirmwaresBox";
this.SNESFirmwaresBox.Size = new System.Drawing.Size(421, 20);
this.SNESFirmwaresBox.TabIndex = 92;
//
// PathConfig
//
this.AcceptButton = this.OK;
@ -3400,5 +3401,6 @@
private System.Windows.Forms.Label SNESFirmwaresDescription;
private System.Windows.Forms.Button SNESBrowseFirmwares;
private System.Windows.Forms.TextBox SNESFirmwaresBox;
private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
}
}

View File

@ -309,12 +309,13 @@ namespace BizHawk.MultiClient
private void BrowseFolder(TextBox box, string Name, string System)
{
FolderBrowserEx f = new FolderBrowserEx();
f.Description = "Set the directory for " + Name;
f.SelectedPath = PathManager.MakeAbsolutePath(box.Text, System);
DialogResult result = f.ShowDialog();
folderBrowserDialog1.Description = "Set the directory for " + Name;
folderBrowserDialog1.SelectedPath = PathManager.MakeAbsolutePath(box.Text, System);
DialogResult result = folderBrowserDialog1.ShowDialog();
if (result == DialogResult.OK)
box.Text = f.SelectedPath;
{
box.Text = folderBrowserDialog1.SelectedPath;
}
}
private void BrowseWatch_Click(object sender, EventArgs e)

File diff suppressed because it is too large Load Diff