Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-25 12:44:46 +01:00
Code Issues Projects Releases Wiki Activity

Some fixes from pull request #556 - thx Ivandrofly :)

Browse Source
This commit is contained in:
niksedk 2015-02-22 16:50:05 +01:00
parent 6a48fa74cf
commit 77de6562c2
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Forms/BatchConvert.cs
View File

@ -124,15 +124,15 @@ namespace Nikse.SubtitleEdit.Forms
timeUpDownAdjust.MaskedTextBox.Text = "000000000";
comboBoxFrameRateFrom.Items.Add((23.976).ToString(CultureInfo.InvariantCulture));
comboBoxFrameRateFrom.Items.Add((24.0).ToString(CultureInfo.InvariantCulture));
comboBoxFrameRateFrom.Items.Add((25.0).ToString(CultureInfo.InvariantCulture));
comboBoxFrameRateFrom.Items.Add((29.97).ToString(CultureInfo.InvariantCulture));
comboBoxFrameRateFrom.Items.Add(23.976);
comboBoxFrameRateFrom.Items.Add(24.0);
comboBoxFrameRateFrom.Items.Add(25.0);
comboBoxFrameRateFrom.Items.Add(29.97);
comboBoxFrameRateTo.Items.Add((23.976).ToString(CultureInfo.InvariantCulture));
comboBoxFrameRateTo.Items.Add((24.0).ToString(CultureInfo.InvariantCulture));
comboBoxFrameRateTo.Items.Add((25.0).ToString(CultureInfo.InvariantCulture));
comboBoxFrameRateTo.Items.Add((29.97).ToString(CultureInfo.InvariantCulture));
comboBoxFrameRateTo.Items.Add(23.976);
comboBoxFrameRateTo.Items.Add(24.0);
comboBoxFrameRateTo.Items.Add(25.0);
comboBoxFrameRateTo.Items.Add(29.97);
FixLargeFonts();
@ -655,8 +655,8 @@ namespace Nikse.SubtitleEdit.Forms
{
if (sub != null && sub.Paragraphs.Count > 0 && sub.Paragraphs[0].Duration.TotalMilliseconds < 1001)
{
if (sub.Paragraphs[0].Text.StartsWith("29.") || sub.Paragraphs[0].Text.StartsWith("23.") ||
sub.Paragraphs[0].Text.StartsWith("29,") || sub.Paragraphs[0].Text.StartsWith("23,") ||
if (sub.Paragraphs[0].Text.StartsWith("29.", StringComparison.Ordinal) || sub.Paragraphs[0].Text.StartsWith("23.", StringComparison.Ordinal) ||
sub.Paragraphs[0].Text.StartsWith("29,", StringComparison.Ordinal) || sub.Paragraphs[0].Text.StartsWith("23,", StringComparison.Ordinal) ||
sub.Paragraphs[0].Text == "24" || sub.Paragraphs[0].Text == "25" ||
sub.Paragraphs[0].Text == "30" || sub.Paragraphs[0].Text == "60")
sub.Paragraphs.RemoveAt(0);
@ -755,11 +755,7 @@ namespace Nikse.SubtitleEdit.Forms
}
if (checkBoxRemoveFormatting.Checked)
{
p.Text = HtmlUtil.RemoveHtmlTags(p.Text);
if (p.Text.StartsWith('{') && p.Text.Length > 6 && p.Text[5] == '}')
p.Text = p.Text.Remove(0, 6);
if (p.Text.StartsWith('{') && p.Text.Length > 6 && p.Text[4] == '}')
p.Text = p.Text.Remove(0, 5);
p.Text = HtmlUtil.RemoveHtmlTags(p.Text, true);
}
}
sub.RemoveEmptyLines();