mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-28 06:52:35 +01:00
Toggle translation/original text in video/audio preview moved to Edit menu + added shortcut
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1364 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
parent
f0c47400e3
commit
f72f4e2d72
52
src/Forms/Main.Designer.cs
generated
52
src/Forms/Main.Designer.cs
generated
@ -120,6 +120,7 @@
|
||||
this.replaceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.multipleReplaceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.gotoLineNumberToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripMenuItemShowOriginalInPreview = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.toolStripMenuItemRightToLeftMode = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripMenuItemReverseRightToLeftStartEnd = new System.Windows.Forms.ToolStripMenuItem();
|
||||
@ -147,7 +148,6 @@
|
||||
this.textCharssecToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.textWordsPerMinutewpmToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripSeparator23 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.toolStripMenuItemShowOriginalInPreview = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripMenuItemMakeEmptyFromCurrent = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.generateDatetimeInfoFromVideoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
|
||||
@ -1154,6 +1154,7 @@
|
||||
this.replaceToolStripMenuItem,
|
||||
this.multipleReplaceToolStripMenuItem,
|
||||
this.gotoLineNumberToolStripMenuItem,
|
||||
this.toolStripMenuItemShowOriginalInPreview,
|
||||
this.toolStripSeparator25,
|
||||
this.toolStripMenuItemRightToLeftMode,
|
||||
this.toolStripMenuItemReverseRightToLeftStartEnd,
|
||||
@ -1167,43 +1168,43 @@
|
||||
// toolStripMenuItemUndo
|
||||
//
|
||||
this.toolStripMenuItemUndo.Name = "toolStripMenuItemUndo";
|
||||
this.toolStripMenuItemUndo.Size = new System.Drawing.Size(222, 22);
|
||||
this.toolStripMenuItemUndo.Size = new System.Drawing.Size(305, 22);
|
||||
this.toolStripMenuItemUndo.Text = "Undo";
|
||||
//
|
||||
// toolStripMenuItemRedo
|
||||
//
|
||||
this.toolStripMenuItemRedo.Name = "toolStripMenuItemRedo";
|
||||
this.toolStripMenuItemRedo.Size = new System.Drawing.Size(222, 22);
|
||||
this.toolStripMenuItemRedo.Size = new System.Drawing.Size(305, 22);
|
||||
this.toolStripMenuItemRedo.Text = "Redo";
|
||||
//
|
||||
// showHistoryforUndoToolStripMenuItem
|
||||
//
|
||||
this.showHistoryforUndoToolStripMenuItem.Name = "showHistoryforUndoToolStripMenuItem";
|
||||
this.showHistoryforUndoToolStripMenuItem.Size = new System.Drawing.Size(222, 22);
|
||||
this.showHistoryforUndoToolStripMenuItem.Size = new System.Drawing.Size(305, 22);
|
||||
this.showHistoryforUndoToolStripMenuItem.Text = "Show history (for undo)";
|
||||
this.showHistoryforUndoToolStripMenuItem.Click += new System.EventHandler(this.ShowHistoryforUndoToolStripMenuItemClick);
|
||||
//
|
||||
// toolStripSeparator14
|
||||
//
|
||||
this.toolStripSeparator14.Name = "toolStripSeparator14";
|
||||
this.toolStripSeparator14.Size = new System.Drawing.Size(219, 6);
|
||||
this.toolStripSeparator14.Size = new System.Drawing.Size(302, 6);
|
||||
//
|
||||
// toolStripMenuItemInsertUnicodeCharacter
|
||||
//
|
||||
this.toolStripMenuItemInsertUnicodeCharacter.Name = "toolStripMenuItemInsertUnicodeCharacter";
|
||||
this.toolStripMenuItemInsertUnicodeCharacter.Size = new System.Drawing.Size(222, 22);
|
||||
this.toolStripMenuItemInsertUnicodeCharacter.Size = new System.Drawing.Size(305, 22);
|
||||
this.toolStripMenuItemInsertUnicodeCharacter.Text = "Insert unicode character";
|
||||
//
|
||||
// toolStripSeparatorInsertUnicodeCharacter
|
||||
//
|
||||
this.toolStripSeparatorInsertUnicodeCharacter.Name = "toolStripSeparatorInsertUnicodeCharacter";
|
||||
this.toolStripSeparatorInsertUnicodeCharacter.Size = new System.Drawing.Size(219, 6);
|
||||
this.toolStripSeparatorInsertUnicodeCharacter.Size = new System.Drawing.Size(302, 6);
|
||||
//
|
||||
// findToolStripMenuItem
|
||||
//
|
||||
this.findToolStripMenuItem.Name = "findToolStripMenuItem";
|
||||
this.findToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F)));
|
||||
this.findToolStripMenuItem.Size = new System.Drawing.Size(222, 22);
|
||||
this.findToolStripMenuItem.Size = new System.Drawing.Size(305, 22);
|
||||
this.findToolStripMenuItem.Text = "Find";
|
||||
this.findToolStripMenuItem.Click += new System.EventHandler(this.FindToolStripMenuItemClick);
|
||||
//
|
||||
@ -1211,7 +1212,7 @@
|
||||
//
|
||||
this.findNextToolStripMenuItem.Name = "findNextToolStripMenuItem";
|
||||
this.findNextToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F3;
|
||||
this.findNextToolStripMenuItem.Size = new System.Drawing.Size(222, 22);
|
||||
this.findNextToolStripMenuItem.Size = new System.Drawing.Size(305, 22);
|
||||
this.findNextToolStripMenuItem.Text = "Find next";
|
||||
this.findNextToolStripMenuItem.Click += new System.EventHandler(this.FindNextToolStripMenuItemClick);
|
||||
//
|
||||
@ -1219,14 +1220,14 @@
|
||||
//
|
||||
this.replaceToolStripMenuItem.Name = "replaceToolStripMenuItem";
|
||||
this.replaceToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.H)));
|
||||
this.replaceToolStripMenuItem.Size = new System.Drawing.Size(222, 22);
|
||||
this.replaceToolStripMenuItem.Size = new System.Drawing.Size(305, 22);
|
||||
this.replaceToolStripMenuItem.Text = "Replace";
|
||||
this.replaceToolStripMenuItem.Click += new System.EventHandler(this.ReplaceToolStripMenuItemClick);
|
||||
//
|
||||
// multipleReplaceToolStripMenuItem
|
||||
//
|
||||
this.multipleReplaceToolStripMenuItem.Name = "multipleReplaceToolStripMenuItem";
|
||||
this.multipleReplaceToolStripMenuItem.Size = new System.Drawing.Size(222, 22);
|
||||
this.multipleReplaceToolStripMenuItem.Size = new System.Drawing.Size(305, 22);
|
||||
this.multipleReplaceToolStripMenuItem.Text = "Multiple replace";
|
||||
this.multipleReplaceToolStripMenuItem.Click += new System.EventHandler(this.MultipleReplaceToolStripMenuItemClick);
|
||||
//
|
||||
@ -1234,38 +1235,45 @@
|
||||
//
|
||||
this.gotoLineNumberToolStripMenuItem.Name = "gotoLineNumberToolStripMenuItem";
|
||||
this.gotoLineNumberToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G)));
|
||||
this.gotoLineNumberToolStripMenuItem.Size = new System.Drawing.Size(222, 22);
|
||||
this.gotoLineNumberToolStripMenuItem.Size = new System.Drawing.Size(305, 22);
|
||||
this.gotoLineNumberToolStripMenuItem.Text = "Goto line number...";
|
||||
this.gotoLineNumberToolStripMenuItem.Click += new System.EventHandler(this.GotoLineNumberToolStripMenuItemClick);
|
||||
//
|
||||
// toolStripMenuItemShowOriginalInPreview
|
||||
//
|
||||
this.toolStripMenuItemShowOriginalInPreview.Name = "toolStripMenuItemShowOriginalInPreview";
|
||||
this.toolStripMenuItemShowOriginalInPreview.Size = new System.Drawing.Size(305, 22);
|
||||
this.toolStripMenuItemShowOriginalInPreview.Text = "Show original text in video/audio previews";
|
||||
this.toolStripMenuItemShowOriginalInPreview.Click += new System.EventHandler(this.ToolStripMenuItemShowOriginalInPreviewClick);
|
||||
//
|
||||
// toolStripSeparator25
|
||||
//
|
||||
this.toolStripSeparator25.Name = "toolStripSeparator25";
|
||||
this.toolStripSeparator25.Size = new System.Drawing.Size(219, 6);
|
||||
this.toolStripSeparator25.Size = new System.Drawing.Size(302, 6);
|
||||
//
|
||||
// toolStripMenuItemRightToLeftMode
|
||||
//
|
||||
this.toolStripMenuItemRightToLeftMode.Name = "toolStripMenuItemRightToLeftMode";
|
||||
this.toolStripMenuItemRightToLeftMode.Size = new System.Drawing.Size(222, 22);
|
||||
this.toolStripMenuItemRightToLeftMode.Size = new System.Drawing.Size(305, 22);
|
||||
this.toolStripMenuItemRightToLeftMode.Text = "Right to left mode";
|
||||
this.toolStripMenuItemRightToLeftMode.Click += new System.EventHandler(this.ToolStripMenuItemRightToLeftModeClick);
|
||||
//
|
||||
// toolStripMenuItemReverseRightToLeftStartEnd
|
||||
//
|
||||
this.toolStripMenuItemReverseRightToLeftStartEnd.Name = "toolStripMenuItemReverseRightToLeftStartEnd";
|
||||
this.toolStripMenuItemReverseRightToLeftStartEnd.Size = new System.Drawing.Size(222, 22);
|
||||
this.toolStripMenuItemReverseRightToLeftStartEnd.Size = new System.Drawing.Size(305, 22);
|
||||
this.toolStripMenuItemReverseRightToLeftStartEnd.Text = "Reverse RTL start/end";
|
||||
this.toolStripMenuItemReverseRightToLeftStartEnd.Click += new System.EventHandler(this.toolStripMenuItemReverseRightToLeftStartEnd_Click);
|
||||
//
|
||||
// toolStripSeparator21
|
||||
//
|
||||
this.toolStripSeparator21.Name = "toolStripSeparator21";
|
||||
this.toolStripSeparator21.Size = new System.Drawing.Size(219, 6);
|
||||
this.toolStripSeparator21.Size = new System.Drawing.Size(302, 6);
|
||||
//
|
||||
// editSelectAllToolStripMenuItem
|
||||
//
|
||||
this.editSelectAllToolStripMenuItem.Name = "editSelectAllToolStripMenuItem";
|
||||
this.editSelectAllToolStripMenuItem.Size = new System.Drawing.Size(222, 22);
|
||||
this.editSelectAllToolStripMenuItem.Size = new System.Drawing.Size(305, 22);
|
||||
this.editSelectAllToolStripMenuItem.Text = "Select all";
|
||||
this.editSelectAllToolStripMenuItem.Click += new System.EventHandler(this.EditSelectAllToolStripMenuItemClick);
|
||||
//
|
||||
@ -1283,7 +1291,6 @@
|
||||
this.setMinimumDisplayTimeBetweenParagraphsToolStripMenuItem,
|
||||
this.toolStripMenuItem1,
|
||||
this.toolStripSeparator23,
|
||||
this.toolStripMenuItemShowOriginalInPreview,
|
||||
this.toolStripMenuItemMakeEmptyFromCurrent,
|
||||
this.generateDatetimeInfoFromVideoToolStripMenuItem,
|
||||
this.toolStripSeparator3,
|
||||
@ -1458,13 +1465,6 @@
|
||||
this.toolStripSeparator23.Name = "toolStripSeparator23";
|
||||
this.toolStripSeparator23.Size = new System.Drawing.Size(343, 6);
|
||||
//
|
||||
// toolStripMenuItemShowOriginalInPreview
|
||||
//
|
||||
this.toolStripMenuItemShowOriginalInPreview.Name = "toolStripMenuItemShowOriginalInPreview";
|
||||
this.toolStripMenuItemShowOriginalInPreview.Size = new System.Drawing.Size(346, 22);
|
||||
this.toolStripMenuItemShowOriginalInPreview.Text = "Show original text in video/audio previews";
|
||||
this.toolStripMenuItemShowOriginalInPreview.Click += new System.EventHandler(this.ToolStripMenuItemShowOriginalInPreviewClick);
|
||||
//
|
||||
// toolStripMenuItemMakeEmptyFromCurrent
|
||||
//
|
||||
this.toolStripMenuItemMakeEmptyFromCurrent.Name = "toolStripMenuItemMakeEmptyFromCurrent";
|
||||
@ -4264,7 +4264,6 @@
|
||||
private System.Windows.Forms.ToolStripMenuItem pointSyncViaOtherSubtitleToolStripMenuItem;
|
||||
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemGoogleMicrosoftTranslateSelLine;
|
||||
private System.Windows.Forms.ToolStripSeparator toolStripSeparator23;
|
||||
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemShowOriginalInPreview;
|
||||
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemMakeEmptyFromCurrent;
|
||||
private System.Windows.Forms.ToolStripSeparator toolStripSeparator24;
|
||||
private System.Windows.Forms.ToolStripMenuItem showWaveformAndSpectrogramToolStripMenuItem;
|
||||
@ -4317,6 +4316,7 @@
|
||||
private System.Windows.Forms.ToolStripMenuItem DvdStudioProStl;
|
||||
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemUndo;
|
||||
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemRedo;
|
||||
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemShowOriginalInPreview;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1235,7 +1235,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
Left = x;
|
||||
Top = y;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (Configuration.Settings.General.StartSize == "Maximized")
|
||||
@ -1275,10 +1275,12 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
{
|
||||
CenterFormOnCurrentScreen();
|
||||
}
|
||||
|
||||
if (!splitContainer1.Panel2Collapsed && Configuration.Settings.General.StartRememberPositionAndSize)
|
||||
{
|
||||
splitContainer1.SplitterDistance = Configuration.Settings.General.StartListViewWidth;
|
||||
}
|
||||
|
||||
if (Configuration.Settings.General.StartRememberPositionAndSize && Configuration.Settings.General.StartListViewHeight > 20 && Configuration.Settings.General.StartListViewHeight < Width - 40)
|
||||
splitContainerMain.SplitterDistance = Configuration.Settings.General.StartListViewHeight;
|
||||
|
||||
if (Environment.OSVersion.Version.Major < 6 && Configuration.Settings.General.SubtitleFontName == Utilities.WinXp2kUnicodeFontName) // 6 == Vista/Win2008Server/Win7
|
||||
{
|
||||
@ -1290,7 +1292,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
SubtitleListview1.Font = new Font(unicodeFontName, fontSize);
|
||||
toolStripWaveControls.RenderMode = ToolStripRenderMode.System;
|
||||
toolStripMenuItemSurroundWithMusicSymbols.Font = new Font(unicodeFontName, fontSize);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void InitializeLanguage()
|
||||
@ -1388,7 +1390,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
textCharssecToolStripMenuItem.Text = _language.Menu.Tools.TextNumberOfCharactersPerSeconds;
|
||||
textWordsPerMinutewpmToolStripMenuItem.Text = _language.Menu.Tools.WordsPerMinute;
|
||||
|
||||
toolStripMenuItemShowOriginalInPreview.Text = _language.Menu.Tools.ShowOriginalTextInAudioAndVideoPreview;
|
||||
toolStripMenuItemShowOriginalInPreview.Text = _language.Menu.Edit.ShowOriginalTextInAudioAndVideoPreview;
|
||||
toolStripMenuItemMakeEmptyFromCurrent.Text = _language.Menu.Tools.MakeNewEmptyTranslationFromCurrentSubtitle;
|
||||
splitToolStripMenuItem.Text = _language.Menu.Tools.SplitSubtitle;
|
||||
appendTextVisuallyToolStripMenuItem.Text = _language.Menu.Tools.AppendSubtitle;
|
||||
@ -6715,6 +6717,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
else
|
||||
Configuration.Settings.General.StartSize = Width + ";" + Height;
|
||||
Configuration.Settings.General.StartListViewWidth = splitContainer1.SplitterDistance;
|
||||
Configuration.Settings.General.StartListViewHeight = splitContainerMain.SplitterDistance;
|
||||
}
|
||||
else if (Configuration.Settings.General.StartRememberPositionAndSize)
|
||||
{
|
||||
@ -9734,6 +9737,8 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
toolStripMenuItemUndo.Enabled = _subtitle.CanUndo;
|
||||
toolStripMenuItemRedo.Enabled = _subtitle.CanUndo;
|
||||
toolStripMenuItemShowOriginalInPreview.Visible = SubtitleListview1.IsAlternateTextColumnVisible;
|
||||
|
||||
}
|
||||
|
||||
private void InsertUnicodeGlyph(object sender, EventArgs e)
|
||||
@ -10731,18 +10736,27 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
newParagraph.CalculateFrameNumbersFromTimeCodes(CurrentFrameRate);
|
||||
newParagraph.CalculateTimeCodesFromFrameNumbers(CurrentFrameRate);
|
||||
}
|
||||
_subtitle.Paragraphs.Insert(index, newParagraph);
|
||||
|
||||
// check if original is available - and insert new paragraph in the original too
|
||||
if (Configuration.Settings.General.AllowEditOfOriginalSubtitle && _subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count > 0)
|
||||
if (_networkSession != null)
|
||||
{
|
||||
_subtitleAlternate.InsertParagraphInCorrectTimeOrder(new Paragraph(newParagraph));
|
||||
_subtitleAlternate.Renumber(1);
|
||||
_networkSession.TimerStop();
|
||||
NetworkGetSendUpdates(new List<int>(), index, newParagraph);
|
||||
}
|
||||
else
|
||||
{
|
||||
_subtitle.Paragraphs.Insert(index, newParagraph);
|
||||
|
||||
_subtitleListViewIndex = -1;
|
||||
_subtitle.Renumber(startNumber);
|
||||
SubtitleListview1.Fill(_subtitle, _subtitleAlternate);
|
||||
// check if original is available - and insert new paragraph in the original too
|
||||
if (Configuration.Settings.General.AllowEditOfOriginalSubtitle && _subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count > 0)
|
||||
{
|
||||
_subtitleAlternate.InsertParagraphInCorrectTimeOrder(new Paragraph(newParagraph));
|
||||
_subtitleAlternate.Renumber(1);
|
||||
}
|
||||
|
||||
_subtitleListViewIndex = -1;
|
||||
_subtitle.Renumber(startNumber);
|
||||
SubtitleListview1.Fill(_subtitle, _subtitleAlternate);
|
||||
}
|
||||
SubtitleListview1.SelectIndexAndEnsureVisible(index);
|
||||
return newParagraph;
|
||||
}
|
||||
@ -11528,11 +11542,13 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
multipleReplaceToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainEditMultipleReplace);
|
||||
gotoLineNumberToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainEditGoToLineNumber);
|
||||
toolStripMenuItemRightToLeftMode.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainEditRightToLeft);
|
||||
toolStripMenuItemShowOriginalInPreview.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainEditToggleTranslationOriginalInPreviews);
|
||||
|
||||
fixToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainToolsFixCommonErrors);
|
||||
startNumberingFromToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainToolsRenumber);
|
||||
removeTextForHearImparedToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainToolsRemoveTextForHI);
|
||||
ChangeCasingToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainToolsChangeCasing);
|
||||
toolStripMenuItemShowOriginalInPreview.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainEditToggleTranslationOriginalInPreviews);
|
||||
|
||||
showhideVideoToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainVideoShowHideVideo);
|
||||
_toggleVideoDockUndock = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
|
||||
@ -11934,17 +11950,27 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
newParagraph.CalculateFrameNumbersFromTimeCodes(CurrentFrameRate);
|
||||
newParagraph.CalculateTimeCodesFromFrameNumbers(CurrentFrameRate);
|
||||
}
|
||||
_subtitle.Paragraphs.Insert(index, newParagraph);
|
||||
|
||||
if (_subtitleAlternate != null && SubtitleListview1.IsAlternateTextColumnVisible && Configuration.Settings.General.AllowEditOfOriginalSubtitle)
|
||||
|
||||
if (_networkSession != null)
|
||||
{
|
||||
_subtitleAlternate.InsertParagraphInCorrectTimeOrder(new Paragraph(newParagraph));
|
||||
_subtitleAlternate.Renumber(1);
|
||||
_networkSession.TimerStop();
|
||||
NetworkGetSendUpdates(new List<int>(), index, newParagraph);
|
||||
}
|
||||
else
|
||||
{
|
||||
_subtitle.Paragraphs.Insert(index, newParagraph);
|
||||
|
||||
_subtitleListViewIndex = -1;
|
||||
_subtitle.Renumber(startNumber);
|
||||
SubtitleListview1.Fill(_subtitle, _subtitleAlternate);
|
||||
if (_subtitleAlternate != null && SubtitleListview1.IsAlternateTextColumnVisible && Configuration.Settings.General.AllowEditOfOriginalSubtitle)
|
||||
{
|
||||
_subtitleAlternate.InsertParagraphInCorrectTimeOrder(new Paragraph(newParagraph));
|
||||
_subtitleAlternate.Renumber(1);
|
||||
}
|
||||
|
||||
_subtitleListViewIndex = -1;
|
||||
_subtitle.Renumber(startNumber);
|
||||
SubtitleListview1.Fill(_subtitle, _subtitleAlternate);
|
||||
}
|
||||
SubtitleListview1.SelectIndexAndEnsureVisible(index);
|
||||
|
||||
textBoxListViewText.Focus();
|
||||
@ -13870,7 +13896,6 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
toolStripMenuItemMakeEmptyFromCurrent.Visible = false;
|
||||
toolStripMenuItemShowOriginalInPreview.Checked = false;
|
||||
}
|
||||
toolStripMenuItemShowOriginalInPreview.Visible = SubtitleListview1.IsAlternateTextColumnVisible;
|
||||
}
|
||||
|
||||
private void ContextMenuStripWaveFormOpening(object sender, System.ComponentModel.CancelEventArgs e)
|
||||
@ -15039,7 +15064,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
var exportBdnXmlPng = new ExportPngXml();
|
||||
exportBdnXmlPng.Initialize(_subtitle, GetCurrentSubtitleFormat(), "STL", _fileName, _videoInfo);
|
||||
exportBdnXmlPng.ShowDialog(this);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
@ -681,7 +681,7 @@
|
||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
|
||||
CAAAAk1TRnQBSQFMAgEBAgEAAegBFgHoARYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
CAAAAk1TRnQBSQFMAgEBAgEAAUABFwFAARcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
||||
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
||||
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
||||
|
@ -518,6 +518,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
editNode.Nodes.Add(Configuration.Settings.Language.Main.Menu.Edit.GoToSubtitleNumber + GetShortcutText(Configuration.Settings.Shortcuts.MainEditGoToLineNumber));
|
||||
editNode.Nodes.Add(Configuration.Settings.Language.VobSubOcr.RightToLeft + GetShortcutText(Configuration.Settings.Shortcuts.MainEditRightToLeft));
|
||||
editNode.Nodes.Add(Configuration.Settings.Language.Settings.ReverseStartAndEndingForRTL + GetShortcutText(Configuration.Settings.Shortcuts.MainEditReverseStartAndEndingForRTL));
|
||||
editNode.Nodes.Add(Configuration.Settings.Language.Settings.ToggleTranslationAndOriginalInPreviews + GetShortcutText(Configuration.Settings.Shortcuts.MainEditToggleTranslationOriginalInPreviews));
|
||||
treeViewShortcuts.Nodes.Add(editNode);
|
||||
|
||||
var toolsNode = new TreeNode(Configuration.Settings.Language.Main.Menu.Tools.Title);
|
||||
@ -1053,6 +1054,8 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
Configuration.Settings.Shortcuts.MainEditRightToLeft = GetShortcut(node.Text);
|
||||
else if (Configuration.Settings.Language.Settings.ReverseStartAndEndingForRTL != null && text == Configuration.Settings.Language.Settings.ReverseStartAndEndingForRTL.Replace("&", string.Empty))
|
||||
Configuration.Settings.Shortcuts.MainEditReverseStartAndEndingForRTL = GetShortcut(node.Text);
|
||||
else if (text == Configuration.Settings.Language.Settings.ToggleTranslationAndOriginalInPreviews.Replace("&", string.Empty))
|
||||
Configuration.Settings.Shortcuts.MainEditToggleTranslationOriginalInPreviews = GetShortcut(node.Text);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -913,6 +913,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
GoToSubtitleNumber = "&Go to subtitle number...",
|
||||
RightToLeftMode = "Right-to-left mode",
|
||||
ReverseRightToLeftStartEnd = "Reverse RTL start/end (for selected lines)",
|
||||
ShowOriginalTextInAudioAndVideoPreview = "Show original text in audio/video previews",
|
||||
},
|
||||
|
||||
Tools = new LanguageStructure.Main.MainMenu.ToolsMenu
|
||||
@ -938,7 +939,6 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
TextNumberOfLines = "Text - number of lines",
|
||||
TextNumberOfCharactersPerSeconds = "Text - number of chars/sec",
|
||||
WordsPerMinute = "Text - words per minute (wpm)",
|
||||
ShowOriginalTextInAudioAndVideoPreview = "Show original text in audio/video previews",
|
||||
MakeNewEmptyTranslationFromCurrentSubtitle = "Make new empty translation from current subtitle",
|
||||
SplitSubtitle = "Split subtitle...",
|
||||
AppendSubtitle = "Append subtitle...",
|
||||
@ -1464,6 +1464,7 @@ can edit in same subtitle file (collaboration)",
|
||||
SwitchOriginalAndTranslation = "Switch original and translation",
|
||||
MergeOriginalAndTranslation = "Merge original and translation",
|
||||
ShortcutIsAlreadyDefinedX = "Shortcut already defined: \r\n{0}\r\n",
|
||||
ToggleTranslationAndOriginalInPreviews = "Toggle translation and original in video/audio preview",
|
||||
};
|
||||
|
||||
ShowEarlierLater = new LanguageStructure.ShowEarlierLater
|
||||
|
@ -825,6 +825,7 @@
|
||||
public string GoToSubtitleNumber { get; set; }
|
||||
public string RightToLeftMode { get; set; }
|
||||
public string ReverseRightToLeftStartEnd { get; set; }
|
||||
public string ShowOriginalTextInAudioAndVideoPreview { get; set; }
|
||||
}
|
||||
public class ToolsMenu
|
||||
{
|
||||
@ -849,7 +850,6 @@
|
||||
public string TextNumberOfLines { get; set; }
|
||||
public string TextNumberOfCharactersPerSeconds { get; set; }
|
||||
public string WordsPerMinute { get; set; }
|
||||
public string ShowOriginalTextInAudioAndVideoPreview { get; set; }
|
||||
public string MakeNewEmptyTranslationFromCurrentSubtitle { get; set; }
|
||||
public string SplitSubtitle { get; set; }
|
||||
public string AppendSubtitle { get; set; }
|
||||
@ -1384,6 +1384,7 @@
|
||||
public string SwitchOriginalAndTranslation { get; set; }
|
||||
public string MergeOriginalAndTranslation { get; set; }
|
||||
public string ShortcutIsAlreadyDefinedX { get; set; }
|
||||
public string ToggleTranslationAndOriginalInPreviews { get; set; }
|
||||
}
|
||||
|
||||
public class ShowEarlierLater
|
||||
|
@ -322,6 +322,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
public string StartPosition { get; set; }
|
||||
public string StartSize { get; set; }
|
||||
public int StartListViewWidth { get; set; }
|
||||
public int StartListViewHeight { get; set; }
|
||||
public bool StartInSourceView { get; set; }
|
||||
public bool RemoveBlankLinesWhenOpening { get; set; }
|
||||
public int SubtitleLineMaximumLength { get; set; }
|
||||
@ -573,6 +574,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
public string MainEditGoToLineNumber { get; set; }
|
||||
public string MainEditRightToLeft { get; set; }
|
||||
public string MainEditReverseStartAndEndingForRTL { get; set; }
|
||||
public string MainEditToggleTranslationOriginalInPreviews { get; set; }
|
||||
public string MainToolsFixCommonErrors { get; set; }
|
||||
public string MainToolsFixCommonErrorsPreview { get; set; }
|
||||
public string MainToolsRenumber { get; set; }
|
||||
@ -1004,6 +1006,9 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
subNode = node.SelectSingleNode("StartListViewWidth");
|
||||
if (subNode != null)
|
||||
settings.General.StartListViewWidth = Convert.ToInt32(subNode.InnerText);
|
||||
subNode = node.SelectSingleNode("StartListViewHeight");
|
||||
if (subNode != null)
|
||||
settings.General.StartListViewHeight = Convert.ToInt32(subNode.InnerText);
|
||||
subNode = node.SelectSingleNode("StartInSourceView");
|
||||
if (subNode != null)
|
||||
settings.General.StartInSourceView = Convert.ToBoolean(subNode.InnerText);
|
||||
@ -1622,6 +1627,9 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
subNode = node.SelectSingleNode("MainToolsAutoDuration");
|
||||
if (subNode != null)
|
||||
settings.Shortcuts.MainToolsAutoDuration = subNode.InnerText;
|
||||
subNode = node.SelectSingleNode("MainToolsToggleTranslationOriginalInPreviews");
|
||||
if (subNode != null)
|
||||
settings.Shortcuts.MainEditToggleTranslationOriginalInPreviews = subNode.InnerText;
|
||||
subNode = node.SelectSingleNode("MainVideoPause");
|
||||
if (subNode != null)
|
||||
settings.Shortcuts.MainVideoPause = subNode.InnerText;
|
||||
@ -1924,6 +1932,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
textWriter.WriteElementString("StartPosition", settings.General.StartPosition);
|
||||
textWriter.WriteElementString("StartSize", settings.General.StartSize);
|
||||
textWriter.WriteElementString("StartListViewWidth", settings.General.StartListViewWidth.ToString());
|
||||
textWriter.WriteElementString("StartListViewHeight", settings.General.StartListViewHeight.ToString());
|
||||
textWriter.WriteElementString("StartInSourceView", settings.General.StartInSourceView.ToString());
|
||||
textWriter.WriteElementString("RemoveBlankLinesWhenOpening", settings.General.RemoveBlankLinesWhenOpening.ToString());
|
||||
textWriter.WriteElementString("SubtitleLineMaximumLength", settings.General.SubtitleLineMaximumLength.ToString());
|
||||
@ -2153,6 +2162,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
textWriter.WriteElementString("MainToolsRemoveTextForHI", settings.Shortcuts.MainToolsRemoveTextForHI);
|
||||
textWriter.WriteElementString("MainToolsChangeCasing", settings.Shortcuts.MainToolsChangeCasing);
|
||||
textWriter.WriteElementString("MainToolsAutoDuration", settings.Shortcuts.MainToolsAutoDuration);
|
||||
textWriter.WriteElementString("MainToolsToggleTranslationOriginalInPreviews", settings.Shortcuts.MainEditToggleTranslationOriginalInPreviews);
|
||||
textWriter.WriteElementString("MainVideoPause", settings.Shortcuts.MainVideoPause);
|
||||
textWriter.WriteElementString("MainVideoPlayPauseToggle", settings.Shortcuts.MainVideoPlayPauseToggle);
|
||||
textWriter.WriteElementString("MainVideoShowHideVideo", settings.Shortcuts.MainVideoShowHideVideo);
|
||||
|
@ -170,6 +170,5 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
return string.Format("{0:00}:{1:00}:{2:00}.{3:00}", _time.Hours, _time.Minutes, _time.Seconds, SubtitleFormats.SubtitleFormat.MillisecondsToFrames(_time.Milliseconds));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user