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

Formatting (whitespace only)

Browse Source
This commit is contained in:
Waldi Ravens 2015-12-27 07:30:41 +01:00
parent 2a083e44de
commit 93886d97cf
15 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Changelog.txt
View File

@ -125,7 +125,7 @@
* Audio visualizer: Fix crash when using shortcuts without audio
* Audio visualizer: Fix issues with HH:MM:SS:FF time code format - thx jdpurcell
* Audio visualizer: Stable end time when using HH:MM:SS:FF time code format - thx ing
* Audio visualizer: Fix new selection disappearing if scrolled out of the left - thx jdpurcell
* Audio visualizer: Fix new selection disappearing if scrolled out of the left - thx jdpurcell
* Inline margin is now loaded/saved in SSA/ASS (can only be edited in source view)
* Changed LAV Filters link from Google Code to GitHub - thx suvjunmd
* Fixed bug in FAB export regarding center alignment - thx felagund
@ -236,7 +236,7 @@
* Improved speed for "Multiple replace"
* FIXED:
* Fixed bugs in ASS/SSA loading - thx kotuwa
* Fixed bug in spell check with auto change casing of http - thx Ivandrofly
* Fixed bug in spell check with auto change casing of http - thx Ivandrofly
* Change language in "Spell check" dialog now loads correct language lists - thx Sami
* Fixed missing rule for "Fix invalid italic tags" - thx Ivandrofly
* Fixed possible freeze in video player text - thx Mafu
@ -605,7 +605,7 @@
* Added initial support for importing DVB subtitles from transport streams
* Added "File -> Import images"
* Added "Tools -> Merge lines with same text"
* Importing from plain text file, "One line is one subtitle" now has a
* Importing from plain text file, "One line is one subtitle" now has a
"Line break" option - thx Adrian
* Added XML subtitle format "FLVCoreCuePoints" - thx Jon
* Added some support for fxpxml 1.3

4
libse/Forms/FixCommonErrors/FixShortDisplayTimes.cs
View File

@ -103,7 +103,7 @@
callbacks.AddFixToListView(p, fixAction, oldCurrent, p.ToString());
}
}
// Make next subtitle duration shorter + make current subtitle duration longer
// Make next subtitle duration shorter + make current subtitle duration longer
else if (diffMs < 1000 &&
Configuration.Settings.Tools.FixShortDisplayTimesAllowMoveStartTime && Utilities.GetCharactersPerSecond(new Paragraph(next.Text, p.StartTime.TotalMilliseconds + temp.Duration.TotalMilliseconds + Configuration.Settings.General.MinimumMillisecondsBetweenLines, next.EndTime.TotalMilliseconds)) < Configuration.Settings.General.SubtitleMaximumCharactersPerSeconds)
{
@ -163,4 +163,4 @@
}
}
}
}

6
libse/NikseBitmap.cs
View File

@ -1084,8 +1084,8 @@ namespace Nikse.SubtitleEdit.Core
0, // ID length (1 bytes)
0, // no color map (1 bytes)
2, // uncompressed, true color (1 bytes)
0, 0, // Color map First Entry Index
0, 0, // Color map Length
0, 0, // Color map First Entry Index
0, 0, // Color map Length
0, // Color map Entry Size
0, 0, 0, 0, // x and y origin
(byte)(Width & 0x00FF),
@ -1093,7 +1093,7 @@ namespace Nikse.SubtitleEdit.Core
(byte)(Height & 0x00FF),
(byte)((Height & 0xFF00) >> 8),
32, // pixel depth - 32=32 bit bitmap
0 // Image Descriptor
0 // Image Descriptor
};
var pixels = new byte[_bitmapData.Length];

4
libse/SubtitleFormats/TextST.cs
View File

