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

Message Config - add rerecord counter

This commit is contained in:
andres.delikat 2011-07-01 02:00:11 +00:00
parent 2b661b52ba
commit 8075d4453d
2 changed files with 76 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
BizHawk.MultiClient/config/MessageConfig.Designer.cs generated
View File

@ -30,6 +30,8 @@
{
this.OK = new System.Windows.Forms.Button();
this.MessageTypeBox = new System.Windows.Forms.GroupBox();
this.RerecLabel = new System.Windows.Forms.Label();
this.RerecordsRadio = new System.Windows.Forms.RadioButton();
this.MessLabel = new System.Windows.Forms.Label();
this.InpLabel = new System.Windows.Forms.Label();
this.LagLabel = new System.Windows.Forms.Label();
@ -87,7 +89,7 @@
// OK
//
this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.OK.Location = new System.Drawing.Point(418, 371);
this.OK.Location = new System.Drawing.Point(418, 403);
this.OK.Name = "OK";
this.OK.Size = new System.Drawing.Size(75, 23);
this.OK.TabIndex = 1;
@ -97,6 +99,8 @@
//
// MessageTypeBox
//
this.MessageTypeBox.Controls.Add(this.RerecLabel);
this.MessageTypeBox.Controls.Add(this.RerecordsRadio);
this.MessageTypeBox.Controls.Add(this.MessLabel);
this.MessageTypeBox.Controls.Add(this.InpLabel);
this.MessageTypeBox.Controls.Add(this.LagLabel);
@ -109,14 +113,35 @@
this.MessageTypeBox.Controls.Add(this.FPSRadio);
this.MessageTypeBox.Location = new System.Drawing.Point(12, 12);
this.MessageTypeBox.Name = "MessageTypeBox";
this.MessageTypeBox.Size = new System.Drawing.Size(177, 139);
this.MessageTypeBox.Size = new System.Drawing.Size(177, 187);
this.MessageTypeBox.TabIndex = 2;
this.MessageTypeBox.TabStop = false;
this.MessageTypeBox.Text = "Message Type";
//
// RerecLabel
//
this.RerecLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
this.RerecLabel.AutoSize = true;
this.RerecLabel.Location = new System.Drawing.Point(126, 141);
this.RerecLabel.Name = "RerecLabel";
this.RerecLabel.Size = new System.Drawing.Size(49, 13);
this.RerecLabel.TabIndex = 11;
this.RerecLabel.Text = "255, 255";
//
// RerecordsRadio
//
this.RerecordsRadio.AutoSize = true;
this.RerecordsRadio.Location = new System.Drawing.Point(6, 137);
this.RerecordsRadio.Name = "RerecordsRadio";
this.RerecordsRadio.Size = new System.Drawing.Size(74, 17);
this.RerecordsRadio.TabIndex = 10;
this.RerecordsRadio.Text = "Rerecords";
this.RerecordsRadio.UseVisualStyleBackColor = true;
this.RerecordsRadio.CheckedChanged += new System.EventHandler(this.MessagesRadio_CheckedChanged);
//
// MessLabel
//
this.MessLabel.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.MessLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
this.MessLabel.AutoSize = true;
this.MessLabel.Location = new System.Drawing.Point(126, 116);
this.MessLabel.Name = "MessLabel";
@ -126,7 +151,7 @@
//
// InpLabel
//
this.InpLabel.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.InpLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
this.InpLabel.AutoSize = true;
this.InpLabel.Location = new System.Drawing.Point(126, 92);
this.InpLabel.Name = "InpLabel";
@ -136,7 +161,7 @@
//
// LagLabel
//
this.LagLabel.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.LagLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
this.LagLabel.AutoSize = true;
this.LagLabel.Location = new System.Drawing.Point(126, 68);
this.LagLabel.Name = "LagLabel";
@ -146,7 +171,7 @@
//
// FCLabel
//
this.FCLabel.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.FCLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
this.FCLabel.AutoSize = true;
this.FCLabel.Location = new System.Drawing.Point(126, 44);
this.FCLabel.Name = "FCLabel";
@ -156,7 +181,7 @@
//
// FpsPosLabel
//
this.FpsPosLabel.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.FpsPosLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
this.FpsPosLabel.AutoSize = true;
this.FpsPosLabel.Location = new System.Drawing.Point(126, 20);
this.FpsPosLabel.Name = "FpsPosLabel";
@ -239,7 +264,7 @@
this.groupBox2.Controls.Add(this.ColorText);
this.groupBox2.Controls.Add(this.button1);
this.groupBox2.Controls.Add(this.MessageColorBox);
this.groupBox2.Location = new System.Drawing.Point(12, 173);
this.groupBox2.Location = new System.Drawing.Point(12, 205);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(177, 192);
this.groupBox2.TabIndex = 4;
@ -413,7 +438,7 @@
//
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.Location = new System.Drawing.Point(499, 371);
this.Cancel.Location = new System.Drawing.Point(499, 403);
this.Cancel.Name = "Cancel";
this.Cancel.Size = new System.Drawing.Size(75, 23);
this.Cancel.TabIndex = 5;
@ -424,7 +449,7 @@
// ResetDefaultsButton
//
this.ResetDefaultsButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.ResetDefaultsButton.Location = new System.Drawing.Point(12, 371);
this.ResetDefaultsButton.Location = new System.Drawing.Point(12, 403);
this.ResetDefaultsButton.Name = "ResetDefaultsButton";
this.ResetDefaultsButton.Size = new System.Drawing.Size(96, 23);
this.ResetDefaultsButton.TabIndex = 6;
@ -575,7 +600,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.Cancel;
this.ClientSize = new System.Drawing.Size(612, 406);
this.ClientSize = new System.Drawing.Size(612, 438);
this.Controls.Add(this.ResetDefaultsButton);
this.Controls.Add(this.Cancel);
this.Controls.Add(this.groupBox2);
@ -650,5 +675,7 @@
private System.Windows.Forms.RadioButton BL;
private System.Windows.Forms.RadioButton TR;
private System.Windows.Forms.RadioButton TL;
private System.Windows.Forms.Label RerecLabel;
private System.Windows.Forms.RadioButton RerecordsRadio;
}
}

