diff --git a/BizHawk.Client.EmuHawk/config/AutofireConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/AutofireConfig.Designer.cs index 4954e729ae..dcd0b6f341 100644 --- a/BizHawk.Client.EmuHawk/config/AutofireConfig.Designer.cs +++ b/BizHawk.Client.EmuHawk/config/AutofireConfig.Designer.cs @@ -32,13 +32,18 @@ this.Cancel = new System.Windows.Forms.Button(); this.OnNumeric = new System.Windows.Forms.NumericUpDown(); this.OffNumeric = new System.Windows.Forms.NumericUpDown(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label1 = new BizHawk.Client.EmuHawk.CustomControls.AutosizedLabel(); + this.label2 = new BizHawk.Client.EmuHawk.CustomControls.AutosizedLabel(); + this.flpButtons = new BizHawk.Client.EmuHawk.CustomControls.SingleRowFLP(); + this.flpMain = new BizHawk.Client.EmuHawk.CustomControls.SingleColumnFLP(); + this.flpPattern = new BizHawk.Client.EmuHawk.CustomControls.SingleRowFLP(); + this.lblPattern = new BizHawk.Client.EmuHawk.CustomControls.AutosizedLabel(); this.LagFrameCheck = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.OnNumeric)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.OffNumeric)).BeginInit(); - this.groupBox1.SuspendLayout(); + this.flpButtons.SuspendLayout(); + this.flpMain.SuspendLayout(); + this.flpPattern.SuspendLayout(); this.SuspendLayout(); // // Ok @@ -78,7 +83,7 @@ 0, 0}); this.OnNumeric.Name = "OnNumeric"; - this.OnNumeric.Size = new System.Drawing.Size(74, 20); + this.OnNumeric.Size = new System.Drawing.Size(48, 19); this.OnNumeric.TabIndex = 2; this.OnNumeric.Value = new decimal(new int[] { 1, @@ -100,7 +105,7 @@ 0, 0}); this.OffNumeric.Name = "OffNumeric"; - this.OffNumeric.Size = new System.Drawing.Size(74, 20); + this.OffNumeric.Size = new System.Drawing.Size(48, 19); this.OffNumeric.TabIndex = 3; this.OffNumeric.Value = new decimal(new int[] { 1, @@ -115,7 +120,7 @@ this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(21, 13); this.label1.TabIndex = 4; - this.label1.Text = "On"; + this.label1.Text = "on,"; // // label2 // @@ -124,26 +129,65 @@ this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(21, 13); this.label2.TabIndex = 5; - this.label2.Text = "Off"; + this.label2.Text = "off"; // - // groupBox1 + // flpButtons // - this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Controls.Add(this.label2); - this.groupBox1.Controls.Add(this.OnNumeric); - this.groupBox1.Controls.Add(this.OffNumeric); - this.groupBox1.Location = new System.Drawing.Point(13, 12); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(184, 70); - this.groupBox1.TabIndex = 6; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Autofire Pattern"; + this.flpButtons.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.flpButtons.AutoSize = true; + this.flpButtons.Controls.Add(this.Ok); + this.flpButtons.Controls.Add(this.Cancel); + this.flpButtons.Location = new System.Drawing.Point(55, 61); + this.flpButtons.Name = "flpButtons"; + this.flpButtons.Size = new System.Drawing.Size(162, 29); + this.flpButtons.TabIndex = 11; + this.flpButtons.WrapContents = false; + // + // flpMain + // + this.flpMain.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.flpMain.AutoSize = false; + this.flpMain.Controls.Add(this.flpPattern); + this.flpMain.Controls.Add(this.LagFrameCheck); + this.flpMain.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; + this.flpMain.Location = new System.Drawing.Point(0, 0); + this.flpMain.Name = "flpMain"; + this.flpMain.Size = new System.Drawing.Size(217, 55); + this.flpMain.TabIndex = 10; + this.flpMain.WrapContents = false; + // + // flpPattern + // + this.flpPattern.AutoSize = true; + this.flpPattern.Controls.Add(this.lblPattern); + this.flpPattern.Controls.Add(this.OnNumeric); + this.flpPattern.Controls.Add(this.label1); + this.flpPattern.Controls.Add(this.OffNumeric); + this.flpPattern.Controls.Add(this.label2); + this.flpPattern.Location = new System.Drawing.Point(3, 3); + this.flpPattern.Name = "flpPattern"; + this.flpPattern.Size = new System.Drawing.Size(211, 26); + this.flpPattern.TabIndex = 9; + this.flpPattern.WrapContents = false; + // + // lblPattern + // + this.lblPattern.Anchor = System.Windows.Forms.AnchorStyles.None; + this.lblPattern.AutoSize = true; + this.lblPattern.Location = new System.Drawing.Point(3, 6); + this.lblPattern.Name = "lblPattern"; + this.lblPattern.Size = new System.Drawing.Size(44, 13); + this.lblPattern.TabIndex = 12; + this.lblPattern.Text = "Pattern:"; // // LagFrameCheck // this.LagFrameCheck.AutoSize = true; this.LagFrameCheck.Location = new System.Drawing.Point(13, 100); this.LagFrameCheck.Name = "LagFrameCheck"; + this.LagFrameCheck.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); this.LagFrameCheck.Size = new System.Drawing.Size(164, 17); this.LagFrameCheck.TabIndex = 8; this.LagFrameCheck.Text = "Take lag frames into account"; @@ -155,23 +199,23 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.Cancel; - this.ClientSize = new System.Drawing.Size(276, 175); - this.Controls.Add(this.LagFrameCheck); - this.Controls.Add(this.groupBox1); - this.Controls.Add(this.Cancel); - this.Controls.Add(this.Ok); + this.ClientSize = new System.Drawing.Size(217, 90); + this.Controls.Add(this.flpMain); + this.Controls.Add(this.flpButtons); this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.Lightning_MultiSize; this.MaximizeBox = false; - this.MaximumSize = new System.Drawing.Size(512, 512); - this.MinimumSize = new System.Drawing.Size(218, 179); + this.MinimumSize = new System.Drawing.Size(233, 129); this.Name = "AutofireConfig"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Autofire Configuration"; this.Load += new System.EventHandler(this.AutofireConfig_Load); ((System.ComponentModel.ISupportInitialize)(this.OnNumeric)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.OffNumeric)).EndInit(); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); + this.flpButtons.ResumeLayout(false); + this.flpMain.ResumeLayout(false); + this.flpMain.PerformLayout(); + this.flpPattern.ResumeLayout(false); + this.flpPattern.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -182,10 +226,13 @@ private System.Windows.Forms.Button Ok; private System.Windows.Forms.Button Cancel; private System.Windows.Forms.NumericUpDown OffNumeric; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.GroupBox groupBox1; + private CustomControls.AutosizedLabel label1; + private CustomControls.AutosizedLabel label2; + private CustomControls.SingleRowFLP flpPattern; + private CustomControls.SingleColumnFLP flpMain; + private CustomControls.SingleRowFLP flpButtons; + private CustomControls.AutosizedLabel lblPattern; public System.Windows.Forms.NumericUpDown OnNumeric; private System.Windows.Forms.CheckBox LagFrameCheck; } -} \ No newline at end of file +}