diff --git a/src/Forms/TimedTextProperties.Designer.cs b/src/Forms/TimedTextProperties.Designer.cs index 5c16e8fb8..2b113d383 100644 --- a/src/Forms/TimedTextProperties.Designer.cs +++ b/src/Forms/TimedTextProperties.Designer.cs @@ -31,6 +31,7 @@ this.buttonOK = new System.Windows.Forms.Button(); this.buttonCancel = new System.Windows.Forms.Button(); this.groupBoxOptions = new System.Windows.Forms.GroupBox(); + this.comboBoxFrameRateMultiplier = new System.Windows.Forms.ComboBox(); this.textBoxDescription = new System.Windows.Forms.TextBox(); this.label7 = new System.Windows.Forms.Label(); this.textBoxTitle = new System.Windows.Forms.TextBox(); @@ -48,7 +49,6 @@ this.labelCollision = new System.Windows.Forms.Label(); this.comboBoxDefaultStyle = new System.Windows.Forms.ComboBox(); this.labelWrapStyle = new System.Windows.Forms.Label(); - this.comboBoxFrameRateMultiplier = new System.Windows.Forms.ComboBox(); this.groupBoxOptions.SuspendLayout(); this.SuspendLayout(); // @@ -104,6 +104,18 @@ this.groupBoxOptions.TabIndex = 0; this.groupBoxOptions.TabStop = false; // + // comboBoxFrameRateMultiplier + // + this.comboBoxFrameRateMultiplier.FormattingEnabled = true; + this.comboBoxFrameRateMultiplier.Items.AddRange(new object[] { + "999 1000", + "1 1", + "1000 1001"}); + this.comboBoxFrameRateMultiplier.Location = new System.Drawing.Point(191, 176); + this.comboBoxFrameRateMultiplier.Name = "comboBoxFrameRateMultiplier"; + this.comboBoxFrameRateMultiplier.Size = new System.Drawing.Size(263, 21); + this.comboBoxFrameRateMultiplier.TabIndex = 18; + // // textBoxDescription // this.textBoxDescription.Location = new System.Drawing.Point(191, 56); @@ -261,17 +273,6 @@ this.labelWrapStyle.TabIndex = 1; this.labelWrapStyle.Text = "Default style"; // - // comboBoxFrameRateMultiplier - // - this.comboBoxFrameRateMultiplier.FormattingEnabled = true; - this.comboBoxFrameRateMultiplier.Items.AddRange(new object[] { - "1 1", - "999 1000"}); - this.comboBoxFrameRateMultiplier.Location = new System.Drawing.Point(191, 176); - this.comboBoxFrameRateMultiplier.Name = "comboBoxFrameRateMultiplier"; - this.comboBoxFrameRateMultiplier.Size = new System.Drawing.Size(263, 21); - this.comboBoxFrameRateMultiplier.TabIndex = 18; - // // TimedTextProperties // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/src/Forms/TimedTextProperties.resx b/src/Forms/TimedTextProperties.resx index 5ea0895e3..29dcb1b3a 100644 --- a/src/Forms/TimedTextProperties.resx +++ b/src/Forms/TimedTextProperties.resx @@ -112,9 +112,9 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file