40
BizHawk.MultiClient/config/MessageConfig.cs
View File

@ -17,8 +17,7 @@ namespace BizHawk.MultiClient
//Deal with typing into Numerics properly
//Have some method of binding a display object to top/bottom/left/right instead of an absolute position
//Bug: restore defaults doesn't restore the y value of whatever radio is checked
//Implement Rerecord Counter config
//Implemetn Multitrack messages counter config
//Implement Multitrack messages counter config
int DispFPSx = Global.Config.DispFPSx;
int DispFPSy = Global.Config.DispFPSy;
@ -28,6 +27,8 @@ namespace BizHawk.MultiClient
int DispLagy = Global.Config.DispLagy;
int DispInpx = Global.Config.DispInpx;
int DispInpy = Global.Config.DispInpy;
int DispRerecx = Global.Config.DispRecx;
int DispRerecy = Global.Config.DispRecy;
int MessageColor = Global.Config.MessagesColor;
int AlertColor = Global.Config.AlertMessageColor;
int LastInputColor = Global.Config.LastInputColor;
@ -147,6 +148,14 @@ namespace BizHawk.MultiClient
px = 0;
py = 0;
}
else if (RerecordsRadio.Checked)
{
XNumeric.Value = DispRecx;
YNumeric.Value = DispRecy;
px = DispRecx;
py = DispRecy;
SetAnchorRadio(DispRecanchor);
}
PositionPanel.Refresh();
XNumeric.Refresh();
@ -164,6 +173,8 @@ namespace BizHawk.MultiClient
Global.Config.DispLagy = DispLagy;
Global.Config.DispInpx = DispInpx;
Global.Config.DispInpy = DispInpy;
Global.Config.DispRecx = DispRecx;
Global.Config.DispRecy = DispRecy;
Global.Config.MessagesColor = MessageColor;
Global.Config.AlertMessageColor = AlertColor;
Global.Config.LastInputColor = LastInputColor;
@ -212,6 +223,12 @@ namespace BizHawk.MultiClient
SetPositionInfo();
}
private void RerecordsRadio_CheckedChanged(object sender, EventArgs e)
{
SetPositionInfo();
}
private void XNumericChange()
{
px = (int)XNumeric.Value;
@ -309,10 +326,16 @@ namespace BizHawk.MultiClient
{
//TODO
}
else if (RerecordsRadio.Checked)
{
DispRecx = px;
DispRecy = py;
}
FpsPosLabel.Text = DispFPSx.ToString() + ", " + DispFPSy.ToString();
FCLabel.Text = DispFrameCx.ToString() + ", " + DispFrameCy.ToString();
LagLabel.Text = DispLagx.ToString() + ", " + DispLagy.ToString();
InpLabel.Text = DispInpx.ToString() + ", " + DispInpy.ToString();
RerecLabel.Text = DispRecx.ToString() + ", " + DispRecy.ToString();
MessLabel.Text = "0, 0";
}
@ -326,6 +349,8 @@ namespace BizHawk.MultiClient
Global.Config.DispLagy = 36;
Global.Config.DispInpx = 0;
Global.Config.DispInpy = 24;
Global.Config.DispRecx = 0;
Global.Config.DispRecy = 48;
Global.Config.MessagesColor = -1;
Global.Config.AlertMessageColor = -65536;
Global.Config.LastInputColor = -23296;
@ -344,6 +369,9 @@ namespace BizHawk.MultiClient
DispLagy = Global.Config.DispLagy;
DispInpx = Global.Config.DispInpx;
DispInpy = Global.Config.DispInpy;
DispRecx = Global.Config.DispRecx;
DispRecy = Global.Config.DispRecy;
MessageColor = Global.Config.MessagesColor;
AlertColor = Global.Config.AlertMessageColor;
LastInputColor = Global.Config.LastInputColor;
@ -392,6 +420,8 @@ namespace BizHawk.MultiClient
DispLaganchor = 0;
else if (InputDisplayRadio.Checked)
DispInputanchor = 0;
else if (RerecordsRadio.Checked)
DispRecanchor = 0;
}
}
@ -407,6 +437,8 @@ namespace BizHawk.MultiClient
DispLaganchor = 1;
else if (InputDisplayRadio.Checked)
DispInputanchor = 1;
else if (RerecordsRadio.Checked)
DispRecanchor = 1;
}
}
@ -422,6 +454,8 @@ namespace BizHawk.MultiClient
DispLaganchor = 2;
else if (InputDisplayRadio.Checked)
DispInputanchor = 2;
else if (RerecordsRadio.Checked)
DispRecanchor = 2;
}
}
@ -437,6 +471,8 @@ namespace BizHawk.MultiClient
DispLaganchor = 3;
else if (InputDisplayRadio.Checked)
DispInputanchor = 3;
else if (RerecordsRadio.Checked)
DispRecanchor = 3;
}
}