Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-27 22:42:38 +01:00
Code Issues Projects Releases Wiki Activity

Add shorcut + update Tesseract to 5.2.0

Browse Source
This commit is contained in:
niksedk 2022-07-14 16:16:00 +02:00
parent 9d3c300d71
commit d003fa6b8e
11 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
LanguageMaster.xml
View File

@ -2387,6 +2387,7 @@ can edit in same subtitle file (collaboration)</Information>
<GoToNextSubtitleAndPlay>Go to next line and play</GoToNextSubtitleAndPlay>
<ToggleFocus>Toggle focus between list view and subtitle text box</ToggleFocus>
<ToggleFocusWaveform>Toggle focus between list view and waveform/spectrogram</ToggleFocusWaveform>
<ToggleFocusWaveformTextBox>Toggle focus between text box and waveform/spectrogram</ToggleFocusWaveformTextBox>
<ToggleDialogDashes>Toggle dialog dashes</ToggleDialogDashes>
<ToggleQuotes>Toggle quotes</ToggleQuotes>
<ToggleHiTags>Toggle HI tags</ToggleHiTags>

2
src/libse/Common/Configuration.cs
View File

@ -24,7 +24,7 @@ namespace Nikse.SubtitleEdit.Core.Common
public static readonly string ShotChangesDirectory = DataDirectory + "ShotChanges" + Path.DirectorySeparatorChar;
public static readonly string AutoBackupDirectory = DataDirectory + "AutoBackup" + Path.DirectorySeparatorChar;
public static readonly string VobSubCompareDirectory = DataDirectory + "VobSub" + Path.DirectorySeparatorChar;
public static readonly string TesseractDirectory = DataDirectory + "Tesseract510" + Path.DirectorySeparatorChar;
public static readonly string TesseractDirectory = DataDirectory + "Tesseract520" + Path.DirectorySeparatorChar;
public static readonly string Tesseract302Directory = DataDirectory + "Tesseract302" + Path.DirectorySeparatorChar;
public static readonly string WaveformsDirectory = DataDirectory + "Waveforms" + Path.DirectorySeparatorChar;
public static readonly string PluginsDirectory = DataDirectory + "Plugins" + Path.DirectorySeparatorChar;

8
src/libse/Common/Settings.cs
View File

