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

Message Config - lots of progress

This commit is contained in:
andres.delikat 2011-04-23 18:22:26 +00:00
parent c45c960c93
commit ea796832fc
4 changed files with 105 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.MultiClient/MainForm.MenuItems.cs
View File

@ -509,7 +509,7 @@ namespace BizHawk.MultiClient
private void messagesToolStripMenuItem_Click(object sender, EventArgs e)
{
MessageConfig m = new MessageConfig();
m.Show();
m.ShowDialog();
}
}
}

10
BizHawk.MultiClient/RenderPanel.cs
View File

@ -258,22 +258,22 @@ namespace BizHawk.MultiClient
//TODO: If movie loaded use that frame counter, and also display total movie frame count if read-only
if (Global.Config.DisplayFrameCounter)
{
MessageFont.DrawString(null, MakeFrameCounter(), Global.Config.DispFrameCx+2,
Global.Config.DispFrameCy+2, new Color4(Color.Black));
MessageFont.DrawString(null, MakeFrameCounter(), Global.Config.DispFrameCx+1,
Global.Config.DispFrameCy+1, new Color4(Color.Black));
MessageFont.DrawString(null, MakeFrameCounter(), Global.Config.DispFrameCx,
Global.Config.DispFrameCy, Color.FromArgb(Global.Config.MessagesColor));
}
if (Global.Config.DisplayInput)
{
string input = MakeInputDisplay();
MessageFont.DrawString(null, input, Global.Config.DispInpx+2, Global.Config.DispInpy+2, new Color4(Color.Black));
MessageFont.DrawString(null, input, Global.Config.DispInpx+1, Global.Config.DispInpy+1, new Color4(Color.Black));
MessageFont.DrawString(null, input, Global.Config.DispInpx, Global.Config.DispInpy, Color.FromArgb(Global.Config.MessagesColor));
}
if (Global.Config.DisplayFPS)
{
MessageFont.DrawString(null, FPS.ToString() + " fps", Global.Config.DispFPSx+2,
Global.Config.DispFPSy+2, new Color4(Color.Black));
MessageFont.DrawString(null, FPS.ToString() + " fps", Global.Config.DispFPSx+1,
Global.Config.DispFPSy+1, new Color4(Color.Black));
MessageFont.DrawString(null, FPS.ToString() + " fps", Global.Config.DispFPSx,
Global.Config.DispFPSy, Color.FromArgb(Global.Config.MessagesColor));
}

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

