diff --git a/BizHawk.MultiClient/AVOut/FFmpegWriterForm.Designer.cs b/BizHawk.MultiClient/AVOut/FFmpegWriterForm.Designer.cs index 73ebd175a4..0ee80ae265 100644 --- a/BizHawk.MultiClient/AVOut/FFmpegWriterForm.Designer.cs +++ b/BizHawk.MultiClient/AVOut/FFmpegWriterForm.Designer.cs @@ -50,9 +50,9 @@ // // listBox1 // - this.listBox1.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.listBox1.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.listBox1.FormattingEnabled = true; this.listBox1.Location = new System.Drawing.Point(5, 23); this.listBox1.Name = "listBox1"; @@ -92,8 +92,8 @@ // // textBox1 // - this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.textBox1.Location = new System.Drawing.Point(8, 273); this.textBox1.Name = "textBox1"; this.textBox1.ReadOnly = true; @@ -150,6 +150,7 @@ this.Controls.Add(this.label1); this.MinimumSize = new System.Drawing.Size(300, 360); this.Name = "FFmpegWriterForm"; + this.ShowIcon = false; this.Text = "Choose Video Format"; this.ResumeLayout(false); this.PerformLayout(); diff --git a/BizHawk.MultiClient/AVOut/GifWriterForm.Designer.cs b/BizHawk.MultiClient/AVOut/GifWriterForm.Designer.cs index cfd8602d93..30b56d7914 100644 --- a/BizHawk.MultiClient/AVOut/GifWriterForm.Designer.cs +++ b/BizHawk.MultiClient/AVOut/GifWriterForm.Designer.cs @@ -41,9 +41,9 @@ // // button1 // - this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.button1.DialogResult = System.Windows.Forms.DialogResult.OK; - this.button1.Location = new System.Drawing.Point(12, 100); + this.button1.Location = new System.Drawing.Point(78, 100); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(75, 23); this.button1.TabIndex = 0; @@ -52,9 +52,9 @@ // // button2 // - this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.button2.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.button2.Location = new System.Drawing.Point(93, 100); + this.button2.Location = new System.Drawing.Point(159, 100); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(75, 23); this.button2.TabIndex = 1; @@ -70,7 +70,7 @@ 0, 0}); this.numericUpDown1.Name = "numericUpDown1"; - this.numericUpDown1.Size = new System.Drawing.Size(120, 20); + this.numericUpDown1.Size = new System.Drawing.Size(96, 20); this.numericUpDown1.TabIndex = 2; // // label1 @@ -100,14 +100,14 @@ 0, -2147483648}); this.numericUpDown2.Name = "numericUpDown2"; - this.numericUpDown2.Size = new System.Drawing.Size(120, 20); + this.numericUpDown2.Size = new System.Drawing.Size(96, 20); this.numericUpDown2.TabIndex = 5; this.numericUpDown2.ValueChanged += new System.EventHandler(this.numericUpDown2_ValueChanged); // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(138, 66); + 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; @@ -119,7 +119,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.button2; - this.ClientSize = new System.Drawing.Size(269, 135); + this.ClientSize = new System.Drawing.Size(246, 135); this.Controls.Add(this.label3); this.Controls.Add(this.numericUpDown2); this.Controls.Add(this.label2); @@ -128,7 +128,8 @@ this.Controls.Add(this.button2); this.Controls.Add(this.button1); this.Name = "GifWriterForm"; - this.Text = "GifWriter Options"; + this.ShowIcon = false; + this.Text = "GIF Writer Options"; ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit(); this.ResumeLayout(false); diff --git a/BizHawk.MultiClient/AVOut/JMDForm.Designer.cs b/BizHawk.MultiClient/AVOut/JMDForm.Designer.cs index c77571916e..a3fa5c65af 100644 --- a/BizHawk.MultiClient/AVOut/JMDForm.Designer.cs +++ b/BizHawk.MultiClient/AVOut/JMDForm.Designer.cs @@ -44,10 +44,11 @@ // // okButton // + this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; - this.okButton.Location = new System.Drawing.Point(23, 224); + this.okButton.Location = new System.Drawing.Point(115, 147); this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(117, 30); + this.okButton.Size = new System.Drawing.Size(70, 23); this.okButton.TabIndex = 0; this.okButton.Text = "OK"; this.okButton.UseVisualStyleBackColor = true; @@ -55,24 +56,24 @@ // // threadsBar // - this.threadsBar.Location = new System.Drawing.Point(88, 68); + this.threadsBar.Location = new System.Drawing.Point(56, 25); this.threadsBar.Name = "threadsBar"; - this.threadsBar.Size = new System.Drawing.Size(104, 42); + this.threadsBar.Size = new System.Drawing.Size(104, 45); this.threadsBar.TabIndex = 5; this.threadsBar.Scroll += new System.EventHandler(this.threadsBar_Scroll); // // compressionBar // - this.compressionBar.Location = new System.Drawing.Point(88, 138); + this.compressionBar.Location = new System.Drawing.Point(56, 86); this.compressionBar.Name = "compressionBar"; - this.compressionBar.Size = new System.Drawing.Size(104, 42); + this.compressionBar.Size = new System.Drawing.Size(104, 45); this.compressionBar.TabIndex = 9; this.compressionBar.Scroll += new System.EventHandler(this.compressionBar_Scroll); // // threadLeft // this.threadLeft.AutoSize = true; - this.threadLeft.Location = new System.Drawing.Point(47, 68); + 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; @@ -81,7 +82,7 @@ // threadRight // this.threadRight.AutoSize = true; - this.threadRight.Location = new System.Drawing.Point(198, 68); + 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; @@ -90,7 +91,7 @@ // compressionLeft // this.compressionLeft.AutoSize = true; - this.compressionLeft.Location = new System.Drawing.Point(47, 148); + 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; @@ -99,7 +100,7 @@ // compressionRight // this.compressionRight.AutoSize = true; - this.compressionRight.Location = new System.Drawing.Point(198, 148); + 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; @@ -108,7 +109,7 @@ // threadTop // this.threadTop.AutoSize = true; - this.threadTop.Location = new System.Drawing.Point(94, 52); + 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; @@ -118,7 +119,7 @@ // compressionTop // this.compressionTop.AutoSize = true; - this.compressionTop.Location = new System.Drawing.Point(96, 122); + 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; @@ -127,10 +128,11 @@ // // cancelButton // + this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancelButton.Location = new System.Drawing.Point(158, 224); + this.cancelButton.Location = new System.Drawing.Point(191, 147); this.cancelButton.Name = "cancelButton"; - this.cancelButton.Size = new System.Drawing.Size(122, 30); + this.cancelButton.Size = new System.Drawing.Size(70, 23); this.cancelButton.TabIndex = 1; this.cancelButton.Text = "Cancel"; this.cancelButton.UseVisualStyleBackColor = true; @@ -142,7 +144,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.cancelButton; - this.ClientSize = new System.Drawing.Size(292, 273); + this.ClientSize = new System.Drawing.Size(273, 182); this.Controls.Add(this.cancelButton); this.Controls.Add(this.compressionTop); this.Controls.Add(this.threadTop); @@ -153,9 +155,8 @@ this.Controls.Add(this.compressionBar); this.Controls.Add(this.threadsBar); this.Controls.Add(this.okButton); - this.MaximumSize = new System.Drawing.Size(300, 300); - this.MinimumSize = new System.Drawing.Size(300, 300); this.Name = "JMDForm"; + this.ShowIcon = false; this.Text = "JMD Compression Options"; ((System.ComponentModel.ISupportInitialize)(this.threadsBar)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.compressionBar)).EndInit(); diff --git a/BizHawk.MultiClient/AVOut/VideoWriterChooserForm.Designer.cs b/BizHawk.MultiClient/AVOut/VideoWriterChooserForm.Designer.cs index d01d834da0..eb30feb965 100644 --- a/BizHawk.MultiClient/AVOut/VideoWriterChooserForm.Designer.cs +++ b/BizHawk.MultiClient/AVOut/VideoWriterChooserForm.Designer.cs @@ -204,6 +204,7 @@ this.Controls.Add(this.buttonCancel); this.Controls.Add(this.checkBoxResize); this.Name = "VideoWriterChooserForm"; + this.ShowIcon = false; this.Text = "Choose A\\V Writer"; this.tableLayoutPanel4.ResumeLayout(false); this.tableLayoutPanel4.PerformLayout(); diff --git a/BizHawk.MultiClient/tools/ToolHelpers.cs b/BizHawk.MultiClient/tools/ToolHelpers.cs index db8ae9662a..03429c2b20 100644 --- a/BizHawk.MultiClient/tools/ToolHelpers.cs +++ b/BizHawk.MultiClient/tools/ToolHelpers.cs @@ -75,7 +75,6 @@ namespace BizHawk.MultiClient Global.CheatList.Add( new Cheat(watch, watch.Value.Value, compare: null, enabled: true) ); - } }