ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Redesign PathConfig (resolves #2435)

This commit is contained in:
YoshiRulz 2021-05-12 03:17:26 +10:00 committed by James Groom
parent dfaf07371e
commit b05d64c10c
2 changed files with 116 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/BizHawk.Client.EmuHawk/config/PathConfig.Designer.cs generated
View File

@ -36,6 +36,13 @@
this.SpecialCommandsBtn = new System.Windows.Forms.Button(); this.SpecialCommandsBtn = new System.Windows.Forms.Button();
this.RecentForROMs = new System.Windows.Forms.CheckBox(); this.RecentForROMs = new System.Windows.Forms.CheckBox();
this.DefaultsBtn = new System.Windows.Forms.Button(); this.DefaultsBtn = new System.Windows.Forms.Button();
this.tcMain = new System.Windows.Forms.TabControl();
this.tpGlobal = new System.Windows.Forms.TabPage();
this.tpSystems = new System.Windows.Forms.TabPage();
this.comboSystem = new System.Windows.Forms.ComboBox();
this.lblSystem = new BizHawk.WinForms.Controls.LocLabelEx();
this.tcMain.SuspendLayout();
this.tpSystems.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// Ok // Ok
@ -66,11 +73,14 @@
this.PathTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.PathTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.PathTabControl.Location = new System.Drawing.Point(12, 41); this.PathTabControl.Appearance = System.Windows.Forms.TabAppearance.FlatButtons;
this.PathTabControl.ItemSize = new System.Drawing.Size(0, 1);
this.PathTabControl.Location = new System.Drawing.Point(6, 31);
this.PathTabControl.Multiline = true; this.PathTabControl.Multiline = true;
this.PathTabControl.Name = "PathTabControl"; this.PathTabControl.Name = "PathTabControl";
this.PathTabControl.SelectedIndex = 0; this.PathTabControl.SelectedIndex = 0;
this.PathTabControl.Size = new System.Drawing.Size(760, 458); this.PathTabControl.Size = new System.Drawing.Size(747, 401);
this.PathTabControl.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
this.PathTabControl.TabIndex = 2; this.PathTabControl.TabIndex = 2;
// //
// SaveBtn // SaveBtn
@ -123,6 +133,58 @@
this.DefaultsBtn.UseVisualStyleBackColor = true; this.DefaultsBtn.UseVisualStyleBackColor = true;
this.DefaultsBtn.Click += new System.EventHandler(this.DefaultsBtn_Click); this.DefaultsBtn.Click += new System.EventHandler(this.DefaultsBtn_Click);
// //
// tcMain
//
this.tcMain.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tcMain.Controls.Add(this.tpGlobal);
this.tcMain.Controls.Add(this.tpSystems);
this.tcMain.Location = new System.Drawing.Point(12, 41);
this.tcMain.Name = "tcMain";
this.tcMain.SelectedIndex = 0;
this.tcMain.Size = new System.Drawing.Size(760, 458);
this.tcMain.TabIndex = 213;
//
// tpGlobal
//
this.tpGlobal.AutoScroll = true;
this.tpGlobal.Location = new System.Drawing.Point(4, 22);
this.tpGlobal.Name = "tpGlobal";
this.tpGlobal.Padding = new System.Windows.Forms.Padding(3);
this.tpGlobal.Size = new System.Drawing.Size(752, 432);
this.tpGlobal.TabIndex = 0;
this.tpGlobal.Text = "Global";
this.tpGlobal.UseVisualStyleBackColor = true;
//
// tpSystems
//
this.tpSystems.Controls.Add(this.lblSystem);
this.tpSystems.Controls.Add(this.comboSystem);
this.tpSystems.Controls.Add(this.PathTabControl);
this.tpSystems.Location = new System.Drawing.Point(4, 22);
this.tpSystems.Name = "tpSystems";
this.tpSystems.Padding = new System.Windows.Forms.Padding(3);
this.tpSystems.Size = new System.Drawing.Size(752, 432);
this.tpSystems.TabIndex = 1;
this.tpSystems.Text = "by System";
this.tpSystems.UseVisualStyleBackColor = true;
//
// comboSystem
//
this.comboSystem.FormattingEnabled = true;
this.comboSystem.Location = new System.Drawing.Point(48, 4);
this.comboSystem.Name = "comboSystem";
this.comboSystem.Size = new System.Drawing.Size(200, 21);
this.comboSystem.TabIndex = 3;
this.comboSystem.SelectedIndexChanged += new System.EventHandler(this.comboSystem_SelectedIndexChanged);
//
// lblSystem
//
this.lblSystem.Location = new System.Drawing.Point(3, 7);
this.lblSystem.Name = "lblSystem";
this.lblSystem.Text = "System:";
//
// PathConfig // PathConfig
// //
this.AcceptButton = this.Ok; this.AcceptButton = this.Ok;
@ -130,12 +192,12 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.Cancel; this.CancelButton = this.Cancel;
this.ClientSize = new System.Drawing.Size(784, 540); this.ClientSize = new System.Drawing.Size(784, 540);
this.Controls.Add(this.tcMain);
this.Controls.Add(this.DefaultsBtn); this.Controls.Add(this.DefaultsBtn);
this.Controls.Add(this.label1); this.Controls.Add(this.label1);
this.Controls.Add(this.SpecialCommandsBtn); this.Controls.Add(this.SpecialCommandsBtn);
this.Controls.Add(this.RecentForROMs); this.Controls.Add(this.RecentForROMs);
this.Controls.Add(this.SaveBtn); this.Controls.Add(this.SaveBtn);
this.Controls.Add(this.PathTabControl);
this.Controls.Add(this.Cancel); this.Controls.Add(this.Cancel);
this.Controls.Add(this.Ok); this.Controls.Add(this.Ok);
this.MinimumSize = new System.Drawing.Size(360, 250); this.MinimumSize = new System.Drawing.Size(360, 250);
@ -144,6 +206,9 @@
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Path Configuration"; this.Text = "Path Configuration";
this.Load += new System.EventHandler(this.NewPathConfig_Load); this.Load += new System.EventHandler(this.NewPathConfig_Load);
this.tcMain.ResumeLayout(false);
this.tpSystems.ResumeLayout(false);
this.tpSystems.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
@ -159,5 +224,10 @@
private System.Windows.Forms.Button SpecialCommandsBtn; private System.Windows.Forms.Button SpecialCommandsBtn;
private System.Windows.Forms.CheckBox RecentForROMs; private System.Windows.Forms.CheckBox RecentForROMs;
private System.Windows.Forms.Button DefaultsBtn; private System.Windows.Forms.Button DefaultsBtn;
private System.Windows.Forms.TabControl tcMain;
private System.Windows.Forms.TabPage tpGlobal;
private System.Windows.Forms.TabPage tpSystems;
private System.Windows.Forms.ComboBox comboSystem;
private WinForms.Controls.LocLabelEx lblSystem;
} }
} }

