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

Minor cleanup/improvements

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@696 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2011-10-06 16:33:32 +00:00
parent 914a53234d
commit 6afe2d16ac
5 changed files with 53 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/Forms/Main.cs
View File

@ -5872,13 +5872,13 @@ namespace Nikse.SubtitleEdit.Forms
}
}
var formSubOcr = new VobSubOcr();
formSubOcr.Initialize(subPicturesWithTimeCodes, Configuration.Settings.VobSubOcr, fileName); //TODO - language???
if (formSubOcr.ShowDialog(this) == DialogResult.OK)
{
ResetSubtitle();
_subtitle.Paragraphs.Clear();
MakeHistoryForUndo(_language.BeforeImportFromMatroskaFile);
_subtitleListViewIndex = -1;
FileNew();
_subtitle.WasLoadedWithFrameNumbers = false;
foreach (Paragraph p in formSubOcr.SubtitleFromOcr.Paragraphs)
_subtitle.Paragraphs.Add(p);
@ -5896,14 +5896,12 @@ namespace Nikse.SubtitleEdit.Forms
Configuration.Settings.Save();
}
}
else
{
MakeHistoryForUndo(_language.BeforeImportFromMatroskaFile);
_subtitleListViewIndex = -1;
FileNew();
_subtitle.Paragraphs.Clear();
for (int i = 0; i < mp4SubtitleTrack.Mdia.Minf.Stbl.EndTimeCodes.Count; i++)
{
@ -6742,6 +6740,33 @@ namespace Nikse.SubtitleEdit.Forms
_fileDateTime = new DateTime();
}
}
else if (e.Modifiers == (Keys.Control | Keys.Shift | Keys.Alt) && e.KeyCode == Keys.M) // Ctrl+Shift+U = switch original/current
{
if (_subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count > 0 && _networkSession == null)
{
if (ContinueNewOrExit())
{
Subtitle subtitle = new Subtitle();
foreach (var p in _subtitle.Paragraphs)
{
var newP = new Paragraph(p);
var original = Utilities.GetOriginalParagraph(_subtitle.GetIndex(p), p, _subtitleAlternate.Paragraphs);
if (original != null)
newP.Text += Environment.NewLine + Environment.NewLine + original.Text;
subtitle.Paragraphs.Add(newP);
}
RemoveAlternate(true);
FileNew();
_subtitle = subtitle;
_subtitleListViewIndex = -1;
ShowSource();
SubtitleListview1.Fill(_subtitle, _subtitleAlternate);
SubtitleListview1.SelectIndexAndEnsureVisible(0);
e.SuppressKeyPress = true;
}
}
}
else if (e.KeyData == _toggleVideoDockUndock)
{
if (_isVideoControlsUnDocked)

2
src/Forms/Main.resx
View File

@ -681,7 +681,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
CAAAAk1TRnQBSQFMAgEBAgEAAVgBCwFYAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAAYABCwGAAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

10
src/Forms/VobSubOcrCharacterInspect.cs
View File

@ -182,6 +182,16 @@ namespace Nikse.SubtitleEdit.Forms
{
if (_selectedCompareNode != null)
{
if (listBoxInspectItems.SelectedIndex < 0)
return;
if (listBoxInspectItems.Items[listBoxInspectItems.SelectedIndex].ToString() == textBoxText.Text)
{
textBoxText.SelectAll();
textBoxText.Focus();
return;
}
XmlNode newNode = ImageCompareDocument.CreateElement("FileName");
XmlAttribute text = newNode.OwnerDocument.CreateAttribute("Text");
text.InnerText = textBoxText.Text;

12
src/Logic/Configuration.cs
View File

@ -39,9 +39,15 @@ namespace Nikse.SubtitleEdit.Logic
get
{
if (Utilities.IsRunningOnLinux() || Utilities.IsRunningOnMac())
return "/usr/share/tesseract-ocr/tessdata";
else
return TesseractFolder + "tessdata";
{
if (System.IO.Directory.Exists("/usr/share/tesseract-ocr/tessdata"))
return "/usr/share/tesseract-ocr/tessdata";
else if (System.IO.Directory.Exists("/usr/share/tesseract/tessdata"))
return "/usr/share/tesseract/tessdata";
else if (System.IO.Directory.Exists("/usr/share/tessdata"))
return "/usr/share/tessdata";
}
return TesseractFolder + "tessdata";
}
}

3
src/Logic/Utilities.cs
View File

@ -1093,6 +1093,9 @@ namespace Nikse.SubtitleEdit.Logic
sb.Append("*" + new Cavena890().Extension + ";");
sb.Append("*" + new Spt().Extension + ";");
sb.Append("*" + new Wsb().Extension + ";");
sb.Append("*.mp4;"); // mp4 video files (can contain subtitles)
sb.Append("*.m4v;"); // mp4 video files (can contain subtitles)
sb.Append("*.mkv;"); // matroska files (can contain subtitles)
sb.Append("*.sup;"); // blu-ray sup
sb.Append("*.son"); // SON text/tif
sb.Append("|" + Configuration.Settings.Language.General.AllFiles + "|*.*");