From 452611477b145aa096ef4f10efb4ad267eb9d61e Mon Sep 17 00:00:00 2001 From: adelikat Date: Mon, 29 Jun 2020 10:32:04 -0500 Subject: [PATCH] delete multitrack message position config values, and message config ui, also reposition thingsin message config and fix some positioining, hence designer barf --- src/BizHawk.Client.Common/config/Config.cs | 1 - .../config/MessagePosition.cs | 1 - .../config/MessageConfig.Designer.cs | 1197 ++++++++--------- .../config/MessageConfig.cs | 17 - 4 files changed, 587 insertions(+), 629 deletions(-) diff --git a/src/BizHawk.Client.Common/config/Config.cs b/src/BizHawk.Client.Common/config/Config.cs index fd132668a3..3dfc66ad53 100644 --- a/src/BizHawk.Client.Common/config/Config.cs +++ b/src/BizHawk.Client.Common/config/Config.cs @@ -167,7 +167,6 @@ namespace BizHawk.Client.Common public MessagePosition LagCounter { get; set; } = DefaultMessagePositions.LagCounter.Clone(); public MessagePosition InputDisplay { get; set; } = DefaultMessagePositions.InputDisplay.Clone(); public MessagePosition ReRecordCounter { get; set; } = DefaultMessagePositions.ReRecordCounter.Clone(); - public MessagePosition MultitrackRecorder { get; set; } = DefaultMessagePositions.MultitrackRecorder.Clone(); public MessagePosition Messages { get; set; } = DefaultMessagePositions.Messages.Clone(); public MessagePosition Autohold { get; set; } = DefaultMessagePositions.Autohold.Clone(); public MessagePosition RamWatches { get; set; } = DefaultMessagePositions.RamWatches.Clone(); diff --git a/src/BizHawk.Client.Common/config/MessagePosition.cs b/src/BizHawk.Client.Common/config/MessagePosition.cs index 6446174ae1..3f1c0c3267 100644 --- a/src/BizHawk.Client.Common/config/MessagePosition.cs +++ b/src/BizHawk.Client.Common/config/MessagePosition.cs @@ -39,7 +39,6 @@ public static MessagePosition LagCounter = new MessagePosition { X = 0, Y = 42 }; public static MessagePosition InputDisplay = new MessagePosition { X = 0, Y = 28 }; public static MessagePosition ReRecordCounter = new MessagePosition { X = 0, Y = 56 }; - public static MessagePosition MultitrackRecorder = new MessagePosition { X = 0, Y = 14, Anchor = MessagePosition.AnchorType.TopRight }; public static MessagePosition Messages = new MessagePosition { X = 0, Y = 0, Anchor = MessagePosition.AnchorType.BottomLeft }; public static MessagePosition Autohold = new MessagePosition { X = 0, Y = 0, Anchor = MessagePosition.AnchorType.TopRight }; public static MessagePosition RamWatches = new MessagePosition { X = 0, Y = 70 }; diff --git a/src/BizHawk.Client.EmuHawk/config/MessageConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/MessageConfig.Designer.cs index 16ad7f29f0..3bcd92c677 100644 --- a/src/BizHawk.Client.EmuHawk/config/MessageConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/MessageConfig.Designer.cs @@ -28,630 +28,609 @@ /// private void InitializeComponent() { - this.OK = new System.Windows.Forms.Button(); - this.MessageTypeBox = new System.Windows.Forms.GroupBox(); - this.AutoholdLabel = new BizHawk.WinForms.Controls.LocLabelEx(); - this.AutoholdRadio = new System.Windows.Forms.RadioButton(); - this.MultitrackLabel = new BizHawk.WinForms.Controls.LocLabelEx(); - this.MultitrackRadio = new System.Windows.Forms.RadioButton(); - this.RerecLabel = new BizHawk.WinForms.Controls.LocLabelEx(); - this.RerecordsRadio = new System.Windows.Forms.RadioButton(); - this.MessLabel = new BizHawk.WinForms.Controls.LocLabelEx(); - this.InpLabel = new BizHawk.WinForms.Controls.LocLabelEx(); - this.LagLabel = new BizHawk.WinForms.Controls.LocLabelEx(); - this.FCLabel = new BizHawk.WinForms.Controls.LocLabelEx(); - this.FpsPosLabel = new BizHawk.WinForms.Controls.LocLabelEx(); - this.MessagesRadio = new System.Windows.Forms.RadioButton(); - this.InputDisplayRadio = new System.Windows.Forms.RadioButton(); - this.LagCounterRadio = new System.Windows.Forms.RadioButton(); - this.FrameCounterRadio = new System.Windows.Forms.RadioButton(); - this.FPSRadio = new System.Windows.Forms.RadioButton(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.label12 = new BizHawk.WinForms.Controls.LocLabelEx(); - this.MovieInputText = new System.Windows.Forms.TextBox(); - this.label11 = new BizHawk.WinForms.Controls.LocLabelEx(); - this.MovieInputColor = new System.Windows.Forms.Panel(); - this.LInputColorPanel = new System.Windows.Forms.Panel(); - this.AlertColorPanel = new System.Windows.Forms.Panel(); - this.ColorPanel = new System.Windows.Forms.Panel(); - this.label7 = new BizHawk.WinForms.Controls.LocLabelEx(); - this.label8 = new BizHawk.WinForms.Controls.LocLabelEx(); - this.LInputText = new System.Windows.Forms.TextBox(); - this.label6 = new BizHawk.WinForms.Controls.LocLabelEx(); - this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); - this.AlertColorText = new System.Windows.Forms.TextBox(); - this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); - this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); - this.ColorText = new System.Windows.Forms.TextBox(); - this.MessageColorDialog = new System.Windows.Forms.ColorDialog(); - this.Cancel = new System.Windows.Forms.Button(); - this.ResetDefaultsButton = new System.Windows.Forms.Button(); - this.PositionPanel = new System.Windows.Forms.Panel(); - this.XNumeric = new System.Windows.Forms.NumericUpDown(); - this.YNumeric = new System.Windows.Forms.NumericUpDown(); - this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); - this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); - this.PositionGroupBox = new System.Windows.Forms.GroupBox(); - this.BR = new System.Windows.Forms.RadioButton(); - this.BL = new System.Windows.Forms.RadioButton(); - this.TR = new System.Windows.Forms.RadioButton(); - this.TL = new System.Windows.Forms.RadioButton(); - this.AlertColorDialog = new System.Windows.Forms.ColorDialog(); - this.LInputColorDialog = new System.Windows.Forms.ColorDialog(); - this.MovieInputColorDialog = new System.Windows.Forms.ColorDialog(); - this.StackMessagesCheckbox = new System.Windows.Forms.CheckBox(); - this.WatchesRadio = new System.Windows.Forms.RadioButton(); - this.WatchesLabel = new BizHawk.WinForms.Controls.LocLabelEx(); - this.MessageTypeBox.SuspendLayout(); - this.groupBox2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.XNumeric)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.YNumeric)).BeginInit(); - this.PositionGroupBox.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(348, 441); - this.OK.Name = "OK"; - this.OK.Size = new System.Drawing.Size(75, 23); - this.OK.TabIndex = 1; - this.OK.Text = "&OK"; - this.OK.UseVisualStyleBackColor = true; - this.OK.Click += new System.EventHandler(this.Ok_Click); - // - // MessageTypeBox - // - this.MessageTypeBox.Controls.Add(this.WatchesLabel); - this.MessageTypeBox.Controls.Add(this.WatchesRadio); - this.MessageTypeBox.Controls.Add(this.AutoholdLabel); - this.MessageTypeBox.Controls.Add(this.AutoholdRadio); - this.MessageTypeBox.Controls.Add(this.MultitrackLabel); - this.MessageTypeBox.Controls.Add(this.MultitrackRadio); - 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); - this.MessageTypeBox.Controls.Add(this.FCLabel); - this.MessageTypeBox.Controls.Add(this.FpsPosLabel); - this.MessageTypeBox.Controls.Add(this.MessagesRadio); - this.MessageTypeBox.Controls.Add(this.InputDisplayRadio); - 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(12, 12); - this.MessageTypeBox.Name = "MessageTypeBox"; - this.MessageTypeBox.Size = new System.Drawing.Size(177, 234); - this.MessageTypeBox.TabIndex = 2; - this.MessageTypeBox.TabStop = false; - this.MessageTypeBox.Text = "Message Type"; - // - // AutoholdLabel - // - this.AutoholdLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.AutoholdLabel.Location = new System.Drawing.Point(126, 209); - this.AutoholdLabel.Name = "AutoholdLabel"; - this.AutoholdLabel.Text = "255, 255"; - // - // AutoholdRadio - // - this.AutoholdRadio.AutoSize = true; - this.AutoholdRadio.Location = new System.Drawing.Point(6, 210); - this.AutoholdRadio.Name = "AutoholdRadio"; - this.AutoholdRadio.Size = new System.Drawing.Size(67, 17); - this.AutoholdRadio.TabIndex = 14; - this.AutoholdRadio.TabStop = true; - this.AutoholdRadio.Text = "Autohold"; - this.AutoholdRadio.UseVisualStyleBackColor = true; - this.AutoholdRadio.CheckedChanged += new System.EventHandler(this.MessageTypeRadio_CheckedChanged); - // - // MultitrackLabel - // - this.MultitrackLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.MultitrackLabel.Location = new System.Drawing.Point(126, 185); - this.MultitrackLabel.Name = "MultitrackLabel"; - this.MultitrackLabel.Text = "255, 255"; - // - // MultitrackRadio - // - this.MultitrackRadio.AutoSize = true; - this.MultitrackRadio.Location = new System.Drawing.Point(6, 186); - this.MultitrackRadio.Name = "MultitrackRadio"; - this.MultitrackRadio.Size = new System.Drawing.Size(71, 17); - this.MultitrackRadio.TabIndex = 12; - this.MultitrackRadio.TabStop = true; - this.MultitrackRadio.Text = "Multitrack"; - this.MultitrackRadio.UseVisualStyleBackColor = true; - this.MultitrackRadio.CheckedChanged += new System.EventHandler(this.MessageTypeRadio_CheckedChanged); - // - // RerecLabel - // - this.RerecLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.RerecLabel.Location = new System.Drawing.Point(126, 161); - this.RerecLabel.Name = "RerecLabel"; - this.RerecLabel.Text = "255, 255"; - // - // RerecordsRadio - // - this.RerecordsRadio.AutoSize = true; - this.RerecordsRadio.Location = new System.Drawing.Point(6, 162); - 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.MessageTypeRadio_CheckedChanged); - // - // MessLabel - // - this.MessLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.MessLabel.Location = new System.Drawing.Point(126, 137); - this.MessLabel.Name = "MessLabel"; - this.MessLabel.Text = "255, 255"; - // - // InpLabel - // - this.InpLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.InpLabel.Location = new System.Drawing.Point(126, 92); - this.InpLabel.Name = "InpLabel"; - this.InpLabel.Text = "255, 255"; - // - // LagLabel - // - this.LagLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.LagLabel.Location = new System.Drawing.Point(126, 68); - this.LagLabel.Name = "LagLabel"; - this.LagLabel.Text = "255, 255"; - // - // FCLabel - // - this.FCLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.FCLabel.Location = new System.Drawing.Point(126, 44); - this.FCLabel.Name = "FCLabel"; - this.FCLabel.Text = "255, 255"; - // - // FpsPosLabel - // - this.FpsPosLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.FpsPosLabel.Location = new System.Drawing.Point(126, 20); - this.FpsPosLabel.Name = "FpsPosLabel"; - this.FpsPosLabel.Text = "255, 255"; - // - // MessagesRadio - // - this.MessagesRadio.AutoSize = true; - this.MessagesRadio.Location = new System.Drawing.Point(6, 138); - this.MessagesRadio.Name = "MessagesRadio"; - this.MessagesRadio.Size = new System.Drawing.Size(73, 17); - this.MessagesRadio.TabIndex = 4; - this.MessagesRadio.Text = "Messages"; - this.MessagesRadio.UseVisualStyleBackColor = true; - this.MessagesRadio.CheckedChanged += new System.EventHandler(this.MessageTypeRadio_CheckedChanged); - // - // InputDisplayRadio - // - this.InputDisplayRadio.AutoSize = true; - this.InputDisplayRadio.Location = new System.Drawing.Point(6, 90); - this.InputDisplayRadio.Name = "InputDisplayRadio"; - this.InputDisplayRadio.Size = new System.Drawing.Size(86, 17); - this.InputDisplayRadio.TabIndex = 3; - this.InputDisplayRadio.Text = "Input Display"; - this.InputDisplayRadio.UseVisualStyleBackColor = true; - this.InputDisplayRadio.CheckedChanged += new System.EventHandler(this.MessageTypeRadio_CheckedChanged); - // - // LagCounterRadio - // - this.LagCounterRadio.AutoSize = true; - this.LagCounterRadio.Location = new System.Drawing.Point(6, 66); - this.LagCounterRadio.Name = "LagCounterRadio"; - this.LagCounterRadio.Size = new System.Drawing.Size(83, 17); - this.LagCounterRadio.TabIndex = 2; - this.LagCounterRadio.Text = "Lag Counter"; - this.LagCounterRadio.UseVisualStyleBackColor = true; - this.LagCounterRadio.CheckedChanged += new System.EventHandler(this.MessageTypeRadio_CheckedChanged); - // - // FrameCounterRadio - // - this.FrameCounterRadio.AutoSize = true; - this.FrameCounterRadio.Location = new System.Drawing.Point(6, 42); - this.FrameCounterRadio.Name = "FrameCounterRadio"; - this.FrameCounterRadio.Size = new System.Drawing.Size(93, 17); - this.FrameCounterRadio.TabIndex = 1; - this.FrameCounterRadio.Text = "Frame counter"; - this.FrameCounterRadio.UseVisualStyleBackColor = true; - this.FrameCounterRadio.CheckedChanged += new System.EventHandler(this.MessageTypeRadio_CheckedChanged); - // - // FPSRadio - // - this.FPSRadio.AutoSize = true; - this.FPSRadio.Checked = true; - this.FPSRadio.Location = new System.Drawing.Point(6, 18); - this.FPSRadio.Name = "FPSRadio"; - this.FPSRadio.Size = new System.Drawing.Size(42, 17); - this.FPSRadio.TabIndex = 0; - this.FPSRadio.TabStop = true; - this.FPSRadio.Text = "Fps"; - this.FPSRadio.UseVisualStyleBackColor = true; - this.FPSRadio.CheckedChanged += new System.EventHandler(this.MessageTypeRadio_CheckedChanged); - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.label12); - this.groupBox2.Controls.Add(this.MovieInputText); - this.groupBox2.Controls.Add(this.label11); - this.groupBox2.Controls.Add(this.MovieInputColor); - this.groupBox2.Controls.Add(this.LInputColorPanel); - this.groupBox2.Controls.Add(this.AlertColorPanel); - this.groupBox2.Controls.Add(this.ColorPanel); - this.groupBox2.Controls.Add(this.label7); - this.groupBox2.Controls.Add(this.label8); - this.groupBox2.Controls.Add(this.LInputText); - this.groupBox2.Controls.Add(this.label6); - this.groupBox2.Controls.Add(this.label5); - this.groupBox2.Controls.Add(this.AlertColorText); - this.groupBox2.Controls.Add(this.label4); - this.groupBox2.Controls.Add(this.label3); - this.groupBox2.Controls.Add(this.ColorText); - this.groupBox2.Location = new System.Drawing.Point(12, 251); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(177, 210); - this.groupBox2.TabIndex = 4; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "Message Colors"; - // - // label12 - // - this.label12.Location = new System.Drawing.Point(1, 161); - this.label12.Name = "label12"; - this.label12.Text = "Movie Input"; - // - // MovieInputText - // - this.MovieInputText.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; - this.MovieInputText.Location = new System.Drawing.Point(45, 178); - this.MovieInputText.MaxLength = 8; - this.MovieInputText.Name = "MovieInputText"; - this.MovieInputText.ReadOnly = true; - this.MovieInputText.Size = new System.Drawing.Size(59, 20); - this.MovieInputText.TabIndex = 23; - // - // label11 - // - this.label11.Location = new System.Drawing.Point(28, 190); - this.label11.Name = "label11"; - this.label11.Text = "0x"; - // - // MovieInputColor - // - this.MovieInputColor.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.MovieInputColor.Location = new System.Drawing.Point(4, 178); - this.MovieInputColor.Name = "MovieInputColor"; - this.MovieInputColor.Size = new System.Drawing.Size(20, 20); - this.MovieInputColor.TabIndex = 9; - this.MovieInputColor.Click += new System.EventHandler(this.MovieInputColor_Click); - // - // LInputColorPanel - // - this.LInputColorPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.LInputColorPanel.Location = new System.Drawing.Point(6, 130); - this.LInputColorPanel.Name = "LInputColorPanel"; - this.LInputColorPanel.Size = new System.Drawing.Size(20, 20); - this.LInputColorPanel.TabIndex = 7; - this.LInputColorPanel.Click += new System.EventHandler(this.LInputColorPanel_Click); - // - // AlertColorPanel - // - this.AlertColorPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.AlertColorPanel.Location = new System.Drawing.Point(6, 81); - this.AlertColorPanel.Name = "AlertColorPanel"; - this.AlertColorPanel.Size = new System.Drawing.Size(20, 20); - this.AlertColorPanel.TabIndex = 7; - this.AlertColorPanel.Click += new System.EventHandler(this.AlertColorPanel_Click); - // - // ColorPanel - // - this.ColorPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.ColorPanel.Location = new System.Drawing.Point(6, 34); - this.ColorPanel.Name = "ColorPanel"; - this.ColorPanel.Size = new System.Drawing.Size(20, 20); - this.ColorPanel.TabIndex = 7; - this.ColorPanel.Click += new System.EventHandler(this.ColorPanel_Click); - // - // label7 - // - this.label7.Location = new System.Drawing.Point(1, 111); - this.label7.Name = "label7"; - this.label7.Text = "Previous Frame Input"; - // - // label8 - // - this.label8.Location = new System.Drawing.Point(28, 133); - this.label8.Name = "label8"; - this.label8.Text = "0x"; - // - // LInputText - // - this.LInputText.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; - this.LInputText.Location = new System.Drawing.Point(45, 130); - this.LInputText.MaxLength = 8; - this.LInputText.Name = "LInputText"; - this.LInputText.ReadOnly = true; - this.LInputText.Size = new System.Drawing.Size(59, 20); - this.LInputText.TabIndex = 16; - // - // label6 - // - this.label6.Location = new System.Drawing.Point(1, 62); - this.label6.Name = "label6"; - this.label6.Text = "Alert messages"; - // - // label5 - // - this.label5.Location = new System.Drawing.Point(28, 84); - this.label5.Name = "label5"; - this.label5.Text = "0x"; - // - // AlertColorText - // - this.AlertColorText.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; - this.AlertColorText.Location = new System.Drawing.Point(45, 81); - this.AlertColorText.MaxLength = 8; - this.AlertColorText.Name = "AlertColorText"; - this.AlertColorText.ReadOnly = true; - this.AlertColorText.Size = new System.Drawing.Size(59, 20); - this.AlertColorText.TabIndex = 11; - // - // label4 - // - this.label4.Location = new System.Drawing.Point(6, 18); - this.label4.Name = "label4"; - this.label4.Text = "Main messages"; - // - // label3 - // - this.label3.Location = new System.Drawing.Point(28, 37); - this.label3.Name = "label3"; - this.label3.Text = "0x"; - // - // ColorText - // - this.ColorText.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; - this.ColorText.Location = new System.Drawing.Point(45, 34); - 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; - // - // MessageColorDialog - // - this.MessageColorDialog.FullOpen = true; - // - // 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(429, 441); - this.Cancel.Name = "Cancel"; - this.Cancel.Size = new System.Drawing.Size(75, 23); - this.Cancel.TabIndex = 5; - this.Cancel.Text = "&Cancel"; - this.Cancel.UseVisualStyleBackColor = true; - this.Cancel.Click += new System.EventHandler(this.Cancel_Click); - // - // 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(195, 441); - this.ResetDefaultsButton.Name = "ResetDefaultsButton"; - this.ResetDefaultsButton.Size = new System.Drawing.Size(96, 23); - this.ResetDefaultsButton.TabIndex = 6; - this.ResetDefaultsButton.Text = "Restore Defaults"; - this.ResetDefaultsButton.UseVisualStyleBackColor = true; - this.ResetDefaultsButton.Click += new System.EventHandler(this.ResetDefaultsButton_Click); - // - // PositionPanel - // - this.PositionPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.PositionPanel.Location = new System.Drawing.Point(22, 18); - this.PositionPanel.Name = "PositionPanel"; - this.PositionPanel.Size = new System.Drawing.Size(264, 248); - this.PositionPanel.TabIndex = 0; - this.PositionPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.PositionPanel_Paint); - this.PositionPanel.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PositionPanel_MouseDown); - this.PositionPanel.MouseEnter += new System.EventHandler(this.PositionPanel_MouseEnter); - this.PositionPanel.MouseLeave += new System.EventHandler(this.PositionPanel_MouseLeave); - this.PositionPanel.MouseMove += new System.Windows.Forms.MouseEventHandler(this.PositionPanel_MouseMove); - this.PositionPanel.MouseUp += new System.Windows.Forms.MouseEventHandler(this.PositionPanel_MouseUp); - // - // XNumeric - // - this.XNumeric.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.XNumeric.Location = new System.Drawing.Point(43, 271); - this.XNumeric.Maximum = new decimal(new int[] { + this.OK = new System.Windows.Forms.Button(); + this.MessageTypeBox = new System.Windows.Forms.GroupBox(); + this.WatchesLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.WatchesRadio = new System.Windows.Forms.RadioButton(); + this.AutoholdLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.AutoholdRadio = new System.Windows.Forms.RadioButton(); + this.RerecLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.RerecordsRadio = new System.Windows.Forms.RadioButton(); + this.MessLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.InpLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.LagLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.FCLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.FpsPosLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.MessagesRadio = new System.Windows.Forms.RadioButton(); + this.InputDisplayRadio = new System.Windows.Forms.RadioButton(); + this.LagCounterRadio = new System.Windows.Forms.RadioButton(); + this.FrameCounterRadio = new System.Windows.Forms.RadioButton(); + this.FPSRadio = new System.Windows.Forms.RadioButton(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.label12 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.MovieInputText = new System.Windows.Forms.TextBox(); + this.label11 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.MovieInputColor = new System.Windows.Forms.Panel(); + this.LInputColorPanel = new System.Windows.Forms.Panel(); + this.AlertColorPanel = new System.Windows.Forms.Panel(); + this.ColorPanel = new System.Windows.Forms.Panel(); + this.label7 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label8 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.LInputText = new System.Windows.Forms.TextBox(); + this.label6 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.AlertColorText = new System.Windows.Forms.TextBox(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.ColorText = new System.Windows.Forms.TextBox(); + this.MessageColorDialog = new System.Windows.Forms.ColorDialog(); + this.Cancel = new System.Windows.Forms.Button(); + this.ResetDefaultsButton = new System.Windows.Forms.Button(); + this.PositionPanel = new System.Windows.Forms.Panel(); + this.XNumeric = new System.Windows.Forms.NumericUpDown(); + this.YNumeric = new System.Windows.Forms.NumericUpDown(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.PositionGroupBox = new System.Windows.Forms.GroupBox(); + this.BR = new System.Windows.Forms.RadioButton(); + this.BL = new System.Windows.Forms.RadioButton(); + this.TR = new System.Windows.Forms.RadioButton(); + this.TL = new System.Windows.Forms.RadioButton(); + this.AlertColorDialog = new System.Windows.Forms.ColorDialog(); + this.LInputColorDialog = new System.Windows.Forms.ColorDialog(); + this.MovieInputColorDialog = new System.Windows.Forms.ColorDialog(); + this.StackMessagesCheckbox = new System.Windows.Forms.CheckBox(); + this.MessageTypeBox.SuspendLayout(); + this.groupBox2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.XNumeric)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.YNumeric)).BeginInit(); + this.PositionGroupBox.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(348, 418); + this.OK.Name = "OK"; + this.OK.Size = new System.Drawing.Size(75, 23); + this.OK.TabIndex = 1; + this.OK.Text = "&OK"; + this.OK.UseVisualStyleBackColor = true; + this.OK.Click += new System.EventHandler(this.Ok_Click); + // + // MessageTypeBox + // + this.MessageTypeBox.Controls.Add(this.WatchesLabel); + this.MessageTypeBox.Controls.Add(this.WatchesRadio); + this.MessageTypeBox.Controls.Add(this.AutoholdLabel); + this.MessageTypeBox.Controls.Add(this.AutoholdRadio); + 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); + this.MessageTypeBox.Controls.Add(this.FCLabel); + this.MessageTypeBox.Controls.Add(this.FpsPosLabel); + this.MessageTypeBox.Controls.Add(this.MessagesRadio); + this.MessageTypeBox.Controls.Add(this.InputDisplayRadio); + 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(12, 12); + this.MessageTypeBox.Name = "MessageTypeBox"; + this.MessageTypeBox.Size = new System.Drawing.Size(177, 211); + this.MessageTypeBox.TabIndex = 2; + this.MessageTypeBox.TabStop = false; + this.MessageTypeBox.Text = "Message Type"; + // + // WatchesLabel + // + this.WatchesLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.WatchesLabel.Location = new System.Drawing.Point(126, 116); + this.WatchesLabel.Name = "WatchesLabel"; + this.WatchesLabel.Text = "255, 255"; + // + // WatchesRadio + // + this.WatchesRadio.AutoSize = true; + this.WatchesRadio.Location = new System.Drawing.Point(6, 114); + this.WatchesRadio.Name = "WatchesRadio"; + this.WatchesRadio.Size = new System.Drawing.Size(68, 17); + this.WatchesRadio.TabIndex = 16; + this.WatchesRadio.Text = "Watches"; + this.WatchesRadio.UseVisualStyleBackColor = true; + // + // AutoholdLabel + // + this.AutoholdLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.AutoholdLabel.Location = new System.Drawing.Point(126, 185); + this.AutoholdLabel.Name = "AutoholdLabel"; + this.AutoholdLabel.Text = "255, 255"; + // + // AutoholdRadio + // + this.AutoholdRadio.AutoSize = true; + this.AutoholdRadio.Location = new System.Drawing.Point(6, 186); + this.AutoholdRadio.Name = "AutoholdRadio"; + this.AutoholdRadio.Size = new System.Drawing.Size(67, 17); + this.AutoholdRadio.TabIndex = 14; + this.AutoholdRadio.TabStop = true; + this.AutoholdRadio.Text = "Autohold"; + this.AutoholdRadio.UseVisualStyleBackColor = true; + this.AutoholdRadio.CheckedChanged += new System.EventHandler(this.MessageTypeRadio_CheckedChanged); + // + // RerecLabel + // + this.RerecLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.RerecLabel.Location = new System.Drawing.Point(126, 161); + this.RerecLabel.Name = "RerecLabel"; + this.RerecLabel.Text = "255, 255"; + // + // RerecordsRadio + // + this.RerecordsRadio.AutoSize = true; + this.RerecordsRadio.Location = new System.Drawing.Point(6, 162); + 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.MessageTypeRadio_CheckedChanged); + // + // MessLabel + // + this.MessLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.MessLabel.Location = new System.Drawing.Point(126, 137); + this.MessLabel.Name = "MessLabel"; + this.MessLabel.Text = "255, 255"; + // + // InpLabel + // + this.InpLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.InpLabel.Location = new System.Drawing.Point(126, 92); + this.InpLabel.Name = "InpLabel"; + this.InpLabel.Text = "255, 255"; + // + // LagLabel + // + this.LagLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.LagLabel.Location = new System.Drawing.Point(126, 68); + this.LagLabel.Name = "LagLabel"; + this.LagLabel.Text = "255, 255"; + // + // FCLabel + // + this.FCLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.FCLabel.Location = new System.Drawing.Point(126, 44); + this.FCLabel.Name = "FCLabel"; + this.FCLabel.Text = "255, 255"; + // + // FpsPosLabel + // + this.FpsPosLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.FpsPosLabel.Location = new System.Drawing.Point(126, 20); + this.FpsPosLabel.Name = "FpsPosLabel"; + this.FpsPosLabel.Text = "255, 255"; + // + // MessagesRadio + // + this.MessagesRadio.AutoSize = true; + this.MessagesRadio.Location = new System.Drawing.Point(6, 138); + this.MessagesRadio.Name = "MessagesRadio"; + this.MessagesRadio.Size = new System.Drawing.Size(73, 17); + this.MessagesRadio.TabIndex = 4; + this.MessagesRadio.Text = "Messages"; + this.MessagesRadio.UseVisualStyleBackColor = true; + this.MessagesRadio.CheckedChanged += new System.EventHandler(this.MessageTypeRadio_CheckedChanged); + // + // InputDisplayRadio + // + this.InputDisplayRadio.AutoSize = true; + this.InputDisplayRadio.Location = new System.Drawing.Point(6, 90); + this.InputDisplayRadio.Name = "InputDisplayRadio"; + this.InputDisplayRadio.Size = new System.Drawing.Size(86, 17); + this.InputDisplayRadio.TabIndex = 3; + this.InputDisplayRadio.Text = "Input Display"; + this.InputDisplayRadio.UseVisualStyleBackColor = true; + this.InputDisplayRadio.CheckedChanged += new System.EventHandler(this.MessageTypeRadio_CheckedChanged); + // + // LagCounterRadio + // + this.LagCounterRadio.AutoSize = true; + this.LagCounterRadio.Location = new System.Drawing.Point(6, 66); + this.LagCounterRadio.Name = "LagCounterRadio"; + this.LagCounterRadio.Size = new System.Drawing.Size(83, 17); + this.LagCounterRadio.TabIndex = 2; + this.LagCounterRadio.Text = "Lag Counter"; + this.LagCounterRadio.UseVisualStyleBackColor = true; + this.LagCounterRadio.CheckedChanged += new System.EventHandler(this.MessageTypeRadio_CheckedChanged); + // + // FrameCounterRadio + // + this.FrameCounterRadio.AutoSize = true; + this.FrameCounterRadio.Location = new System.Drawing.Point(6, 42); + this.FrameCounterRadio.Name = "FrameCounterRadio"; + this.FrameCounterRadio.Size = new System.Drawing.Size(93, 17); + this.FrameCounterRadio.TabIndex = 1; + this.FrameCounterRadio.Text = "Frame counter"; + this.FrameCounterRadio.UseVisualStyleBackColor = true; + this.FrameCounterRadio.CheckedChanged += new System.EventHandler(this.MessageTypeRadio_CheckedChanged); + // + // FPSRadio + // + this.FPSRadio.AutoSize = true; + this.FPSRadio.Checked = true; + this.FPSRadio.Location = new System.Drawing.Point(6, 18); + this.FPSRadio.Name = "FPSRadio"; + this.FPSRadio.Size = new System.Drawing.Size(42, 17); + this.FPSRadio.TabIndex = 0; + this.FPSRadio.TabStop = true; + this.FPSRadio.Text = "Fps"; + this.FPSRadio.UseVisualStyleBackColor = true; + this.FPSRadio.CheckedChanged += new System.EventHandler(this.MessageTypeRadio_CheckedChanged); + // + // groupBox2 + // + this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.groupBox2.Controls.Add(this.label12); + this.groupBox2.Controls.Add(this.MovieInputText); + this.groupBox2.Controls.Add(this.label11); + this.groupBox2.Controls.Add(this.MovieInputColor); + this.groupBox2.Controls.Add(this.LInputColorPanel); + this.groupBox2.Controls.Add(this.AlertColorPanel); + this.groupBox2.Controls.Add(this.ColorPanel); + this.groupBox2.Controls.Add(this.label7); + this.groupBox2.Controls.Add(this.label8); + this.groupBox2.Controls.Add(this.LInputText); + this.groupBox2.Controls.Add(this.label6); + this.groupBox2.Controls.Add(this.label5); + this.groupBox2.Controls.Add(this.AlertColorText); + this.groupBox2.Controls.Add(this.label4); + this.groupBox2.Controls.Add(this.label3); + this.groupBox2.Controls.Add(this.ColorText); + this.groupBox2.Location = new System.Drawing.Point(12, 231); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(177, 210); + this.groupBox2.TabIndex = 4; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Message Colors"; + // + // label12 + // + this.label12.Location = new System.Drawing.Point(1, 161); + this.label12.Name = "label12"; + this.label12.Text = "Movie Input"; + // + // MovieInputText + // + this.MovieInputText.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; + this.MovieInputText.Location = new System.Drawing.Point(45, 178); + this.MovieInputText.MaxLength = 8; + this.MovieInputText.Name = "MovieInputText"; + this.MovieInputText.ReadOnly = true; + this.MovieInputText.Size = new System.Drawing.Size(59, 20); + this.MovieInputText.TabIndex = 23; + // + // label11 + // + this.label11.Location = new System.Drawing.Point(28, 181); + this.label11.Name = "label11"; + this.label11.Text = "0x"; + // + // MovieInputColor + // + this.MovieInputColor.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.MovieInputColor.Location = new System.Drawing.Point(4, 178); + this.MovieInputColor.Name = "MovieInputColor"; + this.MovieInputColor.Size = new System.Drawing.Size(20, 20); + this.MovieInputColor.TabIndex = 9; + this.MovieInputColor.Click += new System.EventHandler(this.MovieInputColor_Click); + // + // LInputColorPanel + // + this.LInputColorPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.LInputColorPanel.Location = new System.Drawing.Point(6, 130); + this.LInputColorPanel.Name = "LInputColorPanel"; + this.LInputColorPanel.Size = new System.Drawing.Size(20, 20); + this.LInputColorPanel.TabIndex = 7; + this.LInputColorPanel.Click += new System.EventHandler(this.LInputColorPanel_Click); + // + // AlertColorPanel + // + this.AlertColorPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.AlertColorPanel.Location = new System.Drawing.Point(6, 81); + this.AlertColorPanel.Name = "AlertColorPanel"; + this.AlertColorPanel.Size = new System.Drawing.Size(20, 20); + this.AlertColorPanel.TabIndex = 7; + this.AlertColorPanel.Click += new System.EventHandler(this.AlertColorPanel_Click); + // + // ColorPanel + // + this.ColorPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.ColorPanel.Location = new System.Drawing.Point(6, 34); + this.ColorPanel.Name = "ColorPanel"; + this.ColorPanel.Size = new System.Drawing.Size(20, 20); + this.ColorPanel.TabIndex = 7; + this.ColorPanel.Click += new System.EventHandler(this.ColorPanel_Click); + // + // label7 + // + this.label7.Location = new System.Drawing.Point(1, 111); + this.label7.Name = "label7"; + this.label7.Text = "Previous Frame Input"; + // + // label8 + // + this.label8.Location = new System.Drawing.Point(28, 133); + this.label8.Name = "label8"; + this.label8.Text = "0x"; + // + // LInputText + // + this.LInputText.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; + this.LInputText.Location = new System.Drawing.Point(46, 130); + this.LInputText.MaxLength = 8; + this.LInputText.Name = "LInputText"; + this.LInputText.ReadOnly = true; + this.LInputText.Size = new System.Drawing.Size(59, 20); + this.LInputText.TabIndex = 16; + // + // label6 + // + this.label6.Location = new System.Drawing.Point(1, 62); + this.label6.Name = "label6"; + this.label6.Text = "Alert messages"; + // + // label5 + // + this.label5.Location = new System.Drawing.Point(28, 84); + this.label5.Name = "label5"; + this.label5.Text = "0x"; + // + // AlertColorText + // + this.AlertColorText.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; + this.AlertColorText.Location = new System.Drawing.Point(46, 81); + this.AlertColorText.MaxLength = 8; + this.AlertColorText.Name = "AlertColorText"; + this.AlertColorText.ReadOnly = true; + this.AlertColorText.Size = new System.Drawing.Size(59, 20); + this.AlertColorText.TabIndex = 11; + // + // label4 + // + this.label4.Location = new System.Drawing.Point(6, 18); + this.label4.Name = "label4"; + this.label4.Text = "Main messages"; + // + // label3 + // + this.label3.Location = new System.Drawing.Point(28, 37); + this.label3.Name = "label3"; + this.label3.Text = "0x"; + // + // ColorText + // + this.ColorText.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; + this.ColorText.Location = new System.Drawing.Point(46, 34); + 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; + // + // MessageColorDialog + // + this.MessageColorDialog.FullOpen = true; + // + // 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(429, 418); + this.Cancel.Name = "Cancel"; + this.Cancel.Size = new System.Drawing.Size(75, 23); + this.Cancel.TabIndex = 5; + this.Cancel.Text = "&Cancel"; + this.Cancel.UseVisualStyleBackColor = true; + this.Cancel.Click += new System.EventHandler(this.Cancel_Click); + // + // 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(195, 418); + this.ResetDefaultsButton.Name = "ResetDefaultsButton"; + this.ResetDefaultsButton.Size = new System.Drawing.Size(96, 23); + this.ResetDefaultsButton.TabIndex = 6; + this.ResetDefaultsButton.Text = "Restore Defaults"; + this.ResetDefaultsButton.UseVisualStyleBackColor = true; + this.ResetDefaultsButton.Click += new System.EventHandler(this.ResetDefaultsButton_Click); + // + // PositionPanel + // + this.PositionPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.PositionPanel.Location = new System.Drawing.Point(22, 18); + this.PositionPanel.Name = "PositionPanel"; + this.PositionPanel.Size = new System.Drawing.Size(264, 248); + this.PositionPanel.TabIndex = 0; + this.PositionPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.PositionPanel_Paint); + this.PositionPanel.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PositionPanel_MouseDown); + this.PositionPanel.MouseEnter += new System.EventHandler(this.PositionPanel_MouseEnter); + this.PositionPanel.MouseLeave += new System.EventHandler(this.PositionPanel_MouseLeave); + this.PositionPanel.MouseMove += new System.Windows.Forms.MouseEventHandler(this.PositionPanel_MouseMove); + this.PositionPanel.MouseUp += new System.Windows.Forms.MouseEventHandler(this.PositionPanel_MouseUp); + // + // XNumeric + // + this.XNumeric.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.XNumeric.Location = new System.Drawing.Point(43, 271); + this.XNumeric.Maximum = new decimal(new int[] { 256, 0, 0, 0}); - this.XNumeric.Name = "XNumeric"; - this.XNumeric.Size = new System.Drawing.Size(44, 20); - this.XNumeric.TabIndex = 1; - this.XNumeric.Value = new decimal(new int[] { + this.XNumeric.Name = "XNumeric"; + this.XNumeric.Size = new System.Drawing.Size(44, 20); + this.XNumeric.TabIndex = 1; + this.XNumeric.Value = new decimal(new int[] { 255, 0, 0, 0}); - this.XNumeric.ValueChanged += new System.EventHandler(this.XNumeric_Changed); - // - // YNumeric - // - this.YNumeric.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.YNumeric.Location = new System.Drawing.Point(106, 271); - this.YNumeric.Maximum = new decimal(new int[] { + this.XNumeric.ValueChanged += new System.EventHandler(this.XNumeric_Changed); + // + // YNumeric + // + this.YNumeric.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.YNumeric.Location = new System.Drawing.Point(106, 271); + this.YNumeric.Maximum = new decimal(new int[] { 256, 0, 0, 0}); - this.YNumeric.Name = "YNumeric"; - this.YNumeric.Size = new System.Drawing.Size(44, 20); - this.YNumeric.TabIndex = 2; - this.YNumeric.Value = new decimal(new int[] { + this.YNumeric.Name = "YNumeric"; + this.YNumeric.Size = new System.Drawing.Size(44, 20); + this.YNumeric.TabIndex = 2; + this.YNumeric.Value = new decimal(new int[] { 255, 0, 0, 0}); - this.YNumeric.ValueChanged += new System.EventHandler(this.YNumeric_Changed); - // - // label1 - // - this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label1.Location = new System.Drawing.Point(27, 274); - this.label1.Name = "label1"; - this.label1.Text = "x"; - // - // label2 - // - this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label2.Location = new System.Drawing.Point(92, 273); - this.label2.Name = "label2"; - this.label2.Text = "y"; - // - // PositionGroupBox - // - this.PositionGroupBox.Controls.Add(this.BR); - this.PositionGroupBox.Controls.Add(this.BL); - this.PositionGroupBox.Controls.Add(this.TR); - this.PositionGroupBox.Controls.Add(this.TL); - this.PositionGroupBox.Controls.Add(this.label2); - this.PositionGroupBox.Controls.Add(this.label1); - this.PositionGroupBox.Controls.Add(this.YNumeric); - this.PositionGroupBox.Controls.Add(this.XNumeric); - this.PositionGroupBox.Controls.Add(this.PositionPanel); - this.PositionGroupBox.Location = new System.Drawing.Point(195, 12); - this.PositionGroupBox.Name = "PositionGroupBox"; - this.PositionGroupBox.Size = new System.Drawing.Size(307, 299); - this.PositionGroupBox.TabIndex = 3; - this.PositionGroupBox.TabStop = false; - this.PositionGroupBox.Text = "Position"; - // - // BR - // - this.BR.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.BR.AutoSize = true; - this.BR.Location = new System.Drawing.Point(289, 253); - this.BR.Name = "BR"; - this.BR.Size = new System.Drawing.Size(14, 13); - this.BR.TabIndex = 8; - this.BR.TabStop = true; - this.BR.UseVisualStyleBackColor = true; - this.BR.Click += new System.EventHandler(this.BR_CheckedChanged); - // - // BL - // - this.BL.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.BL.AutoSize = true; - this.BL.Location = new System.Drawing.Point(6, 253); - this.BL.Name = "BL"; - this.BL.Size = new System.Drawing.Size(14, 13); - this.BL.TabIndex = 7; - this.BL.TabStop = true; - this.BL.UseVisualStyleBackColor = true; - this.BL.Click += new System.EventHandler(this.BL_CheckedChanged); - // - // TR - // - this.TR.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.TR.AutoSize = true; - this.TR.Location = new System.Drawing.Point(288, 18); - this.TR.Name = "TR"; - this.TR.Size = new System.Drawing.Size(14, 13); - this.TR.TabIndex = 6; - this.TR.TabStop = true; - this.TR.UseVisualStyleBackColor = true; - this.TR.Click += new System.EventHandler(this.TR_CheckedChanged); - // - // TL - // - this.TL.AutoSize = true; - this.TL.Location = new System.Drawing.Point(6, 18); - this.TL.Name = "TL"; - this.TL.Size = new System.Drawing.Size(14, 13); - this.TL.TabIndex = 5; - this.TL.TabStop = true; - this.TL.UseVisualStyleBackColor = true; - this.TL.Click += new System.EventHandler(this.TL_CheckedChanged); - // - // AlertColorDialog - // - this.AlertColorDialog.FullOpen = true; - // - // LInputColorDialog - // - this.LInputColorDialog.FullOpen = true; - // - // MovieInputColorDialog - // - this.MovieInputColorDialog.FullOpen = true; - // - // StackMessagesCheckbox - // - this.StackMessagesCheckbox.AutoSize = true; - this.StackMessagesCheckbox.Location = new System.Drawing.Point(195, 411); - this.StackMessagesCheckbox.Name = "StackMessagesCheckbox"; - this.StackMessagesCheckbox.Size = new System.Drawing.Size(105, 17); - this.StackMessagesCheckbox.TabIndex = 7; - this.StackMessagesCheckbox.Text = "Stack Messages"; - this.StackMessagesCheckbox.UseVisualStyleBackColor = true; - // - // WatchesRadio - // - this.WatchesRadio.AutoSize = true; - this.WatchesRadio.Location = new System.Drawing.Point(6, 114); - this.WatchesRadio.Name = "WatchesRadio"; - this.WatchesRadio.Size = new System.Drawing.Size(68, 17); - this.WatchesRadio.TabIndex = 16; - this.WatchesRadio.Text = "Watches"; - this.WatchesRadio.UseVisualStyleBackColor = true; - // - // WatchesLabel - // - this.WatchesLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.WatchesLabel.Location = new System.Drawing.Point(126, 116); - this.WatchesLabel.Name = "WatchesLabel"; - this.WatchesLabel.Text = "255, 255"; - // - // MessageConfig - // - this.AcceptButton = this.OK; - 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(512, 469); - this.Controls.Add(this.StackMessagesCheckbox); - this.Controls.Add(this.ResetDefaultsButton); - this.Controls.Add(this.Cancel); - this.Controls.Add(this.groupBox2); - this.Controls.Add(this.PositionGroupBox); - this.Controls.Add(this.MessageTypeBox); - this.Controls.Add(this.OK); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow; - this.MinimumSize = new System.Drawing.Size(404, 375); - this.Name = "MessageConfig"; - this.ShowIcon = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Configure On Screen Messages"; - this.Load += new System.EventHandler(this.MessageConfig_Load); - this.MessageTypeBox.ResumeLayout(false); - this.MessageTypeBox.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.XNumeric)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.YNumeric)).EndInit(); - this.PositionGroupBox.ResumeLayout(false); - this.PositionGroupBox.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.YNumeric.ValueChanged += new System.EventHandler(this.YNumeric_Changed); + // + // label1 + // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label1.Location = new System.Drawing.Point(27, 274); + this.label1.Name = "label1"; + this.label1.Text = "x"; + // + // label2 + // + this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label2.Location = new System.Drawing.Point(92, 273); + this.label2.Name = "label2"; + this.label2.Text = "y"; + // + // PositionGroupBox + // + this.PositionGroupBox.Controls.Add(this.BR); + this.PositionGroupBox.Controls.Add(this.BL); + this.PositionGroupBox.Controls.Add(this.TR); + this.PositionGroupBox.Controls.Add(this.TL); + this.PositionGroupBox.Controls.Add(this.label2); + this.PositionGroupBox.Controls.Add(this.label1); + this.PositionGroupBox.Controls.Add(this.YNumeric); + this.PositionGroupBox.Controls.Add(this.XNumeric); + this.PositionGroupBox.Controls.Add(this.PositionPanel); + this.PositionGroupBox.Location = new System.Drawing.Point(195, 12); + this.PositionGroupBox.Name = "PositionGroupBox"; + this.PositionGroupBox.Size = new System.Drawing.Size(307, 299); + this.PositionGroupBox.TabIndex = 3; + this.PositionGroupBox.TabStop = false; + this.PositionGroupBox.Text = "Position"; + // + // BR + // + this.BR.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.BR.AutoSize = true; + this.BR.Location = new System.Drawing.Point(289, 253); + this.BR.Name = "BR"; + this.BR.Size = new System.Drawing.Size(14, 13); + this.BR.TabIndex = 8; + this.BR.TabStop = true; + this.BR.UseVisualStyleBackColor = true; + this.BR.Click += new System.EventHandler(this.BR_CheckedChanged); + // + // BL + // + this.BL.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.BL.AutoSize = true; + this.BL.Location = new System.Drawing.Point(6, 253); + this.BL.Name = "BL"; + this.BL.Size = new System.Drawing.Size(14, 13); + this.BL.TabIndex = 7; + this.BL.TabStop = true; + this.BL.UseVisualStyleBackColor = true; + this.BL.Click += new System.EventHandler(this.BL_CheckedChanged); + // + // TR + // + this.TR.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.TR.AutoSize = true; + this.TR.Location = new System.Drawing.Point(288, 18); + this.TR.Name = "TR"; + this.TR.Size = new System.Drawing.Size(14, 13); + this.TR.TabIndex = 6; + this.TR.TabStop = true; + this.TR.UseVisualStyleBackColor = true; + this.TR.Click += new System.EventHandler(this.TR_CheckedChanged); + // + // TL + // + this.TL.AutoSize = true; + this.TL.Location = new System.Drawing.Point(6, 18); + this.TL.Name = "TL"; + this.TL.Size = new System.Drawing.Size(14, 13); + this.TL.TabIndex = 5; + this.TL.TabStop = true; + this.TL.UseVisualStyleBackColor = true; + this.TL.Click += new System.EventHandler(this.TL_CheckedChanged); + // + // AlertColorDialog + // + this.AlertColorDialog.FullOpen = true; + // + // LInputColorDialog + // + this.LInputColorDialog.FullOpen = true; + // + // MovieInputColorDialog + // + this.MovieInputColorDialog.FullOpen = true; + // + // StackMessagesCheckbox + // + this.StackMessagesCheckbox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.StackMessagesCheckbox.AutoSize = true; + this.StackMessagesCheckbox.Location = new System.Drawing.Point(195, 388); + this.StackMessagesCheckbox.Name = "StackMessagesCheckbox"; + this.StackMessagesCheckbox.Size = new System.Drawing.Size(105, 17); + this.StackMessagesCheckbox.TabIndex = 7; + this.StackMessagesCheckbox.Text = "Stack Messages"; + this.StackMessagesCheckbox.UseVisualStyleBackColor = true; + // + // MessageConfig + // + this.AcceptButton = this.OK; + 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(512, 446); + this.Controls.Add(this.StackMessagesCheckbox); + this.Controls.Add(this.ResetDefaultsButton); + this.Controls.Add(this.Cancel); + this.Controls.Add(this.groupBox2); + this.Controls.Add(this.PositionGroupBox); + this.Controls.Add(this.MessageTypeBox); + this.Controls.Add(this.OK); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow; + this.MinimumSize = new System.Drawing.Size(404, 375); + this.Name = "MessageConfig"; + this.ShowIcon = false; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Configure On Screen Messages"; + this.Load += new System.EventHandler(this.MessageConfig_Load); + this.MessageTypeBox.ResumeLayout(false); + this.MessageTypeBox.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.XNumeric)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.YNumeric)).EndInit(); + this.PositionGroupBox.ResumeLayout(false); + this.PositionGroupBox.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -704,8 +683,6 @@ private System.Windows.Forms.Panel MovieInputColor; private BizHawk.WinForms.Controls.LocLabelEx label12; private System.Windows.Forms.ColorDialog MovieInputColorDialog; - private BizHawk.WinForms.Controls.LocLabelEx MultitrackLabel; - private System.Windows.Forms.RadioButton MultitrackRadio; private System.Windows.Forms.CheckBox StackMessagesCheckbox; private BizHawk.WinForms.Controls.LocLabelEx AutoholdLabel; private System.Windows.Forms.RadioButton AutoholdRadio; diff --git a/src/BizHawk.Client.EmuHawk/config/MessageConfig.cs b/src/BizHawk.Client.EmuHawk/config/MessageConfig.cs index 3f74affeaa..69c16df6e8 100644 --- a/src/BizHawk.Client.EmuHawk/config/MessageConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/MessageConfig.cs @@ -16,7 +16,6 @@ namespace BizHawk.Client.EmuHawk private MessagePosition _lagCounter; private MessagePosition _inputDisplay; private MessagePosition _reRecordCounter; - private MessagePosition _multitrackRecorder; private MessagePosition _messages; private MessagePosition _autohold; private MessagePosition _ramWatches; @@ -40,7 +39,6 @@ namespace BizHawk.Client.EmuHawk _lagCounter = _config.LagCounter.Clone(); _inputDisplay = _config.InputDisplay.Clone(); _reRecordCounter = _config.ReRecordCounter.Clone(); - _multitrackRecorder = _config.MultitrackRecorder.Clone(); _messages = _config.Messages.Clone(); _autohold = _config.Autohold.Clone(); _ramWatches = _config.RamWatches.Clone(); @@ -154,10 +152,6 @@ namespace BizHawk.Client.EmuHawk { SetFromOption(_reRecordCounter); } - else if (MultitrackRadio.Checked) - { - SetFromOption(_multitrackRecorder); - } else if (AutoholdRadio.Checked) { SetFromOption(_autohold); @@ -176,7 +170,6 @@ namespace BizHawk.Client.EmuHawk _config.LagCounter = _lagCounter; _config.InputDisplay = _inputDisplay; _config.ReRecordCounter = _reRecordCounter; - _config.MultitrackRecorder = _multitrackRecorder; _config.Messages = _messages; _config.Autohold = _autohold; _config.RamWatches = _ramWatches; @@ -333,10 +326,6 @@ namespace BizHawk.Client.EmuHawk { SetOptionPosition(_reRecordCounter); } - else if (MultitrackRadio.Checked) - { - SetOptionPosition(_multitrackRecorder); - } else if (MessagesRadio.Checked) { SetOptionPosition(_messages); @@ -352,7 +341,6 @@ namespace BizHawk.Client.EmuHawk InpLabel.Text = ToCoordinateStr(_inputDisplay); WatchesLabel.Text = ToCoordinateStr(_ramWatches); RerecLabel.Text = ToCoordinateStr(_reRecordCounter); - MultitrackLabel.Text = ToCoordinateStr(_multitrackRecorder); MessLabel.Text = ToCoordinateStr(_messages); AutoholdLabel.Text = ToCoordinateStr(_autohold); } @@ -369,7 +357,6 @@ namespace BizHawk.Client.EmuHawk _lagCounter = _config.LagCounter = DefaultMessagePositions.LagCounter.Clone(); _inputDisplay = _config.InputDisplay = DefaultMessagePositions.InputDisplay.Clone(); _reRecordCounter = _config.ReRecordCounter = DefaultMessagePositions.ReRecordCounter.Clone(); - _multitrackRecorder = _config.MultitrackRecorder = DefaultMessagePositions.MultitrackRecorder.Clone(); _messages = _config.Messages = DefaultMessagePositions.Messages.Clone(); _autohold = _config.Autohold = DefaultMessagePositions.Autohold.Clone(); _ramWatches = _config.RamWatches = DefaultMessagePositions.RamWatches.Clone(); @@ -421,10 +408,6 @@ namespace BizHawk.Client.EmuHawk { _reRecordCounter.Anchor = value; } - else if (MultitrackRadio.Checked) - { - _multitrackRecorder.Anchor = value; - } else if (AutoholdRadio.Checked) { _autohold.Anchor = value;