Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-23 03:33:18 +01:00
Code Issues Projects Releases Wiki Activity

Fix somtimes not updating total line length - thx OmrSi :)

Browse Source 
Fix adding music symbols with tags - thx OmrSi :)
Fix #3173 and Fix #3174
This commit is contained in:
Nikolaj Olsson 2018-11-12 20:31:53 +01:00
parent eb515d1e32
commit 1ff3fe8d38
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.txt
View File

@ -39,6 +39,8 @@
* Fix reading last line with zero duration - thx darnn * Fix reading last line with zero duration - thx darnn
* Fix for column paste - thx OmrSi * Fix for column paste - thx OmrSi
* Fix syntax coloring in "Fix common errors" - thx OmrSi * Fix syntax coloring in "Fix common errors" - thx OmrSi
* Fix sometimes not updating total line length - thx OmrSi
* Fix adding music symbols with tags - thx OmrSi
3.5.7 (9th August 2018) 3.5.7 (9th August 2018)

37
src/Forms/Main.cs
View File

@ -8007,6 +8007,12 @@ namespace Nikse.SubtitleEdit.Forms
} }
} }
} }
else
{
if (!textBoxHasFocus)
lineTotal.Text = string.Format(_languageGeneral.TotalLengthX, s.Length);
}
UpdateListViewTextCharactersPerSeconds(charactersPerSecond, paragraph); UpdateListViewTextCharactersPerSeconds(charactersPerSecond, paragraph);
charactersPerSecond.Left = textBox.Left + (textBox.Width - labelCharactersPerSecond.Width); charactersPerSecond.Left = textBox.Left + (textBox.Width - labelCharactersPerSecond.Width);
lineTotal.Left = textBox.Left + (textBox.Width - lineTotal.Width); lineTotal.Left = textBox.Left + (textBox.Width - lineTotal.Width);
@ -20797,37 +20803,54 @@ namespace Nikse.SubtitleEdit.Forms
SubtitleListview1.BeginUpdate(); SubtitleListview1.BeginUpdate();
foreach (int i in indices) foreach (int i in indices)
{ {
var pre = string.Empty;
int indexOfEndBracket = -1;
if (_subtitleAlternate != null && Configuration.Settings.General.AllowEditOfOriginalSubtitle) if (_subtitleAlternate != null && Configuration.Settings.General.AllowEditOfOriginalSubtitle)
{ {
var original = Utilities.GetOriginalParagraph(i, _subtitle.Paragraphs[i], _subtitleAlternate.Paragraphs); var original = Utilities.GetOriginalParagraph(i, _subtitle.Paragraphs[i], _subtitleAlternate.Paragraphs);
if (original != null) if (original != null)
{ {
pre = string.Empty;
indexOfEndBracket = original.Text.IndexOf('}');
if (original.Text.StartsWith("{\\", StringComparison.Ordinal) && indexOfEndBracket > 1)
{
pre = original.Text.Substring(0, indexOfEndBracket + 1);
original.Text = original.Text.Remove(0, indexOfEndBracket + 1);
}
if (original.Text.Contains(tag)) if (original.Text.Contains(tag))
{ {
original.Text = original.Text.Replace(tag, string.Empty); original.Text = original.Text.Replace(tag, string.Empty).Trim();
original.Text = original.Text.Replace(Environment.NewLine + " ", Environment.NewLine).Replace(" " + Environment.NewLine, Environment.NewLine).Trim(); original.Text = pre + original.Text.Replace(Environment.NewLine + " ", Environment.NewLine).Replace(" " + Environment.NewLine, Environment.NewLine).Trim();
} }
else else
{ {
if (Configuration.Settings.Tools.MusicSymbolStyle.Equals("single", StringComparison.OrdinalIgnoreCase)) if (Configuration.Settings.Tools.MusicSymbolStyle.Equals("single", StringComparison.OrdinalIgnoreCase))
original.Text = string.Format("{0} {1}", tag, original.Text.Replace(Environment.NewLine, Environment.NewLine + tag + " ")); original.Text = string.Format("{0}{1} {2}", pre, tag, original.Text.Replace(Environment.NewLine, Environment.NewLine + tag + " "));
else else
original.Text = string.Format("{0} {1} {0}", tag, original.Text.Replace(Environment.NewLine, " " + tag + Environment.NewLine + tag + " ")); original.Text = string.Format("{0}{1} {2} {1}", pre, tag, original.Text.Replace(Environment.NewLine, " " + tag + Environment.NewLine + tag + " "));
} }
SubtitleListview1.SetAlternateText(i, original.Text); SubtitleListview1.SetAlternateText(i, original.Text);
} }
} }
pre = string.Empty;
var p = _subtitle.Paragraphs[i];
indexOfEndBracket = p.Text.IndexOf('}');
if (p.Text.StartsWith("{\\", StringComparison.Ordinal) && indexOfEndBracket > 1)
{
pre = p.Text.Substring(0, indexOfEndBracket + 1);
p.Text = p.Text.Remove(0, indexOfEndBracket + 1);
}
if (_subtitle.Paragraphs[i].Text.Contains(tag)) if (_subtitle.Paragraphs[i].Text.Contains(tag))
{ {
_subtitle.Paragraphs[i].Text = _subtitle.Paragraphs[i].Text.Replace("♪", string.Empty).Replace(Environment.NewLine + " ", Environment.NewLine).Replace(" " + Environment.NewLine, Environment.NewLine).Trim(); _subtitle.Paragraphs[i].Text = pre + _subtitle.Paragraphs[i].Text.Replace("♪", string.Empty).Replace(Environment.NewLine + " ", Environment.NewLine).Replace(" " + Environment.NewLine, Environment.NewLine).Trim();
} }
else else
{ {
if (Configuration.Settings.Tools.MusicSymbolStyle.Equals("single", StringComparison.OrdinalIgnoreCase)) if (Configuration.Settings.Tools.MusicSymbolStyle.Equals("single", StringComparison.OrdinalIgnoreCase))
_subtitle.Paragraphs[i].Text = string.Format("{0} {1}", tag, _subtitle.Paragraphs[i].Text.Replace(Environment.NewLine, Environment.NewLine + tag + " ")); p.Text = string.Format("{0}{1} {2}", pre, tag, p.Text.Replace(Environment.NewLine, Environment.NewLine + tag + " "));
else else
_subtitle.Paragraphs[i].Text = string.Format("{0} {1} {0}", tag, _subtitle.Paragraphs[i].Text.Replace(Environment.NewLine, " " + tag + Environment.NewLine + tag + " ")); p.Text = string.Format("{0}{1} {2} {1}", pre, tag, p.Text.Replace(Environment.NewLine, " " + tag + Environment.NewLine + tag + " "));
} }
SubtitleListview1.SetText(i, _subtitle.Paragraphs[i].Text); SubtitleListview1.SetText(i, _subtitle.Paragraphs[i].Text);
} }