@ -47,23 +47,25 @@
this.XNumeric = new System.Windows.Forms.NumericUpDown();
this.PositionPanel = new System.Windows.Forms.Panel();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.ColorText = new System.Windows.Forms.TextBox();
this.button1 = new System.Windows.Forms.Button();
this.MessageColorBox = new System.Windows.Forms.GroupBox();
this.ColorPanel = new System.Windows.Forms.Panel();
this.MessageColorDialog = new System.Windows.Forms.ColorDialog();
this.Cancel = new System.Windows.Forms.Button();
this.ResetDefaultsButton = new System.Windows.Forms.Button();
this.textBox1 = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.MessageTypeBox.SuspendLayout();
this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.YNumeric)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.XNumeric)).BeginInit();
this.groupBox2.SuspendLayout();
this.MessageColorBox.SuspendLayout();
this.SuspendLayout();
//
// 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(337, 316);
this.OK.Location = new System.Drawing.Point(293, 238);
this.OK.Name = "OK";
this.OK.Size = new System.Drawing.Size(75, 23);
this.OK.TabIndex = 1;
@ -83,7 +85,7 @@
this.MessageTypeBox.Controls.Add(this.LagCounterRadio);
this.MessageTypeBox.Controls.Add(this.FrameCounterRadio);
this.MessageTypeBox.Controls.Add(this.FPSRadio);
this.MessageTypeBox.Location = new System.Drawing.Point(18, 23);
this.MessageTypeBox.Location = new System.Drawing.Point(12, 12);
this.MessageTypeBox.Name = "MessageTypeBox";
this.MessageTypeBox.Size = new System.Drawing.Size(149, 139);
this.MessageTypeBox.TabIndex = 2;
@ -200,7 +202,7 @@
this.groupBox1.Controls.Add(this.YNumeric);
this.groupBox1.Controls.Add(this.XNumeric);
this.groupBox1.Controls.Add(this.PositionPanel);
this.groupBox1.Location = new System.Drawing.Point(182, 23);
this.groupBox1.Location = new System.Drawing.Point(182, 12);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(267, 166);
this.groupBox1.TabIndex = 3;
@ -267,19 +269,30 @@
//
// groupBox2
//
this.groupBox2.Controls.Add(this.textBox1);
this.groupBox2.Controls.Add(this.label3);
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(24, 212);
this.groupBox2.Location = new System.Drawing.Point(12, 173);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(156, 88);
this.groupBox2.Size = new System.Drawing.Size(128, 88);
this.groupBox2.TabIndex = 4;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Message Color";
//
// ColorText
//
this.ColorText.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
this.ColorText.Location = new System.Drawing.Point(61, 27);
this.ColorText.MaxLength = 8;
this.ColorText.Name = "ColorText";
this.ColorText.ReadOnly = true;
this.ColorText.Size = new System.Drawing.Size(59, 20);
this.ColorText.TabIndex = 2;
//
// button1
//
this.button1.Location = new System.Drawing.Point(77, 53);
this.button1.Location = new System.Drawing.Point(12, 53);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(65, 23);
this.button1.TabIndex = 1;
@ -289,17 +302,25 @@
//
// MessageColorBox
//
this.MessageColorBox.Controls.Add(this.ColorPanel);
this.MessageColorBox.Location = new System.Drawing.Point(12, 19);
this.MessageColorBox.Name = "MessageColorBox";
this.MessageColorBox.Size = new System.Drawing.Size(36, 30);
this.MessageColorBox.Size = new System.Drawing.Size(29, 29);
this.MessageColorBox.TabIndex = 0;
this.MessageColorBox.TabStop = false;
//
// ColorPanel
//
this.ColorPanel.Location = new System.Drawing.Point(4, 8);
this.ColorPanel.Name = "ColorPanel";
this.ColorPanel.Size = new System.Drawing.Size(20, 16);
this.ColorPanel.TabIndex = 7;
this.ColorPanel.DoubleClick += new System.EventHandler(this.ColorPanel_DoubleClick);
//
// Cancel
//
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(417, 314);
this.Cancel.Location = new System.Drawing.Point(374, 238);
this.Cancel.Name = "Cancel";
this.Cancel.Size = new System.Drawing.Size(75, 23);
this.Cancel.TabIndex = 5;
@ -309,7 +330,7 @@
//
// ResetDefaultsButton
//
this.ResetDefaultsButton.Location = new System.Drawing.Point(18, 316);
this.ResetDefaultsButton.Location = new System.Drawing.Point(182, 192);
this.ResetDefaultsButton.Name = "ResetDefaultsButton";
this.ResetDefaultsButton.Size = new System.Drawing.Size(96, 23);
this.ResetDefaultsButton.TabIndex = 6;
@ -317,15 +338,14 @@
this.ResetDefaultsButton.UseVisualStyleBackColor = true;
this.ResetDefaultsButton.Click += new System.EventHandler(this.ResetDefaultsButton_Click);
//
// textBox1
// label3
//
this.textBox1.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
this.textBox1.Location = new System.Drawing.Point(12, 55);
this.textBox1.MaxLength = 8;
this.textBox1.Name = "textBox1";
this.textBox1.ReadOnly = true;
this.textBox1.Size = new System.Drawing.Size(59, 20);
this.textBox1.TabIndex = 2;
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(44, 30);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(18, 13);
this.label3.TabIndex = 7;
this.label3.Text = "0x";
//
// MessageConfig
//
@ -333,14 +353,16 @@
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(504, 349);
this.ClientSize = new System.Drawing.Size(470, 272);
this.Controls.Add(this.ResetDefaultsButton);
this.Controls.Add(this.Cancel);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.MessageTypeBox);
this.Controls.Add(this.OK);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
this.Name = "MessageConfig";
this.ShowIcon = false;
this.Text = "Configure On Screen Messages";
this.Load += new System.EventHandler(this.MessageConfig_Load);
this.MessageTypeBox.ResumeLayout(false);
@ -351,6 +373,7 @@
((System.ComponentModel.ISupportInitialize)(this.XNumeric)).EndInit();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.MessageColorBox.ResumeLayout(false);
this.ResumeLayout(false);
}
@ -372,7 +395,6 @@
private System.Windows.Forms.Panel PositionPanel;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.GroupBox MessageColorBox;
private System.Windows.Forms.ColorDialog MessageColorDialog;
private System.Windows.Forms.Button Cancel;
private System.Windows.Forms.Label MessLabel;
@ -381,6 +403,9 @@
private System.Windows.Forms.Label FCLabel;
private System.Windows.Forms.Label FpsPosLabel;
private System.Windows.Forms.Button ResetDefaultsButton;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.TextBox ColorText;
private System.Windows.Forms.GroupBox MessageColorBox;
private System.Windows.Forms.Panel ColorPanel;
private System.Windows.Forms.Label label3;
}
}

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

