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

remove trailing spaces and bump the needed Inno Setup version to 5.5.2

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1432 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
XhmikosR 2012-10-21 10:59:47 +00:00
parent 62b808057d
commit 57357ce31a
15 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
installer/Subtitle_Edit_installer.iss
View File

@ -22,8 +22,8 @@
; preprocessor checks
#if VER < EncodeVer(5,5,1)
#error Update your Inno Setup version (5.5.1 or newer)
#if VER < EncodeVer(5,5,2)
#error Update your Inno Setup version (5.5.2 or newer)
#endif
#ifndef UNICODE

2
src/Controls/SubtitleListView.cs
View File

@ -462,7 +462,7 @@ namespace Nikse.SubtitleEdit.Controls
int noOfLines = paragraph.Text.Split(Environment.NewLine[0]).Length;
string s = Utilities.RemoveHtmlTags(paragraph.Text);
foreach (string line in s.Split(Environment.NewLine.ToCharArray(), StringSplitOptions.RemoveEmptyEntries))
{
{
if (line.Length > Configuration.Settings.General.SubtitleLineMaximumLength)
{
item.SubItems[ColumnIndexText].BackColor = Configuration.Settings.Tools.ListViewSyntaxErrorColor;

2
src/Forms/AddToNames.cs
View File

@ -75,7 +75,7 @@ namespace Nikse.SubtitleEdit.Forms
{
comboBoxDictionaries.Items.Add(name);
if (hunspellName != null && name.ToLower() == hunspellName.ToLower())
comboBoxDictionaries.SelectedIndex = comboBoxDictionaries.Items.Count - 1;
comboBoxDictionaries.SelectedIndex = comboBoxDictionaries.Items.Count - 1;
}
}

2
src/Forms/AddToOcrReplaceList.cs
View File

@ -102,7 +102,7 @@ namespace Nikse.SubtitleEdit.Forms
wholeWords.AppendChild(node);
}
doc.Save(replaceListXmlFileName);
doc.Save(replaceListXmlFileName);
DialogResult = DialogResult.OK;
NewSource = key;
NewTarget = value;

8
src/Forms/AddToUserDic.cs
View File

@ -22,7 +22,7 @@ namespace Nikse.SubtitleEdit.Forms
}
private void FixLargeFonts()
{
{
Graphics graphics = this.CreateGraphics();
SizeF textSize = graphics.MeasureString(buttonOK.Text, this.Font);
if (textSize.Height > buttonOK.Height - 4)
@ -59,7 +59,7 @@ namespace Nikse.SubtitleEdit.Forms
language = language.Substring(0, language.IndexOf("]"));
var userWordList = new List<string>();
Utilities.LoadUserWordList(userWordList, language);
if (!string.IsNullOrEmpty(language) && NewWord.Length > 1 && !userWordList.Contains(NewWord))
{
@ -67,7 +67,7 @@ namespace Nikse.SubtitleEdit.Forms
DialogResult = DialogResult.OK;
return;
}
DialogResult = DialogResult.Cancel;
DialogResult = DialogResult.Cancel;
}
internal void Initialize(Subtitle subtitle, string hunspellName, string text)
@ -82,7 +82,7 @@ namespace Nikse.SubtitleEdit.Forms
{
comboBoxDictionaries.Items.Add(name);
if (hunspellName != null && name.ToLower() == hunspellName.ToLower())
comboBoxDictionaries.SelectedIndex = comboBoxDictionaries.Items.Count - 1;
comboBoxDictionaries.SelectedIndex = comboBoxDictionaries.Items.Count - 1;
}
}

8
src/Forms/ImportText.cs
View File

@ -295,16 +295,16 @@ namespace Nikse.SubtitleEdit.Forms
{
string t = sb.ToString().Trim();
string[] tarr = t.Replace("\r\n", "\n").Split('\n');
if (checkBoxMergeShortLines.Checked == false && tarr.Length == 3 &&
tarr[0].Length < Configuration.Settings.General.SubtitleLineMaximumLength &&
if (checkBoxMergeShortLines.Checked == false && tarr.Length == 3 &&
tarr[0].Length < Configuration.Settings.General.SubtitleLineMaximumLength &&
tarr[1].Length < Configuration.Settings.General.SubtitleLineMaximumLength &&
tarr[2].Length < Configuration.Settings.General.SubtitleLineMaximumLength)
{
_subtitle.Paragraphs.Add(new Paragraph() { Text = tarr[0] + Environment.NewLine + tarr[1] });
return;
}
else if (checkBoxMergeShortLines.Checked == false && tarr.Length == 2 &&
tarr[0].Length < Configuration.Settings.General.SubtitleLineMaximumLength &&
else if (checkBoxMergeShortLines.Checked == false && tarr.Length == 2 &&
tarr[0].Length < Configuration.Settings.General.SubtitleLineMaximumLength &&
tarr[1].Length < Configuration.Settings.General.SubtitleLineMaximumLength)
{
_subtitle.Paragraphs.Add(new Paragraph() { Text = tarr[0] + Environment.NewLine + tarr[1] });

6
src/Forms/Main.cs
View File

@ -3930,7 +3930,7 @@ namespace Nikse.SubtitleEdit.Forms
var list = new List<string>(textBoxSource.Lines);
if (format != null && format.IsMine(list, null))
format.LoadSubtitle(temp, list, null);
else
else
format = temp.ReloadLoadSubtitle(new List<string>(textBoxSource.Lines), null);
if (format == null)
@ -7908,7 +7908,7 @@ namespace Nikse.SubtitleEdit.Forms
}
_formPositionsAndSizes.SavePositionAndSize(formSubOcr);
}
return count > 0;
}
@ -14235,7 +14235,7 @@ namespace Nikse.SubtitleEdit.Forms
Configuration.Settings.General.CurrentFrameRate = CurrentFrameRate;
if (_loading)
return;
SubtitleListview1.UpdateFrames(_subtitle);
}