59
src/BizHawk.Client.EmuHawk/config/PathConfig.cs
View File

@ -61,6 +61,8 @@ namespace BizHawk.Client.EmuHawk
private void DoTabs(IList<PathEntry> pathCollection, string focusTabOfSystem) private void DoTabs(IList<PathEntry> pathCollection, string focusTabOfSystem)
{ {
bool IsTabPendingFocus(string system) => system == focusTabOfSystem || system.Split('_').Contains(focusTabOfSystem);
int x = UIHelper.ScaleX(6); int x = UIHelper.ScaleX(6);
int textBoxWidth = UIHelper.ScaleX(70); int textBoxWidth = UIHelper.ScaleX(70);
int padding = UIHelper.ScaleX(5); int padding = UIHelper.ScaleX(5);
@ -70,15 +72,8 @@ namespace BizHawk.Client.EmuHawk
int widgetOffset = UIHelper.ScaleX(85); int widgetOffset = UIHelper.ScaleX(85);
int rowHeight = UIHelper.ScaleY(30); int rowHeight = UIHelper.ScaleY(30);
void AddTabPageForSystem(string system, string systemDisplayName) void PopulateTabPage(Control t, string system)
{ {
var t = new TabPage
{
Name = system,
Text = systemDisplayName,
Width = UIHelper.ScaleX(200), // Initial Left/Width of child controls are based on this size.
AutoScroll = true
};
var paths = pathCollection var paths = pathCollection
.Where(p => p.System == system) .Where(p => p.System == system)
.OrderBy(p => p.Ordinal) .OrderBy(p => p.Ordinal)
@ -130,15 +125,27 @@ namespace BizHawk.Client.EmuHawk
y += rowHeight; y += rowHeight;
} }
}
PathTabControl.TabPages.Add(t); void AddTabPageForSystem(string system, string systemDisplayName)
if (system == focusTabOfSystem || system.Split('_').Contains(focusTabOfSystem)) {
var t = new TabPage
{ {
PathTabControl.SelectTab(PathTabControl.TabPages.Count - 1); Name = system,
Text = systemDisplayName,
Width = UIHelper.ScaleX(200), // Initial Left/Width of child controls are based on this size.
AutoScroll = true
};
PopulateTabPage(t, system);
comboSystem.Items.Add(systemDisplayName);
PathTabControl.TabPages.Add(t);
if (IsTabPendingFocus(system))
{
comboSystem.SelectedIndex = comboSystem.Items.Count - 1; // event handler selects correct tab in inner TabControl
tcMain.SelectTab(1);
} }
} }
PathTabControl.Visible = false; tcMain.Visible = false;
PathTabControl.TabPages.Clear(); PathTabControl.TabPages.Clear();
var systems = _pathEntries.Select(e => e.System).Distinct() // group entries by "system" (intentionally using instance field here, not parameter) var systems = _pathEntries.Select(e => e.System).Distinct() // group entries by "system" (intentionally using instance field here, not parameter)
@ -147,12 +154,27 @@ namespace BizHawk.Client.EmuHawk
.ToList(); .ToList();
// add the Global tab first... // add the Global tab first...
const string idGlobal = "Global_NULL"; const string idGlobal = "Global_NULL";
tpGlobal.Name = idGlobal; // required for SaveSettings
systems.RemoveAll(tuple => tuple.SysGroup == idGlobal); systems.RemoveAll(tuple => tuple.SysGroup == idGlobal);
AddTabPageForSystem(idGlobal, PathEntryCollection.GetDisplayNameFor(idGlobal)); var hack = tpGlobal.Size.Width - UIHelper.ScaleX(220); // whyyyyyyyyyy
textBoxWidth += hack;
widgetOffset += hack;
Size hack1 = new(17, 0); // also whyyyyyyyyyy
PopulateTabPage(tpGlobal, idGlobal);
tpGlobal.Controls[tpGlobal.Controls.Count - 1].Size -= hack1; // TextBox
tpGlobal.Controls[tpGlobal.Controls.Count - 2].Location -= hack1; // Button
textBoxWidth -= hack;
widgetOffset -= hack;
// ...then continue with the others // ...then continue with the others
foreach (var (sys, dispName) in systems) AddTabPageForSystem(sys, dispName); foreach (var (sys, dispName) in systems) AddTabPageForSystem(sys, dispName);
PathTabControl.Visible = true; if (IsTabPendingFocus(idGlobal))
{
comboSystem.SelectedIndex = systems.FindIndex(tuple => tuple.SysGroup == "NES"); // event handler selects correct tab in inner TabControl
// selected tab in tcMain is already 0 (Global)
}
tcMain.Visible = true;
} }
private void BrowseFolder(TextBox box, string name, string system) private void BrowseFolder(TextBox box, string name, string system)
@ -215,7 +237,7 @@ namespace BizHawk.Client.EmuHawk
} }
private IEnumerable<Control> AllPathControls private IEnumerable<Control> AllPathControls
=> PathTabControl.TabPages.Cast<TabPage>().SelectMany(tp => tp.Controls()); => new[] { tpGlobal }.Concat(PathTabControl.TabPages.Cast<TabPage>()).SelectMany(tp => tp.Controls());
private void NewPathConfig_Load(object sender, EventArgs e) private void NewPathConfig_Load(object sender, EventArgs e)
{ {
@ -255,5 +277,10 @@ namespace BizHawk.Client.EmuHawk
_mainForm.AddOnScreenMessage("Path config aborted"); _mainForm.AddOnScreenMessage("Path config aborted");
Close(); Close();
} }
private void comboSystem_SelectedIndexChanged(object sender, EventArgs e)
{
PathTabControl.SelectTab(((ComboBox) sender).SelectedIndex);
}
} }
} }