@ -2431,6 +2431,7 @@ $HorzAlign = Center
public string MainMergeDialogWithPrevious { get; set; }
public string MainToggleFocus { get; set; }
public string MainToggleFocusWaveform { get; set; }
public string MainToggleFocusWaveformTextBox { get; set; }
public string WaveformAdd { get; set; }
public string WaveformVerticalZoom { get; set; }
public string WaveformVerticalZoomOut { get; set; }
@ -9312,6 +9313,12 @@ $HorzAlign = Center
shortcuts.MainToggleFocusWaveform = subNode.InnerText;
}
subNode = node.SelectSingleNode("MainToggleFocusWaveformTextBox");
if (subNode != null)
{
shortcuts.MainToggleFocusWaveformTextBox = subNode.InnerText;
}
subNode = node.SelectSingleNode("WaveformAdd");
if (subNode != null)
{
@ -10791,6 +10798,7 @@ $HorzAlign = Center
textWriter.WriteElementString("MainMergeDialogWithPrevious", shortcuts.MainMergeDialogWithPrevious);
textWriter.WriteElementString("MainToggleFocus", shortcuts.MainToggleFocus);
textWriter.WriteElementString("MainToggleFocusWaveform", shortcuts.MainToggleFocusWaveform);
textWriter.WriteElementString("MainToggleFocusWaveformTextBox", shortcuts.MainToggleFocusWaveformTextBox);
textWriter.WriteElementString("WaveformAdd", shortcuts.WaveformAdd);
textWriter.WriteElementString("WaveformVerticalZoom", shortcuts.WaveformVerticalZoom);
textWriter.WriteElementString("WaveformVerticalZoomOut", shortcuts.WaveformVerticalZoomOut);

13
src/ui/Forms/Main.cs
View File

@ -16426,6 +16426,19 @@ namespace Nikse.SubtitleEdit.Forms
e.SuppressKeyPress = true;
}
else if (_shortcuts.MainToggleFocusWaveformTextBox == e.KeyData)
{
if (textBoxListViewText.Focused || textBoxListViewTextOriginal.Focused)
{
audioVisualizer.Focus();
}
else if (audioVisualizer.Focused)
{
textBoxListViewText.Focus();
}
e.SuppressKeyPress = true;
}
else if (_shortcuts.MainGeneralGoToFirstSelectedLine == e.KeyData) //Locate first selected line in subtitle listview
{
if (SubtitleListview1.SelectedItems.Count > 0)

2
src/ui/Forms/Ocr/DownloadTesseract5.cs
View File

@ -10,7 +10,7 @@ namespace Nikse.SubtitleEdit.Forms.Ocr
{
public sealed partial class DownloadTesseract5 : Form
{
public const string TesseractDownloadUrl = "https://github.com/SubtitleEdit/support-files/raw/master/Tesseract510.tar.gz";
public const string TesseractDownloadUrl = "https://github.com/SubtitleEdit/support-files/raw/master/Tesseract520.tar.gz";
public DownloadTesseract5(string version)
{

2
src/ui/Forms/Ocr/VobSubOcr.cs
View File

@ -327,7 +327,7 @@ namespace Nikse.SubtitleEdit.Forms.Ocr
// Dictionaries/spellchecking/fixing
private OcrFixEngine _ocrFixEngine;
private int _tesseractOcrAutoFixes;
private string Tesseract5Version = "5.1.0";
private string Tesseract5Version = "5.2.0";
private Subtitle _bdnXmlOriginal;
private Subtitle _bdnXmlSubtitle;

1
src/ui/Forms/Options/Settings.cs
View File

@ -1467,6 +1467,7 @@ namespace Nikse.SubtitleEdit.Forms.Options
AddNode(listViewNode, language.MergeDialogWithPrevious, nameof(Configuration.Settings.Shortcuts.MainMergeDialogWithPrevious));
AddNode(listViewNode, language.ToggleFocus, nameof(Configuration.Settings.Shortcuts.MainToggleFocus));
AddNode(listViewNode, language.ToggleFocusWaveform, nameof(Configuration.Settings.Shortcuts.MainToggleFocusWaveform));
AddNode(listViewNode, language.ToggleFocusWaveformTextBox, nameof(Configuration.Settings.Shortcuts.MainToggleFocusWaveformTextBox));
AddNode(listViewNode, language.ToggleDialogDashes, nameof(Configuration.Settings.Shortcuts.MainListViewToggleDashes));
AddNode(listViewNode, language.Alignment, nameof(Configuration.Settings.Shortcuts.MainListViewAlignment), true);
AddNode(listViewNode, language.CopyTextOnly, nameof(Configuration.Settings.Shortcuts.MainListViewCopyText));

1
src/ui/Logic/Language.cs
View File

@ -2717,6 +2717,7 @@ can edit in same subtitle file (collaboration)",
GoToNextSubtitleAndPlay = "Go to next line and play",
ToggleFocus = "Toggle focus between list view and subtitle text box",
ToggleFocusWaveform = "Toggle focus between list view and waveform/spectrogram",
ToggleFocusWaveformTextBox = "Toggle focus between text box and waveform/spectrogram",
ToggleDialogDashes = "Toggle dialog dashes",
ToggleQuotes = "Toggle quotes",
ToggleHiTags = "Toggle HI tags",

3
src/ui/Logic/LanguageDeserializer.cs
View File

@ -6532,6 +6532,9 @@ namespace Nikse.SubtitleEdit.Logic
case "Settings/ToggleFocusWaveform":
language.Settings.ToggleFocusWaveform = reader.Value;
break;
case "Settings/ToggleFocusWaveformTextBox":
language.Settings.ToggleFocusWaveformTextBox = reader.Value;
break;
case "Settings/ToggleDialogDashes":
language.Settings.ToggleDialogDashes = reader.Value;
break;

1
src/ui/Logic/LanguageStructure.cs
View File

@ -2570,6 +2570,7 @@
public string GoToNextSubtitleAndPlay { get; set; }
public string ToggleFocus { get; set; }
public string ToggleFocusWaveform { get; set; }
public string ToggleFocusWaveformTextBox { get; set; }
public string ToggleDialogDashes { get; set; }
public string ToggleQuotes { get; set; }
public string ToggleHiTags { get; set; }

2
src/ui/Logic/MainShortcuts.cs
View File

@ -171,6 +171,7 @@ namespace Nikse.SubtitleEdit.Logic
public Keys MainMergeDialogWithPrevious { get; set; }
public Keys MainToggleFocus { get; set; }
public Keys MainToggleFocusWaveform { get; set; }
public Keys MainToggleFocusWaveformTextBox { get; set; }
public Keys MainWaveformAdd { get; set; }
public Keys MainListViewToggleDashes { get; set; }
public Keys MainListViewToggleQuotes { get; set; }
@ -429,6 +430,7 @@ namespace Nikse.SubtitleEdit.Logic
MainMergeDialogWithPrevious = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainMergeDialogWithPrevious);
MainToggleFocus = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainToggleFocus);
MainToggleFocusWaveform = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainToggleFocusWaveform);
MainToggleFocusWaveformTextBox = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainToggleFocusWaveformTextBox);
MainWaveformAdd = UiUtil.GetKeys(Configuration.Settings.Shortcuts.WaveformAdd);
WaveformVerticalZoom = UiUtil.GetKeys(Configuration.Settings.Shortcuts.WaveformVerticalZoom);
WaveformVerticalZoomOut = UiUtil.GetKeys(Configuration.Settings.Shortcuts.WaveformVerticalZoomOut);