2
src/Forms/PluginsGet.cs
View File

@ -116,7 +116,7 @@ namespace Nikse.SubtitleEdit.Forms
MessageBox.Show(_language.NewVersionOfSubtitleEditRequired);
DialogResult = DialogResult.Cancel;
return;
}
}
foreach (XmlNode node in _pluginDoc.DocumentElement.SelectNodes("Plugin"))
{

2
src/Forms/VobSubOcr.cs
View File

@ -3729,7 +3729,7 @@ namespace Nikse.SubtitleEdit.Forms
LoadOcrFixEngine();
MessageBox.Show(string.Format(Configuration.Settings.Language.Main.OcrReplacePairXAdded, form.NewSource, form.NewTarget));
}
else
else
{
MessageBox.Show(string.Format(Configuration.Settings.Language.Main.OcrReplacePairXNotAdded, form.NewSource, form.NewTarget));
}

2
src/Logic/Settings.cs
View File

@ -1661,7 +1661,7 @@ namespace Nikse.SubtitleEdit.Logic
settings.Shortcuts.MainToolsAutoDuration = subNode.InnerText;
subNode = node.SelectSingleNode("MainToolsBeamer");
if (subNode != null)
settings.Shortcuts.MainToolsBeamer = subNode.InnerText;
settings.Shortcuts.MainToolsBeamer = subNode.InnerText;
subNode = node.SelectSingleNode("MainToolsToggleTranslationOriginalInPreviews");
if (subNode != null)
settings.Shortcuts.MainEditToggleTranslationOriginalInPreviews = subNode.InnerText;

2
src/Logic/SubtitleFormats/Pac.cs
View File

@ -680,7 +680,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
text = text.Replace(Environment.NewLine, Encoding.Default.GetString(new byte[] { 0xfe, 0x02, 0x03 })); // fix line breaks
Encoding encoding = GetEncoding(_codePage);
byte[] textBuffer;
byte[] textBuffer;
if (_codePage == 3)
textBuffer = GetArabicBytes(Utilities.FixEnglishTextInRightToLeftLanguage(text, "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"));

2
src/Logic/SubtitleFormats/ScenaristClosedCaptions.cs
View File

@ -341,7 +341,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
"9134", // "",
"91b5", // "",
"91b6", // "£",
"9137", // "♪",
"9137", // "♪",
"9138", // "à",
"91b9", // "",
"91ba", // "è",

2
src/Logic/SubtitleFormats/TimedText10.cs
View File

@ -326,7 +326,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
lines.ForEach(line => sb.AppendLine(line));
var xml = new XmlDocument();
xml.LoadXml(sb.ToString());
string ns = "http://www.w3.org/ns/ttml";
var nsmgr = new XmlNamespaceManager(xml.NameTable);
nsmgr.AddNamespace("ttml", ns);

6
src/Logic/SubtitleFormats/UnknownSubtitle36.cs
View File

@ -61,7 +61,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
public override string ToText(Subtitle subtitle, string title)
{
const string paragraphWriteFormat = "{0} , {1} ,{2}\r\n";
const string timeFormat = "{0:00}:{1:00}:{2:00}:{3:00}";
const string timeFormat = "{0:00}:{1:00}:{2:00}:{3:00}";
var sb = new StringBuilder();
foreach (Paragraph p in subtitle.Paragraphs)
{
@ -84,7 +84,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
{
string[] threePart = line.Split(",".ToCharArray(), StringSplitOptions.None);
var p = new Paragraph();
if (threePart.Length > 2 &&
if (threePart.Length > 2 &&
line.Length > 58 &&
GetTimeCode(p.StartTime, threePart[0].Trim()) &&
GetTimeCode(p.EndTime, threePart[1].Trim()))
@ -102,7 +102,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
}
}
}
private static bool GetTimeCode(TimeCode timeCode, string timeString)
{
try

4
src/Test/SubtitleFormatsTest.cs
View File

@ -539,7 +539,7 @@ Dialogue: Marked=0,0:00:01.00,0:00:03.00,Default,NTP,0000,0000,0000,!Effect," +
subtitle.Paragraphs.Add(new Paragraph("Line 2", 4000, 7000));
subtitle.Paragraphs.Add(new Paragraph("Line 3", 8000, 11000));
subtitle.Paragraphs.Add(new Paragraph("Line 4", 12000, 15000));
foreach (SubtitleFormat format in SubtitleFormat.AllSubtitleFormats)
{
string text = format.ToText(subtitle, "test");
@ -580,7 +580,7 @@ Dialogue: Marked=0,0:00:01.00,0:00:03.00,Default,NTP,0000,0000,0000,!Effect," +
// {
// if (innerFormat.IsMine(list, null))
// {
// if (format.FriendlyName != innerFormat.FriendlyName &&
// if (format.FriendlyName != innerFormat.FriendlyName &&
// !format.FriendlyName.Contains("Final Cut"))
// {
//// Assert.AreEqual(format.FriendlyName, innerFormat.FriendlyName, text);