Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-28 06:52:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #718 from ivandrofly/fix/patch_02

Browse Source 
Optimization + Refact
This commit is contained in:
Nikolaj Olsson 2015-05-07 20:30:34 +02:00
commit f85132288a
4 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Forms/Main.cs
View File

@ -4357,7 +4357,7 @@ namespace Nikse.SubtitleEdit.Forms
private void ReplaceViaRegularExpression() private void ReplaceViaRegularExpression()
{ {
var r = new Regex(_findHelper.FindText, RegexOptions.Multiline); var r = new Regex(_findHelper.FindText, RegexOptions.Multiline);
if (_findHelper.ReplaceText.Contains("$")) if (_findHelper.ReplaceText.Contains('$'))
{ {
string result = r.Replace(textBoxListViewText.Text, _findHelper.ReplaceText); string result = r.Replace(textBoxListViewText.Text, _findHelper.ReplaceText);
if (result != textBoxListViewText.Text) if (result != textBoxListViewText.Text)
@ -4685,9 +4685,9 @@ namespace Nikse.SubtitleEdit.Forms
{ {
// we only update selected lines // we only update selected lines
int i = 0; int i = 0;
List<int> deletes = new List<int>();
if (_networkSession != null) if (_networkSession != null)
{ {
var deletes = new List<int>();
_networkSession.TimerStop(); _networkSession.TimerStop();
foreach (int index in SubtitleListview1.SelectedIndices) foreach (int index in SubtitleListview1.SelectedIndices)
{ {
@ -4708,13 +4708,13 @@ namespace Nikse.SubtitleEdit.Forms
} }
else else
{ {
foreach (int index in SubtitleListview1.SelectedIndices) for (int index = SubtitleListview1.SelectedIndices.Count - 1; index >= 0; index--)
{ {
var pOld = _subtitle.Paragraphs[index]; var pOld = _subtitle.Paragraphs[index];
var p = fixErrors.FixedSubtitle.GetParagraphOrDefaultById(pOld.ID); var p = fixErrors.FixedSubtitle.GetParagraphOrDefaultById(pOld.ID);
if (p == null) if (p == null)
{ {
deletes.Add(index); _subtitle.Paragraphs.RemoveAt(index);
} }
else else
{ {
@ -4722,11 +4722,6 @@ namespace Nikse.SubtitleEdit.Forms
} }
i++; i++;
} }
deletes.Reverse();
foreach (int index in deletes)
{
_subtitle.Paragraphs.RemoveAt(index);
}
} }
ShowStatus(_language.CommonErrorsFixedInSelectedLines); ShowStatus(_language.CommonErrorsFixedInSelectedLines);
} }
@ -4825,14 +4820,14 @@ namespace Nikse.SubtitleEdit.Forms
} }
ReloadFromSourceView(); ReloadFromSourceView();
double lengthInSeconds = 0;
if (mediaPlayer.VideoPlayer != null)
lengthInSeconds = mediaPlayer.Duration;
if (Configuration.Settings.Tools.SplitAdvanced) if (Configuration.Settings.Tools.SplitAdvanced)
{ {
using (var split = new Split()) using (var split = new Split())
{ {
double lengthInSeconds = 0;
if (mediaPlayer.VideoPlayer != null)
lengthInSeconds = mediaPlayer.Duration;
split.Initialize(_subtitle, _fileName, GetCurrentSubtitleFormat()); split.Initialize(_subtitle, _fileName, GetCurrentSubtitleFormat());
if (split.ShowDialog(this) == DialogResult.OK) if (split.ShowDialog(this) == DialogResult.OK)
{ {
@ -4849,9 +4844,6 @@ namespace Nikse.SubtitleEdit.Forms
{ {
using (var splitSubtitle = new SplitSubtitle()) using (var splitSubtitle = new SplitSubtitle())
{ {
double lengthInSeconds = 0;
if (mediaPlayer.VideoPlayer != null)
lengthInSeconds = mediaPlayer.Duration;
splitSubtitle.Initialize(_subtitle, _fileName, GetCurrentSubtitleFormat(), GetCurrentEncoding(), lengthInSeconds); splitSubtitle.Initialize(_subtitle, _fileName, GetCurrentSubtitleFormat(), GetCurrentEncoding(), lengthInSeconds);
if (splitSubtitle.ShowDialog(this) == DialogResult.OK) if (splitSubtitle.ShowDialog(this) == DialogResult.OK)
{ {
@ -11357,7 +11349,7 @@ namespace Nikse.SubtitleEdit.Forms
var tmp = new Subtitle(); var tmp = new Subtitle();
var format = new SubRip(); var format = new SubRip();
var list = new List<string>(); var list = new List<string>();
foreach (string line in text.Replace(Environment.NewLine, "\n").Split('\n')) foreach (string line in text.SplitToLines())
list.Add(line); list.Add(line);
format.LoadSubtitle(tmp, list, null); format.LoadSubtitle(tmp, list, null);
if (SubtitleListview1.SelectedItems.Count == 1 && tmp.Paragraphs.Count > 0) if (SubtitleListview1.SelectedItems.Count == 1 && tmp.Paragraphs.Count > 0)
@ -14646,8 +14638,9 @@ namespace Nikse.SubtitleEdit.Forms
{ {
if (string.IsNullOrEmpty(_fileName)) if (string.IsNullOrEmpty(_fileName))
{ {
saveFileDialog1.InitialDirectory = Path.GetDirectoryName(fileName); var dirName = Path.GetDirectoryName(fileName);
openFileDialog1.InitialDirectory = Path.GetDirectoryName(fileName); saveFileDialog1.InitialDirectory = dirName;
openFileDialog1.InitialDirectory = dirName;
} }
OpenVideo(fileName); OpenVideo(fileName);
} }

4
src/Resources/OpenOfficeDictionaries.xml
View File

@ -242,8 +242,8 @@
<Dictionary> <Dictionary>
<EnglishName>Portuguese (Brazilian)</EnglishName> <EnglishName>Portuguese (Brazilian)</EnglishName>
<NativeName>Português (do Brasil)</NativeName> <NativeName>Português (do Brasil)</NativeName>
<DownloadLink>http://extensions.libreoffice.org/extension-center/vero-verificador-ortografico-e-hifenizador-em-portugues-do-brasil/pscreleasefolder.2012-01-04.1563120832/2.1/vero_pt_br_v210aoc.oxt</DownloadLink> <DownloadLink>http://extensions.libreoffice.org/extension-center/vero-verificador-ortografico-e-hifenizador-em-portugues-do-brasil/pscreleasefolder.2012-01-04.1563120832/2.1.2/vero_pt_br_v212aoc.oxt</DownloadLink>
<Description>VERO - VERificador Ortográfico e hifenizador em Português do Brasil 2.1</Description> <Description>VERO - VERificador Ortográfico e hifenizador em Português do Brasil 2.1.2</Description>
</Dictionary> </Dictionary>
<Dictionary> <Dictionary>
<EnglishName>Portuguese (Portugal)</EnglishName> <EnglishName>Portuguese (Portugal)</EnglishName>

BIN
src/Resources/OpenOfficeDictionaries.xml.gz
View File

Binary file not shown.