diff --git a/src/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.Designer.cs b/src/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.Designer.cs index f95e6f3d62..8f17a4eba3 100644 --- a/src/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.Designer.cs @@ -28,24 +28,21 @@ /// private void InitializeComponent() { - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.listBox1 = new System.Windows.Forms.ListBox(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); this.textBox1 = new System.Windows.Forms.TextBox(); this.button1 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button(); - this.label5 = new System.Windows.Forms.Label(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); this.SuspendLayout(); // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(5, 5); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(47, 13); - this.label1.TabIndex = 0; this.label1.Text = "Formats:"; // // listBox1 @@ -63,31 +60,22 @@ // label2 // this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(7, 189); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(63, 13); - this.label2.TabIndex = 2; this.label2.Text = "Description:"; // // label3 // this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(6, 206); this.label3.MaximumSize = new System.Drawing.Size(260, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(0, 13); - this.label3.TabIndex = 3; // // label4 // this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(10, 268); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(57, 13); - this.label4.TabIndex = 4; this.label4.Text = "Command:"; // // textBox1 @@ -124,11 +112,8 @@ // label5 // this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(159, 189); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(56, 13); - this.label5.TabIndex = 8; this.label5.Text = "Extension:"; // // FFmpegWriterForm @@ -159,14 +144,14 @@ #endregion - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.ListBox listBox1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label4; + private BizHawk.WinForms.Controls.LocLabelEx label2; + private BizHawk.WinForms.Controls.LocLabelEx label3; + private BizHawk.WinForms.Controls.LocLabelEx label4; private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.Button button1; private System.Windows.Forms.Button button2; - private System.Windows.Forms.Label label5; + private BizHawk.WinForms.Controls.LocLabelEx label5; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.Designer.cs b/src/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.Designer.cs index 75db8afdad..ef3bf9ba29 100644 --- a/src/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.Designer.cs @@ -31,10 +31,10 @@ this.button1 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button(); this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.numericUpDown2 = new System.Windows.Forms.NumericUpDown(); - this.label3 = new System.Windows.Forms.Label(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit(); this.SuspendLayout(); @@ -75,20 +75,14 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 9); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(232, 13); - this.label1.TabIndex = 3; this.label1.Text = "Number of frames to skip for each frame written:"; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(12, 48); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(67, 13); - this.label2.TabIndex = 4; this.label2.Text = "Frame delay:"; // // numericUpDown2 @@ -106,11 +100,8 @@ // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(118, 66); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(35, 13); - this.label3.TabIndex = 6; this.label3.Text = "label3"; // // GifWriterForm @@ -143,9 +134,9 @@ private System.Windows.Forms.Button button1; private System.Windows.Forms.Button button2; private System.Windows.Forms.NumericUpDown numericUpDown1; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label2; private System.Windows.Forms.NumericUpDown numericUpDown2; - private System.Windows.Forms.Label label3; + private BizHawk.WinForms.Controls.LocLabelEx label3; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/AVOut/JMDForm.Designer.cs b/src/BizHawk.Client.EmuHawk/AVOut/JMDForm.Designer.cs index 07638aefd8..8858ac9488 100644 --- a/src/BizHawk.Client.EmuHawk/AVOut/JMDForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/AVOut/JMDForm.Designer.cs @@ -31,12 +31,12 @@ this.okButton = new System.Windows.Forms.Button(); this.threadsBar = new System.Windows.Forms.TrackBar(); this.compressionBar = new System.Windows.Forms.TrackBar(); - this.threadLeft = new System.Windows.Forms.Label(); - this.threadRight = new System.Windows.Forms.Label(); - this.compressionLeft = new System.Windows.Forms.Label(); - this.compressionRight = new System.Windows.Forms.Label(); - this.threadTop = new System.Windows.Forms.Label(); - this.compressionTop = new System.Windows.Forms.Label(); + this.threadLeft = new BizHawk.WinForms.Controls.LocLabelEx(); + this.threadRight = new BizHawk.WinForms.Controls.LocLabelEx(); + this.compressionLeft = new BizHawk.WinForms.Controls.LocLabelEx(); + this.compressionRight = new BizHawk.WinForms.Controls.LocLabelEx(); + this.threadTop = new BizHawk.WinForms.Controls.LocLabelEx(); + this.compressionTop = new BizHawk.WinForms.Controls.LocLabelEx(); this.cancelButton = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.threadsBar)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.compressionBar)).BeginInit(); @@ -71,57 +71,39 @@ // // threadLeft // - this.threadLeft.AutoSize = true; this.threadLeft.Location = new System.Drawing.Point(15, 25); this.threadLeft.Name = "threadLeft"; - this.threadLeft.Size = new System.Drawing.Size(35, 13); - this.threadLeft.TabIndex = 2; this.threadLeft.Text = "label1"; // // threadRight // - this.threadRight.AutoSize = true; this.threadRight.Location = new System.Drawing.Point(166, 25); this.threadRight.Name = "threadRight"; - this.threadRight.Size = new System.Drawing.Size(35, 13); - this.threadRight.TabIndex = 4; this.threadRight.Text = "label2"; // // compressionLeft // - this.compressionLeft.AutoSize = true; this.compressionLeft.Location = new System.Drawing.Point(15, 96); this.compressionLeft.Name = "compressionLeft"; - this.compressionLeft.Size = new System.Drawing.Size(35, 13); - this.compressionLeft.TabIndex = 6; this.compressionLeft.Text = "label3"; // // compressionRight // - this.compressionRight.AutoSize = true; this.compressionRight.Location = new System.Drawing.Point(166, 96); this.compressionRight.Name = "compressionRight"; - this.compressionRight.Size = new System.Drawing.Size(35, 13); - this.compressionRight.TabIndex = 8; this.compressionRight.Text = "label4"; // // threadTop // - this.threadTop.AutoSize = true; this.threadTop.Location = new System.Drawing.Point(62, 9); this.threadTop.Name = "threadTop"; - this.threadTop.Size = new System.Drawing.Size(98, 13); - this.threadTop.TabIndex = 3; this.threadTop.Text = "Number of Threads"; this.threadTop.TextAlign = System.Drawing.ContentAlignment.TopCenter; // // compressionTop // - this.compressionTop.AutoSize = true; this.compressionTop.Location = new System.Drawing.Point(64, 70); this.compressionTop.Name = "compressionTop"; - this.compressionTop.Size = new System.Drawing.Size(96, 13); - this.compressionTop.TabIndex = 7; this.compressionTop.Text = "Compression Level"; this.compressionTop.TextAlign = System.Drawing.ContentAlignment.TopCenter; // @@ -169,12 +151,12 @@ private System.Windows.Forms.Button okButton; private System.Windows.Forms.TrackBar threadsBar; private System.Windows.Forms.TrackBar compressionBar; - private System.Windows.Forms.Label threadLeft; - private System.Windows.Forms.Label threadRight; - private System.Windows.Forms.Label compressionLeft; - private System.Windows.Forms.Label compressionRight; - private System.Windows.Forms.Label threadTop; - private System.Windows.Forms.Label compressionTop; + private BizHawk.WinForms.Controls.LocLabelEx threadLeft; + private BizHawk.WinForms.Controls.LocLabelEx threadRight; + private BizHawk.WinForms.Controls.LocLabelEx compressionLeft; + private BizHawk.WinForms.Controls.LocLabelEx compressionRight; + private BizHawk.WinForms.Controls.LocLabelEx threadTop; + private BizHawk.WinForms.Controls.LocLabelEx compressionTop; private System.Windows.Forms.Button cancelButton; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.Designer.cs b/src/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.Designer.cs index d2fab5f7f1..5abecdcca8 100644 --- a/src/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.Designer.cs @@ -34,19 +34,19 @@ this.buttonOK = new System.Windows.Forms.Button(); this.buttonCancel = new System.Windows.Forms.Button(); this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); - this.labelDescription = new System.Windows.Forms.Label(); - this.labelDescriptionBody = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); + this.labelDescription = new BizHawk.WinForms.Controls.LocLabelEx(); + this.labelDescriptionBody = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); this.buttonAuto = new System.Windows.Forms.Button(); this.panelSizeSelect = new System.Windows.Forms.Panel(); - this.lblSize = new System.Windows.Forms.Label(); + this.lblSize = new BizHawk.WinForms.Controls.LocLabelEx(); this.numericTextBoxW = new BizHawk.Client.EmuHawk.NumericTextBox(); this.numericTextBoxH = new BizHawk.Client.EmuHawk.NumericTextBox(); this.checkBoxPad = new System.Windows.Forms.CheckBox(); this.checkBoxASync = new System.Windows.Forms.CheckBox(); this.panel1 = new System.Windows.Forms.Panel(); - this.lblResolutionWarning = new System.Windows.Forms.Label(); + this.lblResolutionWarning = new BizHawk.WinForms.Controls.LocLabelEx(); this.tableLayoutPanel4.SuspendLayout(); this.panelSizeSelect.SuspendLayout(); this.panel1.SuspendLayout(); @@ -116,13 +116,10 @@ // // labelDescription // - this.labelDescription.AutoSize = true; this.labelDescription.Dock = System.Windows.Forms.DockStyle.Fill; this.labelDescription.Location = new System.Drawing.Point(5, 2); this.labelDescription.Name = "labelDescription"; this.labelDescription.Padding = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.labelDescription.Size = new System.Drawing.Size(319, 19); - this.labelDescription.TabIndex = 3; this.labelDescription.Text = "Description:"; // // labelDescriptionBody @@ -131,26 +128,18 @@ this.labelDescriptionBody.Location = new System.Drawing.Point(5, 23); this.labelDescriptionBody.Name = "labelDescriptionBody"; this.labelDescriptionBody.Padding = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.labelDescriptionBody.Size = new System.Drawing.Size(319, 183); - this.labelDescriptionBody.TabIndex = 6; this.labelDescriptionBody.Text = resources.GetString("labelDescriptionBody.Text"); // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(74, 23); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(14, 13); - this.label3.TabIndex = 12; this.label3.Text = "X"; // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(3, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(42, 13); - this.label4.TabIndex = 13; this.label4.Text = "Resize:"; // // buttonAuto @@ -182,8 +171,6 @@ this.lblSize.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.lblSize.Location = new System.Drawing.Point(3, 42); this.lblSize.Name = "lblSize"; - this.lblSize.Size = new System.Drawing.Size(80, 34); - this.lblSize.TabIndex = 16; this.lblSize.Text = "Size:\r\nTestxTest"; // // numericTextBoxW @@ -239,8 +226,6 @@ this.lblResolutionWarning.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblResolutionWarning.Location = new System.Drawing.Point(4, 4); this.lblResolutionWarning.Name = "lblResolutionWarning"; - this.lblResolutionWarning.Size = new System.Drawing.Size(155, 98); - this.lblResolutionWarning.TabIndex = 0; this.lblResolutionWarning.Text = "Resolution is not a multiple of 4! Odd or non-x4 resolutions breaks many codecs. " + "Check your output carefully and adjust the window size or codec settings if need" + "ed."; @@ -285,18 +270,18 @@ private System.Windows.Forms.Button buttonOK; private System.Windows.Forms.Button buttonCancel; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4; - private System.Windows.Forms.Label labelDescription; - private System.Windows.Forms.Label labelDescriptionBody; + private BizHawk.WinForms.Controls.LocLabelEx labelDescription; + private BizHawk.WinForms.Controls.LocLabelEx labelDescriptionBody; private NumericTextBox numericTextBoxW; private NumericTextBox numericTextBoxH; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label4; + private BizHawk.WinForms.Controls.LocLabelEx label3; + private BizHawk.WinForms.Controls.LocLabelEx label4; private System.Windows.Forms.Button buttonAuto; private System.Windows.Forms.Panel panelSizeSelect; private System.Windows.Forms.CheckBox checkBoxPad; private System.Windows.Forms.CheckBox checkBoxASync; - private System.Windows.Forms.Label lblSize; + private BizHawk.WinForms.Controls.LocLabelEx lblSize; private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Label lblResolutionWarning; + private BizHawk.WinForms.Controls.LocLabelEx lblResolutionWarning; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/BizBox.Designer.cs b/src/BizHawk.Client.EmuHawk/BizBox.Designer.cs index 10b721e229..2a67401dac 100644 --- a/src/BizHawk.Client.EmuHawk/BizBox.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/BizBox.Designer.cs @@ -31,15 +31,15 @@ this.OK = new System.Windows.Forms.Button(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.linkLabel1 = new System.Windows.Forms.LinkLabel(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); this.CoreInfoPanel = new System.Windows.Forms.Panel(); - this.VersionLabel = new System.Windows.Forms.Label(); + this.VersionLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.btnCopyHash = new System.Windows.Forms.Button(); this.linkLabel2 = new System.Windows.Forms.LinkLabel(); this.linkLabel3 = new System.Windows.Forms.LinkLabel(); - this.DateLabel = new System.Windows.Forms.Label(); - this.DeveloperBuildLabel = new System.Windows.Forms.Label(); + this.DateLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.DeveloperBuildLabel = new BizHawk.WinForms.Controls.LocLabelEx(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -78,22 +78,16 @@ // // label3 // - this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label3.Location = new System.Drawing.Point(197, 10); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(78, 20); - this.label3.TabIndex = 5; this.label3.Text = "BizHawk"; // // label4 // - this.label4.AutoSize = true; this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label4.Location = new System.Drawing.Point(207, 31); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(168, 32); - this.label4.TabIndex = 6; this.label4.Text = "\"A multi-platform emulator...\r\nfor productive people.\""; // // CoreInfoPanel @@ -110,11 +104,8 @@ // // VersionLabel // - this.VersionLabel.AutoSize = true; this.VersionLabel.Location = new System.Drawing.Point(198, 75); this.VersionLabel.Name = "VersionLabel"; - this.VersionLabel.Size = new System.Drawing.Size(108, 13); - this.VersionLabel.TabIndex = 7; this.VersionLabel.Text = "versioninfo goes here"; // // btnCopyHash @@ -154,21 +145,15 @@ // // DateLabel // - this.DateLabel.AutoSize = true; this.DateLabel.Location = new System.Drawing.Point(198, 91); this.DateLabel.Name = "DateLabel"; - this.DateLabel.Size = new System.Drawing.Size(104, 13); - this.DateLabel.TabIndex = 21; this.DateLabel.Text = "timestamp goes here"; // // DeveloperBuildLabel // - this.DeveloperBuildLabel.AutoSize = true; this.DeveloperBuildLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 24F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.DeveloperBuildLabel.Location = new System.Drawing.Point(194, 137); this.DeveloperBuildLabel.Name = "DeveloperBuildLabel"; - this.DeveloperBuildLabel.Size = new System.Drawing.Size(240, 37); - this.DeveloperBuildLabel.TabIndex = 22; this.DeveloperBuildLabel.Text = "Developer Build"; // // BizBox @@ -206,15 +191,15 @@ private System.Windows.Forms.Button OK; private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.LinkLabel linkLabel1; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label4; + private BizHawk.WinForms.Controls.LocLabelEx label3; + private BizHawk.WinForms.Controls.LocLabelEx label4; private System.Windows.Forms.Panel CoreInfoPanel; //private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.Label VersionLabel; + private BizHawk.WinForms.Controls.LocLabelEx VersionLabel; private System.Windows.Forms.Button btnCopyHash; private System.Windows.Forms.LinkLabel linkLabel2; private System.Windows.Forms.LinkLabel linkLabel3; - private System.Windows.Forms.Label DateLabel; - private System.Windows.Forms.Label DeveloperBuildLabel; + private BizHawk.WinForms.Controls.LocLabelEx DateLabel; + private BizHawk.WinForms.Controls.LocLabelEx DeveloperBuildLabel; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/BizBoxInfoControl.Designer.cs b/src/BizHawk.Client.EmuHawk/BizBoxInfoControl.Designer.cs index 12bb76abd7..965f3ed6cf 100644 --- a/src/BizHawk.Client.EmuHawk/BizBoxInfoControl.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/BizBoxInfoControl.Designer.cs @@ -28,45 +28,36 @@ /// private void InitializeComponent() { - this.CoreNameLabel = new System.Windows.Forms.Label(); - this.CoreAuthorLabel = new System.Windows.Forms.Label(); - this.CorePortedLabel = new System.Windows.Forms.Label(); + this.CoreNameLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.CoreAuthorLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.CorePortedLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.CoreUrlLink = new System.Windows.Forms.LinkLabel(); this.SuspendLayout(); // // CoreNameLabel // - this.CoreNameLabel.AutoSize = true; this.CoreNameLabel.Dock = System.Windows.Forms.DockStyle.Left; this.CoreNameLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.CoreNameLabel.Location = new System.Drawing.Point(0, 0); this.CoreNameLabel.MinimumSize = new System.Drawing.Size(100, 23); this.CoreNameLabel.Name = "CoreNameLabel"; this.CoreNameLabel.Padding = new System.Windows.Forms.Padding(0, 5, 0, 0); - this.CoreNameLabel.Size = new System.Drawing.Size(100, 23); - this.CoreNameLabel.TabIndex = 0; this.CoreNameLabel.Text = "label1"; // // CoreAuthorLabel // - this.CoreAuthorLabel.AutoSize = true; this.CoreAuthorLabel.Dock = System.Windows.Forms.DockStyle.Left; this.CoreAuthorLabel.Location = new System.Drawing.Point(100, 0); this.CoreAuthorLabel.Name = "CoreAuthorLabel"; this.CoreAuthorLabel.Padding = new System.Windows.Forms.Padding(5, 5, 0, 0); - this.CoreAuthorLabel.Size = new System.Drawing.Size(40, 18); - this.CoreAuthorLabel.TabIndex = 1; this.CoreAuthorLabel.Text = "label2"; // // CorePortedLabel // - this.CorePortedLabel.AutoSize = true; this.CorePortedLabel.Dock = System.Windows.Forms.DockStyle.Left; this.CorePortedLabel.Location = new System.Drawing.Point(140, 0); this.CorePortedLabel.Name = "CorePortedLabel"; this.CorePortedLabel.Padding = new System.Windows.Forms.Padding(5, 5, 0, 0); - this.CorePortedLabel.Size = new System.Drawing.Size(40, 18); - this.CorePortedLabel.TabIndex = 2; this.CorePortedLabel.Text = "label3"; // // CoreUrlLink @@ -99,9 +90,9 @@ #endregion - private System.Windows.Forms.Label CoreNameLabel; - private System.Windows.Forms.Label CoreAuthorLabel; - private System.Windows.Forms.Label CorePortedLabel; + private BizHawk.WinForms.Controls.LocLabelEx CoreNameLabel; + private BizHawk.WinForms.Controls.LocLabelEx CoreAuthorLabel; + private BizHawk.WinForms.Controls.LocLabelEx CorePortedLabel; private System.Windows.Forms.LinkLabel CoreUrlLink; } } diff --git a/src/BizHawk.Client.EmuHawk/CustomControls/MsgBox.cs b/src/BizHawk.Client.EmuHawk/CustomControls/MsgBox.cs index f20f81feba..2863a39c30 100644 --- a/src/BizHawk.Client.EmuHawk/CustomControls/MsgBox.cs +++ b/src/BizHawk.Client.EmuHawk/CustomControls/MsgBox.cs @@ -51,7 +51,6 @@ namespace BizHawk.Client.EmuHawk.CustomControls public void SetMessageToAutoSize() { - messageLbl.AutoSize = true; messageLbl.MaximumSize = new Size(MaximumSize.Width - _msgIcon.Width - UIHelper.ScaleX(25), MaximumSize.Height); } diff --git a/src/BizHawk.Client.EmuHawk/CustomControls/MsgBox.designer.cs b/src/BizHawk.Client.EmuHawk/CustomControls/MsgBox.designer.cs index 978a2718f7..37280a8211 100644 --- a/src/BizHawk.Client.EmuHawk/CustomControls/MsgBox.designer.cs +++ b/src/BizHawk.Client.EmuHawk/CustomControls/MsgBox.designer.cs @@ -31,7 +31,7 @@ this.chkBx = new System.Windows.Forms.CheckBox(); this.btn1 = new System.Windows.Forms.Button(); this.btn2 = new System.Windows.Forms.Button(); - this.messageLbl = new System.Windows.Forms.Label(); + this.messageLbl = new BizHawk.WinForms.Controls.LocLabelEx(); this.btn3 = new System.Windows.Forms.Button(); this.SuspendLayout(); // @@ -77,12 +77,9 @@ // // messageLbl // - this.messageLbl.AutoSize = true; this.messageLbl.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.messageLbl.Location = new System.Drawing.Point(58, 10); this.messageLbl.Name = "messageLbl"; - this.messageLbl.Size = new System.Drawing.Size(73, 16); - this.messageLbl.TabIndex = 19; this.messageLbl.Text = "[Message]"; // // btn3 @@ -126,7 +123,7 @@ private System.Windows.Forms.CheckBox chkBx; private System.Windows.Forms.Button btn1; private System.Windows.Forms.Button btn2; - private System.Windows.Forms.Label messageLbl; + private BizHawk.WinForms.Controls.LocLabelEx messageLbl; private System.Windows.Forms.Button btn3; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/OpenAdvancedChooser.Designer.cs b/src/BizHawk.Client.EmuHawk/OpenAdvancedChooser.Designer.cs index 360c49fcd4..341208c6a0 100644 --- a/src/BizHawk.Client.EmuHawk/OpenAdvancedChooser.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/OpenAdvancedChooser.Designer.cs @@ -1,35 +1,35 @@ -namespace BizHawk.Client.EmuHawk -{ - partial class OpenAdvancedChooser - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.label3 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); +namespace BizHawk.Client.EmuHawk +{ + partial class OpenAdvancedChooser + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.btnLibretroLaunchNoGame = new System.Windows.Forms.Button(); this.btnCancel = new System.Windows.Forms.Button(); this.groupBox2 = new System.Windows.Forms.GroupBox(); @@ -39,7 +39,7 @@ this.groupBox3 = new System.Windows.Forms.GroupBox(); this.btnClassicLaunchGame = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.btnMAMELaunchGame = new System.Windows.Forms.Button(); this.groupBox2.SuspendLayout(); this.groupBox3.SuspendLayout(); @@ -50,18 +50,13 @@ // this.label3.Location = new System.Drawing.Point(6, 25); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(198, 45); - this.label3.TabIndex = 5; this.label3.Text = "Load a ROM with the classic BizHawk autodetection method. But why not just use Op" + "en Rom?"; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(6, 26); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(69, 13); - this.label2.TabIndex = 3; this.label2.Text = "Current Core:"; // // btnLibretroLaunchNoGame @@ -169,8 +164,6 @@ // this.label1.Location = new System.Drawing.Point(6, 25); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(204, 42); - this.label1.TabIndex = 1; this.label1.Text = "Load .zip archive as MAME Arcade ROM (do not unzip)"; this.label1.Click += new System.EventHandler(this.btnMAMELaunchGame_Click); // @@ -206,22 +199,22 @@ this.groupBox1.ResumeLayout(false); this.ResumeLayout(false); - } - - #endregion - - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Button btnLibretroLaunchNoGame; - private System.Windows.Forms.Button btnCancel; - private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.Button btnSetLibretroCore; - private System.Windows.Forms.TextBox txtLibretroCore; - private System.Windows.Forms.Button btnLibretroLaunchGame; - private System.Windows.Forms.GroupBox groupBox3; + } + + #endregion + + private BizHawk.WinForms.Controls.LocLabelEx label3; + private BizHawk.WinForms.Controls.LocLabelEx label2; + private System.Windows.Forms.Button btnLibretroLaunchNoGame; + private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.Button btnSetLibretroCore; + private System.Windows.Forms.TextBox txtLibretroCore; + private System.Windows.Forms.Button btnLibretroLaunchGame; + private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Button btnClassicLaunchGame; private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.Button btnMAMELaunchGame; - } + } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/PlatformChooser.Designer.cs b/src/BizHawk.Client.EmuHawk/PlatformChooser.Designer.cs index 85dceca61f..51ecf64521 100644 --- a/src/BizHawk.Client.EmuHawk/PlatformChooser.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/PlatformChooser.Designer.cs @@ -32,15 +32,15 @@ this.OkBtn = new System.Windows.Forms.Button(); this.CancelBtn = new System.Windows.Forms.Button(); this.PlatformsGroupBox = new System.Windows.Forms.Panel(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.ExtensionLabel = new System.Windows.Forms.Label(); - this.RomSizeLabel = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.ExtensionLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.RomSizeLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label6 = new BizHawk.WinForms.Controls.LocLabelEx(); this.AlwaysCheckbox = new System.Windows.Forms.CheckBox(); - this.label4 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); this.HashBox = new System.Windows.Forms.TextBox(); this.SuspendLayout(); // @@ -96,60 +96,42 @@ // label1 // this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(288, 50); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(67, 13); - this.label1.TabIndex = 7; this.label1.Text = "Rom Details:"; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(12, 50); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(270, 13); - this.label2.TabIndex = 8; this.label2.Text = "Please choose the intended platform to use for this Rom"; // // label3 // this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(288, 74); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(56, 13); - this.label3.TabIndex = 9; this.label3.Text = "Extension:"; // // ExtensionLabel // this.ExtensionLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.ExtensionLabel.AutoSize = true; this.ExtensionLabel.Location = new System.Drawing.Point(288, 89); this.ExtensionLabel.Name = "ExtensionLabel"; - this.ExtensionLabel.Size = new System.Drawing.Size(24, 13); - this.ExtensionLabel.TabIndex = 10; this.ExtensionLabel.Text = ".bin"; // // RomSizeLabel // this.RomSizeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.RomSizeLabel.AutoSize = true; this.RomSizeLabel.Location = new System.Drawing.Point(288, 134); this.RomSizeLabel.Name = "RomSizeLabel"; - this.RomSizeLabel.Size = new System.Drawing.Size(25, 13); - this.RomSizeLabel.TabIndex = 12; this.RomSizeLabel.Text = "4kb"; // // label6 // this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(288, 116); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(30, 13); - this.label6.TabIndex = 11; this.label6.Text = "Size:"; // // AlwaysCheckbox @@ -165,21 +147,15 @@ // label4 // this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(300, 416); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(86, 13); - this.label4.TabIndex = 14; this.label4.Text = "for this extension"; this.label4.Click += new System.EventHandler(this.label4_Click); // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(288, 162); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(35, 13); - this.label5.TabIndex = 15; this.label5.Text = "Hash:"; // // HashBox @@ -228,15 +204,15 @@ private System.Windows.Forms.Button OkBtn; private System.Windows.Forms.Button CancelBtn; private System.Windows.Forms.Panel PlatformsGroupBox; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label ExtensionLabel; - private System.Windows.Forms.Label RomSizeLabel; - private System.Windows.Forms.Label label6; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label2; + private BizHawk.WinForms.Controls.LocLabelEx label3; + private BizHawk.WinForms.Controls.LocLabelEx ExtensionLabel; + private BizHawk.WinForms.Controls.LocLabelEx RomSizeLabel; + private BizHawk.WinForms.Controls.LocLabelEx label6; private System.Windows.Forms.CheckBox AlwaysCheckbox; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label5; + private BizHawk.WinForms.Controls.LocLabelEx label4; + private BizHawk.WinForms.Controls.LocLabelEx label5; private System.Windows.Forms.TextBox HashBox; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/RomStatusPicker.Designer.cs b/src/BizHawk.Client.EmuHawk/RomStatusPicker.Designer.cs index 95ddc9aa4e..93569b42f9 100644 --- a/src/BizHawk.Client.EmuHawk/RomStatusPicker.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/RomStatusPicker.Designer.cs @@ -32,20 +32,20 @@ this.OkBtn = new System.Windows.Forms.Button(); this.GoodRadio = new System.Windows.Forms.RadioButton(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.HomebrewRadio = new System.Windows.Forms.RadioButton(); - this.label3 = new System.Windows.Forms.Label(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.HackRadio = new System.Windows.Forms.RadioButton(); - this.label4 = new System.Windows.Forms.Label(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); this.pictureBox4 = new System.Windows.Forms.PictureBox(); this.TranslationRadio = new System.Windows.Forms.RadioButton(); - this.label5 = new System.Windows.Forms.Label(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); this.pictureBox5 = new System.Windows.Forms.PictureBox(); this.BadRadio = new System.Windows.Forms.RadioButton(); - this.label6 = new System.Windows.Forms.Label(); + this.label6 = new BizHawk.WinForms.Controls.LocLabelEx(); this.pictureBox6 = new System.Windows.Forms.PictureBox(); this.OverdumpRadio = new System.Windows.Forms.RadioButton(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -100,20 +100,14 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(48, 12); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(64, 13); - this.label1.TabIndex = 4; this.label1.Text = "Good Dump"; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(48, 37); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(58, 13); - this.label2.TabIndex = 7; this.label2.Text = "Homebrew"; // // pictureBox2 @@ -135,11 +129,8 @@ // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(48, 62); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(33, 13); - this.label3.TabIndex = 10; this.label3.Text = "Hack"; // // pictureBox3 @@ -161,11 +152,8 @@ // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(48, 87); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(85, 13); - this.label4.TabIndex = 13; this.label4.Text = "Translated ROM"; // // pictureBox4 @@ -187,11 +175,8 @@ // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(48, 112); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(57, 13); - this.label5.TabIndex = 16; this.label5.Text = "Bad Dump"; // // pictureBox5 @@ -213,11 +198,8 @@ // // label6 // - this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(48, 137); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(61, 13); - this.label6.TabIndex = 19; this.label6.Text = "Over Dump"; // // pictureBox6 @@ -289,20 +271,20 @@ private System.Windows.Forms.Button OkBtn; private System.Windows.Forms.RadioButton GoodRadio; private System.Windows.Forms.PictureBox pictureBox1; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label2; private System.Windows.Forms.PictureBox pictureBox2; private System.Windows.Forms.RadioButton HomebrewRadio; - private System.Windows.Forms.Label label3; + private BizHawk.WinForms.Controls.LocLabelEx label3; private System.Windows.Forms.PictureBox pictureBox3; private System.Windows.Forms.RadioButton HackRadio; - private System.Windows.Forms.Label label4; + private BizHawk.WinForms.Controls.LocLabelEx label4; private System.Windows.Forms.PictureBox pictureBox4; private System.Windows.Forms.RadioButton TranslationRadio; - private System.Windows.Forms.Label label5; + private BizHawk.WinForms.Controls.LocLabelEx label5; private System.Windows.Forms.PictureBox pictureBox5; private System.Windows.Forms.RadioButton BadRadio; - private System.Windows.Forms.Label label6; + private BizHawk.WinForms.Controls.LocLabelEx label6; private System.Windows.Forms.PictureBox pictureBox6; private System.Windows.Forms.RadioButton OverdumpRadio; } diff --git a/src/BizHawk.Client.EmuHawk/config/A7800/A7800ControllerSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/A7800/A7800ControllerSettings.Designer.cs index ba25536615..a21360d298 100644 --- a/src/BizHawk.Client.EmuHawk/config/A7800/A7800ControllerSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/A7800/A7800ControllerSettings.Designer.cs @@ -30,11 +30,11 @@ { this.OkBtn = new System.Windows.Forms.Button(); this.CancelBtn = new System.Windows.Forms.Button(); - this.label5 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); this.Port2ComboBox = new System.Windows.Forms.ComboBox(); this.Port1ComboBox = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.SuspendLayout(); // // OkBtn @@ -62,20 +62,14 @@ // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(9, 94); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(38, 13); - this.label5.TabIndex = 16; this.label5.Text = "Port 2:"; // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(12, 44); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(38, 13); - this.label4.TabIndex = 15; this.label4.Text = "Port 1:"; // // Port2ComboBox @@ -102,11 +96,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 14); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(146, 13); - this.label1.TabIndex = 17; this.label1.Text = "A7800 Controller Settings"; // // A7800ControllerSettings @@ -136,10 +127,10 @@ private System.Windows.Forms.Button OkBtn; private System.Windows.Forms.Button CancelBtn; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label4; + private BizHawk.WinForms.Controls.LocLabelEx label5; + private BizHawk.WinForms.Controls.LocLabelEx label4; private System.Windows.Forms.ComboBox Port2ComboBox; private System.Windows.Forms.ComboBox Port1ComboBox; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/A7800/A7800FilterSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/A7800/A7800FilterSettings.Designer.cs index d2bcd5328b..88f506dc70 100644 --- a/src/BizHawk.Client.EmuHawk/config/A7800/A7800FilterSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/A7800/A7800FilterSettings.Designer.cs @@ -1,38 +1,38 @@ -namespace BizHawk.Client.EmuHawk -{ - partial class A7800FilterSettings - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { +namespace BizHawk.Client.EmuHawk +{ + partial class A7800FilterSettings + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { this.OkBtn = new System.Windows.Forms.Button(); this.CancelBtn = new System.Windows.Forms.Button(); - this.label4 = new System.Windows.Forms.Label(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); this.Port1ComboBox = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.SuspendLayout(); // // OkBtn @@ -60,11 +60,8 @@ // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(12, 44); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(35, 13); - this.label4.TabIndex = 15; this.label4.Text = "Filter: "; // // Port1ComboBox @@ -80,11 +77,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 14); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(286, 13); - this.label1.TabIndex = 17; this.label1.Text = "A7800 Filter Settings: Needed For Tower Toppler and Jinks"; // // A7800FilterSettings @@ -106,14 +100,14 @@ this.ResumeLayout(false); this.PerformLayout(); - } - - #endregion - - private System.Windows.Forms.Button OkBtn; - private System.Windows.Forms.Button CancelBtn; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.ComboBox Port1ComboBox; - private System.Windows.Forms.Label label1; - } + } + + #endregion + + private System.Windows.Forms.Button OkBtn; + private System.Windows.Forms.Button CancelBtn; + private BizHawk.WinForms.Controls.LocLabelEx label4; + private System.Windows.Forms.ComboBox Port1ComboBox; + private BizHawk.WinForms.Controls.LocLabelEx label1; + } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCAudioSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCAudioSettings.Designer.cs index cf4dc3139f..35933caa7e 100644 --- a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCAudioSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCAudioSettings.Designer.cs @@ -30,13 +30,13 @@ { this.OkBtn = new System.Windows.Forms.Button(); this.CancelBtn = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.panTypecomboBox1 = new System.Windows.Forms.ComboBox(); - this.lblBorderInfo = new System.Windows.Forms.Label(); + this.lblBorderInfo = new BizHawk.WinForms.Controls.LocLabelEx(); this.tapeVolumetrackBar = new System.Windows.Forms.TrackBar(); - this.label3 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); this.ayVolumetrackBar = new System.Windows.Forms.TrackBar(); ((System.ComponentModel.ISupportInitialize)(this.tapeVolumetrackBar)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ayVolumetrackBar)).BeginInit(); @@ -67,20 +67,14 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 14); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(140, 13); - this.label1.TabIndex = 17; this.label1.Text = "Amstrad CPC Audio Settings"; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(12, 172); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(135, 13); - this.label2.TabIndex = 23; this.label2.Text = "AY-3-8912 Panning Config:"; // // panTypecomboBox1 @@ -99,8 +93,6 @@ this.lblBorderInfo.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBorderInfo.Location = new System.Drawing.Point(175, 175); this.lblBorderInfo.Name = "lblBorderInfo"; - this.lblBorderInfo.Size = new System.Drawing.Size(249, 47); - this.lblBorderInfo.TabIndex = 24; this.lblBorderInfo.Text = "Selects a particular panning configuration for the 3ch AY-3-8912 Programmable Sou" + "nd Generator"; this.lblBorderInfo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -115,20 +107,14 @@ // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(12, 44); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(73, 13); - this.label3.TabIndex = 26; this.label3.Text = "Tape Volume:"; // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(12, 108); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(98, 13); - this.label5.TabIndex = 30; this.label5.Text = "AY-3-8912 Volume:"; // // ayVolumetrackBar @@ -172,13 +158,13 @@ private System.Windows.Forms.Button OkBtn; private System.Windows.Forms.Button CancelBtn; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label2; private System.Windows.Forms.ComboBox panTypecomboBox1; - private System.Windows.Forms.Label lblBorderInfo; + private BizHawk.WinForms.Controls.LocLabelEx lblBorderInfo; private System.Windows.Forms.TrackBar tapeVolumetrackBar; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label5; + private BizHawk.WinForms.Controls.LocLabelEx label3; + private BizHawk.WinForms.Controls.LocLabelEx label5; private System.Windows.Forms.TrackBar ayVolumetrackBar; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCCoreEmulationSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCCoreEmulationSettings.Designer.cs index 0561b63167..fbf3e9b7b1 100644 --- a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCCoreEmulationSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCCoreEmulationSettings.Designer.cs @@ -30,14 +30,14 @@ { this.OkBtn = new System.Windows.Forms.Button(); this.CancelBtn = new System.Windows.Forms.Button(); - this.label4 = new System.Windows.Forms.Label(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); this.MachineSelectionComboBox = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.determEmucheckBox1 = new System.Windows.Forms.CheckBox(); - this.lblAutoLoadText = new System.Windows.Forms.Label(); + this.lblAutoLoadText = new BizHawk.WinForms.Controls.LocLabelEx(); this.autoLoadcheckBox1 = new System.Windows.Forms.CheckBox(); - this.lblBorderInfo = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); + this.lblBorderInfo = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.borderTypecomboBox1 = new System.Windows.Forms.ComboBox(); this.textBoxMachineNotes = new System.Windows.Forms.TextBox(); this.SuspendLayout(); @@ -67,11 +67,8 @@ // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(12, 46); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(98, 13); - this.label4.TabIndex = 15; this.label4.Text = "Emulated Machine:"; // // MachineSelectionComboBox @@ -88,11 +85,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 14); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(159, 13); - this.label1.TabIndex = 17; this.label1.Text = "Amstrad CPC Emulation Settings"; // // determEmucheckBox1 @@ -110,8 +104,6 @@ this.lblAutoLoadText.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblAutoLoadText.Location = new System.Drawing.Point(155, 373); this.lblAutoLoadText.Name = "lblAutoLoadText"; - this.lblAutoLoadText.Size = new System.Drawing.Size(281, 56); - this.lblAutoLoadText.TabIndex = 27; this.lblAutoLoadText.Text = "When enabled CPCHawk will automatically start and stop the tape whenever the tape" + " motor state changes"; this.lblAutoLoadText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -131,18 +123,13 @@ this.lblBorderInfo.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBorderInfo.Location = new System.Drawing.Point(177, 315); this.lblBorderInfo.Name = "lblBorderInfo"; - this.lblBorderInfo.Size = new System.Drawing.Size(259, 53); - this.lblBorderInfo.TabIndex = 30; this.lblBorderInfo.Text = "null"; this.lblBorderInfo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(12, 315); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(118, 13); - this.label2.TabIndex = 29; this.label2.Text = "Rendered Border Type:"; // // borderTypecomboBox1 @@ -203,14 +190,14 @@ private System.Windows.Forms.Button OkBtn; private System.Windows.Forms.Button CancelBtn; - private System.Windows.Forms.Label label4; + private BizHawk.WinForms.Controls.LocLabelEx label4; private System.Windows.Forms.ComboBox MachineSelectionComboBox; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.CheckBox determEmucheckBox1; - private System.Windows.Forms.Label lblAutoLoadText; + private BizHawk.WinForms.Controls.LocLabelEx lblAutoLoadText; private System.Windows.Forms.CheckBox autoLoadcheckBox1; - private System.Windows.Forms.Label lblBorderInfo; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx lblBorderInfo; + private BizHawk.WinForms.Controls.LocLabelEx label2; private System.Windows.Forms.ComboBox borderTypecomboBox1; private System.Windows.Forms.TextBox textBoxMachineNotes; } diff --git a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCNonSyncSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCNonSyncSettings.Designer.cs index 27ff5edfb3..bf7c211920 100644 --- a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCNonSyncSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCNonSyncSettings.Designer.cs @@ -30,9 +30,9 @@ { this.OkBtn = new System.Windows.Forms.Button(); this.CancelBtn = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); - this.lblOSDVerbinfo = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lblOSDVerbinfo = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); this.osdMessageVerbositycomboBox1 = new System.Windows.Forms.ComboBox(); this.SuspendLayout(); // @@ -61,11 +61,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 14); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(185, 13); - this.label1.TabIndex = 17; this.label1.Text = "ZX Spectrum Misc Non-Sync Settings"; // // lblOSDVerbinfo @@ -73,18 +70,13 @@ this.lblOSDVerbinfo.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblOSDVerbinfo.Location = new System.Drawing.Point(175, 60); this.lblOSDVerbinfo.Name = "lblOSDVerbinfo"; - this.lblOSDVerbinfo.Size = new System.Drawing.Size(196, 53); - this.lblOSDVerbinfo.TabIndex = 28; this.lblOSDVerbinfo.Text = "null"; this.lblOSDVerbinfo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(12, 60); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(125, 13); - this.label4.TabIndex = 27; this.label4.Text = "OSD Message Verbosity:"; // // osdMessageVerbositycomboBox1 @@ -126,9 +118,9 @@ private System.Windows.Forms.Button OkBtn; private System.Windows.Forms.Button CancelBtn; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label lblOSDVerbinfo; - private System.Windows.Forms.Label label4; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx lblOSDVerbinfo; + private BizHawk.WinForms.Controls.LocLabelEx label4; private System.Windows.Forms.ComboBox osdMessageVerbositycomboBox1; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.Designer.cs b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.Designer.cs index f84471b815..1642e95447 100644 --- a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.Designer.cs @@ -30,11 +30,11 @@ { this.OkBtn = new System.Windows.Forms.Button(); this.CancelBtn = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.numericUpDownAddress = new System.Windows.Forms.NumericUpDown(); - this.label3 = new System.Windows.Forms.Label(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); this.numericUpDownByte = new System.Windows.Forms.NumericUpDown(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownAddress)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownByte)).BeginInit(); @@ -65,29 +65,20 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 14); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(273, 13); - this.label1.TabIndex = 17; this.label1.Text = "Enter an address to POKE along with a single byte value"; // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(12, 52); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(93, 13); - this.label4.TabIndex = 27; this.label4.Text = "Address (0-65535)"; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(12, 27); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(254, 13); - this.label2.TabIndex = 29; this.label2.Text = "(This will always target the 64K RAM address space)"; // // numericUpDownAddress @@ -104,11 +95,8 @@ // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(123, 52); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(70, 13); - this.label3.TabIndex = 31; this.label3.Text = "Value (0-255)"; // // numericUpDownByte @@ -153,11 +141,11 @@ private System.Windows.Forms.Button OkBtn; private System.Windows.Forms.Button CancelBtn; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label4; + private BizHawk.WinForms.Controls.LocLabelEx label2; private System.Windows.Forms.NumericUpDown numericUpDownAddress; - private System.Windows.Forms.Label label3; + private BizHawk.WinForms.Controls.LocLabelEx label3; private System.Windows.Forms.NumericUpDown numericUpDownByte; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/AnalogRangeConfigControl.Designer.cs b/src/BizHawk.Client.EmuHawk/config/AnalogRangeConfigControl.Designer.cs index ee8521cca8..62ea597112 100644 --- a/src/BizHawk.Client.EmuHawk/config/AnalogRangeConfigControl.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/AnalogRangeConfigControl.Designer.cs @@ -29,8 +29,8 @@ private void InitializeComponent() { this.XNumeric = new System.Windows.Forms.NumericUpDown(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.YNumeric = new System.Windows.Forms.NumericUpDown(); this.RadialCheckbox = new System.Windows.Forms.CheckBox(); this.AnalogRange = new BizHawk.Client.EmuHawk.AnalogRangeConfig(); @@ -53,20 +53,14 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(71, 30); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(14, 13); - this.label1.TabIndex = 3; this.label1.Text = "Y"; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(71, 9); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(14, 13); - this.label2.TabIndex = 4; this.label2.Text = "X"; // // YNumeric @@ -130,8 +124,8 @@ private AnalogRangeConfig AnalogRange; private System.Windows.Forms.NumericUpDown XNumeric; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label2; private System.Windows.Forms.NumericUpDown YNumeric; private System.Windows.Forms.CheckBox RadialCheckbox; diff --git a/src/BizHawk.Client.EmuHawk/config/ColecoVision/ColecoControllerSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/ColecoVision/ColecoControllerSettings.Designer.cs index 7e48fefd38..fef03aa1b9 100644 --- a/src/BizHawk.Client.EmuHawk/config/ColecoVision/ColecoControllerSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/ColecoVision/ColecoControllerSettings.Designer.cs @@ -30,11 +30,11 @@ { this.OkBtn = new System.Windows.Forms.Button(); this.CancelBtn = new System.Windows.Forms.Button(); - this.label5 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); this.Port2ComboBox = new System.Windows.Forms.ComboBox(); this.Port1ComboBox = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.SuspendLayout(); // // OkBtn @@ -62,20 +62,14 @@ // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(9, 94); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(38, 13); - this.label5.TabIndex = 16; this.label5.Text = "Port 2:"; // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(12, 44); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(38, 13); - this.label4.TabIndex = 15; this.label4.Text = "Port 1:"; // // Port2ComboBox @@ -102,11 +96,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 14); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(146, 13); - this.label1.TabIndex = 17; this.label1.Text = "ColecoVision Controller Settings"; // // ColecoControllerSettings @@ -136,10 +127,10 @@ private System.Windows.Forms.Button OkBtn; private System.Windows.Forms.Button CancelBtn; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label4; + private BizHawk.WinForms.Controls.LocLabelEx label5; + private BizHawk.WinForms.Controls.LocLabelEx label4; private System.Windows.Forms.ComboBox Port2ComboBox; private System.Windows.Forms.ComboBox Port1ComboBox; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs index bdd12406a1..7fff12e80d 100644 --- a/src/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs @@ -43,9 +43,9 @@ this.loadDefaultsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.label3 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label38 = new System.Windows.Forms.Label(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label38 = new BizHawk.WinForms.Controls.LocLabelEx(); this.btnMisc = new BizHawk.Client.EmuHawk.MenuButton(); this.AllowUdCheckbox = new System.Windows.Forms.CheckBox(); this.tabControl1.SuspendLayout(); @@ -191,31 +191,22 @@ // label3 // this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(11, 550); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(30, 13); - this.label3.TabIndex = 112; this.label3.Text = "Tips:"; // // label2 // this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(197, 550); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(168, 13); - this.label2.TabIndex = 111; this.label2.Text = "* Disable Auto Tab to multiply bind"; // // label38 // this.label38.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label38.AutoSize = true; this.label38.Location = new System.Drawing.Point(41, 550); this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(153, 13); - this.label38.TabIndex = 110; this.label38.Text = "* Escape clears a key mapping"; // // btnMisc @@ -287,9 +278,9 @@ private System.Windows.Forms.ToolStripMenuItem testToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem loadDefaultsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label38; + private BizHawk.WinForms.Controls.LocLabelEx label3; + private BizHawk.WinForms.Controls.LocLabelEx label2; + private BizHawk.WinForms.Controls.LocLabelEx label38; private System.Windows.Forms.CheckBox AllowUdCheckbox; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/ControllerConfig/AnalogBindControl.Designer.cs b/src/BizHawk.Client.EmuHawk/config/ControllerConfig/AnalogBindControl.Designer.cs index e385ec92aa..d1d6e6bf89 100644 --- a/src/BizHawk.Client.EmuHawk/config/ControllerConfig/AnalogBindControl.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/ControllerConfig/AnalogBindControl.Designer.cs @@ -30,13 +30,13 @@ { this.components = new System.ComponentModel.Container(); this.textBox1 = new System.Windows.Forms.TextBox(); - this.labelButtonName = new System.Windows.Forms.Label(); + this.labelButtonName = new BizHawk.WinForms.Controls.LocLabelEx(); this.trackBarSensitivity = new System.Windows.Forms.TrackBar(); - this.labelSensitivity = new System.Windows.Forms.Label(); + this.labelSensitivity = new BizHawk.WinForms.Controls.LocLabelEx(); this.timer1 = new System.Windows.Forms.Timer(this.components); this.buttonBind = new System.Windows.Forms.Button(); this.trackBarDeadzone = new System.Windows.Forms.TrackBar(); - this.labelDeadzone = new System.Windows.Forms.Label(); + this.labelDeadzone = new BizHawk.WinForms.Controls.LocLabelEx(); this.buttonFlip = new System.Windows.Forms.Button(); this.buttonUnbind = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.trackBarSensitivity)).BeginInit(); @@ -53,11 +53,8 @@ // // labelButtonName // - this.labelButtonName.AutoSize = true; this.labelButtonName.Location = new System.Drawing.Point(109, 6); this.labelButtonName.Name = "labelButtonName"; - this.labelButtonName.Size = new System.Drawing.Size(54, 13); - this.labelButtonName.TabIndex = 1; this.labelButtonName.Text = "Bindname"; // // trackBarSensitivity @@ -75,11 +72,8 @@ // // labelSensitivity // - this.labelSensitivity.AutoSize = true; this.labelSensitivity.Location = new System.Drawing.Point(166, 25); this.labelSensitivity.Name = "labelSensitivity"; - this.labelSensitivity.Size = new System.Drawing.Size(95, 13); - this.labelSensitivity.TabIndex = 3; this.labelSensitivity.Text = "Sensitivity: 5 billion"; // // timer1 @@ -107,11 +101,8 @@ // // labelDeadzone // - this.labelDeadzone.AutoSize = true; this.labelDeadzone.Location = new System.Drawing.Point(166, 60); this.labelDeadzone.Name = "labelDeadzone"; - this.labelDeadzone.Size = new System.Drawing.Size(97, 13); - this.labelDeadzone.TabIndex = 6; this.labelDeadzone.Text = "Deadzone: 5 billion"; // // buttonFlip @@ -159,13 +150,13 @@ #endregion private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.Label labelButtonName; + private BizHawk.WinForms.Controls.LocLabelEx labelButtonName; private System.Windows.Forms.TrackBar trackBarSensitivity; - private System.Windows.Forms.Label labelSensitivity; + private BizHawk.WinForms.Controls.LocLabelEx labelSensitivity; private System.Windows.Forms.Timer timer1; private System.Windows.Forms.Button buttonBind; private System.Windows.Forms.TrackBar trackBarDeadzone; - private System.Windows.Forms.Label labelDeadzone; + private BizHawk.WinForms.Controls.LocLabelEx labelDeadzone; private System.Windows.Forms.Button buttonFlip; private System.Windows.Forms.Button buttonUnbind; } diff --git a/src/BizHawk.Client.EmuHawk/config/DisplayConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/DisplayConfig.Designer.cs index 1c62a50ce6..c073e811f1 100644 --- a/src/BizHawk.Client.EmuHawk/config/DisplayConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/DisplayConfig.Designer.cs @@ -33,8 +33,8 @@ this.btnCancel = new System.Windows.Forms.Button(); this.btnOk = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.lblScanlines = new System.Windows.Forms.Label(); - this.lblUserFilterName = new System.Windows.Forms.Label(); + this.lblScanlines = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lblUserFilterName = new BizHawk.WinForms.Controls.LocLabelEx(); this.btnSelectUserFilter = new System.Windows.Forms.Button(); this.rbUser = new System.Windows.Forms.RadioButton(); this.tbScanlineIntensity = new BizHawk.Client.EmuHawk.TransparentTrackBar(); @@ -51,40 +51,40 @@ this.rbUseSystem = new System.Windows.Forms.RadioButton(); this.grpARSelection = new System.Windows.Forms.GroupBox(); this.txtCustomARY = new System.Windows.Forms.TextBox(); - this.label12 = new System.Windows.Forms.Label(); + this.label12 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtCustomARX = new System.Windows.Forms.TextBox(); this.rbUseCustomRatio = new System.Windows.Forms.RadioButton(); - this.label4 = new System.Windows.Forms.Label(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtCustomARHeight = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtCustomARWidth = new System.Windows.Forms.TextBox(); this.rbUseCustom = new System.Windows.Forms.RadioButton(); this.rbOpenGL = new System.Windows.Forms.RadioButton(); - this.label5 = new System.Windows.Forms.Label(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tpAR = new System.Windows.Forms.TabPage(); this.groupBox6 = new System.Windows.Forms.GroupBox(); - this.label16 = new System.Windows.Forms.Label(); - this.label15 = new System.Windows.Forms.Label(); + this.label16 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label15 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtCropBottom = new System.Windows.Forms.TextBox(); - this.label17 = new System.Windows.Forms.Label(); + this.label17 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtCropRight = new System.Windows.Forms.TextBox(); this.txtCropTop = new System.Windows.Forms.TextBox(); - this.label14 = new System.Windows.Forms.Label(); + this.label14 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtCropLeft = new System.Windows.Forms.TextBox(); this.btnDefaults = new System.Windows.Forms.Button(); this.cbAutoPrescale = new System.Windows.Forms.CheckBox(); - this.label11 = new System.Windows.Forms.Label(); - this.label10 = new System.Windows.Forms.Label(); + this.label11 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label10 = new BizHawk.WinForms.Controls.LocLabelEx(); this.nudPrescale = new System.Windows.Forms.NumericUpDown(); this.tpDispMethod = new System.Windows.Forms.TabPage(); - this.label6 = new System.Windows.Forms.Label(); + this.label6 = new BizHawk.WinForms.Controls.LocLabelEx(); this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.label13 = new System.Windows.Forms.Label(); + this.label13 = new BizHawk.WinForms.Controls.LocLabelEx(); this.cbAlternateVsync = new System.Windows.Forms.CheckBox(); - this.label8 = new System.Windows.Forms.Label(); + this.label8 = new BizHawk.WinForms.Controls.LocLabelEx(); this.rbD3D9 = new System.Windows.Forms.RadioButton(); - this.label7 = new System.Windows.Forms.Label(); + this.label7 = new BizHawk.WinForms.Controls.LocLabelEx(); this.rbGDIPlus = new System.Windows.Forms.RadioButton(); this.tpMisc = new System.Windows.Forms.TabPage(); this.groupBox5 = new System.Windows.Forms.GroupBox(); @@ -95,14 +95,14 @@ this.cbAllowDoubleclickFullscreen = new System.Windows.Forms.CheckBox(); this.groupBox4 = new System.Windows.Forms.GroupBox(); this.cbFSAutohideMouse = new System.Windows.Forms.CheckBox(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.cbFullscreenHacks = new System.Windows.Forms.CheckBox(); this.cbStatusBarFullscreen = new System.Windows.Forms.CheckBox(); this.cbMenuFullscreen = new System.Windows.Forms.CheckBox(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.lblFrameTypeWindowed = new System.Windows.Forms.Label(); + this.lblFrameTypeWindowed = new BizHawk.WinForms.Controls.LocLabelEx(); this.cbStatusBarWindowed = new System.Windows.Forms.CheckBox(); - this.label9 = new System.Windows.Forms.Label(); + this.label9 = new BizHawk.WinForms.Controls.LocLabelEx(); this.cbMenuWindowed = new System.Windows.Forms.CheckBox(); this.trackbarFrameSizeWindowed = new BizHawk.Client.EmuHawk.TransparentTrackBar(); this.cbCaptionWindowed = new System.Windows.Forms.CheckBox(); @@ -167,20 +167,15 @@ // // lblScanlines // - this.lblScanlines.AutoSize = true; this.lblScanlines.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblScanlines.Location = new System.Drawing.Point(104, 39); this.lblScanlines.Name = "lblScanlines"; - this.lblScanlines.Size = new System.Drawing.Size(15, 13); - this.lblScanlines.TabIndex = 11; this.lblScanlines.Text = "%"; // // lblUserFilterName // this.lblUserFilterName.Location = new System.Drawing.Point(6, 114); this.lblUserFilterName.Name = "lblUserFilterName"; - this.lblUserFilterName.Size = new System.Drawing.Size(161, 15); - this.lblUserFilterName.TabIndex = 10; this.lblUserFilterName.Text = "Will contain user filter name"; // // btnSelectUserFilter @@ -370,11 +365,8 @@ // // label12 // - this.label12.AutoSize = true; this.label12.Location = new System.Drawing.Point(202, 107); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(10, 13); - this.label12.TabIndex = 17; this.label12.Text = ":"; // // txtCustomARX @@ -397,11 +389,8 @@ // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(13, 41); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(257, 13); - this.label4.TabIndex = 12; this.label4.Text = "Allow pixel distortion (e.g. 2x1 pixels, for better AR fit):"; // // txtCustomARHeight @@ -413,11 +402,8 @@ // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(202, 84); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(12, 13); - this.label3.TabIndex = 12; this.label3.Text = "x"; // // txtCustomARWidth @@ -454,8 +440,6 @@ // this.label5.Location = new System.Drawing.Point(21, 123); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(359, 47); - this.label5.TabIndex = 16; this.label5.Text = " • May malfunction on some systems.\r\n • May have increased performance for OpenGL" + "-based emulation cores.\r\n • May have reduced performance on some systems.\r\n"; // @@ -514,20 +498,14 @@ // // label16 // - this.label16.AutoSize = true; this.label16.Location = new System.Drawing.Point(217, 25); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(43, 13); - this.label16.TabIndex = 30; this.label16.Text = "Bottom:"; // // label15 // - this.label15.AutoSize = true; this.label15.Location = new System.Drawing.Point(74, 25); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(29, 13); - this.label15.TabIndex = 29; this.label15.Text = "Top:"; // // txtCropBottom @@ -540,11 +518,8 @@ // // label17 // - this.label17.AutoSize = true; this.label17.Location = new System.Drawing.Point(144, 25); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(35, 13); - this.label17.TabIndex = 26; this.label17.Text = "Right:"; // // txtCropRight @@ -565,11 +540,8 @@ // // label14 // - this.label14.AutoSize = true; this.label14.Location = new System.Drawing.Point(6, 25); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(28, 13); - this.label14.TabIndex = 16; this.label14.Text = "Left:"; // // txtCropLeft @@ -603,20 +575,14 @@ // // label11 // - this.label11.AutoSize = true; this.label11.Location = new System.Drawing.Point(140, 11); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(14, 13); - this.label11.TabIndex = 16; this.label11.Text = "X"; // // label10 // - this.label10.AutoSize = true; this.label10.Location = new System.Drawing.Point(7, 11); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(76, 13); - this.label10.TabIndex = 15; this.label10.Text = "User Prescale:"; // // nudPrescale @@ -656,8 +622,6 @@ // this.label6.Location = new System.Drawing.Point(3, 258); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(359, 23); - this.label6.TabIndex = 18; this.label6.Text = "Changes require restart of program to take effect.\r\n"; // // groupBox3 @@ -680,8 +644,6 @@ // this.label13.Location = new System.Drawing.Point(45, 60); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(359, 43); - this.label13.TabIndex = 22; this.label13.Text = resources.GetString("label13.Text"); this.label13.Click += new System.EventHandler(this.label13_Click); this.label13.DoubleClick += new System.EventHandler(this.label13_Click); @@ -699,8 +661,6 @@ // this.label8.Location = new System.Drawing.Point(21, 30); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(359, 27); - this.label8.TabIndex = 20; this.label8.Text = " • Best compatibility\r\n • May have trouble with OpenGL-based cores (N64)\r\n"; // // rbD3D9 @@ -719,8 +679,6 @@ // this.label7.Location = new System.Drawing.Point(21, 191); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(359, 47); - this.label7.TabIndex = 18; this.label7.Text = " • Slow; Mainly for compatibility purposes\r\n • Missing many features\r\n • Works be" + "tter over Remote Desktop, etc.\r\n"; // @@ -844,8 +802,6 @@ // this.label1.Location = new System.Drawing.Point(7, 88); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(240, 115); - this.label1.TabIndex = 27; this.label1.Text = resources.GetString("label1.Text"); // // cbFullscreenHacks @@ -895,11 +851,8 @@ // // lblFrameTypeWindowed // - this.lblFrameTypeWindowed.AutoSize = true; this.lblFrameTypeWindowed.Location = new System.Drawing.Point(51, 17); this.lblFrameTypeWindowed.Name = "lblFrameTypeWindowed"; - this.lblFrameTypeWindowed.Size = new System.Drawing.Size(62, 13); - this.lblFrameTypeWindowed.TabIndex = 26; this.lblFrameTypeWindowed.Text = "(frame type)"; // // cbStatusBarWindowed @@ -914,11 +867,8 @@ // // label9 // - this.label9.AutoSize = true; this.label9.Location = new System.Drawing.Point(6, 17); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(39, 13); - this.label9.TabIndex = 22; this.label9.Text = "Frame:"; // // cbMenuWindowed @@ -1027,31 +977,31 @@ private System.Windows.Forms.RadioButton rbFinalFilterBilinear; private System.Windows.Forms.Button btnSelectUserFilter; private System.Windows.Forms.RadioButton rbUser; - private System.Windows.Forms.Label lblUserFilterName; + private BizHawk.WinForms.Controls.LocLabelEx lblUserFilterName; private System.Windows.Forms.RadioButton rbUseRaw; private System.Windows.Forms.RadioButton rbUseSystem; private System.Windows.Forms.GroupBox grpARSelection; - private System.Windows.Forms.Label lblScanlines; + private BizHawk.WinForms.Controls.LocLabelEx lblScanlines; private System.Windows.Forms.TextBox txtCustomARHeight; - private System.Windows.Forms.Label label3; + private BizHawk.WinForms.Controls.LocLabelEx label3; private System.Windows.Forms.TextBox txtCustomARWidth; private System.Windows.Forms.RadioButton rbUseCustom; - private System.Windows.Forms.Label label4; + private BizHawk.WinForms.Controls.LocLabelEx label4; private System.Windows.Forms.RadioButton rbOpenGL; - private System.Windows.Forms.Label label5; + private BizHawk.WinForms.Controls.LocLabelEx label5; private System.Windows.Forms.TabControl tabControl1; private System.Windows.Forms.TabPage tpAR; private System.Windows.Forms.TabPage tpDispMethod; - private System.Windows.Forms.Label label6; + private BizHawk.WinForms.Controls.LocLabelEx label6; private System.Windows.Forms.GroupBox groupBox3; - private System.Windows.Forms.Label label7; + private BizHawk.WinForms.Controls.LocLabelEx label7; private System.Windows.Forms.RadioButton rbGDIPlus; private System.Windows.Forms.TabPage tpMisc; - private System.Windows.Forms.Label label8; + private BizHawk.WinForms.Controls.LocLabelEx label8; private System.Windows.Forms.RadioButton rbD3D9; private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.CheckBox cbStatusBarWindowed; - private System.Windows.Forms.Label label9; + private BizHawk.WinForms.Controls.LocLabelEx label9; private BizHawk.Client.EmuHawk.TransparentTrackBar trackbarFrameSizeWindowed; private System.Windows.Forms.CheckBox cbMenuWindowed; private System.Windows.Forms.CheckBox cbCaptionWindowed; @@ -1059,9 +1009,9 @@ private System.Windows.Forms.CheckBox cbStatusBarFullscreen; private System.Windows.Forms.CheckBox cbMenuFullscreen; private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.Label lblFrameTypeWindowed; - private System.Windows.Forms.Label label11; - private System.Windows.Forms.Label label10; + private BizHawk.WinForms.Controls.LocLabelEx lblFrameTypeWindowed; + private BizHawk.WinForms.Controls.LocLabelEx label11; + private BizHawk.WinForms.Controls.LocLabelEx label10; private System.Windows.Forms.NumericUpDown nudPrescale; private System.Windows.Forms.CheckBox cbFSAutohideMouse; private System.Windows.Forms.GroupBox groupBox5; @@ -1072,23 +1022,23 @@ private System.Windows.Forms.LinkLabel linkLabel1; private System.Windows.Forms.RadioButton rbUseCustomRatio; private System.Windows.Forms.TextBox txtCustomARY; - private System.Windows.Forms.Label label12; + private BizHawk.WinForms.Controls.LocLabelEx label12; private System.Windows.Forms.TextBox txtCustomARX; private System.Windows.Forms.CheckBox cbAutoPrescale; - private System.Windows.Forms.Label label13; + private BizHawk.WinForms.Controls.LocLabelEx label13; private System.Windows.Forms.CheckBox cbAlternateVsync; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.CheckBox cbFullscreenHacks; private System.Windows.Forms.Button btnDefaults; private System.Windows.Forms.ToolTip toolTip1; private System.Windows.Forms.GroupBox groupBox6; - private System.Windows.Forms.Label label16; - private System.Windows.Forms.Label label15; + private BizHawk.WinForms.Controls.LocLabelEx label16; + private BizHawk.WinForms.Controls.LocLabelEx label15; private System.Windows.Forms.TextBox txtCropBottom; - private System.Windows.Forms.Label label17; + private BizHawk.WinForms.Controls.LocLabelEx label17; private System.Windows.Forms.TextBox txtCropRight; private System.Windows.Forms.TextBox txtCropTop; - private System.Windows.Forms.Label label14; + private BizHawk.WinForms.Controls.LocLabelEx label14; private System.Windows.Forms.TextBox txtCropLeft; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/EmuHawkOptions.Designer.cs b/src/BizHawk.Client.EmuHawk/config/EmuHawkOptions.Designer.cs index 5a20c625c8..e6187783da 100644 --- a/src/BizHawk.Client.EmuHawk/config/EmuHawkOptions.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/EmuHawkOptions.Designer.cs @@ -1,33 +1,33 @@ -namespace BizHawk.Client.EmuHawk -{ - partial class EmuHawkOptions - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { +namespace BizHawk.Client.EmuHawk +{ + partial class EmuHawkOptions + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { this.components = new System.ComponentModel.Container(); this.OkBtn = new System.Windows.Forms.Button(); this.CancelBtn = new System.Windows.Forms.Button(); @@ -35,25 +35,25 @@ this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage3 = new System.Windows.Forms.TabPage(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.label10 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); + this.label10 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label9 = new BizHawk.WinForms.Controls.LocLabelEx(); this.AutosaveSRAMtextBox = new System.Windows.Forms.NumericUpDown(); this.AutosaveSRAMradioButton1 = new System.Windows.Forms.RadioButton(); - this.label8 = new System.Windows.Forms.Label(); + this.label8 = new BizHawk.WinForms.Controls.LocLabelEx(); this.AutosaveSRAMradioButton2 = new System.Windows.Forms.RadioButton(); this.AutosaveSRAMradioButton3 = new System.Windows.Forms.RadioButton(); this.AutosaveSRAMCheckbox = new System.Windows.Forms.CheckBox(); this.panel1 = new System.Windows.Forms.Panel(); - this.label7 = new System.Windows.Forms.Label(); + this.label7 = new BizHawk.WinForms.Controls.LocLabelEx(); this.LuaInterfaceRadio = new System.Windows.Forms.RadioButton(); this.NLuaRadio = new System.Windows.Forms.RadioButton(); - this.label6 = new System.Windows.Forms.Label(); + this.label6 = new BizHawk.WinForms.Controls.LocLabelEx(); this.cbSkipWaterboxIntegrityChecks = new System.Windows.Forms.CheckBox(); - this.label5 = new System.Windows.Forms.Label(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); this.cbMoviesOnDisk = new System.Windows.Forms.CheckBox(); this.LuaDuringTurboCheckbox = new System.Windows.Forms.CheckBox(); - this.label12 = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); + this.label12 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label13 = new BizHawk.WinForms.Controls.LocLabelEx(); this.FrameAdvSkipLagCheckbox = new System.Windows.Forms.CheckBox(); this.BackupSRamCheckbox = new System.Windows.Forms.CheckBox(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); @@ -62,16 +62,16 @@ this.rbInputMethodDirectInput = new System.Windows.Forms.RadioButton(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.StartPausedCheckbox = new System.Windows.Forms.CheckBox(); - this.label14 = new System.Windows.Forms.Label(); + this.label14 = new BizHawk.WinForms.Controls.LocLabelEx(); this.StartFullScreenCheckbox = new System.Windows.Forms.CheckBox(); - this.label3 = new System.Windows.Forms.Label(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); this.SingleInstanceModeCheckbox = new System.Windows.Forms.CheckBox(); this.HandleAlternateKeyboardLayoutsCheckBox = new System.Windows.Forms.CheckBox(); this.NeverAskSaveCheckbox = new System.Windows.Forms.CheckBox(); - this.label2 = new System.Windows.Forms.Label(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.AcceptBackgroundInputCheckbox = new System.Windows.Forms.CheckBox(); this.AcceptBackgroundInputControllerOnlyCheckBox = new System.Windows.Forms.CheckBox(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.RunInBackgroundCheckbox = new System.Windows.Forms.CheckBox(); this.SaveWindowPositionCheckbox = new System.Windows.Forms.CheckBox(); this.EnableContextMenuCheckbox = new System.Windows.Forms.CheckBox(); @@ -184,20 +184,14 @@ // // label10 // - this.label10.AutoSize = true; this.label10.Location = new System.Drawing.Point(9, 34); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(33, 13); - this.label10.TabIndex = 1; this.label10.Text = "every"; // // label9 // - this.label9.AutoSize = true; this.label9.Location = new System.Drawing.Point(6, 16); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(225, 13); - this.label9.TabIndex = 0; this.label9.Text = "Save SaveRAM to .AutoSaveRAM.SaveRAM"; // // AutosaveSRAMtextBox @@ -225,11 +219,8 @@ // // label8 // - this.label8.AutoSize = true; this.label8.Location = new System.Drawing.Point(202, 35); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(12, 13); - this.label8.TabIndex = 6; this.label8.Text = "s"; // // AutosaveSRAMradioButton2 @@ -276,11 +267,8 @@ // // label7 // - this.label7.AutoSize = true; this.label7.Location = new System.Drawing.Point(3, 1); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(50, 13); - this.label7.TabIndex = 0; this.label7.Text = "Lua Core"; // // LuaInterfaceRadio @@ -307,11 +295,8 @@ // // label6 // - this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(27, 243); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(276, 39); - this.label6.TabIndex = 19; this.label6.Text = "Skips some integrity check exceptions in waterbox cores.\r\nUseful for romhackers. " + "Reboot core after changing.\r\nENABLING THIS VOIDS YOUR WARRANTY\r\n"; // @@ -327,11 +312,8 @@ // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(27, 194); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(299, 26); - this.label5.TabIndex = 17; this.label5.Text = "Will prevent many Out Of Memory crashes during long movies.\r\nYou must restart the" + " program after changing this."; // @@ -357,20 +339,14 @@ // // label12 // - this.label12.AutoSize = true; this.label12.Location = new System.Drawing.Point(27, 135); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(231, 13); - this.label12.TabIndex = 14; this.label12.Text = "frames in which no input was polled (lag frames)"; // // label13 // - this.label13.AutoSize = true; this.label13.Location = new System.Drawing.Point(27, 122); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(268, 13); - this.label13.TabIndex = 13; this.label13.Text = "When enabled, the frame advance button will skip over"; // // FrameAdvSkipLagCheckbox @@ -452,11 +428,8 @@ // // label14 // - this.label14.AutoSize = true; this.label14.Location = new System.Drawing.Point(26, 99); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(306, 13); - this.label14.TabIndex = 12; this.label14.Text = "Note: Requires closing and reopening EmuHawk to take effect."; // // StartFullScreenCheckbox @@ -471,11 +444,8 @@ // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(26, 85); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(275, 13); - this.label3.TabIndex = 11; this.label3.Text = "Enable to force only one instance of EmuHawk at a time."; // // SingleInstanceModeCheckbox @@ -510,11 +480,8 @@ // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(26, 112); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(349, 13); - this.label2.TabIndex = 25; this.label2.Text = "When this is set, the client will receive user input even when focus is lost"; // // AcceptBackgroundInputCheckbox @@ -540,11 +507,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(26, 72); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(315, 13); - this.label1.TabIndex = 22; this.label1.Text = "When this is set, the client will continue to run when it loses focus"; // // RunInBackgroundCheckbox @@ -618,44 +582,44 @@ this.groupBox1.PerformLayout(); this.ResumeLayout(false); - } - - #endregion - - private System.Windows.Forms.Button OkBtn; - private System.Windows.Forms.Button CancelBtn; - private System.Windows.Forms.TabControl tabControl1; - private System.Windows.Forms.TabPage tabPage1; - private System.Windows.Forms.TabPage tabPage3; - private System.Windows.Forms.ToolTip toolTip1; - private System.Windows.Forms.CheckBox BackupSRamCheckbox; - private System.Windows.Forms.CheckBox FrameAdvSkipLagCheckbox; - private System.Windows.Forms.Label label12; - private System.Windows.Forms.Label label13; - private System.Windows.Forms.CheckBox LuaDuringTurboCheckbox; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.CheckBox cbMoviesOnDisk; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.CheckBox cbSkipWaterboxIntegrityChecks; - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.RadioButton LuaInterfaceRadio; - private System.Windows.Forms.RadioButton NLuaRadio; - private System.Windows.Forms.CheckBox AutosaveSRAMCheckbox; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.RadioButton AutosaveSRAMradioButton3; - private System.Windows.Forms.RadioButton AutosaveSRAMradioButton2; - private System.Windows.Forms.RadioButton AutosaveSRAMradioButton1; - private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.NumericUpDown AutosaveSRAMtextBox; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.Label label9; + } + + #endregion + + private System.Windows.Forms.Button OkBtn; + private System.Windows.Forms.Button CancelBtn; + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.TabPage tabPage3; + private System.Windows.Forms.ToolTip toolTip1; + private System.Windows.Forms.CheckBox BackupSRamCheckbox; + private System.Windows.Forms.CheckBox FrameAdvSkipLagCheckbox; + private BizHawk.WinForms.Controls.LocLabelEx label12; + private BizHawk.WinForms.Controls.LocLabelEx label13; + private System.Windows.Forms.CheckBox LuaDuringTurboCheckbox; + private BizHawk.WinForms.Controls.LocLabelEx label5; + private System.Windows.Forms.CheckBox cbMoviesOnDisk; + private BizHawk.WinForms.Controls.LocLabelEx label6; + private System.Windows.Forms.CheckBox cbSkipWaterboxIntegrityChecks; + private System.Windows.Forms.Panel panel1; + private BizHawk.WinForms.Controls.LocLabelEx label7; + private System.Windows.Forms.RadioButton LuaInterfaceRadio; + private System.Windows.Forms.RadioButton NLuaRadio; + private System.Windows.Forms.CheckBox AutosaveSRAMCheckbox; + private BizHawk.WinForms.Controls.LocLabelEx label8; + private System.Windows.Forms.RadioButton AutosaveSRAMradioButton3; + private System.Windows.Forms.RadioButton AutosaveSRAMradioButton2; + private System.Windows.Forms.RadioButton AutosaveSRAMradioButton1; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.NumericUpDown AutosaveSRAMtextBox; + private BizHawk.WinForms.Controls.LocLabelEx label10; + private BizHawk.WinForms.Controls.LocLabelEx label9; private System.Windows.Forms.CheckBox HandleAlternateKeyboardLayoutsCheckBox; private System.Windows.Forms.CheckBox NeverAskSaveCheckbox; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label2; private System.Windows.Forms.CheckBox AcceptBackgroundInputCheckbox; private System.Windows.Forms.CheckBox AcceptBackgroundInputControllerOnlyCheckBox; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.CheckBox RunInBackgroundCheckbox; private System.Windows.Forms.CheckBox SaveWindowPositionCheckbox; private System.Windows.Forms.CheckBox EnableContextMenuCheckbox; @@ -665,9 +629,9 @@ private System.Windows.Forms.RadioButton rbInputMethodDirectInput; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.CheckBox StartPausedCheckbox; - private System.Windows.Forms.Label label14; + private BizHawk.WinForms.Controls.LocLabelEx label14; private System.Windows.Forms.CheckBox StartFullScreenCheckbox; - private System.Windows.Forms.Label label3; + private BizHawk.WinForms.Controls.LocLabelEx label3; private System.Windows.Forms.CheckBox SingleInstanceModeCheckbox; - } + } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/FileExtensionPreferences.Designer.cs b/src/BizHawk.Client.EmuHawk/config/FileExtensionPreferences.Designer.cs index 45736882ab..a028f00b1a 100644 --- a/src/BizHawk.Client.EmuHawk/config/FileExtensionPreferences.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/FileExtensionPreferences.Designer.cs @@ -31,9 +31,9 @@ this.OkBtn = new System.Windows.Forms.Button(); this.CancelBtn = new System.Windows.Forms.Button(); this.PrefPanel = new System.Windows.Forms.Panel(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); this.SuspendLayout(); // // OkBtn @@ -73,29 +73,20 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 9); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(296, 13); - this.label1.TabIndex = 3; this.label1.Text = "Select a preferred Platform to run for the given file extensions."; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(12, 24); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(352, 13); - this.label2.TabIndex = 4; this.label2.Text = "Note: The game database overrides these options. They only take effect"; // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(12, 39); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(245, 13); - this.label3.TabIndex = 5; this.label3.Text = "when a Rom is unable to be found in the database"; // // FileExtensionPreferences @@ -127,8 +118,8 @@ private System.Windows.Forms.Button OkBtn; private System.Windows.Forms.Button CancelBtn; private System.Windows.Forms.Panel PrefPanel; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label2; + private BizHawk.WinForms.Controls.LocLabelEx label3; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/FileExtensionPreferencesPicker.Designer.cs b/src/BizHawk.Client.EmuHawk/config/FileExtensionPreferencesPicker.Designer.cs index f4032be5c6..fe0849fdda 100644 --- a/src/BizHawk.Client.EmuHawk/config/FileExtensionPreferencesPicker.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/FileExtensionPreferencesPicker.Designer.cs @@ -28,17 +28,14 @@ /// private void InitializeComponent() { - this.FileExtensionLabel = new System.Windows.Forms.Label(); + this.FileExtensionLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.PlatformDropdown = new System.Windows.Forms.ComboBox(); this.SuspendLayout(); // // FileExtensionLabel // - this.FileExtensionLabel.AutoSize = true; this.FileExtensionLabel.Location = new System.Drawing.Point(3, 5); this.FileExtensionLabel.Name = "FileExtensionLabel"; - this.FileExtensionLabel.Size = new System.Drawing.Size(24, 13); - this.FileExtensionLabel.TabIndex = 0; this.FileExtensionLabel.Text = ".bin"; // // PlatformDropdown @@ -66,7 +63,7 @@ #endregion - private System.Windows.Forms.Label FileExtensionLabel; + private BizHawk.WinForms.Controls.LocLabelEx FileExtensionLabel; private System.Windows.Forms.ComboBox PlatformDropdown; } } diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.Designer.cs index adbc314b7a..f244833531 100644 --- a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.Designer.cs @@ -58,8 +58,8 @@ this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panel2 = new System.Windows.Forms.Panel(); this.linkBasePath = new System.Windows.Forms.LinkLabel(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.lvFirmwaresContextMenuStrip.SuspendLayout(); this.panel1.SuspendLayout(); @@ -336,21 +336,15 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(3, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(119, 13); - this.label1.TabIndex = 25; this.label1.Text = "Firmwares Search Path:"; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(5, 5); this.label2.Margin = new System.Windows.Forms.Padding(5, 5, 3, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(395, 13); - this.label2.TabIndex = 27; this.label2.Text = "Firmware such as BIOS files are copyrighted material and not provided by BizHawk"; // // FirmwaresConfig @@ -404,13 +398,13 @@ private System.Windows.Forms.ToolStripMenuItem tsmiCopy; private System.Windows.Forms.Panel panel2; private System.Windows.Forms.LinkLabel linkBasePath; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.ToolStripButton tbbImport; private System.Windows.Forms.ColumnHeader columnHeader8; private System.Windows.Forms.ToolStripButton tbbClose; private System.Windows.Forms.ToolStripButton tbbCloseReload; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label2; private System.Windows.Forms.ToolStripButton tbbOpenFolder; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.Designer.cs b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.Designer.cs index 41be9b587c..ca882d55a2 100644 --- a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.Designer.cs @@ -37,11 +37,11 @@ this.colInfo = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.imageList1 = new System.Windows.Forms.ImageList(this.components); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.btnClose = new System.Windows.Forms.Button(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); - this.label2 = new System.Windows.Forms.Label(); - this.lblFirmware = new System.Windows.Forms.Label(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lblFirmware = new BizHawk.WinForms.Controls.LocLabelEx(); this.lvmiOptionsContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.tsmiOptionsCopy = new System.Windows.Forms.ToolStripMenuItem(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); @@ -123,11 +123,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(3, 13); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(122, 13); - this.label1.TabIndex = 1; this.label1.Text = "Options for this firmware:"; // // btnClose @@ -157,20 +154,14 @@ // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(3, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(52, 13); - this.label2.TabIndex = 0; this.label2.Text = "Firmware:"; // // lblFirmware // - this.lblFirmware.AutoSize = true; this.lblFirmware.Location = new System.Drawing.Point(61, 0); this.lblFirmware.Name = "lblFirmware"; - this.lblFirmware.Size = new System.Drawing.Size(35, 13); - this.lblFirmware.TabIndex = 1; this.lblFirmware.Text = "label3"; // // lvmiOptionsContextMenuStrip @@ -212,14 +203,14 @@ private System.Windows.Forms.ColumnHeader colHash; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.Button btnClose; private System.Windows.Forms.ColumnHeader colStandardFilename; private System.Windows.Forms.ColumnHeader colDescription; public System.Windows.Forms.ListView lvOptions; private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; - private System.Windows.Forms.Label label2; - public System.Windows.Forms.Label lblFirmware; + private BizHawk.WinForms.Controls.LocLabelEx label2; + public BizHawk.WinForms.Controls.LocLabelEx lblFirmware; private System.Windows.Forms.ContextMenuStrip lvmiOptionsContextMenuStrip; private System.Windows.Forms.ToolStripMenuItem tsmiOptionsCopy; private System.Windows.Forms.ColumnHeader colInfo; diff --git a/src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.Designer.cs b/src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.Designer.cs index 5127da8147..be655de56d 100644 --- a/src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.Designer.cs @@ -40,9 +40,9 @@ this.panel10 = new System.Windows.Forms.Panel(); this.panel11 = new System.Windows.Forms.Panel(); this.panel12 = new System.Windows.Forms.Panel(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); this.OK = new System.Windows.Forms.Button(); this.Cancel = new System.Windows.Forms.Button(); this.buttonInterpolateBG = new System.Windows.Forms.Button(); @@ -164,29 +164,20 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(14, 27); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(22, 13); - this.label1.TabIndex = 12; this.label1.Text = "BG"; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(9, 66); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(27, 13); - this.label2.TabIndex = 13; this.label2.Text = "SP1"; // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(9, 103); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(27, 13); - this.label3.TabIndex = 14; this.label3.Text = "SP2"; // // OK @@ -339,9 +330,9 @@ private System.Windows.Forms.Panel panel10; private System.Windows.Forms.Panel panel11; private System.Windows.Forms.Panel panel12; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label2; + private BizHawk.WinForms.Controls.LocLabelEx label3; private System.Windows.Forms.Button OK; private System.Windows.Forms.Button Cancel; private System.Windows.Forms.Button buttonInterpolateBG; diff --git a/src/BizHawk.Client.EmuHawk/config/HotkeyConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/HotkeyConfig.Designer.cs index 58e991f0e2..e1599ea5a5 100644 --- a/src/BizHawk.Client.EmuHawk/config/HotkeyConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/HotkeyConfig.Designer.cs @@ -29,16 +29,16 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - this.label38 = new System.Windows.Forms.Label(); + this.label38 = new BizHawk.WinForms.Controls.LocLabelEx(); this.AutoTabCheckBox = new System.Windows.Forms.CheckBox(); this.HotkeyTabControl = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.IDB_CANCEL = new System.Windows.Forms.Button(); this.IDB_SAVE = new System.Windows.Forms.Button(); this.SearchBox = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.MiscButton = new BizHawk.Client.EmuHawk.MenuButton(); this.clearBtnContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); @@ -53,11 +53,8 @@ // label38 // this.label38.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label38.AutoSize = true; this.label38.Location = new System.Drawing.Point(39, 441); this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(153, 13); - this.label38.TabIndex = 4; this.label38.Text = "* Escape clears a key mapping"; // // AutoTabCheckBox @@ -133,31 +130,22 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(556, 12); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(30, 13); - this.label1.TabIndex = 107; this.label1.Text = "Find:"; // // label2 // this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(194, 441); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(168, 13); - this.label2.TabIndex = 108; this.label2.Text = "* Disable Auto Tab to multiply bind"; // // label3 // this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(9, 441); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(30, 13); - this.label3.TabIndex = 109; this.label3.Text = "Tips:"; // // MiscButton @@ -237,16 +225,16 @@ #endregion - private System.Windows.Forms.Label label38; + private BizHawk.WinForms.Controls.LocLabelEx label38; private System.Windows.Forms.CheckBox AutoTabCheckBox; private System.Windows.Forms.TabControl HotkeyTabControl; private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.Button IDB_CANCEL; private System.Windows.Forms.Button IDB_SAVE; private System.Windows.Forms.TextBox SearchBox; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label2; + private BizHawk.WinForms.Controls.LocLabelEx label3; private System.Windows.Forms.ToolTip toolTip1; private MenuButton MiscButton; private System.Windows.Forms.ContextMenuStrip clearBtnContextMenu; diff --git a/src/BizHawk.Client.EmuHawk/config/INTV/IntvControllerSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/INTV/IntvControllerSettings.Designer.cs index d22ebe0736..ab60993bfb 100644 --- a/src/BizHawk.Client.EmuHawk/config/INTV/IntvControllerSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/INTV/IntvControllerSettings.Designer.cs @@ -30,11 +30,11 @@ { this.OkBtn = new System.Windows.Forms.Button(); this.CancelBtn = new System.Windows.Forms.Button(); - this.label5 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); this.Port2ComboBox = new System.Windows.Forms.ComboBox(); this.Port1ComboBox = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.SuspendLayout(); // // OkBtn @@ -62,20 +62,14 @@ // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(9, 94); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(38, 13); - this.label5.TabIndex = 16; this.label5.Text = "Port 2:"; // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(12, 44); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(38, 13); - this.label4.TabIndex = 15; this.label4.Text = "Port 1:"; // // Port2ComboBox @@ -102,11 +96,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 14); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(146, 13); - this.label1.TabIndex = 17; this.label1.Text = "Intellivision Controller Settings"; // // IntvControllerSettings @@ -136,10 +127,10 @@ private System.Windows.Forms.Button OkBtn; private System.Windows.Forms.Button CancelBtn; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label4; + private BizHawk.WinForms.Controls.LocLabelEx label5; + private BizHawk.WinForms.Controls.LocLabelEx label4; private System.Windows.Forms.ComboBox Port2ComboBox; private System.Windows.Forms.ComboBox Port1ComboBox; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/MessageConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/MessageConfig.Designer.cs index d43f52c9c3..16ad7f29f0 100644 --- a/src/BizHawk.Client.EmuHawk/config/MessageConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/MessageConfig.Designer.cs @@ -30,38 +30,38 @@ { this.OK = new System.Windows.Forms.Button(); this.MessageTypeBox = new System.Windows.Forms.GroupBox(); - this.AutoholdLabel = new System.Windows.Forms.Label(); + this.AutoholdLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.AutoholdRadio = new System.Windows.Forms.RadioButton(); - this.MultitrackLabel = new System.Windows.Forms.Label(); + this.MultitrackLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.MultitrackRadio = new System.Windows.Forms.RadioButton(); - this.RerecLabel = new System.Windows.Forms.Label(); + this.RerecLabel = new BizHawk.WinForms.Controls.LocLabelEx(); 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(); - this.FCLabel = new System.Windows.Forms.Label(); - this.FpsPosLabel = new System.Windows.Forms.Label(); + 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 System.Windows.Forms.Label(); + this.label12 = new BizHawk.WinForms.Controls.LocLabelEx(); this.MovieInputText = new System.Windows.Forms.TextBox(); - this.label11 = new System.Windows.Forms.Label(); + 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 System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); + this.label7 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label8 = new BizHawk.WinForms.Controls.LocLabelEx(); this.LInputText = new System.Windows.Forms.TextBox(); - this.label6 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); + this.label6 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); this.AlertColorText = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); + 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(); @@ -69,8 +69,8 @@ this.PositionPanel = new System.Windows.Forms.Panel(); this.XNumeric = new System.Windows.Forms.NumericUpDown(); this.YNumeric = new System.Windows.Forms.NumericUpDown(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); + 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(); @@ -81,7 +81,7 @@ this.MovieInputColorDialog = new System.Windows.Forms.ColorDialog(); this.StackMessagesCheckbox = new System.Windows.Forms.CheckBox(); this.WatchesRadio = new System.Windows.Forms.RadioButton(); - this.WatchesLabel = new System.Windows.Forms.Label(); + this.WatchesLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.MessageTypeBox.SuspendLayout(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.XNumeric)).BeginInit(); @@ -130,11 +130,8 @@ // AutoholdLabel // this.AutoholdLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.AutoholdLabel.AutoSize = true; this.AutoholdLabel.Location = new System.Drawing.Point(126, 209); this.AutoholdLabel.Name = "AutoholdLabel"; - this.AutoholdLabel.Size = new System.Drawing.Size(49, 13); - this.AutoholdLabel.TabIndex = 15; this.AutoholdLabel.Text = "255, 255"; // // AutoholdRadio @@ -152,11 +149,8 @@ // MultitrackLabel // this.MultitrackLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.MultitrackLabel.AutoSize = true; this.MultitrackLabel.Location = new System.Drawing.Point(126, 185); this.MultitrackLabel.Name = "MultitrackLabel"; - this.MultitrackLabel.Size = new System.Drawing.Size(49, 13); - this.MultitrackLabel.TabIndex = 13; this.MultitrackLabel.Text = "255, 255"; // // MultitrackRadio @@ -174,11 +168,8 @@ // RerecLabel // this.RerecLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.RerecLabel.AutoSize = true; this.RerecLabel.Location = new System.Drawing.Point(126, 161); this.RerecLabel.Name = "RerecLabel"; - this.RerecLabel.Size = new System.Drawing.Size(49, 13); - this.RerecLabel.TabIndex = 11; this.RerecLabel.Text = "255, 255"; // // RerecordsRadio @@ -195,51 +186,36 @@ // MessLabel // this.MessLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.MessLabel.AutoSize = true; this.MessLabel.Location = new System.Drawing.Point(126, 137); this.MessLabel.Name = "MessLabel"; - this.MessLabel.Size = new System.Drawing.Size(49, 13); - this.MessLabel.TabIndex = 9; 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.AutoSize = true; this.InpLabel.Location = new System.Drawing.Point(126, 92); this.InpLabel.Name = "InpLabel"; - this.InpLabel.Size = new System.Drawing.Size(49, 13); - this.InpLabel.TabIndex = 8; 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.AutoSize = true; this.LagLabel.Location = new System.Drawing.Point(126, 68); this.LagLabel.Name = "LagLabel"; - this.LagLabel.Size = new System.Drawing.Size(49, 13); - this.LagLabel.TabIndex = 7; 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.AutoSize = true; this.FCLabel.Location = new System.Drawing.Point(126, 44); this.FCLabel.Name = "FCLabel"; - this.FCLabel.Size = new System.Drawing.Size(49, 13); - this.FCLabel.TabIndex = 6; 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.AutoSize = true; this.FpsPosLabel.Location = new System.Drawing.Point(126, 20); this.FpsPosLabel.Name = "FpsPosLabel"; - this.FpsPosLabel.Size = new System.Drawing.Size(49, 13); - this.FpsPosLabel.TabIndex = 5; this.FpsPosLabel.Text = "255, 255"; // // MessagesRadio @@ -326,11 +302,8 @@ // // label12 // - this.label12.AutoSize = true; this.label12.Location = new System.Drawing.Point(1, 161); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(63, 13); - this.label12.TabIndex = 24; this.label12.Text = "Movie Input"; // // MovieInputText @@ -345,11 +318,8 @@ // // label11 // - this.label11.AutoSize = true; this.label11.Location = new System.Drawing.Point(28, 190); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(18, 13); - this.label11.TabIndex = 22; this.label11.Text = "0x"; // // MovieInputColor @@ -390,20 +360,14 @@ // // label7 // - this.label7.AutoSize = true; this.label7.Location = new System.Drawing.Point(1, 111); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(86, 13); - this.label7.TabIndex = 18; this.label7.Text = "Previous Frame Input"; // // label8 // - this.label8.AutoSize = true; this.label8.Location = new System.Drawing.Point(28, 133); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(18, 13); - this.label8.TabIndex = 17; this.label8.Text = "0x"; // // LInputText @@ -418,20 +382,14 @@ // // label6 // - this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(1, 62); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(78, 13); - this.label6.TabIndex = 13; this.label6.Text = "Alert messages"; // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(28, 84); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(18, 13); - this.label5.TabIndex = 12; this.label5.Text = "0x"; // // AlertColorText @@ -446,20 +404,14 @@ // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(6, 18); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(80, 13); - this.label4.TabIndex = 8; this.label4.Text = "Main messages"; // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(28, 37); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(18, 13); - this.label3.TabIndex = 7; this.label3.Text = "0x"; // // ColorText @@ -554,21 +506,15 @@ // label1 // this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(27, 274); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(12, 13); - this.label1.TabIndex = 3; this.label1.Text = "x"; // // label2 // this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(92, 273); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(12, 13); - this.label2.TabIndex = 4; this.label2.Text = "y"; // // PositionGroupBox @@ -671,11 +617,8 @@ // WatchesLabel // this.WatchesLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.WatchesLabel.AutoSize = true; this.WatchesLabel.Location = new System.Drawing.Point(126, 116); this.WatchesLabel.Name = "WatchesLabel"; - this.WatchesLabel.Size = new System.Drawing.Size(49, 13); - this.WatchesLabel.TabIndex = 17; this.WatchesLabel.Text = "255, 255"; // // MessageConfig @@ -724,27 +667,27 @@ private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.ColorDialog MessageColorDialog; private System.Windows.Forms.Button Cancel; - private System.Windows.Forms.Label MessLabel; - private System.Windows.Forms.Label InpLabel; - private System.Windows.Forms.Label LagLabel; - private System.Windows.Forms.Label FCLabel; - private System.Windows.Forms.Label FpsPosLabel; + private BizHawk.WinForms.Controls.LocLabelEx MessLabel; + private BizHawk.WinForms.Controls.LocLabelEx InpLabel; + private BizHawk.WinForms.Controls.LocLabelEx LagLabel; + private BizHawk.WinForms.Controls.LocLabelEx FCLabel; + private BizHawk.WinForms.Controls.LocLabelEx FpsPosLabel; private System.Windows.Forms.Button ResetDefaultsButton; private System.Windows.Forms.TextBox ColorText; - private System.Windows.Forms.Label label3; + private BizHawk.WinForms.Controls.LocLabelEx label3; private System.Windows.Forms.Panel PositionPanel; private System.Windows.Forms.NumericUpDown XNumeric; private System.Windows.Forms.NumericUpDown YNumeric; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label2; private System.Windows.Forms.GroupBox PositionGroupBox; - private System.Windows.Forms.Label label5; + private BizHawk.WinForms.Controls.LocLabelEx label5; private System.Windows.Forms.TextBox AlertColorText; private System.Windows.Forms.Panel AlertColorPanel; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.Label label8; + private BizHawk.WinForms.Controls.LocLabelEx label4; + private BizHawk.WinForms.Controls.LocLabelEx label6; + private BizHawk.WinForms.Controls.LocLabelEx label7; + private BizHawk.WinForms.Controls.LocLabelEx label8; private System.Windows.Forms.TextBox LInputText; private System.Windows.Forms.Panel LInputColorPanel; private System.Windows.Forms.ColorDialog AlertColorDialog; @@ -753,20 +696,20 @@ 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 BizHawk.WinForms.Controls.LocLabelEx RerecLabel; private System.Windows.Forms.RadioButton RerecordsRadio; private System.Windows.Forms.Panel ColorPanel; private System.Windows.Forms.TextBox MovieInputText; - private System.Windows.Forms.Label label11; + private BizHawk.WinForms.Controls.LocLabelEx label11; private System.Windows.Forms.Panel MovieInputColor; - private System.Windows.Forms.Label label12; + private BizHawk.WinForms.Controls.LocLabelEx label12; private System.Windows.Forms.ColorDialog MovieInputColorDialog; - private System.Windows.Forms.Label MultitrackLabel; + private BizHawk.WinForms.Controls.LocLabelEx MultitrackLabel; private System.Windows.Forms.RadioButton MultitrackRadio; private System.Windows.Forms.CheckBox StackMessagesCheckbox; - private System.Windows.Forms.Label AutoholdLabel; + private BizHawk.WinForms.Controls.LocLabelEx AutoholdLabel; private System.Windows.Forms.RadioButton AutoholdRadio; - private System.Windows.Forms.Label WatchesLabel; + private BizHawk.WinForms.Controls.LocLabelEx WatchesLabel; private System.Windows.Forms.RadioButton WatchesRadio; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/N64/N64ControllerSettingControl.Designer.cs b/src/BizHawk.Client.EmuHawk/config/N64/N64ControllerSettingControl.Designer.cs index 29f7f4cefc..c774521365 100644 --- a/src/BizHawk.Client.EmuHawk/config/N64/N64ControllerSettingControl.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/N64/N64ControllerSettingControl.Designer.cs @@ -30,7 +30,7 @@ { this.EnabledCheckbox = new System.Windows.Forms.CheckBox(); this.PakTypeDropdown = new System.Windows.Forms.ComboBox(); - this.ControllerNameLabel = new System.Windows.Forms.Label(); + this.ControllerNameLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.SuspendLayout(); // // EnabledCheckbox @@ -60,11 +60,8 @@ // // ControllerNameLabel // - this.ControllerNameLabel.AutoSize = true; this.ControllerNameLabel.Location = new System.Drawing.Point(3, 4); this.ControllerNameLabel.Name = "ControllerNameLabel"; - this.ControllerNameLabel.Size = new System.Drawing.Size(60, 13); - this.ControllerNameLabel.TabIndex = 2; this.ControllerNameLabel.Text = "Controller 1"; // // N64ControllerSettingControl @@ -84,6 +81,6 @@ private System.Windows.Forms.CheckBox EnabledCheckbox; private System.Windows.Forms.ComboBox PakTypeDropdown; - private System.Windows.Forms.Label ControllerNameLabel; + private BizHawk.WinForms.Controls.LocLabelEx ControllerNameLabel; } } diff --git a/src/BizHawk.Client.EmuHawk/config/NDS/NDSSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/NDS/NDSSettings.Designer.cs index 0eaca17c47..48bbb15984 100644 --- a/src/BizHawk.Client.EmuHawk/config/NDS/NDSSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/NDS/NDSSettings.Designer.cs @@ -1,49 +1,49 @@ -namespace BizHawk.Client.EmuHawk -{ - partial class NdsSettings - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { +namespace BizHawk.Client.EmuHawk +{ + partial class NdsSettings + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { this.components = new System.ComponentModel.Container(); this.chkBootToFirmware = new System.Windows.Forms.CheckBox(); this.btnCancel = new System.Windows.Forms.Button(); this.btnSave = new System.Windows.Forms.Button(); this.ttipFirmware = new System.Windows.Forms.ToolTip(this.components); this.txtName = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.numBirthDay = new System.Windows.Forms.NumericUpDown(); this.numBirthMonth = new System.Windows.Forms.NumericUpDown(); - this.label3 = new System.Windows.Forms.Label(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); this.cbxFavColor = new System.Windows.Forms.ComboBox(); - this.label2 = new System.Windows.Forms.Label(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.btnDefault = new System.Windows.Forms.Button(); this.dtpStartupTime = new System.Windows.Forms.DateTimePicker(); - this.label4 = new System.Windows.Forms.Label(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numBirthDay)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numBirthMonth)).BeginInit(); @@ -94,11 +94,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(6, 19); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(38, 13); - this.label1.TabIndex = 3; this.label1.Text = "Name:"; // // groupBox1 @@ -156,11 +153,8 @@ // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(6, 71); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(79, 13); - this.label3.TabIndex = 6; this.label3.Text = "Birthday (M/D):"; // // cbxFavColor @@ -191,11 +185,8 @@ // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(6, 45); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(34, 13); - this.label2.TabIndex = 4; this.label2.Text = "Color:"; // // btnDefault @@ -225,11 +216,8 @@ // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(12, 154); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(57, 13); - this.label4.TabIndex = 6; this.label4.Text = "Date/time:"; // // NdsSettings @@ -261,24 +249,24 @@ this.ResumeLayout(false); this.PerformLayout(); - } - - #endregion - - private System.Windows.Forms.CheckBox chkBootToFirmware; - private System.Windows.Forms.Button btnCancel; - private System.Windows.Forms.Button btnSave; - private System.Windows.Forms.ToolTip ttipFirmware; - private System.Windows.Forms.TextBox txtName; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.ComboBox cbxFavColor; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.NumericUpDown numBirthDay; - private System.Windows.Forms.NumericUpDown numBirthMonth; - private System.Windows.Forms.Button btnDefault; - private System.Windows.Forms.DateTimePicker dtpStartupTime; - private System.Windows.Forms.Label label4; - } + } + + #endregion + + private System.Windows.Forms.CheckBox chkBootToFirmware; + private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.Button btnSave; + private System.Windows.Forms.ToolTip ttipFirmware; + private System.Windows.Forms.TextBox txtName; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private System.Windows.Forms.GroupBox groupBox1; + private BizHawk.WinForms.Controls.LocLabelEx label3; + private System.Windows.Forms.ComboBox cbxFavColor; + private BizHawk.WinForms.Controls.LocLabelEx label2; + private System.Windows.Forms.NumericUpDown numBirthDay; + private System.Windows.Forms.NumericUpDown numBirthMonth; + private System.Windows.Forms.Button btnDefault; + private System.Windows.Forms.DateTimePicker dtpStartupTime; + private BizHawk.WinForms.Controls.LocLabelEx label4; + } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/NES/NESGraphicsConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/NES/NESGraphicsConfig.Designer.cs index d4527e1589..a1a8447485 100644 --- a/src/BizHawk.Client.EmuHawk/config/NES/NESGraphicsConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/NES/NESGraphicsConfig.Designer.cs @@ -34,18 +34,18 @@ this.groupBox1 = new System.Windows.Forms.GroupBox(); this.pictureBoxPalette = new System.Windows.Forms.PictureBox(); this.AutoLoadPalette = new System.Windows.Forms.CheckBox(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.PalettePath = new System.Windows.Forms.TextBox(); this.BrowsePalette = new System.Windows.Forms.Button(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.label6 = new System.Windows.Forms.Label(); + this.label6 = new BizHawk.WinForms.Controls.LocLabelEx(); this.PAL_LastLineNumeric = new System.Windows.Forms.NumericUpDown(); this.PAL_FirstLineNumeric = new System.Windows.Forms.NumericUpDown(); - this.label5 = new System.Windows.Forms.Label(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); this.btnAreaFull = new System.Windows.Forms.Button(); this.btnAreaStandard = new System.Windows.Forms.Button(); - this.label4 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); this.NTSC_LastLineNumeric = new System.Windows.Forms.NumericUpDown(); this.NTSC_FirstLineNumeric = new System.Windows.Forms.NumericUpDown(); this.ClipLeftAndRightCheckBox = new System.Windows.Forms.CheckBox(); @@ -53,14 +53,14 @@ this.checkUseBackdropColor = new System.Windows.Forms.CheckBox(); this.ChangeBGColor = new System.Windows.Forms.Button(); this.BackGroundColorNumber = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.groupBox4 = new System.Windows.Forms.GroupBox(); this.BackgroundColorPanel = new System.Windows.Forms.Panel(); this.DispBackground = new System.Windows.Forms.CheckBox(); this.DispSprites = new System.Windows.Forms.CheckBox(); this.BGColorDialog = new System.Windows.Forms.ColorDialog(); this.RestoreDefaultsButton = new System.Windows.Forms.Button(); - this.label7 = new System.Windows.Forms.Label(); + this.label7 = new BizHawk.WinForms.Controls.LocLabelEx(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxPalette)).BeginInit(); this.groupBox2.SuspendLayout(); @@ -142,11 +142,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(6, 24); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(100, 13); - this.label1.TabIndex = 2; this.label1.Text = "Use palette from file"; // // PalettePath @@ -194,11 +191,8 @@ // // label6 // - this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(131, 22); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(27, 13); - this.label6.TabIndex = 44; this.label6.Text = "PAL"; // // PAL_LastLineNumeric @@ -237,11 +231,8 @@ // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(62, 22); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(36, 13); - this.label5.TabIndex = 41; this.label5.Text = "NTSC"; // // btnAreaFull @@ -266,20 +257,14 @@ // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(4, 69); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(49, 13); - this.label4.TabIndex = 24; this.label4.Text = "Last line:"; // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(5, 43); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(48, 13); - this.label3.TabIndex = 23; this.label3.Text = "First line:"; // // NTSC_LastLineNumeric @@ -377,11 +362,8 @@ // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(8, 64); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(178, 13); - this.label2.TabIndex = 3; this.label2.Text = "Backdrop color when BG is disabled"; // // groupBox4 @@ -439,11 +421,8 @@ // // label7 // - this.label7.AutoSize = true; this.label7.Location = new System.Drawing.Point(142, 67); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(183, 13); - this.label7.TabIndex = 61; this.label7.Text = "(The QuickNES palette is the default)"; // // NESGraphicsConfig @@ -493,7 +472,7 @@ private System.Windows.Forms.TextBox PalettePath; private System.Windows.Forms.Button BrowsePalette; private System.Windows.Forms.CheckBox AutoLoadPalette; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.CheckBox ClipLeftAndRightCheckBox; private System.Windows.Forms.GroupBox groupBox3; @@ -501,23 +480,23 @@ private System.Windows.Forms.CheckBox DispBackground; private System.Windows.Forms.GroupBox groupBox4; private System.Windows.Forms.Panel BackgroundColorPanel; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label2; private System.Windows.Forms.TextBox BackGroundColorNumber; private System.Windows.Forms.Button ChangeBGColor; private System.Windows.Forms.ColorDialog BGColorDialog; private System.Windows.Forms.CheckBox checkUseBackdropColor; private System.Windows.Forms.NumericUpDown NTSC_FirstLineNumeric; private System.Windows.Forms.NumericUpDown NTSC_LastLineNumeric; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label3; + private BizHawk.WinForms.Controls.LocLabelEx label4; + private BizHawk.WinForms.Controls.LocLabelEx label3; private System.Windows.Forms.Button btnAreaFull; private System.Windows.Forms.Button btnAreaStandard; private System.Windows.Forms.Button RestoreDefaultsButton; - private System.Windows.Forms.Label label6; + private BizHawk.WinForms.Controls.LocLabelEx label6; private System.Windows.Forms.NumericUpDown PAL_LastLineNumeric; private System.Windows.Forms.NumericUpDown PAL_FirstLineNumeric; - private System.Windows.Forms.Label label5; + private BizHawk.WinForms.Controls.LocLabelEx label5; private System.Windows.Forms.PictureBox pictureBoxPalette; - private System.Windows.Forms.Label label7; + private BizHawk.WinForms.Controls.LocLabelEx label7; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/NES/NESSoundConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/NES/NESSoundConfig.Designer.cs index 22e5372ca6..b45606db35 100644 --- a/src/BizHawk.Client.EmuHawk/config/NES/NESSoundConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/NES/NESSoundConfig.Designer.cs @@ -31,8 +31,8 @@ this.OK = new System.Windows.Forms.Button(); this.Cancel = new System.Windows.Forms.Button(); this.trackBar1 = new System.Windows.Forms.TrackBar(); - this.label1 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label6 = new BizHawk.WinForms.Controls.LocLabelEx(); ((System.ComponentModel.ISupportInitialize)(this.trackBar1)).BeginInit(); this.SuspendLayout(); // @@ -72,20 +72,14 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(122, 12); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(67, 13); - this.label1.TabIndex = 7; this.label1.Text = "APU Volume"; // // label6 // - this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(122, 25); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(13, 13); - this.label6.TabIndex = 12; this.label6.Text = "0"; // // NESSoundConfig @@ -117,7 +111,7 @@ private System.Windows.Forms.Button OK; private System.Windows.Forms.Button Cancel; private System.Windows.Forms.TrackBar trackBar1; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label6; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label6; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/NES/NESSyncSettingsForm.Designer.cs b/src/BizHawk.Client.EmuHawk/config/NES/NESSyncSettingsForm.Designer.cs index bff17c64e2..19dbfef35d 100644 --- a/src/BizHawk.Client.EmuHawk/config/NES/NESSyncSettingsForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/NES/NESSyncSettingsForm.Designer.cs @@ -33,13 +33,13 @@ this.dataGridView1 = new System.Windows.Forms.DataGridView(); this.RegionComboBox = new System.Windows.Forms.ComboBox(); this.HelpBtn = new System.Windows.Forms.Button(); - this.label2 = new System.Windows.Forms.Label(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.BoardPropertiesGroupBox = new System.Windows.Forms.GroupBox(); - this.label1 = new System.Windows.Forms.Label(); - this.InfoLabel = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.InfoLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); this.RamPatternOverrideBox = new BizHawk.Client.EmuHawk.HexTextBox(); - this.label4 = new System.Windows.Forms.Label(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.BoardPropertiesGroupBox.SuspendLayout(); this.SuspendLayout(); @@ -100,11 +100,8 @@ // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(9, 10); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(87, 13); - this.label2.TabIndex = 12; this.label2.Text = "Region Override:"; // // BoardPropertiesGroupBox @@ -122,30 +119,21 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 53); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(362, 13); - this.label1.TabIndex = 14; this.label1.Text = "Region Override will be ignored when playing Famicom Disk System games."; // // InfoLabel // this.InfoLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.InfoLabel.AutoSize = true; this.InfoLabel.Location = new System.Drawing.Point(41, 182); this.InfoLabel.Name = "InfoLabel"; - this.InfoLabel.Size = new System.Drawing.Size(213, 13); - this.InfoLabel.TabIndex = 15; this.InfoLabel.Text = "The current board has no custom properties"; // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(12, 92); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(133, 13); - this.label3.TabIndex = 16; this.label3.Text = "Initial Ram pattern override"; // // RamPatternOverrideBox @@ -159,11 +147,8 @@ // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(12, 131); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(269, 13); - this.label4.TabIndex = 18; this.label4.Text = "Provides an override to the initial WRAM startup pattern"; // // NESSyncSettingsForm @@ -203,12 +188,12 @@ private System.Windows.Forms.DataGridView dataGridView1; private System.Windows.Forms.ComboBox RegionComboBox; private System.Windows.Forms.Button HelpBtn; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label2; + private BizHawk.WinForms.Controls.LocLabelEx label1; internal System.Windows.Forms.GroupBox BoardPropertiesGroupBox; - private System.Windows.Forms.Label InfoLabel; - private System.Windows.Forms.Label label3; + private BizHawk.WinForms.Controls.LocLabelEx InfoLabel; + private BizHawk.WinForms.Controls.LocLabelEx label3; private HexTextBox RamPatternOverrideBox; - private System.Windows.Forms.Label label4; + private BizHawk.WinForms.Controls.LocLabelEx label4; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.Designer.cs index f1fd2cff4d..a3facf9786 100644 --- a/src/BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.Designer.cs @@ -31,9 +31,9 @@ this.CancelBtn = new System.Windows.Forms.Button(); this.OkBtn = new System.Windows.Forms.Button(); this.checkBoxFamicom = new System.Windows.Forms.CheckBox(); - this.label5 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); this.comboBoxNESR = new System.Windows.Forms.ComboBox(); this.comboBoxNESL = new System.Windows.Forms.ComboBox(); this.comboBoxFamicom = new System.Windows.Forms.ComboBox(); @@ -75,29 +75,20 @@ // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(6, 138); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(82, 13); - this.label5.TabIndex = 12; this.label5.Text = "NES Right Port:"; // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(9, 98); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(75, 13); - this.label4.TabIndex = 11; this.label4.Text = "NES Left Port:"; // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(9, 58); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(104, 13); - this.label3.TabIndex = 10; this.label3.Text = "Famicom Expansion:"; // // comboBoxNESR @@ -157,9 +148,9 @@ private System.Windows.Forms.Button CancelBtn; private System.Windows.Forms.Button OkBtn; private System.Windows.Forms.CheckBox checkBoxFamicom; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label3; + private BizHawk.WinForms.Controls.LocLabelEx label5; + private BizHawk.WinForms.Controls.LocLabelEx label4; + private BizHawk.WinForms.Controls.LocLabelEx label3; private System.Windows.Forms.ComboBox comboBoxNESR; private System.Windows.Forms.ComboBox comboBoxNESL; private System.Windows.Forms.ComboBox comboBoxFamicom; diff --git a/src/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.Designer.cs index c1c454ecf5..5e07a6c9c5 100644 --- a/src/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.Designer.cs @@ -35,7 +35,7 @@ this.buttonCancel = new System.Windows.Forms.Button(); this.buttonPal = new System.Windows.Forms.Button(); this.buttonPalReset = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); @@ -119,11 +119,8 @@ // label1 // this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 374); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(43, 13); - this.label1.TabIndex = 6; this.label1.Text = "Palette:"; // // QuickNesConfig @@ -161,6 +158,6 @@ private System.Windows.Forms.Button buttonPal; private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.Button buttonPalReset; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.Designer.cs index 2e574ea34c..41ee757230 100644 --- a/src/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.Designer.cs @@ -30,14 +30,14 @@ { this.cbMultitap_1 = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.lbl_p_1_4 = new System.Windows.Forms.Label(); - this.lbl_p_1_3 = new System.Windows.Forms.Label(); - this.lbl_p_1_2 = new System.Windows.Forms.Label(); - this.lbl_p_1_1 = new System.Windows.Forms.Label(); - this.lbl_1_4 = new System.Windows.Forms.Label(); - this.lbl_1_3 = new System.Windows.Forms.Label(); - this.lbl_1_2 = new System.Windows.Forms.Label(); - this.lbl_1_1 = new System.Windows.Forms.Label(); + this.lbl_p_1_4 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lbl_p_1_3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lbl_p_1_2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lbl_p_1_1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lbl_1_4 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lbl_1_3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lbl_1_2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lbl_1_1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.combo_1_4 = new System.Windows.Forms.ComboBox(); this.combo_1_3 = new System.Windows.Forms.ComboBox(); this.combo_1_2 = new System.Windows.Forms.ComboBox(); @@ -46,14 +46,14 @@ this.btnOK = new System.Windows.Forms.Button(); this.btnCancel = new System.Windows.Forms.Button(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.lbl_p_2_4 = new System.Windows.Forms.Label(); - this.lbl_p_2_3 = new System.Windows.Forms.Label(); - this.lbl_p_2_2 = new System.Windows.Forms.Label(); - this.lbl_p_2_1 = new System.Windows.Forms.Label(); - this.lbl_2_4 = new System.Windows.Forms.Label(); - this.lbl_2_3 = new System.Windows.Forms.Label(); - this.lbl_2_2 = new System.Windows.Forms.Label(); - this.lbl_2_1 = new System.Windows.Forms.Label(); + this.lbl_p_2_4 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lbl_p_2_3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lbl_p_2_2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lbl_p_2_1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lbl_2_4 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lbl_2_3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lbl_2_2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lbl_2_1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.combo_2_4 = new System.Windows.Forms.ComboBox(); this.combo_2_3 = new System.Windows.Forms.ComboBox(); this.combo_2_2 = new System.Windows.Forms.ComboBox(); @@ -100,81 +100,57 @@ // // lbl_p_1_4 // - this.lbl_p_1_4.AutoSize = true; this.lbl_p_1_4.Location = new System.Drawing.Point(241, 105); this.lbl_p_1_4.Name = "lbl_p_1_4"; - this.lbl_p_1_4.Size = new System.Drawing.Size(20, 13); - this.lbl_p_1_4.TabIndex = 12; this.lbl_p_1_4.Text = "P1"; this.lbl_p_1_4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // lbl_p_1_3 // - this.lbl_p_1_3.AutoSize = true; this.lbl_p_1_3.Location = new System.Drawing.Point(241, 78); this.lbl_p_1_3.Name = "lbl_p_1_3"; - this.lbl_p_1_3.Size = new System.Drawing.Size(20, 13); - this.lbl_p_1_3.TabIndex = 11; this.lbl_p_1_3.Text = "P1"; this.lbl_p_1_3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // lbl_p_1_2 // - this.lbl_p_1_2.AutoSize = true; this.lbl_p_1_2.Location = new System.Drawing.Point(241, 50); this.lbl_p_1_2.Name = "lbl_p_1_2"; - this.lbl_p_1_2.Size = new System.Drawing.Size(20, 13); - this.lbl_p_1_2.TabIndex = 10; this.lbl_p_1_2.Text = "P1"; this.lbl_p_1_2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // lbl_p_1_1 // - this.lbl_p_1_1.AutoSize = true; this.lbl_p_1_1.Location = new System.Drawing.Point(241, 24); this.lbl_p_1_1.Name = "lbl_p_1_1"; - this.lbl_p_1_1.Size = new System.Drawing.Size(20, 13); - this.lbl_p_1_1.TabIndex = 9; this.lbl_p_1_1.Text = "P1"; this.lbl_p_1_1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // lbl_1_4 // - this.lbl_1_4.AutoSize = true; this.lbl_1_4.Location = new System.Drawing.Point(94, 105); this.lbl_1_4.Name = "lbl_1_4"; - this.lbl_1_4.Size = new System.Drawing.Size(15, 13); - this.lbl_1_4.TabIndex = 8; this.lbl_1_4.Text = "D"; this.lbl_1_4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // lbl_1_3 // - this.lbl_1_3.AutoSize = true; this.lbl_1_3.Location = new System.Drawing.Point(94, 78); this.lbl_1_3.Name = "lbl_1_3"; - this.lbl_1_3.Size = new System.Drawing.Size(14, 13); - this.lbl_1_3.TabIndex = 7; this.lbl_1_3.Text = "C"; this.lbl_1_3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // lbl_1_2 // - this.lbl_1_2.AutoSize = true; this.lbl_1_2.Location = new System.Drawing.Point(94, 51); this.lbl_1_2.Name = "lbl_1_2"; - this.lbl_1_2.Size = new System.Drawing.Size(14, 13); - this.lbl_1_2.TabIndex = 6; this.lbl_1_2.Text = "B"; this.lbl_1_2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // lbl_1_1 // - this.lbl_1_1.AutoSize = true; this.lbl_1_1.Location = new System.Drawing.Point(94, 24); this.lbl_1_1.Name = "lbl_1_1"; - this.lbl_1_1.Size = new System.Drawing.Size(14, 13); - this.lbl_1_1.TabIndex = 2; this.lbl_1_1.Text = "A"; this.lbl_1_1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // @@ -275,81 +251,57 @@ // // lbl_p_2_4 // - this.lbl_p_2_4.AutoSize = true; this.lbl_p_2_4.Location = new System.Drawing.Point(241, 105); this.lbl_p_2_4.Name = "lbl_p_2_4"; - this.lbl_p_2_4.Size = new System.Drawing.Size(20, 13); - this.lbl_p_2_4.TabIndex = 12; this.lbl_p_2_4.Text = "P1"; this.lbl_p_2_4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // lbl_p_2_3 // - this.lbl_p_2_3.AutoSize = true; this.lbl_p_2_3.Location = new System.Drawing.Point(241, 78); this.lbl_p_2_3.Name = "lbl_p_2_3"; - this.lbl_p_2_3.Size = new System.Drawing.Size(20, 13); - this.lbl_p_2_3.TabIndex = 11; this.lbl_p_2_3.Text = "P1"; this.lbl_p_2_3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // lbl_p_2_2 // - this.lbl_p_2_2.AutoSize = true; this.lbl_p_2_2.Location = new System.Drawing.Point(241, 50); this.lbl_p_2_2.Name = "lbl_p_2_2"; - this.lbl_p_2_2.Size = new System.Drawing.Size(20, 13); - this.lbl_p_2_2.TabIndex = 10; this.lbl_p_2_2.Text = "P1"; this.lbl_p_2_2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // lbl_p_2_1 // - this.lbl_p_2_1.AutoSize = true; this.lbl_p_2_1.Location = new System.Drawing.Point(241, 24); this.lbl_p_2_1.Name = "lbl_p_2_1"; - this.lbl_p_2_1.Size = new System.Drawing.Size(20, 13); - this.lbl_p_2_1.TabIndex = 9; this.lbl_p_2_1.Text = "P1"; this.lbl_p_2_1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // lbl_2_4 // - this.lbl_2_4.AutoSize = true; this.lbl_2_4.Location = new System.Drawing.Point(94, 105); this.lbl_2_4.Name = "lbl_2_4"; - this.lbl_2_4.Size = new System.Drawing.Size(15, 13); - this.lbl_2_4.TabIndex = 8; this.lbl_2_4.Text = "D"; this.lbl_2_4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // lbl_2_3 // - this.lbl_2_3.AutoSize = true; this.lbl_2_3.Location = new System.Drawing.Point(94, 78); this.lbl_2_3.Name = "lbl_2_3"; - this.lbl_2_3.Size = new System.Drawing.Size(14, 13); - this.lbl_2_3.TabIndex = 7; this.lbl_2_3.Text = "C"; this.lbl_2_3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // lbl_2_2 // - this.lbl_2_2.AutoSize = true; this.lbl_2_2.Location = new System.Drawing.Point(94, 51); this.lbl_2_2.Name = "lbl_2_2"; - this.lbl_2_2.Size = new System.Drawing.Size(14, 13); - this.lbl_2_2.TabIndex = 6; this.lbl_2_2.Text = "B"; this.lbl_2_2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // lbl_2_1 // - this.lbl_2_1.AutoSize = true; this.lbl_2_1.Location = new System.Drawing.Point(94, 24); this.lbl_2_1.Name = "lbl_2_1"; - this.lbl_2_1.Size = new System.Drawing.Size(14, 13); - this.lbl_2_1.TabIndex = 2; this.lbl_2_1.Text = "A"; this.lbl_2_1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // @@ -445,14 +397,14 @@ private System.Windows.Forms.CheckBox cbMultitap_1; private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Label lbl_p_1_4; - private System.Windows.Forms.Label lbl_p_1_3; - private System.Windows.Forms.Label lbl_p_1_2; - private System.Windows.Forms.Label lbl_p_1_1; - private System.Windows.Forms.Label lbl_1_4; - private System.Windows.Forms.Label lbl_1_3; - private System.Windows.Forms.Label lbl_1_2; - private System.Windows.Forms.Label lbl_1_1; + private BizHawk.WinForms.Controls.LocLabelEx lbl_p_1_4; + private BizHawk.WinForms.Controls.LocLabelEx lbl_p_1_3; + private BizHawk.WinForms.Controls.LocLabelEx lbl_p_1_2; + private BizHawk.WinForms.Controls.LocLabelEx lbl_p_1_1; + private BizHawk.WinForms.Controls.LocLabelEx lbl_1_4; + private BizHawk.WinForms.Controls.LocLabelEx lbl_1_3; + private BizHawk.WinForms.Controls.LocLabelEx lbl_1_2; + private BizHawk.WinForms.Controls.LocLabelEx lbl_1_1; private System.Windows.Forms.ComboBox combo_1_4; private System.Windows.Forms.ComboBox combo_1_3; private System.Windows.Forms.ComboBox combo_1_2; @@ -461,14 +413,14 @@ private System.Windows.Forms.Button btnOK; private System.Windows.Forms.Button btnCancel; private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.Label lbl_p_2_4; - private System.Windows.Forms.Label lbl_p_2_3; - private System.Windows.Forms.Label lbl_p_2_2; - private System.Windows.Forms.Label lbl_p_2_1; - private System.Windows.Forms.Label lbl_2_4; - private System.Windows.Forms.Label lbl_2_3; - private System.Windows.Forms.Label lbl_2_2; - private System.Windows.Forms.Label lbl_2_1; + private BizHawk.WinForms.Controls.LocLabelEx lbl_p_2_4; + private BizHawk.WinForms.Controls.LocLabelEx lbl_p_2_3; + private BizHawk.WinForms.Controls.LocLabelEx lbl_p_2_2; + private BizHawk.WinForms.Controls.LocLabelEx lbl_p_2_1; + private BizHawk.WinForms.Controls.LocLabelEx lbl_2_4; + private BizHawk.WinForms.Controls.LocLabelEx lbl_2_3; + private BizHawk.WinForms.Controls.LocLabelEx lbl_2_2; + private BizHawk.WinForms.Controls.LocLabelEx lbl_2_1; private System.Windows.Forms.ComboBox combo_2_4; private System.Windows.Forms.ComboBox combo_2_3; private System.Windows.Forms.ComboBox combo_2_2; diff --git a/src/BizHawk.Client.EmuHawk/config/PSX/PSXHashDiscs.Designer.cs b/src/BizHawk.Client.EmuHawk/config/PSX/PSXHashDiscs.Designer.cs index bd1c5616fc..cf51e45eb1 100644 --- a/src/BizHawk.Client.EmuHawk/config/PSX/PSXHashDiscs.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/PSX/PSXHashDiscs.Designer.cs @@ -31,8 +31,8 @@ this.btnClose = new System.Windows.Forms.Button(); this.btnHash = new System.Windows.Forms.Button(); this.txtHashes = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.SuspendLayout(); // // btnClose @@ -67,20 +67,14 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(24, 211); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(200, 13); - this.label1.TabIndex = 3; this.label1.Text = "Sorry, this is gonna freeze while it hashes"; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(96, 9); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(223, 26); - this.label2.TabIndex = 4; this.label2.Text = "This tool hashes your discs in a standard way.\r\nCheck against redump.org \"Total\" " + "CRC-32"; // @@ -110,7 +104,7 @@ private System.Windows.Forms.Button btnClose; private System.Windows.Forms.Button btnHash; private System.Windows.Forms.TextBox txtHashes; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label2; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/PSX/PSXOptions.Designer.cs b/src/BizHawk.Client.EmuHawk/config/PSX/PSXOptions.Designer.cs index 661749b9e3..d9a2737c5c 100644 --- a/src/BizHawk.Client.EmuHawk/config/PSX/PSXOptions.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/PSX/PSXOptions.Designer.cs @@ -34,27 +34,27 @@ this.btnOk = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.linkLabel1 = new System.Windows.Forms.LinkLabel(); - this.lblTweakedMednafen = new System.Windows.Forms.Label(); + this.lblTweakedMednafen = new BizHawk.WinForms.Controls.LocLabelEx(); this.rbTweakedMednafenMode = new System.Windows.Forms.RadioButton(); - this.label3 = new System.Windows.Forms.Label(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); this.rbDebugMode = new System.Windows.Forms.RadioButton(); this.btnNiceDisplayConfig = new System.Windows.Forms.Button(); - this.lblMednafen = new System.Windows.Forms.Label(); + this.lblMednafen = new BizHawk.WinForms.Controls.LocLabelEx(); this.rbMednafenMode = new System.Windows.Forms.RadioButton(); - this.lblPixelPro = new System.Windows.Forms.Label(); + this.lblPixelPro = new BizHawk.WinForms.Controls.LocLabelEx(); this.rbPixelPro = new System.Windows.Forms.RadioButton(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.rbClipNone = new System.Windows.Forms.RadioButton(); this.rbClipToFramebuffer = new System.Windows.Forms.RadioButton(); this.rbClipBasic = new System.Windows.Forms.RadioButton(); - this.lblPAL = new System.Windows.Forms.Label(); + this.lblPAL = new BizHawk.WinForms.Controls.LocLabelEx(); this.PAL_LastLineNumeric = new System.Windows.Forms.NumericUpDown(); this.PAL_FirstLineNumeric = new System.Windows.Forms.NumericUpDown(); - this.lblNTSC = new System.Windows.Forms.Label(); + this.lblNTSC = new BizHawk.WinForms.Controls.LocLabelEx(); this.btnAreaFull = new System.Windows.Forms.Button(); - this.label4 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.NTSC_LastLineNumeric = new System.Windows.Forms.NumericUpDown(); this.NTSC_FirstLineNumeric = new System.Windows.Forms.NumericUpDown(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); @@ -134,8 +134,6 @@ // this.lblTweakedMednafen.Location = new System.Drawing.Point(249, 134); this.lblTweakedMednafen.Name = "lblTweakedMednafen"; - this.lblTweakedMednafen.Size = new System.Drawing.Size(213, 93); - this.lblTweakedMednafen.TabIndex = 28; this.lblTweakedMednafen.Text = resources.GetString("lblTweakedMednafen.Text"); // // rbTweakedMednafenMode @@ -153,8 +151,6 @@ // this.label3.Location = new System.Drawing.Point(249, 35); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(213, 82); - this.label3.TabIndex = 26; this.label3.Text = "Displays all content unmodified\r\n • Window size will constantly change\r\n • Aspect" + " ratio is usually wrong\r\n • Recommended for hacking\r\n • Ideal for segmented AV d" + "umping\r\n • Ideal for screen shots\r\n\r\n"; @@ -185,8 +181,6 @@ // this.lblMednafen.Location = new System.Drawing.Point(6, 134); this.lblMednafen.Name = "lblMednafen"; - this.lblMednafen.Size = new System.Drawing.Size(213, 93); - this.lblMednafen.TabIndex = 23; this.lblMednafen.Text = resources.GetString("lblMednafen.Text"); // // rbMednafenMode @@ -204,8 +198,6 @@ // this.lblPixelPro.Location = new System.Drawing.Point(6, 35); this.lblPixelPro.Name = "lblPixelPro"; - this.lblPixelPro.Size = new System.Drawing.Size(252, 78); - this.lblPixelPro.TabIndex = 21; this.lblPixelPro.Text = resources.GetString("lblPixelPro.Text"); // // rbPixelPro @@ -295,11 +287,8 @@ // // lblPAL // - this.lblPAL.AutoSize = true; this.lblPAL.Location = new System.Drawing.Point(131, 17); this.lblPAL.Name = "lblPAL"; - this.lblPAL.Size = new System.Drawing.Size(27, 13); - this.lblPAL.TabIndex = 44; this.lblPAL.Text = "PAL"; // // PAL_LastLineNumeric @@ -335,11 +324,8 @@ // // lblNTSC // - this.lblNTSC.AutoSize = true; this.lblNTSC.Location = new System.Drawing.Point(62, 17); this.lblNTSC.Name = "lblNTSC"; - this.lblNTSC.Size = new System.Drawing.Size(36, 13); - this.lblNTSC.TabIndex = 41; this.lblNTSC.Text = "NTSC"; // // btnAreaFull @@ -354,20 +340,14 @@ // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(4, 64); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(49, 13); - this.label4.TabIndex = 24; this.label4.Text = "Last line:"; // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(5, 38); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(48, 13); - this.label1.TabIndex = 23; this.label1.Text = "First line:"; // // NTSC_LastLineNumeric @@ -540,21 +520,21 @@ private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.RadioButton rbPixelPro; private System.Windows.Forms.Button btnNiceDisplayConfig; - private System.Windows.Forms.Label lblMednafen; + private BizHawk.WinForms.Controls.LocLabelEx lblMednafen; private System.Windows.Forms.RadioButton rbMednafenMode; - private System.Windows.Forms.Label lblPixelPro; - private System.Windows.Forms.Label label3; + private BizHawk.WinForms.Controls.LocLabelEx lblPixelPro; + private BizHawk.WinForms.Controls.LocLabelEx label3; private System.Windows.Forms.RadioButton rbDebugMode; - private System.Windows.Forms.Label lblTweakedMednafen; + private BizHawk.WinForms.Controls.LocLabelEx lblTweakedMednafen; private System.Windows.Forms.RadioButton rbTweakedMednafenMode; private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.Label lblPAL; + private BizHawk.WinForms.Controls.LocLabelEx lblPAL; private System.Windows.Forms.NumericUpDown PAL_LastLineNumeric; private System.Windows.Forms.NumericUpDown PAL_FirstLineNumeric; - private System.Windows.Forms.Label lblNTSC; + private BizHawk.WinForms.Controls.LocLabelEx lblNTSC; private System.Windows.Forms.Button btnAreaFull; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label4; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.NumericUpDown NTSC_LastLineNumeric; private System.Windows.Forms.NumericUpDown NTSC_FirstLineNumeric; private System.Windows.Forms.LinkLabel linkLabel1; diff --git a/src/BizHawk.Client.EmuHawk/config/PathConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/PathConfig.Designer.cs index 11e80d4958..7a1d85d7ec 100644 --- a/src/BizHawk.Client.EmuHawk/config/PathConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/PathConfig.Designer.cs @@ -32,7 +32,7 @@ this.Cancel = new System.Windows.Forms.Button(); this.PathTabControl = new System.Windows.Forms.TabControl(); this.SaveBtn = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.SpecialCommandsBtn = new System.Windows.Forms.Button(); this.RecentForROMs = new System.Windows.Forms.CheckBox(); this.DefaultsBtn = new System.Windows.Forms.Button(); @@ -87,11 +87,8 @@ // label1 // this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(672, 19); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(97, 13); - this.label1.TabIndex = 210; this.label1.Text = "Special Commands"; // // SpecialCommandsBtn @@ -158,7 +155,7 @@ private System.Windows.Forms.Button Cancel; private System.Windows.Forms.TabControl PathTabControl; private System.Windows.Forms.Button SaveBtn; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.Button SpecialCommandsBtn; private System.Windows.Forms.CheckBox RecentForROMs; private System.Windows.Forms.Button DefaultsBtn; diff --git a/src/BizHawk.Client.EmuHawk/config/PathInfo.Designer.cs b/src/BizHawk.Client.EmuHawk/config/PathInfo.Designer.cs index f4eddd4f35..5c5730a464 100644 --- a/src/BizHawk.Client.EmuHawk/config/PathInfo.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/PathInfo.Designer.cs @@ -29,18 +29,18 @@ private void InitializeComponent() { this.Ok = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.label10 = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label6 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label7 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label8 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label9 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label10 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label11 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label12 = new BizHawk.WinForms.Controls.LocLabelEx(); this.SuspendLayout(); // // Ok @@ -57,115 +57,79 @@ // // label1 // - this.label1.AutoSize = true; this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.label1.Location = new System.Drawing.Point(13, 13); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(55, 15); - this.label1.TabIndex = 1; this.label1.Text = "%recent%"; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(72, 13); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(210, 13); - this.label2.TabIndex = 2; this.label2.Text = "Sets the path to the Windows Recent Path"; // // label3 // - this.label3.AutoSize = true; this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.label3.Location = new System.Drawing.Point(13, 33); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(42, 15); - this.label3.TabIndex = 3; this.label3.Text = "%exe%"; // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(72, 33); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(277, 13); - this.label4.TabIndex = 4; this.label4.Text = "Sets the path of the executable (EmuHawk.exe)"; // // label5 // - this.label5.AutoSize = true; this.label5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.label5.Location = new System.Drawing.Point(13, 68); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(17, 15); - this.label5.TabIndex = 5; this.label5.Text = ".\\"; // // label6 // - this.label6.AutoSize = true; this.label6.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.label6.Location = new System.Drawing.Point(13, 88); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(20, 15); - this.label6.TabIndex = 6; this.label6.Text = "..\\"; // // label7 // - this.label7.AutoSize = true; this.label7.Location = new System.Drawing.Point(72, 68); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(150, 13); - this.label7.TabIndex = 7; this.label7.Text = "Sets the path to the base path"; // // label8 // - this.label8.AutoSize = true; this.label8.Location = new System.Drawing.Point(94, 106); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(368, 13); - this.label8.TabIndex = 8; this.label8.Text = "- Setting the global base path to one of these will set it to the path of the .ex" + "e"; // // label9 // - this.label9.AutoSize = true; this.label9.Location = new System.Drawing.Point(94, 121); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(250, 13); - this.label9.TabIndex = 9; this.label9.Text = "- Setting a platform base will set it to the global base"; // // label10 // - this.label10.AutoSize = true; this.label10.Location = new System.Drawing.Point(94, 136); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(262, 13); - this.label10.TabIndex = 10; this.label10.Text = "- Setting a platform folder will set it to the platform base"; // // label11 // - this.label11.AutoSize = true; this.label11.Location = new System.Drawing.Point(94, 151); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(238, 13); - this.label11.TabIndex = 11; this.label11.Text = "- Setting a tools folder will set it to the global base"; // // label12 // - this.label12.AutoSize = true; this.label12.Location = new System.Drawing.Point(72, 88); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(230, 13); - this.label12.TabIndex = 12; this.label12.Text = "Sets the path to the folder above the base path"; // // PathInfo @@ -203,17 +167,17 @@ #endregion private System.Windows.Forms.Button Ok; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.Label label9; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.Label label11; - private System.Windows.Forms.Label label12; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label2; + private BizHawk.WinForms.Controls.LocLabelEx label3; + private BizHawk.WinForms.Controls.LocLabelEx label4; + private BizHawk.WinForms.Controls.LocLabelEx label5; + private BizHawk.WinForms.Controls.LocLabelEx label6; + private BizHawk.WinForms.Controls.LocLabelEx label7; + private BizHawk.WinForms.Controls.LocLabelEx label8; + private BizHawk.WinForms.Controls.LocLabelEx label9; + private BizHawk.WinForms.Controls.LocLabelEx label10; + private BizHawk.WinForms.Controls.LocLabelEx label11; + private BizHawk.WinForms.Controls.LocLabelEx label12; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs index 27bbea80c8..bba7f01ae5 100644 --- a/src/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs @@ -33,8 +33,8 @@ this.CancelBtn = new System.Windows.Forms.Button(); this.ProfileSelectComboBox = new System.Windows.Forms.ComboBox(); this.ProfileDialogHelpTexBox = new System.Windows.Forms.RichTextBox(); - this.ProfileOptionsLabel = new System.Windows.Forms.Label(); - this.OtherOptions = new System.Windows.Forms.Label(); + this.ProfileOptionsLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.OtherOptions = new BizHawk.WinForms.Controls.LocLabelEx(); this.AutoCheckForUpdates = new System.Windows.Forms.CheckBox(); this.SuspendLayout(); // @@ -88,22 +88,16 @@ // // ProfileOptionsLabel // - this.ProfileOptionsLabel.AutoSize = true; this.ProfileOptionsLabel.Location = new System.Drawing.Point(9, 9); this.ProfileOptionsLabel.Name = "ProfileOptionsLabel"; - this.ProfileOptionsLabel.Size = new System.Drawing.Size(75, 13); - this.ProfileOptionsLabel.TabIndex = 3; this.ProfileOptionsLabel.Text = "Profile Options"; // // OtherOptions // this.OtherOptions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.OtherOptions.AutoSize = true; this.OtherOptions.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.OtherOptions.Location = new System.Drawing.Point(9, 190); this.OtherOptions.Name = "OtherOptions"; - this.OtherOptions.Size = new System.Drawing.Size(72, 13); - this.OtherOptions.TabIndex = 12; this.OtherOptions.Text = "Other Options"; // // AutoCheckForUpdates @@ -147,8 +141,8 @@ private System.Windows.Forms.Button CancelBtn; private System.Windows.Forms.ComboBox ProfileSelectComboBox; private System.Windows.Forms.RichTextBox ProfileDialogHelpTexBox; - private System.Windows.Forms.Label ProfileOptionsLabel; - private System.Windows.Forms.Label OtherOptions; + private BizHawk.WinForms.Controls.LocLabelEx ProfileOptionsLabel; + private BizHawk.WinForms.Controls.LocLabelEx OtherOptions; private System.Windows.Forms.CheckBox AutoCheckForUpdates; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/RewindConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/RewindConfig.Designer.cs index f1e7be5ac4..7bc37c9438 100644 --- a/src/BizHawk.Client.EmuHawk/config/RewindConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/RewindConfig.Designer.cs @@ -33,20 +33,20 @@ this.Cancel = new System.Windows.Forms.Button(); this.RewindEnabledBox = new System.Windows.Forms.CheckBox(); this.UseCompression = new System.Windows.Forms.CheckBox(); - this.label4 = new System.Windows.Forms.Label(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); this.BufferSizeUpDown = new System.Windows.Forms.NumericUpDown(); - this.label3 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.StateSizeLabel = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); - this.FullnessLabel = new System.Windows.Forms.Label(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.StateSizeLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label6 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.FullnessLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.EstTimeLabel = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.ApproxFramesLabel = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); - this.RewindFramesUsedLabel = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); + this.EstTimeLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label11 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.ApproxFramesLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label8 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.RewindFramesUsedLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label7 = new BizHawk.WinForms.Controls.LocLabelEx(); this.groupBox6 = new System.Windows.Forms.GroupBox(); this.rbStatesText = new System.Windows.Forms.RadioButton(); this.rbStatesBinary = new System.Windows.Forms.RadioButton(); @@ -55,18 +55,18 @@ this.trackBarCompression = new System.Windows.Forms.TrackBar(); this.nudCompression = new System.Windows.Forms.NumericUpDown(); this.groupBox7 = new System.Windows.Forms.GroupBox(); - this.label20 = new System.Windows.Forms.Label(); - this.KbLabel = new System.Windows.Forms.Label(); + this.label20 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.KbLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.BigScreenshotNumeric = new System.Windows.Forms.NumericUpDown(); this.LowResLargeScreenshotsCheckbox = new System.Windows.Forms.CheckBox(); - this.label13 = new System.Windows.Forms.Label(); - this.label14 = new System.Windows.Forms.Label(); + this.label13 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label14 = new BizHawk.WinForms.Controls.LocLabelEx(); this.ScreenshotInStatesCheckbox = new System.Windows.Forms.CheckBox(); - this.label15 = new System.Windows.Forms.Label(); - this.label16 = new System.Windows.Forms.Label(); + this.label15 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label16 = new BizHawk.WinForms.Controls.LocLabelEx(); this.BackupSavestatesCheckbox = new System.Windows.Forms.CheckBox(); - this.label12 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); + this.label12 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.TargetFrameLengthNumeric = new System.Windows.Forms.NumericUpDown(); ((System.ComponentModel.ISupportInitialize)(this.BufferSizeUpDown)).BeginInit(); this.groupBox4.SuspendLayout(); @@ -124,11 +124,8 @@ // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(181, 112); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(23, 13); - this.label4.TabIndex = 9; this.label4.Text = "MB"; // // BufferSizeUpDown @@ -156,47 +153,32 @@ // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(12, 112); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(81, 13); - this.label3.TabIndex = 7; this.label3.Text = "Max buffer size:"; // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 17); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(83, 13); - this.label1.TabIndex = 5; this.label1.Text = "Avg. State Size:"; // // StateSizeLabel // - this.StateSizeLabel.AutoSize = true; this.StateSizeLabel.Location = new System.Drawing.Point(92, 17); this.StateSizeLabel.Name = "StateSizeLabel"; - this.StateSizeLabel.Size = new System.Drawing.Size(30, 13); - this.StateSizeLabel.TabIndex = 6; this.StateSizeLabel.Text = "0 KB"; // // label6 // - this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(67, 48); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(26, 13); - this.label6.TabIndex = 10; this.label6.Text = "Full:"; // // FullnessLabel // - this.FullnessLabel.AutoSize = true; this.FullnessLabel.Location = new System.Drawing.Point(94, 48); this.FullnessLabel.Name = "FullnessLabel"; - this.FullnessLabel.Size = new System.Drawing.Size(21, 13); - this.FullnessLabel.TabIndex = 11; this.FullnessLabel.Text = "0%"; // // groupBox4 @@ -227,56 +209,38 @@ // // EstTimeLabel // - this.EstTimeLabel.AutoSize = true; this.EstTimeLabel.Location = new System.Drawing.Point(273, 32); this.EstTimeLabel.Name = "EstTimeLabel"; - this.EstTimeLabel.Size = new System.Drawing.Size(32, 13); - this.EstTimeLabel.TabIndex = 19; this.EstTimeLabel.Text = "0 min"; // // label11 // - this.label11.AutoSize = true; this.label11.Location = new System.Drawing.Point(221, 32); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(54, 13); - this.label11.TabIndex = 18; this.label11.Text = "Est. Time:"; // // ApproxFramesLabel // - this.ApproxFramesLabel.AutoSize = true; this.ApproxFramesLabel.Location = new System.Drawing.Point(273, 17); this.ApproxFramesLabel.Name = "ApproxFramesLabel"; - this.ApproxFramesLabel.Size = new System.Drawing.Size(47, 13); - this.ApproxFramesLabel.TabIndex = 15; this.ApproxFramesLabel.Text = "0 frames"; // // label8 // - this.label8.AutoSize = true; this.label8.Location = new System.Drawing.Point(209, 17); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(66, 13); - this.label8.TabIndex = 14; this.label8.Text = "Est. storage:"; // // RewindFramesUsedLabel // - this.RewindFramesUsedLabel.AutoSize = true; this.RewindFramesUsedLabel.Location = new System.Drawing.Point(94, 32); this.RewindFramesUsedLabel.Name = "RewindFramesUsedLabel"; - this.RewindFramesUsedLabel.Size = new System.Drawing.Size(13, 13); - this.RewindFramesUsedLabel.TabIndex = 13; this.RewindFramesUsedLabel.Text = "0"; // // label7 // - this.label7.AutoSize = true; this.label7.Location = new System.Drawing.Point(15, 32); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(78, 13); - this.label7.TabIndex = 12; this.label7.Text = "Frames Stored:"; // // groupBox6 @@ -379,20 +343,14 @@ // // label20 // - this.label20.AutoSize = true; this.label20.Location = new System.Drawing.Point(21, 291); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(315, 13); - this.label20.TabIndex = 34; this.label20.Text = "Use a low resolution screenshot for better save/load performance"; // // KbLabel // - this.KbLabel.AutoSize = true; this.KbLabel.Location = new System.Drawing.Point(276, 271); this.KbLabel.Name = "KbLabel"; - this.KbLabel.Size = new System.Drawing.Size(21, 13); - this.KbLabel.TabIndex = 33; this.KbLabel.Text = "KB"; // // BigScreenshotNumeric @@ -429,20 +387,14 @@ // // label13 // - this.label13.AutoSize = true; this.label13.Location = new System.Drawing.Point(21, 235); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(186, 13); - this.label13.TabIndex = 30; this.label13.Text = "black screen on the frame it is loaded."; // // label14 // - this.label14.AutoSize = true; this.label14.Location = new System.Drawing.Point(19, 221); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(290, 13); - this.label14.TabIndex = 29; this.label14.Text = "Saves a screenshot and loads it on loadstate so there isn\'t a"; // // ScreenshotInStatesCheckbox @@ -458,20 +410,14 @@ // // label15 // - this.label15.AutoSize = true; this.label15.Location = new System.Drawing.Point(39, 171); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(102, 13); - this.label15.TabIndex = 27; this.label15.Text = "before overwriting it."; // // label16 // - this.label16.AutoSize = true; this.label16.Location = new System.Drawing.Point(39, 158); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(292, 13); - this.label16.TabIndex = 26; this.label16.Text = "When set, the client will make a backup copy of a savestate"; // // BackupSavestatesCheckbox @@ -486,20 +432,14 @@ // // label12 // - this.label12.AutoSize = true; this.label12.Location = new System.Drawing.Point(19, 21); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(96, 13); - this.label12.TabIndex = 0; this.label12.Text = "Compression Level"; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(12, 138); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(107, 13); - this.label2.TabIndex = 20; this.label2.Text = "Desired frame length:"; // // TargetFrameLengthNumeric @@ -563,20 +503,20 @@ private System.Windows.Forms.Button Cancel; private System.Windows.Forms.CheckBox RewindEnabledBox; private System.Windows.Forms.CheckBox UseCompression; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label StateSizeLabel; - private System.Windows.Forms.Label label4; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx StateSizeLabel; + private BizHawk.WinForms.Controls.LocLabelEx label4; private System.Windows.Forms.NumericUpDown BufferSizeUpDown; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.Label FullnessLabel; + private BizHawk.WinForms.Controls.LocLabelEx label3; + private BizHawk.WinForms.Controls.LocLabelEx label6; + private BizHawk.WinForms.Controls.LocLabelEx FullnessLabel; private System.Windows.Forms.GroupBox groupBox4; - private System.Windows.Forms.Label RewindFramesUsedLabel; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.Label ApproxFramesLabel; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.Label EstTimeLabel; - private System.Windows.Forms.Label label11; + private BizHawk.WinForms.Controls.LocLabelEx RewindFramesUsedLabel; + private BizHawk.WinForms.Controls.LocLabelEx label7; + private BizHawk.WinForms.Controls.LocLabelEx ApproxFramesLabel; + private BizHawk.WinForms.Controls.LocLabelEx label8; + private BizHawk.WinForms.Controls.LocLabelEx EstTimeLabel; + private BizHawk.WinForms.Controls.LocLabelEx label11; private System.Windows.Forms.GroupBox groupBox6; private System.Windows.Forms.RadioButton rbStatesText; private System.Windows.Forms.RadioButton rbStatesBinary; @@ -585,18 +525,18 @@ private System.Windows.Forms.NumericUpDown nudCompression; private System.Windows.Forms.Button btnResetCompression; private System.Windows.Forms.GroupBox groupBox7; - private System.Windows.Forms.Label label12; - private System.Windows.Forms.Label KbLabel; + private BizHawk.WinForms.Controls.LocLabelEx label12; + private BizHawk.WinForms.Controls.LocLabelEx KbLabel; private System.Windows.Forms.NumericUpDown BigScreenshotNumeric; private System.Windows.Forms.CheckBox LowResLargeScreenshotsCheckbox; - private System.Windows.Forms.Label label13; - private System.Windows.Forms.Label label14; + private BizHawk.WinForms.Controls.LocLabelEx label13; + private BizHawk.WinForms.Controls.LocLabelEx label14; private System.Windows.Forms.CheckBox ScreenshotInStatesCheckbox; - private System.Windows.Forms.Label label15; - private System.Windows.Forms.Label label16; + private BizHawk.WinForms.Controls.LocLabelEx label15; + private BizHawk.WinForms.Controls.LocLabelEx label16; private System.Windows.Forms.CheckBox BackupSavestatesCheckbox; - private System.Windows.Forms.Label label20; + private BizHawk.WinForms.Controls.LocLabelEx label20; private System.Windows.Forms.NumericUpDown TargetFrameLengthNumeric; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label2; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/SNES/SNESControllerConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/SNES/SNESControllerConfig.Designer.cs index ca6471ec1a..f7b573a9a2 100644 --- a/src/BizHawk.Client.EmuHawk/config/SNES/SNESControllerConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/SNES/SNESControllerConfig.Designer.cs @@ -30,17 +30,17 @@ { this.OkBtn = new System.Windows.Forms.Button(); this.CancelBtn = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); this.Port2ComboBox = new System.Windows.Forms.ComboBox(); this.Port1ComboBox = new System.Windows.Forms.ComboBox(); - this.MouseSpeedLabel1 = new System.Windows.Forms.Label(); + this.MouseSpeedLabel1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.LimitAnalogChangeCheckBox = new System.Windows.Forms.CheckBox(); - this.MouseSpeedLabel2 = new System.Windows.Forms.Label(); - this.MouseSpeedLabel3 = new System.Windows.Forms.Label(); - this.MouseNagLabel1 = new System.Windows.Forms.Label(); - this.MouseNagLabel2 = new System.Windows.Forms.Label(); + this.MouseSpeedLabel2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.MouseSpeedLabel3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.MouseNagLabel1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.MouseNagLabel2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.SuspendLayout(); // // OkBtn @@ -68,29 +68,20 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 9); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(124, 13); - this.label1.TabIndex = 18; this.label1.Text = "SNES Controller Settings"; // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(9, 88); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(38, 13); - this.label5.TabIndex = 22; this.label5.Text = "Port 2:"; // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(12, 38); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(38, 13); - this.label4.TabIndex = 21; this.label4.Text = "Port 1:"; // // Port2ComboBox @@ -119,11 +110,8 @@ // // MouseSpeedLabel1 // - this.MouseSpeedLabel1.AutoSize = true; this.MouseSpeedLabel1.Location = new System.Drawing.Point(12, 195); this.MouseSpeedLabel1.Name = "MouseSpeedLabel1"; - this.MouseSpeedLabel1.Size = new System.Drawing.Size(191, 13); - this.MouseSpeedLabel1.TabIndex = 23; this.MouseSpeedLabel1.Text = "For casual play this should be checked"; // // LimitAnalogChangeCheckBox @@ -138,38 +126,26 @@ // // MouseSpeedLabel2 // - this.MouseSpeedLabel2.AutoSize = true; this.MouseSpeedLabel2.Location = new System.Drawing.Point(12, 208); this.MouseSpeedLabel2.Name = "MouseSpeedLabel2"; - this.MouseSpeedLabel2.Size = new System.Drawing.Size(229, 13); - this.MouseSpeedLabel2.TabIndex = 25; this.MouseSpeedLabel2.Text = "The full range of values are rather unusuable in"; // // MouseSpeedLabel3 // - this.MouseSpeedLabel3.AutoSize = true; this.MouseSpeedLabel3.Location = new System.Drawing.Point(12, 221); this.MouseSpeedLabel3.Name = "MouseSpeedLabel3"; - this.MouseSpeedLabel3.Size = new System.Drawing.Size(246, 13); - this.MouseSpeedLabel3.TabIndex = 26; this.MouseSpeedLabel3.Text = "normal situations, but good if you need total control"; // // MouseNagLabel1 // - this.MouseNagLabel1.AutoSize = true; this.MouseNagLabel1.Location = new System.Drawing.Point(12, 135); this.MouseNagLabel1.Name = "MouseNagLabel1"; - this.MouseNagLabel1.Size = new System.Drawing.Size(273, 13); - this.MouseNagLabel1.TabIndex = 27; this.MouseNagLabel1.Text = "*Note: mouse and scope controls should be bound to an"; // // MouseNagLabel2 // - this.MouseNagLabel2.AutoSize = true; this.MouseNagLabel2.Location = new System.Drawing.Point(45, 148); this.MouseNagLabel2.Name = "MouseNagLabel2"; - this.MouseNagLabel2.Size = new System.Drawing.Size(134, 13); - this.MouseNagLabel2.TabIndex = 28; this.MouseNagLabel2.Text = "analog stick not the mouse"; // // SNESControllerSettings @@ -205,16 +181,16 @@ private System.Windows.Forms.Button OkBtn; private System.Windows.Forms.Button CancelBtn; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label4; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label5; + private BizHawk.WinForms.Controls.LocLabelEx label4; private System.Windows.Forms.ComboBox Port2ComboBox; private System.Windows.Forms.ComboBox Port1ComboBox; - private System.Windows.Forms.Label MouseSpeedLabel1; + private BizHawk.WinForms.Controls.LocLabelEx MouseSpeedLabel1; private System.Windows.Forms.CheckBox LimitAnalogChangeCheckBox; - private System.Windows.Forms.Label MouseSpeedLabel2; - private System.Windows.Forms.Label MouseSpeedLabel3; - private System.Windows.Forms.Label MouseNagLabel1; - private System.Windows.Forms.Label MouseNagLabel2; + private BizHawk.WinForms.Controls.LocLabelEx MouseSpeedLabel2; + private BizHawk.WinForms.Controls.LocLabelEx MouseSpeedLabel3; + private BizHawk.WinForms.Controls.LocLabelEx MouseNagLabel1; + private BizHawk.WinForms.Controls.LocLabelEx MouseNagLabel2; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/SNES/SNESOptions.Designer.cs b/src/BizHawk.Client.EmuHawk/config/SNES/SNESOptions.Designer.cs index dbd3e9e55f..232c51fa3d 100644 --- a/src/BizHawk.Client.EmuHawk/config/SNES/SNESOptions.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/SNES/SNESOptions.Designer.cs @@ -31,7 +31,7 @@ this.btnOk = new System.Windows.Forms.Button(); this.btnCancel = new System.Windows.Forms.Button(); this.cbDoubleSize = new System.Windows.Forms.CheckBox(); - this.lblDoubleSize = new System.Windows.Forms.Label(); + this.lblDoubleSize = new BizHawk.WinForms.Controls.LocLabelEx(); this.radioButton1 = new System.Windows.Forms.RadioButton(); this.cbCropSGBFrame = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); @@ -85,8 +85,6 @@ // this.lblDoubleSize.Location = new System.Drawing.Point(36, 41); this.lblDoubleSize.Name = "lblDoubleSize"; - this.lblDoubleSize.Size = new System.Drawing.Size(254, 57); - this.lblDoubleSize.TabIndex = 7; this.lblDoubleSize.Text = "Some games are changing the resolution constantly (e.g. SD3) so this option can f" + "orce the SNES output to stay double-size always. NOTE: The Accuracy core runs as" + " if this is selected.\r\n"; @@ -254,7 +252,7 @@ private System.Windows.Forms.Button btnOk; private System.Windows.Forms.Button btnCancel; private System.Windows.Forms.CheckBox cbDoubleSize; - private System.Windows.Forms.Label lblDoubleSize; + private BizHawk.WinForms.Controls.LocLabelEx lblDoubleSize; private System.Windows.Forms.RadioButton radioButton1; private System.Windows.Forms.CheckBox cbCropSGBFrame; private System.Windows.Forms.GroupBox groupBox1; diff --git a/src/BizHawk.Client.EmuHawk/config/SoundConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/SoundConfig.Designer.cs index 885fd08677..78591bc60b 100644 --- a/src/BizHawk.Client.EmuHawk/config/SoundConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/SoundConfig.Designer.cs @@ -35,22 +35,22 @@ this.nudRWFF = new System.Windows.Forms.NumericUpDown(); this.cbEnableRWFF = new System.Windows.Forms.CheckBox(); this.tbRWFF = new System.Windows.Forms.TrackBar(); - this.label2 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.tbNormal = new System.Windows.Forms.TrackBar(); this.nudNormal = new System.Windows.Forms.NumericUpDown(); this.listBoxSoundDevices = new System.Windows.Forms.ListBox(); - this.SoundDeviceLabel = new System.Windows.Forms.Label(); - this.BufferSizeLabel = new System.Windows.Forms.Label(); + this.SoundDeviceLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.BufferSizeLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.BufferSizeNumeric = new System.Windows.Forms.NumericUpDown(); - this.BufferSizeUnitsLabel = new System.Windows.Forms.Label(); + this.BufferSizeUnitsLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.grpOutputMethod = new System.Windows.Forms.GroupBox(); this.rbOutputMethodOpenAL = new System.Windows.Forms.RadioButton(); this.rbOutputMethodXAudio2 = new System.Windows.Forms.RadioButton(); this.rbOutputMethodDirectSound = new System.Windows.Forms.RadioButton(); this.cbMuteFrameAdvance = new System.Windows.Forms.CheckBox(); this.cbEnableMaster = new System.Windows.Forms.CheckBox(); - this.label3 = new System.Windows.Forms.Label(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); this.grpSoundVol.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nudRWFF)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tbRWFF)).BeginInit(); @@ -149,21 +149,15 @@ // label2 // this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(56, 42); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(50, 13); - this.label2.TabIndex = 5; this.label2.Text = "RW && FF"; // // label1 // this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(6, 42); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(40, 13); - this.label1.TabIndex = 1; this.label1.Text = "Normal"; // // tbNormal @@ -204,21 +198,15 @@ // // SoundDeviceLabel // - this.SoundDeviceLabel.AutoSize = true; this.SoundDeviceLabel.Location = new System.Drawing.Point(135, 89); this.SoundDeviceLabel.Name = "SoundDeviceLabel"; - this.SoundDeviceLabel.Size = new System.Drawing.Size(78, 13); - this.SoundDeviceLabel.TabIndex = 7; this.SoundDeviceLabel.Text = "Sound Device:"; // // BufferSizeLabel // this.BufferSizeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.BufferSizeLabel.AutoSize = true; this.BufferSizeLabel.Location = new System.Drawing.Point(135, 210); this.BufferSizeLabel.Name = "BufferSizeLabel"; - this.BufferSizeLabel.Size = new System.Drawing.Size(61, 13); - this.BufferSizeLabel.TabIndex = 9; this.BufferSizeLabel.Text = "Buffer Size:"; // // BufferSizeNumeric @@ -247,11 +235,8 @@ // BufferSizeUnitsLabel // this.BufferSizeUnitsLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.BufferSizeUnitsLabel.AutoSize = true; this.BufferSizeUnitsLabel.Location = new System.Drawing.Point(267, 210); this.BufferSizeUnitsLabel.Name = "BufferSizeUnitsLabel"; - this.BufferSizeUnitsLabel.Size = new System.Drawing.Size(63, 13); - this.BufferSizeUnitsLabel.TabIndex = 11; this.BufferSizeUnitsLabel.Text = "milliseconds"; // // grpOutputMethod @@ -328,8 +313,6 @@ this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label3.Location = new System.Drawing.Point(161, 35); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(126, 26); - this.label3.TabIndex = 5; this.label3.Text = "Controls whether cores even generate audio."; // // SoundConfig @@ -381,10 +364,10 @@ private System.Windows.Forms.NumericUpDown nudNormal; private System.Windows.Forms.TrackBar tbNormal; private System.Windows.Forms.ListBox listBoxSoundDevices; - private System.Windows.Forms.Label SoundDeviceLabel; - private System.Windows.Forms.Label BufferSizeLabel; + private BizHawk.WinForms.Controls.LocLabelEx SoundDeviceLabel; + private BizHawk.WinForms.Controls.LocLabelEx BufferSizeLabel; private System.Windows.Forms.NumericUpDown BufferSizeNumeric; - private System.Windows.Forms.Label BufferSizeUnitsLabel; + private BizHawk.WinForms.Controls.LocLabelEx BufferSizeUnitsLabel; private System.Windows.Forms.GroupBox grpOutputMethod; private System.Windows.Forms.RadioButton rbOutputMethodXAudio2; private System.Windows.Forms.RadioButton rbOutputMethodDirectSound; @@ -392,10 +375,10 @@ private System.Windows.Forms.NumericUpDown nudRWFF; private System.Windows.Forms.CheckBox cbEnableRWFF; private System.Windows.Forms.TrackBar tbRWFF; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label2; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.CheckBox cbMuteFrameAdvance; private System.Windows.Forms.CheckBox cbEnableMaster; - private System.Windows.Forms.Label label3; + private BizHawk.WinForms.Controls.LocLabelEx label3; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/TI83/TI83PaletteConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/TI83/TI83PaletteConfig.Designer.cs index af2c3c5948..42e2fc4028 100644 --- a/src/BizHawk.Client.EmuHawk/config/TI83/TI83PaletteConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/TI83/TI83PaletteConfig.Designer.cs @@ -31,8 +31,8 @@ this.CancelBtn = new System.Windows.Forms.Button(); this.OkBtn = new System.Windows.Forms.Button(); this.BackgroundPanel = new System.Windows.Forms.Panel(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.ForeGroundPanel = new System.Windows.Forms.Panel(); this.DefaultsBtn = new System.Windows.Forms.Button(); this.SuspendLayout(); @@ -71,20 +71,14 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(58, 22); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(65, 13); - this.label1.TabIndex = 13; this.label1.Text = "Background"; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(58, 60); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(61, 13); - this.label2.TabIndex = 15; this.label2.Text = "Foreground"; // // ForeGroundPanel @@ -135,8 +129,8 @@ private System.Windows.Forms.Button CancelBtn; private System.Windows.Forms.Button OkBtn; private System.Windows.Forms.Panel BackgroundPanel; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label2; private System.Windows.Forms.Panel ForeGroundPanel; private System.Windows.Forms.Button DefaultsBtn; } diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumAudioSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumAudioSettings.Designer.cs index dcd71f6d3a..cdf8bf6482 100644 --- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumAudioSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumAudioSettings.Designer.cs @@ -30,15 +30,15 @@ { this.OkBtn = new System.Windows.Forms.Button(); this.CancelBtn = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.panTypecomboBox1 = new System.Windows.Forms.ComboBox(); - this.lblBorderInfo = new System.Windows.Forms.Label(); + this.lblBorderInfo = new BizHawk.WinForms.Controls.LocLabelEx(); this.tapeVolumetrackBar = new System.Windows.Forms.TrackBar(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); this.earVolumetrackBar = new System.Windows.Forms.TrackBar(); - this.label5 = new System.Windows.Forms.Label(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); this.ayVolumetrackBar = new System.Windows.Forms.TrackBar(); ((System.ComponentModel.ISupportInitialize)(this.tapeVolumetrackBar)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.earVolumetrackBar)).BeginInit(); @@ -70,20 +70,14 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 14); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(140, 13); - this.label1.TabIndex = 17; this.label1.Text = "ZX Spectrum Audio Settings"; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(12, 236); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(135, 13); - this.label2.TabIndex = 23; this.label2.Text = "AY-3-8912 Panning Config:"; // // panTypecomboBox1 @@ -102,8 +96,6 @@ this.lblBorderInfo.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBorderInfo.Location = new System.Drawing.Point(175, 236); this.lblBorderInfo.Name = "lblBorderInfo"; - this.lblBorderInfo.Size = new System.Drawing.Size(254, 59); - this.lblBorderInfo.TabIndex = 24; this.lblBorderInfo.Text = "Selects a particular panning configuration for the 3ch AY-3-8912 Programmable Sou" + "nd Generator (128K models only)"; this.lblBorderInfo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -118,20 +110,14 @@ // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(12, 44); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(73, 13); - this.label3.TabIndex = 26; this.label3.Text = "Tape Volume:"; // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(12, 108); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(80, 13); - this.label4.TabIndex = 28; this.label4.Text = "Buzzer Volume:"; // // earVolumetrackBar @@ -144,11 +130,8 @@ // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(12, 172); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(98, 13); - this.label5.TabIndex = 30; this.label5.Text = "AY-3-8912 Volume:"; // // ayVolumetrackBar @@ -195,15 +178,15 @@ private System.Windows.Forms.Button OkBtn; private System.Windows.Forms.Button CancelBtn; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label2; private System.Windows.Forms.ComboBox panTypecomboBox1; - private System.Windows.Forms.Label lblBorderInfo; + private BizHawk.WinForms.Controls.LocLabelEx lblBorderInfo; private System.Windows.Forms.TrackBar tapeVolumetrackBar; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label4; + private BizHawk.WinForms.Controls.LocLabelEx label3; + private BizHawk.WinForms.Controls.LocLabelEx label4; private System.Windows.Forms.TrackBar earVolumetrackBar; - private System.Windows.Forms.Label label5; + private BizHawk.WinForms.Controls.LocLabelEx label5; private System.Windows.Forms.TrackBar ayVolumetrackBar; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.Designer.cs index 6b09c85a16..66a790a7ac 100644 --- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.Designer.cs @@ -30,14 +30,14 @@ { this.OkBtn = new System.Windows.Forms.Button(); this.CancelBtn = new System.Windows.Forms.Button(); - this.label4 = new System.Windows.Forms.Label(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); this.MachineSelectionComboBox = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.determEmucheckBox1 = new System.Windows.Forms.CheckBox(); - this.label2 = new System.Windows.Forms.Label(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.borderTypecomboBox1 = new System.Windows.Forms.ComboBox(); - this.lblBorderInfo = new System.Windows.Forms.Label(); - this.lblAutoLoadText = new System.Windows.Forms.Label(); + this.lblBorderInfo = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lblAutoLoadText = new BizHawk.WinForms.Controls.LocLabelEx(); this.autoLoadcheckBox1 = new System.Windows.Forms.CheckBox(); this.textBoxCoreDetails = new System.Windows.Forms.TextBox(); this.SuspendLayout(); @@ -67,11 +67,8 @@ // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(12, 46); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(98, 13); - this.label4.TabIndex = 15; this.label4.Text = "Emulated Machine:"; // // MachineSelectionComboBox @@ -88,11 +85,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 14); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(159, 13); - this.label1.TabIndex = 17; this.label1.Text = "ZX Spectrum Emulation Settings"; // // determEmucheckBox1 @@ -107,11 +101,8 @@ // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(12, 335); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(118, 13); - this.label2.TabIndex = 23; this.label2.Text = "Rendered Border Type:"; // // borderTypecomboBox1 @@ -131,8 +122,6 @@ this.lblBorderInfo.Font = new System.Drawing.Font("Courier New", 8F); this.lblBorderInfo.Location = new System.Drawing.Point(240, 335); this.lblBorderInfo.Name = "lblBorderInfo"; - this.lblBorderInfo.Size = new System.Drawing.Size(196, 53); - this.lblBorderInfo.TabIndex = 24; this.lblBorderInfo.Text = "null"; this.lblBorderInfo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -141,8 +130,6 @@ this.lblAutoLoadText.Font = new System.Drawing.Font("Courier New", 8F); this.lblAutoLoadText.Location = new System.Drawing.Point(124, 388); this.lblAutoLoadText.Name = "lblAutoLoadText"; - this.lblAutoLoadText.Size = new System.Drawing.Size(312, 43); - this.lblAutoLoadText.TabIndex = 27; this.lblAutoLoadText.Text = "When enabled ZXHawk will attempt to control the tape device automatically when th" + "e correct traps are detected"; this.lblAutoLoadText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -203,14 +190,14 @@ private System.Windows.Forms.Button OkBtn; private System.Windows.Forms.Button CancelBtn; - private System.Windows.Forms.Label label4; + private BizHawk.WinForms.Controls.LocLabelEx label4; private System.Windows.Forms.ComboBox MachineSelectionComboBox; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.CheckBox determEmucheckBox1; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label2; private System.Windows.Forms.ComboBox borderTypecomboBox1; - private System.Windows.Forms.Label lblBorderInfo; - private System.Windows.Forms.Label lblAutoLoadText; + private BizHawk.WinForms.Controls.LocLabelEx lblBorderInfo; + private BizHawk.WinForms.Controls.LocLabelEx lblAutoLoadText; private System.Windows.Forms.CheckBox autoLoadcheckBox1; private System.Windows.Forms.TextBox textBoxCoreDetails; } diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumJoystickSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumJoystickSettings.Designer.cs index 95f2d1703b..ffee98cf7a 100644 --- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumJoystickSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumJoystickSettings.Designer.cs @@ -31,14 +31,14 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ZxSpectrumJoystickSettings)); this.OkBtn = new System.Windows.Forms.Button(); this.CancelBtn = new System.Windows.Forms.Button(); - this.label5 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); this.Port2ComboBox = new System.Windows.Forms.ComboBox(); this.Port1ComboBox = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.Port3ComboBox = new System.Windows.Forms.ComboBox(); - this.label2 = new System.Windows.Forms.Label(); - this.lblDoubleSize = new System.Windows.Forms.Label(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lblDoubleSize = new BizHawk.WinForms.Controls.LocLabelEx(); this.SuspendLayout(); // // OkBtn @@ -66,20 +66,14 @@ // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(9, 207); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(57, 13); - this.label5.TabIndex = 16; this.label5.Text = "Joystick 2:"; // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(12, 157); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(57, 13); - this.label4.TabIndex = 15; this.label4.Text = "Joystick 1:"; // // Port2ComboBox @@ -106,11 +100,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 14); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(151, 13); - this.label1.TabIndex = 17; this.label1.Text = "ZX Spectrum Joystick Settings"; // // Port3ComboBox @@ -126,19 +117,14 @@ // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(12, 259); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(57, 13); - this.label2.TabIndex = 19; this.label2.Text = "Joystick 3:"; // // lblDoubleSize // this.lblDoubleSize.Location = new System.Drawing.Point(26, 40); this.lblDoubleSize.Name = "lblDoubleSize"; - this.lblDoubleSize.Size = new System.Drawing.Size(254, 117); - this.lblDoubleSize.TabIndex = 20; this.lblDoubleSize.Text = resources.GetString("lblDoubleSize.Text"); // // ZXSpectrumJoystickSettings @@ -172,13 +158,13 @@ private System.Windows.Forms.Button OkBtn; private System.Windows.Forms.Button CancelBtn; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label4; + private BizHawk.WinForms.Controls.LocLabelEx label5; + private BizHawk.WinForms.Controls.LocLabelEx label4; private System.Windows.Forms.ComboBox Port2ComboBox; private System.Windows.Forms.ComboBox Port1ComboBox; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.ComboBox Port3ComboBox; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label lblDoubleSize; + private BizHawk.WinForms.Controls.LocLabelEx label2; + private BizHawk.WinForms.Controls.LocLabelEx lblDoubleSize; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumNonSyncSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumNonSyncSettings.Designer.cs index 7f84b5417b..5405b7f77e 100644 --- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumNonSyncSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumNonSyncSettings.Designer.cs @@ -30,11 +30,11 @@ { this.OkBtn = new System.Windows.Forms.Button(); this.CancelBtn = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); - this.lblOSDVerbinfo = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lblOSDVerbinfo = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); this.osdMessageVerbositycomboBox1 = new System.Windows.Forms.ComboBox(); - this.label2 = new System.Windows.Forms.Label(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.buttonChooseBGColor = new System.Windows.Forms.Button(); this.checkBoxShowCoreBrdColor = new System.Windows.Forms.CheckBox(); this.SuspendLayout(); @@ -64,11 +64,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 14); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(185, 13); - this.label1.TabIndex = 17; this.label1.Text = "ZX Spectrum Misc Non-Sync Settings"; // // lblOSDVerbinfo @@ -76,18 +73,13 @@ this.lblOSDVerbinfo.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblOSDVerbinfo.Location = new System.Drawing.Point(175, 89); this.lblOSDVerbinfo.Name = "lblOSDVerbinfo"; - this.lblOSDVerbinfo.Size = new System.Drawing.Size(196, 68); - this.lblOSDVerbinfo.TabIndex = 28; this.lblOSDVerbinfo.Text = "null"; this.lblOSDVerbinfo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(12, 101); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(125, 13); - this.label4.TabIndex = 27; this.label4.Text = "OSD Message Verbosity:"; // // osdMessageVerbositycomboBox1 @@ -104,11 +96,8 @@ // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(12, 41); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(132, 13); - this.label2.TabIndex = 29; this.label2.Text = "Default Background Color:"; // // buttonChooseBGColor @@ -161,11 +150,11 @@ private System.Windows.Forms.Button OkBtn; private System.Windows.Forms.Button CancelBtn; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label lblOSDVerbinfo; - private System.Windows.Forms.Label label4; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx lblOSDVerbinfo; + private BizHawk.WinForms.Controls.LocLabelEx label4; private System.Windows.Forms.ComboBox osdMessageVerbositycomboBox1; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label2; private System.Windows.Forms.Button buttonChooseBGColor; private System.Windows.Forms.CheckBox checkBoxShowCoreBrdColor; } diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.Designer.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.Designer.cs index 058dc0deb5..b44f3540e6 100644 --- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.Designer.cs @@ -30,11 +30,11 @@ { this.OkBtn = new System.Windows.Forms.Button(); this.CancelBtn = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.numericUpDownAddress = new System.Windows.Forms.NumericUpDown(); - this.label3 = new System.Windows.Forms.Label(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); this.numericUpDownByte = new System.Windows.Forms.NumericUpDown(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownAddress)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownByte)).BeginInit(); @@ -65,29 +65,20 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 14); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(273, 13); - this.label1.TabIndex = 17; this.label1.Text = "Enter an address to POKE along with a single byte value"; // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(12, 52); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(93, 13); - this.label4.TabIndex = 27; this.label4.Text = "Address (0-65535)"; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(12, 27); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(266, 13); - this.label2.TabIndex = 29; this.label2.Text = "(Address values that target ROM space will be ignored)"; // // numericUpDownAddress @@ -104,11 +95,8 @@ // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(123, 52); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(70, 13); - this.label3.TabIndex = 31; this.label3.Text = "Value (0-255)"; // // numericUpDownByte @@ -153,11 +141,11 @@ private System.Windows.Forms.Button OkBtn; private System.Windows.Forms.Button CancelBtn; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label4; + private BizHawk.WinForms.Controls.LocLabelEx label2; private System.Windows.Forms.NumericUpDown numericUpDownAddress; - private System.Windows.Forms.Label label3; + private BizHawk.WinForms.Controls.LocLabelEx label3; private System.Windows.Forms.NumericUpDown numericUpDownByte; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.Designer.cs b/src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.Designer.cs index 242a5372dc..bf517d9b8d 100644 --- a/src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.Designer.cs @@ -40,7 +40,7 @@ this.Export = new System.Windows.Forms.Button(); this.ConcatMultilines = new System.Windows.Forms.CheckBox(); this.AddColorTag = new System.Windows.Forms.CheckBox(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); ((System.ComponentModel.ISupportInitialize)(this.SubGrid)).BeginInit(); this.SuspendLayout(); // @@ -176,11 +176,8 @@ // label1 // this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(120, 221); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(56, 13); - this.label1.TabIndex = 6; this.label1.Text = "On export:"; // // EditSubtitlesForm @@ -222,6 +219,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Message; private System.Windows.Forms.CheckBox ConcatMultilines; private System.Windows.Forms.CheckBox AddColorTag; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/movie/PlayMovie.Designer.cs b/src/BizHawk.Client.EmuHawk/movie/PlayMovie.Designer.cs index def0d535c9..86c29d4571 100644 --- a/src/BizHawk.Client.EmuHawk/movie/PlayMovie.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/movie/PlayMovie.Designer.cs @@ -38,7 +38,7 @@ this.groupBox1 = new System.Windows.Forms.GroupBox(); this.SubtitlesBtn = new System.Windows.Forms.Button(); this.CommentsBtn = new System.Windows.Forms.Button(); - this.MovieCount = new System.Windows.Forms.Label(); + this.MovieCount = new BizHawk.WinForms.Controls.LocLabelEx(); this.ReadOnlyCheckBox = new System.Windows.Forms.CheckBox(); this.IncludeSubDirectories = new System.Windows.Forms.CheckBox(); this.Scan = new System.Windows.Forms.Button(); @@ -164,11 +164,8 @@ // // MovieCount // - this.MovieCount.AutoSize = true; this.MovieCount.Location = new System.Drawing.Point(12, 9); this.MovieCount.Name = "MovieCount"; - this.MovieCount.Size = new System.Drawing.Size(31, 13); - this.MovieCount.TabIndex = 7; this.MovieCount.Text = " "; // // ReadOnlyCheckBox @@ -383,7 +380,7 @@ private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.Button SubtitlesBtn; private System.Windows.Forms.Button CommentsBtn; - private System.Windows.Forms.Label MovieCount; + private BizHawk.WinForms.Controls.LocLabelEx MovieCount; private System.Windows.Forms.CheckBox ReadOnlyCheckBox; private System.Windows.Forms.CheckBox IncludeSubDirectories; private System.Windows.Forms.Button Scan; diff --git a/src/BizHawk.Client.EmuHawk/movie/RecordMovie.Designer.cs b/src/BizHawk.Client.EmuHawk/movie/RecordMovie.Designer.cs index 4614ce75ef..a42597c9cc 100644 --- a/src/BizHawk.Client.EmuHawk/movie/RecordMovie.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/movie/RecordMovie.Designer.cs @@ -36,9 +36,9 @@ this.groupBox1 = new System.Windows.Forms.GroupBox(); this.DefaultAuthorCheckBox = new System.Windows.Forms.CheckBox(); this.AuthorBox = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.groupBox1.SuspendLayout(); this.SuspendLayout(); // @@ -142,29 +142,20 @@ // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(36, 41); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(41, 13); - this.label3.TabIndex = 2; this.label3.Text = "Author:"; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(6, 68); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(71, 13); - this.label2.TabIndex = 5; this.label2.Text = "Record From:"; // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(51, 16); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(26, 13); - this.label1.TabIndex = 4; this.label1.Text = "File:"; // // RecordMovie @@ -199,9 +190,9 @@ private System.Windows.Forms.TextBox RecordBox; private System.Windows.Forms.ComboBox StartFromCombo; private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label3; + private BizHawk.WinForms.Controls.LocLabelEx label2; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.TextBox AuthorBox; private System.Windows.Forms.CheckBox DefaultAuthorCheckBox; } diff --git a/src/BizHawk.Client.EmuHawk/movie/SubtitleMaker.Designer.cs b/src/BizHawk.Client.EmuHawk/movie/SubtitleMaker.Designer.cs index d7e97ebc74..5bf590900c 100644 --- a/src/BizHawk.Client.EmuHawk/movie/SubtitleMaker.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/movie/SubtitleMaker.Designer.cs @@ -31,18 +31,18 @@ this.OK = new System.Windows.Forms.Button(); this.Cancel = new System.Windows.Forms.Button(); this.Message = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.YNumeric = new System.Windows.Forms.NumericUpDown(); this.XNumeric = new System.Windows.Forms.NumericUpDown(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); this.DurationNumeric = new System.Windows.Forms.NumericUpDown(); - this.label4 = new System.Windows.Forms.Label(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); this.ColorPanel = new System.Windows.Forms.Panel(); - this.label5 = new System.Windows.Forms.Label(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); this.colorDialog1 = new System.Windows.Forms.ColorDialog(); this.FrameNumeric = new System.Windows.Forms.NumericUpDown(); - this.label6 = new System.Windows.Forms.Label(); + this.label6 = new BizHawk.WinForms.Controls.LocLabelEx(); ((System.ComponentModel.ISupportInitialize)(this.YNumeric)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.XNumeric)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.DurationNumeric)).BeginInit(); @@ -84,11 +84,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 50); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(50, 13); - this.label1.TabIndex = 3; this.label1.Text = "Message"; // // YNumeric @@ -117,20 +114,14 @@ // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(77, 108); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(53, 13); - this.label2.TabIndex = 6; this.label2.Text = "X position"; // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(75, 133); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(53, 13); - this.label3.TabIndex = 7; this.label3.Text = "Y position"; // // DurationNumeric @@ -147,11 +138,8 @@ // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(215, 108); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(47, 13); - this.label4.TabIndex = 9; this.label4.Text = "Duration"; // // ColorPanel @@ -167,11 +155,8 @@ // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(215, 133); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(31, 13); - this.label5.TabIndex = 11; this.label5.Text = "Color"; // // FrameNumeric @@ -194,11 +179,8 @@ // // label6 // - this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(12, 21); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(36, 13); - this.label6.TabIndex = 13; this.label6.Text = "Frame"; // // SubtitleMaker @@ -241,17 +223,17 @@ private System.Windows.Forms.Button OK; private System.Windows.Forms.Button Cancel; private System.Windows.Forms.TextBox Message; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.NumericUpDown YNumeric; private System.Windows.Forms.NumericUpDown XNumeric; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; + private BizHawk.WinForms.Controls.LocLabelEx label2; + private BizHawk.WinForms.Controls.LocLabelEx label3; private System.Windows.Forms.NumericUpDown DurationNumeric; - private System.Windows.Forms.Label label4; + private BizHawk.WinForms.Controls.LocLabelEx label4; private System.Windows.Forms.Panel ColorPanel; - private System.Windows.Forms.Label label5; + private BizHawk.WinForms.Controls.LocLabelEx label5; private System.Windows.Forms.ColorDialog colorDialog1; private System.Windows.Forms.NumericUpDown FrameNumeric; - private System.Windows.Forms.Label label6; + private BizHawk.WinForms.Controls.LocLabelEx label6; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs index c050b7f138..8a2b2ff906 100644 --- a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs @@ -59,60 +59,60 @@ this.btnCopyBestInput = new System.Windows.Forms.Button(); this.PlayBestButton = new System.Windows.Forms.Button(); this.ClearBestButton = new System.Windows.Forms.Button(); - this.BestAttemptNumberLabel = new System.Windows.Forms.Label(); - this.label17 = new System.Windows.Forms.Label(); + this.BestAttemptNumberLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label17 = new BizHawk.WinForms.Controls.LocLabelEx(); this.panel1 = new System.Windows.Forms.Panel(); - this.BestAttemptLogLabel = new System.Windows.Forms.Label(); + this.BestAttemptLogLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.BestTieBreak3Box = new System.Windows.Forms.TextBox(); this.BestTieBreak2Box = new System.Windows.Forms.TextBox(); this.BestTieBreak1Box = new System.Windows.Forms.TextBox(); this.BestMaximizeBox = new System.Windows.Forms.TextBox(); - this.label16 = new System.Windows.Forms.Label(); - this.label15 = new System.Windows.Forms.Label(); - this.label14 = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.AttemptsLabel = new System.Windows.Forms.Label(); - this.FramesLabel = new System.Windows.Forms.Label(); + this.label16 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label15 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label14 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label13 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.AttemptsLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.FramesLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.GoalGroupBox = new System.Windows.Forms.GroupBox(); - this.label4 = new System.Windows.Forms.Label(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); this.FrameLengthNumeric = new System.Windows.Forms.NumericUpDown(); - this.label3 = new System.Windows.Forms.Label(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); this.panel3 = new System.Windows.Forms.Panel(); this.MainValueNumeric = new System.Windows.Forms.NumericUpDown(); this.MainValueRadio = new System.Windows.Forms.RadioButton(); this.MainBestRadio = new System.Windows.Forms.RadioButton(); this.MainOperator = new System.Windows.Forms.ComboBox(); - this.label9 = new System.Windows.Forms.Label(); + this.label9 = new BizHawk.WinForms.Controls.LocLabelEx(); this.MaximizeAddressBox = new BizHawk.Client.EmuHawk.HexTextBox(); - this.maximizeLabeltext = new System.Windows.Forms.Label(); + this.maximizeLabeltext = new BizHawk.WinForms.Controls.LocLabelEx(); this.panel4 = new System.Windows.Forms.Panel(); this.TieBreak1Numeric = new System.Windows.Forms.NumericUpDown(); this.TieBreak1ValueRadio = new System.Windows.Forms.RadioButton(); this.Tiebreak1Operator = new System.Windows.Forms.ComboBox(); this.TieBreak1BestRadio = new System.Windows.Forms.RadioButton(); - this.label5 = new System.Windows.Forms.Label(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); this.TieBreaker1Box = new BizHawk.Client.EmuHawk.HexTextBox(); - this.label10 = new System.Windows.Forms.Label(); + this.label10 = new BizHawk.WinForms.Controls.LocLabelEx(); this.panel5 = new System.Windows.Forms.Panel(); this.TieBreak2Numeric = new System.Windows.Forms.NumericUpDown(); this.Tiebreak2Operator = new System.Windows.Forms.ComboBox(); this.TieBreak2ValueRadio = new System.Windows.Forms.RadioButton(); this.TieBreak2BestRadio = new System.Windows.Forms.RadioButton(); - this.label11 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); + this.label11 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label6 = new BizHawk.WinForms.Controls.LocLabelEx(); this.TieBreaker2Box = new BizHawk.Client.EmuHawk.HexTextBox(); this.panel6 = new System.Windows.Forms.Panel(); - this.label12 = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); + this.label12 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label7 = new BizHawk.WinForms.Controls.LocLabelEx(); this.TieBreaker3Box = new BizHawk.Client.EmuHawk.HexTextBox(); this.TieBreak3Numeric = new System.Windows.Forms.NumericUpDown(); this.TieBreak3ValueRadio = new System.Windows.Forms.RadioButton(); this.TieBreak3BestRadio = new System.Windows.Forms.RadioButton(); this.Tiebreak3Operator = new System.Windows.Forms.ComboBox(); this.StopBtn = new System.Windows.Forms.Button(); - this.label8 = new System.Windows.Forms.Label(); + this.label8 = new BizHawk.WinForms.Controls.LocLabelEx(); this.StartFromSlotBox = new System.Windows.Forms.ComboBox(); this.ControlGroupBox = new System.Windows.Forms.GroupBox(); this.InvisibleEmulationCheckBox = new System.Windows.Forms.CheckBox(); @@ -433,20 +433,14 @@ // // BestAttemptNumberLabel // - this.BestAttemptNumberLabel.AutoSize = true; this.BestAttemptNumberLabel.Location = new System.Drawing.Point(59, 20); this.BestAttemptNumberLabel.Name = "BestAttemptNumberLabel"; - this.BestAttemptNumberLabel.Size = new System.Drawing.Size(13, 13); - this.BestAttemptNumberLabel.TabIndex = 23; this.BestAttemptNumberLabel.Text = "0"; // // label17 // - this.label17.AutoSize = true; this.label17.Location = new System.Drawing.Point(17, 20); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(46, 13); - this.label17.TabIndex = 22; this.label17.Text = "Attempt:"; // // panel1 @@ -465,11 +459,8 @@ // // BestAttemptLogLabel // - this.BestAttemptLogLabel.AutoSize = true; this.BestAttemptLogLabel.Location = new System.Drawing.Point(8, 8); this.BestAttemptLogLabel.Name = "BestAttemptLogLabel"; - this.BestAttemptLogLabel.Size = new System.Drawing.Size(294, 14); - this.BestAttemptLogLabel.TabIndex = 0; this.BestAttemptLogLabel.Text = " "; // // BestTieBreak3Box @@ -515,77 +506,53 @@ // label16 // this.label16.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label16.AutoSize = true; this.label16.Location = new System.Drawing.Point(96, 76); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(61, 13); - this.label16.TabIndex = 16; this.label16.Text = "Tiebreak 3:"; // // label15 // this.label15.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label15.AutoSize = true; this.label15.Location = new System.Drawing.Point(96, 56); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(61, 13); - this.label15.TabIndex = 15; this.label15.Text = "Tiebreak 2:"; // // label14 // this.label14.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label14.AutoSize = true; this.label14.Location = new System.Drawing.Point(96, 36); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(61, 13); - this.label14.TabIndex = 6; this.label14.Text = "Tiebreak 1:"; // // label13 // this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label13.AutoSize = true; this.label13.Location = new System.Drawing.Point(104, 16); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(63, 13); - this.label13.TabIndex = 0; this.label13.Text = "Main Value:"; // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(3, 2); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(51, 13); - this.label1.TabIndex = 5; this.label1.Text = "Attempts:"; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(10, 17); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(44, 13); - this.label2.TabIndex = 6; this.label2.Text = "Frames:"; // // AttemptsLabel // - this.AttemptsLabel.AutoSize = true; this.AttemptsLabel.Location = new System.Drawing.Point(61, 2); this.AttemptsLabel.Name = "AttemptsLabel"; - this.AttemptsLabel.Size = new System.Drawing.Size(13, 13); - this.AttemptsLabel.TabIndex = 7; this.AttemptsLabel.Text = "0"; // // FramesLabel // - this.FramesLabel.AutoSize = true; this.FramesLabel.Location = new System.Drawing.Point(61, 17); this.FramesLabel.Name = "FramesLabel"; - this.FramesLabel.Size = new System.Drawing.Size(13, 13); - this.FramesLabel.TabIndex = 8; this.FramesLabel.Text = "0"; // // GoalGroupBox @@ -608,11 +575,8 @@ // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(113, 29); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(38, 13); - this.label4.TabIndex = 2; this.label4.Text = "frames"; // // FrameLengthNumeric @@ -635,11 +599,8 @@ // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(7, 29); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(50, 13); - this.label3.TabIndex = 0; this.label3.Text = "End after"; // // panel3 @@ -716,11 +677,8 @@ // // label9 // - this.label9.AutoSize = true; this.label9.Location = new System.Drawing.Point(67, 7); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(59, 13); - this.label9.TabIndex = 1008; this.label9.Text = "Address 0x"; // // MaximizeAddressBox @@ -737,11 +695,8 @@ // // maximizeLabeltext // - this.maximizeLabeltext.AutoSize = true; this.maximizeLabeltext.Location = new System.Drawing.Point(1, 7); this.maximizeLabeltext.Name = "maximizeLabeltext"; - this.maximizeLabeltext.Size = new System.Drawing.Size(63, 13); - this.maximizeLabeltext.TabIndex = 1007; this.maximizeLabeltext.Text = "Main Value:"; // // panel4 @@ -818,11 +773,8 @@ // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(1, 7); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(61, 13); - this.label5.TabIndex = 5; this.label5.Text = "Tiebreak 1:"; // // TieBreaker1Box @@ -838,11 +790,8 @@ // // label10 // - this.label10.AutoSize = true; this.label10.Location = new System.Drawing.Point(67, 7); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(59, 13); - this.label10.TabIndex = 12; this.label10.Text = "Address 0x"; // // panel5 @@ -919,20 +868,14 @@ // // label11 // - this.label11.AutoSize = true; this.label11.Location = new System.Drawing.Point(67, 7); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(59, 13); - this.label11.TabIndex = 13; this.label11.Text = "Address 0x"; // // label6 // - this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(1, 7); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(61, 13); - this.label6.TabIndex = 9; this.label6.Text = "Tiebreak 2:"; // // TieBreaker2Box @@ -962,20 +905,14 @@ // // label12 // - this.label12.AutoSize = true; this.label12.Location = new System.Drawing.Point(67, 7); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(59, 13); - this.label12.TabIndex = 1015; this.label12.Text = "Address 0x"; // // label7 // - this.label7.AutoSize = true; this.label7.Location = new System.Drawing.Point(1, 7); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(61, 13); - this.label7.TabIndex = 1014; this.label7.Text = "Tiebreak 3:"; // // TieBreaker3Box @@ -1061,11 +998,8 @@ // // label8 // - this.label8.AutoSize = true; this.label8.Location = new System.Drawing.Point(7, 29); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(58, 13); - this.label8.TabIndex = 11; this.label8.Text = "Start From:"; // // StartFromSlotBox @@ -1213,36 +1147,36 @@ private System.Windows.Forms.GroupBox ControlsBox; private System.Windows.Forms.Panel ControlProbabilityPanel; private System.Windows.Forms.GroupBox BestGroupBox; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label AttemptsLabel; - private System.Windows.Forms.Label FramesLabel; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label2; + private BizHawk.WinForms.Controls.LocLabelEx AttemptsLabel; + private BizHawk.WinForms.Controls.LocLabelEx FramesLabel; private System.Windows.Forms.ToolStripMenuItem OptionsSubMenu; private System.Windows.Forms.GroupBox GoalGroupBox; - private System.Windows.Forms.Label label6; + private BizHawk.WinForms.Controls.LocLabelEx label6; private HexTextBox TieBreaker1Box; private HexTextBox TieBreaker2Box; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label4; + private BizHawk.WinForms.Controls.LocLabelEx label5; + private BizHawk.WinForms.Controls.LocLabelEx label4; private System.Windows.Forms.NumericUpDown FrameLengthNumeric; - private System.Windows.Forms.Label label3; + private BizHawk.WinForms.Controls.LocLabelEx label3; private System.Windows.Forms.Button StopBtn; - private System.Windows.Forms.Label label8; + private BizHawk.WinForms.Controls.LocLabelEx label8; private System.Windows.Forms.ComboBox StartFromSlotBox; - private System.Windows.Forms.Label label11; - private System.Windows.Forms.Label label10; + private BizHawk.WinForms.Controls.LocLabelEx label11; + private BizHawk.WinForms.Controls.LocLabelEx label10; private System.Windows.Forms.TextBox BestTieBreak3Box; private System.Windows.Forms.TextBox BestTieBreak2Box; private System.Windows.Forms.TextBox BestTieBreak1Box; private System.Windows.Forms.TextBox BestMaximizeBox; - private System.Windows.Forms.Label label16; - private System.Windows.Forms.Label label15; - private System.Windows.Forms.Label label14; - private System.Windows.Forms.Label label13; + private BizHawk.WinForms.Controls.LocLabelEx label16; + private BizHawk.WinForms.Controls.LocLabelEx label15; + private BizHawk.WinForms.Controls.LocLabelEx label14; + private BizHawk.WinForms.Controls.LocLabelEx label13; private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Label BestAttemptNumberLabel; - private System.Windows.Forms.Label label17; - private System.Windows.Forms.Label BestAttemptLogLabel; + private BizHawk.WinForms.Controls.LocLabelEx BestAttemptNumberLabel; + private BizHawk.WinForms.Controls.LocLabelEx label17; + private BizHawk.WinForms.Controls.LocLabelEx BestAttemptLogLabel; private System.Windows.Forms.Button ClearBestButton; private System.Windows.Forms.ToolStripMenuItem SaveAsMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; @@ -1267,8 +1201,8 @@ private System.Windows.Forms.ComboBox Tiebreak1Operator; private System.Windows.Forms.Panel panel6; private System.Windows.Forms.ComboBox Tiebreak3Operator; - private System.Windows.Forms.Label label12; - private System.Windows.Forms.Label label7; + private BizHawk.WinForms.Controls.LocLabelEx label12; + private BizHawk.WinForms.Controls.LocLabelEx label7; private HexTextBox TieBreaker3Box; private System.Windows.Forms.NumericUpDown TieBreak3Numeric; private System.Windows.Forms.RadioButton TieBreak3ValueRadio; @@ -1286,9 +1220,9 @@ private System.Windows.Forms.RadioButton MainValueRadio; private System.Windows.Forms.RadioButton MainBestRadio; private System.Windows.Forms.ComboBox MainOperator; - private System.Windows.Forms.Label label9; + private BizHawk.WinForms.Controls.LocLabelEx label9; private HexTextBox MaximizeAddressBox; - private System.Windows.Forms.Label maximizeLabeltext; + private BizHawk.WinForms.Controls.LocLabelEx maximizeLabeltext; private System.Windows.Forms.Button btnCopyBestInput; private System.Windows.Forms.ToolTip toolTip1; private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem; diff --git a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BotControlsRow.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BotControlsRow.Designer.cs index 9ee550ffe8..17d8bab397 100644 --- a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BotControlsRow.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BotControlsRow.Designer.cs @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - this.ButtonNameLabel = new System.Windows.Forms.Label(); + this.ButtonNameLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.ProbabilityUpDown = new System.Windows.Forms.NumericUpDown(); this.ProbabilitySlider = new System.Windows.Forms.TrackBar(); ((System.ComponentModel.ISupportInitialize)(this.ProbabilityUpDown)).BeginInit(); @@ -37,11 +37,8 @@ // // ButtonNameLabel // - this.ButtonNameLabel.AutoSize = true; this.ButtonNameLabel.Location = new System.Drawing.Point(3, 0); this.ButtonNameLabel.Name = "ButtonNameLabel"; - this.ButtonNameLabel.Size = new System.Drawing.Size(35, 13); - this.ButtonNameLabel.TabIndex = 0; this.ButtonNameLabel.Text = "label1"; // // ProbabilityUpDown @@ -87,7 +84,7 @@ #endregion - private System.Windows.Forms.Label ButtonNameLabel; + private BizHawk.WinForms.Controls.LocLabelEx ButtonNameLabel; private System.Windows.Forms.NumericUpDown ProbabilityUpDown; private System.Windows.Forms.TrackBar ProbabilitySlider; } diff --git a/src/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.Designer.cs index 9707bb5bb5..8cc4bc1a22 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.Designer.cs @@ -29,19 +29,19 @@ private void InitializeComponent() { this.NameBox = new System.Windows.Forms.TextBox(); - this.NameLabel = new System.Windows.Forms.Label(); - this.AddressLabel = new System.Windows.Forms.Label(); - this.AddressHexIndLabel = new System.Windows.Forms.Label(); + this.NameLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.AddressLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.AddressHexIndLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.AddressBox = new BizHawk.Client.EmuHawk.HexTextBox(); - this.ValueHexIndLabel = new System.Windows.Forms.Label(); - this.ValueLabel = new System.Windows.Forms.Label(); - this.CompareHexIndLabel = new System.Windows.Forms.Label(); - this.CompareLabel = new System.Windows.Forms.Label(); - this.DomainLabel = new System.Windows.Forms.Label(); + this.ValueHexIndLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.ValueLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.CompareHexIndLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.CompareLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.DomainLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.DomainDropDown = new System.Windows.Forms.ComboBox(); - this.SizeLabel = new System.Windows.Forms.Label(); + this.SizeLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.SizeDropDown = new System.Windows.Forms.ComboBox(); - this.DisplayTypeLabel = new System.Windows.Forms.Label(); + this.DisplayTypeLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.DisplayTypeDropDown = new System.Windows.Forms.ComboBox(); this.BigEndianCheckBox = new System.Windows.Forms.CheckBox(); this.AddButton = new System.Windows.Forms.Button(); @@ -49,7 +49,7 @@ this.CompareBox = new BizHawk.Client.EmuHawk.WatchValueBox(); this.ValueBox = new BizHawk.Client.EmuHawk.WatchValueBox(); this.CompareTypeDropDown = new System.Windows.Forms.ComboBox(); - this.CompareTypeLabel = new System.Windows.Forms.Label(); + this.CompareTypeLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.SuspendLayout(); // // NameBox @@ -61,29 +61,20 @@ // // NameLabel // - this.NameLabel.AutoSize = true; this.NameLabel.Location = new System.Drawing.Point(32, 16); this.NameLabel.Name = "NameLabel"; - this.NameLabel.Size = new System.Drawing.Size(68, 25); - this.NameLabel.TabIndex = 4; this.NameLabel.Text = "Name"; // // AddressLabel // - this.AddressLabel.AutoSize = true; this.AddressLabel.Location = new System.Drawing.Point(22, 43); this.AddressLabel.Name = "AddressLabel"; - this.AddressLabel.Size = new System.Drawing.Size(91, 25); - this.AddressLabel.TabIndex = 6; this.AddressLabel.Text = "Address"; // // AddressHexIndLabel // - this.AddressHexIndLabel.AutoSize = true; this.AddressHexIndLabel.Location = new System.Drawing.Point(92, 43); this.AddressHexIndLabel.Name = "AddressHexIndLabel"; - this.AddressHexIndLabel.Size = new System.Drawing.Size(35, 25); - this.AddressHexIndLabel.TabIndex = 8; this.AddressHexIndLabel.Text = "0x"; // // AddressBox @@ -98,47 +89,32 @@ // // ValueHexIndLabel // - this.ValueHexIndLabel.AutoSize = true; this.ValueHexIndLabel.Location = new System.Drawing.Point(92, 69); this.ValueHexIndLabel.Name = "ValueHexIndLabel"; - this.ValueHexIndLabel.Size = new System.Drawing.Size(35, 25); - this.ValueHexIndLabel.TabIndex = 11; this.ValueHexIndLabel.Text = "0x"; // // ValueLabel // - this.ValueLabel.AutoSize = true; this.ValueLabel.Location = new System.Drawing.Point(33, 69); this.ValueLabel.Name = "ValueLabel"; - this.ValueLabel.Size = new System.Drawing.Size(67, 25); - this.ValueLabel.TabIndex = 10; this.ValueLabel.Text = "Value"; // // CompareHexIndLabel // - this.CompareHexIndLabel.AutoSize = true; this.CompareHexIndLabel.Location = new System.Drawing.Point(92, 95); this.CompareHexIndLabel.Name = "CompareHexIndLabel"; - this.CompareHexIndLabel.Size = new System.Drawing.Size(35, 25); - this.CompareHexIndLabel.TabIndex = 14; this.CompareHexIndLabel.Text = "0x"; // // CompareLabel // - this.CompareLabel.AutoSize = true; this.CompareLabel.Location = new System.Drawing.Point(24, 95); this.CompareLabel.Name = "CompareLabel"; - this.CompareLabel.Size = new System.Drawing.Size(99, 25); - this.CompareLabel.TabIndex = 13; this.CompareLabel.Text = "Compare"; // // DomainLabel // - this.DomainLabel.AutoSize = true; this.DomainLabel.Location = new System.Drawing.Point(24, 158); this.DomainLabel.Name = "DomainLabel"; - this.DomainLabel.Size = new System.Drawing.Size(85, 25); - this.DomainLabel.TabIndex = 16; this.DomainLabel.Text = "Domain"; // // DomainDropDown @@ -153,11 +129,8 @@ // // SizeLabel // - this.SizeLabel.AutoSize = true; this.SizeLabel.Location = new System.Drawing.Point(40, 190); this.SizeLabel.Name = "SizeLabel"; - this.SizeLabel.Size = new System.Drawing.Size(54, 25); - this.SizeLabel.TabIndex = 18; this.SizeLabel.Text = "Size"; // // SizeDropDown @@ -176,11 +149,8 @@ // // DisplayTypeLabel // - this.DisplayTypeLabel.AutoSize = true; this.DisplayTypeLabel.Location = new System.Drawing.Point(11, 219); this.DisplayTypeLabel.Name = "DisplayTypeLabel"; - this.DisplayTypeLabel.Size = new System.Drawing.Size(114, 25); - this.DisplayTypeLabel.TabIndex = 20; this.DisplayTypeLabel.Text = "Display As"; // // DisplayTypeDropDown @@ -272,11 +242,8 @@ // // CompareTypeLabel // - this.CompareTypeLabel.AutoSize = true; this.CompareTypeLabel.Location = new System.Drawing.Point(24, 125); this.CompareTypeLabel.Name = "CompareTypeLabel"; - this.CompareTypeLabel.Size = new System.Drawing.Size(153, 25); - this.CompareTypeLabel.TabIndex = 25; this.CompareTypeLabel.Text = "Compare Type"; this.CompareTypeLabel.TextAlign = System.Drawing.ContentAlignment.BottomLeft; // @@ -316,26 +283,26 @@ #endregion private System.Windows.Forms.TextBox NameBox; - private System.Windows.Forms.Label NameLabel; - private System.Windows.Forms.Label AddressLabel; - private System.Windows.Forms.Label AddressHexIndLabel; + private BizHawk.WinForms.Controls.LocLabelEx NameLabel; + private BizHawk.WinForms.Controls.LocLabelEx AddressLabel; + private BizHawk.WinForms.Controls.LocLabelEx AddressHexIndLabel; private HexTextBox AddressBox; private WatchValueBox ValueBox; - private System.Windows.Forms.Label ValueHexIndLabel; - private System.Windows.Forms.Label ValueLabel; + private BizHawk.WinForms.Controls.LocLabelEx ValueHexIndLabel; + private BizHawk.WinForms.Controls.LocLabelEx ValueLabel; private WatchValueBox CompareBox; - private System.Windows.Forms.Label CompareHexIndLabel; - private System.Windows.Forms.Label CompareLabel; - private System.Windows.Forms.Label DomainLabel; + private BizHawk.WinForms.Controls.LocLabelEx CompareHexIndLabel; + private BizHawk.WinForms.Controls.LocLabelEx CompareLabel; + private BizHawk.WinForms.Controls.LocLabelEx DomainLabel; private System.Windows.Forms.ComboBox DomainDropDown; - private System.Windows.Forms.Label SizeLabel; + private BizHawk.WinForms.Controls.LocLabelEx SizeLabel; private System.Windows.Forms.ComboBox SizeDropDown; - private System.Windows.Forms.Label DisplayTypeLabel; + private BizHawk.WinForms.Controls.LocLabelEx DisplayTypeLabel; private System.Windows.Forms.ComboBox DisplayTypeDropDown; private System.Windows.Forms.CheckBox BigEndianCheckBox; private System.Windows.Forms.Button AddButton; private System.Windows.Forms.Button EditButton; private System.Windows.Forms.ComboBox CompareTypeDropDown; - private System.Windows.Forms.Label CompareTypeLabel; + private BizHawk.WinForms.Controls.LocLabelEx CompareTypeLabel; } } diff --git a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs index 80f3c04fe9..572cfd6509 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs @@ -81,8 +81,8 @@ this.MoveDownToolbarItem = new System.Windows.Forms.ToolStripButton(); this.GameGenieToolbarSeparator = new System.Windows.Forms.ToolStripSeparator(); this.LoadGameGenieToolbarItem = new System.Windows.Forms.ToolStripButton(); - this.TotalLabel = new System.Windows.Forms.Label(); - this.MessageLabel = new System.Windows.Forms.Label(); + this.TotalLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.MessageLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.CheatGroupBox = new System.Windows.Forms.GroupBox(); this.CheatEditor = new BizHawk.Client.EmuHawk.CheatEdit(); this.CheatsContextMenu.SuspendLayout(); @@ -546,21 +546,15 @@ // // TotalLabel // - this.TotalLabel.AutoSize = true; this.TotalLabel.Location = new System.Drawing.Point(9, 52); this.TotalLabel.Name = "TotalLabel"; - this.TotalLabel.Size = new System.Drawing.Size(49, 13); - this.TotalLabel.TabIndex = 6; this.TotalLabel.Text = "0 Cheats"; // // MessageLabel // this.MessageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.MessageLabel.AutoSize = true; this.MessageLabel.Location = new System.Drawing.Point(13, 397); this.MessageLabel.Name = "MessageLabel"; - this.MessageLabel.Size = new System.Drawing.Size(31, 13); - this.MessageLabel.TabIndex = 7; this.MessageLabel.Text = " "; // // CheatGroupBox @@ -658,8 +652,8 @@ private System.Windows.Forms.ToolStripButton MoveUpToolbarItem; private System.Windows.Forms.ToolStripButton MoveDownToolbarItem; private System.Windows.Forms.ToolStripButton LoadGameGenieToolbarItem; - private System.Windows.Forms.Label TotalLabel; - private System.Windows.Forms.Label MessageLabel; + private BizHawk.WinForms.Controls.LocLabelEx TotalLabel; + private BizHawk.WinForms.Controls.LocLabelEx MessageLabel; private System.Windows.Forms.ToolStripMenuItem AlwaysOnTopMenuItem; private System.Windows.Forms.ToolStripMenuItem ToggleMenuItem; private System.Windows.Forms.ToolStripSeparator GameGenieToolbarSeparator; diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/AddBreakpointDialog.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/AddBreakpointDialog.Designer.cs index e63e8b0ebf..82e202a450 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Debugger/AddBreakpointDialog.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/AddBreakpointDialog.Designer.cs @@ -34,11 +34,11 @@ this.ExecuteRadio = new System.Windows.Forms.RadioButton(); this.WriteRadio = new System.Windows.Forms.RadioButton(); this.ReadRadio = new System.Windows.Forms.RadioButton(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.CancelBtn = new System.Windows.Forms.Button(); this.AddressBox = new BizHawk.Client.EmuHawk.HexTextBox(); - this.label2 = new System.Windows.Forms.Label(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.AddressMaskBox = new BizHawk.Client.EmuHawk.HexTextBox(); this.BreakpointTypeGroupbox.SuspendLayout(); this.SuspendLayout(); @@ -99,11 +99,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 9); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(59, 13); - this.label1.TabIndex = 4; this.label1.Text = "Address 0x"; // // CancelBtn @@ -130,11 +127,8 @@ // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(13, 32); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(47, 13); - this.label2.TabIndex = 5; this.label2.Text = "Mask 0x"; // // AddressMaskBox @@ -184,10 +178,10 @@ private System.Windows.Forms.RadioButton WriteRadio; private System.Windows.Forms.RadioButton ReadRadio; private HexTextBox AddressBox; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.ToolTip toolTip1; private System.Windows.Forms.Button CancelBtn; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label2; private HexTextBox AddressMaskBox; } } diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.Designer.cs index d74975c1f3..dc5d46adb2 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.Designer.cs @@ -30,7 +30,7 @@ { this.components = new System.ComponentModel.Container(); this.AddBreakpointButton = new System.Windows.Forms.Button(); - this.BreakpointStatsLabel = new System.Windows.Forms.Label(); + this.BreakpointStatsLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.ToggleButton = new System.Windows.Forms.Button(); this.RemoveBreakpointButton = new System.Windows.Forms.Button(); @@ -56,11 +56,8 @@ // // BreakpointStatsLabel // - this.BreakpointStatsLabel.AutoSize = true; this.BreakpointStatsLabel.Location = new System.Drawing.Point(3, 3); this.BreakpointStatsLabel.Name = "BreakpointStatsLabel"; - this.BreakpointStatsLabel.Size = new System.Drawing.Size(35, 13); - this.BreakpointStatsLabel.TabIndex = 8; this.BreakpointStatsLabel.Text = "label1"; // // ToggleButton @@ -181,7 +178,7 @@ private System.Windows.Forms.Button AddBreakpointButton; private System.Windows.Forms.Button RemoveBreakpointButton; private System.Windows.Forms.ColumnHeader columnHeader3; - private System.Windows.Forms.Label BreakpointStatsLabel; + private BizHawk.WinForms.Controls.LocLabelEx BreakpointStatsLabel; private System.Windows.Forms.ToolTip toolTip1; private System.Windows.Forms.Button ToggleButton; private System.Windows.Forms.Button DuplicateBreakpointButton; diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs index 87a749270d..0d057ac2f0 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs @@ -44,7 +44,7 @@ this.BreakPointControl1 = new BizHawk.Client.EmuHawk.BreakpointControl(); this.DisassemblerBox = new System.Windows.Forms.GroupBox(); this.ToPCBtn = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.DisassemblerView = new InputRoll(); this.DisassemblerContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.AddBreakpointContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -224,11 +224,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(6, 23); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(29, 13); - this.label1.TabIndex = 2; this.label1.Text = "Cpu:"; // // DisassemblerView @@ -390,7 +387,7 @@ private BreakpointControl BreakPointControl1; private System.Windows.Forms.GroupBox DisassemblerBox; private InputRoll DisassemblerView; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.Button StepOutBtn; private System.Windows.Forms.Button StepIntoBtn; private System.Windows.Forms.Button StepOverBtn; diff --git a/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.Designer.cs index 04abefa479..dbbda7c18b 100644 --- a/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.Designer.cs @@ -28,32 +28,32 @@ /// private void InitializeComponent() { - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label6 = new BizHawk.WinForms.Controls.LocLabelEx(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.label7 = new System.Windows.Forms.Label(); + this.label7 = new BizHawk.WinForms.Controls.LocLabelEx(); this.groupBox4 = new System.Windows.Forms.GroupBox(); this.groupBox5 = new System.Windows.Forms.GroupBox(); this.hScrollBarScanline = new System.Windows.Forms.HScrollBar(); - this.labelScanline = new System.Windows.Forms.Label(); + this.labelScanline = new BizHawk.WinForms.Controls.LocLabelEx(); this.buttonRefresh = new System.Windows.Forms.Button(); this.radioButtonRefreshManual = new System.Windows.Forms.RadioButton(); this.radioButtonRefreshScanline = new System.Windows.Forms.RadioButton(); this.radioButtonRefreshFrame = new System.Windows.Forms.RadioButton(); this.groupBoxDetails = new System.Windows.Forms.GroupBox(); - this.labelDetails = new System.Windows.Forms.Label(); + this.labelDetails = new BizHawk.WinForms.Controls.LocLabelEx(); this.groupBoxMemory = new System.Windows.Forms.GroupBox(); - this.labelMemory = new System.Windows.Forms.Label(); + this.labelMemory = new BizHawk.WinForms.Controls.LocLabelEx(); this.groupBox6 = new System.Windows.Forms.GroupBox(); - this.labelClipboard = new System.Windows.Forms.Label(); + this.labelClipboard = new BizHawk.WinForms.Controls.LocLabelEx(); this.groupBox8 = new System.Windows.Forms.GroupBox(); - this.labelSpriteBackColor = new System.Windows.Forms.Label(); + this.labelSpriteBackColor = new BizHawk.WinForms.Controls.LocLabelEx(); this.buttonChangeColor = new System.Windows.Forms.Button(); this.panelSpriteBackColor = new System.Windows.Forms.Panel(); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); @@ -79,56 +79,38 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(3, 16); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(65, 13); - this.label1.TabIndex = 2; this.label1.Text = "Background"; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(265, 16); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(46, 13); - this.label2.TabIndex = 3; this.label2.Text = "Window"; // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(3, 16); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(41, 13); - this.label3.TabIndex = 8; this.label3.Text = "Bank 1"; // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(137, 16); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(72, 13); - this.label4.TabIndex = 9; this.label4.Text = "Bank 2 (CGB)"; // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(3, 16); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(116, 13); - this.label5.TabIndex = 12; this.label5.Text = "Background && Window"; // // label6 // - this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(137, 16); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(34, 13); - this.label6.TabIndex = 13; this.label6.Text = "Sprite"; // // groupBox1 @@ -173,11 +155,8 @@ // // label7 // - this.label7.AutoSize = true; this.label7.Location = new System.Drawing.Point(6, 99); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(266, 13); - this.label7.TabIndex = 14; this.label7.Text = "Left-click a palette to use it for drawing the tiles display."; // // groupBox4 @@ -216,11 +195,8 @@ // // labelScanline // - this.labelScanline.AutoSize = true; this.labelScanline.Location = new System.Drawing.Point(159, 24); this.labelScanline.Name = "labelScanline"; - this.labelScanline.Size = new System.Drawing.Size(21, 13); - this.labelScanline.TabIndex = 5; this.labelScanline.Text = "SS"; this.labelScanline.TextAlign = System.Drawing.ContentAlignment.TopCenter; // @@ -283,12 +259,9 @@ // // labelDetails // - this.labelDetails.AutoSize = true; this.labelDetails.Location = new System.Drawing.Point(76, 16); this.labelDetails.MaximumSize = new System.Drawing.Size(150, 0); this.labelDetails.Name = "labelDetails"; - this.labelDetails.Size = new System.Drawing.Size(135, 26); - this.labelDetails.TabIndex = 1; this.labelDetails.Text = "Mouse over an item to see details about it."; // // groupBoxMemory @@ -304,12 +277,9 @@ // // labelMemory // - this.labelMemory.AutoSize = true; this.labelMemory.Location = new System.Drawing.Point(76, 16); this.labelMemory.MaximumSize = new System.Drawing.Size(150, 0); this.labelMemory.Name = "labelMemory"; - this.labelMemory.Size = new System.Drawing.Size(149, 26); - this.labelMemory.TabIndex = 0; this.labelMemory.Text = "Right-click an item to display it here."; // // groupBox6 @@ -324,11 +294,8 @@ // // labelClipboard // - this.labelClipboard.AutoSize = true; this.labelClipboard.Location = new System.Drawing.Point(7, 23); this.labelClipboard.Name = "labelClipboard"; - this.labelClipboard.Size = new System.Drawing.Size(212, 13); - this.labelClipboard.TabIndex = 0; this.labelClipboard.Text = "CTRL+C copies the pane under the mouse."; // // groupBox8 @@ -345,11 +312,8 @@ // // labelSpriteBackColor // - this.labelSpriteBackColor.AutoSize = true; this.labelSpriteBackColor.Location = new System.Drawing.Point(67, 24); this.labelSpriteBackColor.Name = "labelSpriteBackColor"; - this.labelSpriteBackColor.Size = new System.Drawing.Size(35, 13); - this.labelSpriteBackColor.TabIndex = 2; this.labelSpriteBackColor.Text = "label8"; // // buttonChangeColor @@ -534,25 +498,25 @@ #endregion - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label2; private BmpView bmpViewBG; private BmpView bmpViewWin; private BmpView bmpViewTiles1; private BmpView bmpViewTiles2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label4; + private BizHawk.WinForms.Controls.LocLabelEx label3; + private BizHawk.WinForms.Controls.LocLabelEx label4; private BmpView bmpViewBGPal; private BmpView bmpViewSPPal; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label6; + private BizHawk.WinForms.Controls.LocLabelEx label5; + private BizHawk.WinForms.Controls.LocLabelEx label6; private BmpView bmpViewOAM; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.GroupBox groupBox4; private System.Windows.Forms.GroupBox groupBox5; - private System.Windows.Forms.Label labelScanline; + private BizHawk.WinForms.Controls.LocLabelEx labelScanline; private System.Windows.Forms.Button buttonRefresh; private System.Windows.Forms.RadioButton radioButtonRefreshManual; private System.Windows.Forms.RadioButton radioButtonRefreshScanline; @@ -560,17 +524,17 @@ private System.Windows.Forms.HScrollBar hScrollBarScanline; private System.Windows.Forms.GroupBox groupBoxDetails; private BmpView bmpViewDetails; - private System.Windows.Forms.Label labelDetails; + private BizHawk.WinForms.Controls.LocLabelEx labelDetails; private System.Windows.Forms.GroupBox groupBoxMemory; - private System.Windows.Forms.Label labelMemory; + private BizHawk.WinForms.Controls.LocLabelEx labelMemory; private BmpView bmpViewMemory; - private System.Windows.Forms.Label label7; + private BizHawk.WinForms.Controls.LocLabelEx label7; private System.Windows.Forms.GroupBox groupBox6; - private System.Windows.Forms.Label labelClipboard; + private BizHawk.WinForms.Controls.LocLabelEx labelClipboard; private System.Windows.Forms.GroupBox groupBox8; private System.Windows.Forms.Panel panelSpriteBackColor; private System.Windows.Forms.Button buttonChangeColor; - private System.Windows.Forms.Label labelSpriteBackColor; + private BizHawk.WinForms.Controls.LocLabelEx labelSpriteBackColor; private System.Windows.Forms.MenuStrip menuStrip1; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.Designer.cs index 158be816a4..ddc5065db7 100644 --- a/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.Designer.cs @@ -29,7 +29,7 @@ private void InitializeComponent() { this.paperView = new BmpView(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.paperScroll = new System.Windows.Forms.VScrollBar(); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -94,7 +94,6 @@ // this.label1.Name = "label1"; this.label1.Location = new System.Drawing.Point(0, 24); - this.label1.Size = new System.Drawing.Size(336, 24); this.label1.Text = "Note: the printer is only connected while this window is open."; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -140,7 +139,7 @@ private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem; private BmpView paperView; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.VScrollBar paperScroll; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.Designer.cs index ffd39cf024..da50a16177 100644 --- a/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.Designer.cs @@ -31,14 +31,14 @@ this.components = new System.ComponentModel.Container(); this.listBoxWidgets = new System.Windows.Forms.ListBox(); this.panel1 = new System.Windows.Forms.Panel(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.buttonShowWidget = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.buttonRefresh = new System.Windows.Forms.Button(); this.hScrollBar1 = new System.Windows.Forms.HScrollBar(); this.radioButtonManual = new System.Windows.Forms.RadioButton(); this.radioButtonScanline = new System.Windows.Forms.RadioButton(); - this.labelClipboard = new System.Windows.Forms.Label(); + this.labelClipboard = new BizHawk.WinForms.Controls.LocLabelEx(); this.timerMessage = new System.Windows.Forms.Timer(this.components); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.groupBox1.SuspendLayout(); @@ -66,11 +66,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 24); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(92, 13); - this.label1.TabIndex = 2; this.label1.Text = "Available widgets:"; // // buttonShowWidget @@ -141,12 +138,9 @@ // // labelClipboard // - this.labelClipboard.AutoSize = true; this.labelClipboard.Location = new System.Drawing.Point(9, 371); this.labelClipboard.MaximumSize = new System.Drawing.Size(145, 0); this.labelClipboard.Name = "labelClipboard"; - this.labelClipboard.Size = new System.Drawing.Size(117, 26); - this.labelClipboard.TabIndex = 5; this.labelClipboard.Text = "CTRL + C: Copy under mouse to clipboard."; // // timerMessage @@ -193,14 +187,14 @@ private System.Windows.Forms.ListBox listBoxWidgets; private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.Button buttonShowWidget; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.Button buttonRefresh; private System.Windows.Forms.HScrollBar hScrollBar1; private System.Windows.Forms.RadioButton radioButtonManual; private System.Windows.Forms.RadioButton radioButtonScanline; - private System.Windows.Forms.Label labelClipboard; + private BizHawk.WinForms.Controls.LocLabelEx labelClipboard; private System.Windows.Forms.Timer timerMessage; private System.Windows.Forms.MenuStrip menuStrip1; diff --git a/src/BizHawk.Client.EmuHawk/tools/GameShark.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/GameShark.Designer.cs index 73ceff6764..712c6ba9d2 100644 --- a/src/BizHawk.Client.EmuHawk/tools/GameShark.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/GameShark.Designer.cs @@ -30,10 +30,10 @@ { this.mnuGameShark = new System.Windows.Forms.MenuStrip(); this.btnClear = new System.Windows.Forms.Button(); - this.lblCheat = new System.Windows.Forms.Label(); + this.lblCheat = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtCheat = new System.Windows.Forms.TextBox(); this.btnGo = new System.Windows.Forms.Button(); - this.lblDescription = new System.Windows.Forms.Label(); + this.lblDescription = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtDescription = new System.Windows.Forms.TextBox(); this.SuspendLayout(); // @@ -57,11 +57,8 @@ // // lblCheat // - this.lblCheat.AutoSize = true; this.lblCheat.Location = new System.Drawing.Point(12, 63); this.lblCheat.Name = "lblCheat"; - this.lblCheat.Size = new System.Drawing.Size(63, 13); - this.lblCheat.TabIndex = 11; this.lblCheat.Text = "Cheat Code"; // // txtCheat @@ -89,11 +86,8 @@ // // lblDescription // - this.lblDescription.AutoSize = true; this.lblDescription.Location = new System.Drawing.Point(12, 38); this.lblDescription.Name = "lblDescription"; - this.lblDescription.Size = new System.Drawing.Size(60, 13); - this.lblDescription.TabIndex = 17; this.lblDescription.Text = "Description"; // // txtDescription @@ -131,10 +125,10 @@ private System.Windows.Forms.MenuStrip mnuGameShark; internal System.Windows.Forms.Button btnClear; - internal System.Windows.Forms.Label lblCheat; + internal BizHawk.WinForms.Controls.LocLabelEx lblCheat; internal System.Windows.Forms.TextBox txtCheat; internal System.Windows.Forms.Button btnGo; - private System.Windows.Forms.Label lblDescription; + private BizHawk.WinForms.Controls.LocLabelEx lblDescription; private System.Windows.Forms.TextBox txtDescription; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.Designer.cs index 43bf826cdd..a1df85f8df 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.Designer.cs @@ -38,7 +38,7 @@ this.bmpViewNTA = new BizHawk.Client.EmuHawk.BmpView(); this.groupBox5 = new System.Windows.Forms.GroupBox(); this.bmpViewNTB = new BizHawk.Client.EmuHawk.BmpView(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.menuStrip1 = new MenuStripEx(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveBGAScreenshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -149,11 +149,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(743, 855); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(323, 13); - this.label1.TabIndex = 10; this.label1.Text = "CTRL+C copies the pane under the mouse pointer to the clipboard."; // // menuStrip1 @@ -272,7 +269,7 @@ private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.GroupBox groupBox4; private System.Windows.Forms.GroupBox groupBox5; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private MenuStripEx menuStrip1; private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem saveBGAScreenshotToolStripMenuItem; diff --git a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexColor.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexColor.Designer.cs index bc8bdee926..bcc5d09b2b 100644 --- a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexColor.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexColor.Designer.cs @@ -29,17 +29,17 @@ private void InitializeComponent() { this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.label6 = new System.Windows.Forms.Label(); + this.label6 = new BizHawk.WinForms.Controls.LocLabelEx(); this.HexFreezeHL = new System.Windows.Forms.Panel(); - this.label5 = new System.Windows.Forms.Label(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); this.HexFreeze = new System.Windows.Forms.Panel(); - this.label4 = new System.Windows.Forms.Label(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); this.HexHighlight = new System.Windows.Forms.Panel(); this.HexForegrnd = new System.Windows.Forms.Panel(); - this.label1 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); this.HexMenubar = new System.Windows.Forms.Panel(); - this.label2 = new System.Windows.Forms.Label(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.HexBackgrnd = new System.Windows.Forms.Panel(); this.colorDialog1 = new System.Windows.Forms.ColorDialog(); this.groupBox1.SuspendLayout(); @@ -67,11 +67,8 @@ // // label6 // - this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(30, 171); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(110, 13); - this.label6.TabIndex = 17; this.label6.Text = "Freeze Highlight Color"; // // HexFreezeHL @@ -85,11 +82,8 @@ // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(30, 139); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(66, 13); - this.label5.TabIndex = 15; this.label5.Text = "Freeze Color"; // // HexFreeze @@ -103,11 +97,8 @@ // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(30, 108); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(75, 13); - this.label4.TabIndex = 13; this.label4.Text = "Highlight Color"; // // HexHighlight @@ -130,20 +121,14 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(30, 15); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(92, 13); - this.label1.TabIndex = 9; this.label1.Text = "Background Color"; // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(30, 77); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(76, 13); - this.label3.TabIndex = 11; this.label3.Text = "Menubar Color"; // // HexMenubar @@ -157,11 +142,8 @@ // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(30, 46); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(55, 13); - this.label2.TabIndex = 10; this.label2.Text = "Font Color"; // // HexBackgrnd @@ -195,18 +177,18 @@ #endregion private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label3; + private BizHawk.WinForms.Controls.LocLabelEx label2; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.Panel HexForegrnd; private System.Windows.Forms.Panel HexBackgrnd; private System.Windows.Forms.ColorDialog colorDialog1; private System.Windows.Forms.Panel HexMenubar; - private System.Windows.Forms.Label label6; + private BizHawk.WinForms.Controls.LocLabelEx label6; private System.Windows.Forms.Panel HexFreezeHL; - private System.Windows.Forms.Label label5; + private BizHawk.WinForms.Controls.LocLabelEx label5; private System.Windows.Forms.Panel HexFreeze; - private System.Windows.Forms.Label label4; + private BizHawk.WinForms.Controls.LocLabelEx label4; private System.Windows.Forms.Panel HexHighlight; } diff --git a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs index ec1396a25d..cb70177dd4 100644 --- a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs @@ -88,9 +88,9 @@ this.viewN64MatrixToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.MemoryViewerBox = new System.Windows.Forms.GroupBox(); this.HexScrollBar = new System.Windows.Forms.VScrollBar(); - this.AddressLabel = new System.Windows.Forms.Label(); - this.AddressesLabel = new System.Windows.Forms.Label(); - this.Header = new System.Windows.Forms.Label(); + this.AddressLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.AddressesLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.Header = new BizHawk.WinForms.Controls.LocLabelEx(); this.HexMenuStrip.SuspendLayout(); this.ViewerContextMenuStrip.SuspendLayout(); this.MemoryViewerBox.SuspendLayout(); @@ -591,22 +591,16 @@ // // AddressLabel // - this.AddressLabel.AutoSize = true; this.AddressLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.AddressLabel.Location = new System.Drawing.Point(3, 30); this.AddressLabel.Name = "AddressLabel"; - this.AddressLabel.Size = new System.Drawing.Size(25, 13); - this.AddressLabel.TabIndex = 2; this.AddressLabel.Text = " "; // // AddressesLabel // - this.AddressesLabel.AutoSize = true; this.AddressesLabel.ContextMenuStrip = this.ViewerContextMenuStrip; this.AddressesLabel.Location = new System.Drawing.Point(79, 30); this.AddressesLabel.Name = "AddressesLabel"; - this.AddressesLabel.Size = new System.Drawing.Size(31, 13); - this.AddressesLabel.TabIndex = 0; this.AddressesLabel.Text = "RAM"; this.AddressesLabel.MouseDown += new System.Windows.Forms.MouseEventHandler(this.AddressesLabel_MouseDown); this.AddressesLabel.MouseLeave += new System.EventHandler(this.AddressesLabel_MouseLeave); @@ -615,12 +609,9 @@ // // Header // - this.Header.AutoSize = true; this.Header.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Header.Location = new System.Drawing.Point(28, 44); this.Header.Name = "Header"; - this.Header.Size = new System.Drawing.Size(35, 13); - this.Header.TabIndex = 2; this.Header.Text = "label1"; // // HexEditor @@ -675,7 +666,7 @@ private System.Windows.Forms.ToolStripMenuItem AddToRamWatchMenuItem; private System.Windows.Forms.ToolStripMenuItem FreezeAddressMenuItem; public System.Windows.Forms.GroupBox MemoryViewerBox; - private System.Windows.Forms.Label AddressesLabel; + private BizHawk.WinForms.Controls.LocLabelEx AddressesLabel; private System.Windows.Forms.VScrollBar HexScrollBar; private System.Windows.Forms.ToolStripMenuItem UnfreezeAllMenuItem; private System.Windows.Forms.ToolStripMenuItem UnfreezeAllContextItem; @@ -696,8 +687,8 @@ private System.Windows.Forms.ToolStripMenuItem SetColorsMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator8; private System.Windows.Forms.ToolStripMenuItem ResetColorsToDefaultMenuItem; - public System.Windows.Forms.Label Header; - private System.Windows.Forms.Label AddressLabel; + public BizHawk.WinForms.Controls.LocLabelEx Header; + private BizHawk.WinForms.Controls.LocLabelEx AddressLabel; private System.Windows.Forms.ToolStripMenuItem CopyContextItem; private System.Windows.Forms.ToolStripMenuItem PasteContextItem; private System.Windows.Forms.ToolStripMenuItem FindNextMenuItem; diff --git a/src/BizHawk.Client.EmuHawk/tools/InputPrompt.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/InputPrompt.Designer.cs index 412e498437..51388be34a 100644 --- a/src/BizHawk.Client.EmuHawk/tools/InputPrompt.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/InputPrompt.Designer.cs @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - this.PromptLabel = new System.Windows.Forms.Label(); + this.PromptLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.PromptBox = new System.Windows.Forms.TextBox(); this.OK = new System.Windows.Forms.Button(); this.Cancel = new System.Windows.Forms.Button(); @@ -36,11 +36,8 @@ // // PromptLabel // - this.PromptLabel.AutoSize = true; this.PromptLabel.Location = new System.Drawing.Point(33, 9); this.PromptLabel.Name = "PromptLabel"; - this.PromptLabel.Size = new System.Drawing.Size(73, 13); - this.PromptLabel.TabIndex = 0; this.PromptLabel.Text = "Enter a value:"; // // PromptBox @@ -104,7 +101,7 @@ #endregion - private System.Windows.Forms.Label PromptLabel; + private BizHawk.WinForms.Controls.LocLabelEx PromptLabel; private System.Windows.Forms.TextBox PromptBox; private System.Windows.Forms.Button OK; private System.Windows.Forms.Button Cancel; diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs index 31c91c7065..b6b6c44a72 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs @@ -89,8 +89,8 @@ this.ClearRegisteredFunctionsLogContextItem = new System.Windows.Forms.ToolStripMenuItem(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.InputBox = new System.Windows.Forms.TextBox(); - this.NumberOfScripts = new System.Windows.Forms.Label(); - this.OutputMessages = new System.Windows.Forms.Label(); + this.NumberOfScripts = new BizHawk.WinForms.Controls.LocLabelEx(); + this.OutputMessages = new BizHawk.WinForms.Controls.LocLabelEx(); this.toolStrip1 = new ToolStripEx(); this.NewScriptToolbarItem = new System.Windows.Forms.ToolStripButton(); this.OpenScriptToolbarItem = new System.Windows.Forms.ToolStripButton(); @@ -626,21 +626,15 @@ // // NumberOfScripts // - this.NumberOfScripts.AutoSize = true; this.NumberOfScripts.Location = new System.Drawing.Point(3, 3); this.NumberOfScripts.Name = "NumberOfScripts"; - this.NumberOfScripts.Size = new System.Drawing.Size(56, 13); - this.NumberOfScripts.TabIndex = 4; this.NumberOfScripts.Text = "0 script "; // // OutputMessages // this.OutputMessages.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.OutputMessages.AutoSize = true; this.OutputMessages.Location = new System.Drawing.Point(13, 329); this.OutputMessages.Name = "OutputMessages"; - this.OutputMessages.Size = new System.Drawing.Size(106, 13); - this.OutputMessages.TabIndex = 6; this.OutputMessages.Text = " "; // // toolStrip1 @@ -882,7 +876,7 @@ private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.ToolStripMenuItem NewSessionMenuItem; private System.Windows.Forms.ToolStripMenuItem SettingsSubMenu; - private System.Windows.Forms.Label NumberOfScripts; + private BizHawk.WinForms.Controls.LocLabelEx NumberOfScripts; private System.Windows.Forms.ToolStripMenuItem InsertSeparatorMenuItem; private System.Windows.Forms.ToolStripMenuItem StopAllScriptsMenuItem; private System.Windows.Forms.ContextMenuStrip ScriptListContextMenu; @@ -923,7 +917,7 @@ private System.Windows.Forms.ToolStripButton PauseToolbarItem; private System.Windows.Forms.ToolStripMenuItem PauseScriptContextItem; public System.Windows.Forms.RichTextBox OutputBox; - private System.Windows.Forms.Label OutputMessages; + private BizHawk.WinForms.Controls.LocLabelEx OutputMessages; private System.Windows.Forms.ToolStripMenuItem OnlineDocsMenuItem; private System.Windows.Forms.ToolStripMenuItem NewScriptMenuItem; private System.Windows.Forms.ToolStripButton NewScriptToolbarItem; diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.Designer.cs index 9d719df860..47ff650e11 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.Designer.cs @@ -31,7 +31,7 @@ this.OK = new System.Windows.Forms.Button(); this.directoryEntry1 = new System.DirectoryServices.DirectoryEntry(); this.FilterBox = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.ToWikiMarkupButton = new System.Windows.Forms.Button(); this.FunctionView = new System.Windows.Forms.ListView(); this.LibraryReturn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -64,11 +64,8 @@ // label1 // this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(173, 314); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(29, 13); - this.label1.TabIndex = 3; this.label1.Text = "Filter"; // // ToWikiMarkupButton @@ -172,7 +169,7 @@ private System.Windows.Forms.ColumnHeader LibraryParameters; private System.Windows.Forms.ColumnHeader LibraryDescription; private System.Windows.Forms.TextBox FilterBox; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.Button ToWikiMarkupButton; private System.Windows.Forms.ContextMenu CopyMenu; } diff --git a/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.Designer.cs index 3a57ae9985..569addf6fe 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.Designer.cs @@ -38,15 +38,15 @@ this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.NameTextbox = new System.Windows.Forms.TextBox(); this.ReplaceBox = new System.Windows.Forms.CheckBox(); - this.label2 = new System.Windows.Forms.Label(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.PlaceNum = new System.Windows.Forms.NumericUpDown(); this.EndNum = new System.Windows.Forms.NumericUpDown(); this.PlaceZoneButton = new System.Windows.Forms.Button(); this.StartNum = new System.Windows.Forms.NumericUpDown(); this.SetZoneButton = new System.Windows.Forms.Button(); this.ZonesList = new System.Windows.Forms.ListBox(); - this.label3 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.CurrentButton = new System.Windows.Forms.Button(); this.OverlayBox = new System.Windows.Forms.CheckBox(); this.MacroMenu.SuspendLayout(); @@ -144,11 +144,8 @@ // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(12, 24); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(127, 13); - this.label2.TabIndex = 16; this.label2.Text = "macro start macro end"; // // PlaceNum @@ -223,20 +220,14 @@ // label3 // this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(178, 184); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(39, 13); - this.label3.TabIndex = 17; this.label3.Text = "Frame:"; // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(4, 184); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(71, 13); - this.label1.TabIndex = 22; this.label1.Text = "Macro Name:"; // // CurrentButton @@ -305,15 +296,15 @@ private System.Windows.Forms.ToolStripMenuItem ExitMenuItem; private System.Windows.Forms.TextBox NameTextbox; private System.Windows.Forms.CheckBox ReplaceBox; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label2; private System.Windows.Forms.NumericUpDown PlaceNum; private System.Windows.Forms.NumericUpDown EndNum; private System.Windows.Forms.Button PlaceZoneButton; private System.Windows.Forms.NumericUpDown StartNum; private System.Windows.Forms.Button SetZoneButton; private System.Windows.Forms.ListBox ZonesList; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label3; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.ToolStripMenuItem saveAsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem loadMacroToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem RecentToolStripMenuItem; diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.Designer.cs index 5235c53f60..134392b1e5 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.Designer.cs @@ -29,9 +29,9 @@ private void InitializeComponent() { this.textBox1 = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); this.button1 = new System.Windows.Forms.Button(); this.SuspendLayout(); // @@ -47,29 +47,20 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 36); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(176, 13); - this.label1.TabIndex = 1; this.label1.Text = "Enter the digits of the barcode here:"; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(12, 9); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(503, 13); - this.label2.TabIndex = 2; this.label2.Text = "THIS IS AN EXPERIMENTAL FEATURE AND WILL DESYNC MOVIES. DO NOT USE WITH MOVIES."; // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(12, 75); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(35, 13); - this.label3.TabIndex = 3; this.label3.Text = "label3"; // // button1 @@ -103,9 +94,9 @@ #endregion private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label2; + private BizHawk.WinForms.Controls.LocLabelEx label3; private System.Windows.Forms.Button button1; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.Designer.cs index 5dfbbd8fd6..2c13589cd7 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.Designer.cs @@ -31,13 +31,13 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NESMusicRipper)); this.btnControl = new System.Windows.Forms.Button(); this.txtDivider = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.btnExport = new System.Windows.Forms.Button(); - this.lblContents = new System.Windows.Forms.Label(); + this.lblContents = new BizHawk.WinForms.Controls.LocLabelEx(); this.textBox1 = new System.Windows.Forms.TextBox(); this.txtPatternLength = new System.Windows.Forms.TextBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.label2 = new System.Windows.Forms.Label(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.menuStrip1 = new MenuStripEx(); this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem(); @@ -68,11 +68,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(6, 16); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(135, 13); - this.label1.TabIndex = 2; this.label1.Text = "APU Divider (trace interval)"; // // btnExport @@ -88,11 +85,8 @@ // // lblContents // - this.lblContents.AutoSize = true; this.lblContents.Location = new System.Drawing.Point(6, 102); this.lblContents.Name = "lblContents"; - this.lblContents.Size = new System.Drawing.Size(55, 13); - this.lblContents.TabIndex = 4; this.lblContents.Text = "(Contents)"; // // textBox1 @@ -126,11 +120,8 @@ // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(12, 21); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(126, 13); - this.label2.TabIndex = 8; this.label2.Text = "Pattern Length (512 max)"; // // groupBox2 @@ -208,9 +199,9 @@ private System.Windows.Forms.Button btnControl; private System.Windows.Forms.TextBox txtDivider; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.Button btnExport; - private System.Windows.Forms.Label lblContents; + private BizHawk.WinForms.Controls.LocLabelEx lblContents; private MenuStripEx menuStrip1; private System.Windows.Forms.ToolStripMenuItem FileSubMenu; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; @@ -218,7 +209,7 @@ private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.TextBox txtPatternLength; private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label2; private System.Windows.Forms.GroupBox groupBox2; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.Designer.cs index 416218af1c..4f2500965b 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.Designer.cs @@ -50,19 +50,19 @@ this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.PaletteLabel = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.TableLabel = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.PPUAddressLabel = new System.Windows.Forms.Label(); - this.XYLabel = new System.Windows.Forms.Label(); - this.TileIDLabel = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); + this.PaletteLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.TableLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.PPUAddressLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.XYLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.TileIDLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.groupBox5 = new System.Windows.Forms.GroupBox(); - this.label7 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); + this.label7 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label6 = new BizHawk.WinForms.Controls.LocLabelEx(); this.RefreshRate = new System.Windows.Forms.TrackBar(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.groupBox1.SuspendLayout(); @@ -288,92 +288,62 @@ // // PaletteLabel // - this.PaletteLabel.AutoSize = true; this.PaletteLabel.Location = new System.Drawing.Point(64, 96); this.PaletteLabel.Name = "PaletteLabel"; - this.PaletteLabel.Size = new System.Drawing.Size(22, 13); - this.PaletteLabel.TabIndex = 9; this.PaletteLabel.Text = " "; // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(6, 96); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(43, 13); - this.label5.TabIndex = 8; this.label5.Text = "Palette:"; // // TableLabel // - this.TableLabel.AutoSize = true; this.TableLabel.Location = new System.Drawing.Point(64, 78); this.TableLabel.Name = "TableLabel"; - this.TableLabel.Size = new System.Drawing.Size(22, 13); - this.TableLabel.TabIndex = 7; this.TableLabel.Text = " "; // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(6, 78); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(37, 13); - this.label4.TabIndex = 6; this.label4.Text = "Table:"; // // PPUAddressLabel // - this.PPUAddressLabel.AutoSize = true; this.PPUAddressLabel.Location = new System.Drawing.Point(64, 60); this.PPUAddressLabel.Name = "PPUAddressLabel"; - this.PPUAddressLabel.Size = new System.Drawing.Size(22, 13); - this.PPUAddressLabel.TabIndex = 5; this.PPUAddressLabel.Text = " "; // // XYLabel // - this.XYLabel.AutoSize = true; this.XYLabel.Location = new System.Drawing.Point(64, 43); this.XYLabel.Name = "XYLabel"; - this.XYLabel.Size = new System.Drawing.Size(22, 13); - this.XYLabel.TabIndex = 4; this.XYLabel.Text = " "; // // TileIDLabel // - this.TileIDLabel.AutoSize = true; this.TileIDLabel.Location = new System.Drawing.Point(64, 26); this.TileIDLabel.Name = "TileIDLabel"; - this.TileIDLabel.Size = new System.Drawing.Size(22, 13); - this.TileIDLabel.TabIndex = 3; this.TileIDLabel.Text = " "; // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(6, 60); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(57, 13); - this.label3.TabIndex = 2; this.label3.Text = "PPU Addr:"; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(6, 43); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(35, 13); - this.label2.TabIndex = 1; this.label2.Text = "X / Y:"; // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(6, 26); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(41, 13); - this.label1.TabIndex = 0; this.label1.Text = "Tile ID:"; // // groupBox5 @@ -390,20 +360,14 @@ // // label7 // - this.label7.AutoSize = true; this.label7.Location = new System.Drawing.Point(7, 186); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(31, 13); - this.label7.TabIndex = 2; this.label7.Text = "More"; // // label6 // - this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(7, 32); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(29, 13); - this.label6.TabIndex = 1; this.label6.Text = "Less"; // // RefreshRate @@ -470,20 +434,20 @@ private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.GroupBox groupBox4; - private System.Windows.Forms.Label PPUAddressLabel; - private System.Windows.Forms.Label XYLabel; - private System.Windows.Forms.Label TileIDLabel; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label TableLabel; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label PaletteLabel; + private BizHawk.WinForms.Controls.LocLabelEx PPUAddressLabel; + private BizHawk.WinForms.Controls.LocLabelEx XYLabel; + private BizHawk.WinForms.Controls.LocLabelEx TileIDLabel; + private BizHawk.WinForms.Controls.LocLabelEx label3; + private BizHawk.WinForms.Controls.LocLabelEx label2; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label4; + private BizHawk.WinForms.Controls.LocLabelEx TableLabel; + private BizHawk.WinForms.Controls.LocLabelEx label5; + private BizHawk.WinForms.Controls.LocLabelEx PaletteLabel; private System.Windows.Forms.GroupBox groupBox5; - private System.Windows.Forms.Label label6; + private BizHawk.WinForms.Controls.LocLabelEx label6; private System.Windows.Forms.TrackBar RefreshRate; - private System.Windows.Forms.Label label7; + private BizHawk.WinForms.Controls.LocLabelEx label7; private System.Windows.Forms.ToolStripMenuItem FileSubMenu; private System.Windows.Forms.ToolStripMenuItem ScreenshotMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.Designer.cs index 82e44a16d6..fc2a8c69af 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.Designer.cs @@ -30,8 +30,8 @@ { this.components = new System.ComponentModel.Container(); this.PatternGroup = new System.Windows.Forms.GroupBox(); - this.Table1PaletteLabel = new System.Windows.Forms.Label(); - this.Table0PaletteLabel = new System.Windows.Forms.Label(); + this.Table1PaletteLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.Table0PaletteLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.PatternView = new BizHawk.Client.EmuHawk.PatternViewer(); this.PatternContext = new System.Windows.Forms.ContextMenuStrip(this.components); this.PatternSaveImageMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -44,15 +44,15 @@ this.PaletteImageToClipboardMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.PaletteRefreshMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.DetailsBox = new System.Windows.Forms.GroupBox(); - this.label2 = new System.Windows.Forms.Label(); - this.Value5Label = new System.Windows.Forms.Label(); - this.Value4Label = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.Value5Label = new BizHawk.WinForms.Controls.LocLabelEx(); + this.Value4Label = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.ZoomBox = new System.Windows.Forms.PictureBox(); - this.Value3Label = new System.Windows.Forms.Label(); - this.Value2Label = new System.Windows.Forms.Label(); - this.ValueLabel = new System.Windows.Forms.Label(); - this.AddressLabel = new System.Windows.Forms.Label(); + this.Value3Label = new BizHawk.WinForms.Controls.LocLabelEx(); + this.Value2Label = new BizHawk.WinForms.Controls.LocLabelEx(); + this.ValueLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.AddressLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.SpriteViewerBox = new System.Windows.Forms.GroupBox(); this.SpriteView = new BizHawk.Client.EmuHawk.SpriteViewer(); this.SpriteContext = new System.Windows.Forms.ContextMenuStrip(this.components); @@ -62,8 +62,8 @@ this.txtScanline = new System.Windows.Forms.TextBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.label4 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); this.RefreshRate = new System.Windows.Forms.TrackBar(); this.NesPPUMenu = new MenuStripEx(); this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem(); @@ -101,7 +101,7 @@ this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.Messagetimer = new System.Windows.Forms.Timer(this.components); this.CHRROMGroup = new System.Windows.Forms.GroupBox(); - this.label5 = new System.Windows.Forms.Label(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); this.numericUpDownCHRROMBank = new System.Windows.Forms.NumericUpDown(); this.CHRROMView = new BizHawk.Client.EmuHawk.PatternViewer(); this.PatternGroup.SuspendLayout(); @@ -137,22 +137,16 @@ // // Table1PaletteLabel // - this.Table1PaletteLabel.AutoSize = true; this.Table1PaletteLabel.Location = new System.Drawing.Point(172, 185); this.Table1PaletteLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.Table1PaletteLabel.Name = "Table1PaletteLabel"; - this.Table1PaletteLabel.Size = new System.Drawing.Size(68, 17); - this.Table1PaletteLabel.TabIndex = 2; this.Table1PaletteLabel.Text = "Palette: 0"; // // Table0PaletteLabel // - this.Table0PaletteLabel.AutoSize = true; this.Table0PaletteLabel.Location = new System.Drawing.Point(8, 185); this.Table0PaletteLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.Table0PaletteLabel.Name = "Table0PaletteLabel"; - this.Table0PaletteLabel.Size = new System.Drawing.Size(68, 17); - this.Table0PaletteLabel.TabIndex = 1; this.Table0PaletteLabel.Text = "Palette: 0"; // // PatternView @@ -281,42 +275,30 @@ // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(8, 38); this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(212, 17); - this.label2.TabIndex = 10; this.label2.Text = "Shift-click to remember selection"; // // Value5Label // - this.Value5Label.AutoSize = true; this.Value5Label.Location = new System.Drawing.Point(192, 182); this.Value5Label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.Value5Label.Name = "Value5Label"; - this.Value5Label.Size = new System.Drawing.Size(56, 17); - this.Value5Label.TabIndex = 9; this.Value5Label.Text = "Value 5"; // // Value4Label // - this.Value4Label.AutoSize = true; this.Value4Label.Location = new System.Drawing.Point(192, 148); this.Value4Label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.Value4Label.Name = "Value4Label"; - this.Value4Label.Size = new System.Drawing.Size(56, 17); - this.Value4Label.TabIndex = 8; this.Value4Label.Text = "Value 4"; // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(8, 20); this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(200, 17); - this.label1.TabIndex = 7; this.label1.Text = "Hover over item to view details"; // // ZoomBox @@ -331,42 +313,30 @@ // // Value3Label // - this.Value3Label.AutoSize = true; this.Value3Label.Location = new System.Drawing.Point(192, 113); this.Value3Label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.Value3Label.Name = "Value3Label"; - this.Value3Label.Size = new System.Drawing.Size(56, 17); - this.Value3Label.TabIndex = 5; this.Value3Label.Text = "Value 3"; // // Value2Label // - this.Value2Label.AutoSize = true; this.Value2Label.Location = new System.Drawing.Point(13, 182); this.Value2Label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.Value2Label.Name = "Value2Label"; - this.Value2Label.Size = new System.Drawing.Size(56, 17); - this.Value2Label.TabIndex = 3; this.Value2Label.Text = "Value 2"; // // ValueLabel // - this.ValueLabel.AutoSize = true; this.ValueLabel.Location = new System.Drawing.Point(13, 148); this.ValueLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.ValueLabel.Name = "ValueLabel"; - this.ValueLabel.Size = new System.Drawing.Size(56, 17); - this.ValueLabel.TabIndex = 2; this.ValueLabel.Text = "Value 1"; // // AddressLabel // - this.AddressLabel.AutoSize = true; this.AddressLabel.Location = new System.Drawing.Point(13, 113); this.AddressLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.AddressLabel.Name = "AddressLabel"; - this.AddressLabel.Size = new System.Drawing.Size(60, 17); - this.AddressLabel.TabIndex = 1; this.AddressLabel.Text = "Address"; // // SpriteViewerBox @@ -465,22 +435,16 @@ // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(187, 25); this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(38, 17); - this.label4.TabIndex = 11; this.label4.Text = "Less"; // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(8, 23); this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(40, 17); - this.label3.TabIndex = 10; this.label3.Text = "More"; // // RefreshRate @@ -797,12 +761,9 @@ // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(8, 192); this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(44, 17); - this.label5.TabIndex = 2; this.label5.Text = "Bank:"; // // numericUpDownCHRROMBank @@ -883,26 +844,26 @@ private System.Windows.Forms.GroupBox PalettesGroup; private PaletteViewer PaletteView; private System.Windows.Forms.GroupBox DetailsBox; - private System.Windows.Forms.Label ValueLabel; - private System.Windows.Forms.Label AddressLabel; + private BizHawk.WinForms.Controls.LocLabelEx ValueLabel; + private BizHawk.WinForms.Controls.LocLabelEx AddressLabel; private PatternViewer PatternView; - private System.Windows.Forms.Label Table1PaletteLabel; - private System.Windows.Forms.Label Table0PaletteLabel; - private System.Windows.Forms.Label Value2Label; + private BizHawk.WinForms.Controls.LocLabelEx Table1PaletteLabel; + private BizHawk.WinForms.Controls.LocLabelEx Table0PaletteLabel; + private BizHawk.WinForms.Controls.LocLabelEx Value2Label; private System.Windows.Forms.GroupBox SpriteViewerBox; private SpriteViewer SpriteView; private System.Windows.Forms.TextBox txtScanline; private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Label Value3Label; + private BizHawk.WinForms.Controls.LocLabelEx Value3Label; private System.Windows.Forms.PictureBox ZoomBox; - private System.Windows.Forms.Label Value5Label; - private System.Windows.Forms.Label Value4Label; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx Value5Label; + private BizHawk.WinForms.Controls.LocLabelEx Value4Label; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label2; private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.TrackBar RefreshRate; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label3; + private BizHawk.WinForms.Controls.LocLabelEx label4; + private BizHawk.WinForms.Controls.LocLabelEx label3; private MenuStripEx NesPPUMenu; private System.Windows.Forms.ToolStripMenuItem SettingsSubMenu; private System.Windows.Forms.ToolStripMenuItem PatternSubMenu; @@ -950,7 +911,7 @@ private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1; private System.Windows.Forms.Timer Messagetimer; private System.Windows.Forms.GroupBox CHRROMGroup; - private System.Windows.Forms.Label label5; + private BizHawk.WinForms.Controls.LocLabelEx label5; private System.Windows.Forms.NumericUpDown numericUpDownCHRROMBank; private PatternViewer CHRROMView; private System.Windows.Forms.ToolStripMenuItem cHRROMTileViewerToolStripMenuItem; diff --git a/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.Designer.cs index 181a9f39c7..8b9aa20927 100644 --- a/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.Designer.cs @@ -37,17 +37,17 @@ this.groupBox1 = new System.Windows.Forms.GroupBox(); this.canvas = new BizHawk.Client.EmuHawk.PceBgCanvas(); this.groupBox5 = new System.Windows.Forms.GroupBox(); - this.label7 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); + this.label7 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label6 = new BizHawk.WinForms.Controls.LocLabelEx(); this.RefreshRate = new System.Windows.Forms.TrackBar(); this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.PaletteLabel = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.PPUAddressLabel = new System.Windows.Forms.Label(); - this.XYLabel = new System.Windows.Forms.Label(); - this.TileIDLabel = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); + this.PaletteLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.PPUAddressLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.XYLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.TileIDLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.PceBgViewerMenu.SuspendLayout(); this.groupBox1.SuspendLayout(); this.groupBox5.SuspendLayout(); @@ -137,20 +137,14 @@ // // label7 // - this.label7.AutoSize = true; this.label7.Location = new System.Drawing.Point(7, 186); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(31, 13); - this.label7.TabIndex = 2; this.label7.Text = "More"; // // label6 // - this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(7, 32); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(29, 13); - this.label6.TabIndex = 1; this.label6.Text = "Less"; // // RefreshRate @@ -184,65 +178,44 @@ // // PaletteLabel // - this.PaletteLabel.AutoSize = true; this.PaletteLabel.Location = new System.Drawing.Point(64, 60); this.PaletteLabel.Name = "PaletteLabel"; - this.PaletteLabel.Size = new System.Drawing.Size(22, 13); - this.PaletteLabel.TabIndex = 9; this.PaletteLabel.Text = " "; // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(6, 60); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(43, 13); - this.label5.TabIndex = 8; this.label5.Text = "Palette:"; // // PPUAddressLabel // - this.PPUAddressLabel.AutoSize = true; this.PPUAddressLabel.Location = new System.Drawing.Point(64, 60); this.PPUAddressLabel.Name = "PPUAddressLabel"; - this.PPUAddressLabel.Size = new System.Drawing.Size(22, 13); - this.PPUAddressLabel.TabIndex = 5; this.PPUAddressLabel.Text = " "; // // XYLabel // - this.XYLabel.AutoSize = true; this.XYLabel.Location = new System.Drawing.Point(64, 43); this.XYLabel.Name = "XYLabel"; - this.XYLabel.Size = new System.Drawing.Size(22, 13); - this.XYLabel.TabIndex = 4; this.XYLabel.Text = " "; // // TileIDLabel // - this.TileIDLabel.AutoSize = true; this.TileIDLabel.Location = new System.Drawing.Point(64, 26); this.TileIDLabel.Name = "TileIDLabel"; - this.TileIDLabel.Size = new System.Drawing.Size(22, 13); - this.TileIDLabel.TabIndex = 3; this.TileIDLabel.Text = " "; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(6, 43); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(35, 13); - this.label2.TabIndex = 1; this.label2.Text = "X / Y:"; // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(6, 26); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(41, 13); - this.label1.TabIndex = 0; this.label1.Text = "Tile ID:"; // // PceBgViewer @@ -282,16 +255,16 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.GroupBox groupBox5; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.Label label6; + private BizHawk.WinForms.Controls.LocLabelEx label7; + private BizHawk.WinForms.Controls.LocLabelEx label6; private System.Windows.Forms.TrackBar RefreshRate; private System.Windows.Forms.GroupBox groupBox4; - private System.Windows.Forms.Label PaletteLabel; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label PPUAddressLabel; - private System.Windows.Forms.Label XYLabel; - private System.Windows.Forms.Label TileIDLabel; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx PaletteLabel; + private BizHawk.WinForms.Controls.LocLabelEx label5; + private BizHawk.WinForms.Controls.LocLabelEx PPUAddressLabel; + private BizHawk.WinForms.Controls.LocLabelEx XYLabel; + private BizHawk.WinForms.Controls.LocLabelEx TileIDLabel; + private BizHawk.WinForms.Controls.LocLabelEx label2; + private BizHawk.WinForms.Controls.LocLabelEx label1; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.Designer.cs index 76caa5bcf8..78cf64a989 100644 --- a/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.Designer.cs @@ -35,7 +35,7 @@ this.bmpViewSPPal = new BizHawk.Client.EmuHawk.BmpView(); this.bmpViewSP = new BizHawk.Client.EmuHawk.BmpView(); this.checkBoxVDC2 = new System.Windows.Forms.CheckBox(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.menuStrip1 = new MenuStripEx(); this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.saveBackgroundScreenshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -116,11 +116,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(504, 599); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(294, 13); - this.label1.TabIndex = 7; this.label1.Text = "CTRL + C copies the pane under the mouse to the clipboard."; // // menuStrip1 @@ -206,7 +203,7 @@ private BmpView bmpViewBG; private BmpView bmpViewSPPal; private BmpView bmpViewSP; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private MenuStripEx menuStrip1; private System.Windows.Forms.ToolStripMenuItem FileSubMenu; private System.Windows.Forms.ToolStripMenuItem closeToolStripMenuItem; diff --git a/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs index fd2b71328b..f8159ed24b 100644 --- a/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs @@ -34,7 +34,7 @@ this.bmpViewPalette = new BizHawk.Client.EmuHawk.BmpView(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.bmpViewBG = new BizHawk.Client.EmuHawk.BmpView(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.menuStrip1 = new MenuStripEx(); this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.saveTilesScreenshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -105,11 +105,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 316); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(294, 13); - this.label1.TabIndex = 4; this.label1.Text = "CTRL + C copies the pane under the mouse to the clipboard."; // // menuStrip1 @@ -203,7 +200,7 @@ private BmpView bmpViewPalette; private System.Windows.Forms.GroupBox groupBox3; private BmpView bmpViewBG; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private MenuStripEx menuStrip1; private System.Windows.Forms.ToolStripMenuItem FileSubMenu; private System.Windows.Forms.ToolStripMenuItem CloseMenuItem; diff --git a/src/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.Designer.cs index f479454e11..17f20ab2a1 100644 --- a/src/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.Designer.cs @@ -40,23 +40,23 @@ this.panel1 = new System.Windows.Forms.Panel(); this.groupFreeze = new System.Windows.Forms.GroupBox(); this.pnGroupFreeze = new System.Windows.Forms.Panel(); - this.labelMemory = new System.Windows.Forms.Label(); + this.labelMemory = new BizHawk.WinForms.Controls.LocLabelEx(); this.check2x = new System.Windows.Forms.CheckBox(); this.comboDisplayType = new System.Windows.Forms.ComboBox(); - this.label47 = new System.Windows.Forms.Label(); + this.label47 = new BizHawk.WinForms.Controls.LocLabelEx(); this.pnBackdropColor = new System.Windows.Forms.Panel(); this.comboPalette = new System.Windows.Forms.ComboBox(); this.checkBackdropColor = new System.Windows.Forms.CheckBox(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.checkScanlineControl = new System.Windows.Forms.CheckBox(); - this.label19 = new System.Windows.Forms.Label(); + this.label19 = new BizHawk.WinForms.Controls.LocLabelEx(); this.nudScanline = new System.Windows.Forms.NumericUpDown(); this.sliderScanline = new System.Windows.Forms.TrackBar(); - this.label24 = new System.Windows.Forms.Label(); + this.label24 = new BizHawk.WinForms.Controls.LocLabelEx(); this.groupBox6 = new System.Windows.Forms.GroupBox(); - this.labelClipboard = new System.Windows.Forms.Label(); + this.labelClipboard = new BizHawk.WinForms.Controls.LocLabelEx(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.label26 = new System.Windows.Forms.Label(); + this.label26 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtOBSELT1OfsBits = new System.Windows.Forms.TextBox(); this.groupBox8 = new System.Windows.Forms.GroupBox(); this.radioButton6 = new System.Windows.Forms.RadioButton(); @@ -69,46 +69,46 @@ this.radioButton3 = new System.Windows.Forms.RadioButton(); this.radioButton13 = new System.Windows.Forms.RadioButton(); this.radioButton2 = new System.Windows.Forms.RadioButton(); - this.lblEnPrio3 = new System.Windows.Forms.Label(); + this.lblEnPrio3 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtOBSELT1OfsDescr = new System.Windows.Forms.TextBox(); this.checkEN1_OBJ = new System.Windows.Forms.CheckBox(); - this.label30 = new System.Windows.Forms.Label(); + this.label30 = new BizHawk.WinForms.Controls.LocLabelEx(); this.checkEN1_BG4 = new System.Windows.Forms.CheckBox(); this.txtOBSELBaseBits = new System.Windows.Forms.TextBox(); this.checkEN1_BG3 = new System.Windows.Forms.CheckBox(); this.txtOBSELBaseDescr = new System.Windows.Forms.TextBox(); this.checkEN1_BG2 = new System.Windows.Forms.CheckBox(); - this.label29 = new System.Windows.Forms.Label(); + this.label29 = new BizHawk.WinForms.Controls.LocLabelEx(); this.checkEN1_BG1 = new System.Windows.Forms.CheckBox(); this.txtOBSELSizeBits = new System.Windows.Forms.TextBox(); this.checkEN3_OBJ = new System.Windows.Forms.CheckBox(); this.checkEN2_OBJ = new System.Windows.Forms.CheckBox(); this.txtOBSELSizeDescr = new System.Windows.Forms.TextBox(); - this.lblEnPrio2 = new System.Windows.Forms.Label(); - this.label28 = new System.Windows.Forms.Label(); - this.lblEnPrio1 = new System.Windows.Forms.Label(); - this.label20 = new System.Windows.Forms.Label(); + this.lblEnPrio2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label28 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lblEnPrio1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label20 = new BizHawk.WinForms.Controls.LocLabelEx(); this.checkScreenExtbg = new System.Windows.Forms.CheckBox(); - this.label38 = new System.Windows.Forms.Label(); - this.label21 = new System.Windows.Forms.Label(); + this.label38 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label21 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtScreenCGADSUB_Half = new System.Windows.Forms.CheckBox(); this.checkScreenHires = new System.Windows.Forms.CheckBox(); - this.lblEnPrio0 = new System.Windows.Forms.Label(); - this.label18391 = new System.Windows.Forms.Label(); + this.lblEnPrio0 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label18391 = new BizHawk.WinForms.Controls.LocLabelEx(); this.checkEN0_OBJ = new System.Windows.Forms.CheckBox(); this.checkScreenOverscan = new System.Windows.Forms.CheckBox(); this.checkEN0_BG4 = new System.Windows.Forms.CheckBox(); - this.label198129381279841 = new System.Windows.Forms.Label(); + this.label198129381279841 = new BizHawk.WinForms.Controls.LocLabelEx(); this.checkEN0_BG3 = new System.Windows.Forms.CheckBox(); this.checkScreenObjInterlace = new System.Windows.Forms.CheckBox(); this.checkEN0_BG2 = new System.Windows.Forms.CheckBox(); - this.label123812831 = new System.Windows.Forms.Label(); + this.label123812831 = new BizHawk.WinForms.Controls.LocLabelEx(); this.checkEN0_BG1 = new System.Windows.Forms.CheckBox(); this.checkScreenInterlace = new System.Windows.Forms.CheckBox(); this.txtScreenCGADSUB_AddSub_Descr = new System.Windows.Forms.TextBox(); - this.label2193813 = new System.Windows.Forms.Label(); + this.label2193813 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtScreenCGADSUB_AddSub = new System.Windows.Forms.TextBox(); - this.label36 = new System.Windows.Forms.Label(); + this.label36 = new BizHawk.WinForms.Controls.LocLabelEx(); this.checkTMOBJ = new BizHawk.Client.EmuHawk.CustomCheckBox(); this.checkTSOBJ = new BizHawk.Client.EmuHawk.CustomCheckBox(); this.checkMathBK = new BizHawk.Client.EmuHawk.CustomCheckBox(); @@ -117,48 +117,48 @@ this.checkMathBG3 = new BizHawk.Client.EmuHawk.CustomCheckBox(); this.checkMathBG2 = new BizHawk.Client.EmuHawk.CustomCheckBox(); this.checkMathBG1 = new BizHawk.Client.EmuHawk.CustomCheckBox(); - this.label33 = new System.Windows.Forms.Label(); + this.label33 = new BizHawk.WinForms.Controls.LocLabelEx(); this.checkMathOBJ = new BizHawk.Client.EmuHawk.CustomCheckBox(); - this.lblTS = new System.Windows.Forms.Label(); + this.lblTS = new BizHawk.WinForms.Controls.LocLabelEx(); this.checkTSBG4 = new BizHawk.Client.EmuHawk.CustomCheckBox(); this.checkTSBG3 = new BizHawk.Client.EmuHawk.CustomCheckBox(); this.checkTSBG2 = new BizHawk.Client.EmuHawk.CustomCheckBox(); this.checkTSBG1 = new BizHawk.Client.EmuHawk.CustomCheckBox(); - this.lblTM = new System.Windows.Forms.Label(); + this.lblTM = new BizHawk.WinForms.Controls.LocLabelEx(); this.checkTMBG4 = new BizHawk.Client.EmuHawk.CustomCheckBox(); this.checkTMBG3 = new BizHawk.Client.EmuHawk.CustomCheckBox(); this.checkTMBG2 = new BizHawk.Client.EmuHawk.CustomCheckBox(); this.checkTMBG1 = new BizHawk.Client.EmuHawk.CustomCheckBox(); - this.label32 = new System.Windows.Forms.Label(); - this.label31 = new System.Windows.Forms.Label(); - this.label25 = new System.Windows.Forms.Label(); + this.label32 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label31 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label25 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtScreenCGWSEL_MathFixed = new System.Windows.Forms.TextBox(); - this.label2893719831 = new System.Windows.Forms.Label(); + this.label2893719831 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtScreenCGWSEL_ColorSubMask = new System.Windows.Forms.TextBox(); - this.label23 = new System.Windows.Forms.Label(); + this.label23 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtScreenCGWSEL_ColorMask = new System.Windows.Forms.TextBox(); - this.label22 = new System.Windows.Forms.Label(); - this.label27 = new System.Windows.Forms.Label(); + this.label22 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label27 = new BizHawk.WinForms.Controls.LocLabelEx(); this.checkScreenCGWSEL_DirectColor = new System.Windows.Forms.CheckBox(); - this.label16 = new System.Windows.Forms.Label(); + this.label16 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtScreenBG4TSize = new System.Windows.Forms.TextBox(); this.txtScreenBG3TSize = new System.Windows.Forms.TextBox(); this.txtScreenBG2TSize = new System.Windows.Forms.TextBox(); this.txtScreenBG1TSize = new System.Windows.Forms.TextBox(); this.txtScreenBG4Bpp = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtScreenBG3Bpp = new System.Windows.Forms.TextBox(); this.txtModeBits = new System.Windows.Forms.TextBox(); this.txtScreenBG2Bpp = new System.Windows.Forms.TextBox(); - this.label8 = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); + this.label8 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label7 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtScreenBG1Bpp = new System.Windows.Forms.TextBox(); - this.lblBG3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); + this.lblBG3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.txtBG1Scroll = new System.Windows.Forms.TextBox(); - this.label37 = new System.Windows.Forms.Label(); + this.label37 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtBG1MapSizeBytes = new System.Windows.Forms.TextBox(); this.txtBGPaletteInfo = new System.Windows.Forms.TextBox(); this.rbBG4 = new System.Windows.Forms.RadioButton(); @@ -167,31 +167,31 @@ this.rbBG1 = new System.Windows.Forms.RadioButton(); this.txtBG1TSizeDescr = new System.Windows.Forms.TextBox(); this.comboBGProps = new System.Windows.Forms.ComboBox(); - this.label15 = new System.Windows.Forms.Label(); + this.label15 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtBG1TSizeBits = new System.Windows.Forms.TextBox(); - this.label13 = new System.Windows.Forms.Label(); + this.label13 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtBG1Colors = new System.Windows.Forms.TextBox(); this.txtBG1Bpp = new System.Windows.Forms.TextBox(); - this.label12 = new System.Windows.Forms.Label(); + this.label12 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtBG1TDAddrDescr = new System.Windows.Forms.TextBox(); - this.label11 = new System.Windows.Forms.Label(); + this.label11 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtBG1SCAddrDescr = new System.Windows.Forms.TextBox(); - this.label9 = new System.Windows.Forms.Label(); + this.label9 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtBG1TDAddrBits = new System.Windows.Forms.TextBox(); - this.label10 = new System.Windows.Forms.Label(); + this.label10 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtBG1SizeInPixels = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtBG1SCAddrBits = new System.Windows.Forms.TextBox(); this.txtBG1SizeInTiles = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtBG1SizeBits = new System.Windows.Forms.TextBox(); this.groupBox5 = new System.Windows.Forms.GroupBox(); this.paletteViewer = new BizHawk.Client.EmuHawk.SNESGraphicsViewer(); this.tabctrlDetails = new System.Windows.Forms.TabControl(); this.tpPalette = new System.Windows.Forms.TabPage(); - this.label53 = new System.Windows.Forms.Label(); - this.label52 = new System.Windows.Forms.Label(); - this.label51 = new System.Windows.Forms.Label(); + this.label53 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label52 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label51 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtPaletteDetailsAddress = new System.Windows.Forms.TextBox(); this.txtPaletteDetailsIndex = new System.Windows.Forms.TextBox(); this.txtPaletteDetailsIndexHex = new System.Windows.Forms.TextBox(); @@ -200,26 +200,26 @@ this.txtDetailsPaletteColor = new System.Windows.Forms.TextBox(); this.pnDetailsPaletteColor = new System.Windows.Forms.Panel(); this.tpTile = new System.Windows.Forms.TabPage(); - this.label45 = new System.Windows.Forms.Label(); + this.label45 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtTilePalette = new System.Windows.Forms.TextBox(); this.txtTileNumber = new System.Windows.Forms.TextBox(); this.txtTileMode = new System.Windows.Forms.TextBox(); - this.label18 = new System.Windows.Forms.Label(); + this.label18 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtTileColors = new System.Windows.Forms.TextBox(); this.txtTileBpp = new System.Windows.Forms.TextBox(); - this.label42 = new System.Windows.Forms.Label(); + this.label42 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtTileAddress = new System.Windows.Forms.TextBox(); this.viewerTile = new BizHawk.Client.EmuHawk.SNESGraphicsViewer(); this.tpMapEntry = new System.Windows.Forms.TabPage(); this.textBox2 = new System.Windows.Forms.TextBox(); this.checkMapEntryVFlip = new System.Windows.Forms.CheckBox(); - this.label34 = new System.Windows.Forms.Label(); + this.label34 = new BizHawk.WinForms.Controls.LocLabelEx(); this.checkMapEntryHFlip = new System.Windows.Forms.CheckBox(); - this.label17 = new System.Windows.Forms.Label(); - this.lblMapEntryHFlip = new System.Windows.Forms.Label(); + this.label17 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lblMapEntryHFlip = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtMapEntryPalette = new System.Windows.Forms.TextBox(); - this.label14 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); + this.label14 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label6 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtMapEntryTileAddr = new System.Windows.Forms.TextBox(); this.txtMapEntryPrio = new System.Windows.Forms.TextBox(); this.txtMapEntryLocation = new System.Windows.Forms.TextBox(); @@ -227,22 +227,22 @@ this.viewerMapEntryTile = new BizHawk.Client.EmuHawk.SNESGraphicsViewer(); this.tpOBJ = new System.Windows.Forms.TabPage(); this.txtObjPriority = new System.Windows.Forms.TextBox(); - this.label50 = new System.Windows.Forms.Label(); + this.label50 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtObjPaletteMemo = new System.Windows.Forms.TextBox(); - this.label49 = new System.Windows.Forms.Label(); + this.label49 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtObjPalette = new System.Windows.Forms.TextBox(); - this.label48 = new System.Windows.Forms.Label(); + this.label48 = new BizHawk.WinForms.Controls.LocLabelEx(); this.txtObjNameAddr = new System.Windows.Forms.TextBox(); this.txtObjName = new System.Windows.Forms.TextBox(); this.txtObjSize = new System.Windows.Forms.TextBox(); - this.label46 = new System.Windows.Forms.Label(); + this.label46 = new BizHawk.WinForms.Controls.LocLabelEx(); this.cbObjLarge = new System.Windows.Forms.CheckBox(); this.txtObjNumber = new System.Windows.Forms.TextBox(); this.txtObjCoord = new System.Windows.Forms.TextBox(); this.cbObjVFlip = new System.Windows.Forms.CheckBox(); - this.label43 = new System.Windows.Forms.Label(); + this.label43 = new BizHawk.WinForms.Controls.LocLabelEx(); this.cbObjHFlip = new System.Windows.Forms.CheckBox(); - this.label44 = new System.Windows.Forms.Label(); + this.label44 = new BizHawk.WinForms.Controls.LocLabelEx(); this.viewerObj = new BizHawk.Client.EmuHawk.SNESGraphicsViewer(); this.viewerPanel = new System.Windows.Forms.Panel(); this.viewer = new BizHawk.Client.EmuHawk.SNESGraphicsViewer(); @@ -379,11 +379,8 @@ // // labelMemory // - this.labelMemory.AutoSize = true; this.labelMemory.Location = new System.Drawing.Point(3, 2); this.labelMemory.Name = "labelMemory"; - this.labelMemory.Size = new System.Drawing.Size(176, 13); - this.labelMemory.TabIndex = 1; this.labelMemory.Text = "Right-click an item to display it here."; // // check2x @@ -417,11 +414,8 @@ // // label47 // - this.label47.AutoSize = true; this.label47.Location = new System.Drawing.Point(442, 22); this.label47.Name = "label47"; - this.label47.Size = new System.Drawing.Size(40, 13); - this.label47.TabIndex = 53; this.label47.Text = "Palette"; // // pnBackdropColor @@ -482,12 +476,9 @@ // // label19 // - this.label19.AutoSize = true; this.label19.Location = new System.Drawing.Point(3, 7); this.label19.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(48, 13); - this.label19.TabIndex = 41; this.label19.Text = "Scanline"; // // nudScanline @@ -520,11 +511,8 @@ // // label24 // - this.label24.AutoSize = true; this.label24.Location = new System.Drawing.Point(420, 60); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(78, 13); - this.label24.TabIndex = 49; this.label24.Text = "User Backdrop"; // // groupBox6 @@ -539,11 +527,8 @@ // // labelClipboard // - this.labelClipboard.AutoSize = true; this.labelClipboard.Location = new System.Drawing.Point(4, 18); this.labelClipboard.Name = "labelClipboard"; - this.labelClipboard.Size = new System.Drawing.Size(152, 13); - this.labelClipboard.TabIndex = 0; this.labelClipboard.Text = "Mouseover pane and CTRL+C"; // // groupBox2 @@ -647,11 +632,8 @@ // // label26 // - this.label26.AutoSize = true; this.label26.Location = new System.Drawing.Point(6, 194); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(42, 13); - this.label26.TabIndex = 45; this.label26.Text = "OBSEL"; // // txtOBSELT1OfsBits @@ -806,12 +788,9 @@ // // lblEnPrio3 // - this.lblEnPrio3.AutoSize = true; this.lblEnPrio3.ForeColor = System.Drawing.Color.Blue; this.lblEnPrio3.Location = new System.Drawing.Point(3, 161); this.lblEnPrio3.Name = "lblEnPrio3"; - this.lblEnPrio3.Size = new System.Drawing.Size(49, 13); - this.lblEnPrio3.TabIndex = 101; this.lblEnPrio3.Text = "EN.Prio3"; this.lblEnPrio3.Click += new System.EventHandler(this.lblEnPrio3_Click); this.lblEnPrio3.DoubleClick += new System.EventHandler(this.lblEnPrio3_Click); @@ -837,11 +816,8 @@ // // label30 // - this.label30.AutoSize = true; this.label30.Location = new System.Drawing.Point(32, 252); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(46, 13); - this.label30.TabIndex = 53; this.label30.Text = "@Tiles1"; // // checkEN1_BG4 @@ -896,11 +872,8 @@ // // label29 // - this.label29.AutoSize = true; this.label29.Location = new System.Drawing.Point(32, 233); this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(46, 13); - this.label29.TabIndex = 50; this.label29.Text = "@Tiles0"; // // checkEN1_BG1 @@ -956,44 +929,32 @@ // // lblEnPrio2 // - this.lblEnPrio2.AutoSize = true; this.lblEnPrio2.ForeColor = System.Drawing.Color.Blue; this.lblEnPrio2.Location = new System.Drawing.Point(3, 146); this.lblEnPrio2.Name = "lblEnPrio2"; - this.lblEnPrio2.Size = new System.Drawing.Size(49, 13); - this.lblEnPrio2.TabIndex = 93; this.lblEnPrio2.Text = "EN.Prio2"; this.lblEnPrio2.Click += new System.EventHandler(this.lblEnPrio2_Click); this.lblEnPrio2.DoubleClick += new System.EventHandler(this.lblEnPrio2_Click); // // label28 // - this.label28.AutoSize = true; this.label28.Location = new System.Drawing.Point(32, 213); this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(27, 13); - this.label28.TabIndex = 47; this.label28.Text = "Size"; // // lblEnPrio1 // - this.lblEnPrio1.AutoSize = true; this.lblEnPrio1.ForeColor = System.Drawing.Color.Blue; this.lblEnPrio1.Location = new System.Drawing.Point(162, 130); this.lblEnPrio1.Name = "lblEnPrio1"; - this.lblEnPrio1.Size = new System.Drawing.Size(49, 13); - this.lblEnPrio1.TabIndex = 92; this.lblEnPrio1.Text = "EN.Prio1"; this.lblEnPrio1.Click += new System.EventHandler(this.lblEnPrio1_Click); this.lblEnPrio1.DoubleClick += new System.EventHandler(this.lblEnPrio1_Click); // // label20 // - this.label20.AutoSize = true; this.label20.Location = new System.Drawing.Point(72, 147); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(42, 13); - this.label20.TabIndex = 21; this.label20.Text = "SETINI"; // // checkScreenExtbg @@ -1008,20 +969,14 @@ // // label38 // - this.label38.AutoSize = true; this.label38.Location = new System.Drawing.Point(229, 131); this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(26, 13); - this.label38.TabIndex = 91; this.label38.Text = "Half"; // // label21 // - this.label21.AutoSize = true; this.label21.Location = new System.Drawing.Point(97, 163); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(43, 13); - this.label21.TabIndex = 23; this.label21.Text = "EXTBG"; // // txtScreenCGADSUB_Half @@ -1046,23 +1001,17 @@ // // lblEnPrio0 // - this.lblEnPrio0.AutoSize = true; this.lblEnPrio0.ForeColor = System.Drawing.Color.Blue; this.lblEnPrio0.Location = new System.Drawing.Point(162, 115); this.lblEnPrio0.Name = "lblEnPrio0"; - this.lblEnPrio0.Size = new System.Drawing.Size(49, 13); - this.lblEnPrio0.TabIndex = 89; this.lblEnPrio0.Text = "EN.Prio0"; this.lblEnPrio0.Click += new System.EventHandler(this.lblEnPrio0_Click); this.lblEnPrio0.DoubleClick += new System.EventHandler(this.lblEnPrio0_Click); // // label18391 // - this.label18391.AutoSize = true; this.label18391.Location = new System.Drawing.Point(97, 177); this.label18391.Name = "label18391"; - this.label18391.Size = new System.Drawing.Size(40, 13); - this.label18391.TabIndex = 25; this.label18391.Text = "HIRES"; // // checkEN0_OBJ @@ -1097,11 +1046,8 @@ // // label198129381279841 // - this.label198129381279841.AutoSize = true; this.label198129381279841.Location = new System.Drawing.Point(97, 191); this.label198129381279841.Name = "label198129381279841"; - this.label198129381279841.Size = new System.Drawing.Size(47, 13); - this.label198129381279841.TabIndex = 27; this.label198129381279841.Text = "O.SCAN"; // // checkEN0_BG3 @@ -1136,11 +1082,8 @@ // // label123812831 // - this.label123812831.AutoSize = true; this.label123812831.Location = new System.Drawing.Point(156, 161); this.label123812831.Name = "label123812831"; - this.label123812831.Size = new System.Drawing.Size(49, 13); - this.label123812831.TabIndex = 29; this.label123812831.Text = "O.INTLC"; // // checkEN0_BG1 @@ -1175,11 +1118,8 @@ // // label2193813 // - this.label2193813.AutoSize = true; this.label2193813.Location = new System.Drawing.Point(156, 174); this.label2193813.Name = "label2193813"; - this.label2193813.Size = new System.Drawing.Size(48, 13); - this.label2193813.TabIndex = 31; this.label2193813.Text = "S.INTLC"; // // txtScreenCGADSUB_AddSub @@ -1195,11 +1135,8 @@ // // label36 // - this.label36.AutoSize = true; this.label36.Location = new System.Drawing.Point(206, 96); this.label36.Name = "label36"; - this.label36.Size = new System.Drawing.Size(59, 13); - this.label36.TabIndex = 82; this.label36.Text = "CGADSUB"; // // checkTMOBJ @@ -1289,11 +1226,8 @@ // // label33 // - this.label33.AutoSize = true; this.label33.Location = new System.Drawing.Point(162, 94); this.label33.Name = "label33"; - this.label33.Size = new System.Drawing.Size(31, 13); - this.label33.TabIndex = 73; this.label33.Text = "Math"; // // checkMathOBJ @@ -1309,11 +1243,8 @@ // // lblTS // - this.lblTS.AutoSize = true; this.lblTS.Location = new System.Drawing.Point(162, 78); this.lblTS.Name = "lblTS"; - this.lblTS.Size = new System.Drawing.Size(21, 13); - this.lblTS.TabIndex = 71; this.lblTS.Text = "TS"; // // checkTSBG4 @@ -1362,11 +1293,8 @@ // // lblTM // - this.lblTM.AutoSize = true; this.lblTM.Location = new System.Drawing.Point(162, 63); this.lblTM.Name = "lblTM"; - this.lblTM.Size = new System.Drawing.Size(23, 13); - this.lblTM.TabIndex = 66; this.lblTM.Text = "TM"; // // checkTMBG4 @@ -1415,29 +1343,20 @@ // // label32 // - this.label32.AutoSize = true; this.label32.Location = new System.Drawing.Point(46, 46); this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(27, 13); - this.label32.TabIndex = 57; this.label32.Text = "OBJ"; // // label31 // - this.label31.AutoSize = true; this.label31.Location = new System.Drawing.Point(26, 78); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(21, 13); - this.label31.TabIndex = 56; this.label31.Text = "BK"; // // label25 // - this.label25.AutoSize = true; this.label25.Location = new System.Drawing.Point(229, 64); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(61, 13); - this.label25.TabIndex = 44; this.label25.Text = "Math/Fixed"; // // txtScreenCGWSEL_MathFixed @@ -1453,11 +1372,8 @@ // // label2893719831 // - this.label2893719831.AutoSize = true; this.label2893719831.Location = new System.Drawing.Point(229, 45); this.label2893719831.Name = "label2893719831"; - this.label2893719831.Size = new System.Drawing.Size(52, 13); - this.label2893719831.TabIndex = 42; this.label2893719831.Text = "SubMask"; // // txtScreenCGWSEL_ColorSubMask @@ -1473,11 +1389,8 @@ // // label23 // - this.label23.AutoSize = true; this.label23.Location = new System.Drawing.Point(229, 27); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(56, 13); - this.label23.TabIndex = 40; this.label23.Text = "MainMask"; // // txtScreenCGWSEL_ColorMask @@ -1493,20 +1406,14 @@ // // label22 // - this.label22.AutoSize = true; this.label22.Location = new System.Drawing.Point(206, 10); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(53, 13); - this.label22.TabIndex = 32; this.label22.Text = "CGWSEL"; // // label27 // - this.label27.AutoSize = true; this.label27.Location = new System.Drawing.Point(229, 81); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(59, 13); - this.label27.TabIndex = 31; this.label27.Text = "DirectColor"; // // checkScreenCGWSEL_DirectColor @@ -1521,11 +1428,8 @@ // // label16 // - this.label16.AutoSize = true; this.label16.Location = new System.Drawing.Point(162, 46); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(34, 13); - this.label16.TabIndex = 20; this.label16.Text = "TSize"; // // txtScreenBG4TSize @@ -1580,11 +1484,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(4, 20); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(34, 13); - this.label1.TabIndex = 0; this.label1.Text = "Mode"; // // txtScreenBG3Bpp @@ -1620,20 +1521,14 @@ // // label8 // - this.label8.AutoSize = true; this.label8.Location = new System.Drawing.Point(162, 27); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(25, 13); - this.label8.TabIndex = 7; this.label8.Text = "bpp"; // // label7 // - this.label7.AutoSize = true; this.label7.Location = new System.Drawing.Point(142, 10); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(28, 13); - this.label7.TabIndex = 12; this.label7.Text = "BG4"; // // txtScreenBG1Bpp @@ -1648,30 +1543,21 @@ // // lblBG3 // - this.lblBG3.AutoSize = true; this.lblBG3.Location = new System.Drawing.Point(117, 10); this.lblBG3.Name = "lblBG3"; - this.lblBG3.Size = new System.Drawing.Size(28, 13); - this.lblBG3.TabIndex = 11; this.lblBG3.Text = "BG3"; this.toolTip1.SetToolTip(this.lblBG3, "Test"); // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(69, 10); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(28, 13); - this.label4.TabIndex = 9; this.label4.Text = "BG1"; // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(93, 10); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(28, 13); - this.label5.TabIndex = 10; this.label5.Text = "BG2"; // // groupBox1 @@ -1723,11 +1609,8 @@ // // label37 // - this.label37.AutoSize = true; this.label37.Location = new System.Drawing.Point(35, 137); this.label37.Name = "label37"; - this.label37.Size = new System.Drawing.Size(36, 13); - this.label37.TabIndex = 41; this.label37.Text = "Scroll:"; // // txtBG1MapSizeBytes @@ -1825,11 +1708,8 @@ // // label15 // - this.label15.AutoSize = true; this.label15.Location = new System.Drawing.Point(33, 74); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(34, 13); - this.label15.TabIndex = 22; this.label15.Text = "TSize"; // // txtBG1TSizeBits @@ -1845,11 +1725,8 @@ // // label13 // - this.label13.AutoSize = true; this.label13.Location = new System.Drawing.Point(124, 52); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(36, 13); - this.label13.TabIndex = 20; this.label13.Text = "Colors"; // // txtBG1Colors @@ -1874,11 +1751,8 @@ // // label12 // - this.label12.AutoSize = true; this.label12.Location = new System.Drawing.Point(33, 52); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(32, 13); - this.label12.TabIndex = 17; this.label12.Text = "Bpp; "; // // txtBG1TDAddrDescr @@ -1893,11 +1767,8 @@ // // label11 // - this.label11.AutoSize = true; this.label11.Location = new System.Drawing.Point(30, 182); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(40, 13); - this.label11.TabIndex = 14; this.label11.Text = "@Tiles"; // // txtBG1SCAddrDescr @@ -1912,11 +1783,8 @@ // // label9 // - this.label9.AutoSize = true; this.label9.Location = new System.Drawing.Point(145, 116); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(18, 13); - this.label9.TabIndex = 9; this.label9.Text = "px"; // // txtBG1TDAddrBits @@ -1932,11 +1800,8 @@ // // label10 // - this.label10.AutoSize = true; this.label10.Location = new System.Drawing.Point(30, 158); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(40, 13); - this.label10.TabIndex = 11; this.label10.Text = "@Scrn"; // // txtBG1SizeInPixels @@ -1951,11 +1816,8 @@ // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(134, 96); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(32, 13); - this.label3.TabIndex = 7; this.label3.Text = "Tiles;"; // // txtBG1SCAddrBits @@ -1981,11 +1843,8 @@ // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(34, 95); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(27, 13); - this.label2.TabIndex = 4; this.label2.Text = "Size"; // // txtBG1SizeBits @@ -2055,29 +1914,20 @@ // // label53 // - this.label53.AutoSize = true; this.label53.Location = new System.Drawing.Point(73, 76); this.label53.Name = "label53"; - this.label53.Size = new System.Drawing.Size(48, 13); - this.label53.TabIndex = 61; this.label53.Text = "RGB888"; // // label52 // - this.label52.AutoSize = true; this.label52.Location = new System.Drawing.Point(93, 54); this.label52.Name = "label52"; - this.label52.Size = new System.Drawing.Size(26, 13); - this.label52.TabIndex = 60; this.label52.Text = "Hex"; // // label51 // - this.label51.AutoSize = true; this.label51.Location = new System.Drawing.Point(73, 32); this.label51.Name = "label51"; - this.label51.Size = new System.Drawing.Size(50, 13); - this.label51.TabIndex = 59; this.label51.Text = "Raw Col."; // // txtPaletteDetailsAddress @@ -2171,11 +2021,8 @@ // // label45 // - this.label45.AutoSize = true; this.label45.Location = new System.Drawing.Point(169, 75); this.label45.Name = "label45"; - this.label45.Size = new System.Drawing.Size(22, 13); - this.label45.TabIndex = 65; this.label45.Text = "Pal"; // // txtTilePalette @@ -2210,11 +2057,8 @@ // // label18 // - this.label18.AutoSize = true; this.label18.Location = new System.Drawing.Point(169, 53); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(36, 13); - this.label18.TabIndex = 61; this.label18.Text = "Colors"; // // txtTileColors @@ -2239,11 +2083,8 @@ // // label42 // - this.label42.AutoSize = true; this.label42.Location = new System.Drawing.Point(169, 31); this.label42.Name = "label42"; - this.label42.Size = new System.Drawing.Size(32, 13); - this.label42.TabIndex = 58; this.label42.Text = "Bpp; "; // // txtTileAddress @@ -2310,11 +2151,8 @@ // // label34 // - this.label34.AutoSize = true; this.label34.Location = new System.Drawing.Point(56, 76); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(14, 13); - this.label34.TabIndex = 62; this.label34.Text = "V"; // // checkMapEntryHFlip @@ -2329,20 +2167,14 @@ // // label17 // - this.label17.AutoSize = true; this.label17.Location = new System.Drawing.Point(93, 53); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(40, 13); - this.label17.TabIndex = 60; this.label17.Text = "Palette"; // // lblMapEntryHFlip // - this.lblMapEntryHFlip.AutoSize = true; this.lblMapEntryHFlip.Location = new System.Drawing.Point(22, 76); this.lblMapEntryHFlip.Name = "lblMapEntryHFlip"; - this.lblMapEntryHFlip.Size = new System.Drawing.Size(15, 13); - this.lblMapEntryHFlip.TabIndex = 57; this.lblMapEntryHFlip.Text = "H"; // // txtMapEntryPalette @@ -2358,20 +2190,14 @@ // // label14 // - this.label14.AutoSize = true; this.label14.Location = new System.Drawing.Point(95, 75); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(25, 13); - this.label14.TabIndex = 58; this.label14.Text = "Prio"; // // label6 // - this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(121, 31); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(31, 13); - this.label6.TabIndex = 56; this.label6.Text = "Tile#"; // // txtMapEntryTileAddr @@ -2465,11 +2291,8 @@ // // label50 // - this.label50.AutoSize = true; this.label50.Location = new System.Drawing.Point(160, 31); this.label50.Name = "label50"; - this.label50.Size = new System.Drawing.Size(25, 13); - this.label50.TabIndex = 101; this.label50.Text = "Prio"; // // txtObjPaletteMemo @@ -2484,11 +2307,8 @@ // // label49 // - this.label49.AutoSize = true; this.label49.Location = new System.Drawing.Point(93, 75); this.label49.Name = "label49"; - this.label49.Size = new System.Drawing.Size(40, 13); - this.label49.TabIndex = 99; this.label49.Text = "Palette"; // // txtObjPalette @@ -2504,11 +2324,8 @@ // // label48 // - this.label48.AutoSize = true; this.label48.Location = new System.Drawing.Point(121, 53); this.label48.Name = "label48"; - this.label48.Size = new System.Drawing.Size(31, 13); - this.label48.TabIndex = 96; this.label48.Text = "Tile#"; // // txtObjNameAddr @@ -2544,11 +2361,8 @@ // // label46 // - this.label46.AutoSize = true; this.label46.Location = new System.Drawing.Point(89, 31); this.label46.Name = "label46"; - this.label46.Size = new System.Drawing.Size(34, 13); - this.label46.TabIndex = 92; this.label46.Text = "Large"; // // cbObjLarge @@ -2593,11 +2407,8 @@ // // label43 // - this.label43.AutoSize = true; this.label43.Location = new System.Drawing.Point(56, 76); this.label43.Name = "label43"; - this.label43.Size = new System.Drawing.Size(14, 13); - this.label43.TabIndex = 66; this.label43.Text = "V"; // // cbObjHFlip @@ -2612,11 +2423,8 @@ // // label44 // - this.label44.AutoSize = true; this.label44.Location = new System.Drawing.Point(22, 76); this.label44.Name = "label44"; - this.label44.Size = new System.Drawing.Size(15, 13); - this.label44.TabIndex = 64; this.label44.Text = "H"; // // viewerObj @@ -2725,22 +2533,22 @@ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.Label label16; + private BizHawk.WinForms.Controls.LocLabelEx label16; private System.Windows.Forms.TextBox txtScreenBG4TSize; private System.Windows.Forms.TextBox txtScreenBG3TSize; private System.Windows.Forms.TextBox txtScreenBG2TSize; private System.Windows.Forms.TextBox txtScreenBG1TSize; private System.Windows.Forms.TextBox txtScreenBG4Bpp; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.TextBox txtScreenBG3Bpp; private System.Windows.Forms.TextBox txtModeBits; private System.Windows.Forms.TextBox txtScreenBG2Bpp; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.Label label7; + private BizHawk.WinForms.Controls.LocLabelEx label8; + private BizHawk.WinForms.Controls.LocLabelEx label7; private System.Windows.Forms.TextBox txtScreenBG1Bpp; - private System.Windows.Forms.Label lblBG3; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label5; + private BizHawk.WinForms.Controls.LocLabelEx lblBG3; + private BizHawk.WinForms.Controls.LocLabelEx label4; + private BizHawk.WinForms.Controls.LocLabelEx label5; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.RadioButton rbBG4; private System.Windows.Forms.RadioButton rbBG3; @@ -2748,24 +2556,24 @@ private System.Windows.Forms.RadioButton rbBG1; private System.Windows.Forms.TextBox txtBG1TSizeDescr; private System.Windows.Forms.ComboBox comboBGProps; - private System.Windows.Forms.Label label15; + private BizHawk.WinForms.Controls.LocLabelEx label15; private System.Windows.Forms.TextBox txtBG1TSizeBits; - private System.Windows.Forms.Label label13; + private BizHawk.WinForms.Controls.LocLabelEx label13; private System.Windows.Forms.TextBox txtBG1Colors; private System.Windows.Forms.TextBox txtBG1Bpp; - private System.Windows.Forms.Label label12; + private BizHawk.WinForms.Controls.LocLabelEx label12; private System.Windows.Forms.TextBox txtBG1TDAddrDescr; - private System.Windows.Forms.Label label11; + private BizHawk.WinForms.Controls.LocLabelEx label11; private System.Windows.Forms.TextBox txtBG1SCAddrDescr; - private System.Windows.Forms.Label label9; + private BizHawk.WinForms.Controls.LocLabelEx label9; private System.Windows.Forms.TextBox txtBG1TDAddrBits; - private System.Windows.Forms.Label label10; + private BizHawk.WinForms.Controls.LocLabelEx label10; private System.Windows.Forms.TextBox txtBG1SizeInPixels; - private System.Windows.Forms.Label label3; + private BizHawk.WinForms.Controls.LocLabelEx label3; private System.Windows.Forms.TextBox txtBG1SCAddrBits; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label2; private System.Windows.Forms.TextBox txtBG1SizeBits; - private System.Windows.Forms.Label label19; + private BizHawk.WinForms.Controls.LocLabelEx label19; private System.Windows.Forms.ComboBox comboDisplayType; private System.Windows.Forms.TrackBar sliderScanline; private System.Windows.Forms.GroupBox groupBox5; @@ -2787,46 +2595,46 @@ private System.Windows.Forms.CheckBox checkScanlineControl; private System.Windows.Forms.ToolTip toolTip1; private System.Windows.Forms.CheckBox check2x; - private System.Windows.Forms.Label label21; + private BizHawk.WinForms.Controls.LocLabelEx label21; private System.Windows.Forms.CheckBox checkScreenExtbg; - private System.Windows.Forms.Label label20; - private System.Windows.Forms.Label label18391; + private BizHawk.WinForms.Controls.LocLabelEx label20; + private BizHawk.WinForms.Controls.LocLabelEx label18391; private System.Windows.Forms.CheckBox checkScreenHires; - private System.Windows.Forms.Label label198129381279841; + private BizHawk.WinForms.Controls.LocLabelEx label198129381279841; private System.Windows.Forms.CheckBox checkScreenOverscan; - private System.Windows.Forms.Label label123812831; + private BizHawk.WinForms.Controls.LocLabelEx label123812831; private System.Windows.Forms.CheckBox checkScreenObjInterlace; - private System.Windows.Forms.Label label2193813; + private BizHawk.WinForms.Controls.LocLabelEx label2193813; private System.Windows.Forms.CheckBox checkScreenInterlace; private System.Windows.Forms.TextBox txtScreenCGWSEL_ColorMask; - private System.Windows.Forms.Label label22; - private System.Windows.Forms.Label label2893719831; + private BizHawk.WinForms.Controls.LocLabelEx label22; + private BizHawk.WinForms.Controls.LocLabelEx label2893719831; private System.Windows.Forms.TextBox txtScreenCGWSEL_ColorSubMask; - private System.Windows.Forms.Label label25; + private BizHawk.WinForms.Controls.LocLabelEx label25; private System.Windows.Forms.TextBox txtScreenCGWSEL_MathFixed; - private System.Windows.Forms.Label label23; - private System.Windows.Forms.Label label27; + private BizHawk.WinForms.Controls.LocLabelEx label23; + private BizHawk.WinForms.Controls.LocLabelEx label27; private System.Windows.Forms.CheckBox checkScreenCGWSEL_DirectColor; private SNESGraphicsViewer viewerTile; private System.Windows.Forms.Panel pnBackdropColor; private System.Windows.Forms.CheckBox checkBackdropColor; - private System.Windows.Forms.Label label24; + private BizHawk.WinForms.Controls.LocLabelEx label24; private System.Windows.Forms.Timer messagetimer; private System.Windows.Forms.TextBox txtOBSELT1OfsBits; private System.Windows.Forms.TextBox txtOBSELT1OfsDescr; - private System.Windows.Forms.Label label30; + private BizHawk.WinForms.Controls.LocLabelEx label30; private System.Windows.Forms.TextBox txtOBSELBaseBits; private System.Windows.Forms.TextBox txtOBSELBaseDescr; - private System.Windows.Forms.Label label29; + private BizHawk.WinForms.Controls.LocLabelEx label29; private System.Windows.Forms.TextBox txtOBSELSizeBits; - private System.Windows.Forms.Label label26; + private BizHawk.WinForms.Controls.LocLabelEx label26; private System.Windows.Forms.TextBox txtOBSELSizeDescr; - private System.Windows.Forms.Label label28; + private BizHawk.WinForms.Controls.LocLabelEx label28; private System.Windows.Forms.ComboBox comboPalette; - private System.Windows.Forms.Label lblTS; - private System.Windows.Forms.Label lblTM; - private System.Windows.Forms.Label label32; - private System.Windows.Forms.Label label31; + private BizHawk.WinForms.Controls.LocLabelEx lblTS; + private BizHawk.WinForms.Controls.LocLabelEx lblTM; + private BizHawk.WinForms.Controls.LocLabelEx label32; + private BizHawk.WinForms.Controls.LocLabelEx label31; private CustomCheckBox checkTSBG4; private CustomCheckBox checkTSBG3; private CustomCheckBox checkTSBG2; @@ -2839,13 +2647,13 @@ private System.Windows.Forms.TextBox txtMapEntryTileNum; private SNESGraphicsViewer viewerMapEntryTile; private System.Windows.Forms.CheckBox checkMapEntryVFlip; - private System.Windows.Forms.Label label34; + private BizHawk.WinForms.Controls.LocLabelEx label34; private System.Windows.Forms.CheckBox checkMapEntryHFlip; - private System.Windows.Forms.Label label17; - private System.Windows.Forms.Label lblMapEntryHFlip; + private BizHawk.WinForms.Controls.LocLabelEx label17; + private BizHawk.WinForms.Controls.LocLabelEx lblMapEntryHFlip; private System.Windows.Forms.TextBox txtMapEntryPalette; - private System.Windows.Forms.Label label14; - private System.Windows.Forms.Label label6; + private BizHawk.WinForms.Controls.LocLabelEx label14; + private BizHawk.WinForms.Controls.LocLabelEx label6; private System.Windows.Forms.TextBox txtMapEntryTileAddr; private System.Windows.Forms.TextBox txtMapEntryPrio; private System.Windows.Forms.TextBox txtMapEntryLocation; @@ -2854,23 +2662,23 @@ private CustomCheckBox checkMathBG3; private CustomCheckBox checkMathBG2; private CustomCheckBox checkMathBG1; - private System.Windows.Forms.Label label33; + private BizHawk.WinForms.Controls.LocLabelEx label33; private CustomCheckBox checkMathOBJ; private CustomCheckBox checkTMOBJ; private CustomCheckBox checkTSOBJ; private CustomCheckBox checkMathBK; private System.Windows.Forms.TextBox txtScreenCGADSUB_AddSub; - private System.Windows.Forms.Label label36; + private BizHawk.WinForms.Controls.LocLabelEx label36; private System.Windows.Forms.TextBox txtScreenCGADSUB_AddSub_Descr; - private System.Windows.Forms.Label label38; + private BizHawk.WinForms.Controls.LocLabelEx label38; private System.Windows.Forms.CheckBox txtScreenCGADSUB_Half; - private System.Windows.Forms.Label lblEnPrio0; + private BizHawk.WinForms.Controls.LocLabelEx lblEnPrio0; private System.Windows.Forms.CheckBox checkEN0_OBJ; private System.Windows.Forms.CheckBox checkEN0_BG4; private System.Windows.Forms.CheckBox checkEN0_BG3; private System.Windows.Forms.CheckBox checkEN0_BG2; private System.Windows.Forms.CheckBox checkEN0_BG1; - private System.Windows.Forms.Label lblEnPrio3; + private BizHawk.WinForms.Controls.LocLabelEx lblEnPrio3; private System.Windows.Forms.CheckBox checkEN1_OBJ; private System.Windows.Forms.CheckBox checkEN1_BG4; private System.Windows.Forms.CheckBox checkEN1_BG3; @@ -2878,12 +2686,12 @@ private System.Windows.Forms.CheckBox checkEN1_BG1; private System.Windows.Forms.CheckBox checkEN3_OBJ; private System.Windows.Forms.CheckBox checkEN2_OBJ; - private System.Windows.Forms.Label lblEnPrio2; - private System.Windows.Forms.Label lblEnPrio1; + private BizHawk.WinForms.Controls.LocLabelEx lblEnPrio2; + private BizHawk.WinForms.Controls.LocLabelEx lblEnPrio1; private System.Windows.Forms.TextBox txtBGPaletteInfo; private System.Windows.Forms.GroupBox groupBox6; - private System.Windows.Forms.Label labelClipboard; - private System.Windows.Forms.Label label47; + private BizHawk.WinForms.Controls.LocLabelEx labelClipboard; + private BizHawk.WinForms.Controls.LocLabelEx label47; private System.Windows.Forms.TabPage tpOBJ; private System.Windows.Forms.GroupBox groupFreeze; private System.Windows.Forms.GroupBox groupBox8; @@ -2898,41 +2706,41 @@ private System.Windows.Forms.RadioButton radioButton13; private System.Windows.Forms.RadioButton radioButton2; private System.Windows.Forms.Panel pnGroupFreeze; - private System.Windows.Forms.Label labelMemory; + private BizHawk.WinForms.Controls.LocLabelEx labelMemory; private System.Windows.Forms.TextBox txtBG1MapSizeBytes; private System.Windows.Forms.TextBox txtBG1SizeInTiles; private System.Windows.Forms.TextBox txtTileMode; - private System.Windows.Forms.Label label18; + private BizHawk.WinForms.Controls.LocLabelEx label18; private System.Windows.Forms.TextBox txtTileColors; private System.Windows.Forms.TextBox txtTileBpp; - private System.Windows.Forms.Label label42; + private BizHawk.WinForms.Controls.LocLabelEx label42; private System.Windows.Forms.TextBox txtTileAddress; private SNESGraphicsViewer viewerObj; private System.Windows.Forms.TextBox txtObjNumber; private System.Windows.Forms.TextBox txtObjCoord; private System.Windows.Forms.CheckBox cbObjVFlip; - private System.Windows.Forms.Label label43; + private BizHawk.WinForms.Controls.LocLabelEx label43; private System.Windows.Forms.CheckBox cbObjHFlip; - private System.Windows.Forms.Label label44; + private BizHawk.WinForms.Controls.LocLabelEx label44; private System.Windows.Forms.TextBox txtTileNumber; - private System.Windows.Forms.Label label45; + private BizHawk.WinForms.Controls.LocLabelEx label45; private System.Windows.Forms.TextBox txtTilePalette; - private System.Windows.Forms.Label label48; + private BizHawk.WinForms.Controls.LocLabelEx label48; private System.Windows.Forms.TextBox txtObjNameAddr; private System.Windows.Forms.TextBox txtObjName; private System.Windows.Forms.TextBox txtObjSize; - private System.Windows.Forms.Label label46; + private BizHawk.WinForms.Controls.LocLabelEx label46; private System.Windows.Forms.CheckBox cbObjLarge; - private System.Windows.Forms.Label label53; - private System.Windows.Forms.Label label52; - private System.Windows.Forms.Label label51; + private BizHawk.WinForms.Controls.LocLabelEx label53; + private BizHawk.WinForms.Controls.LocLabelEx label52; + private BizHawk.WinForms.Controls.LocLabelEx label51; private System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.TextBox txtObjPriority; - private System.Windows.Forms.Label label50; + private BizHawk.WinForms.Controls.LocLabelEx label50; private System.Windows.Forms.TextBox txtObjPaletteMemo; - private System.Windows.Forms.Label label49; + private BizHawk.WinForms.Controls.LocLabelEx label49; private System.Windows.Forms.TextBox txtObjPalette; private System.Windows.Forms.TextBox txtBG1Scroll; - private System.Windows.Forms.Label label37; + private BizHawk.WinForms.Controls.LocLabelEx label37; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/FramesPrompt.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/FramesPrompt.Designer.cs index ba855ba444..5cb04de767 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/FramesPrompt.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/FramesPrompt.Designer.cs @@ -30,7 +30,7 @@ { this.OkBtn = new System.Windows.Forms.Button(); this.CancelBtn = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.NumFramesBox = new BizHawk.Client.EmuHawk.WatchValueBox(); this.SuspendLayout(); // @@ -59,11 +59,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 20); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(120, 13); - this.label1.TabIndex = 4; this.label1.Text = "Insert number of frames:"; // // NumFramesBox @@ -106,6 +103,6 @@ private System.Windows.Forms.Button OkBtn; private System.Windows.Forms.Button CancelBtn; private WatchValueBox NumFramesBox; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.Designer.cs index 728ef7a3bf..8d8c2be9d8 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.Designer.cs @@ -38,30 +38,30 @@ namespace BizHawk.Client.EmuHawk this.CancelBtn = new System.Windows.Forms.Button(); this.OkBtn = new System.Windows.Forms.Button(); this.MemCapacityNumeric = new System.Windows.Forms.NumericUpDown(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.SavestateSizeLabel = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.NumStatesLabel = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.SavestateSizeLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.NumStatesLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.DiskCapacityNumeric = new System.Windows.Forms.NumericUpDown(); - this.label5 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label6 = new BizHawk.WinForms.Controls.LocLabelEx(); this.FileCapacityNumeric = new System.Windows.Forms.NumericUpDown(); - this.label7 = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.NumSaveStatesLabel = new System.Windows.Forms.Label(); + this.label7 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label8 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label9 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.NumSaveStatesLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.FileStateGapNumeric = new System.Windows.Forms.NumericUpDown(); - this.label10 = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.FileNumFramesLabel = new System.Windows.Forms.Label(); + this.label10 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label11 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.FileNumFramesLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.label14 = new System.Windows.Forms.Label(); - this.MemFramesLabel = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); + this.label14 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.MemFramesLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label13 = new BizHawk.WinForms.Controls.LocLabelEx(); this.MemStateGapDividerNumeric = new System.Windows.Forms.NumericUpDown(); - this.label12 = new System.Windows.Forms.Label(); + this.label12 = new BizHawk.WinForms.Controls.LocLabelEx(); this.groupBox2 = new System.Windows.Forms.GroupBox(); ((System.ComponentModel.ISupportInitialize)(this.MemCapacityNumeric)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.DiskCapacityNumeric)).BeginInit(); diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/HeaderEditor.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/HeaderEditor.Designer.cs index 42e80fd806..76f8043594 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/HeaderEditor.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/HeaderEditor.Designer.cs @@ -38,17 +38,17 @@ namespace BizHawk.Client.EmuHawk this.CancelBtn = new System.Windows.Forms.Button(); this.OkBtn = new System.Windows.Forms.Button(); this.AuthorTextBox = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.DefaultAuthorButton = new System.Windows.Forms.Button(); this.MakeDefaultCheckbox = new System.Windows.Forms.CheckBox(); - this.label2 = new System.Windows.Forms.Label(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.EmulatorVersionTextBox = new System.Windows.Forms.TextBox(); this.CoreTextBox = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); this.BoardNameTextBox = new System.Windows.Forms.TextBox(); - this.label5 = new System.Windows.Forms.Label(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); this.GameNameTextBox = new System.Windows.Forms.TextBox(); - this.label6 = new System.Windows.Forms.Label(); + this.label6 = new BizHawk.WinForms.Controls.LocLabelEx(); this.SuspendLayout(); // // CancelBtn diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/PatternsForm.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/PatternsForm.Designer.cs index fe80b39e8a..8b6d979bad 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/PatternsForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/PatternsForm.Designer.cs @@ -33,10 +33,10 @@ this.InsertButton = new System.Windows.Forms.Button(); this.DeleteButton = new System.Windows.Forms.Button(); this.LagBox = new System.Windows.Forms.CheckBox(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.ValueNum = new System.Windows.Forms.NumericUpDown(); this.CountNum = new System.Windows.Forms.NumericUpDown(); - this.label2 = new System.Windows.Forms.Label(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.OnOffBox = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.ValueNum)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.CountNum)).BeginInit(); @@ -105,11 +105,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(9, 181); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(37, 13); - this.label1.TabIndex = 4; this.label1.Text = "Value:"; // // ValueNum @@ -136,11 +133,8 @@ // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(103, 181); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(38, 13); - this.label2.TabIndex = 4; this.label2.Text = "Count:"; // // OnOffBox @@ -187,10 +181,10 @@ private System.Windows.Forms.Button InsertButton; private System.Windows.Forms.Button DeleteButton; private System.Windows.Forms.CheckBox LagBox; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private System.Windows.Forms.NumericUpDown ValueNum; private System.Windows.Forms.NumericUpDown CountNum; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label2; private System.Windows.Forms.CheckBox OnOffBox; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/UndoHistoryForm.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/UndoHistoryForm.Designer.cs index b1e837c6c9..b2c3e1c830 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/UndoHistoryForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/UndoHistoryForm.Designer.cs @@ -39,7 +39,7 @@ this.clearHistoryToHereToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.AutoScrollCheck = new System.Windows.Forms.CheckBox(); this.MaxStepsNum = new System.Windows.Forms.NumericUpDown(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.HistoryView = new InputRoll(); this.RightClickMenu.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.MaxStepsNum)).BeginInit(); @@ -154,11 +154,8 @@ // label1 // this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(236, 234); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(30, 13); - this.label1.TabIndex = 7; this.label1.Text = "Max:"; // // HistoryView @@ -215,6 +212,6 @@ private System.Windows.Forms.ToolStripMenuItem clearHistoryToHereToolStripMenuItem; private System.Windows.Forms.CheckBox AutoScrollCheck; private System.Windows.Forms.NumericUpDown MaxStepsNum; - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.Designer.cs index 4ecb1b65c7..6a8b6e47ac 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.Designer.cs @@ -41,132 +41,132 @@ this.ZoomButton = new System.Windows.Forms.Button(); this.TraceButton = new System.Windows.Forms.Button(); this.GraphButton = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); this.ModeButton = new System.Windows.Forms.Button(); - this.label6 = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); + this.label6 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label7 = new BizHawk.WinForms.Controls.LocLabelEx(); this.DelButton = new System.Windows.Forms.Button(); this.XButton = new System.Windows.Forms.Button(); this.StatButton = new System.Windows.Forms.Button(); - this.label8 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); + this.label8 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label9 = new BizHawk.WinForms.Controls.LocLabelEx(); this.AlphaButton = new System.Windows.Forms.Button(); - this.label10 = new System.Windows.Forms.Label(); + this.label10 = new BizHawk.WinForms.Controls.LocLabelEx(); this.MathButton = new System.Windows.Forms.Button(); - this.label11 = new System.Windows.Forms.Label(); + this.label11 = new BizHawk.WinForms.Controls.LocLabelEx(); this.MatrixButton = new System.Windows.Forms.Button(); this.PrgmButton = new System.Windows.Forms.Button(); this.VarsButton = new System.Windows.Forms.Button(); this.ClearButton = new System.Windows.Forms.Button(); - this.label12 = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); - this.label14 = new System.Windows.Forms.Label(); - this.label15 = new System.Windows.Forms.Label(); - this.label16 = new System.Windows.Forms.Label(); - this.label17 = new System.Windows.Forms.Label(); - this.label18 = new System.Windows.Forms.Label(); - this.label19 = new System.Windows.Forms.Label(); + this.label12 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label13 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label14 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label15 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label16 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label17 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label18 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label19 = new BizHawk.WinForms.Controls.LocLabelEx(); this.Neg1Button = new System.Windows.Forms.Button(); this.SinButton = new System.Windows.Forms.Button(); this.CosButton = new System.Windows.Forms.Button(); this.TanButton = new System.Windows.Forms.Button(); this.ExpButton = new System.Windows.Forms.Button(); - this.label20 = new System.Windows.Forms.Label(); - this.label21 = new System.Windows.Forms.Label(); - this.label22 = new System.Windows.Forms.Label(); - this.label23 = new System.Windows.Forms.Label(); - this.label24 = new System.Windows.Forms.Label(); - this.label25 = new System.Windows.Forms.Label(); - this.label26 = new System.Windows.Forms.Label(); - this.label27 = new System.Windows.Forms.Label(); - this.label28 = new System.Windows.Forms.Label(); - this.label29 = new System.Windows.Forms.Label(); - this.label30 = new System.Windows.Forms.Label(); - this.label31 = new System.Windows.Forms.Label(); - this.label32 = new System.Windows.Forms.Label(); - this.label33 = new System.Windows.Forms.Label(); - this.label34 = new System.Windows.Forms.Label(); - this.label35 = new System.Windows.Forms.Label(); + this.label20 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label21 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label22 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label23 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label24 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label25 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label26 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label27 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label28 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label29 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label30 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label31 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label32 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label33 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label34 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label35 = new BizHawk.WinForms.Controls.LocLabelEx(); this.DivideButton = new System.Windows.Forms.Button(); this.ParaCloseButton = new System.Windows.Forms.Button(); this.ParaOpenButton = new System.Windows.Forms.Button(); this.CommaButton = new System.Windows.Forms.Button(); this.SquaredButton = new System.Windows.Forms.Button(); - this.label36 = new System.Windows.Forms.Label(); - this.label37 = new System.Windows.Forms.Label(); - this.label38 = new System.Windows.Forms.Label(); - this.label39 = new System.Windows.Forms.Label(); - this.label40 = new System.Windows.Forms.Label(); - this.label41 = new System.Windows.Forms.Label(); - this.label42 = new System.Windows.Forms.Label(); - this.label43 = new System.Windows.Forms.Label(); - this.label44 = new System.Windows.Forms.Label(); - this.label45 = new System.Windows.Forms.Label(); + this.label36 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label37 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label38 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label39 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label40 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label41 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label42 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label43 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label44 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label45 = new BizHawk.WinForms.Controls.LocLabelEx(); this.MultiplyButton = new System.Windows.Forms.Button(); this.NineButton = new System.Windows.Forms.Button(); this.EightButton = new System.Windows.Forms.Button(); this.SevenButton = new System.Windows.Forms.Button(); this.LogButton = new System.Windows.Forms.Button(); - this.label46 = new System.Windows.Forms.Label(); - this.label47 = new System.Windows.Forms.Label(); - this.label48 = new System.Windows.Forms.Label(); - this.label49 = new System.Windows.Forms.Label(); - this.label50 = new System.Windows.Forms.Label(); - this.label51 = new System.Windows.Forms.Label(); - this.label52 = new System.Windows.Forms.Label(); - this.label53 = new System.Windows.Forms.Label(); - this.label54 = new System.Windows.Forms.Label(); - this.label55 = new System.Windows.Forms.Label(); + this.label46 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label47 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label48 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label49 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label50 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label51 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label52 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label53 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label54 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label55 = new BizHawk.WinForms.Controls.LocLabelEx(); this.MinusButton = new System.Windows.Forms.Button(); this.SixButton = new System.Windows.Forms.Button(); this.FiveButton = new System.Windows.Forms.Button(); this.FourButton = new System.Windows.Forms.Button(); this.LnButton = new System.Windows.Forms.Button(); - this.label56 = new System.Windows.Forms.Label(); - this.label57 = new System.Windows.Forms.Label(); - this.label58 = new System.Windows.Forms.Label(); - this.label59 = new System.Windows.Forms.Label(); - this.label60 = new System.Windows.Forms.Label(); - this.label61 = new System.Windows.Forms.Label(); - this.label62 = new System.Windows.Forms.Label(); - this.label63 = new System.Windows.Forms.Label(); - this.label64 = new System.Windows.Forms.Label(); - this.label65 = new System.Windows.Forms.Label(); + this.label56 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label57 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label58 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label59 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label60 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label61 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label62 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label63 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label64 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label65 = new BizHawk.WinForms.Controls.LocLabelEx(); this.PlusButton = new System.Windows.Forms.Button(); this.ThreeButton = new System.Windows.Forms.Button(); this.TwoButton = new System.Windows.Forms.Button(); this.OneButton = new System.Windows.Forms.Button(); this.StoButton = new System.Windows.Forms.Button(); - this.label66 = new System.Windows.Forms.Label(); - this.label67 = new System.Windows.Forms.Label(); - this.label68 = new System.Windows.Forms.Label(); - this.label69 = new System.Windows.Forms.Label(); - this.label70 = new System.Windows.Forms.Label(); - this.label71 = new System.Windows.Forms.Label(); - this.label72 = new System.Windows.Forms.Label(); - this.label73 = new System.Windows.Forms.Label(); - this.label74 = new System.Windows.Forms.Label(); - this.label75 = new System.Windows.Forms.Label(); + this.label66 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label67 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label68 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label69 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label70 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label71 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label72 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label73 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label74 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label75 = new BizHawk.WinForms.Controls.LocLabelEx(); this.EnterButton = new System.Windows.Forms.Button(); this.DashButton = new System.Windows.Forms.Button(); this.PeriodButton = new System.Windows.Forms.Button(); this.ZeroButton = new System.Windows.Forms.Button(); this.OnButton = new System.Windows.Forms.Button(); - this.label76 = new System.Windows.Forms.Label(); + this.label76 = new BizHawk.WinForms.Controls.LocLabelEx(); this.LeftButton = new System.Windows.Forms.Button(); this.RightButton = new System.Windows.Forms.Button(); this.DownButton = new System.Windows.Forms.Button(); this.UpButton = new System.Windows.Forms.Button(); this.KeyPadToolTips = new System.Windows.Forms.ToolTip(this.components); - this.label77 = new System.Windows.Forms.Label(); - this.label78 = new System.Windows.Forms.Label(); - this.label79 = new System.Windows.Forms.Label(); - this.label80 = new System.Windows.Forms.Label(); - this.label81 = new System.Windows.Forms.Label(); + this.label77 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label78 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label79 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label80 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label81 = new BizHawk.WinForms.Controls.LocLabelEx(); this.menuStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -302,57 +302,42 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label1.ForeColor = System.Drawing.Color.Gold; this.label1.Location = new System.Drawing.Point(8, 42); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(75, 13); - this.label1.TabIndex = 10; this.label1.Text = "STAT PLOT"; // // label2 // - this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label2.ForeColor = System.Drawing.Color.Gold; this.label2.Location = new System.Drawing.Point(85, 42); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(54, 13); - this.label2.TabIndex = 11; this.label2.Text = "TBLSET"; // // label3 // - this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label3.ForeColor = System.Drawing.Color.Gold; this.label3.Location = new System.Drawing.Point(155, 42); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(58, 13); - this.label3.TabIndex = 12; this.label3.Text = "FORMAT"; // // label4 // - this.label4.AutoSize = true; this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label4.ForeColor = System.Drawing.Color.Gold; this.label4.Location = new System.Drawing.Point(231, 42); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(38, 13); - this.label4.TabIndex = 13; this.label4.Text = "CALC"; // // label5 // - this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label5.ForeColor = System.Drawing.Color.Gold; this.label5.Location = new System.Drawing.Point(294, 42); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(46, 13); - this.label5.TabIndex = 14; this.label5.Text = "TABLE"; // // MODE @@ -370,24 +355,18 @@ // // label6 // - this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label6.ForeColor = System.Drawing.Color.Gold; this.label6.Location = new System.Drawing.Point(87, 114); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(37, 13); - this.label6.TabIndex = 16; this.label6.Text = "QUIT"; // // label7 // - this.label7.AutoSize = true; this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label7.ForeColor = System.Drawing.Color.Gold; this.label7.Location = new System.Drawing.Point(155, 114); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(28, 13); - this.label7.TabIndex = 18; this.label7.Text = "INS"; // // DEL @@ -431,24 +410,18 @@ // // label8 // - this.label8.AutoSize = true; this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label8.ForeColor = System.Drawing.Color.Gold; this.label8.Location = new System.Drawing.Point(87, 162); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(35, 13); - this.label8.TabIndex = 21; this.label8.Text = "LINK"; // // label9 // - this.label9.AutoSize = true; this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label9.ForeColor = System.Drawing.Color.Gold; this.label9.Location = new System.Drawing.Point(155, 162); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(34, 13); - this.label9.TabIndex = 22; this.label9.Text = "LIST"; // // ALPHA @@ -466,13 +439,10 @@ // // label10 // - this.label10.AutoSize = true; this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label10.ForeColor = System.Drawing.Color.Gold; this.label10.Location = new System.Drawing.Point(15, 162); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(51, 13); - this.label10.TabIndex = 24; this.label10.Text = "A-LOCK"; // // MATH @@ -490,13 +460,10 @@ // // label11 // - this.label11.AutoSize = true; this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label11.ForeColor = System.Drawing.Color.Gold; this.label11.Location = new System.Drawing.Point(15, 209); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(39, 13); - this.label11.TabIndex = 26; this.label11.Text = "TEST"; // // MATRIX @@ -553,90 +520,66 @@ // // label12 // - this.label12.AutoSize = true; this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label12.ForeColor = System.Drawing.Color.Gold; this.label12.Location = new System.Drawing.Point(87, 209); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(48, 13); - this.label12.TabIndex = 31; this.label12.Text = "ANGLE"; // // label13 // - this.label13.AutoSize = true; this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label13.ForeColor = System.Drawing.Color.Gold; this.label13.Location = new System.Drawing.Point(155, 209); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(45, 13); - this.label13.TabIndex = 32; this.label13.Text = "DRAW"; // // label14 // - this.label14.AutoSize = true; this.label14.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label14.ForeColor = System.Drawing.Color.Gold; this.label14.Location = new System.Drawing.Point(224, 209); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(45, 13); - this.label14.TabIndex = 33; this.label14.Text = "DISTR"; // // label15 // - this.label15.AutoSize = true; this.label15.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label15.ForeColor = System.Drawing.Color.LightSeaGreen; this.label15.Location = new System.Drawing.Point(57, 209); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(15, 13); - this.label15.TabIndex = 34; this.label15.Text = "A"; // // label16 // - this.label16.AutoSize = true; this.label16.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label16.ForeColor = System.Drawing.Color.LightSeaGreen; this.label16.Location = new System.Drawing.Point(133, 209); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(15, 13); - this.label16.TabIndex = 35; this.label16.Text = "B"; // // label17 // - this.label17.AutoSize = true; this.label17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label17.ForeColor = System.Drawing.Color.LightSeaGreen; this.label17.Location = new System.Drawing.Point(198, 209); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(15, 13); - this.label17.TabIndex = 36; this.label17.Text = "C"; // // label18 // - this.label18.AutoSize = true; this.label18.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label18.ForeColor = System.Drawing.Color.LightSeaGreen; this.label18.Location = new System.Drawing.Point(61, 258); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(16, 13); - this.label18.TabIndex = 37; this.label18.Text = "D"; // // label19 // - this.label19.AutoSize = true; this.label19.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label19.ForeColor = System.Drawing.Color.Gold; this.label19.Location = new System.Drawing.Point(12, 258); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(52, 13); - this.label19.TabIndex = 38; this.label19.Text = "Finance"; // // NEG1 @@ -706,178 +649,130 @@ // // label20 // - this.label20.AutoSize = true; this.label20.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label20.ForeColor = System.Drawing.Color.Gold; this.label20.Location = new System.Drawing.Point(87, 258); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(28, 13); - this.label20.TabIndex = 44; this.label20.Text = "SIN"; // // label21 // - this.label21.AutoSize = true; this.label21.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label21.ForeColor = System.Drawing.Color.Gold; this.label21.Location = new System.Drawing.Point(155, 258); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(32, 13); - this.label21.TabIndex = 45; this.label21.Text = "COS"; // // label22 // - this.label22.AutoSize = true; this.label22.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label22.ForeColor = System.Drawing.Color.Gold; this.label22.Location = new System.Drawing.Point(222, 258); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(32, 13); - this.label22.TabIndex = 46; this.label22.Text = "TAN"; // // label23 // - this.label23.AutoSize = true; this.label23.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label23.ForeColor = System.Drawing.Color.Gold; this.label23.Location = new System.Drawing.Point(295, 254); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(17, 18); - this.label23.TabIndex = 47; this.label23.Text = "π"; // // label24 // - this.label24.AutoSize = true; this.label24.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label24.ForeColor = System.Drawing.Color.LightSeaGreen; this.label24.Location = new System.Drawing.Point(133, 258); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(15, 13); - this.label24.TabIndex = 48; this.label24.Text = "E"; // // label25 // - this.label25.AutoSize = true; this.label25.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label25.ForeColor = System.Drawing.Color.LightSeaGreen; this.label25.Location = new System.Drawing.Point(198, 258); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(14, 13); - this.label25.TabIndex = 49; this.label25.Text = "F"; // // label26 // - this.label26.AutoSize = true; this.label26.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label26.ForeColor = System.Drawing.Color.LightSeaGreen; this.label26.Location = new System.Drawing.Point(266, 258); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(16, 13); - this.label26.TabIndex = 50; this.label26.Text = "G"; // // label27 // - this.label27.AutoSize = true; this.label27.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label27.ForeColor = System.Drawing.Color.LightSeaGreen; this.label27.Location = new System.Drawing.Point(332, 258); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(16, 13); - this.label27.TabIndex = 51; this.label27.Text = "H"; // // label28 // - this.label28.AutoSize = true; this.label28.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label28.ForeColor = System.Drawing.Color.LightSeaGreen; this.label28.Location = new System.Drawing.Point(332, 307); this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(17, 13); - this.label28.TabIndex = 66; this.label28.Text = "M"; // // label29 // - this.label29.AutoSize = true; this.label29.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label29.ForeColor = System.Drawing.Color.LightSeaGreen; this.label29.Location = new System.Drawing.Point(266, 307); this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(14, 13); - this.label29.TabIndex = 65; this.label29.Text = "L"; // // label30 // - this.label30.AutoSize = true; this.label30.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label30.ForeColor = System.Drawing.Color.LightSeaGreen; this.label30.Location = new System.Drawing.Point(198, 307); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(15, 13); - this.label30.TabIndex = 64; this.label30.Text = "K"; // // label31 // - this.label31.AutoSize = true; this.label31.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label31.ForeColor = System.Drawing.Color.LightSeaGreen; this.label31.Location = new System.Drawing.Point(133, 307); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(13, 13); - this.label31.TabIndex = 63; this.label31.Text = "J"; // // label32 // - this.label32.AutoSize = true; this.label32.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label32.ForeColor = System.Drawing.Color.Gold; this.label32.Location = new System.Drawing.Point(294, 307); this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(14, 13); - this.label32.TabIndex = 62; this.label32.Text = "e"; // // label33 // - this.label33.AutoSize = true; this.label33.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label33.ForeColor = System.Drawing.Color.Gold; this.label33.Location = new System.Drawing.Point(224, 307); this.label33.Name = "label33"; - this.label33.Size = new System.Drawing.Size(12, 13); - this.label33.TabIndex = 61; this.label33.Text = "}"; // // label34 // - this.label34.AutoSize = true; this.label34.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label34.ForeColor = System.Drawing.Color.Gold; this.label34.Location = new System.Drawing.Point(155, 307); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(12, 13); - this.label34.TabIndex = 60; this.label34.Text = "{"; // // label35 // - this.label35.AutoSize = true; this.label35.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label35.ForeColor = System.Drawing.Color.Gold; this.label35.Location = new System.Drawing.Point(87, 307); this.label35.Name = "label35"; - this.label35.Size = new System.Drawing.Size(23, 13); - this.label35.TabIndex = 59; this.label35.Text = "EE"; // // DIVIDE @@ -947,112 +842,82 @@ // // label36 // - this.label36.AutoSize = true; this.label36.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label36.ForeColor = System.Drawing.Color.Gold; this.label36.Location = new System.Drawing.Point(15, 307); this.label36.Name = "label36"; - this.label36.Size = new System.Drawing.Size(14, 13); - this.label36.TabIndex = 53; this.label36.Text = "√"; // // label37 // - this.label37.AutoSize = true; this.label37.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label37.ForeColor = System.Drawing.Color.LightSeaGreen; this.label37.Location = new System.Drawing.Point(57, 307); this.label37.Name = "label37"; - this.label37.Size = new System.Drawing.Size(11, 13); - this.label37.TabIndex = 52; this.label37.Text = "I"; // // label38 // - this.label38.AutoSize = true; this.label38.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label38.ForeColor = System.Drawing.Color.LightSeaGreen; this.label38.Location = new System.Drawing.Point(332, 359); this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(16, 13); - this.label38.TabIndex = 81; this.label38.Text = "R"; // // label39 // - this.label39.AutoSize = true; this.label39.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label39.ForeColor = System.Drawing.Color.LightSeaGreen; this.label39.Location = new System.Drawing.Point(266, 359); this.label39.Name = "label39"; - this.label39.Size = new System.Drawing.Size(16, 13); - this.label39.TabIndex = 80; this.label39.Text = "Q"; // // label40 // - this.label40.AutoSize = true; this.label40.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label40.ForeColor = System.Drawing.Color.LightSeaGreen; this.label40.Location = new System.Drawing.Point(198, 359); this.label40.Name = "label40"; - this.label40.Size = new System.Drawing.Size(15, 13); - this.label40.TabIndex = 79; this.label40.Text = "P"; // // label41 // - this.label41.AutoSize = true; this.label41.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label41.ForeColor = System.Drawing.Color.LightSeaGreen; this.label41.Location = new System.Drawing.Point(133, 359); this.label41.Name = "label41"; - this.label41.Size = new System.Drawing.Size(16, 13); - this.label41.TabIndex = 78; this.label41.Text = "O"; // // label42 // - this.label42.AutoSize = true; this.label42.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label42.ForeColor = System.Drawing.Color.Gold; this.label42.Location = new System.Drawing.Point(294, 359); this.label42.Name = "label42"; - this.label42.Size = new System.Drawing.Size(11, 13); - this.label42.TabIndex = 77; this.label42.Text = "["; // // label43 // - this.label43.AutoSize = true; this.label43.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label43.ForeColor = System.Drawing.Color.Gold; this.label43.Location = new System.Drawing.Point(224, 359); this.label43.Name = "label43"; - this.label43.Size = new System.Drawing.Size(16, 13); - this.label43.TabIndex = 76; this.label43.Text = "w"; // // label44 // - this.label44.AutoSize = true; this.label44.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label44.ForeColor = System.Drawing.Color.Gold; this.label44.Location = new System.Drawing.Point(155, 359); this.label44.Name = "label44"; - this.label44.Size = new System.Drawing.Size(14, 13); - this.label44.TabIndex = 75; this.label44.Text = "v"; // // label45 // - this.label45.AutoSize = true; this.label45.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label45.ForeColor = System.Drawing.Color.Gold; this.label45.Location = new System.Drawing.Point(87, 359); this.label45.Name = "label45"; - this.label45.Size = new System.Drawing.Size(14, 13); - this.label45.TabIndex = 74; this.label45.Text = "u"; // // MULTIPLY @@ -1122,112 +987,82 @@ // // label46 // - this.label46.AutoSize = true; this.label46.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label46.ForeColor = System.Drawing.Color.Gold; this.label46.Location = new System.Drawing.Point(15, 359); this.label46.Name = "label46"; - this.label46.Size = new System.Drawing.Size(21, 13); - this.label46.TabIndex = 68; this.label46.Text = "10"; // // label47 // - this.label47.AutoSize = true; this.label47.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label47.ForeColor = System.Drawing.Color.LightSeaGreen; this.label47.Location = new System.Drawing.Point(57, 359); this.label47.Name = "label47"; - this.label47.Size = new System.Drawing.Size(16, 13); - this.label47.TabIndex = 67; this.label47.Text = "N"; // // label48 // - this.label48.AutoSize = true; this.label48.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label48.ForeColor = System.Drawing.Color.LightSeaGreen; this.label48.Location = new System.Drawing.Point(332, 404); this.label48.Name = "label48"; - this.label48.Size = new System.Drawing.Size(19, 13); - this.label48.TabIndex = 96; this.label48.Text = "W"; // // label49 // - this.label49.AutoSize = true; this.label49.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label49.ForeColor = System.Drawing.Color.LightSeaGreen; this.label49.Location = new System.Drawing.Point(266, 404); this.label49.Name = "label49"; - this.label49.Size = new System.Drawing.Size(15, 13); - this.label49.TabIndex = 95; this.label49.Text = "V"; // // label50 // - this.label50.AutoSize = true; this.label50.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label50.ForeColor = System.Drawing.Color.LightSeaGreen; this.label50.Location = new System.Drawing.Point(198, 404); this.label50.Name = "label50"; - this.label50.Size = new System.Drawing.Size(16, 13); - this.label50.TabIndex = 94; this.label50.Text = "U"; // // label51 // - this.label51.AutoSize = true; this.label51.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label51.ForeColor = System.Drawing.Color.LightSeaGreen; this.label51.Location = new System.Drawing.Point(133, 404); this.label51.Name = "label51"; - this.label51.Size = new System.Drawing.Size(15, 13); - this.label51.TabIndex = 93; this.label51.Text = "T"; // // label52 // - this.label52.AutoSize = true; this.label52.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label52.ForeColor = System.Drawing.Color.Gold; this.label52.Location = new System.Drawing.Point(294, 404); this.label52.Name = "label52"; - this.label52.Size = new System.Drawing.Size(11, 13); - this.label52.TabIndex = 92; this.label52.Text = "]"; // // label53 // - this.label53.AutoSize = true; this.label53.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label53.ForeColor = System.Drawing.Color.Gold; this.label53.Location = new System.Drawing.Point(224, 404); this.label53.Name = "label53"; - this.label53.Size = new System.Drawing.Size(21, 13); - this.label53.TabIndex = 91; this.label53.Text = "L6"; // // label54 // - this.label54.AutoSize = true; this.label54.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label54.ForeColor = System.Drawing.Color.Gold; this.label54.Location = new System.Drawing.Point(155, 404); this.label54.Name = "label54"; - this.label54.Size = new System.Drawing.Size(21, 13); - this.label54.TabIndex = 90; this.label54.Text = "L5"; // // label55 // - this.label55.AutoSize = true; this.label55.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label55.ForeColor = System.Drawing.Color.Gold; this.label55.Location = new System.Drawing.Point(87, 404); this.label55.Name = "label55"; - this.label55.Size = new System.Drawing.Size(21, 13); - this.label55.TabIndex = 89; this.label55.Text = "L4"; // // MINUS @@ -1297,112 +1132,82 @@ // // label56 // - this.label56.AutoSize = true; this.label56.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label56.ForeColor = System.Drawing.Color.Gold; this.label56.Location = new System.Drawing.Point(15, 404); this.label56.Name = "label56"; - this.label56.Size = new System.Drawing.Size(14, 13); - this.label56.TabIndex = 83; this.label56.Text = "e"; // // label57 // - this.label57.AutoSize = true; this.label57.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label57.ForeColor = System.Drawing.Color.LightSeaGreen; this.label57.Location = new System.Drawing.Point(57, 404); this.label57.Name = "label57"; - this.label57.Size = new System.Drawing.Size(15, 13); - this.label57.TabIndex = 82; this.label57.Text = "S"; // // label58 // - this.label58.AutoSize = true; this.label58.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label58.ForeColor = System.Drawing.Color.LightSeaGreen; this.label58.Location = new System.Drawing.Point(332, 453); this.label58.Name = "label58"; - this.label58.Size = new System.Drawing.Size(13, 13); - this.label58.TabIndex = 111; this.label58.Text = "\'\'"; // // label59 // - this.label59.AutoSize = true; this.label59.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label59.ForeColor = System.Drawing.Color.LightSeaGreen; this.label59.Location = new System.Drawing.Point(266, 451); this.label59.Name = "label59"; - this.label59.Size = new System.Drawing.Size(15, 15); - this.label59.TabIndex = 110; this.label59.Text = "ø"; // // label60 // - this.label60.AutoSize = true; this.label60.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label60.ForeColor = System.Drawing.Color.LightSeaGreen; this.label60.Location = new System.Drawing.Point(198, 453); this.label60.Name = "label60"; - this.label60.Size = new System.Drawing.Size(15, 13); - this.label60.TabIndex = 109; this.label60.Text = "Z"; // // label61 // - this.label61.AutoSize = true; this.label61.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label61.ForeColor = System.Drawing.Color.LightSeaGreen; this.label61.Location = new System.Drawing.Point(133, 453); this.label61.Name = "label61"; - this.label61.Size = new System.Drawing.Size(15, 13); - this.label61.TabIndex = 108; this.label61.Text = "Y"; // // label62 // - this.label62.AutoSize = true; this.label62.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label62.ForeColor = System.Drawing.Color.Gold; this.label62.Location = new System.Drawing.Point(294, 453); this.label62.Name = "label62"; - this.label62.Size = new System.Drawing.Size(35, 13); - this.label62.TabIndex = 107; this.label62.Text = "MEM"; // // label63 // - this.label63.AutoSize = true; this.label63.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label63.ForeColor = System.Drawing.Color.Gold; this.label63.Location = new System.Drawing.Point(224, 453); this.label63.Name = "label63"; - this.label63.Size = new System.Drawing.Size(21, 13); - this.label63.TabIndex = 106; this.label63.Text = "L3"; // // label64 // - this.label64.AutoSize = true; this.label64.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label64.ForeColor = System.Drawing.Color.Gold; this.label64.Location = new System.Drawing.Point(155, 453); this.label64.Name = "label64"; - this.label64.Size = new System.Drawing.Size(21, 13); - this.label64.TabIndex = 105; this.label64.Text = "L2"; // // label65 // - this.label65.AutoSize = true; this.label65.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label65.ForeColor = System.Drawing.Color.Gold; this.label65.Location = new System.Drawing.Point(87, 453); this.label65.Name = "label65"; - this.label65.Size = new System.Drawing.Size(21, 13); - this.label65.TabIndex = 104; this.label65.Text = "L1"; // // PLUS @@ -1472,112 +1277,82 @@ // // label66 // - this.label66.AutoSize = true; this.label66.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label66.ForeColor = System.Drawing.Color.Gold; this.label66.Location = new System.Drawing.Point(15, 453); this.label66.Name = "label66"; - this.label66.Size = new System.Drawing.Size(31, 13); - this.label66.TabIndex = 98; this.label66.Text = "RCL"; // // label67 // - this.label67.AutoSize = true; this.label67.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label67.ForeColor = System.Drawing.Color.LightSeaGreen; this.label67.Location = new System.Drawing.Point(57, 453); this.label67.Name = "label67"; - this.label67.Size = new System.Drawing.Size(15, 13); - this.label67.TabIndex = 97; this.label67.Text = "X"; // // label68 // - this.label68.AutoSize = true; this.label68.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label68.ForeColor = System.Drawing.Color.LightSeaGreen; this.label68.Location = new System.Drawing.Point(321, 501); this.label68.Name = "label68"; - this.label68.Size = new System.Drawing.Size(39, 13); - this.label68.TabIndex = 125; this.label68.Text = "Solve"; // // label69 // - this.label69.AutoSize = true; this.label69.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label69.ForeColor = System.Drawing.Color.LightSeaGreen; this.label69.Location = new System.Drawing.Point(266, 501); this.label69.Name = "label69"; - this.label69.Size = new System.Drawing.Size(14, 13); - this.label69.TabIndex = 124; this.label69.Text = "?"; // // label70 // - this.label70.AutoSize = true; this.label70.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label70.ForeColor = System.Drawing.Color.LightSeaGreen; this.label70.Location = new System.Drawing.Point(198, 501); this.label70.Name = "label70"; - this.label70.Size = new System.Drawing.Size(11, 13); - this.label70.TabIndex = 123; this.label70.Text = ":"; // // label71 // - this.label71.AutoSize = true; this.label71.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label71.ForeColor = System.Drawing.Color.LightSeaGreen; this.label71.Location = new System.Drawing.Point(133, 501); this.label71.Name = "label71"; - this.label71.Size = new System.Drawing.Size(14, 13); - this.label71.TabIndex = 122; this.label71.Text = "_"; // // label72 // - this.label72.AutoSize = true; this.label72.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label72.ForeColor = System.Drawing.Color.Gold; this.label72.Location = new System.Drawing.Point(285, 501); this.label72.Name = "label72"; - this.label72.Size = new System.Drawing.Size(36, 13); - this.label72.TabIndex = 121; this.label72.Text = "Entry"; // // label73 // - this.label73.AutoSize = true; this.label73.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label73.ForeColor = System.Drawing.Color.Gold; this.label73.Location = new System.Drawing.Point(224, 501); this.label73.Name = "label73"; - this.label73.Size = new System.Drawing.Size(32, 13); - this.label73.TabIndex = 120; this.label73.Text = "ANS"; // // label74 // - this.label74.AutoSize = true; this.label74.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label74.ForeColor = System.Drawing.Color.Gold; this.label74.Location = new System.Drawing.Point(155, 501); this.label74.Name = "label74"; - this.label74.Size = new System.Drawing.Size(10, 13); - this.label74.TabIndex = 119; this.label74.Text = "i"; // // label75 // - this.label75.AutoSize = true; this.label75.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label75.ForeColor = System.Drawing.Color.Gold; this.label75.Location = new System.Drawing.Point(78, 501); this.label75.Name = "label75"; - this.label75.Size = new System.Drawing.Size(50, 13); - this.label75.TabIndex = 118; this.label75.Text = "Catalog"; // // ENTER @@ -1647,13 +1422,10 @@ // // label76 // - this.label76.AutoSize = true; this.label76.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label76.ForeColor = System.Drawing.Color.Gold; this.label76.Location = new System.Drawing.Point(15, 501); this.label76.Name = "label76"; - this.label76.Size = new System.Drawing.Size(30, 13); - this.label76.TabIndex = 112; this.label76.Text = "OFF"; // // LEFT @@ -1708,57 +1480,42 @@ // // label77 // - this.label77.AutoSize = true; this.label77.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label77.ForeColor = System.Drawing.Color.Gold; this.label77.Location = new System.Drawing.Point(29, 401); this.label77.Name = "label77"; - this.label77.Size = new System.Drawing.Size(13, 13); - this.label77.TabIndex = 126; this.label77.Text = "x"; // // label78 // - this.label78.AutoSize = true; this.label78.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label78.ForeColor = System.Drawing.Color.Gold; this.label78.Location = new System.Drawing.Point(35, 352); this.label78.Name = "label78"; - this.label78.Size = new System.Drawing.Size(13, 13); - this.label78.TabIndex = 127; this.label78.Text = "x"; // // label79 // - this.label79.AutoSize = true; this.label79.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label79.ForeColor = System.Drawing.Color.Gold; this.label79.Location = new System.Drawing.Point(113, 254); this.label79.Name = "label79"; - this.label79.Size = new System.Drawing.Size(16, 13); - this.label79.TabIndex = 128; this.label79.Text = "-1"; // // label80 // - this.label80.AutoSize = true; this.label80.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label80.ForeColor = System.Drawing.Color.Gold; this.label80.Location = new System.Drawing.Point(185, 254); this.label80.Name = "label80"; - this.label80.Size = new System.Drawing.Size(16, 13); - this.label80.TabIndex = 129; this.label80.Text = "-1"; // // label81 // - this.label81.AutoSize = true; this.label81.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label81.ForeColor = System.Drawing.Color.Gold; this.label81.Location = new System.Drawing.Point(252, 254); this.label81.Name = "label81"; - this.label81.Size = new System.Drawing.Size(16, 13); - this.label81.TabIndex = 130; this.label81.Text = "-1"; // // TI83KeyPad @@ -1928,132 +1685,132 @@ private System.Windows.Forms.Button ZoomButton; private System.Windows.Forms.Button TraceButton; private System.Windows.Forms.Button GraphButton; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label5; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label2; + private BizHawk.WinForms.Controls.LocLabelEx label3; + private BizHawk.WinForms.Controls.LocLabelEx label4; + private BizHawk.WinForms.Controls.LocLabelEx label5; private System.Windows.Forms.Button ModeButton; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.Label label7; + private BizHawk.WinForms.Controls.LocLabelEx label6; + private BizHawk.WinForms.Controls.LocLabelEx label7; private System.Windows.Forms.Button DelButton; private System.Windows.Forms.Button XButton; private System.Windows.Forms.Button StatButton; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.Label label9; + private BizHawk.WinForms.Controls.LocLabelEx label8; + private BizHawk.WinForms.Controls.LocLabelEx label9; private System.Windows.Forms.Button AlphaButton; - private System.Windows.Forms.Label label10; + private BizHawk.WinForms.Controls.LocLabelEx label10; private System.Windows.Forms.Button MathButton; - private System.Windows.Forms.Label label11; + private BizHawk.WinForms.Controls.LocLabelEx label11; private System.Windows.Forms.Button MatrixButton; private System.Windows.Forms.Button PrgmButton; private System.Windows.Forms.Button VarsButton; private System.Windows.Forms.Button ClearButton; - private System.Windows.Forms.Label label12; - private System.Windows.Forms.Label label13; - private System.Windows.Forms.Label label14; - private System.Windows.Forms.Label label15; - private System.Windows.Forms.Label label16; - private System.Windows.Forms.Label label17; - private System.Windows.Forms.Label label18; - private System.Windows.Forms.Label label19; + private BizHawk.WinForms.Controls.LocLabelEx label12; + private BizHawk.WinForms.Controls.LocLabelEx label13; + private BizHawk.WinForms.Controls.LocLabelEx label14; + private BizHawk.WinForms.Controls.LocLabelEx label15; + private BizHawk.WinForms.Controls.LocLabelEx label16; + private BizHawk.WinForms.Controls.LocLabelEx label17; + private BizHawk.WinForms.Controls.LocLabelEx label18; + private BizHawk.WinForms.Controls.LocLabelEx label19; private System.Windows.Forms.Button Neg1Button; private System.Windows.Forms.Button SinButton; private System.Windows.Forms.Button CosButton; private System.Windows.Forms.Button TanButton; private System.Windows.Forms.Button ExpButton; - private System.Windows.Forms.Label label20; - private System.Windows.Forms.Label label21; - private System.Windows.Forms.Label label22; - private System.Windows.Forms.Label label23; - private System.Windows.Forms.Label label24; - private System.Windows.Forms.Label label25; - private System.Windows.Forms.Label label26; - private System.Windows.Forms.Label label27; - private System.Windows.Forms.Label label28; - private System.Windows.Forms.Label label29; - private System.Windows.Forms.Label label30; - private System.Windows.Forms.Label label31; - private System.Windows.Forms.Label label32; - private System.Windows.Forms.Label label33; - private System.Windows.Forms.Label label34; - private System.Windows.Forms.Label label35; + private BizHawk.WinForms.Controls.LocLabelEx label20; + private BizHawk.WinForms.Controls.LocLabelEx label21; + private BizHawk.WinForms.Controls.LocLabelEx label22; + private BizHawk.WinForms.Controls.LocLabelEx label23; + private BizHawk.WinForms.Controls.LocLabelEx label24; + private BizHawk.WinForms.Controls.LocLabelEx label25; + private BizHawk.WinForms.Controls.LocLabelEx label26; + private BizHawk.WinForms.Controls.LocLabelEx label27; + private BizHawk.WinForms.Controls.LocLabelEx label28; + private BizHawk.WinForms.Controls.LocLabelEx label29; + private BizHawk.WinForms.Controls.LocLabelEx label30; + private BizHawk.WinForms.Controls.LocLabelEx label31; + private BizHawk.WinForms.Controls.LocLabelEx label32; + private BizHawk.WinForms.Controls.LocLabelEx label33; + private BizHawk.WinForms.Controls.LocLabelEx label34; + private BizHawk.WinForms.Controls.LocLabelEx label35; private System.Windows.Forms.Button DivideButton; private System.Windows.Forms.Button ParaCloseButton; private System.Windows.Forms.Button ParaOpenButton; private System.Windows.Forms.Button CommaButton; private System.Windows.Forms.Button SquaredButton; - private System.Windows.Forms.Label label36; - private System.Windows.Forms.Label label37; - private System.Windows.Forms.Label label38; - private System.Windows.Forms.Label label39; - private System.Windows.Forms.Label label40; - private System.Windows.Forms.Label label41; - private System.Windows.Forms.Label label42; - private System.Windows.Forms.Label label43; - private System.Windows.Forms.Label label44; - private System.Windows.Forms.Label label45; + private BizHawk.WinForms.Controls.LocLabelEx label36; + private BizHawk.WinForms.Controls.LocLabelEx label37; + private BizHawk.WinForms.Controls.LocLabelEx label38; + private BizHawk.WinForms.Controls.LocLabelEx label39; + private BizHawk.WinForms.Controls.LocLabelEx label40; + private BizHawk.WinForms.Controls.LocLabelEx label41; + private BizHawk.WinForms.Controls.LocLabelEx label42; + private BizHawk.WinForms.Controls.LocLabelEx label43; + private BizHawk.WinForms.Controls.LocLabelEx label44; + private BizHawk.WinForms.Controls.LocLabelEx label45; private System.Windows.Forms.Button MultiplyButton; private System.Windows.Forms.Button NineButton; private System.Windows.Forms.Button EightButton; private System.Windows.Forms.Button SevenButton; private System.Windows.Forms.Button LogButton; - private System.Windows.Forms.Label label46; - private System.Windows.Forms.Label label47; - private System.Windows.Forms.Label label48; - private System.Windows.Forms.Label label49; - private System.Windows.Forms.Label label50; - private System.Windows.Forms.Label label51; - private System.Windows.Forms.Label label52; - private System.Windows.Forms.Label label53; - private System.Windows.Forms.Label label54; - private System.Windows.Forms.Label label55; + private BizHawk.WinForms.Controls.LocLabelEx label46; + private BizHawk.WinForms.Controls.LocLabelEx label47; + private BizHawk.WinForms.Controls.LocLabelEx label48; + private BizHawk.WinForms.Controls.LocLabelEx label49; + private BizHawk.WinForms.Controls.LocLabelEx label50; + private BizHawk.WinForms.Controls.LocLabelEx label51; + private BizHawk.WinForms.Controls.LocLabelEx label52; + private BizHawk.WinForms.Controls.LocLabelEx label53; + private BizHawk.WinForms.Controls.LocLabelEx label54; + private BizHawk.WinForms.Controls.LocLabelEx label55; private System.Windows.Forms.Button MinusButton; private System.Windows.Forms.Button SixButton; private System.Windows.Forms.Button FiveButton; private System.Windows.Forms.Button FourButton; private System.Windows.Forms.Button LnButton; - private System.Windows.Forms.Label label56; - private System.Windows.Forms.Label label57; - private System.Windows.Forms.Label label58; - private System.Windows.Forms.Label label59; - private System.Windows.Forms.Label label60; - private System.Windows.Forms.Label label61; - private System.Windows.Forms.Label label62; - private System.Windows.Forms.Label label63; - private System.Windows.Forms.Label label64; - private System.Windows.Forms.Label label65; + private BizHawk.WinForms.Controls.LocLabelEx label56; + private BizHawk.WinForms.Controls.LocLabelEx label57; + private BizHawk.WinForms.Controls.LocLabelEx label58; + private BizHawk.WinForms.Controls.LocLabelEx label59; + private BizHawk.WinForms.Controls.LocLabelEx label60; + private BizHawk.WinForms.Controls.LocLabelEx label61; + private BizHawk.WinForms.Controls.LocLabelEx label62; + private BizHawk.WinForms.Controls.LocLabelEx label63; + private BizHawk.WinForms.Controls.LocLabelEx label64; + private BizHawk.WinForms.Controls.LocLabelEx label65; private System.Windows.Forms.Button PlusButton; private System.Windows.Forms.Button ThreeButton; private System.Windows.Forms.Button TwoButton; private System.Windows.Forms.Button OneButton; private System.Windows.Forms.Button StoButton; - private System.Windows.Forms.Label label66; - private System.Windows.Forms.Label label67; - private System.Windows.Forms.Label label68; - private System.Windows.Forms.Label label69; - private System.Windows.Forms.Label label70; - private System.Windows.Forms.Label label71; - private System.Windows.Forms.Label label72; - private System.Windows.Forms.Label label73; - private System.Windows.Forms.Label label74; - private System.Windows.Forms.Label label75; + private BizHawk.WinForms.Controls.LocLabelEx label66; + private BizHawk.WinForms.Controls.LocLabelEx label67; + private BizHawk.WinForms.Controls.LocLabelEx label68; + private BizHawk.WinForms.Controls.LocLabelEx label69; + private BizHawk.WinForms.Controls.LocLabelEx label70; + private BizHawk.WinForms.Controls.LocLabelEx label71; + private BizHawk.WinForms.Controls.LocLabelEx label72; + private BizHawk.WinForms.Controls.LocLabelEx label73; + private BizHawk.WinForms.Controls.LocLabelEx label74; + private BizHawk.WinForms.Controls.LocLabelEx label75; private System.Windows.Forms.Button EnterButton; private System.Windows.Forms.Button DashButton; private System.Windows.Forms.Button PeriodButton; private System.Windows.Forms.Button ZeroButton; private System.Windows.Forms.Button OnButton; - private System.Windows.Forms.Label label76; + private BizHawk.WinForms.Controls.LocLabelEx label76; private System.Windows.Forms.Button LeftButton; private System.Windows.Forms.Button RightButton; private System.Windows.Forms.Button DownButton; private System.Windows.Forms.Button UpButton; private System.Windows.Forms.ToolTip KeyPadToolTips; private System.Windows.Forms.ToolStripMenuItem ShowHotkeysMenuItem; - private System.Windows.Forms.Label label77; - private System.Windows.Forms.Label label78; - private System.Windows.Forms.Label label79; - private System.Windows.Forms.Label label80; - private System.Windows.Forms.Label label81; + private BizHawk.WinForms.Controls.LocLabelEx label77; + private BizHawk.WinForms.Controls.LocLabelEx label78; + private BizHawk.WinForms.Controls.LocLabelEx label79; + private BizHawk.WinForms.Controls.LocLabelEx label80; + private BizHawk.WinForms.Controls.LocLabelEx label81; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.Designer.cs index a5c6bc8341..8a0247d786 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.Designer.cs @@ -29,8 +29,8 @@ private void InitializeComponent() { this.AnalogTrackBar = new System.Windows.Forms.TrackBar(); - this.DisplayNameLabel = new System.Windows.Forms.Label(); - this.ValueLabel = new System.Windows.Forms.Label(); + this.DisplayNameLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.ValueLabel = new BizHawk.WinForms.Controls.LocLabelEx(); ((System.ComponentModel.ISupportInitialize)(this.AnalogTrackBar)).BeginInit(); this.SuspendLayout(); // @@ -47,21 +47,15 @@ // DisplayNameLabel // this.DisplayNameLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.DisplayNameLabel.AutoSize = true; this.DisplayNameLabel.Location = new System.Drawing.Point(6, 51); this.DisplayNameLabel.Name = "DisplayNameLabel"; - this.DisplayNameLabel.Size = new System.Drawing.Size(33, 13); - this.DisplayNameLabel.TabIndex = 1; this.DisplayNameLabel.Text = "Slider"; // // ValueLabel // this.ValueLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.ValueLabel.AutoSize = true; this.ValueLabel.Location = new System.Drawing.Point(257, 51); this.ValueLabel.Name = "ValueLabel"; - this.ValueLabel.Size = new System.Drawing.Size(37, 13); - this.ValueLabel.TabIndex = 2; this.ValueLabel.Text = "99999"; // // VirtualPadAnalogButton @@ -83,7 +77,7 @@ #endregion private System.Windows.Forms.TrackBar AnalogTrackBar; - private System.Windows.Forms.Label DisplayNameLabel; - private System.Windows.Forms.Label ValueLabel; + private BizHawk.WinForms.Controls.LocLabelEx DisplayNameLabel; + private BizHawk.WinForms.Controls.LocLabelEx ValueLabel; } } diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogStick.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogStick.Designer.cs index 88006ea0fc..b5ac44cf6c 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogStick.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogStick.Designer.cs @@ -28,17 +28,17 @@ /// private void InitializeComponent() { - this.XLabel = new System.Windows.Forms.Label(); + this.XLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.ManualX = new System.Windows.Forms.NumericUpDown(); - this.YLabel = new System.Windows.Forms.Label(); + this.YLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.ManualY = new System.Windows.Forms.NumericUpDown(); - this.MaxLabel = new System.Windows.Forms.Label(); + this.MaxLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.MaxXNumeric = new System.Windows.Forms.NumericUpDown(); this.MaxYNumeric = new System.Windows.Forms.NumericUpDown(); - this.rLabel = new System.Windows.Forms.Label(); + this.rLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.manualR = new System.Windows.Forms.NumericUpDown(); this.manualTheta = new System.Windows.Forms.NumericUpDown(); - this.thetaLabel = new System.Windows.Forms.Label(); + this.thetaLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.AnalogStick = new BizHawk.Client.EmuHawk.AnalogStickPanel(); ((System.ComponentModel.ISupportInitialize)(this.ManualX)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ManualY)).BeginInit(); @@ -51,11 +51,8 @@ // XLabel // this.XLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.XLabel.AutoSize = true; this.XLabel.Location = new System.Drawing.Point(187, 7); this.XLabel.Name = "XLabel"; - this.XLabel.Size = new System.Drawing.Size(14, 13); - this.XLabel.TabIndex = 23; this.XLabel.Text = "X"; // // ManualX @@ -70,11 +67,8 @@ // YLabel // this.YLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.YLabel.AutoSize = true; this.YLabel.Location = new System.Drawing.Point(187, 33); this.YLabel.Name = "YLabel"; - this.YLabel.Size = new System.Drawing.Size(14, 13); - this.YLabel.TabIndex = 26; this.YLabel.Text = "Y"; // // ManualY @@ -90,11 +84,8 @@ // MaxLabel // this.MaxLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.MaxLabel.AutoSize = true; this.MaxLabel.Location = new System.Drawing.Point(205, 107); this.MaxLabel.Name = "MaxLabel"; - this.MaxLabel.Size = new System.Drawing.Size(47, 13); - this.MaxLabel.TabIndex = 27; this.MaxLabel.Text = "Range%"; // // MaxXNumeric @@ -121,11 +112,8 @@ // rLabel // this.rLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.rLabel.AutoSize = true; this.rLabel.Location = new System.Drawing.Point(167, 60); this.rLabel.Name = "rLabel"; - this.rLabel.Size = new System.Drawing.Size(26, 13); - this.rLabel.TabIndex = 30; this.rLabel.Text = "Ray"; // // manualR @@ -149,11 +137,8 @@ // thetaLabel // this.thetaLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.thetaLabel.AutoSize = true; this.thetaLabel.Location = new System.Drawing.Point(167, 86); this.thetaLabel.Name = "thetaLabel"; - this.thetaLabel.Size = new System.Drawing.Size(20, 13); - this.thetaLabel.TabIndex = 32; this.thetaLabel.Text = "θ (°)"; // // AnalogStick @@ -204,16 +189,16 @@ #endregion private AnalogStickPanel AnalogStick; - private System.Windows.Forms.Label XLabel; + private BizHawk.WinForms.Controls.LocLabelEx XLabel; private System.Windows.Forms.NumericUpDown ManualX; - private System.Windows.Forms.Label YLabel; + private BizHawk.WinForms.Controls.LocLabelEx YLabel; private System.Windows.Forms.NumericUpDown ManualY; - private System.Windows.Forms.Label MaxLabel; + private BizHawk.WinForms.Controls.LocLabelEx MaxLabel; private System.Windows.Forms.NumericUpDown MaxXNumeric; private System.Windows.Forms.NumericUpDown MaxYNumeric; - private System.Windows.Forms.Label rLabel; + private BizHawk.WinForms.Controls.LocLabelEx rLabel; private System.Windows.Forms.NumericUpDown manualR; private System.Windows.Forms.NumericUpDown manualTheta; - private System.Windows.Forms.Label thetaLabel; + private BizHawk.WinForms.Controls.LocLabelEx thetaLabel; } } diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.Designer.cs index ca4a99c50b..9052002f5f 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.Designer.cs @@ -32,10 +32,10 @@ this.lvDiscs = new System.Windows.Forms.ListView(); this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.btnClose = new BizHawk.Client.EmuHawk.VirtualPadButton(); this.btnOpen = new BizHawk.Client.EmuHawk.VirtualPadButton(); - this.lblTimeZero = new System.Windows.Forms.Label(); + this.lblTimeZero = new BizHawk.WinForms.Controls.LocLabelEx(); this.groupBox1.SuspendLayout(); this.SuspendLayout(); // @@ -83,11 +83,8 @@ // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(6, 11); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(34, 13); - this.label1.TabIndex = 3; this.label1.Text = "Tray :"; // // btnClose @@ -122,11 +119,8 @@ // // lblTimeZero // - this.lblTimeZero.AutoSize = true; this.lblTimeZero.Location = new System.Drawing.Point(142, 11); this.lblTimeZero.Name = "lblTimeZero"; - this.lblTimeZero.Size = new System.Drawing.Size(135, 13); - this.lblTimeZero.TabIndex = 4; this.lblTimeZero.Text = "(T=0: Freely set initial state)"; // // VirtualPadDiscManager @@ -155,7 +149,7 @@ private System.Windows.Forms.ColumnHeader columnHeader1; private System.Windows.Forms.ColumnHeader columnHeader2; private VirtualPadButton btnClose; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label lblTimeZero; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx lblTimeZero; } } diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadTargetScreen.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadTargetScreen.Designer.cs index acfe845d79..a811a60be5 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadTargetScreen.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadTargetScreen.Designer.cs @@ -30,8 +30,8 @@ { this.TargetPanel = new System.Windows.Forms.Panel(); this.XNumeric = new System.Windows.Forms.NumericUpDown(); - this.XLabel = new System.Windows.Forms.Label(); - this.YLabel = new System.Windows.Forms.Label(); + this.XLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.YLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.YNumeric = new System.Windows.Forms.NumericUpDown(); ((System.ComponentModel.ISupportInitialize)(this.XNumeric)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.YNumeric)).BeginInit(); @@ -62,21 +62,15 @@ // XLabel // this.XLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.XLabel.AutoSize = true; this.XLabel.Location = new System.Drawing.Point(3, 233); this.XLabel.Name = "XLabel"; - this.XLabel.Size = new System.Drawing.Size(14, 13); - this.XLabel.TabIndex = 2; this.XLabel.Text = "X"; // // YLabel // this.YLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.YLabel.AutoSize = true; this.YLabel.Location = new System.Drawing.Point(91, 233); this.YLabel.Name = "YLabel"; - this.YLabel.Size = new System.Drawing.Size(14, 13); - this.YLabel.TabIndex = 4; this.YLabel.Text = "Y"; // // YNumeric @@ -112,8 +106,8 @@ private System.Windows.Forms.Panel TargetPanel; private System.Windows.Forms.NumericUpDown XNumeric; - private System.Windows.Forms.Label XLabel; - private System.Windows.Forms.Label YLabel; + private BizHawk.WinForms.Controls.LocLabelEx XLabel; + private BizHawk.WinForms.Controls.LocLabelEx YLabel; private System.Windows.Forms.NumericUpDown YNumeric; } } diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.Designer.cs index c58d36dcd9..3f25256245 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.Designer.cs @@ -28,31 +28,28 @@ namespace BizHawk.Client.EmuHawk /// private void InitializeComponent() { - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.OK = new System.Windows.Forms.Button(); this.Cancel = new System.Windows.Forms.Button(); - this.OutputLabel = new System.Windows.Forms.Label(); - this.ValeLabel = new System.Windows.Forms.Label(); + this.OutputLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.ValeLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.ValueBox = new BizHawk.Client.EmuHawk.WatchValueBox(); - this.ValueHexLabel = new System.Windows.Forms.Label(); - this.DisplayTypeLabel = new System.Windows.Forms.Label(); - this.SizeLabel = new System.Windows.Forms.Label(); - this.BigEndianLabel = new System.Windows.Forms.Label(); + this.ValueHexLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.DisplayTypeLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.SizeLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.BigEndianLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.AddressBox = new BizHawk.Client.EmuHawk.HexTextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.DomainLabel = new System.Windows.Forms.Label(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label5 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.DomainLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.SuspendLayout(); // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(20, 33); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(62, 13); - this.label1.TabIndex = 0; this.label1.Text = "Address: 0x"; // // OK @@ -80,20 +77,14 @@ namespace BizHawk.Client.EmuHawk // // OutputLabel // - this.OutputLabel.AutoSize = true; this.OutputLabel.Location = new System.Drawing.Point(12, 7); this.OutputLabel.Name = "OutputLabel"; - this.OutputLabel.Size = new System.Drawing.Size(129, 13); - this.OutputLabel.TabIndex = 9; this.OutputLabel.Text = "Enter an address to poke:"; // // ValeLabel // - this.ValeLabel.AutoSize = true; this.ValeLabel.Location = new System.Drawing.Point(31, 59); this.ValeLabel.Name = "ValeLabel"; - this.ValeLabel.Size = new System.Drawing.Size(37, 13); - this.ValeLabel.TabIndex = 10; this.ValeLabel.Text = "Value:"; // // ValueBox @@ -111,38 +102,26 @@ namespace BizHawk.Client.EmuHawk // // ValueHexLabel // - this.ValueHexLabel.AutoSize = true; this.ValueHexLabel.Location = new System.Drawing.Point(64, 60); this.ValueHexLabel.Name = "ValueHexLabel"; - this.ValueHexLabel.Size = new System.Drawing.Size(18, 13); - this.ValueHexLabel.TabIndex = 11; this.ValueHexLabel.Text = "0x"; // // DisplayTypeLabel // - this.DisplayTypeLabel.AutoSize = true; this.DisplayTypeLabel.Location = new System.Drawing.Point(81, 118); this.DisplayTypeLabel.Name = "DisplayTypeLabel"; - this.DisplayTypeLabel.Size = new System.Drawing.Size(52, 13); - this.DisplayTypeLabel.TabIndex = 24; this.DisplayTypeLabel.Text = "Unsigned"; // // SizeLabel // - this.SizeLabel.AutoSize = true; this.SizeLabel.Location = new System.Drawing.Point(82, 101); this.SizeLabel.Name = "SizeLabel"; - this.SizeLabel.Size = new System.Drawing.Size(28, 13); - this.SizeLabel.TabIndex = 23; this.SizeLabel.Text = "Byte"; // // BigEndianLabel // - this.BigEndianLabel.AutoSize = true; this.BigEndianLabel.Location = new System.Drawing.Point(82, 135); this.BigEndianLabel.Name = "BigEndianLabel"; - this.BigEndianLabel.Size = new System.Drawing.Size(58, 13); - this.BigEndianLabel.TabIndex = 41; this.BigEndianLabel.Text = "Big Endian"; // // AddressBox @@ -159,47 +138,32 @@ namespace BizHawk.Client.EmuHawk // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(39, 135); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(43, 13); - this.label2.TabIndex = 44; this.label2.Text = "Endian:"; // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(11, 118); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(71, 13); - this.label3.TabIndex = 43; this.label3.Text = "Display Type:"; // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(52, 101); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(30, 13); - this.label4.TabIndex = 42; this.label4.Text = "Size:"; // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(36, 84); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(46, 13); - this.label5.TabIndex = 46; this.label5.Text = "Domain:"; // // DomainLabel // - this.DomainLabel.AutoSize = true; this.DomainLabel.Location = new System.Drawing.Point(82, 84); this.DomainLabel.Name = "DomainLabel"; - this.DomainLabel.Size = new System.Drawing.Size(70, 13); - this.DomainLabel.TabIndex = 45; this.DomainLabel.Text = "Main Memory"; // // RamPoke @@ -239,21 +203,21 @@ namespace BizHawk.Client.EmuHawk #endregion - private System.Windows.Forms.Label label1; + private BizHawk.WinForms.Controls.LocLabelEx label1; private HexTextBox AddressBox; private System.Windows.Forms.Button OK; private System.Windows.Forms.Button Cancel; - private System.Windows.Forms.Label OutputLabel; - private System.Windows.Forms.Label ValeLabel; + private BizHawk.WinForms.Controls.LocLabelEx OutputLabel; + private BizHawk.WinForms.Controls.LocLabelEx ValeLabel; private WatchValueBox ValueBox; - private System.Windows.Forms.Label ValueHexLabel; - private System.Windows.Forms.Label DisplayTypeLabel; - private System.Windows.Forms.Label SizeLabel; - private System.Windows.Forms.Label BigEndianLabel; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label DomainLabel; + private BizHawk.WinForms.Controls.LocLabelEx ValueHexLabel; + private BizHawk.WinForms.Controls.LocLabelEx DisplayTypeLabel; + private BizHawk.WinForms.Controls.LocLabelEx SizeLabel; + private BizHawk.WinForms.Controls.LocLabelEx BigEndianLabel; + private BizHawk.WinForms.Controls.LocLabelEx label2; + private BizHawk.WinForms.Controls.LocLabelEx label3; + private BizHawk.WinForms.Controls.LocLabelEx label4; + private BizHawk.WinForms.Controls.LocLabelEx label5; + private BizHawk.WinForms.Controls.LocLabelEx DomainLabel; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs index cf94cc27c0..ec478f9e1f 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs @@ -29,7 +29,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - this.TotalSearchLabel = new System.Windows.Forms.Label(); + this.TotalSearchLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.WatchListView = new InputRoll(); this.ListViewContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.DoSearchContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -104,8 +104,8 @@ this.FloatingWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.RestoreDefaultsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.MemDomainLabel = new System.Windows.Forms.Label(); - this.MessageLabel = new System.Windows.Forms.Label(); + this.MemDomainLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.MessageLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.AutoSearchCheckBox = new System.Windows.Forms.CheckBox(); this.CompareToBox = new System.Windows.Forms.GroupBox(); @@ -147,8 +147,8 @@ this.LessThanRadio = new System.Windows.Forms.RadioButton(); this.SearchButton = new System.Windows.Forms.Button(); this.SizeDropdown = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.DisplayTypeDropdown = new System.Windows.Forms.ComboBox(); this.SearchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ListViewContextMenu.SuspendLayout(); @@ -167,11 +167,8 @@ // // TotalSearchLabel // - this.TotalSearchLabel.AutoSize = true; this.TotalSearchLabel.Location = new System.Drawing.Point(12, 49); this.TotalSearchLabel.Name = "TotalSearchLabel"; - this.TotalSearchLabel.Size = new System.Drawing.Size(64, 13); - this.TotalSearchLabel.TabIndex = 2; this.TotalSearchLabel.Text = "0 addresses"; // // WatchListView @@ -787,21 +784,15 @@ // // MemDomainLabel // - this.MemDomainLabel.AutoSize = true; this.MemDomainLabel.Location = new System.Drawing.Point(135, 49); this.MemDomainLabel.Name = "MemDomainLabel"; - this.MemDomainLabel.Size = new System.Drawing.Size(70, 13); - this.MemDomainLabel.TabIndex = 8; this.MemDomainLabel.Text = "Main Memory"; // // MessageLabel // this.MessageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.MessageLabel.AutoSize = true; this.MessageLabel.Location = new System.Drawing.Point(9, 434); this.MessageLabel.Name = "MessageLabel"; - this.MessageLabel.Size = new System.Drawing.Size(106, 13); - this.MessageLabel.TabIndex = 9; this.MessageLabel.Text = " todo "; // // AutoSearchCheckBox @@ -1266,21 +1257,15 @@ // label1 // this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(244, 358); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(27, 13); - this.label1.TabIndex = 97; this.label1.Text = "Size"; // // label2 // this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(327, 358); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(41, 13); - this.label2.TabIndex = 99; this.label2.Text = "Display"; // // DisplayTypeDropdown @@ -1343,7 +1328,7 @@ #endregion - private System.Windows.Forms.Label TotalSearchLabel; + private BizHawk.WinForms.Controls.LocLabelEx TotalSearchLabel; private System.Windows.Forms.ToolStripMenuItem SearchMenuItem; private InputRoll WatchListView; private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; @@ -1354,8 +1339,8 @@ private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem RestoreDefaultsMenuItem; private System.Windows.Forms.ToolStripMenuItem SaveWinPositionMenuItem; - private System.Windows.Forms.Label MemDomainLabel; - private System.Windows.Forms.Label MessageLabel; + private BizHawk.WinForms.Controls.LocLabelEx MemDomainLabel; + private BizHawk.WinForms.Controls.LocLabelEx MessageLabel; private System.Windows.Forms.ToolStripMenuItem RecentSubMenu; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripMenuItem AppendFileMenuItem; @@ -1457,8 +1442,8 @@ private System.Windows.Forms.ToolStripSeparator RebootToolBarSeparator; private System.Windows.Forms.ToolStripButton RebootToolbarButton; private System.Windows.Forms.ComboBox SizeDropdown; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label2; private System.Windows.Forms.ComboBox DisplayTypeDropdown; private System.Windows.Forms.ToolStripMenuItem GoToAddressMenuItem; private System.Windows.Forms.ToolStripMenuItem FloatingWindowMenuItem; diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.Designer.cs index b75ff78e0f..7e3a1603ac 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.Designer.cs @@ -28,37 +28,31 @@ /// private void InitializeComponent() { - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); + this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); this.AddressBox = new BizHawk.Client.EmuHawk.HexTextBox(); this.NotesBox = new System.Windows.Forms.TextBox(); this.OK = new System.Windows.Forms.Button(); this.Cancel = new System.Windows.Forms.Button(); - this.label6 = new System.Windows.Forms.Label(); + this.label6 = new BizHawk.WinForms.Controls.LocLabelEx(); this.DomainDropDown = new System.Windows.Forms.ComboBox(); - this.label3 = new System.Windows.Forms.Label(); + this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); this.SizeDropDown = new System.Windows.Forms.ComboBox(); - this.DisplayTypeLael = new System.Windows.Forms.Label(); + this.DisplayTypeLael = new BizHawk.WinForms.Controls.LocLabelEx(); this.DisplayTypeDropDown = new System.Windows.Forms.ComboBox(); this.BigEndianCheckBox = new System.Windows.Forms.CheckBox(); this.SuspendLayout(); // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(9, 9); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(62, 13); - this.label1.TabIndex = 0; this.label1.Text = "Address: 0x"; // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(9, 35); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(38, 13); - this.label2.TabIndex = 1; this.label2.Text = "Notes:"; // // AddressBox @@ -105,11 +99,8 @@ // // label6 // - this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(11, 214); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(83, 13); - this.label6.TabIndex = 15; this.label6.Text = "Memory Domain"; // // DomainDropDown @@ -124,11 +115,8 @@ // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(9, 64); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(27, 13); - this.label3.TabIndex = 17; this.label3.Text = "Size"; // // SizeDropDown @@ -147,11 +135,8 @@ // // DisplayTypeLael // - this.DisplayTypeLael.AutoSize = true; this.DisplayTypeLael.Location = new System.Drawing.Point(11, 106); this.DisplayTypeLael.Name = "DisplayTypeLael"; - this.DisplayTypeLael.Size = new System.Drawing.Size(68, 13); - this.DisplayTypeLael.TabIndex = 19; this.DisplayTypeLael.Text = "Display Type"; // // DisplayTypeDropDown @@ -212,17 +197,17 @@ #endregion - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; + private BizHawk.WinForms.Controls.LocLabelEx label1; + private BizHawk.WinForms.Controls.LocLabelEx label2; private HexTextBox AddressBox; private System.Windows.Forms.TextBox NotesBox; private System.Windows.Forms.Button OK; private System.Windows.Forms.Button Cancel; - private System.Windows.Forms.Label label6; + private BizHawk.WinForms.Controls.LocLabelEx label6; private System.Windows.Forms.ComboBox DomainDropDown; - private System.Windows.Forms.Label label3; + private BizHawk.WinForms.Controls.LocLabelEx label3; private System.Windows.Forms.ComboBox SizeDropDown; - private System.Windows.Forms.Label DisplayTypeLael; + private BizHawk.WinForms.Controls.LocLabelEx DisplayTypeLael; private System.Windows.Forms.ComboBox DisplayTypeDropDown; private System.Windows.Forms.CheckBox BigEndianCheckBox; }