@ -616,7 +616,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
italic = true;
if (content.Count > 0 && content[content.Count - 1] is SubtitleRegionContentChangeFontStyle)
{
content.RemoveAt(content.Count - 1); // Remove last style tag (italic/bold will be combined)
content.RemoveAt(content.Count - 1); // Remove last style tag (italic/bold will be combined)
}
content.Add(new SubtitleRegionContentChangeFontStyle
{
@ -642,7 +642,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
bold = true;
if (content.Count > 0 && content[content.Count - 1] is SubtitleRegionContentChangeFontStyle)
{
content.RemoveAt(content.Count - 1); // Remove last style tag (italic/bold will be combined)
content.RemoveAt(content.Count - 1); // Remove last style tag (italic/bold will be combined)
}
content.Add(new SubtitleRegionContentChangeFontStyle
{

2
libse/SubtitleFormats/Ultech130.cs
View File

@ -348,7 +348,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
//}
//else if ((codeBytes[14] == '0' && codeBytes[13] == '0' && codeBytes[9] == '0' && codeBytes[6] == '0' && codeBytes[4] == '0' &&
// codeBytes[12] == '1' && codeBytes[10] == '1' && codeBytes[5] == '1') || b == 0x11)
//{ // codeBytes[10] == 0 ???
//{ // codeBytes[10] == 0 ???
// //control codes
// if (code.Substring(11, 4) == "0111" && buffer[k] == 0x11)
// {

2
src/Controls/AudioVisualizer.cs
View File

@ -1791,7 +1791,7 @@ namespace Nikse.SubtitleEdit.Controls
double average = 0;
for (int k = begin; k < _wavePeaks.Peaks.Count; k++)
average += _wavePeaks.Peaks[k].Abs;
average /= _wavePeaks.Peaks.Count - begin;
average /= _wavePeaks.Peaks.Count - begin;
var maxThreshold = (int)(_wavePeaks.HighestPeak * (maximumVolumePercent / 100.0));
var silenceThreshold = (int)(average * (minimumVolumePercent / 100.0));

2
src/Forms/ExportCustomText.cs
View File

@ -129,7 +129,7 @@ namespace Nikse.SubtitleEdit.Forms
{
form.FormatOk = form.FormatOk.Remove(0, name.Length);
name = arr[0] + " (" + i + ")";
form.FormatOk = name + form.FormatOk;
form.FormatOk = name + form.FormatOk;
i++;
}
_templates.Add(form.FormatOk);

2
src/Forms/GoogleTranslate.cs
View File

@ -861,7 +861,7 @@ namespace Nikse.SubtitleEdit.Forms
labelPleaseWait.Visible = true;
int start = 0;
bool overQuota = false;
try
{
var sb = new StringBuilder();

4
src/Forms/VobSubOcr.cs
View File

@ -5658,9 +5658,9 @@ namespace Nikse.SubtitleEdit.Forms
Bitmap unItaliced = new Bitmap(bmp.Width + left + 4, bmp.Height);
Point[] destinationPoints = {
new Point(0, 0), // destination for upper-left point of original
new Point(0, 0), // destination for upper-left point of original
new Point(bmp.Width, 0), // destination for upper-right point of original
new Point(left, bmp.Height) // destination for lower-left point of original
new Point(left, bmp.Height) // destination for lower-left point of original
};
using (var g = Graphics.FromImage(unItaliced))

2
src/Logic/ColorChooser/ColorWheel.cs
View File

@ -542,7 +542,7 @@ namespace Nikse.SubtitleEdit.Logic.ColorChooser
{
// Given the center of a circle and its radius, along
// with the angle corresponding to the point, find the coordinates.
// In other words, conver t from polar to rectangular coordinates.
// In other words, convert from polar to rectangular coordinates.
double radians = degrees / DEGREES_PER_RADIAN;
return new Point((int)(centerPoint.X + Math.Floor(radius * Math.Cos(radians))),

6
src/Logic/OCR/OcrFixEngine.cs
View File

@ -485,12 +485,12 @@ namespace Nikse.SubtitleEdit.Logic.Ocr
string beforeThis = HtmlUtil.RemoveHtmlTags(text.Substring(0, start));
endingBeforeThis = beforeThis.EndsWith('.') || beforeThis.EndsWith('!') || beforeThis.EndsWith('?');
}
if (endingBeforeThis)
{
text = text.Remove(start + 1, 1).Insert(start + 1, "L");
}
else
else
{
text = text.Remove(start + 1, 1).Insert(start + 1, "l");
}
@ -516,7 +516,7 @@ namespace Nikse.SubtitleEdit.Logic.Ocr
{
text = text.Remove(start + Environment.NewLine.Length, 1).Insert(start + Environment.NewLine.Length, "L");
}
else
else
{
text = text.Remove(start + Environment.NewLine.Length, 1).Insert(start + Environment.NewLine.Length, "l");
}

2
src/Test/Logic/SubtitleFormats/SubtitleFormatsTest.cs
View File

@ -775,7 +775,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);

4
src/Test/Logic/TimeCodeTest.cs
View File

@ -117,8 +117,8 @@ namespace Test.Logic
var tc = new TimeCode(1, 2, 3, 4);
Assert.AreEqual(tc.TotalMilliseconds, 3723004);
Assert.IsTrue(Math.Abs(tc.TotalMilliseconds - (tc.TotalSeconds * 1000.0)) < 0.001);
Assert.IsTrue(Math.Abs(tc.TotalMilliseconds - (tc.TotalSeconds * 1000.0)) < 0.001);
}
}
}
}

4
www/Help.cshtml
View File

@ -37,8 +37,8 @@ Q: When translating/editing subtitles, can Subtitle Edit navigate quickly to nex
A: Yes, press ALT+ARROW UP/DOWN for next previous subtitle - also textbox will keep focus.<br />
<br />
Q: Can Subtitle Edit add the subtitles to the video file?<br />
A: No, Subtitle Edit cannot do this - but one or more of the 100+ output formats should work. Use either <i>File</i> -> <i>Save as...</i> for text based formats or <i>File</i> -> <i>Export...</i> for binary/image-based formats.<br />
There are two ways of adding subtitles into the video file - hardcoding (cannot be turned off ever, so this <i>might</i> be a bad idea) or embedding (only for some formats like mkv, mp4).<br />
A: No, Subtitle Edit cannot do this - but one or more of the 100+ output formats should work. Use either <i>File</i> -> <i>Save as...</i> for text based formats or <i>File</i> -> <i>Export...</i> for binary/image-based formats.<br />
There are two ways of adding subtitles into the video file - hardcoding (cannot be turned off ever, so this <i>might</i> be a bad idea) or embedding (only for some formats like mkv, mp4).<br />
Read more about <a href="AddSubtitlesToVideo">adding subtitles to video</a>.
<br />
<br />

4
www/HelpEU.cshtml
View File

@ -37,8 +37,8 @@ G: Azpidatziak itzultzerakoan/editatzerakoan, Subtitle Editek nabigatu dezake az
E: Bai, sakatu ALT+GORA/BEHERA GEZIA hurrengo/aurreko azpidatzira joateko - idaz-kutxak ere fokuari heutsi diezaioke.<br />
<br />
G: Subtitle Editek gehitu ahal ditu azpidatziak bideo agirira?<br />
E: Ez, Subtitle Editek ezin du egin - baina 100+ irteera heuskarrietako batek edo gehiagok lan egin behar du. Erabili <i>Agiria</i> -> <i>Gorde honela...</i> idatzi ohinarriko azpidatzientzat edo <i>Agiria</i> -> <i>Esportatu...</i> binario/irudi-ohinarriko heuskarrientzat.<br />
Bi bide daude azpidatziak bideo agirira gehitzeko - erreta (ezin dira inoiz ezkutatu, hortaz <i>beharketa</i> hau ideia txarra izan daiteke) edo barneratuz (zenbait heuskarrirako bakarrik, mkv, mp4 bezala).<br />
E: Ez, Subtitle Editek ezin du egin - baina 100+ irteera heuskarrietako batek edo gehiagok lan egin behar du. Erabili <i>Agiria</i> -> <i>Gorde honela...</i> idatzi ohinarriko azpidatzientzat edo <i>Agiria</i> -> <i>Esportatu...</i> binario/irudi-ohinarriko heuskarrientzat.<br />
Bi bide daude azpidatziak bideo agirira gehitzeko - erreta (ezin dira inoiz ezkutatu, hortaz <i>beharketa</i> hau ideia txarra izan daiteke) edo barneratuz (zenbait heuskarrirako bakarrik, mkv, mp4 bezala).<br />
Irakurri gehiago <a href="AddSubtitlesToVideo">azpidatziak gehitzea bideoari</a>.
<br />
<br />