mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-28 06:52:35 +01:00
ran tabspace
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1564 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
parent
7836a3591d
commit
6706e51242
@ -605,7 +605,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
string numberString = string.Format("IMAGE{0:000}", i);
|
string numberString = string.Format("IMAGE{0:000}", i);
|
||||||
string fileName = Path.Combine(folderBrowserDialog1.SelectedPath, numberString + "." + comboBoxImageFormat.Text.ToLower());
|
string fileName = Path.Combine(folderBrowserDialog1.SelectedPath, numberString + "." + comboBoxImageFormat.Text.ToLower());
|
||||||
|
|
||||||
|
|
||||||
foreach (var encoder in ImageCodecInfo.GetImageEncoders())
|
foreach (var encoder in ImageCodecInfo.GetImageEncoders())
|
||||||
{
|
{
|
||||||
if (encoder.FormatID == ImageFormat.Png.Guid)
|
if (encoder.FormatID == ImageFormat.Png.Guid)
|
||||||
@ -616,9 +616,9 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
imagesSavedCount++;
|
imagesSavedCount++;
|
||||||
|
|
||||||
const string paragraphWriteFormat = "\t\t<spu start=\"{0}\" end=\"{1}\" image=\"{2}\" />";
|
const string paragraphWriteFormat = "\t\t<spu start=\"{0}\" end=\"{1}\" image=\"{2}\" />";
|
||||||
@ -950,7 +950,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
sizeX = 1;
|
sizeX = 1;
|
||||||
if (sizeY < 1)
|
if (sizeY < 1)
|
||||||
sizeY = 1;
|
sizeY = 1;
|
||||||
bmp = new Bitmap(sizeX, sizeY);
|
bmp = new Bitmap(sizeX, sizeY);
|
||||||
g = Graphics.FromImage(bmp);
|
g = Graphics.FromImage(bmp);
|
||||||
if (parameter.BackgroundColor != Color.Transparent)
|
if (parameter.BackgroundColor != Color.Transparent)
|
||||||
g.FillRectangle(new SolidBrush(parameter.BackgroundColor), 0, 0, bmp.Width, bmp.Height);
|
g.FillRectangle(new SolidBrush(parameter.BackgroundColor), 0, 0, bmp.Width, bmp.Height);
|
||||||
|
@ -2327,7 +2327,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
foreach (Paragraph p in _subtitle.Paragraphs)
|
foreach (Paragraph p in _subtitle.Paragraphs)
|
||||||
{
|
{
|
||||||
p.Text = p.Text.Replace("<і>", "<i>").Replace("</і>", "</i>"); // different unicode chars
|
p.Text = p.Text.Replace("<і>", "<i>").Replace("</і>", "</i>"); // different unicode chars
|
||||||
}
|
}
|
||||||
|
|
||||||
_subtitleListViewIndex = -1;
|
_subtitleListViewIndex = -1;
|
||||||
SetCurrentFormat(format);
|
SetCurrentFormat(format);
|
||||||
@ -6436,7 +6436,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
{
|
{
|
||||||
_networkSession.TimerStop();
|
_networkSession.TimerStop();
|
||||||
SetDurationInSeconds(currentParagraph.Duration.TotalSeconds);
|
SetDurationInSeconds(currentParagraph.Duration.TotalSeconds);
|
||||||
_networkSession.UpdateLine(_subtitle.GetIndex(currentParagraph), currentParagraph);
|
_networkSession.UpdateLine(_subtitle.GetIndex(currentParagraph), currentParagraph);
|
||||||
NetworkGetSendUpdates(new List<int>(), firstSelectedIndex+1, newParagraph);
|
NetworkGetSendUpdates(new List<int>(), firstSelectedIndex+1, newParagraph);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -6758,7 +6758,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
currentParagraph.EndTime.TotalMilliseconds = nextParagraph.EndTime.TotalMilliseconds;
|
currentParagraph.EndTime.TotalMilliseconds = nextParagraph.EndTime.TotalMilliseconds;
|
||||||
|
|
||||||
if (_networkSession != null)
|
if (_networkSession != null)
|
||||||
{
|
{
|
||||||
_networkSession.TimerStop();
|
_networkSession.TimerStop();
|
||||||
SetDurationInSeconds(currentParagraph.Duration.TotalSeconds);
|
SetDurationInSeconds(currentParagraph.Duration.TotalSeconds);
|
||||||
_networkSession.UpdateLine(_subtitle.GetIndex(currentParagraph), currentParagraph);
|
_networkSession.UpdateLine(_subtitle.GetIndex(currentParagraph), currentParagraph);
|
||||||
@ -16268,7 +16268,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
|
|
||||||
private void toolStripMenuItemColumn_DropDownOpening(object sender, EventArgs e)
|
private void toolStripMenuItemColumn_DropDownOpening(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
copyOriginalTextToCurrentToolStripMenuItem.Visible = !string.IsNullOrEmpty(copyOriginalTextToCurrentToolStripMenuItem.Text) &&
|
copyOriginalTextToCurrentToolStripMenuItem.Visible = !string.IsNullOrEmpty(copyOriginalTextToCurrentToolStripMenuItem.Text) &&
|
||||||
SubtitleListview1.IsAlternateTextColumnVisible &&
|
SubtitleListview1.IsAlternateTextColumnVisible &&
|
||||||
_subtitleAlternate != null;
|
_subtitleAlternate != null;
|
||||||
}
|
}
|
||||||
|
@ -180,7 +180,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
{
|
{
|
||||||
lastMerged = false;
|
lastMerged = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -287,6 +287,6 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
loading = false;
|
loading = false;
|
||||||
listViewFixes.ItemChecked += listViewFixes_ItemChecked;
|
listViewFixes.ItemChecked += listViewFixes_ItemChecked;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -781,7 +781,7 @@ namespace Nikse.SubtitleEdit.Logic.BluRaySup
|
|||||||
{
|
{
|
||||||
prev.EndTime = cur.EndTime;
|
prev.EndTime = cur.EndTime;
|
||||||
pcsList.RemoveAt(pcsIndex);
|
pcsList.RemoveAt(pcsIndex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -790,16 +790,16 @@ namespace Nikse.SubtitleEdit.Logic.BluRaySup
|
|||||||
|
|
||||||
private static bool ByteArraysEqual(byte[] b1, byte[] b2)
|
private static bool ByteArraysEqual(byte[] b1, byte[] b2)
|
||||||
{
|
{
|
||||||
if (b1 == b2)
|
if (b1 == b2)
|
||||||
return true;
|
return true;
|
||||||
if (b1 == null || b2 == null)
|
if (b1 == null || b2 == null)
|
||||||
return false;
|
return false;
|
||||||
if (b1.Length != b2.Length)
|
if (b1.Length != b2.Length)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
for (int i = 0; i < b1.Length; i++)
|
for (int i = 0; i < b1.Length; i++)
|
||||||
{
|
{
|
||||||
if (b1[i] != b2[i])
|
if (b1[i] != b2[i])
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
@ -235,7 +235,7 @@
|
|||||||
public string ShiftCellsDown { get; set; }
|
public string ShiftCellsDown { get; set; }
|
||||||
public string TimeCodesOnly { get; set; }
|
public string TimeCodesOnly { get; set; }
|
||||||
public string TextOnly { get; set; }
|
public string TextOnly { get; set; }
|
||||||
public string OriginalTextOnly { get; set; }
|
public string OriginalTextOnly { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class CompareSubtitles
|
public class CompareSubtitles
|
||||||
@ -933,7 +933,7 @@
|
|||||||
public string ChangeFrameRate { get; set; }
|
public string ChangeFrameRate { get; set; }
|
||||||
public string ChangeSpeedInPercent { get; set; }
|
public string ChangeSpeedInPercent { get; set; }
|
||||||
public string MergeShortLines { get; set; }
|
public string MergeShortLines { get; set; }
|
||||||
public string MergeDuplicateText { get; set; }
|
public string MergeDuplicateText { get; set; }
|
||||||
public string SplitLongLines { get; set; }
|
public string SplitLongLines { get; set; }
|
||||||
public string MinimumDisplayTimeBetweenParagraphs { get; set; }
|
public string MinimumDisplayTimeBetweenParagraphs { get; set; }
|
||||||
public string SortBy { get; set; }
|
public string SortBy { get; set; }
|
||||||
@ -1057,7 +1057,7 @@
|
|||||||
public string ColumnInsertTextFromSubtitle { get; set; }
|
public string ColumnInsertTextFromSubtitle { get; set; }
|
||||||
public string ColumnImportTextAndShiftCellsDown { get; set; }
|
public string ColumnImportTextAndShiftCellsDown { get; set; }
|
||||||
public string ColumnPasteFromClipboard { get; set; }
|
public string ColumnPasteFromClipboard { get; set; }
|
||||||
public string ColumnCopyOriginalTextToCurrent { get; set; }
|
public string ColumnCopyOriginalTextToCurrent { get; set; }
|
||||||
public string Split { get; set; }
|
public string Split { get; set; }
|
||||||
public string MergeSelectedLines { get; set; }
|
public string MergeSelectedLines { get; set; }
|
||||||
public string MergeSelectedLinesASDialogue { get; set; }
|
public string MergeSelectedLinesASDialogue { get; set; }
|
||||||
|
@ -552,7 +552,7 @@ namespace Nikse.SubtitleEdit.Logic
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (newTop == 0)
|
if (newTop == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
int newHeight = Height - newTop;
|
int newHeight = Height - newTop;
|
||||||
var newBitmapData = new byte[Width * newHeight * 4];
|
var newBitmapData = new byte[Width * newHeight * 4];
|
||||||
|
Loading…
Reference in New Issue
Block a user