From ab3a7fdddd3363119162fd81717534dec3b61b68 Mon Sep 17 00:00:00 2001 From: ivandrofly Date: Sat, 25 Apr 2015 02:40:04 +0100 Subject: [PATCH 1/4] Optimization + Refact --- src/Forms/Main.cs | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index 22c582464..acd98e9a6 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -4342,7 +4342,7 @@ namespace Nikse.SubtitleEdit.Forms private void ReplaceViaRegularExpression() { var r = new Regex(_findHelper.FindText, RegexOptions.Multiline); - if (_findHelper.ReplaceText.Contains("$")) + if (_findHelper.ReplaceText.Contains('$')) { string result = r.Replace(textBoxListViewText.Text, _findHelper.ReplaceText); if (result != textBoxListViewText.Text) @@ -4670,9 +4670,9 @@ namespace Nikse.SubtitleEdit.Forms { // we only update selected lines int i = 0; - List deletes = new List(); if (_networkSession != null) { + var deletes = new List(); _networkSession.TimerStop(); foreach (int index in SubtitleListview1.SelectedIndices) { @@ -4693,13 +4693,13 @@ namespace Nikse.SubtitleEdit.Forms } else { - foreach (int index in SubtitleListview1.SelectedIndices) + for (int index = SubtitleListview1.SelectedIndices.Count - 1; index >= 0; index--) { var pOld = _subtitle.Paragraphs[index]; var p = fixErrors.FixedSubtitle.GetParagraphOrDefaultById(pOld.ID); if (p == null) { - deletes.Add(index); + _subtitle.Paragraphs.RemoveAt(index); } else { @@ -4707,11 +4707,6 @@ namespace Nikse.SubtitleEdit.Forms } i++; } - deletes.Reverse(); - foreach (int index in deletes) - { - _subtitle.Paragraphs.RemoveAt(index); - } } ShowStatus(_language.CommonErrorsFixedInSelectedLines); } @@ -9364,9 +9359,9 @@ namespace Nikse.SubtitleEdit.Forms byte[] buffer = new byte[26]; f.Read(buffer, 0, 26); - if (buffer[2] == 0x3a && // : - buffer[5] == 0x3a && // : - buffer[8] == 0x2e && // . + if (buffer[2] == 0x3a && // : + buffer[5] == 0x3a && // : + buffer[8] == 0x2e && // . buffer[12] == 0x2d && // - buffer[15] == 0x3a && // : buffer[18] == 0x3a && // : From c3c9d7ff33f2e1f3abe9b1baba670a48565b75e3 Mon Sep 17 00:00:00 2001 From: ivandrofly Date: Sat, 25 Apr 2015 02:45:57 +0100 Subject: [PATCH 2/4] More refact --- src/Forms/Main.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index acd98e9a6..2dad2708c 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -4805,14 +4805,14 @@ namespace Nikse.SubtitleEdit.Forms } ReloadFromSourceView(); + double lengthInSeconds = 0; + if (mediaPlayer.VideoPlayer != null) + lengthInSeconds = mediaPlayer.Duration; if (Configuration.Settings.Tools.SplitAdvanced) { using (var split = new Split()) { - double lengthInSeconds = 0; - if (mediaPlayer.VideoPlayer != null) - lengthInSeconds = mediaPlayer.Duration; split.Initialize(_subtitle, _fileName, GetCurrentSubtitleFormat()); if (split.ShowDialog(this) == DialogResult.OK) { @@ -4829,9 +4829,6 @@ namespace Nikse.SubtitleEdit.Forms { using (var splitSubtitle = new SplitSubtitle()) { - double lengthInSeconds = 0; - if (mediaPlayer.VideoPlayer != null) - lengthInSeconds = mediaPlayer.Duration; splitSubtitle.Initialize(_subtitle, _fileName, GetCurrentSubtitleFormat(), GetCurrentEncoding(), lengthInSeconds); if (splitSubtitle.ShowDialog(this) == DialogResult.OK) { From ced7e22feb5a25a226e16ffc41ad6e28b4dc5718 Mon Sep 17 00:00:00 2001 From: ivandrofly Date: Wed, 29 Apr 2015 00:46:20 +0100 Subject: [PATCH 3/4] Split line using extension method + GetDirectoryName Optimized --- src/Forms/Main.cs | 7 ++++--- src/Logic/SubtitleFormats/SubtitleFormat.cs | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index 2dad2708c..bc1662567 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -11334,7 +11334,7 @@ namespace Nikse.SubtitleEdit.Forms var tmp = new Subtitle(); var format = new SubRip(); var list = new List(); - foreach (string line in text.Replace(Environment.NewLine, "\n").Split('\n')) + foreach (string line in text.SplitToLines()) list.Add(line); format.LoadSubtitle(tmp, list, null); if (SubtitleListview1.SelectedItems.Count == 1 && tmp.Paragraphs.Count > 0) @@ -14617,8 +14617,9 @@ namespace Nikse.SubtitleEdit.Forms { if (string.IsNullOrEmpty(_fileName)) { - saveFileDialog1.InitialDirectory = Path.GetDirectoryName(fileName); - openFileDialog1.InitialDirectory = Path.GetDirectoryName(fileName); + var dirName = Path.GetDirectoryName(fileName); + saveFileDialog1.InitialDirectory = dirName; + openFileDialog1.InitialDirectory = dirName; } OpenVideo(fileName); } diff --git a/src/Logic/SubtitleFormats/SubtitleFormat.cs b/src/Logic/SubtitleFormats/SubtitleFormat.cs index a8253126c..13834b829 100644 --- a/src/Logic/SubtitleFormats/SubtitleFormat.cs +++ b/src/Logic/SubtitleFormats/SubtitleFormat.cs @@ -150,7 +150,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats new YouTubeTranscriptOneLine(), new ZeroG(), - // new Idx(), + // new Idx(), new UnknownSubtitle1(), new UnknownSubtitle2(), new UnknownSubtitle3(), From 7cb285c4d6dc4bce82fa9cf26a42a84bd5b87047 Mon Sep 17 00:00:00 2001 From: ivandrofly Date: Wed, 29 Apr 2015 22:02:25 +0100 Subject: [PATCH 4/4] Dictionary ptBr URL updated to v2.1.2 --- src/Resources/OpenOfficeDictionaries.xml | 4 ++-- src/Resources/OpenOfficeDictionaries.xml.gz | Bin 3981 -> 4118 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Resources/OpenOfficeDictionaries.xml b/src/Resources/OpenOfficeDictionaries.xml index fc08c3ce2..205715640 100644 --- a/src/Resources/OpenOfficeDictionaries.xml +++ b/src/Resources/OpenOfficeDictionaries.xml @@ -242,8 +242,8 @@ Portuguese (Brazilian) Português (do Brasil) - http://extensions.libreoffice.org/extension-center/vero-verificador-ortografico-e-hifenizador-em-portugues-do-brasil/pscreleasefolder.2012-01-04.1563120832/2.1/vero_pt_br_v210aoc.oxt - VERO - VERificador Ortográfico e hifenizador em Português do Brasil 2.1 + http://extensions.libreoffice.org/extension-center/vero-verificador-ortografico-e-hifenizador-em-portugues-do-brasil/pscreleasefolder.2012-01-04.1563120832/2.1.2/vero_pt_br_v212aoc.oxt + VERO - VERificador Ortográfico e hifenizador em Português do Brasil 2.1.2 Portuguese (Portugal) diff --git a/src/Resources/OpenOfficeDictionaries.xml.gz b/src/Resources/OpenOfficeDictionaries.xml.gz index 99faf4f2996cd9f569e61b2c020512fff966425d..f116d044d874a5e388a6820b8bea70fc1f81e1c1 100644 GIT binary patch literal 4118 zcmV+x5b5t9iwFoKL_t*q08embZck=rX=7zXX=8M0Z*F07X=QURcx`L|&0I;38$}ep zBk>>V0-BLhy?TWJnq&e&Bn)Cg#3E#s+hx0PyUX-qXXeBvAt4ar09-h*??@~{gk8en z8aX$(4Ob-o1Fx#v-EGfIx_aD3D3ckxySnPt_tkq<@71e5y)&ZjPPc1YblbK9o4LfZ zsekvaw;*&nxw0p|!fdrX%L&abBBw%NpW z80lQF-ND`cAQ;`Ds-5_nulOwVEZSvWk18$=)RD)YqE?_1#xT7SP}c|fd{x)ArmCqO zkQbA#!mb4Ocz5y2ZZo%TGwy|-q%hP;y)ksxR~U4iiLNWq059aiueb^LMCNj1e?%Pz zTYYK`sCPRVj_wTnyL7W|HuZX=sf#P2Pg_IV^O$$nfV#nHHQTeKx74>hd&E&qVL_sL z6ju)qriCIN)RYJ*Vm#8etvpu#`2LTt{`mOMmt;xFAn4d_kEY0_x3C30r=CiL1dFh# z9(5@3sjr%fA*gB*55s4mO9m}bb=RY`>*Z7RC~xl$6yX{(Hg6E6 z4VJ(hb%+=GHgWUVo4q#scJ|}!%Nx(!c>cz-vmfBot7!Jq?3dZsvoF`iX{Dy?s$Pxk zQk!B;sn%{vYCf0kq|3)Mi9O2o5Q}_;|m81;%JsPlF>Y>zrpSiRrOLHMZ=i-jXLVMrt;Wig1rsa^$ z(-d8g$AO3W7fGw-QlT3!feL-Yl}M=2Rarm_>rK5< zQ5$L}vmU|i-l~c-?-D+q~W2m8blLuO}(sZmi^PP2p>Elx-X1}2JogW!KJBt80H zv+*Si@1OA0i5nD~{ zJ8bMG-?s;Q%Y4?FCtX(yfU{h3L6C~By$m8uKS84D=@)|%mR8%uwf$T&p_D(6C9=q} z$`8nx4wxHw%;`{28!k?k19jwE@!G1(i+GBm={nY$*whrwXlT0GH1&pRDAB45YJia- zx#)^IkJ5$QA*Jb*I)QG7LB8TVNTHVw2(rc~N~Ky;YpUyD0ofQ-M_YB-)!}`^bH8BO z=pFBVHmirCDzJEwP!a(qnm2fex$P3&PySg#OJwn z#F8uwP_(i2$SHJo>lC{0%qjH9?kV*6RtYopIUl?ciJ4lq`^AT=X(Wc821Und*IO8; zH0n*(eLG^jCWEx1Yc;I`QIh3BYVEtWmCu!-X$?iIE1JGK5%&^Ue4&kpDEuMrW*#4L zIh8-QzU7l)R-0;Ud%L74IZH-lBt%|xt&cVx6|JdP^~T9ehd`tRK0NB?+w*%p;!Zyz zwzN4fGJnR{xWx9r$L&H>7POQ`BdQRAbr=T9;J#oKig9}x+J0a^9g2tWxQZo%v)kGB zPk3M0UwHf`|KivNzA3c{fMe%L~ie+-jF*YTcIC-W1Bnlw`myoFgt8a-|zt@ zkJ?s$a~=5igkZQsF$p;QLwh0WaLnojezdAmuj!S#SvM+G6|TY@TvPOVyojN#d3`N@ z4{J57*X1ahV+As8T|%Oc&BbXVZLK_JqQ85&%w(k7K6j*a7(LOUPokJYx>WRGSQ+!{ zKxsR4*AnVWIEA0XoTkck6l)#2I&08bJCdQ<*erPkI&Wro0pX=)KDim4X(_bPr<>W`v}`0G8mSGeS7o^_qH2910PbgZ53>xVwl9@K z3<~~8dPz=+ptl0_ot+Z!wcU=L2k*iA-ygjH>%sfa9lZbH!3WRC0$5mC46|0BFNyp1 zib~SwJ(E}vbKQVg$jLVO1bmAdPNh1~=R;R+@984x?GbNn%;*N}y*FcK!d01>cWOCg zxWtN~nI~jr-ayt+Jp>J`PRRWh<#T_2^2qcH-vK}d(qY^}<|cF_J7fFY_G5c4RT4+a zLK`E$V1rBrCV5?7sEJ>OxgX1Jy(U;7|A>tcK^;nFCX_TGCBCdxL0MD71W1bu)o6%-Gc(qpXWPz%D&ip7R%*LJ86ut1V{mk&QI zdZO&xqZ0wKIt1Km=OS={6iJvUGKR#oBe6T1H^*sOU2DRISoQE6=a9nFn&|JbTe$0+ z+MwOB#MCB=K^9B6CPtugKjdj(tV4X5!yu-;?~ws)%(SELZ4!1M&^Bb95X8(XeG`=4 z8MmA&&I8yxK#v=m0<%e*g-!eGW*CEY#M}P`}c3w z0(&gRfmq5SJ>>bEWWFJc-I~s|!PS=(jFDCO7K|nU+F;W5{0z z2VH|`CPe=$WuRlxj#M&9TJk@^Y0$d(fGkczu%*#60ow_)CJATSC}>l7MPM_bZMZ5HPaPT%+wqlAe{_#WM=n%$S6W&u z+QA9x-vx{Pzzf|0{I&Il3x84z317khDuKTlWpx>Ta0gUYlT+BF^Gm5t#|0}QOIqsY z&3f=JVk%u;G0rASI=IaSLw@9^huuAK|CpGO25Yy5Qq$o`L0zkuHI*mIf<7-$0zZW) z@ds!@8nnU1nSS6P)ix$0-0ZL6HzVG4c23M9tH0CaA;Eq7_20lm)}eTfn-8wGt+thoA>x z4-$GHW8#cQ_H9QhM=W}3`YC7>NC^-6wzHN@88|t>F#NKi23{H17@WFx(bW9Y4IailSF*rfz5r(@=T#uOXUije=I&YmFfyN0=oywlAN1 zcn6q)KXXCRju3SE4wn>Bl#vwCA<7__0Ej?_GSZ&1oJOCCQ-D%g8dsS)0pf=)$!W-C zNbZ}y$B@B&amb4-0icK3P|Bt7*l_x;d+m8yL<&dGVCU6PW21^a2K3ig454|VYlk-% z7q=1?yq07R%w(?`HN&XX>L<)z75J8aknG{mm)Z21z0J??Mn@25-^+4W#3%t)OZlc5 zxD|eqnszW0pD=IW!!cV-Sb%$QPIGkpxdfOnYKGP{8`Wm53a+}LL>ta6FN7aagN6;< zl(R=1swG!3BOyA&B}Cva3JDSGqOF}vNJyw4(e~r_G_^NqeZy#g&6R4 z&$Gb;w1m@s^SIXXR&iaKr>pp$9Q<+L(Z<=h)pQGH6V1=fE$0iNq_q+@$98SE53bqG z&`*n<#7~b5QHr~pSU(O@HI(ps0K8l>z|@aoRLC zqVPenu0*loG=l){a#hw0qaio1MY1j**Ww$hD%uqimVIbzcO-Rc>zqF#)32nVDWr^% z1o?qu16F6;|Iqo4bsgrS2AIUUN_hoD0^6vaEV%GE+JKORW(ut?!M`g6Cv(t!)SZ6f z+16V2JXb}wM_tNg!(_<+lE_37yoY5mPr3*B_CxWBpr{hGhvG4{iGYU^(#K=yp(PIl zhc@za`x6?{XV&7dtV#rlq?18>J2}bCP|`h&lK!C$u(8u`TzklT;9!?R+#U{k!xgk^ zJJWaCK+$H&gj}RoU1;1i=pUDF(Nt?SqzSjSP{@H^#Tc^E~3jFFPnhN zpve0nb&6=j{F(o!MvP}xS5Y?+|g`0X;OCy-uUi>b|mJ}-EpCW(!#!YwV9qs^v5f@;eOPo z#dpaNSl~grYWi#@t);5NiO9yGcenH@k$RIuj3JL8l@JuX)F-*a`rzu@2Uov7xcUkI z{rw9ESKmCi`tI7uf!z4&{48(KUy+=kPh?Z$E7j&InMMHQI`iWn8F<8&31rRQoBaT8 z_Ln!_oc#%QB5xi3z< zWdHTUufW@7`>!8g3}mq?Y(biEfX`INb}Os+rM^aSoOC%F{YSqJw62}-je04f5p}X} Ucss2g^9t900WTgjTH93s07SJ4yZ`_I literal 3981 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