From 6706e51242145521b37a3add6928e26849a7f5af Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 16 Jan 2013 07:06:35 +0000 Subject: [PATCH] ran tabspace git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1564 99eadd0c-20b8-1223-b5c4-2a2b2df33de2 --- src/Forms/ExportPngXml.cs | 10 +++++----- src/Forms/Main.cs | 8 ++++---- src/Forms/MergeDoubleLines.cs | 4 ++-- src/Logic/BluRaySup/BluRaySupParser.cs | 10 +++++----- src/Logic/LanguageStructure.cs | 6 +++--- src/Logic/NikseBitmap.cs | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/Forms/ExportPngXml.cs b/src/Forms/ExportPngXml.cs index 781aae4f6..952d0cb78 100644 --- a/src/Forms/ExportPngXml.cs +++ b/src/Forms/ExportPngXml.cs @@ -605,7 +605,7 @@ namespace Nikse.SubtitleEdit.Forms string numberString = string.Format("IMAGE{0:000}", i); string fileName = Path.Combine(folderBrowserDialog1.SelectedPath, numberString + "." + comboBoxImageFormat.Text.ToLower()); - + foreach (var encoder in ImageCodecInfo.GetImageEncoders()) { if (encoder.FormatID == ImageFormat.Png.Guid) @@ -616,9 +616,9 @@ namespace Nikse.SubtitleEdit.Forms break; } } - - - + + + imagesSavedCount++; const string paragraphWriteFormat = "\t\t"; @@ -950,7 +950,7 @@ namespace Nikse.SubtitleEdit.Forms sizeX = 1; if (sizeY < 1) sizeY = 1; - bmp = new Bitmap(sizeX, sizeY); + bmp = new Bitmap(sizeX, sizeY); g = Graphics.FromImage(bmp); if (parameter.BackgroundColor != Color.Transparent) g.FillRectangle(new SolidBrush(parameter.BackgroundColor), 0, 0, bmp.Width, bmp.Height); diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index 35a1261b5..79b52f6b1 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -2327,7 +2327,7 @@ namespace Nikse.SubtitleEdit.Forms foreach (Paragraph p in _subtitle.Paragraphs) { p.Text = p.Text.Replace("<і>", "").Replace("", ""); // different unicode chars - } + } _subtitleListViewIndex = -1; SetCurrentFormat(format); @@ -6436,7 +6436,7 @@ namespace Nikse.SubtitleEdit.Forms { _networkSession.TimerStop(); SetDurationInSeconds(currentParagraph.Duration.TotalSeconds); - _networkSession.UpdateLine(_subtitle.GetIndex(currentParagraph), currentParagraph); + _networkSession.UpdateLine(_subtitle.GetIndex(currentParagraph), currentParagraph); NetworkGetSendUpdates(new List(), firstSelectedIndex+1, newParagraph); } else @@ -6758,7 +6758,7 @@ namespace Nikse.SubtitleEdit.Forms currentParagraph.EndTime.TotalMilliseconds = nextParagraph.EndTime.TotalMilliseconds; if (_networkSession != null) - { + { _networkSession.TimerStop(); SetDurationInSeconds(currentParagraph.Duration.TotalSeconds); _networkSession.UpdateLine(_subtitle.GetIndex(currentParagraph), currentParagraph); @@ -16268,7 +16268,7 @@ namespace Nikse.SubtitleEdit.Forms private void toolStripMenuItemColumn_DropDownOpening(object sender, EventArgs e) { - copyOriginalTextToCurrentToolStripMenuItem.Visible = !string.IsNullOrEmpty(copyOriginalTextToCurrentToolStripMenuItem.Text) && + copyOriginalTextToCurrentToolStripMenuItem.Visible = !string.IsNullOrEmpty(copyOriginalTextToCurrentToolStripMenuItem.Text) && SubtitleListview1.IsAlternateTextColumnVisible && _subtitleAlternate != null; } diff --git a/src/Forms/MergeDoubleLines.cs b/src/Forms/MergeDoubleLines.cs index e0de83b8d..b06946a64 100644 --- a/src/Forms/MergeDoubleLines.cs +++ b/src/Forms/MergeDoubleLines.cs @@ -180,7 +180,7 @@ namespace Nikse.SubtitleEdit.Forms { lastMerged = false; } - } + } } else { @@ -287,6 +287,6 @@ namespace Nikse.SubtitleEdit.Forms loading = false; listViewFixes.ItemChecked += listViewFixes_ItemChecked; } - + } } diff --git a/src/Logic/BluRaySup/BluRaySupParser.cs b/src/Logic/BluRaySup/BluRaySupParser.cs index 097160690..bdd2e1cae 100644 --- a/src/Logic/BluRaySup/BluRaySupParser.cs +++ b/src/Logic/BluRaySup/BluRaySupParser.cs @@ -781,7 +781,7 @@ namespace Nikse.SubtitleEdit.Logic.BluRaySup { prev.EndTime = cur.EndTime; pcsList.RemoveAt(pcsIndex); - } + } } } @@ -790,16 +790,16 @@ namespace Nikse.SubtitleEdit.Logic.BluRaySup private static bool ByteArraysEqual(byte[] b1, byte[] b2) { - if (b1 == b2) + if (b1 == b2) return true; - if (b1 == null || b2 == null) + if (b1 == null || b2 == null) return false; - if (b1.Length != b2.Length) + if (b1.Length != b2.Length) return false; for (int i = 0; i < b1.Length; i++) { - if (b1[i] != b2[i]) + if (b1[i] != b2[i]) return false; } return true; diff --git a/src/Logic/LanguageStructure.cs b/src/Logic/LanguageStructure.cs index 42ce2683c..53837ce74 100644 --- a/src/Logic/LanguageStructure.cs +++ b/src/Logic/LanguageStructure.cs @@ -235,7 +235,7 @@ public string ShiftCellsDown { get; set; } public string TimeCodesOnly { get; set; } public string TextOnly { get; set; } - public string OriginalTextOnly { get; set; } + public string OriginalTextOnly { get; set; } } public class CompareSubtitles @@ -933,7 +933,7 @@ public string ChangeFrameRate { get; set; } public string ChangeSpeedInPercent { get; set; } public string MergeShortLines { get; set; } - public string MergeDuplicateText { get; set; } + public string MergeDuplicateText { get; set; } public string SplitLongLines { get; set; } public string MinimumDisplayTimeBetweenParagraphs { get; set; } public string SortBy { get; set; } @@ -1057,7 +1057,7 @@ public string ColumnInsertTextFromSubtitle { get; set; } public string ColumnImportTextAndShiftCellsDown { get; set; } public string ColumnPasteFromClipboard { get; set; } - public string ColumnCopyOriginalTextToCurrent { get; set; } + public string ColumnCopyOriginalTextToCurrent { get; set; } public string Split { get; set; } public string MergeSelectedLines { get; set; } public string MergeSelectedLinesASDialogue { get; set; } diff --git a/src/Logic/NikseBitmap.cs b/src/Logic/NikseBitmap.cs index a87edb4bd..fd867d33f 100644 --- a/src/Logic/NikseBitmap.cs +++ b/src/Logic/NikseBitmap.cs @@ -552,7 +552,7 @@ namespace Nikse.SubtitleEdit.Logic } if (newTop == 0) - return; + return; int newHeight = Height - newTop; var newBitmapData = new byte[Width * newHeight * 4];