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

Allow L+R/U+D toggle (just the GUI & config work, not hooked up yet)

This commit is contained in:
andres.delikat 2011-06-04 23:17:59 +00:00
parent 2a7996c228
commit 0224eebbf1
3 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.MultiClient/Config.cs
View File

@ -98,6 +98,7 @@
public bool RunInBackground = true; public bool RunInBackground = true;
public bool AcceptBackgroundInput = false; public bool AcceptBackgroundInput = false;
public bool SingleInstanceMode = false; public bool SingleInstanceMode = false;
public bool AllowUD_LR = false;
// Run-Control settings // Run-Control settings
public int FrameProgressDelayMs = 500; //how long until a frame advance hold turns into a frame progress? public int FrameProgressDelayMs = 500; //how long until a frame advance hold turns into a frame progress?

31
BizHawk.MultiClient/config/InputConfig.Designer.cs generated
View File

@ -38,6 +38,7 @@
this.ControllComboBox = new System.Windows.Forms.ComboBox(); this.ControllComboBox = new System.Windows.Forms.ComboBox();
this.SystemGroupBox = new System.Windows.Forms.GroupBox(); this.SystemGroupBox = new System.Windows.Forms.GroupBox();
this.SystemComboBox = new System.Windows.Forms.ComboBox(); this.SystemComboBox = new System.Windows.Forms.ComboBox();
this.AllowLR = new System.Windows.Forms.CheckBox();
((System.ComponentModel.ISupportInitialize)(this.ControllerImage)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ControllerImage)).BeginInit();
this.ControllerSelectGroupBox.SuspendLayout(); this.ControllerSelectGroupBox.SuspendLayout();
this.SystemGroupBox.SuspendLayout(); this.SystemGroupBox.SuspendLayout();
@ -46,7 +47,7 @@
// OK // OK
// //
this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.OK.Location = new System.Drawing.Point(260, 284); this.OK.Location = new System.Drawing.Point(261, 309);
this.OK.Name = "OK"; this.OK.Name = "OK";
this.OK.Size = new System.Drawing.Size(75, 23); this.OK.Size = new System.Drawing.Size(75, 23);
this.OK.TabIndex = 0; this.OK.TabIndex = 0;
@ -58,7 +59,7 @@
// //
this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.Cancel.Location = new System.Drawing.Point(350, 284); this.Cancel.Location = new System.Drawing.Point(351, 309);
this.Cancel.Name = "Cancel"; this.Cancel.Name = "Cancel";
this.Cancel.Size = new System.Drawing.Size(75, 23); this.Cancel.Size = new System.Drawing.Size(75, 23);
this.Cancel.TabIndex = 1; this.Cancel.TabIndex = 1;
@ -73,7 +74,7 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.ButtonsGroupBox.Location = new System.Drawing.Point(12, 68); this.ButtonsGroupBox.Location = new System.Drawing.Point(12, 68);
this.ButtonsGroupBox.Name = "ButtonsGroupBox"; this.ButtonsGroupBox.Name = "ButtonsGroupBox";
this.ButtonsGroupBox.Size = new System.Drawing.Size(240, 239); this.ButtonsGroupBox.Size = new System.Drawing.Size(241, 264);
this.ButtonsGroupBox.TabIndex = 2; this.ButtonsGroupBox.TabIndex = 2;
this.ButtonsGroupBox.TabStop = false; this.ButtonsGroupBox.TabStop = false;
this.ButtonsGroupBox.Text = "Buttons"; this.ButtonsGroupBox.Text = "Buttons";
@ -83,7 +84,7 @@
this.ControllerImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.ControllerImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.ControllerImage.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.ControllerImage.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.ControllerImage.Location = new System.Drawing.Point(258, 73); this.ControllerImage.Location = new System.Drawing.Point(259, 73);
this.ControllerImage.Name = "ControllerImage"; this.ControllerImage.Name = "ControllerImage";
this.ControllerImage.Size = new System.Drawing.Size(169, 202); this.ControllerImage.Size = new System.Drawing.Size(169, 202);
this.ControllerImage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.ControllerImage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
@ -92,11 +93,13 @@
// //
// ControllerSelectGroupBox // ControllerSelectGroupBox
// //
this.ControllerSelectGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.ControllerSelectGroupBox.Controls.Add(this.IDX_CONTROLLERENABLED); this.ControllerSelectGroupBox.Controls.Add(this.IDX_CONTROLLERENABLED);
this.ControllerSelectGroupBox.Controls.Add(this.ControllComboBox); this.ControllerSelectGroupBox.Controls.Add(this.ControllComboBox);
this.ControllerSelectGroupBox.Location = new System.Drawing.Point(13, 12); this.ControllerSelectGroupBox.Location = new System.Drawing.Point(13, 12);
this.ControllerSelectGroupBox.Name = "ControllerSelectGroupBox"; this.ControllerSelectGroupBox.Name = "ControllerSelectGroupBox";
this.ControllerSelectGroupBox.Size = new System.Drawing.Size(239, 50); this.ControllerSelectGroupBox.Size = new System.Drawing.Size(240, 50);
this.ControllerSelectGroupBox.TabIndex = 4; this.ControllerSelectGroupBox.TabIndex = 4;
this.ControllerSelectGroupBox.TabStop = false; this.ControllerSelectGroupBox.TabStop = false;
this.ControllerSelectGroupBox.Text = "Controller"; this.ControllerSelectGroupBox.Text = "Controller";
@ -125,8 +128,9 @@
// //
// SystemGroupBox // SystemGroupBox
// //
this.SystemGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.SystemGroupBox.Controls.Add(this.SystemComboBox); this.SystemGroupBox.Controls.Add(this.SystemComboBox);
this.SystemGroupBox.Location = new System.Drawing.Point(258, 12); this.SystemGroupBox.Location = new System.Drawing.Point(259, 12);
this.SystemGroupBox.Name = "SystemGroupBox"; this.SystemGroupBox.Name = "SystemGroupBox";
this.SystemGroupBox.Size = new System.Drawing.Size(158, 50); this.SystemGroupBox.Size = new System.Drawing.Size(158, 50);
this.SystemGroupBox.TabIndex = 6; this.SystemGroupBox.TabIndex = 6;
@ -150,11 +154,22 @@
this.SystemComboBox.TabIndex = 2; this.SystemComboBox.TabIndex = 2;
this.SystemComboBox.SelectedIndexChanged += new System.EventHandler(this.SystemComboBox_SelectedIndexChanged); this.SystemComboBox.SelectedIndexChanged += new System.EventHandler(this.SystemComboBox_SelectedIndexChanged);
// //
// AllowLR
//
this.AllowLR.AutoSize = true;
this.AllowLR.Location = new System.Drawing.Point(261, 286);
this.AllowLR.Name = "AllowLR";
this.AllowLR.Size = new System.Drawing.Size(107, 17);
this.AllowLR.TabIndex = 7;
this.AllowLR.Text = "Allow L+R / U+D";
this.AllowLR.UseVisualStyleBackColor = true;
//
// InputConfig // InputConfig
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(439, 319); this.ClientSize = new System.Drawing.Size(440, 344);
this.Controls.Add(this.AllowLR);
this.Controls.Add(this.SystemGroupBox); this.Controls.Add(this.SystemGroupBox);
this.Controls.Add(this.ControllerSelectGroupBox); this.Controls.Add(this.ControllerSelectGroupBox);
this.Controls.Add(this.ControllerImage); this.Controls.Add(this.ControllerImage);
@ -173,6 +188,7 @@
this.ControllerSelectGroupBox.PerformLayout(); this.ControllerSelectGroupBox.PerformLayout();
this.SystemGroupBox.ResumeLayout(false); this.SystemGroupBox.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout();
} }
@ -187,5 +203,6 @@
private System.Windows.Forms.CheckBox IDX_CONTROLLERENABLED; private System.Windows.Forms.CheckBox IDX_CONTROLLERENABLED;
private System.Windows.Forms.GroupBox SystemGroupBox; private System.Windows.Forms.GroupBox SystemGroupBox;
private System.Windows.Forms.ComboBox SystemComboBox; private System.Windows.Forms.ComboBox SystemComboBox;
private System.Windows.Forms.CheckBox AllowLR;
} }
} }

2
BizHawk.MultiClient/config/InputConfig.cs
View File

@ -629,6 +629,7 @@ namespace BizHawk.MultiClient
{ {
prevWidth = Size.Width; prevWidth = Size.Width;
prevHeight = Size.Height; prevHeight = Size.Height;
AllowLR.Checked = Global.Config.AllowUD_LR;
if(Global.Game != null) if(Global.Game != null)
switch (Global.Game.System) switch (Global.Game.System)
@ -667,6 +668,7 @@ namespace BizHawk.MultiClient
UpdateAll(); UpdateAll();
} }
this.DialogResult = DialogResult.OK; this.DialogResult = DialogResult.OK;
Global.Config.AllowUD_LR = AllowLR.Checked;
this.Close(); this.Close();
} }