mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-28 06:52:35 +01:00
Merge branch 'master' of https://github.com/SubtitleEdit/subtitleedit
This commit is contained in:
commit
c24fffa85e
@ -4,17 +4,17 @@
|
||||
3.4.1 (xth August 2014)
|
||||
* NEW:
|
||||
* Added new subtitle formats
|
||||
* Can now import new time codes into ocr window - thx Music Fan
|
||||
* Can now import new time codes into OCR window - thx Music Fan
|
||||
* IMPROVED:
|
||||
* Split line improvement regarding italic/dialogue - thx moob
|
||||
* Added .avs to list of known video formats - thx Peter
|
||||
* Avid Stl format detection improved
|
||||
* Allow adding words to user dic with a length of 1 - thx Betsy25
|
||||
* Avid STL format detection improved
|
||||
* Allow adding words to user dictionary with a length of 1 - thx Betsy25
|
||||
* FIXED:
|
||||
* Fixed crash in Visual Sync when using VLC as video player
|
||||
* Do not lock explorer when dropping files (for ocr) in SE main list view - thx Jar
|
||||
* Do not lock explorer when dropping files (for OCR) in SE main list view - thx Jar
|
||||
* Fixed dialogue issue in "auto-break lines" - thx fred
|
||||
* Framerate convertion - fix for time based subs
|
||||
* Framerate conversion - fix for time based subs
|
||||
* Fixed issue regarding showing current vs original texts on previews - thx Krystian
|
||||
* Fixed bug in break long lines - thx moob
|
||||
* Fixed bug in export/boxing - thx mood
|
||||
|
@ -3210,7 +3210,7 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
|
||||
item.Selected = !item.Selected;
|
||||
subtitleListView1.EndUpdate();
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -19584,6 +19584,6 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
Configuration.Settings.General.LastCheckForUpdates = DateTime.Now;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -322,7 +322,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
foreach (Paragraph p in Paragraphs)
|
||||
{
|
||||
p.StartTime.TotalMilliseconds = p.StartTime.TotalMilliseconds * factor;
|
||||
|
@ -187,7 +187,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
|
||||
public static List<string> ReadArray(string s, string tag)
|
||||
{
|
||||
var list = new List<string>();
|
||||
|
||||
|
||||
int startIndex = s.IndexOf("\"" + tag + "\"");
|
||||
if (startIndex == -1)
|
||||
startIndex = s.IndexOf("'" + tag + "'");
|
||||
@ -202,7 +202,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
|
||||
int nextTag = 0;
|
||||
int oldStart = 0;
|
||||
while (tagLevel >= 1 && nextTag >= 0 && nextTag+1 < res.Length)
|
||||
{
|
||||
{
|
||||
if (res.Substring(oldStart, 1) == "\"")
|
||||
{
|
||||
nextTag = res.IndexOf('"', oldStart + 1);
|
||||
@ -216,7 +216,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
|
||||
list.Add(newValue.Remove(0, 1));
|
||||
oldStart = nextTag + 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (res.Substring(oldStart, 1) != "[" && res.Substring(oldStart, 1) != "]")
|
||||
{
|
||||
nextTag = res.IndexOf(',', oldStart + 1);
|
||||
@ -255,7 +255,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
@ -118,7 +118,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
|
||||
string text = texts[i];
|
||||
if (text.StartsWith("["))
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user