From a660aa3c574ee32d435ec3e0bffcdcb922506e00 Mon Sep 17 00:00:00 2001 From: jdpurcell Date: Sun, 8 Feb 2015 14:23:44 +0000 Subject: [PATCH] EditSubtitlesForm - Revert changes from r7614 caused by WinForms designer not running at 96 DPI. --- .../movie/EditSubtitlesForm.Designer.cs | 47 +++++++++---------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.Designer.cs b/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.Designer.cs index b70f80085a..24ae76edb7 100644 --- a/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.Designer.cs +++ b/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.Designer.cs @@ -32,13 +32,13 @@ this.Cancel = new System.Windows.Forms.Button(); this.OK = new System.Windows.Forms.Button(); this.SubGrid = new System.Windows.Forms.DataGridView(); - this.Export = new System.Windows.Forms.Button(); this.Frame = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.X = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Y = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Length = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.DispColor = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Message = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Export = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.SubGrid)).BeginInit(); this.SuspendLayout(); // @@ -46,10 +46,9 @@ // this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.Cancel.Location = new System.Drawing.Point(647, 266); - this.Cancel.Margin = new System.Windows.Forms.Padding(4); + this.Cancel.Location = new System.Drawing.Point(485, 216); this.Cancel.Name = "Cancel"; - this.Cancel.Size = new System.Drawing.Size(100, 28); + this.Cancel.Size = new System.Drawing.Size(75, 23); this.Cancel.TabIndex = 0; this.Cancel.Text = "&Cancel"; this.Cancel.UseVisualStyleBackColor = true; @@ -58,10 +57,9 @@ // OK // this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.OK.Location = new System.Drawing.Point(539, 266); - this.OK.Margin = new System.Windows.Forms.Padding(4); + this.OK.Location = new System.Drawing.Point(404, 216); this.OK.Name = "OK"; - this.OK.Size = new System.Drawing.Size(100, 28); + this.OK.Size = new System.Drawing.Size(75, 23); this.OK.TabIndex = 1; this.OK.Text = "&Ok"; this.OK.UseVisualStyleBackColor = true; @@ -81,25 +79,13 @@ this.Length, this.DispColor, this.Message}); - this.SubGrid.Location = new System.Drawing.Point(16, 15); - this.SubGrid.Margin = new System.Windows.Forms.Padding(4); + this.SubGrid.Location = new System.Drawing.Point(12, 12); this.SubGrid.Name = "SubGrid"; - this.SubGrid.Size = new System.Drawing.Size(731, 244); + this.SubGrid.Size = new System.Drawing.Size(548, 198); this.SubGrid.TabIndex = 2; this.SubGrid.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.SubGrid_DefaultValuesNeeded); this.SubGrid.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.SubGrid_MouseDoubleClick); // - // Export - // - this.Export.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Export.Location = new System.Drawing.Point(16, 266); - this.Export.Name = "Export"; - this.Export.Size = new System.Drawing.Size(125, 28); - this.Export.TabIndex = 3; - this.Export.Text = "&Export to SubRip"; - this.Export.UseVisualStyleBackColor = true; - this.Export.Click += new System.EventHandler(this.Export_Click); - // // Frame // this.Frame.HeaderText = "Frame"; @@ -149,20 +135,31 @@ this.Message.Name = "Message"; this.Message.ToolTipText = "What will be displayed"; // + // Export + // + this.Export.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.Export.Location = new System.Drawing.Point(12, 216); + this.Export.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.Export.Name = "Export"; + this.Export.Size = new System.Drawing.Size(94, 23); + this.Export.TabIndex = 3; + this.Export.Text = "&Export to SubRip"; + this.Export.UseVisualStyleBackColor = true; + this.Export.Click += new System.EventHandler(this.Export_Click); + // // EditSubtitlesForm // this.AcceptButton = this.OK; - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + 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(763, 309); + this.ClientSize = new System.Drawing.Size(572, 251); this.Controls.Add(this.Export); this.Controls.Add(this.SubGrid); this.Controls.Add(this.OK); this.Controls.Add(this.Cancel); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(4); - this.MinimumSize = new System.Drawing.Size(245, 139); + this.MinimumSize = new System.Drawing.Size(188, 121); this.Name = "EditSubtitlesForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Edit Subtitles";