From f13d7c1b81452735797608bcc42470523c8dd6e0 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 24 Jan 2016 12:51:04 +0200 Subject: [PATCH] Ran CodeMaid. --- libse/BluRaySup/BluRaySupPalette.cs | 2 +- libse/BluRaySup/BluRaySupParser.cs | 2 +- libse/BluRaySup/BluRaySupPicture.cs | 2 +- libse/BluRaySup/Core.cs | 2 +- libse/BluRaySup/ImageObject.cs | 2 +- libse/BluRaySup/ImageObjectFragment.cs | 2 +- libse/BluRaySup/PaletteInfo.cs | 2 +- libse/BluRaySup/ToolBox.cs | 2 +- libse/BmpReader.cs | 2 +- libse/Configuration.cs | 2 +- libse/ContainerFormats/Ebml/Element.cs | 2 +- .../MaterialExchangeFormat/KlvPacket.cs | 6 +-- .../MaterialExchangeFormat/MxfParser.cs | 5 +-- .../ContainerFormats/Matroska/MatroskaFile.cs | 6 +-- libse/ContainerFormats/Mp4/Boxes/Stbl.cs | 8 ++-- libse/ContainerFormats/Mp4/Mp4Parser.cs | 4 +- libse/ContainerFormats/RiffDecodeHeader.cs | 2 +- libse/ContainerFormats/RiffParser.cs | 2 +- libse/DetectEncoding/EncodingTools.cs | 2 +- libse/Dictionaries/NamesList.cs | 2 +- libse/Dictionaries/OcrFixReplaceList.cs | 2 +- libse/Enums/FindType.cs | 2 +- libse/Enums/SelectionChoice.cs | 2 +- libse/Enums/SpellCheckAction.cs | 2 +- libse/Enums/SubtitleSortCriteria.cs | 2 +- libse/FastBitmap.cs | 2 +- libse/FastFileStream.cs | 2 +- libse/FileUtil.cs | 2 +- libse/Forms/CheckForUpdatesHelper.cs | 4 +- .../Forms/FixCommonErrors/EmptyFixCallback.cs | 8 ++-- libse/Forms/FixCommonErrors/FixEmptyLines.cs | 2 +- libse/Forms/FixCommonErrors/FixHyphensAdd.cs | 3 +- .../Forms/FixCommonErrors/FixHyphensRemove.cs | 3 +- libse/Forms/FixCommonErrors/FixLongLines.cs | 2 +- .../FixMissingPeriodsAtEndOfLine.cs | 2 +- .../FixCommonErrors/FixShortDisplayTimes.cs | 2 +- libse/Forms/FixCommonErrors/Helper.cs | 2 +- libse/Forms/FixCommonErrors/IFixCallbacks.cs | 4 +- .../RemoveSpaceBetweenNumbers.cs | 7 +-- libse/Forms/RemoveTextForHI.cs | 3 +- libse/Forms/RemoveTextForHISettings.cs | 2 +- libse/Forms/SplitLongLinesHelper.cs | 2 +- libse/HistoryItem.cs | 2 +- libse/HtmlUtil.cs | 2 +- libse/IfoParser.cs | 2 +- libse/Language.cs | 2 +- libse/LanguageStructure.cs | 4 +- libse/ManagedBitmap.cs | 2 +- libse/MurMurHash3.cs | 2 +- libse/NikseBitmap.cs | 8 ++-- libse/NoBreakAfterItem.cs | 2 +- libse/Paragraph.cs | 2 +- libse/RegistryUtil.cs | 6 +-- libse/RichTextToPlainText.cs | 6 +-- libse/Settings.cs | 10 ++--- libse/SsaStyle.cs | 6 +-- libse/StringExtensions.cs | 2 +- libse/StripableText.cs | 2 +- libse/Subtitle.cs | 2 +- libse/SubtitleFormats/AQTitle.cs | 2 +- libse/SubtitleFormats/AbcIViewer.cs | 2 +- .../AdobeEncoreLineTabNewLine.cs | 2 +- libse/SubtitleFormats/AdobeEncoreLineTabs.cs | 2 +- libse/SubtitleFormats/AdobeEncoreTabs.cs | 2 +- .../AdobeEncoreWithLineNumbersNtsc.cs | 2 +- .../AdvancedSubStationAlpha.cs | 2 +- libse/SubtitleFormats/AvidCaption.cs | 2 +- libse/SubtitleFormats/AvidDvd.cs | 2 +- libse/SubtitleFormats/AvidStl.cs | 2 +- libse/SubtitleFormats/Ayato.cs | 3 +- libse/SubtitleFormats/BdnXml.cs | 2 +- libse/SubtitleFormats/BelleNuitSubtitler.cs | 2 +- libse/SubtitleFormats/CapMakerPlus.cs | 2 +- libse/SubtitleFormats/CaptionAssistant.cs | 2 +- libse/SubtitleFormats/Captionate.cs | 2 +- libse/SubtitleFormats/CaptionateMs.cs | 2 +- libse/SubtitleFormats/CaptionsInc.cs | 2 +- libse/SubtitleFormats/CaraokeXml.cs | 2 +- libse/SubtitleFormats/Cavena890.cs | 4 +- libse/SubtitleFormats/CheetahCaption.cs | 2 +- libse/SubtitleFormats/Chk.cs | 1 - libse/SubtitleFormats/Csv.cs | 2 +- libse/SubtitleFormats/Csv2.cs | 2 +- libse/SubtitleFormats/Csv3.cs | 2 +- libse/SubtitleFormats/DCSubtitle.cs | 2 +- libse/SubtitleFormats/DCinemaSmpte2007.cs | 2 +- libse/SubtitleFormats/DCinemaSmpte2010.cs | 2 +- libse/SubtitleFormats/DigiBeta.cs | 2 +- libse/SubtitleFormats/Dost.cs | 4 +- libse/SubtitleFormats/DvdSubtitle.cs | 2 +- libse/SubtitleFormats/DvdSubtitleSystem.cs | 2 +- .../SubtitleFormats/ELRStudioClosedCaption.cs | 2 +- libse/SubtitleFormats/Ebu.cs | 17 ++++---- libse/SubtitleFormats/Eeg708.cs | 2 +- libse/SubtitleFormats/F4Rtf.cs | 2 +- libse/SubtitleFormats/F4Text.cs | 2 +- libse/SubtitleFormats/F4Xml.cs | 2 +- libse/SubtitleFormats/FLVCoreCuePoints.cs | 2 +- libse/SubtitleFormats/FabSubtitler.cs | 2 +- libse/SubtitleFormats/FilmEditXml.cs | 2 +- libse/SubtitleFormats/FinalCutProImage.cs | 2 +- libse/SubtitleFormats/FinalCutProTest2Xml.cs | 2 +- libse/SubtitleFormats/FinalCutProTextXml.cs | 2 +- libse/SubtitleFormats/FinalCutProXCM.cs | 2 +- libse/SubtitleFormats/FinalCutProXXml.cs | 2 +- libse/SubtitleFormats/FinalCutProXml.cs | 2 +- libse/SubtitleFormats/FinalCutProXml13.cs | 2 +- libse/SubtitleFormats/FinalCutProXml14.cs | 2 +- libse/SubtitleFormats/FinalCutProXmlGap.cs | 2 +- libse/SubtitleFormats/FlashXml.cs | 2 +- libse/SubtitleFormats/Footage.cs | 2 +- libse/SubtitleFormats/GpacTtxt.cs | 2 +- libse/SubtitleFormats/Idx.cs | 10 ++--- libse/SubtitleFormats/IssXml.cs | 2 +- libse/SubtitleFormats/ItunesTimedText.cs | 2 +- libse/SubtitleFormats/Json.cs | 2 +- libse/SubtitleFormats/JsonType2.cs | 2 +- libse/SubtitleFormats/JsonType3.cs | 2 +- libse/SubtitleFormats/JsonType4.cs | 2 +- libse/SubtitleFormats/JsonType5.cs | 2 +- libse/SubtitleFormats/JsonType6.cs | 2 +- libse/SubtitleFormats/Lrc.cs | 6 +-- libse/SubtitleFormats/MPlayer2.cs | 2 +- libse/SubtitleFormats/MacCaption.cs | 2 +- libse/SubtitleFormats/MicroDvd.cs | 2 +- libse/SubtitleFormats/MidwayInscriberCGX.cs | 2 +- libse/SubtitleFormats/NciCaption.cs | 2 +- .../SubtitleFormats/NciTimedRollUpCaptions.cs | 4 +- libse/SubtitleFormats/OpenDvt.cs | 2 +- libse/SubtitleFormats/Oresme.cs | 2 +- libse/SubtitleFormats/OresmeDocXDocument.cs | 2 +- libse/SubtitleFormats/PE2.cs | 2 +- libse/SubtitleFormats/PListCaption.cs | 2 +- libse/SubtitleFormats/Pac.cs | 4 +- libse/SubtitleFormats/Pns.cs | 2 +- libse/SubtitleFormats/QubeMasterImport.cs | 2 +- libse/SubtitleFormats/QuickTimeText.cs | 2 +- libse/SubtitleFormats/RhozetHarmonic.cs | 2 +- libse/SubtitleFormats/Sami.cs | 2 +- libse/SubtitleFormats/SamiModern.cs | 2 +- libse/SubtitleFormats/SamiYouTube.cs | 2 +- libse/SubtitleFormats/SatBoxPng.cs | 2 +- libse/SubtitleFormats/Scenarist.cs | 2 +- .../ScenaristClosedCaptions.cs | 2 +- libse/SubtitleFormats/SeImageHtmlIndex.cs | 2 +- libse/SubtitleFormats/SmilTimesheetData.cs | 2 +- libse/SubtitleFormats/SoftNiColonSub.cs | 2 +- libse/SubtitleFormats/SoftNiSub.cs | 2 +- .../SubtitleFormats/SonicScenaristBitmaps.cs | 2 +- .../SonyDVDArchitectExplicitDuration.cs | 2 +- libse/SubtitleFormats/Spruce.cs | 2 +- libse/SubtitleFormats/Spt.cs | 2 +- libse/SubtitleFormats/StructuredTitles.cs | 2 +- libse/SubtitleFormats/SubRip.cs | 2 +- libse/SubtitleFormats/SubStationAlpha.cs | 3 +- libse/SubtitleFormats/SubtitleFormat.cs | 2 +- libse/SubtitleFormats/SwiftInterchange2.cs | 2 +- libse/SubtitleFormats/SwiftText.cs | 2 +- .../SubtitleFormats/SwiftTextLineNoAndDur.cs | 2 +- libse/SubtitleFormats/SwiftTextLineNumber.cs | 2 +- libse/SubtitleFormats/TMPlayer.cs | 2 +- libse/SubtitleFormats/TSB4.cs | 2 +- libse/SubtitleFormats/Tek.cs | 2 +- libse/SubtitleFormats/TextST.cs | 29 +++++++------ libse/SubtitleFormats/TimeXml.cs | 2 +- libse/SubtitleFormats/TimeXml2.cs | 2 +- libse/SubtitleFormats/TimedText.cs | 2 +- libse/SubtitleFormats/TimedText10.cs | 2 +- libse/SubtitleFormats/TimedText200604CData.cs | 2 +- libse/SubtitleFormats/TimedTextImage.cs | 2 +- libse/SubtitleFormats/TimelineAscii.cs | 2 +- libse/SubtitleFormats/TimelineFootageAscii.cs | 2 +- libse/SubtitleFormats/TimelineMvt.cs | 2 +- libse/SubtitleFormats/TitleExchangePro.cs | 2 +- libse/SubtitleFormats/Titra.cs | 2 +- libse/SubtitleFormats/TmpegEncAW5.cs | 2 +- libse/SubtitleFormats/TmpegEncXml.cs | 2 +- libse/SubtitleFormats/Tmx14.cs | 2 +- libse/SubtitleFormats/TranscriberXml.cs | 2 +- libse/SubtitleFormats/TurboTitler.cs | 2 +- libse/SubtitleFormats/UTSubtitleXml.cs | 2 +- libse/SubtitleFormats/UleadSubtitleFormat.cs | 2 +- libse/SubtitleFormats/Ultech130.cs | 2 +- .../UniversalSubtitleFormat.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle1.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle10.cs | 10 ++--- libse/SubtitleFormats/UnknownSubtitle11.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle12.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle13.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle14.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle16.cs | 3 +- libse/SubtitleFormats/UnknownSubtitle17.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle18.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle19.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle2.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle20.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle21.cs | 3 +- libse/SubtitleFormats/UnknownSubtitle22.cs | 3 +- libse/SubtitleFormats/UnknownSubtitle24.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle25.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle27.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle29.cs | 3 +- libse/SubtitleFormats/UnknownSubtitle3.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle30.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle31.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle32.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle33.cs | 3 +- libse/SubtitleFormats/UnknownSubtitle34.cs | 3 +- libse/SubtitleFormats/UnknownSubtitle35.cs | 3 +- libse/SubtitleFormats/UnknownSubtitle39.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle4.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle40.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle41.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle42.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle43.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle44.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle45.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle46.cs | 3 +- libse/SubtitleFormats/UnknownSubtitle47.cs | 3 +- libse/SubtitleFormats/UnknownSubtitle48.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle49.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle5.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle50.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle51.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle52.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle53.cs | 3 +- libse/SubtitleFormats/UnknownSubtitle54.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle55.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle56.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle57.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle58.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle59.cs | 3 +- libse/SubtitleFormats/UnknownSubtitle6.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle60.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle61.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle62.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle63.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle64.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle65.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle66.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle67.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle68.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle69.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle7.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle70.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle71.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle72.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle73.cs | 4 +- libse/SubtitleFormats/UnknownSubtitle74.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle75.cs | 36 ++++++++-------- libse/SubtitleFormats/UnknownSubtitle76.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle77.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle78.cs | 4 +- libse/SubtitleFormats/UnknownSubtitle79.cs | 3 +- libse/SubtitleFormats/UnknownSubtitle8.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle80.cs | 2 +- libse/SubtitleFormats/UnknownSubtitle9.cs | 4 +- libse/SubtitleFormats/Utx.cs | 2 +- libse/SubtitleFormats/UtxFrames.cs | 2 +- libse/SubtitleFormats/VocapiaSplit.cs | 2 +- libse/SubtitleFormats/WebVTT.cs | 2 +- .../WebVTTFileWithLineNumber.cs | 2 +- libse/SubtitleFormats/Wsb.cs | 2 +- libse/SubtitleFormats/Xif.cs | 3 +- libse/SubtitleFormats/YouTubeAnnotations.cs | 6 +-- libse/SubtitleFormats/YouTubeSbv.cs | 2 +- libse/SubtitleFormats/YouTubeTranscript.cs | 2 +- .../YouTubeTranscriptOneLine.cs | 2 +- libse/SubtitleFormats/ZeroG.cs | 2 +- libse/TarHeader.cs | 2 +- libse/TarReader.cs | 2 +- libse/TaskbarList.cs | 2 +- libse/TextDraw.cs | 2 +- libse/TimeCode.cs | 6 +-- libse/TransportStream/AdaptationField.cs | 2 +- .../TransportStream/ClutDefinitionSegment.cs | 2 +- .../DisplayDefinitionSegment.cs | 2 +- libse/TransportStream/DvbSubPes.cs | 2 +- libse/TransportStream/EbuPesDataFieldText.cs | 2 +- libse/TransportStream/Helper.cs | 2 +- libse/TransportStream/HummingDecoder.cs | 2 +- libse/TransportStream/Packet.cs | 2 +- .../PacketizedElementaryStream.cs | 2 +- .../TransportStream/PageCompositionSegemnt.cs | 2 +- .../PageCompositionSegmentRegion.cs | 2 +- .../ProgramAssociationTable.cs | 2 +- .../TransportStream/RegionClutSegmentEntry.cs | 2 +- .../RegionCompositionSegment.cs | 2 +- .../RegionCompositionSegmentObject.cs | 2 +- .../TransportStream/TransportStreamParser.cs | 10 +++-- .../TransportStreamSubtitle.cs | 4 +- libse/UknownFormatImporter.cs | 4 +- libse/Utilities.cs | 5 +-- libse/VideoInfo.cs | 2 +- libse/VobSub/VobSubParser.cs | 2 +- libse/VobSub/VobSubWriter.cs | 2 +- libse/WaveToVisualizer.cs | 17 ++++---- libse/XSub.cs | 2 +- libse/ZipExtractor.cs | 4 +- src/Controls/AudioVisualizer.cs | 7 ++- src/Controls/SETextBox.cs | 2 +- src/Controls/SubtitleListView.cs | 5 ++- src/Controls/TimeUpDown.cs | 6 +-- src/Controls/VideoPlayerContainer.cs | 2 +- src/Forms/About.cs | 2 +- src/Forms/AddToNames.cs | 4 +- src/Forms/AddToOcrReplaceList.cs | 2 +- src/Forms/AddToUserDic.cs | 2 +- src/Forms/AddWaveformBatch.cs | 1 - src/Forms/AlignmentPicker.cs | 2 +- src/Forms/ApplyDurationLimits.cs | 2 +- src/Forms/AutoBreakUnbreakLines.cs | 3 +- src/Forms/BatchConvert.cs | 5 ++- src/Forms/ChangeCasing.cs | 2 +- src/Forms/ChangeCasingNames.cs | 2 +- src/Forms/CheckForUpdates.cs | 4 +- src/Forms/ChooseEncoding.cs | 2 +- src/Forms/ChooseLanguage.cs | 4 +- src/Forms/ChooseResolution.cs | 2 +- src/Forms/ChooseStyle.cs | 2 +- src/Forms/DCinema/DCinemaPropertiesForm.cs | 2 +- src/Forms/DCinema/DCinemaPropertiesInterop.cs | 8 ++-- src/Forms/DCinema/DCinemaPropertiesSmpte.cs | 8 ++-- src/Forms/DialogDoNotShowAgain.cs | 2 +- src/Forms/DoNotBreakAfterListEdit.cs | 2 +- src/Forms/DurationsBridgeGaps.cs | 2 +- src/Forms/DvdSubRip.cs | 2 +- src/Forms/EbuSaveOptions.cs | 2 +- src/Forms/EffectKaraoke.cs | 2 +- src/Forms/ExportCustomText.cs | 2 +- src/Forms/ExportCustomTextFormat.cs | 2 +- src/Forms/ExportPngXml.cs | 4 +- src/Forms/ExportPngXmlPreview.cs | 2 +- src/Forms/ExportText.cs | 2 +- src/Forms/ExportTextST.cs | 7 +-- src/Forms/ExtractDateTimeInfo.cs | 2 +- src/Forms/FcpProperties.cs | 2 +- src/Forms/FindDialog.cs | 4 +- src/Forms/FindSubtitleLine.cs | 2 +- src/Forms/FixCommonErrors.cs | 4 +- src/Forms/GetDictionaries.cs | 2 +- src/Forms/GetTesseractDictionaries.cs | 2 +- src/Forms/GoToLine.cs | 2 +- src/Forms/GoogleOrMicrosoftTranslate.cs | 2 +- src/Forms/GoogleTranslate.cs | 5 ++- src/Forms/ImportImages.cs | 10 ++--- src/Forms/ImportSceneChanges.cs | 2 +- src/Forms/ImportText.cs | 2 +- src/Forms/ImportUnknownFormat.cs | 2 +- src/Forms/Interjections.cs | 2 +- src/Forms/JoinSubtitles.cs | 2 +- src/Forms/Main.cs | 5 +-- src/Forms/ModifySelection.cs | 2 +- src/Forms/MultipleReplace.cs | 2 +- src/Forms/NetworkJoin.cs | 2 +- src/Forms/NetworkLogAndInfo.cs | 2 +- src/Forms/NuendoProperties.cs | 2 +- src/Forms/PluginsGet.cs | 2 +- src/Forms/RemoveTextFromHearImpaired.cs | 2 +- src/Forms/ReplaceDialog.cs | 4 +- src/Forms/SetVideoOffset.cs | 1 + src/Forms/Settings.cs | 2 +- src/Forms/ShowEarlierLater.cs | 2 +- src/Forms/ShowHistory.cs | 2 +- src/Forms/SpellCheck.cs | 3 +- src/Forms/SplitLongLines.cs | 2 +- src/Forms/SplitSubtitle.cs | 2 +- src/Forms/Statistics.cs | 4 +- src/Forms/Styles/StylesForm.cs | 6 +-- src/Forms/Styles/SubStationAlphaStyles.cs | 2 +- .../SubStationAlphaStylesBatchConvert.cs | 12 +++--- src/Forms/Styles/TimedTextStyles.cs | 2 +- src/Forms/SubStationAlphaProperties.cs | 6 +-- src/Forms/SyncPointsSync.cs | 4 +- src/Forms/VideoPlayerUndocked.cs | 2 +- src/Forms/VisualSync.cs | 2 +- src/Forms/VobSubEditCharacters.cs | 2 +- src/Forms/VobSubNOcrCharacterInspect.cs | 2 +- src/Forms/VobSubOcr.cs | 4 +- src/Forms/VobSubOcrCharacter.cs | 2 +- src/Forms/VobSubOcrNOcrCharacter.cs | 2 +- src/Languages/ar-EG.xml | 2 +- src/Languages/bg-BG.xml | 2 +- src/Languages/ca-ES.xml | 2 +- src/Languages/cs-CZ.xml | 2 +- src/Languages/da-DK.xml | 2 +- src/Languages/de-DE.xml | 2 +- src/Languages/el-GR.xml | 2 +- src/Languages/es-AR.xml | 2 +- src/Languages/es-ES.xml | 2 +- src/Languages/es-MX.xml | 2 +- src/Languages/eu-ES.xml | 2 +- src/Languages/fa-IR.xml | 2 +- src/Languages/fi-FI.xml | 2 +- src/Languages/fr-FR.xml | 2 +- src/Languages/hr-HR.xml | 2 +- src/Languages/hu-HU.xml | 2 +- src/Languages/it-IT.xml | 2 +- src/Languages/ja-JP.xml | 2 +- src/Languages/ko-KR.xml | 2 +- src/Languages/nl-NL.xml | 2 +- src/Languages/pl-PL.xml | 2 +- src/Languages/pt-BR.xml | 2 +- src/Languages/pt-PT.xml | 2 +- src/Languages/ro-RO.xml | 2 +- src/Languages/ru-RU.xml | 2 +- src/Languages/sl-SI.xml | 2 +- src/Languages/sr-Cyrl-RS.xml | 2 +- src/Languages/sr-Latn-RS.xml | 2 +- src/Languages/sv-SE.xml | 2 +- src/Languages/th-TH.xml | 2 +- src/Languages/tr-TR.xml | 2 +- src/Languages/uk-UA.xml | 2 +- src/Languages/vi-VN.xml | 2 +- src/Languages/zh-Hans.xml | 2 +- src/Languages/zh-tw.xml | 2 +- .../ColorChooser/ColorChangedEventArgs.cs | 2 +- src/Logic/ColorChooser/ColorHandler.cs | 2 +- src/Logic/ColorChooser/ColorWheel.cs | 2 +- src/Logic/CommandLineConvert.cs | 9 ++-- src/Logic/FindReplaceDialogHelper.cs | 8 ++-- .../Networking/NikseWebServiceSession.cs | 6 +-- src/Logic/Networking/UpdateLogEntry.cs | 2 +- src/Logic/NikseBitmapImageSplitter.cs | 4 +- src/Logic/OCR/Binary/BinaryOcrBitmap.cs | 8 ++-- src/Logic/OCR/Binary/BinaryOcrDb.cs | 10 ++--- src/Logic/OCR/ModiLanguage.cs | 2 +- src/Logic/OCR/NOcrChar.cs | 2 +- src/Logic/OCR/NOcrDb.cs | 6 +-- src/Logic/OCR/NOcrPoint.cs | 2 +- src/Logic/OCR/OcrAlphabet.cs | 2 +- src/Logic/OCR/OcrCharacter.cs | 2 +- src/Logic/OCR/OcrFixEngine.cs | 2 +- src/Logic/OCR/OcrImage.cs | 2 +- src/Logic/SpellCheck/Hunspell.cs | 4 +- src/Logic/UiEbuSaveHelper.cs | 2 +- src/Logic/UiUtil.cs | 13 +++--- src/Logic/VideoPlayers/LibVlcDynamic.cs | 9 ++-- src/Logic/VideoPlayers/LibVlcMono.cs | 4 +- src/Logic/VideoPlayers/MPlayer.cs | 8 ++-- .../VideoPlayers/ManagedDirectXPlayer.cs | 2 +- src/Logic/VideoPlayers/MpcHC/MpcHc.cs | 1 + src/Logic/VideoPlayers/MpcHC/NativeMethods.cs | 2 +- src/Logic/VideoPlayers/QuartsPlayer.cs | 10 ++--- src/Logic/WordSpellChecker.cs | 6 +-- src/Program.cs | 6 +-- src/Resources/HunspellDictionaries.xml | 2 +- src/Resources/OpenOfficeDictionaries.xml | 2 +- src/Resources/TesseractDictionaries.xml | 2 +- src/Test/Core/LanguageAutoDetectTest.cs | 7 ++- src/Test/Core/StringExtensionsTest.cs | 4 +- src/Test/Dictionaries/names_etc.xml | 2 +- src/Test/FixCommonErrorsTest.cs | 43 ++++++++----------- .../Logic/BluRaySup/BluRaySupParserTest.cs | 8 ++-- src/Test/Logic/Dictionaries/NamesListTest.cs | 2 +- .../Dictionaries/OcrFixReplaceListTest.cs | 8 ++-- .../Forms/RemoveTextForHearImpairedTest.cs | 7 ++- src/Test/Logic/LanguageTest.cs | 6 +-- src/Test/Logic/Mp4/Mp4Test.cs | 2 +- src/Test/Logic/Ocr/BinaryOcrTest.cs | 6 +-- src/Test/Logic/Ocr/NOcrTest.cs | 6 +-- src/Test/Logic/ParagraphTest.cs | 8 ++-- src/Test/Logic/StripableTextTest.cs | 3 +- .../SubtitleFormats/SubtitleFormatsTest.cs | 15 +++---- src/Test/Logic/TimeCodeTest.cs | 7 ++- .../TransportStream/TransportStreamTest.cs | 2 +- src/Test/Logic/UtilitiesTest.cs | 8 ++-- src/Test/Logic/VideoFormats/MatroskaTest.cs | 2 +- src/Test/XmlDictionariesTest.cs | 6 +-- src/UpdateAssemblyInfo/Program.cs | 12 +++--- .../LanguageDeserializerGenerator.cs | 4 +- src/UpdateLanguageFiles/Program.cs | 2 +- .../MicrosoftTranslationService/Reference.cs | 2 +- .../SoapService.wsdl | 2 +- .../MicrosoftTranslationService/soap.wsdl | 2 +- .../MicrosoftTranslationService/soap.xsd | 2 +- .../MicrosoftTranslationService/soap0.xsd | 2 +- .../MicrosoftTranslationService/soap1.xsd | 2 +- .../MicrosoftTranslationService/soap2.xsd | 2 +- .../SeNetworkService/Reference.cs | 2 +- .../SeNetworkService/SeService.wsdl | 2 +- src/packages/packages.config | 2 +- 482 files changed, 739 insertions(+), 742 deletions(-) diff --git a/libse/BluRaySup/BluRaySupPalette.cs b/libse/BluRaySup/BluRaySupPalette.cs index 92a38e1cb..524ea5965 100644 --- a/libse/BluRaySup/BluRaySupPalette.cs +++ b/libse/BluRaySup/BluRaySupPalette.cs @@ -467,4 +467,4 @@ namespace Nikse.SubtitleEdit.Core.BluRaySup } } -} \ No newline at end of file +} diff --git a/libse/BluRaySup/BluRaySupParser.cs b/libse/BluRaySup/BluRaySupParser.cs index c69906895..c37d529c0 100644 --- a/libse/BluRaySup/BluRaySupParser.cs +++ b/libse/BluRaySup/BluRaySupParser.cs @@ -807,4 +807,4 @@ namespace Nikse.SubtitleEdit.Core.BluRaySup } } -} \ No newline at end of file +} diff --git a/libse/BluRaySup/BluRaySupPicture.cs b/libse/BluRaySup/BluRaySupPicture.cs index 403540d86..51b4a36ce 100644 --- a/libse/BluRaySup/BluRaySupPicture.cs +++ b/libse/BluRaySup/BluRaySupPicture.cs @@ -569,4 +569,4 @@ namespace Nikse.SubtitleEdit.Core.BluRaySup } } -} \ No newline at end of file +} diff --git a/libse/BluRaySup/Core.cs b/libse/BluRaySup/Core.cs index c31f681fa..2151f20f3 100644 --- a/libse/BluRaySup/Core.cs +++ b/libse/BluRaySup/Core.cs @@ -87,4 +87,4 @@ namespace Nikse.SubtitleEdit.Core.BluRaySup public const double FpsTrg = FpsPal; } -} \ No newline at end of file +} diff --git a/libse/BluRaySup/ImageObject.cs b/libse/BluRaySup/ImageObject.cs index f03225e26..b105a97c0 100644 --- a/libse/BluRaySup/ImageObject.cs +++ b/libse/BluRaySup/ImageObject.cs @@ -57,4 +57,4 @@ namespace Nikse.SubtitleEdit.Core.BluRaySup /// public int YOffset { get; set; } } -} \ No newline at end of file +} diff --git a/libse/BluRaySup/ImageObjectFragment.cs b/libse/BluRaySup/ImageObjectFragment.cs index a3cc65053..250732e2d 100644 --- a/libse/BluRaySup/ImageObjectFragment.cs +++ b/libse/BluRaySup/ImageObjectFragment.cs @@ -34,4 +34,4 @@ namespace Nikse.SubtitleEdit.Core.BluRaySup public byte[] ImageBuffer { get; set; } } -} \ No newline at end of file +} diff --git a/libse/BluRaySup/PaletteInfo.cs b/libse/BluRaySup/PaletteInfo.cs index 6ea146080..5b6159f68 100644 --- a/libse/BluRaySup/PaletteInfo.cs +++ b/libse/BluRaySup/PaletteInfo.cs @@ -47,4 +47,4 @@ namespace Nikse.SubtitleEdit.Core.BluRaySup } } -} \ No newline at end of file +} diff --git a/libse/BluRaySup/ToolBox.cs b/libse/BluRaySup/ToolBox.cs index 5d6fcb1de..dcbb439b6 100644 --- a/libse/BluRaySup/ToolBox.cs +++ b/libse/BluRaySup/ToolBox.cs @@ -119,4 +119,4 @@ namespace Nikse.SubtitleEdit.Core.BluRaySup } } -} \ No newline at end of file +} diff --git a/libse/BmpReader.cs b/libse/BmpReader.cs index 61b8ff98d..17ce8bee5 100644 --- a/libse/BmpReader.cs +++ b/libse/BmpReader.cs @@ -17,4 +17,4 @@ namespace Nikse.SubtitleEdit.Core } } -} \ No newline at end of file +} diff --git a/libse/Configuration.cs b/libse/Configuration.cs index cf6a48a79..7f45a8ad1 100644 --- a/libse/Configuration.cs +++ b/libse/Configuration.cs @@ -231,4 +231,4 @@ namespace Nikse.SubtitleEdit.Core } } -} \ No newline at end of file +} diff --git a/libse/ContainerFormats/Ebml/Element.cs b/libse/ContainerFormats/Ebml/Element.cs index 2e3e51add..16a715278 100644 --- a/libse/ContainerFormats/Ebml/Element.cs +++ b/libse/ContainerFormats/Ebml/Element.cs @@ -50,4 +50,4 @@ return string.Format(@"{0} ({1})", _id, _dataSize); } } -} \ No newline at end of file +} diff --git a/libse/ContainerFormats/MaterialExchangeFormat/KlvPacket.cs b/libse/ContainerFormats/MaterialExchangeFormat/KlvPacket.cs index 8f137770a..98d0ab779 100644 --- a/libse/ContainerFormats/MaterialExchangeFormat/KlvPacket.cs +++ b/libse/ContainerFormats/MaterialExchangeFormat/KlvPacket.cs @@ -1,7 +1,7 @@ -using System; +using Nikse.SubtitleEdit.Core.VobSub; +using System; using System.IO; using System.Text; -using Nikse.SubtitleEdit.Core.VobSub; namespace Nikse.SubtitleEdit.Core.ContainerFormats.MaterialExchangeFormat { @@ -152,4 +152,4 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.MaterialExchangeFormat } } -} \ No newline at end of file +} diff --git a/libse/ContainerFormats/MaterialExchangeFormat/MxfParser.cs b/libse/ContainerFormats/MaterialExchangeFormat/MxfParser.cs index 8eeffd385..f1235b6c5 100644 --- a/libse/ContainerFormats/MaterialExchangeFormat/MxfParser.cs +++ b/libse/ContainerFormats/MaterialExchangeFormat/MxfParser.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; namespace Nikse.SubtitleEdit.Core.ContainerFormats.MaterialExchangeFormat @@ -121,4 +120,4 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.MaterialExchangeFormat } } -} \ No newline at end of file +} diff --git a/libse/ContainerFormats/Matroska/MatroskaFile.cs b/libse/ContainerFormats/Matroska/MatroskaFile.cs index d2ff2932c..b5c25ca49 100644 --- a/libse/ContainerFormats/Matroska/MatroskaFile.cs +++ b/libse/ContainerFormats/Matroska/MatroskaFile.cs @@ -1,9 +1,9 @@ -using System; +using Nikse.SubtitleEdit.Core.ContainerFormats.Ebml; +using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using Nikse.SubtitleEdit.Core.ContainerFormats.Ebml; namespace Nikse.SubtitleEdit.Core.ContainerFormats.Matroska { @@ -645,4 +645,4 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.Matroska return encoding.GetString(buffer); } } -} \ No newline at end of file +} diff --git a/libse/ContainerFormats/Mp4/Boxes/Stbl.cs b/libse/ContainerFormats/Mp4/Boxes/Stbl.cs index cb5286e95..07842f0c9 100644 --- a/libse/ContainerFormats/Mp4/Boxes/Stbl.cs +++ b/libse/ContainerFormats/Mp4/Boxes/Stbl.cs @@ -1,9 +1,9 @@ -using System; +using Nikse.SubtitleEdit.Core.SubtitleFormats; +using Nikse.SubtitleEdit.Core.VobSub; +using System; using System.Collections.Generic; using System.IO; using System.Text; -using Nikse.SubtitleEdit.Core.SubtitleFormats; -using Nikse.SubtitleEdit.Core.VobSub; namespace Nikse.SubtitleEdit.Core.ContainerFormats.Mp4.Boxes { @@ -197,4 +197,4 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.Mp4.Boxes } } -} \ No newline at end of file +} diff --git a/libse/ContainerFormats/Mp4/Mp4Parser.cs b/libse/ContainerFormats/Mp4/Mp4Parser.cs index eae7ea73d..c8d4d998f 100644 --- a/libse/ContainerFormats/Mp4/Mp4Parser.cs +++ b/libse/ContainerFormats/Mp4/Mp4Parser.cs @@ -1,7 +1,7 @@ -using System; +using Nikse.SubtitleEdit.Core.ContainerFormats.Mp4.Boxes; +using System; using System.Collections.Generic; using System.IO; -using Nikse.SubtitleEdit.Core.ContainerFormats.Mp4.Boxes; namespace Nikse.SubtitleEdit.Core.ContainerFormats.Mp4 { diff --git a/libse/ContainerFormats/RiffDecodeHeader.cs b/libse/ContainerFormats/RiffDecodeHeader.cs index c717ce585..99d9047ac 100644 --- a/libse/ContainerFormats/RiffDecodeHeader.cs +++ b/libse/ContainerFormats/RiffDecodeHeader.cs @@ -448,4 +448,4 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats #endregion WAVE processing } -} \ No newline at end of file +} diff --git a/libse/ContainerFormats/RiffParser.cs b/libse/ContainerFormats/RiffParser.cs index 49fa55a39..bfd42667b 100644 --- a/libse/ContainerFormats/RiffParser.cs +++ b/libse/ContainerFormats/RiffParser.cs @@ -479,4 +479,4 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats } } -} \ No newline at end of file +} diff --git a/libse/DetectEncoding/EncodingTools.cs b/libse/DetectEncoding/EncodingTools.cs index 5fd1cb6df..cc7b9cccc 100644 --- a/libse/DetectEncoding/EncodingTools.cs +++ b/libse/DetectEncoding/EncodingTools.cs @@ -1,11 +1,11 @@ // Ripped from http://www.codeproject.com/KB/recipes/DetectEncoding.aspx +using Nikse.SubtitleEdit.Core.DetectEncoding.Multilang; using System; using System.Collections.Generic; using System.IO; using System.Runtime.InteropServices; using System.Text; -using Nikse.SubtitleEdit.Core.DetectEncoding.Multilang; namespace Nikse.SubtitleEdit.Core.DetectEncoding { diff --git a/libse/Dictionaries/NamesList.cs b/libse/Dictionaries/NamesList.cs index 861546f05..23342aab3 100644 --- a/libse/Dictionaries/NamesList.cs +++ b/libse/Dictionaries/NamesList.cs @@ -255,4 +255,4 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries } } -} \ No newline at end of file +} diff --git a/libse/Dictionaries/OcrFixReplaceList.cs b/libse/Dictionaries/OcrFixReplaceList.cs index f8585db2b..afd597990 100644 --- a/libse/Dictionaries/OcrFixReplaceList.cs +++ b/libse/Dictionaries/OcrFixReplaceList.cs @@ -954,4 +954,4 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries } } -} \ No newline at end of file +} diff --git a/libse/Enums/FindType.cs b/libse/Enums/FindType.cs index 073ccc34a..531b04615 100644 --- a/libse/Enums/FindType.cs +++ b/libse/Enums/FindType.cs @@ -6,4 +6,4 @@ CaseSensitive, RegEx } -} \ No newline at end of file +} diff --git a/libse/Enums/SelectionChoice.cs b/libse/Enums/SelectionChoice.cs index ee5c78b02..7d6dc33e9 100644 --- a/libse/Enums/SelectionChoice.cs +++ b/libse/Enums/SelectionChoice.cs @@ -6,4 +6,4 @@ AllLines, SelectionAndForward, } -} \ No newline at end of file +} diff --git a/libse/Enums/SpellCheckAction.cs b/libse/Enums/SpellCheckAction.cs index 90be6e242..8959c887a 100644 --- a/libse/Enums/SpellCheckAction.cs +++ b/libse/Enums/SpellCheckAction.cs @@ -12,4 +12,4 @@ AddToNamesEtc, ChangeWholeText } -} \ No newline at end of file +} diff --git a/libse/Enums/SubtitleSortCriteria.cs b/libse/Enums/SubtitleSortCriteria.cs index 8ef5d2fc0..4605b1553 100644 --- a/libse/Enums/SubtitleSortCriteria.cs +++ b/libse/Enums/SubtitleSortCriteria.cs @@ -14,4 +14,4 @@ WordsPerMinute, Style, } -} \ No newline at end of file +} diff --git a/libse/FastBitmap.cs b/libse/FastBitmap.cs index 16fff346d..3f04bf09a 100644 --- a/libse/FastBitmap.cs +++ b/libse/FastBitmap.cs @@ -121,4 +121,4 @@ namespace Nikse.SubtitleEdit.Core _pBase = null; } } -} \ No newline at end of file +} diff --git a/libse/FastFileStream.cs b/libse/FastFileStream.cs index 7f9024148..c80a504a3 100644 --- a/libse/FastFileStream.cs +++ b/libse/FastFileStream.cs @@ -101,4 +101,4 @@ namespace Nikse.SubtitleEdit.Core return base.ReadByte(); } } -} \ No newline at end of file +} diff --git a/libse/FileUtil.cs b/libse/FileUtil.cs index 9fb847ce9..f43f7921a 100644 --- a/libse/FileUtil.cs +++ b/libse/FileUtil.cs @@ -301,4 +301,4 @@ namespace Nikse.SubtitleEdit.Core return ((File.GetAttributes(path) & FileAttributes.Directory) == FileAttributes.Directory); } } -} \ No newline at end of file +} diff --git a/libse/Forms/CheckForUpdatesHelper.cs b/libse/Forms/CheckForUpdatesHelper.cs index 13c096c88..6d9c74d7a 100644 --- a/libse/Forms/CheckForUpdatesHelper.cs +++ b/libse/Forms/CheckForUpdatesHelper.cs @@ -18,6 +18,7 @@ namespace Nikse.SubtitleEdit.Core.Forms private int _successCount; public string Error { get; set; } + public bool Done { get @@ -25,6 +26,7 @@ namespace Nikse.SubtitleEdit.Core.Forms return _successCount == 1; } } + public string LatestVersionNumber { get; set; } public string LatestChangeLog { get; set; } @@ -183,4 +185,4 @@ namespace Nikse.SubtitleEdit.Core.Forms } } -} \ No newline at end of file +} diff --git a/libse/Forms/FixCommonErrors/EmptyFixCallback.cs b/libse/Forms/FixCommonErrors/EmptyFixCallback.cs index bd4fa16ce..9d96466e0 100644 --- a/libse/Forms/FixCommonErrors/EmptyFixCallback.cs +++ b/libse/Forms/FixCommonErrors/EmptyFixCallback.cs @@ -1,6 +1,6 @@ -using System.Collections.Generic; +using Nikse.SubtitleEdit.Core.SubtitleFormats; +using System.Collections.Generic; using System.Text; -using Nikse.SubtitleEdit.Core.SubtitleFormats; namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors { @@ -42,6 +42,7 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors } private string _language = "en"; + public string Language { get { return _language; } @@ -54,6 +55,7 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors } private Encoding _encoding = Encoding.UTF8; + public Encoding Encoding { get { return _encoding; } @@ -66,4 +68,4 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors } } -} \ No newline at end of file +} diff --git a/libse/Forms/FixCommonErrors/FixEmptyLines.cs b/libse/Forms/FixCommonErrors/FixEmptyLines.cs index 8677533a5..dbe69cc88 100644 --- a/libse/Forms/FixCommonErrors/FixEmptyLines.cs +++ b/libse/Forms/FixCommonErrors/FixEmptyLines.cs @@ -123,4 +123,4 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors } } -} \ No newline at end of file +} diff --git a/libse/Forms/FixCommonErrors/FixHyphensAdd.cs b/libse/Forms/FixCommonErrors/FixHyphensAdd.cs index 7938e32fe..c8599a70b 100644 --- a/libse/Forms/FixCommonErrors/FixHyphensAdd.cs +++ b/libse/Forms/FixCommonErrors/FixHyphensAdd.cs @@ -1,5 +1,4 @@ - -namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors +namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors { public class FixHyphensAdd : IFixCommonError { diff --git a/libse/Forms/FixCommonErrors/FixHyphensRemove.cs b/libse/Forms/FixCommonErrors/FixHyphensRemove.cs index a4ff62d7d..b60d74c4a 100644 --- a/libse/Forms/FixCommonErrors/FixHyphensRemove.cs +++ b/libse/Forms/FixCommonErrors/FixHyphensRemove.cs @@ -1,5 +1,4 @@ - -namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors +namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors { public class FixHyphensRemove : IFixCommonError { diff --git a/libse/Forms/FixCommonErrors/FixLongLines.cs b/libse/Forms/FixCommonErrors/FixLongLines.cs index a6a1c6b98..ebfa1ee9e 100644 --- a/libse/Forms/FixCommonErrors/FixLongLines.cs +++ b/libse/Forms/FixCommonErrors/FixLongLines.cs @@ -40,4 +40,4 @@ callbacks.UpdateFixStatus(noOfLongLines, language.BreakLongLines, string.Format(language.XLineBreaksAdded, noOfLongLines)); } } -} \ No newline at end of file +} diff --git a/libse/Forms/FixCommonErrors/FixMissingPeriodsAtEndOfLine.cs b/libse/Forms/FixCommonErrors/FixMissingPeriodsAtEndOfLine.cs index 8492a8e34..1caff0230 100644 --- a/libse/Forms/FixCommonErrors/FixMissingPeriodsAtEndOfLine.cs +++ b/libse/Forms/FixCommonErrors/FixMissingPeriodsAtEndOfLine.cs @@ -156,4 +156,4 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors } } -} \ No newline at end of file +} diff --git a/libse/Forms/FixCommonErrors/FixShortDisplayTimes.cs b/libse/Forms/FixCommonErrors/FixShortDisplayTimes.cs index 4418e8634..be02bd4aa 100644 --- a/libse/Forms/FixCommonErrors/FixShortDisplayTimes.cs +++ b/libse/Forms/FixCommonErrors/FixShortDisplayTimes.cs @@ -163,4 +163,4 @@ } } -} \ No newline at end of file +} diff --git a/libse/Forms/FixCommonErrors/Helper.cs b/libse/Forms/FixCommonErrors/Helper.cs index 3f7c976b6..021c97ad0 100644 --- a/libse/Forms/FixCommonErrors/Helper.cs +++ b/libse/Forms/FixCommonErrors/Helper.cs @@ -493,4 +493,4 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors } } -} \ No newline at end of file +} diff --git a/libse/Forms/FixCommonErrors/IFixCallbacks.cs b/libse/Forms/FixCommonErrors/IFixCallbacks.cs index 81dbf95a0..359ec7514 100644 --- a/libse/Forms/FixCommonErrors/IFixCallbacks.cs +++ b/libse/Forms/FixCommonErrors/IFixCallbacks.cs @@ -1,6 +1,6 @@ -using System.Collections.Generic; +using Nikse.SubtitleEdit.Core.SubtitleFormats; +using System.Collections.Generic; using System.Text; -using Nikse.SubtitleEdit.Core.SubtitleFormats; namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors { diff --git a/libse/Forms/FixCommonErrors/RemoveSpaceBetweenNumbers.cs b/libse/Forms/FixCommonErrors/RemoveSpaceBetweenNumbers.cs index 2ae0f33fb..9d6df66d8 100644 --- a/libse/Forms/FixCommonErrors/RemoveSpaceBetweenNumbers.cs +++ b/libse/Forms/FixCommonErrors/RemoveSpaceBetweenNumbers.cs @@ -1,7 +1,4 @@ -using System; -using System.Text.RegularExpressions; - -namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors +namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors { public class RemoveSpaceBetweenNumbers : IFixCommonError { @@ -29,4 +26,4 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors } } -} \ No newline at end of file +} diff --git a/libse/Forms/RemoveTextForHI.cs b/libse/Forms/RemoveTextForHI.cs index dc55afea5..b43c0c965 100644 --- a/libse/Forms/RemoveTextForHI.cs +++ b/libse/Forms/RemoveTextForHI.cs @@ -661,7 +661,6 @@ namespace Nikse.SubtitleEdit.Core.Forms text = "" + text.Remove(0, removeText.Length).TrimStart(' '); } - if (oldText != text) { // insert spaces before "-" @@ -1256,4 +1255,4 @@ namespace Nikse.SubtitleEdit.Core.Forms } } -} \ No newline at end of file +} diff --git a/libse/Forms/RemoveTextForHISettings.cs b/libse/Forms/RemoveTextForHISettings.cs index ad69fdcec..2e11f92a3 100644 --- a/libse/Forms/RemoveTextForHISettings.cs +++ b/libse/Forms/RemoveTextForHISettings.cs @@ -45,4 +45,4 @@ namespace Nikse.SubtitleEdit.Core.Forms } } -} \ No newline at end of file +} diff --git a/libse/Forms/SplitLongLinesHelper.cs b/libse/Forms/SplitLongLinesHelper.cs index 8cd6e6f1a..14fdbbdc3 100644 --- a/libse/Forms/SplitLongLinesHelper.cs +++ b/libse/Forms/SplitLongLinesHelper.cs @@ -140,4 +140,4 @@ namespace Nikse.SubtitleEdit.Core.Forms } } -} \ No newline at end of file +} diff --git a/libse/HistoryItem.cs b/libse/HistoryItem.cs index d3ea43f4c..24b025f79 100644 --- a/libse/HistoryItem.cs +++ b/libse/HistoryItem.cs @@ -49,4 +49,4 @@ namespace Nikse.SubtitleEdit.Core return $"{Timestamp.Hour:00}:{Timestamp.Minute:00}:{Timestamp.Second:00}"; } } -} \ No newline at end of file +} diff --git a/libse/HtmlUtil.cs b/libse/HtmlUtil.cs index 10b8d4c32..cd9490cbc 100644 --- a/libse/HtmlUtil.cs +++ b/libse/HtmlUtil.cs @@ -700,4 +700,4 @@ namespace Nikse.SubtitleEdit.Core } } -} \ No newline at end of file +} diff --git a/libse/IfoParser.cs b/libse/IfoParser.cs index 80eee60e3..45ca6b0c3 100644 --- a/libse/IfoParser.cs +++ b/libse/IfoParser.cs @@ -615,4 +615,4 @@ namespace Nikse.SubtitleEdit.Core } } -} \ No newline at end of file +} diff --git a/libse/Language.cs b/libse/Language.cs index 2fff30301..9c525b542 100644 --- a/libse/Language.cs +++ b/libse/Language.cs @@ -2504,4 +2504,4 @@ Keep changes?", } } -} \ No newline at end of file +} diff --git a/libse/LanguageStructure.cs b/libse/LanguageStructure.cs index 9ec4877c4..f9e2e7bea 100644 --- a/libse/LanguageStructure.cs +++ b/libse/LanguageStructure.cs @@ -1364,6 +1364,7 @@ //translation helper public string AutoRepeat { get; set; } + public string AutoRepeatOn { get; set; } public string AutoRepeatCount { get; set; } public string AutoContinue { get; set; } @@ -1383,6 +1384,7 @@ // create/adjust public string InsertNewSubtitleAtVideoPosition { get; set; } + public string Auto { get; set; } public string PlayFromJustBeforeText { get; set; } public string Pause { get; set; } @@ -2327,4 +2329,4 @@ } } -} \ No newline at end of file +} diff --git a/libse/ManagedBitmap.cs b/libse/ManagedBitmap.cs index 94709c468..4d89fad98 100644 --- a/libse/ManagedBitmap.cs +++ b/libse/ManagedBitmap.cs @@ -202,4 +202,4 @@ namespace Nikse.SubtitleEdit.Core } } -} \ No newline at end of file +} diff --git a/libse/MurMurHash3.cs b/libse/MurMurHash3.cs index f9b0d8bc1..6a74dd98b 100644 --- a/libse/MurMurHash3.cs +++ b/libse/MurMurHash3.cs @@ -85,4 +85,4 @@ } } -} \ No newline at end of file +} diff --git a/libse/NikseBitmap.cs b/libse/NikseBitmap.cs index 5de5e3cfd..ef5a37ae6 100644 --- a/libse/NikseBitmap.cs +++ b/libse/NikseBitmap.cs @@ -1,10 +1,10 @@ -using System; +using Nikse.SubtitleEdit.Core.VobSub; +using System; using System.Collections.Generic; using System.Drawing; using System.Drawing.Imaging; using System.IO; using System.Runtime.InteropServices; -using Nikse.SubtitleEdit.Core.VobSub; namespace Nikse.SubtitleEdit.Core { @@ -1098,7 +1098,7 @@ namespace Nikse.SubtitleEdit.Core var pixels = new byte[_bitmapData.Length]; int offsetDest = 0; - for (int y = Height-1; y >= 0; y--) // takes lines from bottom lines to top (mirrowed horizontally) + for (int y = Height - 1; y >= 0; y--) // takes lines from bottom lines to top (mirrowed horizontally) { for (int x = 0; x < Width; x++) { @@ -1119,4 +1119,4 @@ namespace Nikse.SubtitleEdit.Core } } -} \ No newline at end of file +} diff --git a/libse/NoBreakAfterItem.cs b/libse/NoBreakAfterItem.cs index 09e47be55..de5515033 100644 --- a/libse/NoBreakAfterItem.cs +++ b/libse/NoBreakAfterItem.cs @@ -53,4 +53,4 @@ namespace Nikse.SubtitleEdit.Core return string.Compare(Text, o.Text, StringComparison.Ordinal); } } -} \ No newline at end of file +} diff --git a/libse/Paragraph.cs b/libse/Paragraph.cs index 4e5daac4a..7d11bc4c8 100644 --- a/libse/Paragraph.cs +++ b/libse/Paragraph.cs @@ -155,4 +155,4 @@ namespace Nikse.SubtitleEdit.Core } } } -} \ No newline at end of file +} diff --git a/libse/RegistryUtil.cs b/libse/RegistryUtil.cs index 3ae073d79..11790da76 100644 --- a/libse/RegistryUtil.cs +++ b/libse/RegistryUtil.cs @@ -1,5 +1,5 @@ -using System.Security; -using Microsoft.Win32; +using Microsoft.Win32; +using System.Security; namespace Nikse.SubtitleEdit.Core { @@ -40,4 +40,4 @@ namespace Nikse.SubtitleEdit.Core return null; } } -} \ No newline at end of file +} diff --git a/libse/RichTextToPlainText.cs b/libse/RichTextToPlainText.cs index 2b3cf6519..8ee5e7d00 100644 --- a/libse/RichTextToPlainText.cs +++ b/libse/RichTextToPlainText.cs @@ -1,8 +1,8 @@ -using System; +using Nikse.SubtitleEdit.Core.Interfaces; +using System; using System.Collections.Generic; using System.Text; using System.Text.RegularExpressions; -using Nikse.SubtitleEdit.Core.Interfaces; namespace Nikse.SubtitleEdit.Core { @@ -263,4 +263,4 @@ namespace Nikse.SubtitleEdit.Core } -} \ No newline at end of file +} diff --git a/libse/Settings.cs b/libse/Settings.cs index 5be7cac58..c3df0e8a5 100644 --- a/libse/Settings.cs +++ b/libse/Settings.cs @@ -732,7 +732,7 @@ namespace Nikse.SubtitleEdit.Core public int LineOcrMinLineHeight { get; set; } public int LineOcrMaxLineHeight { get; set; } public string LastBinaryImageCompareDb { get; set; } - public string LastBinaryImageSpellCheck { get; set; } + public string LastBinaryImageSpellCheck { get; set; } public VobSubOcrSettings() { @@ -1849,7 +1849,7 @@ namespace Nikse.SubtitleEdit.Core settings.SubtitleSettings.SsaMarginRight = Convert.ToInt32(subNode.InnerText); subNode = node.SelectSingleNode("SsaMarginTopBottom"); if (subNode != null) - settings.SubtitleSettings.SsaMarginTopBottom= Convert.ToInt32(subNode.InnerText); + settings.SubtitleSettings.SsaMarginTopBottom = Convert.ToInt32(subNode.InnerText); subNode = node.SelectSingleNode("DCinemaFontFile"); if (subNode != null) settings.SubtitleSettings.DCinemaFontFile = subNode.InnerText; @@ -2242,10 +2242,10 @@ namespace Nikse.SubtitleEdit.Core settings.VobSubOcr.LineOcrMinLineHeight = Convert.ToInt32(subNode.InnerText); subNode = node.SelectSingleNode("LineOcrMaxLineHeight"); if (subNode != null) - settings.VobSubOcr.LineOcrMaxLineHeight = Convert.ToInt32(subNode.InnerText); + settings.VobSubOcr.LineOcrMaxLineHeight = Convert.ToInt32(subNode.InnerText); subNode = node.SelectSingleNode("LastBinaryImageCompareDb"); if (subNode != null) - settings.VobSubOcr.LastBinaryImageCompareDb = subNode.InnerText; + settings.VobSubOcr.LastBinaryImageCompareDb = subNode.InnerText; subNode = node.SelectSingleNode("LastBinaryImageSpellCheck"); if (subNode != null) settings.VobSubOcr.LastBinaryImageSpellCheck = subNode.InnerText; @@ -3299,4 +3299,4 @@ namespace Nikse.SubtitleEdit.Core } } -} \ No newline at end of file +} diff --git a/libse/SsaStyle.cs b/libse/SsaStyle.cs index 808570851..d11dc3121 100644 --- a/libse/SsaStyle.cs +++ b/libse/SsaStyle.cs @@ -1,7 +1,7 @@ -using System; +using Nikse.SubtitleEdit.Core.SubtitleFormats; +using System; using System.Drawing; using System.Text; -using Nikse.SubtitleEdit.Core.SubtitleFormats; namespace Nikse.SubtitleEdit.Core { @@ -202,4 +202,4 @@ namespace Nikse.SubtitleEdit.Core return s.Substring(0, s.Length - 1); } } -} \ No newline at end of file +} diff --git a/libse/StringExtensions.cs b/libse/StringExtensions.cs index 71fd2e305..692c13835 100644 --- a/libse/StringExtensions.cs +++ b/libse/StringExtensions.cs @@ -226,4 +226,4 @@ namespace Nikse.SubtitleEdit.Core } } -} \ No newline at end of file +} diff --git a/libse/StripableText.cs b/libse/StripableText.cs index e39459890..371b3e7e3 100644 --- a/libse/StripableText.cs +++ b/libse/StripableText.cs @@ -283,4 +283,4 @@ namespace Nikse.SubtitleEdit.Core } } -} \ No newline at end of file +} diff --git a/libse/Subtitle.cs b/libse/Subtitle.cs index 454b0dd6a..238d33b8e 100644 --- a/libse/Subtitle.cs +++ b/libse/Subtitle.cs @@ -583,4 +583,4 @@ namespace Nikse.SubtitleEdit.Core } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/AQTitle.cs b/libse/SubtitleFormats/AQTitle.cs index 1037b9916..7c1f40d54 100644 --- a/libse/SubtitleFormats/AQTitle.cs +++ b/libse/SubtitleFormats/AQTitle.cs @@ -146,4 +146,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/AbcIViewer.cs b/libse/SubtitleFormats/AbcIViewer.cs index 097e357a7..88f30caff 100644 --- a/libse/SubtitleFormats/AbcIViewer.cs +++ b/libse/SubtitleFormats/AbcIViewer.cs @@ -132,4 +132,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/AdobeEncoreLineTabNewLine.cs b/libse/SubtitleFormats/AdobeEncoreLineTabNewLine.cs index 9f97b57f4..184ad2bbe 100644 --- a/libse/SubtitleFormats/AdobeEncoreLineTabNewLine.cs +++ b/libse/SubtitleFormats/AdobeEncoreLineTabNewLine.cs @@ -138,4 +138,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/AdobeEncoreLineTabs.cs b/libse/SubtitleFormats/AdobeEncoreLineTabs.cs index a38088770..a2c63c527 100644 --- a/libse/SubtitleFormats/AdobeEncoreLineTabs.cs +++ b/libse/SubtitleFormats/AdobeEncoreLineTabs.cs @@ -128,4 +128,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/AdobeEncoreTabs.cs b/libse/SubtitleFormats/AdobeEncoreTabs.cs index 6e390fbd2..afcc3420a 100644 --- a/libse/SubtitleFormats/AdobeEncoreTabs.cs +++ b/libse/SubtitleFormats/AdobeEncoreTabs.cs @@ -93,4 +93,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/AdobeEncoreWithLineNumbersNtsc.cs b/libse/SubtitleFormats/AdobeEncoreWithLineNumbersNtsc.cs index ebcd6e975..1207bfb3f 100644 --- a/libse/SubtitleFormats/AdobeEncoreWithLineNumbersNtsc.cs +++ b/libse/SubtitleFormats/AdobeEncoreWithLineNumbersNtsc.cs @@ -98,4 +98,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats subtitle.Renumber(); } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/AdvancedSubStationAlpha.cs b/libse/SubtitleFormats/AdvancedSubStationAlpha.cs index 1497a07a9..adf924756 100644 --- a/libse/SubtitleFormats/AdvancedSubStationAlpha.cs +++ b/libse/SubtitleFormats/AdvancedSubStationAlpha.cs @@ -1522,4 +1522,4 @@ Format: Layer, Start, End, Style, Actor, MarginL, MarginR, MarginV, Effect, Text } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/AvidCaption.cs b/libse/SubtitleFormats/AvidCaption.cs index aab4db5a6..b6910c70f 100644 --- a/libse/SubtitleFormats/AvidCaption.cs +++ b/libse/SubtitleFormats/AvidCaption.cs @@ -127,4 +127,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/AvidDvd.cs b/libse/SubtitleFormats/AvidDvd.cs index 8f3969c8e..3ce2b230a 100644 --- a/libse/SubtitleFormats/AvidDvd.cs +++ b/libse/SubtitleFormats/AvidDvd.cs @@ -145,4 +145,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/AvidStl.cs b/libse/SubtitleFormats/AvidStl.cs index 090277971..125cb220a 100644 --- a/libse/SubtitleFormats/AvidStl.cs +++ b/libse/SubtitleFormats/AvidStl.cs @@ -189,4 +189,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Ayato.cs b/libse/SubtitleFormats/Ayato.cs index 3dc42d534..cda886d3a 100644 --- a/libse/SubtitleFormats/Ayato.cs +++ b/libse/SubtitleFormats/Ayato.cs @@ -110,7 +110,6 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats header[2082] = 0x01; header[2085] = 0x01; - // Microsoft Sans Serif header[2088] = 0x4d; header[2089] = 0x69; @@ -372,4 +371,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/BdnXml.cs b/libse/SubtitleFormats/BdnXml.cs index 98049a912..409b89d8c 100644 --- a/libse/SubtitleFormats/BdnXml.cs +++ b/libse/SubtitleFormats/BdnXml.cs @@ -127,4 +127,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/BelleNuitSubtitler.cs b/libse/SubtitleFormats/BelleNuitSubtitler.cs index 203f9fd1a..a562a07da 100644 --- a/libse/SubtitleFormats/BelleNuitSubtitler.cs +++ b/libse/SubtitleFormats/BelleNuitSubtitler.cs @@ -329,4 +329,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/CapMakerPlus.cs b/libse/SubtitleFormats/CapMakerPlus.cs index 85943d15e..a0a737989 100644 --- a/libse/SubtitleFormats/CapMakerPlus.cs +++ b/libse/SubtitleFormats/CapMakerPlus.cs @@ -265,4 +265,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/CaptionAssistant.cs b/libse/SubtitleFormats/CaptionAssistant.cs index f3245af99..76748eb28 100644 --- a/libse/SubtitleFormats/CaptionAssistant.cs +++ b/libse/SubtitleFormats/CaptionAssistant.cs @@ -156,4 +156,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Captionate.cs b/libse/SubtitleFormats/Captionate.cs index 08719f635..a245c0c6c 100644 --- a/libse/SubtitleFormats/Captionate.cs +++ b/libse/SubtitleFormats/Captionate.cs @@ -172,4 +172,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/CaptionateMs.cs b/libse/SubtitleFormats/CaptionateMs.cs index b37f66dbd..1a737ba02 100644 --- a/libse/SubtitleFormats/CaptionateMs.cs +++ b/libse/SubtitleFormats/CaptionateMs.cs @@ -152,4 +152,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/CaptionsInc.cs b/libse/SubtitleFormats/CaptionsInc.cs index e87c7b70a..0ccf994f6 100644 --- a/libse/SubtitleFormats/CaptionsInc.cs +++ b/libse/SubtitleFormats/CaptionsInc.cs @@ -243,4 +243,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/CaraokeXml.cs b/libse/SubtitleFormats/CaraokeXml.cs index 39542f020..abac9bf32 100644 --- a/libse/SubtitleFormats/CaraokeXml.cs +++ b/libse/SubtitleFormats/CaraokeXml.cs @@ -108,4 +108,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Cavena890.cs b/libse/SubtitleFormats/Cavena890.cs index 973bc166d..642763a5a 100644 --- a/libse/SubtitleFormats/Cavena890.cs +++ b/libse/SubtitleFormats/Cavena890.cs @@ -717,7 +717,6 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats _languageIdLine2 = LanguageIdRussian; } - // Chinese else if (_languageIdLine1 == LanguageIdChineseSimplified) { @@ -730,7 +729,6 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats _languageIdLine2 = LanguageIdChineseTraditional; } - int i = 455; int lastNumber = -1; while (i < buffer.Length - 20) @@ -991,4 +989,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/CheetahCaption.cs b/libse/SubtitleFormats/CheetahCaption.cs index 4e329dac7..2d608083f 100644 --- a/libse/SubtitleFormats/CheetahCaption.cs +++ b/libse/SubtitleFormats/CheetahCaption.cs @@ -354,4 +354,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Chk.cs b/libse/SubtitleFormats/Chk.cs index ad977f332..3aaf0cc61 100644 --- a/libse/SubtitleFormats/Chk.cs +++ b/libse/SubtitleFormats/Chk.cs @@ -148,7 +148,6 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats text = text.Remove(0, 5); } - // special language codes... text = text.Replace("ÔA", "Á"); text = text.Replace("ÔE", "É"); diff --git a/libse/SubtitleFormats/Csv.cs b/libse/SubtitleFormats/Csv.cs index 1388899b9..c692f11d1 100644 --- a/libse/SubtitleFormats/Csv.cs +++ b/libse/SubtitleFormats/Csv.cs @@ -94,4 +94,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Csv2.cs b/libse/SubtitleFormats/Csv2.cs index 83198b683..cb0cfeb3f 100644 --- a/libse/SubtitleFormats/Csv2.cs +++ b/libse/SubtitleFormats/Csv2.cs @@ -127,4 +127,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Csv3.cs b/libse/SubtitleFormats/Csv3.cs index b742d8a28..2413f1c4f 100644 --- a/libse/SubtitleFormats/Csv3.cs +++ b/libse/SubtitleFormats/Csv3.cs @@ -178,4 +178,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/DCSubtitle.cs b/libse/SubtitleFormats/DCSubtitle.cs index 5092710f9..a8fe73cf5 100644 --- a/libse/SubtitleFormats/DCSubtitle.cs +++ b/libse/SubtitleFormats/DCSubtitle.cs @@ -732,4 +732,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/DCinemaSmpte2007.cs b/libse/SubtitleFormats/DCinemaSmpte2007.cs index 500b3f091..48d1591dc 100644 --- a/libse/SubtitleFormats/DCinemaSmpte2007.cs +++ b/libse/SubtitleFormats/DCinemaSmpte2007.cs @@ -777,4 +777,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/DCinemaSmpte2010.cs b/libse/SubtitleFormats/DCinemaSmpte2010.cs index 15f234135..92df1d675 100644 --- a/libse/SubtitleFormats/DCinemaSmpte2010.cs +++ b/libse/SubtitleFormats/DCinemaSmpte2010.cs @@ -785,4 +785,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/DigiBeta.cs b/libse/SubtitleFormats/DigiBeta.cs index a8ec9dd57..6566c5e81 100644 --- a/libse/SubtitleFormats/DigiBeta.cs +++ b/libse/SubtitleFormats/DigiBeta.cs @@ -85,4 +85,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Dost.cs b/libse/SubtitleFormats/Dost.cs index 97fa2dd47..7e95d3ec1 100644 --- a/libse/SubtitleFormats/Dost.cs +++ b/libse/SubtitleFormats/Dost.cs @@ -97,6 +97,6 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats subtitle.Renumber(); } - + } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/DvdSubtitle.cs b/libse/SubtitleFormats/DvdSubtitle.cs index 7c28aa48a..1526f022c 100644 --- a/libse/SubtitleFormats/DvdSubtitle.cs +++ b/libse/SubtitleFormats/DvdSubtitle.cs @@ -145,4 +145,4 @@ LICENSE= subtitle.Renumber(); } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/DvdSubtitleSystem.cs b/libse/SubtitleFormats/DvdSubtitleSystem.cs index c63b12e0d..ce70848ea 100644 --- a/libse/SubtitleFormats/DvdSubtitleSystem.cs +++ b/libse/SubtitleFormats/DvdSubtitleSystem.cs @@ -90,4 +90,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/ELRStudioClosedCaption.cs b/libse/SubtitleFormats/ELRStudioClosedCaption.cs index 1699c9d70..aa7351b01 100644 --- a/libse/SubtitleFormats/ELRStudioClosedCaption.cs +++ b/libse/SubtitleFormats/ELRStudioClosedCaption.cs @@ -145,4 +145,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Ebu.cs b/libse/SubtitleFormats/Ebu.cs index 4151b8b28..422eee58d 100644 --- a/libse/SubtitleFormats/Ebu.cs +++ b/libse/SubtitleFormats/Ebu.cs @@ -13,7 +13,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats public class Ebu : SubtitleFormat { - const string LanguageCodeChinese = "75"; + private const string LanguageCodeChinese = "75"; public interface IEbuUiHelper { @@ -382,7 +382,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } else if (Configuration.Settings.SubtitleSettings.EbuStlTeletextUseDoubleHeight) { - newline = encoding.GetString(new byte[] {0x8a, 0x8a, 0x0d, 0x0d }); // 0d==double height + newline = encoding.GetString(new byte[] { 0x8a, 0x8a, 0x0d, 0x0d }); // 0d==double height } if (header.DisplayStandardCode == "0") // 0=Open subtitling { @@ -1162,22 +1162,21 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats sb.Append(""); else if (b == underlineOff && header.LanguageCode != LanguageCodeChinese) sb.Append(""); - else if (b == 0xd3 && header.CharacterCodeTableNumber == "00") // Latin { - sb.Append("©"); + sb.Append("©"); } else if (b == 0xd4 && header.CharacterCodeTableNumber == "00") // Latin { - sb.Append("™"); + sb.Append("™"); } else if (b == 0xd5 && header.CharacterCodeTableNumber == "00") // Latin { - sb.Append("♪"); + sb.Append("♪"); } - //else if (b == 0xD0) // em-dash - // sb.Append('–'); + //else if (b == 0xD0) // em-dash + // sb.Append('–'); else if (b == textFieldTerminator) break; else if ((b >= 0x20 && b <= 0x7F) || b >= 0xA1 || header.LanguageCode == LanguageCodeChinese) @@ -1243,4 +1242,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Eeg708.cs b/libse/SubtitleFormats/Eeg708.cs index cf1c87e2f..3580d2145 100644 --- a/libse/SubtitleFormats/Eeg708.cs +++ b/libse/SubtitleFormats/Eeg708.cs @@ -114,4 +114,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/F4Rtf.cs b/libse/SubtitleFormats/F4Rtf.cs index 17401ef3e..43260dd71 100644 --- a/libse/SubtitleFormats/F4Rtf.cs +++ b/libse/SubtitleFormats/F4Rtf.cs @@ -51,4 +51,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/F4Text.cs b/libse/SubtitleFormats/F4Text.cs index a5aad5eef..c411f5ba1 100644 --- a/libse/SubtitleFormats/F4Text.cs +++ b/libse/SubtitleFormats/F4Text.cs @@ -159,4 +159,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/F4Xml.cs b/libse/SubtitleFormats/F4Xml.cs index 324ba5b37..60d168d1e 100644 --- a/libse/SubtitleFormats/F4Xml.cs +++ b/libse/SubtitleFormats/F4Xml.cs @@ -72,4 +72,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats LoadF4TextSubtitle(subtitle, text); } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/FLVCoreCuePoints.cs b/libse/SubtitleFormats/FLVCoreCuePoints.cs index 072986257..fc82968ae 100644 --- a/libse/SubtitleFormats/FLVCoreCuePoints.cs +++ b/libse/SubtitleFormats/FLVCoreCuePoints.cs @@ -153,4 +153,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/FabSubtitler.cs b/libse/SubtitleFormats/FabSubtitler.cs index b0d781966..6d8e3c57d 100644 --- a/libse/SubtitleFormats/FabSubtitler.cs +++ b/libse/SubtitleFormats/FabSubtitler.cs @@ -92,4 +92,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats subtitle.Renumber(); } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/FilmEditXml.cs b/libse/SubtitleFormats/FilmEditXml.cs index 399379636..8c687df30 100644 --- a/libse/SubtitleFormats/FilmEditXml.cs +++ b/libse/SubtitleFormats/FilmEditXml.cs @@ -162,4 +162,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats subtitle.Renumber(); } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/FinalCutProImage.cs b/libse/SubtitleFormats/FinalCutProImage.cs index 1b14aec86..04c0bac86 100644 --- a/libse/SubtitleFormats/FinalCutProImage.cs +++ b/libse/SubtitleFormats/FinalCutProImage.cs @@ -100,4 +100,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/FinalCutProTest2Xml.cs b/libse/SubtitleFormats/FinalCutProTest2Xml.cs index 332c3b574..b59390232 100644 --- a/libse/SubtitleFormats/FinalCutProTest2Xml.cs +++ b/libse/SubtitleFormats/FinalCutProTest2Xml.cs @@ -291,4 +291,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/FinalCutProTextXml.cs b/libse/SubtitleFormats/FinalCutProTextXml.cs index d35762d6c..c2532ba72 100644 --- a/libse/SubtitleFormats/FinalCutProTextXml.cs +++ b/libse/SubtitleFormats/FinalCutProTextXml.cs @@ -361,4 +361,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/FinalCutProXCM.cs b/libse/SubtitleFormats/FinalCutProXCM.cs index 3fda51e48..948c4f877 100644 --- a/libse/SubtitleFormats/FinalCutProXCM.cs +++ b/libse/SubtitleFormats/FinalCutProXCM.cs @@ -153,4 +153,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/FinalCutProXXml.cs b/libse/SubtitleFormats/FinalCutProXXml.cs index 59ca8f6eb..0943db797 100644 --- a/libse/SubtitleFormats/FinalCutProXXml.cs +++ b/libse/SubtitleFormats/FinalCutProXXml.cs @@ -187,4 +187,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/FinalCutProXml.cs b/libse/SubtitleFormats/FinalCutProXml.cs index 16b5dd6cb..77b479a2f 100644 --- a/libse/SubtitleFormats/FinalCutProXml.cs +++ b/libse/SubtitleFormats/FinalCutProXml.cs @@ -612,4 +612,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/FinalCutProXml13.cs b/libse/SubtitleFormats/FinalCutProXml13.cs index 31f6ca4da..2f5027b32 100644 --- a/libse/SubtitleFormats/FinalCutProXml13.cs +++ b/libse/SubtitleFormats/FinalCutProXml13.cs @@ -207,4 +207,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/FinalCutProXml14.cs b/libse/SubtitleFormats/FinalCutProXml14.cs index 0aeb8f4fd..2415c853f 100644 --- a/libse/SubtitleFormats/FinalCutProXml14.cs +++ b/libse/SubtitleFormats/FinalCutProXml14.cs @@ -193,4 +193,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/FinalCutProXmlGap.cs b/libse/SubtitleFormats/FinalCutProXmlGap.cs index 74bce17e6..d1dbfab80 100644 --- a/libse/SubtitleFormats/FinalCutProXmlGap.cs +++ b/libse/SubtitleFormats/FinalCutProXmlGap.cs @@ -159,4 +159,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/FlashXml.cs b/libse/SubtitleFormats/FlashXml.cs index 3dd64e4d2..a862b7636 100644 --- a/libse/SubtitleFormats/FlashXml.cs +++ b/libse/SubtitleFormats/FlashXml.cs @@ -184,4 +184,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Footage.cs b/libse/SubtitleFormats/Footage.cs index 7f52bb8f4..c6ad05d08 100644 --- a/libse/SubtitleFormats/Footage.cs +++ b/libse/SubtitleFormats/Footage.cs @@ -165,4 +165,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/GpacTtxt.cs b/libse/SubtitleFormats/GpacTtxt.cs index 3ea130e15..98ff780e8 100644 --- a/libse/SubtitleFormats/GpacTtxt.cs +++ b/libse/SubtitleFormats/GpacTtxt.cs @@ -129,4 +129,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Idx.cs b/libse/SubtitleFormats/Idx.cs index 2a99987b5..2b1fa2041 100644 --- a/libse/SubtitleFormats/Idx.cs +++ b/libse/SubtitleFormats/Idx.cs @@ -122,14 +122,14 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats int.TryParse(parts[4], out milliseconds)) { return new Paragraph - { - StartTime = { TimeSpan = new TimeSpan(0, hours, minutes, seconds, milliseconds) }, - Text = parts[6] - }; + { + StartTime = { TimeSpan = new TimeSpan(0, hours, minutes, seconds, milliseconds) }, + Text = parts[6] + }; } } return null; } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/IssXml.cs b/libse/SubtitleFormats/IssXml.cs index c7876fec1..f0e64d459 100644 --- a/libse/SubtitleFormats/IssXml.cs +++ b/libse/SubtitleFormats/IssXml.cs @@ -209,4 +209,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/ItunesTimedText.cs b/libse/SubtitleFormats/ItunesTimedText.cs index 75e39d029..fb71d3f11 100644 --- a/libse/SubtitleFormats/ItunesTimedText.cs +++ b/libse/SubtitleFormats/ItunesTimedText.cs @@ -316,4 +316,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Json.cs b/libse/SubtitleFormats/Json.cs index 145949cd2..b97be0234 100644 --- a/libse/SubtitleFormats/Json.cs +++ b/libse/SubtitleFormats/Json.cs @@ -289,4 +289,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/JsonType2.cs b/libse/SubtitleFormats/JsonType2.cs index 793794f5e..c62c05c2e 100644 --- a/libse/SubtitleFormats/JsonType2.cs +++ b/libse/SubtitleFormats/JsonType2.cs @@ -88,4 +88,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/JsonType3.cs b/libse/SubtitleFormats/JsonType3.cs index b206731bc..c7bb814d8 100644 --- a/libse/SubtitleFormats/JsonType3.cs +++ b/libse/SubtitleFormats/JsonType3.cs @@ -91,4 +91,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/JsonType4.cs b/libse/SubtitleFormats/JsonType4.cs index 79ecfcccd..f3b672411 100644 --- a/libse/SubtitleFormats/JsonType4.cs +++ b/libse/SubtitleFormats/JsonType4.cs @@ -96,4 +96,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/JsonType5.cs b/libse/SubtitleFormats/JsonType5.cs index f1750e913..518cc42b3 100644 --- a/libse/SubtitleFormats/JsonType5.cs +++ b/libse/SubtitleFormats/JsonType5.cs @@ -163,4 +163,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/JsonType6.cs b/libse/SubtitleFormats/JsonType6.cs index eb893905a..233cd817d 100644 --- a/libse/SubtitleFormats/JsonType6.cs +++ b/libse/SubtitleFormats/JsonType6.cs @@ -180,4 +180,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Lrc.cs b/libse/SubtitleFormats/Lrc.cs index e38903793..cb8d550ef 100644 --- a/libse/SubtitleFormats/Lrc.cs +++ b/libse/SubtitleFormats/Lrc.cs @@ -1,8 +1,8 @@ -using System; +using Nikse.SubtitleEdit.Core.Enums; +using System; using System.Collections.Generic; using System.Text; using System.Text.RegularExpressions; -using Nikse.SubtitleEdit.Core.Enums; namespace Nikse.SubtitleEdit.Core.SubtitleFormats { @@ -226,4 +226,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/MPlayer2.cs b/libse/SubtitleFormats/MPlayer2.cs index 10368759d..f81c0d8ae 100644 --- a/libse/SubtitleFormats/MPlayer2.cs +++ b/libse/SubtitleFormats/MPlayer2.cs @@ -158,4 +158,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats subtitle.Renumber(); } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/MacCaption.cs b/libse/SubtitleFormats/MacCaption.cs index b696d9829..85cef35d2 100644 --- a/libse/SubtitleFormats/MacCaption.cs +++ b/libse/SubtitleFormats/MacCaption.cs @@ -214,4 +214,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/MicroDvd.cs b/libse/SubtitleFormats/MicroDvd.cs index 876069738..ca8d99113 100644 --- a/libse/SubtitleFormats/MicroDvd.cs +++ b/libse/SubtitleFormats/MicroDvd.cs @@ -563,4 +563,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats return i; } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/MidwayInscriberCGX.cs b/libse/SubtitleFormats/MidwayInscriberCGX.cs index ce2344774..9678f2b76 100644 --- a/libse/SubtitleFormats/MidwayInscriberCGX.cs +++ b/libse/SubtitleFormats/MidwayInscriberCGX.cs @@ -100,4 +100,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/NciCaption.cs b/libse/SubtitleFormats/NciCaption.cs index 9cd4cde41..f1667efdd 100644 --- a/libse/SubtitleFormats/NciCaption.cs +++ b/libse/SubtitleFormats/NciCaption.cs @@ -255,4 +255,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/NciTimedRollUpCaptions.cs b/libse/SubtitleFormats/NciTimedRollUpCaptions.cs index dabd7c13d..e4c689256 100644 --- a/libse/SubtitleFormats/NciTimedRollUpCaptions.cs +++ b/libse/SubtitleFormats/NciTimedRollUpCaptions.cs @@ -121,7 +121,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats Paragraph p = subtitle.Paragraphs[index]; p.Text = FixText(p.Text); - Paragraph next = subtitle.GetParagraphOrDefault(index+1); + Paragraph next = subtitle.GetParagraphOrDefault(index + 1); if (next != null) { if (next.StartTime.TotalMilliseconds - p.StartTime.TotalMilliseconds <= MaxDurationMs) @@ -161,4 +161,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/OpenDvt.cs b/libse/SubtitleFormats/OpenDvt.cs index c3fca5fe1..98378c047 100644 --- a/libse/SubtitleFormats/OpenDvt.cs +++ b/libse/SubtitleFormats/OpenDvt.cs @@ -191,4 +191,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Oresme.cs b/libse/SubtitleFormats/Oresme.cs index db2858e2d..01c30dc39 100644 --- a/libse/SubtitleFormats/Oresme.cs +++ b/libse/SubtitleFormats/Oresme.cs @@ -121,4 +121,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats return sb.ToString().Trim(); } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/OresmeDocXDocument.cs b/libse/SubtitleFormats/OresmeDocXDocument.cs index ceec5acad..6d9875886 100644 --- a/libse/SubtitleFormats/OresmeDocXDocument.cs +++ b/libse/SubtitleFormats/OresmeDocXDocument.cs @@ -280,4 +280,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/PE2.cs b/libse/SubtitleFormats/PE2.cs index 739bba3e1..b7eb4b744 100644 --- a/libse/SubtitleFormats/PE2.cs +++ b/libse/SubtitleFormats/PE2.cs @@ -149,4 +149,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/PListCaption.cs b/libse/SubtitleFormats/PListCaption.cs index 349da7fc3..26a5b2f7d 100644 --- a/libse/SubtitleFormats/PListCaption.cs +++ b/libse/SubtitleFormats/PListCaption.cs @@ -165,4 +165,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Pac.cs b/libse/SubtitleFormats/Pac.cs index a3d54169e..522995f52 100644 --- a/libse/SubtitleFormats/Pac.cs +++ b/libse/SubtitleFormats/Pac.cs @@ -12,7 +12,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats { public interface IGetPacEncoding { - int GetPacEncoding(byte[] previewBuffer , string fileName); + int GetPacEncoding(byte[] previewBuffer, string fileName); } public static IGetPacEncoding GetPacEncodingImplementation; @@ -1801,4 +1801,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Pns.cs b/libse/SubtitleFormats/Pns.cs index 6ec86cdd2..e0bef6b43 100644 --- a/libse/SubtitleFormats/Pns.cs +++ b/libse/SubtitleFormats/Pns.cs @@ -160,4 +160,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/QubeMasterImport.cs b/libse/SubtitleFormats/QubeMasterImport.cs index 490361403..0aba73af3 100644 --- a/libse/SubtitleFormats/QubeMasterImport.cs +++ b/libse/SubtitleFormats/QubeMasterImport.cs @@ -136,4 +136,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/QuickTimeText.cs b/libse/SubtitleFormats/QuickTimeText.cs index 1563d5fea..b1f65537a 100644 --- a/libse/SubtitleFormats/QuickTimeText.cs +++ b/libse/SubtitleFormats/QuickTimeText.cs @@ -134,4 +134,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats subtitle.Renumber(); } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/RhozetHarmonic.cs b/libse/SubtitleFormats/RhozetHarmonic.cs index 2f1c15a72..65ca537d9 100644 --- a/libse/SubtitleFormats/RhozetHarmonic.cs +++ b/libse/SubtitleFormats/RhozetHarmonic.cs @@ -186,4 +186,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Sami.cs b/libse/SubtitleFormats/Sami.cs index 139eb70ae..abe201b96 100644 --- a/libse/SubtitleFormats/Sami.cs +++ b/libse/SubtitleFormats/Sami.cs @@ -438,4 +438,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/SamiModern.cs b/libse/SubtitleFormats/SamiModern.cs index b3108b758..0042c0cd9 100644 --- a/libse/SubtitleFormats/SamiModern.cs +++ b/libse/SubtitleFormats/SamiModern.cs @@ -16,4 +16,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats return subtitle.Paragraphs.Count > _errorCount; } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/SamiYouTube.cs b/libse/SubtitleFormats/SamiYouTube.cs index 17f8c877f..686857ba9 100644 --- a/libse/SubtitleFormats/SamiYouTube.cs +++ b/libse/SubtitleFormats/SamiYouTube.cs @@ -16,4 +16,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats return subtitle.Paragraphs.Count > _errorCount; } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/SatBoxPng.cs b/libse/SubtitleFormats/SatBoxPng.cs index c98b3c609..9718d15d9 100644 --- a/libse/SubtitleFormats/SatBoxPng.cs +++ b/libse/SubtitleFormats/SatBoxPng.cs @@ -95,4 +95,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Scenarist.cs b/libse/SubtitleFormats/Scenarist.cs index 9f427090c..b9c30b902 100644 --- a/libse/SubtitleFormats/Scenarist.cs +++ b/libse/SubtitleFormats/Scenarist.cs @@ -96,4 +96,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/ScenaristClosedCaptions.cs b/libse/SubtitleFormats/ScenaristClosedCaptions.cs index 5a43a120b..c5fe09b5f 100644 --- a/libse/SubtitleFormats/ScenaristClosedCaptions.cs +++ b/libse/SubtitleFormats/ScenaristClosedCaptions.cs @@ -1779,4 +1779,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/SeImageHtmlIndex.cs b/libse/SubtitleFormats/SeImageHtmlIndex.cs index e09f2a985..333da85fa 100644 --- a/libse/SubtitleFormats/SeImageHtmlIndex.cs +++ b/libse/SubtitleFormats/SeImageHtmlIndex.cs @@ -91,4 +91,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/SmilTimesheetData.cs b/libse/SubtitleFormats/SmilTimesheetData.cs index 2cc03a24a..fb9cd8806 100644 --- a/libse/SubtitleFormats/SmilTimesheetData.cs +++ b/libse/SubtitleFormats/SmilTimesheetData.cs @@ -214,4 +214,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/SoftNiColonSub.cs b/libse/SubtitleFormats/SoftNiColonSub.cs index 6efca7160..a743f1065 100644 --- a/libse/SubtitleFormats/SoftNiColonSub.cs +++ b/libse/SubtitleFormats/SoftNiColonSub.cs @@ -229,4 +229,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/SoftNiSub.cs b/libse/SubtitleFormats/SoftNiSub.cs index 2134a44c9..32e16bc1f 100644 --- a/libse/SubtitleFormats/SoftNiSub.cs +++ b/libse/SubtitleFormats/SoftNiSub.cs @@ -230,4 +230,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/SonicScenaristBitmaps.cs b/libse/SubtitleFormats/SonicScenaristBitmaps.cs index 0eaf85ec0..a1c57ce89 100644 --- a/libse/SubtitleFormats/SonicScenaristBitmaps.cs +++ b/libse/SubtitleFormats/SonicScenaristBitmaps.cs @@ -113,4 +113,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/SonyDVDArchitectExplicitDuration.cs b/libse/SubtitleFormats/SonyDVDArchitectExplicitDuration.cs index 5dbabb275..a27c06f67 100644 --- a/libse/SubtitleFormats/SonyDVDArchitectExplicitDuration.cs +++ b/libse/SubtitleFormats/SonyDVDArchitectExplicitDuration.cs @@ -111,4 +111,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats subtitle.Renumber(); } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Spruce.cs b/libse/SubtitleFormats/Spruce.cs index c37e5d481..bc9fadaed 100644 --- a/libse/SubtitleFormats/Spruce.cs +++ b/libse/SubtitleFormats/Spruce.cs @@ -208,4 +208,4 @@ $ColorIndex4 = 3 return text; } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Spt.cs b/libse/SubtitleFormats/Spt.cs index 6e188ad5a..750687392 100644 --- a/libse/SubtitleFormats/Spt.cs +++ b/libse/SubtitleFormats/Spt.cs @@ -178,4 +178,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/StructuredTitles.cs b/libse/SubtitleFormats/StructuredTitles.cs index 8e24b05bc..a940209e5 100644 --- a/libse/SubtitleFormats/StructuredTitles.cs +++ b/libse/SubtitleFormats/StructuredTitles.cs @@ -133,4 +133,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/SubRip.cs b/libse/SubtitleFormats/SubRip.cs index 1261a60fa..dce29c818 100644 --- a/libse/SubtitleFormats/SubRip.cs +++ b/libse/SubtitleFormats/SubRip.cs @@ -280,4 +280,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/SubStationAlpha.cs b/libse/SubtitleFormats/SubStationAlpha.cs index a4f8f7b0f..06022a423 100644 --- a/libse/SubtitleFormats/SubStationAlpha.cs +++ b/libse/SubtitleFormats/SubStationAlpha.cs @@ -130,7 +130,6 @@ Format: Marked, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text if (!string.IsNullOrEmpty(p.MarginV) && Utilities.IsInteger(p.MarginV)) marginV = p.MarginV.PadLeft(4, '0'); - string effect = ""; if (!string.IsNullOrEmpty(p.Effect)) effect = p.Effect; @@ -565,4 +564,4 @@ Format: Marked, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/SubtitleFormat.cs b/libse/SubtitleFormats/SubtitleFormat.cs index 2f84d4b39..6a9949122 100644 --- a/libse/SubtitleFormats/SubtitleFormat.cs +++ b/libse/SubtitleFormats/SubtitleFormat.cs @@ -436,4 +436,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats return DecodeTimeCode(part.Split(splitChars, StringSplitOptions.RemoveEmptyEntries)); } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/SwiftInterchange2.cs b/libse/SubtitleFormats/SwiftInterchange2.cs index f1daa92c3..735d05c34 100644 --- a/libse/SubtitleFormats/SwiftInterchange2.cs +++ b/libse/SubtitleFormats/SwiftInterchange2.cs @@ -156,4 +156,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/SwiftText.cs b/libse/SubtitleFormats/SwiftText.cs index deed19b9d..40ff07a08 100644 --- a/libse/SubtitleFormats/SwiftText.cs +++ b/libse/SubtitleFormats/SwiftText.cs @@ -181,4 +181,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats return false; } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/SwiftTextLineNoAndDur.cs b/libse/SubtitleFormats/SwiftTextLineNoAndDur.cs index 98a1b437f..6b51e9161 100644 --- a/libse/SubtitleFormats/SwiftTextLineNoAndDur.cs +++ b/libse/SubtitleFormats/SwiftTextLineNoAndDur.cs @@ -178,4 +178,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/SwiftTextLineNumber.cs b/libse/SubtitleFormats/SwiftTextLineNumber.cs index cc0ef6cf5..d9af2f728 100644 --- a/libse/SubtitleFormats/SwiftTextLineNumber.cs +++ b/libse/SubtitleFormats/SwiftTextLineNumber.cs @@ -168,4 +168,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats return false; } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/TMPlayer.cs b/libse/SubtitleFormats/TMPlayer.cs index 077d945b2..bf2156a6e 100644 --- a/libse/SubtitleFormats/TMPlayer.cs +++ b/libse/SubtitleFormats/TMPlayer.cs @@ -126,4 +126,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/TSB4.cs b/libse/SubtitleFormats/TSB4.cs index 2e72b8719..9a0cb959a 100644 --- a/libse/SubtitleFormats/TSB4.cs +++ b/libse/SubtitleFormats/TSB4.cs @@ -89,4 +89,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Tek.cs b/libse/SubtitleFormats/Tek.cs index 4997eb5b8..54aeb82de 100644 --- a/libse/SubtitleFormats/Tek.cs +++ b/libse/SubtitleFormats/Tek.cs @@ -120,4 +120,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/TextST.cs b/libse/SubtitleFormats/TextST.cs index 672bed55b..f66432d4c 100644 --- a/libse/SubtitleFormats/TextST.cs +++ b/libse/SubtitleFormats/TextST.cs @@ -1,11 +1,11 @@ -using System; +using Nikse.SubtitleEdit.Core.BluRaySup; +using Nikse.SubtitleEdit.Core.TransportStream; +using Nikse.SubtitleEdit.Core.VobSub; +using System; using System.Collections.Generic; using System.Drawing; using System.IO; using System.Text; -using Nikse.SubtitleEdit.Core.BluRaySup; -using Nikse.SubtitleEdit.Core.TransportStream; -using Nikse.SubtitleEdit.Core.VobSub; using Helper = Nikse.SubtitleEdit.Core.TransportStream.Helper; namespace Nikse.SubtitleEdit.Core.SubtitleFormats @@ -422,7 +422,6 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } - public abstract class SubtitleRegionContent { public int EscapeCode { get; set; } @@ -803,22 +802,28 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats var fontOutlineThickness = buffer[idx + 2]; switch (fontStyle) { - case 1: region.Texts.Add(""); + case 1: + region.Texts.Add(""); endStyle = ""; break; - case 2: region.Texts.Add(""); + case 2: + region.Texts.Add(""); endStyle = ""; break; - case 3: region.Texts.Add(""); + case 3: + region.Texts.Add(""); endStyle = ""; break; - case 5: region.Texts.Add(""); + case 5: + region.Texts.Add(""); endStyle = ""; break; - case 6: region.Texts.Add(""); + case 6: + region.Texts.Add(""); endStyle = ""; break; - case 7: region.Texts.Add(""); + case 7: + region.Texts.Add(""); endStyle = ""; break; } @@ -1166,4 +1171,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/TimeXml.cs b/libse/SubtitleFormats/TimeXml.cs index e1538ce7a..191d19d80 100644 --- a/libse/SubtitleFormats/TimeXml.cs +++ b/libse/SubtitleFormats/TimeXml.cs @@ -107,4 +107,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/TimeXml2.cs b/libse/SubtitleFormats/TimeXml2.cs index 3796bdb6e..7b07d25d7 100644 --- a/libse/SubtitleFormats/TimeXml2.cs +++ b/libse/SubtitleFormats/TimeXml2.cs @@ -121,4 +121,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/TimedText.cs b/libse/SubtitleFormats/TimedText.cs index 33d4c8bfd..0e232e8c1 100644 --- a/libse/SubtitleFormats/TimedText.cs +++ b/libse/SubtitleFormats/TimedText.cs @@ -251,7 +251,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats double dBegin, dEnd; if (!start.Contains(':') && Utilities.CountTagInText(start, '.') == 1 && !end.Contains(':') && Utilities.CountTagInText(end, '.') == 1 && - double.TryParse(start, NumberStyles.Float , CultureInfo.InvariantCulture, out dBegin) && double.TryParse(end, NumberStyles.Float, CultureInfo.InvariantCulture, out dEnd)) + double.TryParse(start, NumberStyles.Float, CultureInfo.InvariantCulture, out dBegin) && double.TryParse(end, NumberStyles.Float, CultureInfo.InvariantCulture, out dEnd)) { subtitle.Paragraphs.Add(new Paragraph(text, dBegin * TimeCode.BaseUnit, dEnd * TimeCode.BaseUnit)); } diff --git a/libse/SubtitleFormats/TimedText10.cs b/libse/SubtitleFormats/TimedText10.cs index 05e1fb2d3..0225cfb74 100644 --- a/libse/SubtitleFormats/TimedText10.cs +++ b/libse/SubtitleFormats/TimedText10.cs @@ -907,4 +907,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/TimedText200604CData.cs b/libse/SubtitleFormats/TimedText200604CData.cs index 79543755c..b1a5c5bac 100644 --- a/libse/SubtitleFormats/TimedText200604CData.cs +++ b/libse/SubtitleFormats/TimedText200604CData.cs @@ -13,4 +13,4 @@ } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/TimedTextImage.cs b/libse/SubtitleFormats/TimedTextImage.cs index 860baa95a..9a620141d 100644 --- a/libse/SubtitleFormats/TimedTextImage.cs +++ b/libse/SubtitleFormats/TimedTextImage.cs @@ -130,7 +130,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats double dBegin, dEnd; if (!start.Contains(':') && Utilities.CountTagInText(start, '.') == 1 && !end.Contains(':') && Utilities.CountTagInText(end, '.') == 1 && - double.TryParse(start, NumberStyles.Float , CultureInfo.InvariantCulture, out dBegin) && double.TryParse(end, NumberStyles.Float, CultureInfo.InvariantCulture, out dEnd)) + double.TryParse(start, NumberStyles.Float, CultureInfo.InvariantCulture, out dBegin) && double.TryParse(end, NumberStyles.Float, CultureInfo.InvariantCulture, out dEnd)) { subtitle.Paragraphs.Add(new Paragraph(text, dBegin * TimeCode.BaseUnit, dEnd * TimeCode.BaseUnit)); } diff --git a/libse/SubtitleFormats/TimelineAscii.cs b/libse/SubtitleFormats/TimelineAscii.cs index a6443867f..8ed794d95 100644 --- a/libse/SubtitleFormats/TimelineAscii.cs +++ b/libse/SubtitleFormats/TimelineAscii.cs @@ -202,4 +202,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/TimelineFootageAscii.cs b/libse/SubtitleFormats/TimelineFootageAscii.cs index e7b96c0e9..d76410830 100644 --- a/libse/SubtitleFormats/TimelineFootageAscii.cs +++ b/libse/SubtitleFormats/TimelineFootageAscii.cs @@ -209,4 +209,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/TimelineMvt.cs b/libse/SubtitleFormats/TimelineMvt.cs index 2348b52b0..701463650 100644 --- a/libse/SubtitleFormats/TimelineMvt.cs +++ b/libse/SubtitleFormats/TimelineMvt.cs @@ -172,4 +172,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/TitleExchangePro.cs b/libse/SubtitleFormats/TitleExchangePro.cs index 7ce8bbada..25d87ddb6 100644 --- a/libse/SubtitleFormats/TitleExchangePro.cs +++ b/libse/SubtitleFormats/TitleExchangePro.cs @@ -124,4 +124,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Titra.cs b/libse/SubtitleFormats/Titra.cs index 8e5aeae2a..ead84bbd5 100644 --- a/libse/SubtitleFormats/Titra.cs +++ b/libse/SubtitleFormats/Titra.cs @@ -126,4 +126,4 @@ ATTENTION : Pas plus de 40 caractères PAR LIGNE } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/TmpegEncAW5.cs b/libse/SubtitleFormats/TmpegEncAW5.cs index dcc44a321..01ff9b18c 100644 --- a/libse/SubtitleFormats/TmpegEncAW5.cs +++ b/libse/SubtitleFormats/TmpegEncAW5.cs @@ -79,4 +79,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/TmpegEncXml.cs b/libse/SubtitleFormats/TmpegEncXml.cs index 318d399b6..ca74745b3 100644 --- a/libse/SubtitleFormats/TmpegEncXml.cs +++ b/libse/SubtitleFormats/TmpegEncXml.cs @@ -381,4 +381,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats return new TimeCode(int.Parse(parts[0]), int.Parse(parts[1]), int.Parse(parts[2]), int.Parse(parts[3])); } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Tmx14.cs b/libse/SubtitleFormats/Tmx14.cs index f46b74986..4b6a07651 100644 --- a/libse/SubtitleFormats/Tmx14.cs +++ b/libse/SubtitleFormats/Tmx14.cs @@ -147,4 +147,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/TranscriberXml.cs b/libse/SubtitleFormats/TranscriberXml.cs index b6d1fbec0..beb7f21a7 100644 --- a/libse/SubtitleFormats/TranscriberXml.cs +++ b/libse/SubtitleFormats/TranscriberXml.cs @@ -137,4 +137,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/TurboTitler.cs b/libse/SubtitleFormats/TurboTitler.cs index 01decb0b7..696045f11 100644 --- a/libse/SubtitleFormats/TurboTitler.cs +++ b/libse/SubtitleFormats/TurboTitler.cs @@ -103,4 +103,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UTSubtitleXml.cs b/libse/SubtitleFormats/UTSubtitleXml.cs index 28a4546c4..00edde013 100644 --- a/libse/SubtitleFormats/UTSubtitleXml.cs +++ b/libse/SubtitleFormats/UTSubtitleXml.cs @@ -110,4 +110,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UleadSubtitleFormat.cs b/libse/SubtitleFormats/UleadSubtitleFormat.cs index 208581b33..5e56886d7 100644 --- a/libse/SubtitleFormats/UleadSubtitleFormat.cs +++ b/libse/SubtitleFormats/UleadSubtitleFormat.cs @@ -136,4 +136,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Ultech130.cs b/libse/SubtitleFormats/Ultech130.cs index 7bdcc39fd..28fc3a384 100644 --- a/libse/SubtitleFormats/Ultech130.cs +++ b/libse/SubtitleFormats/Ultech130.cs @@ -466,4 +466,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UniversalSubtitleFormat.cs b/libse/SubtitleFormats/UniversalSubtitleFormat.cs index 8621bc722..3ae33fc73 100644 --- a/libse/SubtitleFormats/UniversalSubtitleFormat.cs +++ b/libse/SubtitleFormats/UniversalSubtitleFormat.cs @@ -178,4 +178,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle1.cs b/libse/SubtitleFormats/UnknownSubtitle1.cs index 22fe1d8ba..027853c49 100644 --- a/libse/SubtitleFormats/UnknownSubtitle1.cs +++ b/libse/SubtitleFormats/UnknownSubtitle1.cs @@ -114,4 +114,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats return new TimeCode(0, int.Parse(parts[0]), int.Parse(parts[1]), 0); } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle10.cs b/libse/SubtitleFormats/UnknownSubtitle10.cs index 5ae88d3b6..a854b610e 100644 --- a/libse/SubtitleFormats/UnknownSubtitle10.cs +++ b/libse/SubtitleFormats/UnknownSubtitle10.cs @@ -87,11 +87,11 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats string start = line.Substring(indexStartTime); string end = line.Substring(indexEndTime); var paragraph = new Paragraph - { - Text = text, - StartTime = { TotalMilliseconds = GetMilliseconds(start) }, - EndTime = { TotalMilliseconds = GetMilliseconds(end) } - }; + { + Text = text, + StartTime = { TotalMilliseconds = GetMilliseconds(start) }, + EndTime = { TotalMilliseconds = GetMilliseconds(end) } + }; subtitle.Paragraphs.Add(paragraph); } catch (Exception exception) diff --git a/libse/SubtitleFormats/UnknownSubtitle11.cs b/libse/SubtitleFormats/UnknownSubtitle11.cs index b45b8e750..1988ab799 100644 --- a/libse/SubtitleFormats/UnknownSubtitle11.cs +++ b/libse/SubtitleFormats/UnknownSubtitle11.cs @@ -269,4 +269,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats return i; } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle12.cs b/libse/SubtitleFormats/UnknownSubtitle12.cs index e24cf56ec..cb105f69c 100644 --- a/libse/SubtitleFormats/UnknownSubtitle12.cs +++ b/libse/SubtitleFormats/UnknownSubtitle12.cs @@ -104,4 +104,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle13.cs b/libse/SubtitleFormats/UnknownSubtitle13.cs index f6903c23b..306d04382 100644 --- a/libse/SubtitleFormats/UnknownSubtitle13.cs +++ b/libse/SubtitleFormats/UnknownSubtitle13.cs @@ -124,4 +124,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle14.cs b/libse/SubtitleFormats/UnknownSubtitle14.cs index 95a5581c5..3178b1135 100644 --- a/libse/SubtitleFormats/UnknownSubtitle14.cs +++ b/libse/SubtitleFormats/UnknownSubtitle14.cs @@ -113,4 +113,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle16.cs b/libse/SubtitleFormats/UnknownSubtitle16.cs index faa0a13dc..9664994e8 100644 --- a/libse/SubtitleFormats/UnknownSubtitle16.cs +++ b/libse/SubtitleFormats/UnknownSubtitle16.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Nikse.SubtitleEdit.Core; namespace Nikse.SubtitleEdit.Core.SubtitleFormats { @@ -53,4 +52,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats _errorCount = u52.ErrorCount; } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle17.cs b/libse/SubtitleFormats/UnknownSubtitle17.cs index 3d65255c5..f84cae85e 100644 --- a/libse/SubtitleFormats/UnknownSubtitle17.cs +++ b/libse/SubtitleFormats/UnknownSubtitle17.cs @@ -179,4 +179,4 @@ DIGITAL_CINEMA=YES return string.Format("{0:00}:{1:00}:{2:00}:{3:00}", time.Hours, time.Minutes, time.Seconds, MillisecondsToFramesMaxFrameRate(time.Milliseconds)); } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle18.cs b/libse/SubtitleFormats/UnknownSubtitle18.cs index 3052528bc..ee97a832b 100644 --- a/libse/SubtitleFormats/UnknownSubtitle18.cs +++ b/libse/SubtitleFormats/UnknownSubtitle18.cs @@ -167,4 +167,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats return false; } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle19.cs b/libse/SubtitleFormats/UnknownSubtitle19.cs index 9f9b574dd..9e90eef57 100644 --- a/libse/SubtitleFormats/UnknownSubtitle19.cs +++ b/libse/SubtitleFormats/UnknownSubtitle19.cs @@ -130,4 +130,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle2.cs b/libse/SubtitleFormats/UnknownSubtitle2.cs index 647798a4c..bee3f18b6 100644 --- a/libse/SubtitleFormats/UnknownSubtitle2.cs +++ b/libse/SubtitleFormats/UnknownSubtitle2.cs @@ -149,4 +149,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle20.cs b/libse/SubtitleFormats/UnknownSubtitle20.cs index 110ad8104..56e1222c1 100644 --- a/libse/SubtitleFormats/UnknownSubtitle20.cs +++ b/libse/SubtitleFormats/UnknownSubtitle20.cs @@ -146,4 +146,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle21.cs b/libse/SubtitleFormats/UnknownSubtitle21.cs index cd4145e97..5fc278fe5 100644 --- a/libse/SubtitleFormats/UnknownSubtitle21.cs +++ b/libse/SubtitleFormats/UnknownSubtitle21.cs @@ -72,7 +72,6 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats if (!rtf.StartsWith("{\\rtf")) return; - lines = rtf.FromRtf().SplitToLines().ToList(); _errorCount = 0; Paragraph p = null; @@ -127,4 +126,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle22.cs b/libse/SubtitleFormats/UnknownSubtitle22.cs index 459823c72..f004a1000 100644 --- a/libse/SubtitleFormats/UnknownSubtitle22.cs +++ b/libse/SubtitleFormats/UnknownSubtitle22.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Text; using System.Text.RegularExpressions; diff --git a/libse/SubtitleFormats/UnknownSubtitle24.cs b/libse/SubtitleFormats/UnknownSubtitle24.cs index 55ea91c21..66c46bd4a 100644 --- a/libse/SubtitleFormats/UnknownSubtitle24.cs +++ b/libse/SubtitleFormats/UnknownSubtitle24.cs @@ -53,4 +53,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle25.cs b/libse/SubtitleFormats/UnknownSubtitle25.cs index 3bedca8b7..1cc954124 100644 --- a/libse/SubtitleFormats/UnknownSubtitle25.cs +++ b/libse/SubtitleFormats/UnknownSubtitle25.cs @@ -124,4 +124,4 @@ NOTE= } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle27.cs b/libse/SubtitleFormats/UnknownSubtitle27.cs index 68157f32d..16d4e86ac 100644 --- a/libse/SubtitleFormats/UnknownSubtitle27.cs +++ b/libse/SubtitleFormats/UnknownSubtitle27.cs @@ -128,4 +128,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle29.cs b/libse/SubtitleFormats/UnknownSubtitle29.cs index 56a040915..d24101818 100644 --- a/libse/SubtitleFormats/UnknownSubtitle29.cs +++ b/libse/SubtitleFormats/UnknownSubtitle29.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Text; using System.Text.RegularExpressions; diff --git a/libse/SubtitleFormats/UnknownSubtitle3.cs b/libse/SubtitleFormats/UnknownSubtitle3.cs index c51c56460..3342d44c1 100644 --- a/libse/SubtitleFormats/UnknownSubtitle3.cs +++ b/libse/SubtitleFormats/UnknownSubtitle3.cs @@ -87,4 +87,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle30.cs b/libse/SubtitleFormats/UnknownSubtitle30.cs index 20d19efd4..2d93ad4ee 100644 --- a/libse/SubtitleFormats/UnknownSubtitle30.cs +++ b/libse/SubtitleFormats/UnknownSubtitle30.cs @@ -158,4 +158,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle31.cs b/libse/SubtitleFormats/UnknownSubtitle31.cs index 277b1ab92..1b91bc30e 100644 --- a/libse/SubtitleFormats/UnknownSubtitle31.cs +++ b/libse/SubtitleFormats/UnknownSubtitle31.cs @@ -150,4 +150,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle32.cs b/libse/SubtitleFormats/UnknownSubtitle32.cs index 79295e7b4..2bf3b8ef2 100644 --- a/libse/SubtitleFormats/UnknownSubtitle32.cs +++ b/libse/SubtitleFormats/UnknownSubtitle32.cs @@ -153,4 +153,4 @@ Sony,Sony DVD/UMD,1:85,16x9 } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle33.cs b/libse/SubtitleFormats/UnknownSubtitle33.cs index 25ee85d95..b5855f047 100644 --- a/libse/SubtitleFormats/UnknownSubtitle33.cs +++ b/libse/SubtitleFormats/UnknownSubtitle33.cs @@ -11,6 +11,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats private static readonly Regex RegexTimeCodes = new Regex(@"^\d\d\:\d\d\:\d\d\s+\d+ ", RegexOptions.Compiled); private static readonly Regex RegexNumberAndText = new Regex(@"^\d+ [^ ]+", RegexOptions.Compiled); + public override string Extension { get { return ".txt"; } @@ -151,4 +152,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle34.cs b/libse/SubtitleFormats/UnknownSubtitle34.cs index 30ba5aa61..d138ea43c 100644 --- a/libse/SubtitleFormats/UnknownSubtitle34.cs +++ b/libse/SubtitleFormats/UnknownSubtitle34.cs @@ -9,6 +9,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats { private static readonly Regex RegexTimeCodes = new Regex(@"^\d\d\:\d\d\:\d\d\t[^ ]+", RegexOptions.Compiled); + public override string Extension { get { return ".txt"; } @@ -130,4 +131,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle35.cs b/libse/SubtitleFormats/UnknownSubtitle35.cs index 4bf0c6e65..deefeebde 100644 --- a/libse/SubtitleFormats/UnknownSubtitle35.cs +++ b/libse/SubtitleFormats/UnknownSubtitle35.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Text; using System.Text.RegularExpressions; diff --git a/libse/SubtitleFormats/UnknownSubtitle39.cs b/libse/SubtitleFormats/UnknownSubtitle39.cs index 894ad8a61..471c1015f 100644 --- a/libse/SubtitleFormats/UnknownSubtitle39.cs +++ b/libse/SubtitleFormats/UnknownSubtitle39.cs @@ -53,4 +53,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle4.cs b/libse/SubtitleFormats/UnknownSubtitle4.cs index eefbe0794..e47055273 100644 --- a/libse/SubtitleFormats/UnknownSubtitle4.cs +++ b/libse/SubtitleFormats/UnknownSubtitle4.cs @@ -140,4 +140,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats subtitle.Renumber(); } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle40.cs b/libse/SubtitleFormats/UnknownSubtitle40.cs index 2665bfd90..d348f5ee1 100644 --- a/libse/SubtitleFormats/UnknownSubtitle40.cs +++ b/libse/SubtitleFormats/UnknownSubtitle40.cs @@ -101,4 +101,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle41.cs b/libse/SubtitleFormats/UnknownSubtitle41.cs index 4fe2cb1b0..95fb05b3b 100644 --- a/libse/SubtitleFormats/UnknownSubtitle41.cs +++ b/libse/SubtitleFormats/UnknownSubtitle41.cs @@ -125,4 +125,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle42.cs b/libse/SubtitleFormats/UnknownSubtitle42.cs index 29a3f4470..b90626e6a 100644 --- a/libse/SubtitleFormats/UnknownSubtitle42.cs +++ b/libse/SubtitleFormats/UnknownSubtitle42.cs @@ -119,4 +119,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle43.cs b/libse/SubtitleFormats/UnknownSubtitle43.cs index 06bd25a51..474bc144c 100644 --- a/libse/SubtitleFormats/UnknownSubtitle43.cs +++ b/libse/SubtitleFormats/UnknownSubtitle43.cs @@ -174,4 +174,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle44.cs b/libse/SubtitleFormats/UnknownSubtitle44.cs index a03d19d08..3b21c53b1 100644 --- a/libse/SubtitleFormats/UnknownSubtitle44.cs +++ b/libse/SubtitleFormats/UnknownSubtitle44.cs @@ -149,4 +149,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle45.cs b/libse/SubtitleFormats/UnknownSubtitle45.cs index dee4b862a..70908f409 100644 --- a/libse/SubtitleFormats/UnknownSubtitle45.cs +++ b/libse/SubtitleFormats/UnknownSubtitle45.cs @@ -125,4 +125,4 @@ ST 0 EB 3.10 } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle46.cs b/libse/SubtitleFormats/UnknownSubtitle46.cs index bf31dd08a..488e62793 100644 --- a/libse/SubtitleFormats/UnknownSubtitle46.cs +++ b/libse/SubtitleFormats/UnknownSubtitle46.cs @@ -10,6 +10,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats //7:00:01:27AM private static readonly Regex regexTimeCodesAM = new Regex(@"^\d\:\d\d\:\d\d\:\d\dAM", RegexOptions.Compiled); private static readonly Regex regexTimeCodesPM = new Regex(@"^\d\:\d\d\:\d\d\:\d\dPM", RegexOptions.Compiled); + public override string Extension { get { return ".pst"; } @@ -106,4 +107,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle47.cs b/libse/SubtitleFormats/UnknownSubtitle47.cs index 5b1ab4dba..3386cfdcf 100644 --- a/libse/SubtitleFormats/UnknownSubtitle47.cs +++ b/libse/SubtitleFormats/UnknownSubtitle47.cs @@ -9,6 +9,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats { //7:00:01:27AM private static Regex regexTimeCodes = new Regex(@"^\d\:\d\d\:\d\d\:\d\d\t", RegexOptions.Compiled); + public override string Extension { get { return ".txt"; } @@ -100,4 +101,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle48.cs b/libse/SubtitleFormats/UnknownSubtitle48.cs index bb7489370..3a95e23cb 100644 --- a/libse/SubtitleFormats/UnknownSubtitle48.cs +++ b/libse/SubtitleFormats/UnknownSubtitle48.cs @@ -98,4 +98,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle49.cs b/libse/SubtitleFormats/UnknownSubtitle49.cs index 9769a5c79..9a67eab7a 100644 --- a/libse/SubtitleFormats/UnknownSubtitle49.cs +++ b/libse/SubtitleFormats/UnknownSubtitle49.cs @@ -155,4 +155,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle5.cs b/libse/SubtitleFormats/UnknownSubtitle5.cs index 50324039b..64d5d6ca2 100644 --- a/libse/SubtitleFormats/UnknownSubtitle5.cs +++ b/libse/SubtitleFormats/UnknownSubtitle5.cs @@ -105,4 +105,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle50.cs b/libse/SubtitleFormats/UnknownSubtitle50.cs index 89706b80b..360f1b2ec 100644 --- a/libse/SubtitleFormats/UnknownSubtitle50.cs +++ b/libse/SubtitleFormats/UnknownSubtitle50.cs @@ -175,4 +175,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle51.cs b/libse/SubtitleFormats/UnknownSubtitle51.cs index 75932ef22..fdb963753 100644 --- a/libse/SubtitleFormats/UnknownSubtitle51.cs +++ b/libse/SubtitleFormats/UnknownSubtitle51.cs @@ -107,4 +107,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle52.cs b/libse/SubtitleFormats/UnknownSubtitle52.cs index ea7b16b2f..7ff401788 100644 --- a/libse/SubtitleFormats/UnknownSubtitle52.cs +++ b/libse/SubtitleFormats/UnknownSubtitle52.cs @@ -137,4 +137,4 @@ FILE_INFO_END"; } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle53.cs b/libse/SubtitleFormats/UnknownSubtitle53.cs index 3e26be091..72fa2b8ab 100644 --- a/libse/SubtitleFormats/UnknownSubtitle53.cs +++ b/libse/SubtitleFormats/UnknownSubtitle53.cs @@ -8,6 +8,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats { private static readonly Regex RegexTimeCodes = new Regex(@"^\d\d\:\d\d\:\d\d\:\d\d [^ ]+", RegexOptions.Compiled); + public override string Extension { get { return ".txt"; } @@ -114,4 +115,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle54.cs b/libse/SubtitleFormats/UnknownSubtitle54.cs index a486b1d7f..f1c2b5c33 100644 --- a/libse/SubtitleFormats/UnknownSubtitle54.cs +++ b/libse/SubtitleFormats/UnknownSubtitle54.cs @@ -136,4 +136,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle55.cs b/libse/SubtitleFormats/UnknownSubtitle55.cs index d8ff0d24b..14bef7cf9 100644 --- a/libse/SubtitleFormats/UnknownSubtitle55.cs +++ b/libse/SubtitleFormats/UnknownSubtitle55.cs @@ -130,4 +130,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle56.cs b/libse/SubtitleFormats/UnknownSubtitle56.cs index bc7998c2d..e16337c3b 100644 --- a/libse/SubtitleFormats/UnknownSubtitle56.cs +++ b/libse/SubtitleFormats/UnknownSubtitle56.cs @@ -134,4 +134,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle57.cs b/libse/SubtitleFormats/UnknownSubtitle57.cs index 5bbe0cfcf..91f3f6a1f 100644 --- a/libse/SubtitleFormats/UnknownSubtitle57.cs +++ b/libse/SubtitleFormats/UnknownSubtitle57.cs @@ -93,4 +93,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats subtitle.Renumber(); } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle58.cs b/libse/SubtitleFormats/UnknownSubtitle58.cs index b1220cd8e..da615c254 100644 --- a/libse/SubtitleFormats/UnknownSubtitle58.cs +++ b/libse/SubtitleFormats/UnknownSubtitle58.cs @@ -124,4 +124,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle59.cs b/libse/SubtitleFormats/UnknownSubtitle59.cs index 923cd8452..7ddac6c62 100644 --- a/libse/SubtitleFormats/UnknownSubtitle59.cs +++ b/libse/SubtitleFormats/UnknownSubtitle59.cs @@ -11,6 +11,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats public static readonly Regex RegexTimeCodes2 = new Regex(@"^\d\d\:\d\d\:\d\d.+\d\d\:\d\d\:\d\d$", RegexOptions.Compiled); private static readonly Regex RegexStartOnly = new Regex(@"^\d\d\:\d\d\:\d\d\t.+$", RegexOptions.Compiled); private static readonly Regex RegexEndOnly = new Regex(@"\d\d\:\d\d\:\d\d$", RegexOptions.Compiled); + public override string Extension { get { return ".txt"; } @@ -180,4 +181,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle6.cs b/libse/SubtitleFormats/UnknownSubtitle6.cs index 29cc68ab0..bef57320d 100644 --- a/libse/SubtitleFormats/UnknownSubtitle6.cs +++ b/libse/SubtitleFormats/UnknownSubtitle6.cs @@ -130,4 +130,4 @@ SRPSKI subtitle.Renumber(); } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle60.cs b/libse/SubtitleFormats/UnknownSubtitle60.cs index b68da8cfd..45766d81a 100644 --- a/libse/SubtitleFormats/UnknownSubtitle60.cs +++ b/libse/SubtitleFormats/UnknownSubtitle60.cs @@ -148,4 +148,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle61.cs b/libse/SubtitleFormats/UnknownSubtitle61.cs index ba716eef3..0af431bd5 100644 --- a/libse/SubtitleFormats/UnknownSubtitle61.cs +++ b/libse/SubtitleFormats/UnknownSubtitle61.cs @@ -152,4 +152,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle62.cs b/libse/SubtitleFormats/UnknownSubtitle62.cs index b26d0a389..1b6c239f6 100644 --- a/libse/SubtitleFormats/UnknownSubtitle62.cs +++ b/libse/SubtitleFormats/UnknownSubtitle62.cs @@ -119,4 +119,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle63.cs b/libse/SubtitleFormats/UnknownSubtitle63.cs index 70eba490d..232d212dc 100644 --- a/libse/SubtitleFormats/UnknownSubtitle63.cs +++ b/libse/SubtitleFormats/UnknownSubtitle63.cs @@ -129,4 +129,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle64.cs b/libse/SubtitleFormats/UnknownSubtitle64.cs index dd4643655..973c60cbd 100644 --- a/libse/SubtitleFormats/UnknownSubtitle64.cs +++ b/libse/SubtitleFormats/UnknownSubtitle64.cs @@ -154,4 +154,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle65.cs b/libse/SubtitleFormats/UnknownSubtitle65.cs index 56bef9fbc..0abdbecda 100644 --- a/libse/SubtitleFormats/UnknownSubtitle65.cs +++ b/libse/SubtitleFormats/UnknownSubtitle65.cs @@ -124,4 +124,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats subtitle.Renumber(); } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle66.cs b/libse/SubtitleFormats/UnknownSubtitle66.cs index a07a2afbf..9f08fb4f9 100644 --- a/libse/SubtitleFormats/UnknownSubtitle66.cs +++ b/libse/SubtitleFormats/UnknownSubtitle66.cs @@ -133,4 +133,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle67.cs b/libse/SubtitleFormats/UnknownSubtitle67.cs index 904a8cb37..93a6fb3af 100644 --- a/libse/SubtitleFormats/UnknownSubtitle67.cs +++ b/libse/SubtitleFormats/UnknownSubtitle67.cs @@ -114,4 +114,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle68.cs b/libse/SubtitleFormats/UnknownSubtitle68.cs index 371e0eed0..17176e40e 100644 --- a/libse/SubtitleFormats/UnknownSubtitle68.cs +++ b/libse/SubtitleFormats/UnknownSubtitle68.cs @@ -182,4 +182,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle69.cs b/libse/SubtitleFormats/UnknownSubtitle69.cs index e38ac2559..71ed04be5 100644 --- a/libse/SubtitleFormats/UnknownSubtitle69.cs +++ b/libse/SubtitleFormats/UnknownSubtitle69.cs @@ -107,4 +107,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle7.cs b/libse/SubtitleFormats/UnknownSubtitle7.cs index 37c2b884a..1a6f922ba 100644 --- a/libse/SubtitleFormats/UnknownSubtitle7.cs +++ b/libse/SubtitleFormats/UnknownSubtitle7.cs @@ -142,4 +142,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle70.cs b/libse/SubtitleFormats/UnknownSubtitle70.cs index 2884137f2..d5a2600cd 100644 --- a/libse/SubtitleFormats/UnknownSubtitle70.cs +++ b/libse/SubtitleFormats/UnknownSubtitle70.cs @@ -562,4 +562,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats return i; } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle71.cs b/libse/SubtitleFormats/UnknownSubtitle71.cs index dea745e2a..c4617a84e 100644 --- a/libse/SubtitleFormats/UnknownSubtitle71.cs +++ b/libse/SubtitleFormats/UnknownSubtitle71.cs @@ -204,4 +204,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle72.cs b/libse/SubtitleFormats/UnknownSubtitle72.cs index 596ea54d7..fa4aeed3b 100644 --- a/libse/SubtitleFormats/UnknownSubtitle72.cs +++ b/libse/SubtitleFormats/UnknownSubtitle72.cs @@ -131,4 +131,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle73.cs b/libse/SubtitleFormats/UnknownSubtitle73.cs index 9323b2acf..2d74524c1 100644 --- a/libse/SubtitleFormats/UnknownSubtitle73.cs +++ b/libse/SubtitleFormats/UnknownSubtitle73.cs @@ -118,6 +118,6 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats subtitle.Renumber(); } - + } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle74.cs b/libse/SubtitleFormats/UnknownSubtitle74.cs index 096175d9e..161345704 100644 --- a/libse/SubtitleFormats/UnknownSubtitle74.cs +++ b/libse/SubtitleFormats/UnknownSubtitle74.cs @@ -143,4 +143,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle75.cs b/libse/SubtitleFormats/UnknownSubtitle75.cs index 53a2d04a8..852be7af1 100644 --- a/libse/SubtitleFormats/UnknownSubtitle75.cs +++ b/libse/SubtitleFormats/UnknownSubtitle75.cs @@ -8,23 +8,23 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats public class UnknownSubtitle75 : SubtitleFormat { -//BOSTA - English -//REEL 1 -//0001: 124+12 127+12 -//Get going, you idiot! -//0002: 139+13 143+07 -//They scorn it, but they don't -//know its true value. -//0003: 143+12 146+09 -//Move on, move on! -//0004: 147+04 151+00 -//In 1943, it was one of a kind. -//0005: 159+00 161+15 -//... -//1083: 1575+05 1583+09 -//THE END IS THE BEGINNING -//1084: 1918+12 0+00 -//END OF THE FILM + //BOSTA - English + //REEL 1 + //0001: 124+12 127+12 + //Get going, you idiot! + //0002: 139+13 143+07 + //They scorn it, but they don't + //know its true value. + //0003: 143+12 146+09 + //Move on, move on! + //0004: 147+04 151+00 + //In 1943, it was one of a kind. + //0005: 159+00 161+15 + //... + //1083: 1575+05 1583+09 + //THE END IS THE BEGINNING + //1084: 1918+12 0+00 + //END OF THE FILM private static readonly Regex RegexTimeCodes = new Regex(@"^\d\d\d\d:\s+\d+\+\d+\s+\d+\+\d+$", RegexOptions.Compiled); @@ -143,4 +143,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle76.cs b/libse/SubtitleFormats/UnknownSubtitle76.cs index 6c6fc2183..bbc1b1668 100644 --- a/libse/SubtitleFormats/UnknownSubtitle76.cs +++ b/libse/SubtitleFormats/UnknownSubtitle76.cs @@ -111,4 +111,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle77.cs b/libse/SubtitleFormats/UnknownSubtitle77.cs index 9f987bf25..b83f7b56f 100644 --- a/libse/SubtitleFormats/UnknownSubtitle77.cs +++ b/libse/SubtitleFormats/UnknownSubtitle77.cs @@ -86,4 +86,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle78.cs b/libse/SubtitleFormats/UnknownSubtitle78.cs index 66bb228c7..a61ffe801 100644 --- a/libse/SubtitleFormats/UnknownSubtitle78.cs +++ b/libse/SubtitleFormats/UnknownSubtitle78.cs @@ -5,7 +5,7 @@ using System.Xml; namespace Nikse.SubtitleEdit.Core.SubtitleFormats { - class UnknownSubtitle78 : SubtitleFormat + internal class UnknownSubtitle78 : SubtitleFormat { public override string Extension { @@ -214,4 +214,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle79.cs b/libse/SubtitleFormats/UnknownSubtitle79.cs index 03217b10d..ab4776ffb 100644 --- a/libse/SubtitleFormats/UnknownSubtitle79.cs +++ b/libse/SubtitleFormats/UnknownSubtitle79.cs @@ -42,7 +42,6 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats //0 = Height (0=bottom, 5=middle, 9=top) //N or I or B = Normal or Italic or Bold - const string paragraphWriteFormat = "SUB [{0} {1} {2}>{3}]{4}{5}"; var sb = new StringBuilder(); foreach (Paragraph p in subtitle.Paragraphs) @@ -155,4 +154,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats return time.ToHHMMSSFF(); } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle8.cs b/libse/SubtitleFormats/UnknownSubtitle8.cs index db806aa76..0fc5945e9 100644 --- a/libse/SubtitleFormats/UnknownSubtitle8.cs +++ b/libse/SubtitleFormats/UnknownSubtitle8.cs @@ -114,4 +114,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle80.cs b/libse/SubtitleFormats/UnknownSubtitle80.cs index 5d3c27f50..3b04082c1 100644 --- a/libse/SubtitleFormats/UnknownSubtitle80.cs +++ b/libse/SubtitleFormats/UnknownSubtitle80.cs @@ -126,4 +126,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UnknownSubtitle9.cs b/libse/SubtitleFormats/UnknownSubtitle9.cs index 4d6f8a7ce..07a56a90a 100644 --- a/libse/SubtitleFormats/UnknownSubtitle9.cs +++ b/libse/SubtitleFormats/UnknownSubtitle9.cs @@ -40,7 +40,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats sb.AppendLine("
"); foreach (Paragraph p in subtitle.Paragraphs) { - sb.AppendLine(string.Format(" {2}",((long)(Math.Round(p.StartTime.TotalMilliseconds))).ToString(CultureInfo.InvariantCulture), ((long)(Math.Round(p.Duration.TotalMilliseconds))).ToString(CultureInfo.InvariantCulture), p.Text.Replace(Environment.NewLine, "
"))); + sb.AppendLine(string.Format(" {2}", ((long)(Math.Round(p.StartTime.TotalMilliseconds))).ToString(CultureInfo.InvariantCulture), ((long)(Math.Round(p.Duration.TotalMilliseconds))).ToString(CultureInfo.InvariantCulture), p.Text.Replace(Environment.NewLine, "
"))); } sb.AppendLine("
"); sb.AppendLine(" "); @@ -108,4 +108,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Utx.cs b/libse/SubtitleFormats/Utx.cs index 2b68230b6..7652719d2 100644 --- a/libse/SubtitleFormats/Utx.cs +++ b/libse/SubtitleFormats/Utx.cs @@ -108,4 +108,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/UtxFrames.cs b/libse/SubtitleFormats/UtxFrames.cs index 0ef247af7..a1c4d89d1 100644 --- a/libse/SubtitleFormats/UtxFrames.cs +++ b/libse/SubtitleFormats/UtxFrames.cs @@ -100,4 +100,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/VocapiaSplit.cs b/libse/SubtitleFormats/VocapiaSplit.cs index 6ea1260ee..caeff4517 100644 --- a/libse/SubtitleFormats/VocapiaSplit.cs +++ b/libse/SubtitleFormats/VocapiaSplit.cs @@ -166,4 +166,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/WebVTT.cs b/libse/SubtitleFormats/WebVTT.cs index 0d40922c2..fa4cdc229 100644 --- a/libse/SubtitleFormats/WebVTT.cs +++ b/libse/SubtitleFormats/WebVTT.cs @@ -197,4 +197,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/WebVTTFileWithLineNumber.cs b/libse/SubtitleFormats/WebVTTFileWithLineNumber.cs index ac1a48333..8851fff99 100644 --- a/libse/SubtitleFormats/WebVTTFileWithLineNumber.cs +++ b/libse/SubtitleFormats/WebVTTFileWithLineNumber.cs @@ -213,4 +213,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Wsb.cs b/libse/SubtitleFormats/Wsb.cs index 5087121fe..f8b904e82 100644 --- a/libse/SubtitleFormats/Wsb.cs +++ b/libse/SubtitleFormats/Wsb.cs @@ -105,4 +105,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/Xif.cs b/libse/SubtitleFormats/Xif.cs index 26c59ea0f..9ce72ff15 100644 --- a/libse/SubtitleFormats/Xif.cs +++ b/libse/SubtitleFormats/Xif.cs @@ -119,7 +119,6 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats globalFileInfoNode.Attributes["StopTime"].InnerText = lastTimeCode.ToHHMMSSFF(); globalFileInfoNode.Attributes["NumberOfCaptions"].InnerText = subtitle.Paragraphs.Count.ToString(CultureInfo.InvariantCulture); - var fileBodyNode = xml.DocumentElement.SelectSingleNode("FileBody"); foreach (Paragraph p in subtitle.Paragraphs) { @@ -221,4 +220,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/YouTubeAnnotations.cs b/libse/SubtitleFormats/YouTubeAnnotations.cs index 8acbdd591..0657454cf 100644 --- a/libse/SubtitleFormats/YouTubeAnnotations.cs +++ b/libse/SubtitleFormats/YouTubeAnnotations.cs @@ -1,8 +1,8 @@ -using System; +using Nikse.SubtitleEdit.Core.Enums; +using System; using System.Collections.Generic; using System.Text; using System.Xml; -using Nikse.SubtitleEdit.Core.Enums; namespace Nikse.SubtitleEdit.Core.SubtitleFormats { @@ -246,4 +246,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/YouTubeSbv.cs b/libse/SubtitleFormats/YouTubeSbv.cs index 119d6fa49..83ca876fb 100644 --- a/libse/SubtitleFormats/YouTubeSbv.cs +++ b/libse/SubtitleFormats/YouTubeSbv.cs @@ -181,4 +181,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats return false; } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/YouTubeTranscript.cs b/libse/SubtitleFormats/YouTubeTranscript.cs index 1bc68a92f..9eee7ab5d 100644 --- a/libse/SubtitleFormats/YouTubeTranscript.cs +++ b/libse/SubtitleFormats/YouTubeTranscript.cs @@ -102,4 +102,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/YouTubeTranscriptOneLine.cs b/libse/SubtitleFormats/YouTubeTranscriptOneLine.cs index 450618058..a32be37a5 100644 --- a/libse/SubtitleFormats/YouTubeTranscriptOneLine.cs +++ b/libse/SubtitleFormats/YouTubeTranscriptOneLine.cs @@ -93,4 +93,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/SubtitleFormats/ZeroG.cs b/libse/SubtitleFormats/ZeroG.cs index fedc665d9..cf18b82d4 100644 --- a/libse/SubtitleFormats/ZeroG.cs +++ b/libse/SubtitleFormats/ZeroG.cs @@ -98,4 +98,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats } } -} \ No newline at end of file +} diff --git a/libse/TarHeader.cs b/libse/TarHeader.cs index c61f31700..233f5d992 100644 --- a/libse/TarHeader.cs +++ b/libse/TarHeader.cs @@ -37,4 +37,4 @@ namespace Nikse.SubtitleEdit.Core } } -} \ No newline at end of file +} diff --git a/libse/TarReader.cs b/libse/TarReader.cs index 476e94da5..6c9eb353b 100644 --- a/libse/TarReader.cs +++ b/libse/TarReader.cs @@ -54,4 +54,4 @@ namespace Nikse.SubtitleEdit.Core } } -} \ No newline at end of file +} diff --git a/libse/TaskbarList.cs b/libse/TaskbarList.cs index 0ffef6404..063da2688 100644 --- a/libse/TaskbarList.cs +++ b/libse/TaskbarList.cs @@ -231,4 +231,4 @@ namespace Nikse.SubtitleEdit.Core Paused = 0x8 } -} \ No newline at end of file +} diff --git a/libse/TextDraw.cs b/libse/TextDraw.cs index a0968e02a..880ddaa88 100644 --- a/libse/TextDraw.cs +++ b/libse/TextDraw.cs @@ -127,4 +127,4 @@ namespace Nikse.SubtitleEdit.Core } } -} \ No newline at end of file +} diff --git a/libse/TimeCode.cs b/libse/TimeCode.cs index 287003649..69a551ee2 100644 --- a/libse/TimeCode.cs +++ b/libse/TimeCode.cs @@ -1,6 +1,6 @@ -using System; +using Nikse.SubtitleEdit.Core.SubtitleFormats; +using System; using System.Globalization; -using Nikse.SubtitleEdit.Core.SubtitleFormats; namespace Nikse.SubtitleEdit.Core { @@ -259,4 +259,4 @@ namespace Nikse.SubtitleEdit.Core } } -} \ No newline at end of file +} diff --git a/libse/TransportStream/AdaptationField.cs b/libse/TransportStream/AdaptationField.cs index 7725e53cf..38716c5a6 100644 --- a/libse/TransportStream/AdaptationField.cs +++ b/libse/TransportStream/AdaptationField.cs @@ -105,4 +105,4 @@ namespace Nikse.SubtitleEdit.Core.TransportStream } } } -} \ No newline at end of file +} diff --git a/libse/TransportStream/ClutDefinitionSegment.cs b/libse/TransportStream/ClutDefinitionSegment.cs index e077afcde..96c5cb54f 100644 --- a/libse/TransportStream/ClutDefinitionSegment.cs +++ b/libse/TransportStream/ClutDefinitionSegment.cs @@ -46,4 +46,4 @@ namespace Nikse.SubtitleEdit.Core.TransportStream } } } -} \ No newline at end of file +} diff --git a/libse/TransportStream/DisplayDefinitionSegment.cs b/libse/TransportStream/DisplayDefinitionSegment.cs index 426b4c103..0f9a3f787 100644 --- a/libse/TransportStream/DisplayDefinitionSegment.cs +++ b/libse/TransportStream/DisplayDefinitionSegment.cs @@ -27,4 +27,4 @@ } } -} \ No newline at end of file +} diff --git a/libse/TransportStream/DvbSubPes.cs b/libse/TransportStream/DvbSubPes.cs index 8c33dfd10..a5e163472 100644 --- a/libse/TransportStream/DvbSubPes.cs +++ b/libse/TransportStream/DvbSubPes.cs @@ -395,4 +395,4 @@ namespace Nikse.SubtitleEdit.Core.TransportStream } } -} \ No newline at end of file +} diff --git a/libse/TransportStream/EbuPesDataFieldText.cs b/libse/TransportStream/EbuPesDataFieldText.cs index 4a3ac6b82..cee6a8e73 100644 --- a/libse/TransportStream/EbuPesDataFieldText.cs +++ b/libse/TransportStream/EbuPesDataFieldText.cs @@ -7,4 +7,4 @@ public byte[] DataField { get; set; } public EbuPesDataFieldText FieldText; } -} \ No newline at end of file +} diff --git a/libse/TransportStream/Helper.cs b/libse/TransportStream/Helper.cs index be8255ab3..edca946dc 100644 --- a/libse/TransportStream/Helper.cs +++ b/libse/TransportStream/Helper.cs @@ -327,4 +327,4 @@ namespace Nikse.SubtitleEdit.Core.TransportStream } } -} \ No newline at end of file +} diff --git a/libse/TransportStream/HummingDecoder.cs b/libse/TransportStream/HummingDecoder.cs index 6e39f81f4..fa29069df 100644 --- a/libse/TransportStream/HummingDecoder.cs +++ b/libse/TransportStream/HummingDecoder.cs @@ -46,4 +46,4 @@ } } -} \ No newline at end of file +} diff --git a/libse/TransportStream/Packet.cs b/libse/TransportStream/Packet.cs index 16b407828..e39dfe861 100644 --- a/libse/TransportStream/Packet.cs +++ b/libse/TransportStream/Packet.cs @@ -146,4 +146,4 @@ namespace Nikse.SubtitleEdit.Core.TransportStream } } -} \ No newline at end of file +} diff --git a/libse/TransportStream/PacketizedElementaryStream.cs b/libse/TransportStream/PacketizedElementaryStream.cs index ce748d781..6ce9516e9 100644 --- a/libse/TransportStream/PacketizedElementaryStream.cs +++ b/libse/TransportStream/PacketizedElementaryStream.cs @@ -88,7 +88,7 @@ namespace Nikse.SubtitleEdit.Core.TransportStream return; } - DataBuffer = new byte[dataSize+1]; + DataBuffer = new byte[dataSize + 1]; //Buffer.BlockCopy(buffer, dataIndex, DataBuffer, 0, dataSize); Buffer.BlockCopy(buffer, dataIndex - 1, DataBuffer, 0, DataBuffer.Length); // why subtract one from dataIndex??? } diff --git a/libse/TransportStream/PageCompositionSegemnt.cs b/libse/TransportStream/PageCompositionSegemnt.cs index 519a275c8..c13a850ab 100644 --- a/libse/TransportStream/PageCompositionSegemnt.cs +++ b/libse/TransportStream/PageCompositionSegemnt.cs @@ -30,4 +30,4 @@ namespace Nikse.SubtitleEdit.Core.TransportStream } } -} \ No newline at end of file +} diff --git a/libse/TransportStream/PageCompositionSegmentRegion.cs b/libse/TransportStream/PageCompositionSegmentRegion.cs index fb9a053e9..f9ea623a5 100644 --- a/libse/TransportStream/PageCompositionSegmentRegion.cs +++ b/libse/TransportStream/PageCompositionSegmentRegion.cs @@ -7,4 +7,4 @@ public int RegionVerticalAddress { get; set; } } -} \ No newline at end of file +} diff --git a/libse/TransportStream/ProgramAssociationTable.cs b/libse/TransportStream/ProgramAssociationTable.cs index ede2fe000..90da7f381 100644 --- a/libse/TransportStream/ProgramAssociationTable.cs +++ b/libse/TransportStream/ProgramAssociationTable.cs @@ -40,4 +40,4 @@ namespace Nikse.SubtitleEdit.Core.TransportStream } } } -} \ No newline at end of file +} diff --git a/libse/TransportStream/RegionClutSegmentEntry.cs b/libse/TransportStream/RegionClutSegmentEntry.cs index cfab97e25..3abaf7080 100644 --- a/libse/TransportStream/RegionClutSegmentEntry.cs +++ b/libse/TransportStream/RegionClutSegmentEntry.cs @@ -56,4 +56,4 @@ namespace Nikse.SubtitleEdit.Core.TransportStream } } -} \ No newline at end of file +} diff --git a/libse/TransportStream/RegionCompositionSegment.cs b/libse/TransportStream/RegionCompositionSegment.cs index 6d6d24c6c..60eea86bb 100644 --- a/libse/TransportStream/RegionCompositionSegment.cs +++ b/libse/TransportStream/RegionCompositionSegment.cs @@ -49,4 +49,4 @@ namespace Nikse.SubtitleEdit.Core.TransportStream } } } -} \ No newline at end of file +} diff --git a/libse/TransportStream/RegionCompositionSegmentObject.cs b/libse/TransportStream/RegionCompositionSegmentObject.cs index 6165153ef..1a45b4c61 100644 --- a/libse/TransportStream/RegionCompositionSegmentObject.cs +++ b/libse/TransportStream/RegionCompositionSegmentObject.cs @@ -10,4 +10,4 @@ public int? ObjectForegroundPixelCode { get; set; } public int? ObjectBackgroundPixelCode { get; set; } } -} \ No newline at end of file +} diff --git a/libse/TransportStream/TransportStreamParser.cs b/libse/TransportStream/TransportStreamParser.cs index d88169632..0112e161a 100644 --- a/libse/TransportStream/TransportStreamParser.cs +++ b/libse/TransportStream/TransportStreamParser.cs @@ -1,9 +1,9 @@ -using System; +using Nikse.SubtitleEdit.Core.BluRaySup; +using Nikse.SubtitleEdit.Core.VobSub; +using System; using System.Collections.Generic; using System.IO; using System.Text; -using Nikse.SubtitleEdit.Core.BluRaySup; -using Nikse.SubtitleEdit.Core.VobSub; namespace Nikse.SubtitleEdit.Core.TransportStream { @@ -20,8 +20,10 @@ namespace Nikse.SubtitleEdit.Core.TransportStream public long TotalNumberOfPrivateStream1Continuation0 { get; private set; } public List SubtitlePacketIds { get; private set; } public List SubtitlePackets { get; private set; } + // public List ProgramAssociationTables { get; private set; } private Dictionary> SubtitlesLookup { get; set; } + private Dictionary> DvbSubtitlesLookup { get; set; } public bool IsM2TransportStream { get; private set; } public ulong FirstVideoPts { get; private set; } @@ -440,4 +442,4 @@ namespace Nikse.SubtitleEdit.Core.TransportStream } } -} \ No newline at end of file +} diff --git a/libse/TransportStream/TransportStreamSubtitle.cs b/libse/TransportStream/TransportStreamSubtitle.cs index 4bfb388b1..c2dfcb005 100644 --- a/libse/TransportStream/TransportStreamSubtitle.cs +++ b/libse/TransportStream/TransportStreamSubtitle.cs @@ -5,6 +5,7 @@ namespace Nikse.SubtitleEdit.Core.TransportStream public class TransportStreamSubtitle { private ulong _startMilliseconds; + public ulong StartMilliseconds { get @@ -20,6 +21,7 @@ namespace Nikse.SubtitleEdit.Core.TransportStream } private ulong _endMilliseconds; + public ulong EndMilliseconds { get @@ -100,4 +102,4 @@ namespace Nikse.SubtitleEdit.Core.TransportStream } } -} \ No newline at end of file +} diff --git a/libse/UknownFormatImporter.cs b/libse/UknownFormatImporter.cs index 2a8c2cff9..ed8d9403d 100644 --- a/libse/UknownFormatImporter.cs +++ b/libse/UknownFormatImporter.cs @@ -1,7 +1,7 @@ -using System; +using Nikse.SubtitleEdit.Core.SubtitleFormats; +using System; using System.Text; using System.Text.RegularExpressions; -using Nikse.SubtitleEdit.Core.SubtitleFormats; namespace Nikse.SubtitleEdit.Core { diff --git a/libse/Utilities.cs b/libse/Utilities.cs index df9a4e00d..fb9d612c0 100644 --- a/libse/Utilities.cs +++ b/libse/Utilities.cs @@ -177,8 +177,6 @@ namespace Nikse.SubtitleEdit.Core return string.Format("{0:0.0} gb", (float)fileSize / (1024 * 1024 * 1024)); } - - /// /// Downloads the requested resource as a using the configured . /// @@ -907,7 +905,6 @@ namespace Nikse.SubtitleEdit.Core return sb.ToString(); } - public static bool IsValidRegex(string testPattern) { if (string.IsNullOrEmpty(testPattern)) @@ -2213,4 +2210,4 @@ namespace Nikse.SubtitleEdit.Core } } -} \ No newline at end of file +} diff --git a/libse/VideoInfo.cs b/libse/VideoInfo.cs index c934d7b6b..3f5fc5a71 100644 --- a/libse/VideoInfo.cs +++ b/libse/VideoInfo.cs @@ -12,4 +12,4 @@ public string FileType { get; set; } public bool Success { get; set; } } -} \ No newline at end of file +} diff --git a/libse/VobSub/VobSubParser.cs b/libse/VobSub/VobSubParser.cs index 04a6bbe8c..350c64549 100644 --- a/libse/VobSub/VobSubParser.cs +++ b/libse/VobSub/VobSubParser.cs @@ -244,4 +244,4 @@ namespace Nikse.SubtitleEdit.Core.VobSub } } -} \ No newline at end of file +} diff --git a/libse/VobSub/VobSubWriter.cs b/libse/VobSub/VobSubWriter.cs index 5ba0a7b77..1f44c02f7 100644 --- a/libse/VobSub/VobSubWriter.cs +++ b/libse/VobSub/VobSubWriter.cs @@ -441,4 +441,4 @@ id: " + _languageNameShort + @", index: 0 } } -} \ No newline at end of file +} diff --git a/libse/WaveToVisualizer.cs b/libse/WaveToVisualizer.cs index 68d9a2bd5..a1d2ffdbe 100644 --- a/libse/WaveToVisualizer.cs +++ b/libse/WaveToVisualizer.cs @@ -58,6 +58,7 @@ namespace Nikse.SubtitleEdit.Core /// Size of sound data /// public uint DataChunkSize { get; private set; } + public int DataStartPosition { get; private set; } public WaveHeader(Stream stream) @@ -559,7 +560,7 @@ namespace Nikse.SubtitleEdit.Core private static int ReadValue16Bit(byte[] data, ref int index) { int result = (short) - ((data[index ] ) | + ((data[index]) | (data[index + 1] << 8)); index += 2; return result; @@ -568,7 +569,7 @@ namespace Nikse.SubtitleEdit.Core private static int ReadValue24Bit(byte[] data, ref int index) { int result = - ((data[index ] << 8) | + ((data[index] << 8) | (data[index + 1] << 16) | (data[index + 2] << 24)) >> 8; index += 3; @@ -578,8 +579,8 @@ namespace Nikse.SubtitleEdit.Core private static int ReadValue32Bit(byte[] data, ref int index) { int result = - (data[index ] ) | - (data[index + 1] << 8) | + (data[index]) | + (data[index + 1] << 8) | (data[index + 2] << 16) | (data[index + 3] << 24); index += 4; @@ -593,20 +594,20 @@ namespace Nikse.SubtitleEdit.Core private static void WriteValue16Bit(byte[] buffer, int offset, int value) { - buffer[offset ] = (byte)value; + buffer[offset] = (byte)value; buffer[offset + 1] = (byte)(value >> 8); } private static void WriteValue24Bit(byte[] buffer, int offset, int value) { - buffer[offset ] = (byte)value; + buffer[offset] = (byte)value; buffer[offset + 1] = (byte)(value >> 8); buffer[offset + 2] = (byte)(value >> 16); } private static void WriteValue32Bit(byte[] buffer, int offset, int value) { - buffer[offset ] = (byte)value; + buffer[offset] = (byte)value; buffer[offset + 1] = (byte)(value >> 8); buffer[offset + 2] = (byte)(value >> 16); buffer[offset + 3] = (byte)(value >> 24); @@ -1007,4 +1008,4 @@ namespace Nikse.SubtitleEdit.Core } } } -} \ No newline at end of file +} diff --git a/libse/XSub.cs b/libse/XSub.cs index 3039bfc16..719d044f9 100644 --- a/libse/XSub.cs +++ b/libse/XSub.cs @@ -38,7 +38,7 @@ namespace Nikse.SubtitleEdit.Core var nibble_end = buf.Length * 2; var x = 0; var y = 0; - for (; ; ) + for (;;) { if (nibbleOffset >= nibble_end) return -1; diff --git a/libse/ZipExtractor.cs b/libse/ZipExtractor.cs index eedceaa44..bf673475c 100644 --- a/libse/ZipExtractor.cs +++ b/libse/ZipExtractor.cs @@ -160,7 +160,7 @@ namespace Nikse.SubtitleEdit.Core List result = new List(); - for (int pointer = 0; pointer < this.CentralDirImage.Length; ) + for (int pointer = 0; pointer < this.CentralDirImage.Length;) { uint signature = BitConverter.ToUInt32(CentralDirImage, pointer); if (signature != 0x02014b50) @@ -437,4 +437,4 @@ namespace Nikse.SubtitleEdit.Core #endregion IDisposable Members } -} \ No newline at end of file +} diff --git a/src/Controls/AudioVisualizer.cs b/src/Controls/AudioVisualizer.cs index 0037cca3b..b9e057c23 100644 --- a/src/Controls/AudioVisualizer.cs +++ b/src/Controls/AudioVisualizer.cs @@ -109,6 +109,7 @@ namespace Nikse.SubtitleEdit.Controls public const double ZoomMinimum = 0.1; public const double ZoomMaximum = 2.5; private double _zoomFactor = 1.0; // 1.0=no zoom + public double ZoomFactor { get @@ -133,6 +134,7 @@ namespace Nikse.SubtitleEdit.Controls public const double VerticalZoomMinimum = 1.0; public const double VerticalZoomMaximum = 20.0; private double _verticalZoomFactor = 1.0; // 1.0=no zoom + public double VerticalZoomFactor { get @@ -181,6 +183,7 @@ namespace Nikse.SubtitleEdit.Controls } private bool _showSpectrogram; + public bool ShowSpectrogram { get @@ -200,6 +203,7 @@ namespace Nikse.SubtitleEdit.Controls public bool AllowOverlap { get; set; } private bool _showWaveform; + public bool ShowWaveform { get @@ -217,6 +221,7 @@ namespace Nikse.SubtitleEdit.Controls } private double _startPositionSeconds; + public double StartPositionSeconds { get @@ -1864,4 +1869,4 @@ namespace Nikse.SubtitleEdit.Controls } } -} \ No newline at end of file +} diff --git a/src/Controls/SETextBox.cs b/src/Controls/SETextBox.cs index d35830356..75982b885 100644 --- a/src/Controls/SETextBox.cs +++ b/src/Controls/SETextBox.cs @@ -271,4 +271,4 @@ namespace Nikse.SubtitleEdit.Controls } } -} \ No newline at end of file +} diff --git a/src/Controls/SubtitleListView.cs b/src/Controls/SubtitleListView.cs index 422168145..bfba49451 100644 --- a/src/Controls/SubtitleListView.cs +++ b/src/Controls/SubtitleListView.cs @@ -23,6 +23,7 @@ namespace Nikse.SubtitleEdit.Controls private Font _subtitleFont = new Font("Tahoma", 8.25F); private string _subtitleFontName = "Tahoma"; + public string SubtitleFontName { get { return _subtitleFontName; } @@ -37,6 +38,7 @@ namespace Nikse.SubtitleEdit.Controls } private bool _subtitleFontBold; + public bool SubtitleFontBold { get { return _subtitleFontBold; } @@ -51,6 +53,7 @@ namespace Nikse.SubtitleEdit.Controls } private int _subtitleFontSize = 8; + public int SubtitleFontSize { get { return _subtitleFontSize; } @@ -973,4 +976,4 @@ namespace Nikse.SubtitleEdit.Controls return (index >= 0 && index < Items.Count); } } -} \ No newline at end of file +} diff --git a/src/Controls/TimeUpDown.cs b/src/Controls/TimeUpDown.cs index e038e5060..00885b902 100644 --- a/src/Controls/TimeUpDown.cs +++ b/src/Controls/TimeUpDown.cs @@ -1,6 +1,6 @@ -using System.Collections.Generic; -using Nikse.SubtitleEdit.Core; +using Nikse.SubtitleEdit.Core; using System; +using System.Collections.Generic; using System.Globalization; using System.Windows.Forms; @@ -273,4 +273,4 @@ namespace Nikse.SubtitleEdit.Controls } } -} \ No newline at end of file +} diff --git a/src/Controls/VideoPlayerContainer.cs b/src/Controls/VideoPlayerContainer.cs index a5a470cfc..429c18d6f 100644 --- a/src/Controls/VideoPlayerContainer.cs +++ b/src/Controls/VideoPlayerContainer.cs @@ -1417,4 +1417,4 @@ namespace Nikse.SubtitleEdit.Controls #endregion VideoPlayer functions } -} \ No newline at end of file +} diff --git a/src/Forms/About.cs b/src/Forms/About.cs index bf166b455..c38f6d65a 100644 --- a/src/Forms/About.cs +++ b/src/Forms/About.cs @@ -102,4 +102,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/AddToNames.cs b/src/Forms/AddToNames.cs index 74b7d8812..c62a6be24 100644 --- a/src/Forms/AddToNames.cs +++ b/src/Forms/AddToNames.cs @@ -59,7 +59,7 @@ namespace Nikse.SubtitleEdit.Forms if (!string.IsNullOrEmpty(text)) { - textBoxAddName.Text = text.Trim().TrimEnd('.','!', '?'); + textBoxAddName.Text = text.Trim().TrimEnd('.', '!', '?'); if (textBoxAddName.Text.Length > 1) textBoxAddName.Text = char.ToUpper(textBoxAddName.Text[0]) + textBoxAddName.Text.Substring(1); } @@ -135,4 +135,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/AddToOcrReplaceList.cs b/src/Forms/AddToOcrReplaceList.cs index 5472a046c..8cdb87f23 100644 --- a/src/Forms/AddToOcrReplaceList.cs +++ b/src/Forms/AddToOcrReplaceList.cs @@ -96,4 +96,4 @@ namespace Nikse.SubtitleEdit.Forms } } } -} \ No newline at end of file +} diff --git a/src/Forms/AddToUserDic.cs b/src/Forms/AddToUserDic.cs index 922e8ff6e..3c99716f6 100644 --- a/src/Forms/AddToUserDic.cs +++ b/src/Forms/AddToUserDic.cs @@ -72,4 +72,4 @@ namespace Nikse.SubtitleEdit.Forms public string NewWord { get; private set; } } -} \ No newline at end of file +} diff --git a/src/Forms/AddWaveformBatch.cs b/src/Forms/AddWaveformBatch.cs index bd49c3370..ebde7ce4a 100644 --- a/src/Forms/AddWaveformBatch.cs +++ b/src/Forms/AddWaveformBatch.cs @@ -247,7 +247,6 @@ namespace Nikse.SubtitleEdit.Forms Application.DoEvents(); } - // check for delay in matroska files var audioTrackNames = new List(); var mkvAudioTrackNumbers = new Dictionary(); diff --git a/src/Forms/AlignmentPicker.cs b/src/Forms/AlignmentPicker.cs index 03a36cb8e..22af98580 100644 --- a/src/Forms/AlignmentPicker.cs +++ b/src/Forms/AlignmentPicker.cs @@ -98,4 +98,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/ApplyDurationLimits.cs b/src/Forms/ApplyDurationLimits.cs index a3679a221..a04fc3a12 100644 --- a/src/Forms/ApplyDurationLimits.cs +++ b/src/Forms/ApplyDurationLimits.cs @@ -221,4 +221,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/AutoBreakUnbreakLines.cs b/src/Forms/AutoBreakUnbreakLines.cs index 6dc954b81..66d9575b8 100644 --- a/src/Forms/AutoBreakUnbreakLines.cs +++ b/src/Forms/AutoBreakUnbreakLines.cs @@ -15,6 +15,7 @@ namespace Nikse.SubtitleEdit.Forms private HashSet _notAllowedFixes = new HashSet(); private Dictionary _fixedText = new Dictionary(); + public Dictionary FixedText { get { return _fixedText; } @@ -213,4 +214,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/BatchConvert.cs b/src/Forms/BatchConvert.cs index f0260f6b5..1dbcf1bd7 100644 --- a/src/Forms/BatchConvert.cs +++ b/src/Forms/BatchConvert.cs @@ -854,7 +854,8 @@ namespace Nikse.SubtitleEdit.Forms if (first) { first = false; - } else + } + else { if (prev.EndTime.TotalMilliseconds >= p.StartTime.TotalMilliseconds) prev.EndTime.TotalMilliseconds = p.StartTime.TotalMilliseconds - 1; @@ -1505,4 +1506,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/ChangeCasing.cs b/src/Forms/ChangeCasing.cs index e1257a733..05833d821 100644 --- a/src/Forms/ChangeCasing.cs +++ b/src/Forms/ChangeCasing.cs @@ -157,4 +157,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/ChangeCasingNames.cs b/src/Forms/ChangeCasingNames.cs index 4cc5671ee..6e78c998e 100644 --- a/src/Forms/ChangeCasingNames.cs +++ b/src/Forms/ChangeCasingNames.cs @@ -278,4 +278,4 @@ namespace Nikse.SubtitleEdit.Forms GeneratePreview(); } } -} \ No newline at end of file +} diff --git a/src/Forms/CheckForUpdates.cs b/src/Forms/CheckForUpdates.cs index 2cdb93481..74e1f7e6b 100644 --- a/src/Forms/CheckForUpdates.cs +++ b/src/Forms/CheckForUpdates.cs @@ -1,7 +1,7 @@ using Nikse.SubtitleEdit.Core; +using Nikse.SubtitleEdit.Core.Forms; using System; using System.Windows.Forms; -using Nikse.SubtitleEdit.Core.Forms; namespace Nikse.SubtitleEdit.Forms { @@ -145,4 +145,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/ChooseEncoding.cs b/src/Forms/ChooseEncoding.cs index bddcfb1bd..fe587305f 100644 --- a/src/Forms/ChooseEncoding.cs +++ b/src/Forms/ChooseEncoding.cs @@ -1,9 +1,9 @@ using Nikse.SubtitleEdit.Core; +using Nikse.SubtitleEdit.Logic; using System; using System.IO; using System.Text; using System.Windows.Forms; -using Nikse.SubtitleEdit.Logic; namespace Nikse.SubtitleEdit.Forms { diff --git a/src/Forms/ChooseLanguage.cs b/src/Forms/ChooseLanguage.cs index a0d465e11..c67f9c19e 100644 --- a/src/Forms/ChooseLanguage.cs +++ b/src/Forms/ChooseLanguage.cs @@ -15,12 +15,14 @@ namespace Nikse.SubtitleEdit.Forms private class TranslationInfo : IEquatable { private readonly string _cultureName; + public string CultureName { get { return _cultureName; } } private readonly string _displayName; + public string DisplayName { get { return _displayName; } @@ -146,4 +148,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/ChooseResolution.cs b/src/Forms/ChooseResolution.cs index 9e98cfee7..199bd290e 100644 --- a/src/Forms/ChooseResolution.cs +++ b/src/Forms/ChooseResolution.cs @@ -55,4 +55,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/ChooseStyle.cs b/src/Forms/ChooseStyle.cs index e24091e70..8fc6e484f 100644 --- a/src/Forms/ChooseStyle.cs +++ b/src/Forms/ChooseStyle.cs @@ -68,4 +68,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/DCinema/DCinemaPropertiesForm.cs b/src/Forms/DCinema/DCinemaPropertiesForm.cs index 00dbbf9b8..b25754fe8 100644 --- a/src/Forms/DCinema/DCinemaPropertiesForm.cs +++ b/src/Forms/DCinema/DCinemaPropertiesForm.cs @@ -3,4 +3,4 @@ public /* abstract */ class DCinemaPropertiesForm : PositionAndSizeForm { } -} \ No newline at end of file +} diff --git a/src/Forms/DCinema/DCinemaPropertiesInterop.cs b/src/Forms/DCinema/DCinemaPropertiesInterop.cs index 4ad8b4f1a..173d95961 100644 --- a/src/Forms/DCinema/DCinemaPropertiesInterop.cs +++ b/src/Forms/DCinema/DCinemaPropertiesInterop.cs @@ -1,8 +1,8 @@ -using System; +using Nikse.SubtitleEdit.Core; +using Nikse.SubtitleEdit.Logic; +using System; using System.Globalization; using System.Windows.Forms; -using Nikse.SubtitleEdit.Core; -using Nikse.SubtitleEdit.Logic; namespace Nikse.SubtitleEdit.Forms.DCinema { @@ -146,4 +146,4 @@ namespace Nikse.SubtitleEdit.Forms.DCinema DialogResult = DialogResult.Cancel; } } -} \ No newline at end of file +} diff --git a/src/Forms/DCinema/DCinemaPropertiesSmpte.cs b/src/Forms/DCinema/DCinemaPropertiesSmpte.cs index e5168a1c7..3031227ff 100644 --- a/src/Forms/DCinema/DCinemaPropertiesSmpte.cs +++ b/src/Forms/DCinema/DCinemaPropertiesSmpte.cs @@ -1,8 +1,8 @@ -using System; +using Nikse.SubtitleEdit.Core; +using Nikse.SubtitleEdit.Logic; +using System; using System.Globalization; using System.Windows.Forms; -using Nikse.SubtitleEdit.Core; -using Nikse.SubtitleEdit.Logic; namespace Nikse.SubtitleEdit.Forms.DCinema { @@ -155,4 +155,4 @@ namespace Nikse.SubtitleEdit.Forms.DCinema return "urn:uuid:" + hex.Insert(8, "-").Insert(13, "-").Insert(18, "-").Insert(23, "-"); } } -} \ No newline at end of file +} diff --git a/src/Forms/DialogDoNotShowAgain.cs b/src/Forms/DialogDoNotShowAgain.cs index 33b10e4ff..b76eafd52 100644 --- a/src/Forms/DialogDoNotShowAgain.cs +++ b/src/Forms/DialogDoNotShowAgain.cs @@ -45,4 +45,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/DoNotBreakAfterListEdit.cs b/src/Forms/DoNotBreakAfterListEdit.cs index 52b7b7538..8223bde3b 100644 --- a/src/Forms/DoNotBreakAfterListEdit.cs +++ b/src/Forms/DoNotBreakAfterListEdit.cs @@ -210,4 +210,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/DurationsBridgeGaps.cs b/src/Forms/DurationsBridgeGaps.cs index 920472ae4..2d21ef277 100644 --- a/src/Forms/DurationsBridgeGaps.cs +++ b/src/Forms/DurationsBridgeGaps.cs @@ -212,4 +212,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/DvdSubRip.cs b/src/Forms/DvdSubRip.cs index eaf5944ad..404f7e8ea 100644 --- a/src/Forms/DvdSubRip.cs +++ b/src/Forms/DvdSubRip.cs @@ -515,4 +515,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/EbuSaveOptions.cs b/src/Forms/EbuSaveOptions.cs index 2292844bc..9d0ac1c30 100644 --- a/src/Forms/EbuSaveOptions.cs +++ b/src/Forms/EbuSaveOptions.cs @@ -366,4 +366,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/EffectKaraoke.cs b/src/Forms/EffectKaraoke.cs index 05740aa84..ffd842a15 100644 --- a/src/Forms/EffectKaraoke.cs +++ b/src/Forms/EffectKaraoke.cs @@ -384,4 +384,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/ExportCustomText.cs b/src/Forms/ExportCustomText.cs index f4a8343b6..c14e6cd70 100644 --- a/src/Forms/ExportCustomText.cs +++ b/src/Forms/ExportCustomText.cs @@ -337,4 +337,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/ExportCustomTextFormat.cs b/src/Forms/ExportCustomTextFormat.cs index bb2f80ccf..961c7b12a 100644 --- a/src/Forms/ExportCustomTextFormat.cs +++ b/src/Forms/ExportCustomTextFormat.cs @@ -284,4 +284,4 @@ namespace Nikse.SubtitleEdit.Forms return s; } } -} \ No newline at end of file +} diff --git a/src/Forms/ExportPngXml.cs b/src/Forms/ExportPngXml.cs index 610104e5b..aad755e35 100644 --- a/src/Forms/ExportPngXml.cs +++ b/src/Forms/ExportPngXml.cs @@ -1156,7 +1156,7 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine + string fileNameNoExt = Path.GetFileNameWithoutExtension(fileNameNoPath); string template = " " + Environment.NewLine + -// file://localhost/" + fileNameNoPath.Replace(" ", "%20") + @" + // file://localhost/" + fileNameNoPath.Replace(" ", "%20") + @" @" " + System.Security.SecurityElement.Escape(fileNameNoPath) + @" [DURATION] @@ -4041,4 +4041,4 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine + } } -} \ No newline at end of file +} diff --git a/src/Forms/ExportPngXmlPreview.cs b/src/Forms/ExportPngXmlPreview.cs index 579c00ce4..de5d4f490 100644 --- a/src/Forms/ExportPngXmlPreview.cs +++ b/src/Forms/ExportPngXmlPreview.cs @@ -100,4 +100,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/ExportText.cs b/src/Forms/ExportText.cs index 9ec93a752..f9b5af353 100644 --- a/src/Forms/ExportText.cs +++ b/src/Forms/ExportText.cs @@ -184,4 +184,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/ExportTextST.cs b/src/Forms/ExportTextST.cs index 5e4a6be90..18e0e3f2f 100644 --- a/src/Forms/ExportTextST.cs +++ b/src/Forms/ExportTextST.cs @@ -134,7 +134,8 @@ namespace Nikse.SubtitleEdit.Forms { count++; var presentationSegmentNode = new TreeNode(string.Format("Segment {0}: {1} -- > {2}", count, - new TimeCode(segment.StartPtsMilliseconds), new TimeCode(segment.EndPtsMilliseconds))) { Tag = segment }; + new TimeCode(segment.StartPtsMilliseconds), new TimeCode(segment.EndPtsMilliseconds))) + { Tag = segment }; presentationSegmentsNode.Nodes.Add(presentationSegmentNode); foreach (var subtitleRegion in segment.Regions) @@ -708,7 +709,7 @@ namespace Nikse.SubtitleEdit.Forms private void addFontSizeToolStripMenuItem_Click(object sender, EventArgs e) { - var newContent = new TextST.SubtitleRegionContentChangeFontSize { FontSize = 45}; + var newContent = new TextST.SubtitleRegionContentChangeFontSize { FontSize = 45 }; AddSubtitleContent(newContent, newContent.Name); } @@ -817,4 +818,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/ExtractDateTimeInfo.cs b/src/Forms/ExtractDateTimeInfo.cs index 6e5816086..9c6ce4492 100644 --- a/src/Forms/ExtractDateTimeInfo.cs +++ b/src/Forms/ExtractDateTimeInfo.cs @@ -142,4 +142,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/FcpProperties.cs b/src/Forms/FcpProperties.cs index d95d1e467..4f20c589a 100644 --- a/src/Forms/FcpProperties.cs +++ b/src/Forms/FcpProperties.cs @@ -41,4 +41,4 @@ namespace Nikse.SubtitleEdit.Forms DialogResult = DialogResult.Cancel; } } -} \ No newline at end of file +} diff --git a/src/Forms/FindDialog.cs b/src/Forms/FindDialog.cs index ed7e52429..9e2c29e29 100644 --- a/src/Forms/FindDialog.cs +++ b/src/Forms/FindDialog.cs @@ -1,10 +1,10 @@ using Nikse.SubtitleEdit.Core; using Nikse.SubtitleEdit.Core.Enums; +using Nikse.SubtitleEdit.Logic; using System; using System.Drawing; using System.Text.RegularExpressions; using System.Windows.Forms; -using Nikse.SubtitleEdit.Logic; namespace Nikse.SubtitleEdit.Forms { @@ -219,4 +219,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/FindSubtitleLine.cs b/src/Forms/FindSubtitleLine.cs index 87017f04a..2cc638ffa 100644 --- a/src/Forms/FindSubtitleLine.cs +++ b/src/Forms/FindSubtitleLine.cs @@ -193,4 +193,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/FixCommonErrors.cs b/src/Forms/FixCommonErrors.cs index 52cafb6f1..868c3e6bf 100644 --- a/src/Forms/FixCommonErrors.cs +++ b/src/Forms/FixCommonErrors.cs @@ -2,6 +2,7 @@ using Nikse.SubtitleEdit.Core.Dictionaries; using Nikse.SubtitleEdit.Core.Forms.FixCommonErrors; using Nikse.SubtitleEdit.Core.SubtitleFormats; +using Nikse.SubtitleEdit.Logic; using Nikse.SubtitleEdit.Logic.Ocr; using System; using System.Collections.Generic; @@ -10,7 +11,6 @@ using System.Globalization; using System.IO; using System.Text; using System.Windows.Forms; -using Nikse.SubtitleEdit.Logic; namespace Nikse.SubtitleEdit.Forms { @@ -1595,4 +1595,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/GetDictionaries.cs b/src/Forms/GetDictionaries.cs index 97ad9542c..31d6d2261 100644 --- a/src/Forms/GetDictionaries.cs +++ b/src/Forms/GetDictionaries.cs @@ -235,4 +235,4 @@ namespace Nikse.SubtitleEdit.Forms labelPleaseWait.Text = _descriptions[index]; } } -} \ No newline at end of file +} diff --git a/src/Forms/GetTesseractDictionaries.cs b/src/Forms/GetTesseractDictionaries.cs index 1d564aec1..c3c63fd8b 100644 --- a/src/Forms/GetTesseractDictionaries.cs +++ b/src/Forms/GetTesseractDictionaries.cs @@ -178,4 +178,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/GoToLine.cs b/src/Forms/GoToLine.cs index 023c547ec..867958727 100644 --- a/src/Forms/GoToLine.cs +++ b/src/Forms/GoToLine.cs @@ -114,4 +114,4 @@ namespace Nikse.SubtitleEdit.Forms DialogResult = DialogResult.Cancel; } } -} \ No newline at end of file +} diff --git a/src/Forms/GoogleOrMicrosoftTranslate.cs b/src/Forms/GoogleOrMicrosoftTranslate.cs index ee80a14ab..3f298b7da 100644 --- a/src/Forms/GoogleOrMicrosoftTranslate.cs +++ b/src/Forms/GoogleOrMicrosoftTranslate.cs @@ -150,4 +150,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/GoogleTranslate.cs b/src/Forms/GoogleTranslate.cs index ad33d8268..eed939bd5 100644 --- a/src/Forms/GoogleTranslate.cs +++ b/src/Forms/GoogleTranslate.cs @@ -31,6 +31,7 @@ namespace Nikse.SubtitleEdit.Forms private FormattingType[] _formattingTypes; private Encoding _screenScrapingEncoding; + public Encoding ScreenScrapingEncoding { get { return _screenScrapingEncoding; } @@ -309,7 +310,7 @@ namespace Nikse.SubtitleEdit.Forms string languagePair = (comboBoxFrom.SelectedItem as ComboBoxItem).Value + "|" + (comboBoxTo.SelectedItem as ComboBoxItem).Value; bool romanji = languagePair.EndsWith("|romanji", StringComparison.InvariantCulture); if (romanji) - languagePair = (comboBoxFrom.SelectedItem as ComboBoxItem).Value + "|ja" ; + languagePair = (comboBoxFrom.SelectedItem as ComboBoxItem).Value + "|ja"; input = PreTranslate(input.TrimEnd('|').Trim()); @@ -942,4 +943,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/ImportImages.cs b/src/Forms/ImportImages.cs index 18eff538d..909539e53 100644 --- a/src/Forms/ImportImages.cs +++ b/src/Forms/ImportImages.cs @@ -1,9 +1,9 @@ -using System.Text.RegularExpressions; -using Nikse.SubtitleEdit.Core; +using Nikse.SubtitleEdit.Core; using System; -using System.IO; -using System.Windows.Forms; using System.Collections.Generic; +using System.IO; +using System.Text.RegularExpressions; +using System.Windows.Forms; namespace Nikse.SubtitleEdit.Forms { @@ -198,4 +198,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/ImportSceneChanges.cs b/src/Forms/ImportSceneChanges.cs index b0c8ca9c3..8dbb75e78 100644 --- a/src/Forms/ImportSceneChanges.cs +++ b/src/Forms/ImportSceneChanges.cs @@ -125,4 +125,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/ImportText.cs b/src/Forms/ImportText.cs index 4c8474b36..a074bacdb 100644 --- a/src/Forms/ImportText.cs +++ b/src/Forms/ImportText.cs @@ -798,4 +798,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/ImportUnknownFormat.cs b/src/Forms/ImportUnknownFormat.cs index e7a4a8671..8c8c96ca3 100644 --- a/src/Forms/ImportUnknownFormat.cs +++ b/src/Forms/ImportUnknownFormat.cs @@ -113,4 +113,4 @@ namespace Nikse.SubtitleEdit.Forms DialogResult = DialogResult.OK; } } -} \ No newline at end of file +} diff --git a/src/Forms/Interjections.cs b/src/Forms/Interjections.cs index 6fa998960..7985ccdbc 100644 --- a/src/Forms/Interjections.cs +++ b/src/Forms/Interjections.cs @@ -139,4 +139,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/JoinSubtitles.cs b/src/Forms/JoinSubtitles.cs index 9861723ee..9baa70b2f 100644 --- a/src/Forms/JoinSubtitles.cs +++ b/src/Forms/JoinSubtitles.cs @@ -228,4 +228,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index 4f83e8452..2e998478c 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -443,7 +443,6 @@ namespace Nikse.SubtitleEdit.Forms buttonCustomUrl2.Text = Configuration.Settings.VideoControls.CustomSearchText2; buttonCustomUrl2.Visible = Configuration.Settings.VideoControls.CustomSearchUrl2.Length > 1; - if (fileName.Length > 0 && File.Exists(fileName)) { OpenSubtitle(fileName, null); @@ -1903,7 +1902,6 @@ namespace Nikse.SubtitleEdit.Forms } } - if (format == null) { var cavena890 = new Cavena890(); @@ -2505,7 +2503,6 @@ namespace Nikse.SubtitleEdit.Forms } } - // Try to use a generic subtitle format parser (guessing subtitle format) try { @@ -19679,4 +19676,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/ModifySelection.cs b/src/Forms/ModifySelection.cs index 9743520c5..2447fd377 100644 --- a/src/Forms/ModifySelection.cs +++ b/src/Forms/ModifySelection.cs @@ -257,4 +257,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/MultipleReplace.cs b/src/Forms/MultipleReplace.cs index 65ae93712..0d6564f30 100644 --- a/src/Forms/MultipleReplace.cs +++ b/src/Forms/MultipleReplace.cs @@ -615,4 +615,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/NetworkJoin.cs b/src/Forms/NetworkJoin.cs index 9772b08b9..58a8b931e 100644 --- a/src/Forms/NetworkJoin.cs +++ b/src/Forms/NetworkJoin.cs @@ -102,4 +102,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/NetworkLogAndInfo.cs b/src/Forms/NetworkLogAndInfo.cs index 15a901d8f..e67086777 100644 --- a/src/Forms/NetworkLogAndInfo.cs +++ b/src/Forms/NetworkLogAndInfo.cs @@ -36,4 +36,4 @@ namespace Nikse.SubtitleEdit.Forms DialogResult = DialogResult.Cancel; } } -} \ No newline at end of file +} diff --git a/src/Forms/NuendoProperties.cs b/src/Forms/NuendoProperties.cs index 9d76163b1..1314ecdce 100644 --- a/src/Forms/NuendoProperties.cs +++ b/src/Forms/NuendoProperties.cs @@ -87,4 +87,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/PluginsGet.cs b/src/Forms/PluginsGet.cs index 3c367f61f..eda5c25ee 100644 --- a/src/Forms/PluginsGet.cs +++ b/src/Forms/PluginsGet.cs @@ -390,4 +390,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/RemoveTextFromHearImpaired.cs b/src/Forms/RemoveTextFromHearImpaired.cs index 00ca8af61..b38a0dfa8 100644 --- a/src/Forms/RemoveTextFromHearImpaired.cs +++ b/src/Forms/RemoveTextFromHearImpaired.cs @@ -299,4 +299,4 @@ namespace Nikse.SubtitleEdit.Forms } } } -} \ No newline at end of file +} diff --git a/src/Forms/ReplaceDialog.cs b/src/Forms/ReplaceDialog.cs index 79a6e81f3..38188191c 100644 --- a/src/Forms/ReplaceDialog.cs +++ b/src/Forms/ReplaceDialog.cs @@ -1,10 +1,10 @@ using Nikse.SubtitleEdit.Core; +using Nikse.SubtitleEdit.Core.Enums; +using Nikse.SubtitleEdit.Logic; using System; using System.Drawing; using System.Text.RegularExpressions; using System.Windows.Forms; -using Nikse.SubtitleEdit.Core.Enums; -using Nikse.SubtitleEdit.Logic; namespace Nikse.SubtitleEdit.Forms { diff --git a/src/Forms/SetVideoOffset.cs b/src/Forms/SetVideoOffset.cs index 891c0cf4c..a1b979519 100644 --- a/src/Forms/SetVideoOffset.cs +++ b/src/Forms/SetVideoOffset.cs @@ -10,6 +10,7 @@ namespace Nikse.SubtitleEdit.Forms public bool FromCurrentVideoPosition { get; set; } private TimeCode _videoOffset = new TimeCode(0); + public TimeCode VideoOffset { get diff --git a/src/Forms/Settings.cs b/src/Forms/Settings.cs index 1eb8cba0d..4359660a6 100644 --- a/src/Forms/Settings.cs +++ b/src/Forms/Settings.cs @@ -2633,4 +2633,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/ShowEarlierLater.cs b/src/Forms/ShowEarlierLater.cs index 63064b4de..e501b2a0c 100644 --- a/src/Forms/ShowEarlierLater.cs +++ b/src/Forms/ShowEarlierLater.cs @@ -115,4 +115,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/ShowHistory.cs b/src/Forms/ShowHistory.cs index 3bc59c06d..3ca80ff36 100644 --- a/src/Forms/ShowHistory.cs +++ b/src/Forms/ShowHistory.cs @@ -125,4 +125,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/SpellCheck.cs b/src/Forms/SpellCheck.cs index bfa212b5f..9d8d5f743 100644 --- a/src/Forms/SpellCheck.cs +++ b/src/Forms/SpellCheck.cs @@ -38,6 +38,7 @@ namespace Nikse.SubtitleEdit.Forms public string ChangeWord { get { return textBoxWord.Text; } set { textBoxWord.Text = value; } } public string ChangeWholeText { get { return textBoxWholeText.Text; } } public bool AutoFixNames { get { return checkBoxAutoChangeNames.Checked; } } + public int CurrentLineIndex { get { return _currentIndex; } @@ -1267,4 +1268,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/SplitLongLines.cs b/src/Forms/SplitLongLines.cs index 12e53dfca..848e6f7f6 100644 --- a/src/Forms/SplitLongLines.cs +++ b/src/Forms/SplitLongLines.cs @@ -360,4 +360,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/SplitSubtitle.cs b/src/Forms/SplitSubtitle.cs index c61fc0309..1d5151de6 100644 --- a/src/Forms/SplitSubtitle.cs +++ b/src/Forms/SplitSubtitle.cs @@ -162,4 +162,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/Statistics.cs b/src/Forms/Statistics.cs index ef652da09..4dbc0e99d 100644 --- a/src/Forms/Statistics.cs +++ b/src/Forms/Statistics.cs @@ -16,7 +16,7 @@ namespace Nikse.SubtitleEdit.Forms private string _mostUsedLines; private string _general; private string _mostUsedWords; - const string WriteFormat = @"File generated by: Subtitle Edit + private const string WriteFormat = @"File generated by: Subtitle Edit http://www.nikse.dk/subtitleedit/ https://github.com/SubtitleEdit/subtitleedit ============================= General ============================= @@ -326,4 +326,4 @@ https://github.com/SubtitleEdit/subtitleedit } } -} \ No newline at end of file +} diff --git a/src/Forms/Styles/StylesForm.cs b/src/Forms/Styles/StylesForm.cs index 100501fca..85411c7f9 100644 --- a/src/Forms/Styles/StylesForm.cs +++ b/src/Forms/Styles/StylesForm.cs @@ -1,6 +1,6 @@ -using System; +using Nikse.SubtitleEdit.Core; +using System; using System.Windows.Forms; -using Nikse.SubtitleEdit.Core; namespace Nikse.SubtitleEdit.Forms.Styles { @@ -59,4 +59,4 @@ namespace Nikse.SubtitleEdit.Forms.Styles GeneratePreviewReal(); } } -} \ No newline at end of file +} diff --git a/src/Forms/Styles/SubStationAlphaStyles.cs b/src/Forms/Styles/SubStationAlphaStyles.cs index e8ecfa452..05da9c5b4 100644 --- a/src/Forms/Styles/SubStationAlphaStyles.cs +++ b/src/Forms/Styles/SubStationAlphaStyles.cs @@ -1344,4 +1344,4 @@ namespace Nikse.SubtitleEdit.Forms.Styles } } -} \ No newline at end of file +} diff --git a/src/Forms/Styles/SubStationAlphaStylesBatchConvert.cs b/src/Forms/Styles/SubStationAlphaStylesBatchConvert.cs index 6820c2819..f3421a60e 100644 --- a/src/Forms/Styles/SubStationAlphaStylesBatchConvert.cs +++ b/src/Forms/Styles/SubStationAlphaStylesBatchConvert.cs @@ -1,4 +1,7 @@ -using System; +using Nikse.SubtitleEdit.Core; +using Nikse.SubtitleEdit.Core.SubtitleFormats; +using Nikse.SubtitleEdit.Logic; +using System; using System.Collections.Generic; using System.Drawing; using System.Drawing.Drawing2D; @@ -6,9 +9,6 @@ using System.Drawing.Text; using System.Globalization; using System.Text; using System.Windows.Forms; -using Nikse.SubtitleEdit.Core; -using Nikse.SubtitleEdit.Core.SubtitleFormats; -using Nikse.SubtitleEdit.Logic; namespace Nikse.SubtitleEdit.Forms.Styles { @@ -40,7 +40,7 @@ namespace Nikse.SubtitleEdit.Forms.Styles var l = Configuration.Settings.Language.SubStationAlphaStyles; Text = l.Title; -// groupBoxStyles.Text = l.Styles; + // groupBoxStyles.Text = l.Styles; groupBoxProperties.Text = l.Properties; groupBoxFont.Text = l.Font; labelFontName.Text = l.FontName; @@ -1046,4 +1046,4 @@ namespace Nikse.SubtitleEdit.Forms.Styles } } -} \ No newline at end of file +} diff --git a/src/Forms/Styles/TimedTextStyles.cs b/src/Forms/Styles/TimedTextStyles.cs index 54713ad0d..6e32ef656 100644 --- a/src/Forms/Styles/TimedTextStyles.cs +++ b/src/Forms/Styles/TimedTextStyles.cs @@ -526,4 +526,4 @@ namespace Nikse.SubtitleEdit.Forms.Styles } } -} \ No newline at end of file +} diff --git a/src/Forms/SubStationAlphaProperties.cs b/src/Forms/SubStationAlphaProperties.cs index dc09c9e33..026ac027b 100644 --- a/src/Forms/SubStationAlphaProperties.cs +++ b/src/Forms/SubStationAlphaProperties.cs @@ -1,9 +1,9 @@ -using System.Globalization; -using Nikse.SubtitleEdit.Core; +using Nikse.SubtitleEdit.Core; using Nikse.SubtitleEdit.Core.SubtitleFormats; using Nikse.SubtitleEdit.Logic; using System; using System.Collections.Generic; +using System.Globalization; using System.IO; using System.Text; using System.Windows.Forms; @@ -276,4 +276,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/SyncPointsSync.cs b/src/Forms/SyncPointsSync.cs index 5f9ed52a8..2251b88dc 100644 --- a/src/Forms/SyncPointsSync.cs +++ b/src/Forms/SyncPointsSync.cs @@ -1,11 +1,11 @@ using Nikse.SubtitleEdit.Core; +using Nikse.SubtitleEdit.Logic; using System; using System.Collections.Generic; using System.Drawing; using System.Globalization; using System.Linq; using System.Windows.Forms; -using Nikse.SubtitleEdit.Logic; namespace Nikse.SubtitleEdit.Forms { @@ -467,4 +467,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/VideoPlayerUndocked.cs b/src/Forms/VideoPlayerUndocked.cs index d33f6a5cb..76671111e 100644 --- a/src/Forms/VideoPlayerUndocked.cs +++ b/src/Forms/VideoPlayerUndocked.cs @@ -168,4 +168,4 @@ namespace Nikse.SubtitleEdit.Forms this.Refresh(); } } -} \ No newline at end of file +} diff --git a/src/Forms/VisualSync.cs b/src/Forms/VisualSync.cs index 049095a93..fc4d7ba55 100644 --- a/src/Forms/VisualSync.cs +++ b/src/Forms/VisualSync.cs @@ -770,4 +770,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/VobSubEditCharacters.cs b/src/Forms/VobSubEditCharacters.cs index f9897e0f0..041662923 100644 --- a/src/Forms/VobSubEditCharacters.cs +++ b/src/Forms/VobSubEditCharacters.cs @@ -621,4 +621,4 @@ namespace Nikse.SubtitleEdit.Forms } } } -} \ No newline at end of file +} diff --git a/src/Forms/VobSubNOcrCharacterInspect.cs b/src/Forms/VobSubNOcrCharacterInspect.cs index 0aff96861..92d25bce6 100644 --- a/src/Forms/VobSubNOcrCharacterInspect.cs +++ b/src/Forms/VobSubNOcrCharacterInspect.cs @@ -297,4 +297,4 @@ namespace Nikse.SubtitleEdit.Forms form.ShowDialog(this); } } -} \ No newline at end of file +} diff --git a/src/Forms/VobSubOcr.cs b/src/Forms/VobSubOcr.cs index 0bf897e39..0b8b8dc97 100644 --- a/src/Forms/VobSubOcr.cs +++ b/src/Forms/VobSubOcr.cs @@ -5588,7 +5588,6 @@ namespace Nikse.SubtitleEdit.Forms //} //Text = (ts / _elapseds.Count).ToString(); // display ms in win title bar - _lastLine = text; text = text.Replace("-", "-"); @@ -7951,7 +7950,6 @@ namespace Nikse.SubtitleEdit.Forms Configuration.Settings.VobSubOcr.LastBinaryImageSpellCheck = comboBoxDictionaries.SelectedItem.ToString(); } - if (_bluRaySubtitlesOriginal != null) Configuration.Settings.VobSubOcr.BlurayAllowDifferenceInPercent = (double)numericUpDownMaxErrorPct.Value; else @@ -8616,4 +8614,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Forms/VobSubOcrCharacter.cs b/src/Forms/VobSubOcrCharacter.cs index ec7651950..b01d2eda7 100644 --- a/src/Forms/VobSubOcrCharacter.cs +++ b/src/Forms/VobSubOcrCharacter.cs @@ -252,4 +252,4 @@ namespace Nikse.SubtitleEdit.Forms textBoxCharacters.Text = dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString(); } } -} \ No newline at end of file +} diff --git a/src/Forms/VobSubOcrNOcrCharacter.cs b/src/Forms/VobSubOcrNOcrCharacter.cs index dbd59a65f..70f5054bf 100644 --- a/src/Forms/VobSubOcrNOcrCharacter.cs +++ b/src/Forms/VobSubOcrNOcrCharacter.cs @@ -749,4 +749,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} \ No newline at end of file +} diff --git a/src/Languages/ar-EG.xml b/src/Languages/ar-EG.xml index 82db1acb4..5f2e27c10 100644 --- a/src/Languages/ar-EG.xml +++ b/src/Languages/ar-EG.xml @@ -1249,4 +1249,4 @@ Keep changes? عرض شكل الموجة فقط عرض الفيديو فقط - \ No newline at end of file + diff --git a/src/Languages/bg-BG.xml b/src/Languages/bg-BG.xml index 7d00670af..8c33ac3e5 100644 --- a/src/Languages/bg-BG.xml +++ b/src/Languages/bg-BG.xml @@ -2105,4 +2105,4 @@ Email: mailto:nikse.dk@gmail.com WebVTT - задаване на нов глас Име на гласа - \ No newline at end of file + diff --git a/src/Languages/ca-ES.xml b/src/Languages/ca-ES.xml index 32558aa38..6ce9ec984 100644 --- a/src/Languages/ca-ES.xml +++ b/src/Languages/ca-ES.xml @@ -2099,4 +2099,4 @@ Email: mailto:nikse.dk@gmail.com WebVTT - estableix veu nova Nom de veu - \ No newline at end of file + diff --git a/src/Languages/cs-CZ.xml b/src/Languages/cs-CZ.xml index 3e059add5..4071b221b 100644 --- a/src/Languages/cs-CZ.xml +++ b/src/Languages/cs-CZ.xml @@ -2116,4 +2116,4 @@ Zachovat změny? WebVTT - nastavit nový hlas Název hlasu - \ No newline at end of file + diff --git a/src/Languages/da-DK.xml b/src/Languages/da-DK.xml index 020fa3379..214b01ff2 100644 --- a/src/Languages/da-DK.xml +++ b/src/Languages/da-DK.xml @@ -2116,4 +2116,4 @@ kan redigere i samme undertekst fil (fælles online projekt) WebVTT - angiv ny stemme Stemme-navn - \ No newline at end of file + diff --git a/src/Languages/de-DE.xml b/src/Languages/de-DE.xml index 3dc7b9aaa..58e5d8af6 100644 --- a/src/Languages/de-DE.xml +++ b/src/Languages/de-DE.xml @@ -2121,4 +2121,4 @@ gleiche Untertiteldatei bearbeiten können (Zusammenarbeit) WebVTT - Neue Sprache Sprachname - \ No newline at end of file + diff --git a/src/Languages/el-GR.xml b/src/Languages/el-GR.xml index b0406e5e3..d88ba1916 100644 --- a/src/Languages/el-GR.xml +++ b/src/Languages/el-GR.xml @@ -1998,4 +1998,4 @@ Email: mailto:nikse.dk@gmail.com WebVTT - καθορισμός νέας φωνής Όνομα φωνής - \ No newline at end of file + diff --git a/src/Languages/es-AR.xml b/src/Languages/es-AR.xml index cef95ad02..11fd99fbf 100644 --- a/src/Languages/es-AR.xml +++ b/src/Languages/es-AR.xml @@ -1931,4 +1931,4 @@ puede editar el mismo archivo de subtítulo (colaboración) WebVTT - establecer nueva voz Nombre de la voz - \ No newline at end of file + diff --git a/src/Languages/es-ES.xml b/src/Languages/es-ES.xml index f3ec7c429..93504bba2 100644 --- a/src/Languages/es-ES.xml +++ b/src/Languages/es-ES.xml @@ -1257,4 +1257,4 @@ puede editar el mismo archivo de subtítulo (colaboración) Mostrar solo forma de onda Mostrar solo espectrograma - \ No newline at end of file + diff --git a/src/Languages/es-MX.xml b/src/Languages/es-MX.xml index 1deaae529..859877be7 100644 --- a/src/Languages/es-MX.xml +++ b/src/Languages/es-MX.xml @@ -2023,4 +2023,4 @@ puedan editar el mismo archivo de subtítulo (colaboración) WebVTT - fijar nueva voz Nombre de la voz - \ No newline at end of file + diff --git a/src/Languages/eu-ES.xml b/src/Languages/eu-ES.xml index be56c997b..2b2a70ce7 100644 --- a/src/Languages/eu-ES.xml +++ b/src/Languages/eu-ES.xml @@ -2102,4 +2102,4 @@ Gorde aldaketak? WebVTT - ezarri ahots berria Ahotsaren izena - \ No newline at end of file + diff --git a/src/Languages/fa-IR.xml b/src/Languages/fa-IR.xml index bc30890e1..e0f1a01de 100644 --- a/src/Languages/fa-IR.xml +++ b/src/Languages/fa-IR.xml @@ -1279,4 +1279,4 @@ http://soft98.ir فقط نمایش شکل موج فقط نمایش طیف نگار - \ No newline at end of file + diff --git a/src/Languages/fi-FI.xml b/src/Languages/fi-FI.xml index 9c08249e8..baa3b9596 100644 --- a/src/Languages/fi-FI.xml +++ b/src/Languages/fi-FI.xml @@ -2060,4 +2060,4 @@ Haluatko aloittaa asiakirjan alusta ja hakea kerran vielä? NettiVTT - aseta uusi ääni Äänen nimi - \ No newline at end of file + diff --git a/src/Languages/fr-FR.xml b/src/Languages/fr-FR.xml index aabcb1294..a51234294 100644 --- a/src/Languages/fr-FR.xml +++ b/src/Languages/fr-FR.xml @@ -2126,4 +2126,4 @@ peuvent modifier le même fichier de sous-titres (collaboration) Web VTT – Définir l’interprète Interprète du dialogue - \ No newline at end of file + diff --git a/src/Languages/hr-HR.xml b/src/Languages/hr-HR.xml index a1c4565a1..93d23a693 100644 --- a/src/Languages/hr-HR.xml +++ b/src/Languages/hr-HR.xml @@ -2094,4 +2094,4 @@ određeni podnaslov s drugim ljudima. WebVTT - postavi novi glas Naziv glasa - \ No newline at end of file + diff --git a/src/Languages/hu-HU.xml b/src/Languages/hu-HU.xml index 901b5c902..c90649c2a 100644 --- a/src/Languages/hu-HU.xml +++ b/src/Languages/hu-HU.xml @@ -2106,4 +2106,4 @@ Megtartja a változásokat? WebVTT - új hang beállítása Hang neve - \ No newline at end of file + diff --git a/src/Languages/it-IT.xml b/src/Languages/it-IT.xml index 24ba9355a..a28346b58 100644 --- a/src/Languages/it-IT.xml +++ b/src/Languages/it-IT.xml @@ -2088,4 +2088,4 @@ Mantenere le modifiche? WebVTT - imposta nuova voce Nome per la voce - \ No newline at end of file + diff --git a/src/Languages/ja-JP.xml b/src/Languages/ja-JP.xml index 3d7f69b26..189dba032 100644 --- a/src/Languages/ja-JP.xml +++ b/src/Languages/ja-JP.xml @@ -1683,4 +1683,4 @@ C# ソース コードは https://github.com/SubtitleEdit/subtitleedit にあり ミリ秒 その他 - \ No newline at end of file + diff --git a/src/Languages/ko-KR.xml b/src/Languages/ko-KR.xml index 8e190b192..d1822b41f 100644 --- a/src/Languages/ko-KR.xml +++ b/src/Languages/ko-KR.xml @@ -2118,4 +2118,4 @@ C# 코드는 https://github.com/SubtitleEdit/subtitleedit 에 있습니다. WebVTT - 새로운 음성 설정 음성 이름 - \ No newline at end of file + diff --git a/src/Languages/nl-NL.xml b/src/Languages/nl-NL.xml index bde85e77c..2d3db32a4 100644 --- a/src/Languages/nl-NL.xml +++ b/src/Languages/nl-NL.xml @@ -2120,4 +2120,4 @@ Wijzigingen behouden? WebVTT - installeer nieuwe stem Naam van de stem - \ No newline at end of file + diff --git a/src/Languages/pl-PL.xml b/src/Languages/pl-PL.xml index 70f6bf387..43da205fd 100644 --- a/src/Languages/pl-PL.xml +++ b/src/Languages/pl-PL.xml @@ -2121,4 +2121,4 @@ Utrzymać te zmiany? Ustaw nowy głos - WebVTT Nazwa głosu - \ No newline at end of file + diff --git a/src/Languages/pt-BR.xml b/src/Languages/pt-BR.xml index 0bf6f47e2..4a7b1d853 100644 --- a/src/Languages/pt-BR.xml +++ b/src/Languages/pt-BR.xml @@ -2099,4 +2099,4 @@ Manter as alterações? WebVTT - definir nova voz Nome da voz - \ No newline at end of file + diff --git a/src/Languages/pt-PT.xml b/src/Languages/pt-PT.xml index 4d1e2fdb1..d7e58b542 100644 --- a/src/Languages/pt-PT.xml +++ b/src/Languages/pt-PT.xml @@ -2123,4 +2123,4 @@ Manter as alterações? WebVTT - definir nova voz Nome da voz - \ No newline at end of file + diff --git a/src/Languages/ro-RO.xml b/src/Languages/ro-RO.xml index 924269270..7d857abed 100644 --- a/src/Languages/ro-RO.xml +++ b/src/Languages/ro-RO.xml @@ -2108,4 +2108,4 @@ Păstrezi schimbările? WebVTT - setare voce nouă Denumirea vocii - \ No newline at end of file + diff --git a/src/Languages/ru-RU.xml b/src/Languages/ru-RU.xml index b28c41d29..9374a4132 100644 --- a/src/Languages/ru-RU.xml +++ b/src/Languages/ru-RU.xml @@ -2136,4 +2136,4 @@ https://github.com/SubtitleEdit/subtitleedit WebVTT - установить новый голос Имя голоса - \ No newline at end of file + diff --git a/src/Languages/sl-SI.xml b/src/Languages/sl-SI.xml index 59c7c75fd..b7424a8a6 100644 --- a/src/Languages/sl-SI.xml +++ b/src/Languages/sl-SI.xml @@ -1961,4 +1961,4 @@ Ohranim spremembe? WebVTT - nastavi nov glagolski način Ime glagolskega načina - \ No newline at end of file + diff --git a/src/Languages/sr-Cyrl-RS.xml b/src/Languages/sr-Cyrl-RS.xml index 911d63b4f..bbf3df85f 100644 --- a/src/Languages/sr-Cyrl-RS.xml +++ b/src/Languages/sr-Cyrl-RS.xml @@ -1239,4 +1239,4 @@ Прикажи само таласни облик Прикажи само спектрограм - \ No newline at end of file + diff --git a/src/Languages/sr-Latn-RS.xml b/src/Languages/sr-Latn-RS.xml index fa0a4526d..a0a8dbd6f 100644 --- a/src/Languages/sr-Latn-RS.xml +++ b/src/Languages/sr-Latn-RS.xml @@ -1684,4 +1684,4 @@ određeni prevod s drugim ljudima. Milisekundi Ostalo - \ No newline at end of file + diff --git a/src/Languages/sv-SE.xml b/src/Languages/sv-SE.xml index e7fe62718..1e624d50a 100644 --- a/src/Languages/sv-SE.xml +++ b/src/Languages/sv-SE.xml @@ -1992,4 +1992,4 @@ kan redigera i samma textningsfil (samarbete) WebVTT - set ny röst Namn av röst - \ No newline at end of file + diff --git a/src/Languages/th-TH.xml b/src/Languages/th-TH.xml index fb5921100..27304755e 100644 --- a/src/Languages/th-TH.xml +++ b/src/Languages/th-TH.xml @@ -2006,4 +2006,4 @@ WebVTT - กำหนดเสียงใหม่ ตั้งชื่อของเสียง - \ No newline at end of file + diff --git a/src/Languages/tr-TR.xml b/src/Languages/tr-TR.xml index 852a5e391..951db2157 100644 --- a/src/Languages/tr-TR.xml +++ b/src/Languages/tr-TR.xml @@ -2020,4 +2020,4 @@ Değişiklikler saklansın mı? WebVTT - yeni ses ayarla Yeni sesin adı - \ No newline at end of file + diff --git a/src/Languages/uk-UA.xml b/src/Languages/uk-UA.xml index a2c3b68ee..8ac804573 100644 --- a/src/Languages/uk-UA.xml +++ b/src/Languages/uk-UA.xml @@ -2108,4 +2108,4 @@ Email: mailto:nikse.dk@gmail.com WebVTT - встановити новий голос Назва голосу - \ No newline at end of file + diff --git a/src/Languages/vi-VN.xml b/src/Languages/vi-VN.xml index e18af6b02..5cb3472a9 100644 --- a/src/Languages/vi-VN.xml +++ b/src/Languages/vi-VN.xml @@ -1696,4 +1696,4 @@ có thể chỉnh sửa trong cùng một tập tin phụ đề (hợp tác vớ ms Khác - \ No newline at end of file + diff --git a/src/Languages/zh-Hans.xml b/src/Languages/zh-Hans.xml index 59a1ec119..de10a97ec 100644 --- a/src/Languages/zh-Hans.xml +++ b/src/Languages/zh-Hans.xml @@ -2082,4 +2082,4 @@ Command line: {1} {2} WebVTT - 设定新人声 人声名称 - \ No newline at end of file + diff --git a/src/Languages/zh-tw.xml b/src/Languages/zh-tw.xml index 73f8f8c2c..cb3280a5e 100644 --- a/src/Languages/zh-tw.xml +++ b/src/Languages/zh-tw.xml @@ -1997,4 +1997,4 @@ C# 原始碼可從 https://github.com/SubtitleEdit/subtitleedit 取得。 WebVTT - 設定新的語音 語音名稱 - \ No newline at end of file + diff --git a/src/Logic/ColorChooser/ColorChangedEventArgs.cs b/src/Logic/ColorChooser/ColorChangedEventArgs.cs index 1ae5692c6..1f7a350b0 100644 --- a/src/Logic/ColorChooser/ColorChangedEventArgs.cs +++ b/src/Logic/ColorChooser/ColorChangedEventArgs.cs @@ -35,4 +35,4 @@ namespace Nikse.SubtitleEdit.Logic.ColorChooser public ColorHandler.HSV HSV { get; private set; } } -} \ No newline at end of file +} diff --git a/src/Logic/ColorChooser/ColorHandler.cs b/src/Logic/ColorChooser/ColorHandler.cs index cc783e9a5..29f44a5ca 100644 --- a/src/Logic/ColorChooser/ColorHandler.cs +++ b/src/Logic/ColorChooser/ColorHandler.cs @@ -254,4 +254,4 @@ namespace Nikse.SubtitleEdit.Logic.ColorChooser #endregion Nested type: HSV } -} \ No newline at end of file +} diff --git a/src/Logic/ColorChooser/ColorWheel.cs b/src/Logic/ColorChooser/ColorWheel.cs index 0ce909fc3..15558746a 100644 --- a/src/Logic/ColorChooser/ColorWheel.cs +++ b/src/Logic/ColorChooser/ColorWheel.cs @@ -598,4 +598,4 @@ namespace Nikse.SubtitleEdit.Logic.ColorChooser } } -} \ No newline at end of file +} diff --git a/src/Logic/CommandLineConvert.cs b/src/Logic/CommandLineConvert.cs index ee75be035..ed10f0465 100644 --- a/src/Logic/CommandLineConvert.cs +++ b/src/Logic/CommandLineConvert.cs @@ -1,13 +1,13 @@ -using System.Globalization; -using Nikse.SubtitleEdit.Core; +using Nikse.SubtitleEdit.Core; +using Nikse.SubtitleEdit.Core.BluRaySup; using Nikse.SubtitleEdit.Core.ContainerFormats.Matroska; using Nikse.SubtitleEdit.Core.SubtitleFormats; using Nikse.SubtitleEdit.Forms; using System; using System.Collections.Generic; +using System.Globalization; using System.IO; using System.Text; -using Nikse.SubtitleEdit.Core.BluRaySup; namespace Nikse.SubtitleEdit.Logic { @@ -484,7 +484,6 @@ namespace Nikse.SubtitleEdit.Logic } } - /// /// Gets a argument from the command line /// @@ -802,4 +801,4 @@ namespace Nikse.SubtitleEdit.Logic } } -} \ No newline at end of file +} diff --git a/src/Logic/FindReplaceDialogHelper.cs b/src/Logic/FindReplaceDialogHelper.cs index 34c94cec2..4abd21779 100644 --- a/src/Logic/FindReplaceDialogHelper.cs +++ b/src/Logic/FindReplaceDialogHelper.cs @@ -1,8 +1,8 @@ -using System; +using Nikse.SubtitleEdit.Core; +using Nikse.SubtitleEdit.Core.Enums; +using System; using System.Text.RegularExpressions; using System.Windows.Forms; -using Nikse.SubtitleEdit.Core; -using Nikse.SubtitleEdit.Core.Enums; namespace Nikse.SubtitleEdit.Logic { @@ -309,4 +309,4 @@ namespace Nikse.SubtitleEdit.Logic } } -} \ No newline at end of file +} diff --git a/src/Logic/Networking/NikseWebServiceSession.cs b/src/Logic/Networking/NikseWebServiceSession.cs index aeec9f7dc..4e6882e33 100644 --- a/src/Logic/Networking/NikseWebServiceSession.cs +++ b/src/Logic/Networking/NikseWebServiceSession.cs @@ -1,8 +1,8 @@ -using System; +using Nikse.SubtitleEdit.Core; +using System; using System.Collections.Generic; using System.Net; using System.Text; -using Nikse.SubtitleEdit.Core; namespace Nikse.SubtitleEdit.Logic.Networking { @@ -382,4 +382,4 @@ namespace Nikse.SubtitleEdit.Logic.Networking } } -} \ No newline at end of file +} diff --git a/src/Logic/Networking/UpdateLogEntry.cs b/src/Logic/Networking/UpdateLogEntry.cs index c6af4a375..f5790d4e3 100644 --- a/src/Logic/Networking/UpdateLogEntry.cs +++ b/src/Logic/Networking/UpdateLogEntry.cs @@ -25,4 +25,4 @@ namespace Nikse.SubtitleEdit.Logic.Networking } } -} \ No newline at end of file +} diff --git a/src/Logic/NikseBitmapImageSplitter.cs b/src/Logic/NikseBitmapImageSplitter.cs index c714a2450..2d240eef9 100644 --- a/src/Logic/NikseBitmapImageSplitter.cs +++ b/src/Logic/NikseBitmapImageSplitter.cs @@ -1,7 +1,7 @@ -using System; +using Nikse.SubtitleEdit.Core; +using System; using System.Collections.Generic; using System.Drawing; -using Nikse.SubtitleEdit.Core; namespace Nikse.SubtitleEdit.Logic { diff --git a/src/Logic/OCR/Binary/BinaryOcrBitmap.cs b/src/Logic/OCR/Binary/BinaryOcrBitmap.cs index 5ea2dd758..b253709ba 100644 --- a/src/Logic/OCR/Binary/BinaryOcrBitmap.cs +++ b/src/Logic/OCR/Binary/BinaryOcrBitmap.cs @@ -1,9 +1,9 @@ -using System; +using Nikse.SubtitleEdit.Core; +using Nikse.SubtitleEdit.Core.VobSub; +using System; using System.Collections.Generic; using System.Drawing; using System.IO; -using Nikse.SubtitleEdit.Core; -using Nikse.SubtitleEdit.Core.VobSub; namespace Nikse.SubtitleEdit.Logic.Ocr.Binary { @@ -294,4 +294,4 @@ namespace Nikse.SubtitleEdit.Logic.Ocr.Binary } } -} \ No newline at end of file +} diff --git a/src/Logic/OCR/Binary/BinaryOcrDb.cs b/src/Logic/OCR/Binary/BinaryOcrDb.cs index f3f3b10f3..465ab833c 100644 --- a/src/Logic/OCR/Binary/BinaryOcrDb.cs +++ b/src/Logic/OCR/Binary/BinaryOcrDb.cs @@ -38,7 +38,7 @@ namespace Nikse.SubtitleEdit.Logic.Ocr.Binary if (bob.ExpandCount == 0) System.Windows.Forms.MessageBox.Show("Ups, not expanded image in CompareImagesExpanded!"); bob.Save(gz); - if (bob.ExpandedList.Count != bob.ExpandCount -1) + if (bob.ExpandedList.Count != bob.ExpandCount - 1) { throw new Exception("BinaryOcrDb.Save: Expanded image should have " + (bob.ExpandCount - 1) + " sub images"); } @@ -130,8 +130,8 @@ namespace Nikse.SubtitleEdit.Logic.Ocr.Binary int index; if (bob.ExpandCount > 0) { - if (bob.ExpandedList == null || bob.ExpandCount -1 != bob.ExpandedList.Count ) - throw new Exception("BinaryOcrDb.Add: There should be " + (bob.ExpandCount -1) + " sub image(s)"); + if (bob.ExpandedList == null || bob.ExpandCount - 1 != bob.ExpandedList.Count) + throw new Exception("BinaryOcrDb.Add: There should be " + (bob.ExpandCount - 1) + " sub image(s)"); if (bob.ExpandedList[0].Text != null) throw new Exception("BinaryOcrDb.Add: sub image should have null text"); @@ -153,7 +153,7 @@ namespace Nikse.SubtitleEdit.Logic.Ocr.Binary if (!allAlike) CompareImagesExpanded.Add(bob); else - throw new Exception("BinaryOcrDb.Add: Expanded image already in db!"); + throw new Exception("BinaryOcrDb.Add: Expanded image already in db!"); } } else @@ -168,4 +168,4 @@ namespace Nikse.SubtitleEdit.Logic.Ocr.Binary } } -} \ No newline at end of file +} diff --git a/src/Logic/OCR/ModiLanguage.cs b/src/Logic/OCR/ModiLanguage.cs index 98b9589a4..3a00e439c 100644 --- a/src/Logic/OCR/ModiLanguage.cs +++ b/src/Logic/OCR/ModiLanguage.cs @@ -45,4 +45,4 @@ namespace Nikse.SubtitleEdit.Logic.Ocr } } } -} \ No newline at end of file +} diff --git a/src/Logic/OCR/NOcrChar.cs b/src/Logic/OCR/NOcrChar.cs index 429420b73..4e6723732 100644 --- a/src/Logic/OCR/NOcrChar.cs +++ b/src/Logic/OCR/NOcrChar.cs @@ -168,4 +168,4 @@ namespace Nikse.SubtitleEdit.Logic.Ocr } } -} \ No newline at end of file +} diff --git a/src/Logic/OCR/NOcrDb.cs b/src/Logic/OCR/NOcrDb.cs index 294c808ad..e6257a3d4 100644 --- a/src/Logic/OCR/NOcrDb.cs +++ b/src/Logic/OCR/NOcrDb.cs @@ -1,9 +1,9 @@ -using System; +using Nikse.SubtitleEdit.Core; +using System; using System.Collections.Generic; using System.Drawing; using System.IO; using System.IO.Compression; -using Nikse.SubtitleEdit.Core; namespace Nikse.SubtitleEdit.Logic.Ocr { @@ -154,4 +154,4 @@ namespace Nikse.SubtitleEdit.Logic.Ocr } } -} \ No newline at end of file +} diff --git a/src/Logic/OCR/NOcrPoint.cs b/src/Logic/OCR/NOcrPoint.cs index 63da695a4..509506a1b 100644 --- a/src/Logic/OCR/NOcrPoint.cs +++ b/src/Logic/OCR/NOcrPoint.cs @@ -103,4 +103,4 @@ namespace Nikse.SubtitleEdit.Logic.Ocr return new Point((int)Math.Round(End.X * 100.0 / ocrChar.Width * width / 100.0), (int)Math.Round(End.Y * 100.0 / ocrChar.Height * height / 100.0)); } } -} \ No newline at end of file +} diff --git a/src/Logic/OCR/OcrAlphabet.cs b/src/Logic/OCR/OcrAlphabet.cs index 7f7baab69..f4a3289e7 100644 --- a/src/Logic/OCR/OcrAlphabet.cs +++ b/src/Logic/OCR/OcrAlphabet.cs @@ -44,4 +44,4 @@ namespace Nikse.SubtitleEdit.Logic.Ocr } } -} \ No newline at end of file +} diff --git a/src/Logic/OCR/OcrCharacter.cs b/src/Logic/OCR/OcrCharacter.cs index b377d98b6..8edf9a436 100644 --- a/src/Logic/OCR/OcrCharacter.cs +++ b/src/Logic/OCR/OcrCharacter.cs @@ -13,4 +13,4 @@ namespace Nikse.SubtitleEdit.Logic.Ocr OcrImages = new List(); } } -} \ No newline at end of file +} diff --git a/src/Logic/OCR/OcrFixEngine.cs b/src/Logic/OCR/OcrFixEngine.cs index 1d4804524..cd6a0974d 100644 --- a/src/Logic/OCR/OcrFixEngine.cs +++ b/src/Logic/OCR/OcrFixEngine.cs @@ -1415,4 +1415,4 @@ namespace Nikse.SubtitleEdit.Logic.Ocr } } -} \ No newline at end of file +} diff --git a/src/Logic/OCR/OcrImage.cs b/src/Logic/OCR/OcrImage.cs index 2b0ad74b8..6df23a5da 100644 --- a/src/Logic/OCR/OcrImage.cs +++ b/src/Logic/OCR/OcrImage.cs @@ -34,4 +34,4 @@ namespace Nikse.SubtitleEdit.Logic.Ocr return data; } } -} \ No newline at end of file +} diff --git a/src/Logic/SpellCheck/Hunspell.cs b/src/Logic/SpellCheck/Hunspell.cs index 26062f8e0..c412e3e36 100644 --- a/src/Logic/SpellCheck/Hunspell.cs +++ b/src/Logic/SpellCheck/Hunspell.cs @@ -1,6 +1,6 @@ -using System; +using Nikse.SubtitleEdit.Core; +using System; using System.Collections.Generic; -using Nikse.SubtitleEdit.Core; namespace Nikse.SubtitleEdit.Logic.SpellCheck { diff --git a/src/Logic/UiEbuSaveHelper.cs b/src/Logic/UiEbuSaveHelper.cs index d007f2c4f..77070f304 100644 --- a/src/Logic/UiEbuSaveHelper.cs +++ b/src/Logic/UiEbuSaveHelper.cs @@ -37,4 +37,4 @@ namespace Nikse.SubtitleEdit.Logic } } -} \ No newline at end of file +} diff --git a/src/Logic/UiUtil.cs b/src/Logic/UiUtil.cs index fc7b7eada..ecaf3e872 100644 --- a/src/Logic/UiUtil.cs +++ b/src/Logic/UiUtil.cs @@ -1,13 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Text; -using Nikse.SubtitleEdit.Controls; +using Nikse.SubtitleEdit.Controls; using Nikse.SubtitleEdit.Core; using Nikse.SubtitleEdit.Core.SubtitleFormats; using Nikse.SubtitleEdit.Forms; using Nikse.SubtitleEdit.Logic.VideoPlayers; +using System; +using System.Collections.Generic; +using System.Drawing; using System.IO; +using System.Text; using System.Windows.Forms; namespace Nikse.SubtitleEdit.Logic @@ -309,7 +309,6 @@ namespace Nikse.SubtitleEdit.Logic control.Height = newHeight; } - public static void InitializeSubtitleFont(Control control) { var gs = Configuration.Settings.General; @@ -395,4 +394,4 @@ namespace Nikse.SubtitleEdit.Logic } } -} \ No newline at end of file +} diff --git a/src/Logic/VideoPlayers/LibVlcDynamic.cs b/src/Logic/VideoPlayers/LibVlcDynamic.cs index 94946e467..60e65dc9a 100644 --- a/src/Logic/VideoPlayers/LibVlcDynamic.cs +++ b/src/Logic/VideoPlayers/LibVlcDynamic.cs @@ -153,7 +153,6 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers private delegate int libvlc_video_set_spu(IntPtr mediaPlayer, int trackNumber); private libvlc_video_set_spu _libvlc_video_set_spu; - //[UnmanagedFunctionPointer(CallingConvention.Cdecl)] //public unsafe delegate void* LockEventHandler(void* opaque, void** plane); @@ -238,7 +237,7 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers private bool IsAllMethodsLoaded() { return _libvlc_new != null && - //_libvlc_get_version != null && + //_libvlc_get_version != null && _libvlc_release != null && _libvlc_media_new_path != null && _libvlc_media_player_new_from_media != null && @@ -248,12 +247,12 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers _libvlc_audio_set_volume != null && _libvlc_media_player_play != null && _libvlc_media_player_stop != null && - //_libvlc_media_player_pause != null && + //_libvlc_media_player_pause != null && _libvlc_media_player_set_hwnd != null && _libvlc_media_player_is_playing != null && _libvlc_media_player_get_time != null && _libvlc_media_player_set_time != null && - //_libvlc_media_player_get_fps != null && + //_libvlc_media_player_get_fps != null && _libvlc_media_player_get_state != null && _libvlc_media_player_get_length != null && _libvlc_media_player_release != null && @@ -805,4 +804,4 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers } } -} \ No newline at end of file +} diff --git a/src/Logic/VideoPlayers/LibVlcMono.cs b/src/Logic/VideoPlayers/LibVlcMono.cs index 8ccd11fec..7dac7bb47 100644 --- a/src/Logic/VideoPlayers/LibVlcMono.cs +++ b/src/Logic/VideoPlayers/LibVlcMono.cs @@ -1,7 +1,7 @@ -using System; +using Nikse.SubtitleEdit.Core; +using System; using System.Text; using System.Windows.Forms; -using Nikse.SubtitleEdit.Core; namespace Nikse.SubtitleEdit.Logic.VideoPlayers { diff --git a/src/Logic/VideoPlayers/MPlayer.cs b/src/Logic/VideoPlayers/MPlayer.cs index 7f0e49ab5..ba443584d 100644 --- a/src/Logic/VideoPlayers/MPlayer.cs +++ b/src/Logic/VideoPlayers/MPlayer.cs @@ -1,9 +1,9 @@ -using System; +using Nikse.SubtitleEdit.Core; +using System; using System.Diagnostics; using System.Globalization; using System.IO; using System.Windows.Forms; -using Nikse.SubtitleEdit.Core; namespace Nikse.SubtitleEdit.Logic.VideoPlayers { @@ -33,6 +33,7 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers } private float _volume; + public override int Volume { get @@ -55,6 +56,7 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers } private double _timePosition; + public override double CurrentPosition { get @@ -414,4 +416,4 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers } } -} \ No newline at end of file +} diff --git a/src/Logic/VideoPlayers/ManagedDirectXPlayer.cs b/src/Logic/VideoPlayers/ManagedDirectXPlayer.cs index 012320775..ce1b1fa1e 100644 --- a/src/Logic/VideoPlayers/ManagedDirectXPlayer.cs +++ b/src/Logic/VideoPlayers/ManagedDirectXPlayer.cs @@ -160,4 +160,4 @@ // ((IDisposable)player).Dispose(); // } // } -//} \ No newline at end of file +//} diff --git a/src/Logic/VideoPlayers/MpcHC/MpcHc.cs b/src/Logic/VideoPlayers/MpcHC/MpcHc.cs index 1883065ce..df0ef67f2 100644 --- a/src/Logic/VideoPlayers/MpcHC/MpcHc.cs +++ b/src/Logic/VideoPlayers/MpcHC/MpcHc.cs @@ -38,6 +38,7 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers.MpcHC } private int _volume = 75; + public override int Volume { get diff --git a/src/Logic/VideoPlayers/MpcHC/NativeMethods.cs b/src/Logic/VideoPlayers/MpcHC/NativeMethods.cs index a95c6eb5c..87c6d78b9 100644 --- a/src/Logic/VideoPlayers/MpcHC/NativeMethods.cs +++ b/src/Logic/VideoPlayers/MpcHC/NativeMethods.cs @@ -152,4 +152,4 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers.MpcHC #endregion Win32 API } -} \ No newline at end of file +} diff --git a/src/Logic/VideoPlayers/QuartsPlayer.cs b/src/Logic/VideoPlayers/QuartsPlayer.cs index 54e96cddb..5cf85d87c 100644 --- a/src/Logic/VideoPlayers/QuartsPlayer.cs +++ b/src/Logic/VideoPlayers/QuartsPlayer.cs @@ -1,9 +1,9 @@ -using System; +using Nikse.SubtitleEdit.Core; +using QuartzTypeLib; +using System; +using System.ComponentModel; using System.Runtime.InteropServices; using System.Windows.Forms; -using Nikse.SubtitleEdit.Core; -using QuartzTypeLib; -using System.ComponentModel; //http://msdn.microsoft.com/en-us/library/dd375454%28VS.85%29.aspx //http://msdn.microsoft.com/en-us/library/dd387928%28v=vs.85%29.aspx @@ -337,4 +337,4 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers } } -} \ No newline at end of file +} diff --git a/src/Logic/WordSpellChecker.cs b/src/Logic/WordSpellChecker.cs index d9751cd27..18078498f 100644 --- a/src/Logic/WordSpellChecker.cs +++ b/src/Logic/WordSpellChecker.cs @@ -1,8 +1,8 @@ -using System; +using Nikse.SubtitleEdit.Forms; +using System; using System.Reflection; -using System.Windows.Forms; -using Nikse.SubtitleEdit.Forms; using System.Runtime.InteropServices; +using System.Windows.Forms; namespace Nikse.SubtitleEdit.Logic { diff --git a/src/Program.cs b/src/Program.cs index 58ff6c285..aacd42190 100644 --- a/src/Program.cs +++ b/src/Program.cs @@ -1,8 +1,8 @@ -using System; +using Nikse.SubtitleEdit.Forms; +using System; using System.Diagnostics; using System.Threading; using System.Windows.Forms; -using Nikse.SubtitleEdit.Forms; namespace Nikse.SubtitleEdit { @@ -98,4 +98,4 @@ namespace Nikse.SubtitleEdit } } -} \ No newline at end of file +} diff --git a/src/Resources/HunspellDictionaries.xml b/src/Resources/HunspellDictionaries.xml index 193ef9e79..80c1156b5 100644 --- a/src/Resources/HunspellDictionaries.xml +++ b/src/Resources/HunspellDictionaries.xml @@ -366,4 +366,4 @@ http://ftp.nluug.nl/office/openoffice/contrib/dictionaries/zu_ZA.zip Zulu spell checker - \ No newline at end of file + diff --git a/src/Resources/OpenOfficeDictionaries.xml b/src/Resources/OpenOfficeDictionaries.xml index 39eac676b..ea9f8af72 100644 --- a/src/Resources/OpenOfficeDictionaries.xml +++ b/src/Resources/OpenOfficeDictionaries.xml @@ -347,4 +347,4 @@ http://downloads.sourceforge.net/project/aoo-extensions/917/3/vi_spellchecker_ooo3.oxt?r=http%3A%2F%2Fextensions.services.openoffice.org%2Fen%2Fproject%2Fvietnamese-spellchecker&ts=1373917708&use_mirror=kent Vietnamese SpellChecker - \ No newline at end of file + diff --git a/src/Resources/TesseractDictionaries.xml b/src/Resources/TesseractDictionaries.xml index 98319e899..1fdf49428 100644 --- a/src/Resources/TesseractDictionaries.xml +++ b/src/Resources/TesseractDictionaries.xml @@ -163,4 +163,4 @@ http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.vie.tar.gz Vietnamese Language Data for Tesseract 3.02 - \ No newline at end of file + diff --git a/src/Test/Core/LanguageAutoDetectTest.cs b/src/Test/Core/LanguageAutoDetectTest.cs index b32dc585b..8184c4b07 100644 --- a/src/Test/Core/LanguageAutoDetectTest.cs +++ b/src/Test/Core/LanguageAutoDetectTest.cs @@ -1,7 +1,7 @@ -using System.IO; -using System.Text; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.VisualStudio.TestTools.UnitTesting; using Nikse.SubtitleEdit.Core; +using System.IO; +using System.Text; namespace Test.Core { @@ -34,6 +34,5 @@ namespace Test.Core Assert.AreEqual(languageCode, "da"); } - } } diff --git a/src/Test/Core/StringExtensionsTest.cs b/src/Test/Core/StringExtensionsTest.cs index 2b6508fbd..dc4547b9a 100644 --- a/src/Test/Core/StringExtensionsTest.cs +++ b/src/Test/Core/StringExtensionsTest.cs @@ -1,6 +1,6 @@ -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.VisualStudio.TestTools.UnitTesting; using Nikse.SubtitleEdit.Core; +using System; namespace Test.Core { diff --git a/src/Test/Dictionaries/names_etc.xml b/src/Test/Dictionaries/names_etc.xml index ccab7c3c4..be8df2b77 100644 --- a/src/Test/Dictionaries/names_etc.xml +++ b/src/Test/Dictionaries/names_etc.xml @@ -5589,4 +5589,4 @@ This file is generated/updated by Multi Translator www.filmfix.se zozlow Østrig - \ No newline at end of file + diff --git a/src/Test/FixCommonErrorsTest.cs b/src/Test/FixCommonErrorsTest.cs index b182e4dfb..fdaabb9d0 100644 --- a/src/Test/FixCommonErrorsTest.cs +++ b/src/Test/FixCommonErrorsTest.cs @@ -1,11 +1,11 @@ -using System; -using System.Collections.Generic; -using System.IO; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using Nikse.SubtitleEdit.Core; using Nikse.SubtitleEdit.Core.Forms.FixCommonErrors; using Nikse.SubtitleEdit.Core.SubtitleFormats; using Nikse.SubtitleEdit.Forms; -using Nikse.SubtitleEdit.Core; +using System; +using System.Collections.Generic; +using System.IO; namespace Test { @@ -207,7 +207,6 @@ namespace Test } } - [TestMethod] [DeploymentItem("SubtitleEdit.exe")] public void MergeShortLinesHearingImpaired() @@ -222,8 +221,6 @@ namespace Test Assert.AreEqual(result, expected); Assert.AreEqual(result2, expected2.Replace(Environment.NewLine, " ")); } - - #endregion Merge short lines #region Fix Italics @@ -488,7 +485,6 @@ namespace Test } } - [TestMethod] [DeploymentItem("SubtitleEdit.exe")] public void FixHyphensDontCrash() @@ -502,9 +498,6 @@ namespace Test } } - - - #endregion Fix Hyphens (add dash) #region Fix OCR errors @@ -884,9 +877,6 @@ namespace Test } } - - - #endregion Fix unneeded spaces #region Fix EmptyLines @@ -915,8 +905,7 @@ namespace Test } } - - #endregion + #endregion Fix EmptyLines #region Fix missing periods at end of line @@ -941,7 +930,8 @@ namespace Test new FixMissingPeriodsAtEndOfLine().Fix(s, new EmptyFixCallback()); Assert.AreEqual(s.Paragraphs[0].Text, "The house seemed desolate to me and"); } - #endregion + + #endregion Fix missing periods at end of line #region Start with uppercase after paragraph @@ -1474,7 +1464,7 @@ namespace Test Assert.AreEqual(result4, expected4); } - #endregion + #endregion FixDoubleGreater #region Fix uppercase I inside words @@ -1566,7 +1556,7 @@ namespace Test } } - #endregion + #endregion FixDoubleDash #region Start with upppercase after colon @@ -1613,9 +1603,11 @@ namespace Test Assert.AreEqual("John: Hello world.", _subtitle.Paragraphs[0].Text); } } - #endregion + + #endregion Start with upppercase after colon #region Fix Music Notation + [TestMethod] public void FixMusicNotation1() { @@ -1649,9 +1641,11 @@ namespace Test Assert.AreEqual(string.Format("{0} Hello world. {0}", Configuration.Settings.Tools.MusicSymbol), _subtitle.Paragraphs[0].Text); } } - #endregion + + #endregion Fix Music Notation #region FixFrenchLApostrophe + [TestMethod] public void FixFrenchLApostrophe1() { @@ -1683,6 +1677,7 @@ namespace Test res = Nikse.SubtitleEdit.Logic.Ocr.OcrFixEngine.FixFrenchLApostrophe(res, " l'", "Bye."); Assert.AreEqual("L'Axxxx and" + Environment.NewLine + "l'axxxx", res); } - #endregion + + #endregion FixFrenchLApostrophe } -} \ No newline at end of file +} diff --git a/src/Test/Logic/BluRaySup/BluRaySupParserTest.cs b/src/Test/Logic/BluRaySup/BluRaySupParserTest.cs index 46b1bd7f9..412cbd688 100644 --- a/src/Test/Logic/BluRaySup/BluRaySupParserTest.cs +++ b/src/Test/Logic/BluRaySup/BluRaySupParserTest.cs @@ -1,9 +1,9 @@ -using System; -using System.Drawing; -using System.Text; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.VisualStudio.TestTools.UnitTesting; using Nikse.SubtitleEdit.Core.BluRaySup; +using System; +using System.Drawing; using System.IO; +using System.Text; namespace Test.Logic.BluRaySup { diff --git a/src/Test/Logic/Dictionaries/NamesListTest.cs b/src/Test/Logic/Dictionaries/NamesListTest.cs index 54e4a117c..e88526caf 100644 --- a/src/Test/Logic/Dictionaries/NamesListTest.cs +++ b/src/Test/Logic/Dictionaries/NamesListTest.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using System.IO; using Nikse.SubtitleEdit.Core.Dictionaries; +using System.IO; namespace Test.Logic.Dictionaries { diff --git a/src/Test/Logic/Dictionaries/OcrFixReplaceListTest.cs b/src/Test/Logic/Dictionaries/OcrFixReplaceListTest.cs index e3dde182c..1755ce183 100644 --- a/src/Test/Logic/Dictionaries/OcrFixReplaceListTest.cs +++ b/src/Test/Logic/Dictionaries/OcrFixReplaceListTest.cs @@ -1,7 +1,7 @@ -using System; -using System.IO; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.VisualStudio.TestTools.UnitTesting; using Nikse.SubtitleEdit.Core.Dictionaries; +using System; +using System.IO; namespace Test.Logic.Dictionaries { @@ -210,4 +210,4 @@ namespace Test.Logic.Dictionaries } } -} \ No newline at end of file +} diff --git a/src/Test/Logic/Forms/RemoveTextForHearImpairedTest.cs b/src/Test/Logic/Forms/RemoveTextForHearImpairedTest.cs index bbe7c97c9..296c5f9e8 100644 --- a/src/Test/Logic/Forms/RemoveTextForHearImpairedTest.cs +++ b/src/Test/Logic/Forms/RemoveTextForHearImpairedTest.cs @@ -1,7 +1,6 @@ -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Nikse.SubtitleEdit.Core; +using Microsoft.VisualStudio.TestTools.UnitTesting; using Nikse.SubtitleEdit.Core.Forms; +using System; namespace Test.Logic.Forms { @@ -1532,4 +1531,4 @@ namespace Test.Logic.Forms #endregion Additional test attributes } -} \ No newline at end of file +} diff --git a/src/Test/Logic/LanguageTest.cs b/src/Test/Logic/LanguageTest.cs index ea85bff0b..d2d3229a3 100644 --- a/src/Test/Logic/LanguageTest.cs +++ b/src/Test/Logic/LanguageTest.cs @@ -1,9 +1,9 @@ -using System; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using Nikse.SubtitleEdit.Core; +using System; using System.Collections.Generic; using System.IO; using System.Xml; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Nikse.SubtitleEdit.Core; namespace Test.Logic { diff --git a/src/Test/Logic/Mp4/Mp4Test.cs b/src/Test/Logic/Mp4/Mp4Test.cs index aa3ce2b21..b58239b12 100644 --- a/src/Test/Logic/Mp4/Mp4Test.cs +++ b/src/Test/Logic/Mp4/Mp4Test.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using System.IO; using Nikse.SubtitleEdit.Core.ContainerFormats.Mp4; +using System.IO; namespace Test.Logic.Mp4 { diff --git a/src/Test/Logic/Ocr/BinaryOcrTest.cs b/src/Test/Logic/Ocr/BinaryOcrTest.cs index f0f3f7436..373cb0ef7 100644 --- a/src/Test/Logic/Ocr/BinaryOcrTest.cs +++ b/src/Test/Logic/Ocr/BinaryOcrTest.cs @@ -1,8 +1,8 @@ -using System.Drawing; -using System.IO; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.VisualStudio.TestTools.UnitTesting; using Nikse.SubtitleEdit.Core; using Nikse.SubtitleEdit.Logic.Ocr.Binary; +using System.Drawing; +using System.IO; namespace Test.Logic.Ocr { diff --git a/src/Test/Logic/Ocr/NOcrTest.cs b/src/Test/Logic/Ocr/NOcrTest.cs index f9306fcd5..798b7585a 100644 --- a/src/Test/Logic/Ocr/NOcrTest.cs +++ b/src/Test/Logic/Ocr/NOcrTest.cs @@ -1,7 +1,7 @@ -using System.Drawing; -using System.IO; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.VisualStudio.TestTools.UnitTesting; using Nikse.SubtitleEdit.Logic.Ocr; +using System.Drawing; +using System.IO; namespace Test.Logic.Ocr { diff --git a/src/Test/Logic/ParagraphTest.cs b/src/Test/Logic/ParagraphTest.cs index 10f01de2a..383f9694e 100644 --- a/src/Test/Logic/ParagraphTest.cs +++ b/src/Test/Logic/ParagraphTest.cs @@ -1,6 +1,6 @@ -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.VisualStudio.TestTools.UnitTesting; using Nikse.SubtitleEdit.Core; +using System; namespace Test.Logic { @@ -38,7 +38,7 @@ namespace Test.Logic [TestMethod] public void TestAdjust1() { - var p = new Paragraph { Text = string.Empty, StartTime = new TimeCode(0,1,1,1), EndTime = new TimeCode(0, 1, 3, 1) }; + var p = new Paragraph { Text = string.Empty, StartTime = new TimeCode(0, 1, 1, 1), EndTime = new TimeCode(0, 1, 3, 1) }; p.Adjust(1, 10); Assert.AreEqual(new TimeCode(0, 1, 11, 1).TotalMilliseconds, p.StartTime.TotalMilliseconds); Assert.AreEqual(new TimeCode(0, 1, 13, 1).TotalMilliseconds, p.EndTime.TotalMilliseconds); @@ -64,7 +64,7 @@ namespace Test.Logic [TestMethod] public void TestDuration() { - var p = new Paragraph { Text = string.Empty, StartTime = new TimeCode(0, 1, 0, 0), EndTime = new TimeCode(0, 1, 1, 1) }; + var p = new Paragraph { Text = string.Empty, StartTime = new TimeCode(0, 1, 0, 0), EndTime = new TimeCode(0, 1, 1, 1) }; Assert.AreEqual(p.Duration.TotalMilliseconds, 1001); } diff --git a/src/Test/Logic/StripableTextTest.cs b/src/Test/Logic/StripableTextTest.cs index a5947b55b..c5ad3c29a 100644 --- a/src/Test/Logic/StripableTextTest.cs +++ b/src/Test/Logic/StripableTextTest.cs @@ -1,6 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Nikse.SubtitleEdit.Core; -using Nikse.SubtitleEdit.Logic; namespace Test.Logic { @@ -117,4 +116,4 @@ namespace Test.Logic } } -} \ No newline at end of file +} diff --git a/src/Test/Logic/SubtitleFormats/SubtitleFormatsTest.cs b/src/Test/Logic/SubtitleFormats/SubtitleFormatsTest.cs index 0fefa9533..c7b746db4 100644 --- a/src/Test/Logic/SubtitleFormats/SubtitleFormatsTest.cs +++ b/src/Test/Logic/SubtitleFormats/SubtitleFormatsTest.cs @@ -1,11 +1,11 @@ -using System.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.VisualStudio.TestTools.UnitTesting; using Nikse.SubtitleEdit.Core; +using Nikse.SubtitleEdit.Core.SubtitleFormats; using System; using System.Collections.Generic; using System.Globalization; +using System.Linq; using System.Xml; -using Nikse.SubtitleEdit.Core.SubtitleFormats; namespace Test.Logic.SubtitleFormats { @@ -152,7 +152,6 @@ Line 3"; Assert.AreEqual(expected, actual); } - [TestMethod] public void SrtKeepBlankLines() { @@ -614,8 +613,7 @@ Dialogue: Marked=0,0:00:01.00,0:00:03.00,Default,NTP,0000,0000,0000,!Effect," + Assert.IsTrue(outSubtitle.Paragraphs[1].Text == subText); } - #endregion - + #endregion Sami (.smi) #region Scenerist SCC @@ -791,6 +789,7 @@ Dialogue: Marked=0,0:00:01.00,0:00:03.00,Default,NTP,0000,0000,0000,!Effect," + #endregion All subtitle formats #region ToUtf8XmlString + [TestMethod] [DeploymentItem("SubtitleEdit.exe")] public void ToUtf8XmlStringDefault() @@ -823,7 +822,7 @@ Dialogue: Marked=0,0:00:01.00,0:00:03.00,Default,NTP,0000,0000,0000,!Effect," + Assert.IsTrue(doc.InnerXml.Contains("ø")); } - #endregion + #endregion ToUtf8XmlString } -} \ No newline at end of file +} diff --git a/src/Test/Logic/TimeCodeTest.cs b/src/Test/Logic/TimeCodeTest.cs index 789a50772..93cff578c 100644 --- a/src/Test/Logic/TimeCodeTest.cs +++ b/src/Test/Logic/TimeCodeTest.cs @@ -1,6 +1,6 @@ -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.VisualStudio.TestTools.UnitTesting; using Nikse.SubtitleEdit.Core; +using System; namespace Test.Logic { @@ -61,7 +61,6 @@ namespace Test.Logic Assert.AreEqual(tc.TotalMilliseconds, 2000); } - [TestMethod] public void TimeCodeAddTime7() { @@ -121,4 +120,4 @@ namespace Test.Logic } } -} \ No newline at end of file +} diff --git a/src/Test/Logic/TransportStream/TransportStreamTest.cs b/src/Test/Logic/TransportStream/TransportStreamTest.cs index 43822c3c5..cf55ef417 100644 --- a/src/Test/Logic/TransportStream/TransportStreamTest.cs +++ b/src/Test/Logic/TransportStream/TransportStreamTest.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using System.IO; using Nikse.SubtitleEdit.Core.TransportStream; +using System.IO; namespace Test.Logic.TransportStream { diff --git a/src/Test/Logic/UtilitiesTest.cs b/src/Test/Logic/UtilitiesTest.cs index e65dc541e..a2287c99c 100644 --- a/src/Test/Logic/UtilitiesTest.cs +++ b/src/Test/Logic/UtilitiesTest.cs @@ -1,9 +1,7 @@ -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Nikse.SubtitleEdit.Core.Forms; -using Nikse.SubtitleEdit.Core.Forms.FixCommonErrors; -using Nikse.SubtitleEdit.Logic; +using Microsoft.VisualStudio.TestTools.UnitTesting; using Nikse.SubtitleEdit.Core; +using Nikse.SubtitleEdit.Core.Forms.FixCommonErrors; +using System; namespace Test.Logic { diff --git a/src/Test/Logic/VideoFormats/MatroskaTest.cs b/src/Test/Logic/VideoFormats/MatroskaTest.cs index 79eac12f6..0283e8c41 100644 --- a/src/Test/Logic/VideoFormats/MatroskaTest.cs +++ b/src/Test/Logic/VideoFormats/MatroskaTest.cs @@ -1,7 +1,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; +using Nikse.SubtitleEdit.Core.ContainerFormats.Matroska; using System; using System.IO; -using Nikse.SubtitleEdit.Core.ContainerFormats.Matroska; namespace Test.Logic.VideoFormats { diff --git a/src/Test/XmlDictionariesTest.cs b/src/Test/XmlDictionariesTest.cs index 955bb982b..bc5f4a9ce 100644 --- a/src/Test/XmlDictionariesTest.cs +++ b/src/Test/XmlDictionariesTest.cs @@ -1,8 +1,8 @@ -using System.Text.RegularExpressions; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.IO; using System.Linq; +using System.Text.RegularExpressions; using System.Xml; using System.Xml.Linq; @@ -91,4 +91,4 @@ namespace Test } } -} \ No newline at end of file +} diff --git a/src/UpdateAssemblyInfo/Program.cs b/src/UpdateAssemblyInfo/Program.cs index 4e914231f..e704bb47b 100644 --- a/src/UpdateAssemblyInfo/Program.cs +++ b/src/UpdateAssemblyInfo/Program.cs @@ -110,22 +110,22 @@ namespace UpdateAssemblyInfo return FullVersion.GetHashCode(); } - public static bool operator == (VersionInfo vi1, VersionInfo vi2) + public static bool operator ==(VersionInfo vi1, VersionInfo vi2) { return object.ReferenceEquals(vi2, null) ? object.ReferenceEquals(vi1, null) : vi2.Equals(vi1); } - public static bool operator != (VersionInfo vi1, VersionInfo vi2) + public static bool operator !=(VersionInfo vi1, VersionInfo vi2) { return object.ReferenceEquals(vi2, null) ? !object.ReferenceEquals(vi1, null) : !vi2.Equals(vi1); } - public static bool operator > (VersionInfo vi1, VersionInfo vi2) + public static bool operator >(VersionInfo vi1, VersionInfo vi2) { return object.ReferenceEquals(vi1, null) ? false : vi1.CompareTo(vi2) > 0; } - public static bool operator < (VersionInfo vi1, VersionInfo vi2) + public static bool operator <(VersionInfo vi1, VersionInfo vi2) { return object.ReferenceEquals(vi2, null) ? false : vi2.CompareTo(vi1) > 0; } @@ -257,7 +257,7 @@ namespace UpdateAssemblyInfo } else if (currentRepositoryVersion.RevisionGuid.Length == 0) { - // last resort when building from source tarball - unknown build number and revision guid + // last resort when building from source tarball - unknown build number and revision guid newVersion = GetTemplateVersion(seTemplateFileName); } else @@ -366,4 +366,4 @@ namespace UpdateAssemblyInfo } } -} \ No newline at end of file +} diff --git a/src/UpdateLanguageFiles/LanguageDeserializerGenerator.cs b/src/UpdateLanguageFiles/LanguageDeserializerGenerator.cs index c7370eb50..9e920510d 100644 --- a/src/UpdateLanguageFiles/LanguageDeserializerGenerator.cs +++ b/src/UpdateLanguageFiles/LanguageDeserializerGenerator.cs @@ -1,6 +1,6 @@ -using System; +using Nikse.SubtitleEdit.Core; +using System; using System.Text; -using Nikse.SubtitleEdit.Core; namespace Nikse.SubtitleEdit.Logic { diff --git a/src/UpdateLanguageFiles/Program.cs b/src/UpdateLanguageFiles/Program.cs index 23cbc27f8..5ed2a56e2 100644 --- a/src/UpdateLanguageFiles/Program.cs +++ b/src/UpdateLanguageFiles/Program.cs @@ -118,4 +118,4 @@ namespace UpdateLanguageFiles } } -} \ No newline at end of file +} diff --git a/src/Web References/MicrosoftTranslationService/Reference.cs b/src/Web References/MicrosoftTranslationService/Reference.cs index dfc9b0bc9..e11a52212 100644 --- a/src/Web References/MicrosoftTranslationService/Reference.cs +++ b/src/Web References/MicrosoftTranslationService/Reference.cs @@ -1620,4 +1620,4 @@ namespace Nikse.SubtitleEdit.MicrosoftTranslationService } } -#pragma warning restore 1591 \ No newline at end of file +#pragma warning restore 1591 diff --git a/src/Web References/MicrosoftTranslationService/SoapService.wsdl b/src/Web References/MicrosoftTranslationService/SoapService.wsdl index dc4065688..b4b7751b5 100644 --- a/src/Web References/MicrosoftTranslationService/SoapService.wsdl +++ b/src/Web References/MicrosoftTranslationService/SoapService.wsdl @@ -136,4 +136,4 @@ - \ No newline at end of file + diff --git a/src/Web References/MicrosoftTranslationService/soap.wsdl b/src/Web References/MicrosoftTranslationService/soap.wsdl index 431d86a46..310fad14f 100644 --- a/src/Web References/MicrosoftTranslationService/soap.wsdl +++ b/src/Web References/MicrosoftTranslationService/soap.wsdl @@ -150,4 +150,4 @@ - \ No newline at end of file + diff --git a/src/Web References/MicrosoftTranslationService/soap.xsd b/src/Web References/MicrosoftTranslationService/soap.xsd index 87cf3499a..f37212a3d 100644 --- a/src/Web References/MicrosoftTranslationService/soap.xsd +++ b/src/Web References/MicrosoftTranslationService/soap.xsd @@ -189,4 +189,4 @@ - \ No newline at end of file + diff --git a/src/Web References/MicrosoftTranslationService/soap0.xsd b/src/Web References/MicrosoftTranslationService/soap0.xsd index 32e1c19af..545cb45a7 100644 --- a/src/Web References/MicrosoftTranslationService/soap0.xsd +++ b/src/Web References/MicrosoftTranslationService/soap0.xsd @@ -39,4 +39,4 @@ - \ No newline at end of file + diff --git a/src/Web References/MicrosoftTranslationService/soap1.xsd b/src/Web References/MicrosoftTranslationService/soap1.xsd index f8360fdaa..f9c7a2d0c 100644 --- a/src/Web References/MicrosoftTranslationService/soap1.xsd +++ b/src/Web References/MicrosoftTranslationService/soap1.xsd @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/src/Web References/MicrosoftTranslationService/soap2.xsd b/src/Web References/MicrosoftTranslationService/soap2.xsd index ed446ff05..874186412 100644 --- a/src/Web References/MicrosoftTranslationService/soap2.xsd +++ b/src/Web References/MicrosoftTranslationService/soap2.xsd @@ -238,4 +238,4 @@ - \ No newline at end of file + diff --git a/src/Web References/SeNetworkService/Reference.cs b/src/Web References/SeNetworkService/Reference.cs index 6f589ca02..b95cb43a9 100644 --- a/src/Web References/SeNetworkService/Reference.cs +++ b/src/Web References/SeNetworkService/Reference.cs @@ -1117,4 +1117,4 @@ namespace Nikse.SubtitleEdit.SeNetworkService } } -#pragma warning restore 1591 \ No newline at end of file +#pragma warning restore 1591 diff --git a/src/Web References/SeNetworkService/SeService.wsdl b/src/Web References/SeNetworkService/SeService.wsdl index ebf85de97..0894d9714 100644 --- a/src/Web References/SeNetworkService/SeService.wsdl +++ b/src/Web References/SeNetworkService/SeService.wsdl @@ -509,4 +509,4 @@ - \ No newline at end of file + diff --git a/src/packages/packages.config b/src/packages/packages.config index 0b76e9b71..4696758ab 100644 --- a/src/packages/packages.config +++ b/src/packages/packages.config @@ -3,4 +3,4 @@ - \ No newline at end of file +