mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
Last bridge gaps text change + now has "*" in titlebar when a subtitle is changed
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1967 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
parent
119aeed9af
commit
dde74dac9e
18
src/Forms/DurationsBridgeGaps.Designer.cs
generated
18
src/Forms/DurationsBridgeGaps.Designer.cs
generated
@ -52,12 +52,13 @@
|
||||
//
|
||||
// groupBoxLinesFound
|
||||
//
|
||||
this.groupBoxLinesFound.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
this.groupBoxLinesFound.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.groupBoxLinesFound.Controls.Add(this.SubtitleListview1);
|
||||
this.groupBoxLinesFound.Location = new System.Drawing.Point(15, 65);
|
||||
this.groupBoxLinesFound.Name = "groupBoxLinesFound";
|
||||
this.groupBoxLinesFound.Size = new System.Drawing.Size(832, 490);
|
||||
this.groupBoxLinesFound.Size = new System.Drawing.Size(832, 484);
|
||||
this.groupBoxLinesFound.TabIndex = 53;
|
||||
this.groupBoxLinesFound.TabStop = false;
|
||||
this.groupBoxLinesFound.Text = "Lines that will be bridged";
|
||||
@ -75,7 +76,7 @@
|
||||
this.SubtitleListview1.Location = new System.Drawing.Point(3, 16);
|
||||
this.SubtitleListview1.Name = "SubtitleListview1";
|
||||
this.SubtitleListview1.OwnerDraw = true;
|
||||
this.SubtitleListview1.Size = new System.Drawing.Size(826, 471);
|
||||
this.SubtitleListview1.Size = new System.Drawing.Size(826, 465);
|
||||
this.SubtitleListview1.TabIndex = 54;
|
||||
this.SubtitleListview1.UseCompatibleStateImageBehavior = false;
|
||||
this.SubtitleListview1.UseSyntaxColoring = true;
|
||||
@ -122,7 +123,7 @@
|
||||
//
|
||||
this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.buttonOK.ImeMode = System.Windows.Forms.ImeMode.NoControl;
|
||||
this.buttonOK.Location = new System.Drawing.Point(691, 591);
|
||||
this.buttonOK.Location = new System.Drawing.Point(691, 555);
|
||||
this.buttonOK.Name = "buttonOK";
|
||||
this.buttonOK.Size = new System.Drawing.Size(75, 21);
|
||||
this.buttonOK.TabIndex = 55;
|
||||
@ -135,7 +136,7 @@
|
||||
this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
|
||||
this.buttonCancel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
|
||||
this.buttonCancel.Location = new System.Drawing.Point(772, 591);
|
||||
this.buttonCancel.Location = new System.Drawing.Point(772, 555);
|
||||
this.buttonCancel.Name = "buttonCancel";
|
||||
this.buttonCancel.Size = new System.Drawing.Size(75, 21);
|
||||
this.buttonCancel.TabIndex = 56;
|
||||
@ -145,11 +146,12 @@
|
||||
//
|
||||
// radioButtonProlongEndTime
|
||||
//
|
||||
this.radioButtonProlongEndTime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.radioButtonProlongEndTime.AutoSize = true;
|
||||
this.radioButtonProlongEndTime.Checked = true;
|
||||
this.radioButtonProlongEndTime.Location = new System.Drawing.Point(586, 17);
|
||||
this.radioButtonProlongEndTime.Name = "radioButtonProlongEndTime";
|
||||
this.radioButtonProlongEndTime.Size = new System.Drawing.Size(169, 17);
|
||||
this.radioButtonProlongEndTime.Size = new System.Drawing.Size(171, 17);
|
||||
this.radioButtonProlongEndTime.TabIndex = 61;
|
||||
this.radioButtonProlongEndTime.TabStop = true;
|
||||
this.radioButtonProlongEndTime.Text = "Previous text takes all gap time";
|
||||
@ -158,6 +160,7 @@
|
||||
//
|
||||
// radioButtonDivideEven
|
||||
//
|
||||
this.radioButtonDivideEven.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.radioButtonDivideEven.AutoSize = true;
|
||||
this.radioButtonDivideEven.Location = new System.Drawing.Point(586, 40);
|
||||
this.radioButtonDivideEven.Name = "radioButtonDivideEven";
|
||||
@ -171,7 +174,7 @@
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(859, 624);
|
||||
this.ClientSize = new System.Drawing.Size(859, 588);
|
||||
this.Controls.Add(this.radioButtonDivideEven);
|
||||
this.Controls.Add(this.radioButtonProlongEndTime);
|
||||
this.Controls.Add(this.labelMilliseconds);
|
||||
@ -181,6 +184,7 @@
|
||||
this.Controls.Add(this.buttonOK);
|
||||
this.Controls.Add(this.buttonCancel);
|
||||
this.KeyPreview = true;
|
||||
this.MinimumSize = new System.Drawing.Size(850, 400);
|
||||
this.Name = "DurationsBridgeGaps";
|
||||
this.ShowIcon = false;
|
||||
this.ShowInTaskbar = false;
|
||||
|
@ -1449,6 +1449,8 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
toolsToolStripMenuItem.Text = _language.Menu.Tools.Title;
|
||||
adjustDisplayTimeToolStripMenuItem.Text = _language.Menu.Tools.AdjustDisplayDuration;
|
||||
toolStripMenuItemApplyDurationLimits.Text = _language.Menu.Tools.ApplyDurationLimits;
|
||||
toolStripMenuItemDurationBridgeGaps.Text = _language.Menu.Tools.DurationsBridgeGap;
|
||||
toolStripMenuItemDurationBridgeGaps.Visible = !string.IsNullOrEmpty(_language.Menu.Tools.DurationsBridgeGap); //TODO: Remove in SE 3.4
|
||||
fixToolStripMenuItem.Text = _language.Menu.Tools.FixCommonErrors;
|
||||
startNumberingFromToolStripMenuItem.Text = _language.Menu.Tools.StartNumberingFrom;
|
||||
removeTextForHearImparedToolStripMenuItem.Text = _language.Menu.Tools.RemoveTextForHearingImpaired;
|
||||
@ -11473,6 +11475,15 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
}
|
||||
}
|
||||
if (_changeSubtitleToString != _subtitle.ToText(new SubRip()).Trim())
|
||||
{
|
||||
if (!Text.EndsWith("*"))
|
||||
Text = Text.TrimEnd() + " *";
|
||||
}
|
||||
else
|
||||
{
|
||||
Text = Text.TrimEnd('*').TrimEnd();
|
||||
}
|
||||
ShowSubtitleTimer.Start();
|
||||
}
|
||||
|
||||
@ -12291,7 +12302,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
value = trackBarWaveFormPosition.Minimum;
|
||||
trackBarWaveFormPosition.Value = value;
|
||||
trackBarWaveFormPosition.ValueChanged += trackBarWaveFormPosition_ValueChanged;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void StopAutoDuration()
|
||||
|
@ -1101,6 +1101,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
Title = "Tools",
|
||||
AdjustDisplayDuration = "&Adjust durations...",
|
||||
ApplyDurationLimits = "Apply duration limits...",
|
||||
DurationsBridgeGap = "Bridge gap in durations...",
|
||||
FixCommonErrors = "&Fix common errors...",
|
||||
StartNumberingFrom = "Start numbering from...",
|
||||
RemoveTextForHearingImpaired = "Remove text for hearing impaired...",
|
||||
|
@ -991,6 +991,7 @@
|
||||
public string Title { get; set; }
|
||||
public string AdjustDisplayDuration { get; set; }
|
||||
public string ApplyDurationLimits { get; set; }
|
||||
public string DurationsBridgeGap { get; set; }
|
||||
public string FixCommonErrors { get; set; }
|
||||
public string StartNumberingFrom { get; set; }
|
||||
public string RemoveTextForHearingImpaired { get; set; }
|
||||
|
Loading…
Reference in New Issue
Block a user