@ -12,12 +12,8 @@ namespace BizHawk.MultiClient
public partial class MessageConfig : Form
{
//TODO:
//crash if moving too far off drawing area while dragging
//Get message color box working
//Add read only edit box to display message color as hex value
//Implement message position as a variable
//Make a checkbox to enable/disable the stacking effect of message label
//Implement restore defaults
//Deal with typing into Numerics properly
int DispFPSx = Global.Config.DispFPSx;
@ -57,7 +53,9 @@ namespace BizHawk.MultiClient
private void SetColorBox()
{
MessageColorBox.BackColor = MessageColorDialog.Color;
MessageColor = MessageColorDialog.Color.ToArgb();
ColorPanel.BackColor = MessageColorDialog.Color;
ColorText.Text = String.Format("{0:X8}", MessageColor);
}
private void SetPositionInfo()
@ -123,7 +121,8 @@ namespace BizHawk.MultiClient
private void button1_Click(object sender, EventArgs e)
{
MessageColorDialog.ShowDialog();
if (MessageColorDialog.ShowDialog() == DialogResult.OK)
SetColorBox();
}
private void FPSRadio_CheckedChanged(object sender, EventArgs e)
@ -158,6 +157,13 @@ namespace BizHawk.MultiClient
PositionPanel.Refresh();
}
private void YNumericChange()
{
py = (int)YNumeric.Value;
SetPositionLabels();
PositionPanel.Refresh();
}
private void XNumeric_ValueChanged(object sender, EventArgs e)
{
XNumericChange();
@ -165,9 +171,7 @@ namespace BizHawk.MultiClient
private void YNumeric_ValueChanged(object sender, EventArgs e)
{
py = (int)XNumeric.Value;
SetPositionLabels();
PositionPanel.Refresh();
YNumericChange();
}
private void Cancel_Click(object sender, EventArgs e)
@ -207,6 +211,10 @@ namespace BizHawk.MultiClient
private void SetNewPosition(int mx, int my)
{
if (mx < 0) mx = 0;
if (my < 0) my = 0;
if (mx > XNumeric.Maximum) mx = (int)XNumeric.Maximum;
if (my > YNumeric.Maximum) my = (int)YNumeric.Maximum;
XNumeric.Value = mx;
YNumeric.Value = my;
px = mx;
@ -218,7 +226,9 @@ namespace BizHawk.MultiClient
private void PositionPanel_MouseMove(object sender, MouseEventArgs e)
{
if (mousedown)
{
SetNewPosition(e.X, e.Y);
}
}
private void SetPositionLabels()
@ -256,7 +266,37 @@ namespace BizHawk.MultiClient
private void ResetDefaultsButton_Click(object sender, EventArgs e)
{
//TODO
Global.Config.DispFPSx = 0;
Global.Config.DispFPSy = 0;
Global.Config.DispFrameCx = 0;
Global.Config.DispFrameCy = 12;
Global.Config.DispLagx = 0;
Global.Config.DispLagy = 36;
Global.Config.DispInpx = 0;
Global.Config.DispInpy = 24;
Global.Config.MessagesColor = -1;
DispFPSx = Global.Config.DispFPSx;
DispFPSy = Global.Config.DispFPSy;
DispFrameCx = Global.Config.DispFrameCx;
DispFrameCy = Global.Config.DispFrameCy;
DispLagx = Global.Config.DispLagx;
DispLagy = Global.Config.DispLagy;
DispInpx = Global.Config.DispInpx;
DispInpy = Global.Config.DispInpy;
MessageColor = Global.Config.MessagesColor;
SetMaxXY();
MessageColorDialog.Color = Color.FromArgb(MessageColor);
SetColorBox();
SetPositionInfo();
}
private void ColorPanel_DoubleClick(object sender, EventArgs e)
{
if (MessageColorDialog.ShowDialog() == DialogResult.OK)
SetColorBox();
}
}
}