From dc5db7213675c81c01d94cd1a14774c306163e5c Mon Sep 17 00:00:00 2001 From: niksedk Date: Sun, 2 Jul 2023 21:38:15 +0200 Subject: [PATCH] Work on WaveformPlaybackSpeedSelected - thx jmaraujouy :) --- Icons/Black/WaveformPlaybackSpeed.png | Bin 2250 -> 2369 bytes Icons/Black/WaveformPlaybackSpeedSelected.png | Bin 0 -> 2345 bytes Icons/DarkTheme/WaveformPlaybackSpeed.png | Bin 2044 -> 2081 bytes .../WaveformPlaybackSpeedSelected.png | Bin 0 -> 2345 bytes Icons/DefaultTheme/WaveformPlaybackSpeed.png | Bin 2244 -> 2082 bytes .../WaveformPlaybackSpeedSelected.png | Bin 0 -> 2353 bytes src/libse/Common/Settings.cs | 9 + src/ui/Forms/Main.Designer.cs | 522 +++++++++--------- src/ui/Forms/Options/Settings.Designer.cs | 31 +- src/ui/Forms/Options/Settings.cs | 14 + src/ui/Logic/Language.cs | 1 + src/ui/Logic/LanguageStructure.cs | 1 + 12 files changed, 316 insertions(+), 262 deletions(-) create mode 100644 Icons/Black/WaveformPlaybackSpeedSelected.png create mode 100644 Icons/DarkTheme/WaveformPlaybackSpeedSelected.png create mode 100644 Icons/DefaultTheme/WaveformPlaybackSpeedSelected.png diff --git a/Icons/Black/WaveformPlaybackSpeed.png b/Icons/Black/WaveformPlaybackSpeed.png index 3e7d1c242c0da33632f9173183e02f7057401ccd..acbc0c539e5cfa1bee92f7577e1fa59b67806418 100644 GIT binary patch delta 827 zcmX>lcu;7=2_|+kD?@WDV~fe>nbhFyKTH8C$wp>r#%4)Ix|SBk2D+xkCWg8erfEjH ziH4~LDJDi17RKfllM9%&R7{Lb5{(j#EOe8TQ%rQtl1)r?Et1j_b(4}!QqnAqQq2?1 zQzq|YR#7oCH8V3aHnq^TNHej}H8(La0Ge%P0@P=gVqlPJY?zj4Hkpkjj5vi2EdN!~ zER&4Q%q&cFEsaf*byE#Zl5~?yj4gEyOiYqfla0*H6O&UW7qCfzJO)GtlP9tTO%`J_ zBhqsajo{Fk$hNvZ;%NSP1_s8Lo-U3d7QJ()Z1j_M6lk-TRu&OouDv*?I6tAH!DCt1 zrI~$~@)>Lz-}asJbAPUVxiIw-%OV?wXPlc@`3rcbt(cVbKXLlwo(=VxTdT{B@1J{f zCil1{y8)YD<9Ubqcek+pW4PbAN&SUr!3O0ESJ?M4I5)^CUh)m#uMat}_ZkDM0fSqV zc`3u3vN^^5d;IP*8!zxl*m|vU(@BXLTXHtM+vcGCz~e&kgZ0N2w%Pg%-ClL@MS1iB z^{D%dpH*hX95$M9YT1PI+!e!mTlUewb7}CI`y|ZOdic_C~ulploPCb zW8*dNv&O~-8`S4zDjt@0y?mvse!@-Ngw-bS)FO9Ajp>@K^39Ddvt?!%Kg1o9l!1 z9!$ADH%TjaS|hj9RPiHR`O51TxNZ4UDePM8wCCi##j`5*pLv@)z2NiWxzAecvp2F< zD9-soYigd*}3~HS9I2WhdOt#8>$4tnu+b@HB2(s`dlM q9}G22-?ld_i(=m2;Jx4ve=d8me0!ClD+2=qCxfS}pUXO@geCx7|3Xaw delta 707 zcmX>obV_i;2_|+!D??)|1JlXpnbhFyKTH8CMwV%2$*HNSx=D#9=DL=qCW*S17Ut%< z$)*NIiAE+yCYC1VlM9%&R4fyXjSY=WOm%_k&2>{vO^kFcEt8XVjm%Ax5>t~6lTu6! zC+}lcQAtiUFiuWQG15&-_{agO?X7iH@n<8$TJ1wF! zDwI!enz5fDt}({UfmtF!c{h8uuED)RzBgOA7KqNA7|Zg{#!W!Ej;X$`bZw)i0e{Ey zTdQ4PCF=|Q_6vR>9l^fOU$@`XAb8{EbLw9l^rub{vOMM_`0G%gxy9L46OVjj%3OM<_dZ9wT#0&y zo4MP6#iM7pGM?JlAF%eo-Kk3+xEU<9UKp6vTzxot-Esa8O_N`>JbCv|;k)}E_J{46 Vf_*RNUd~_u0#8>zmvv4FO#oUo3jY8A diff --git a/Icons/Black/WaveformPlaybackSpeedSelected.png b/Icons/Black/WaveformPlaybackSpeedSelected.png new file mode 100644 index 0000000000000000000000000000000000000000..d2180ab0d98a4373c9aa01f250dbf1ad60e4c7bf GIT binary patch literal 2345 zcmb_e4Q$k881C3|zz72(F(5K($CSTb+iUNya$|FM;}*EFY(oYLqt||SSGa3y+uhFw zY{8!Z4v2yhfq*dq5^<9#5J3Yd2n>u)Fa#J0BOrf*f0jz~SHSa=#?i+F|MzVTKMzlR74LKnLHa#m92v;!wL=iZ z^p99otylXdv%DNJbAs##=6FPbXapHQA+B)zT%e*fgt;^eM$4 zBzo&qP+3=2#n;W{odPzY039D^VSotGIW!&#OBx$@Vad2Gyfz*a7@CCWb6r@GL5NoS z%F$w31*p?Z;yg)`sNHF%>=bXY2gacm(qbV<2SM3z%E6KrmZ8zq4})~75MV3ZB`Gp^ z=fXm|uCN3Vi^a?_+AOOMjhX+F3(HNr#oRlul4FBF-rUWhRZ9l0bn^^F>Q3W0l>}az=grC(KuOBH2fA(|%dfkMv+oX$NIEbweVRwEoNSd4H%KqyiWL(?*{#d26yAu-I3 zPG;frv89rxa}p0q-7XB)Y!*d zSVWVaU^(9Kx(nltCIbOWJr;Y=g8Us|#g#}bOf^v!y7J1I7m5540YUZZ9gX%JR*DLqs(YWY?B?>tGw9N)R z;-ncK2NdJS{S58INrvG8T*mAipO(10L}}AQ-=|IgI1;7g=R=$n1aO5Wu*Wav(fr?; zWsk*lpTYlMF@&)$cRHE)ugR0|x~<{RFv&-7V=yk$TN1oUZ)!k-I;n8Wns{ae+&446 zFLf7HIhHoRLzU$f4fL$XCwZ5h@1tdY+Phj@gR`%~`2tQD;ZQ*cn{)U8TGUc43aS-1e+F3UeL?_N^u83anXAO{; z_0B?1L1m?{Y*S=Bg_{BY&ROy@&Q}K62{vojVhmDxT=iFdimO}%E{Y;Lq8iiHQ{Ty792eIhn4H>a!aV}p#4O_oYq^1 z4=s55ZE3;Qqf2fCnkQt;I((p}y1l6B`WyOhYjR89T6JYp<4>kbw-()4`r*NvLGqU6 mJ2SpO)(qOQ`t)t;@80hnnAd=tw`Uq3Go_v~cgqX27yb(>KOxHi literal 0 HcmV?d00001 diff --git a/Icons/DarkTheme/WaveformPlaybackSpeed.png b/Icons/DarkTheme/WaveformPlaybackSpeed.png index 08de6941f5e85e78a89d73a1bc285ba286d92ff8..46d44440198c83531b92bc422a010d8453dd0630 100644 GIT binary patch delta 695 zcmeyvzffSq2_|+kD??K&Q-jIpnbhFyKTH8CmZpg*CW%H#x+zI1$+{*+CI-5eiN=Py zscGg$N#-f0mdWPHlM9%&R7}%Mj7*ITOmr<%OwDyo%}tDTEsaf0bd4>NEt4$`O;SwF zQYY_YR#CAuPEAcUG&RySwzLGQF)~ThO)^bQ(oHl;wKO)iFi9~?Hkr)E5=NZD2A2QC zxv_yogx6fxz$nBJ=GBEPHj~)$>({-k?qOhHoaX7`7-G@8b?U*wLk0q_@-syq?AG^U zbzp7e^I`X6ZR9#2Dxjqx+rsyVk4g5&p}Vpc?6t1hiD@Se)~C4}U9wvnrfv9gSD)b* z6E4vTwjFWnzaNtgUOwPF>{f380m zB66UAf&78)H#*$+r_PLCGC?GUA^z3*#@^0lQ(I-@&!2aY&*GFN^S#Ng;YQl* zI$I|z8@k$l2s>bDSFXAtAwu$l?&${et+z$qbXew^7`jZ#YCHd$X@%*3o%=>EvIkmk zH8Wm0GKXzy*QJ-cjgk*;XSiy(&oA22!u6s`{RP>y)jvwE9%DCLCibSIk~#j*w*^5N z*^BO8UeA$!FypK0;VR#K{6}QhcC_!|7iQY=u#UCm;{xM4_OPwDd>+?7;Qr{MtCF$U zQu5!I_9rRg9ifFmv*WrJgdLFGK2<0rDvZJWM{rzn-g)~cB3C@u+&jBkEm`0&F??*$X6atE}D_W@cBaj!i)bt*D*fsE65k?yyD3K N1fH&bF6*2UngISA3n2gi delta 658 zcmZ1|@P~iH2_|+!D+3EFQ{&0!nbhFyKTH8CNhang#zw|Tx)v6RNxDhqCKkFDMoH$n z#+DYwiDs$hmT8velM9%&R4fyXjSY=WOm)-DlFfBfO-+n+EiIFib&bqTlM+*t4U)lbC(@3-@sQhKT0k;VOdi8T>lrzqAF7lILa<^QnV}4ZP;7X z9dUf;HJR@-ydQZK_Wxg39e?LJ^MoIkdAG|{kC(Iv%$XLqsyT`O)7!>d62Xq~T|CRD zuaDyQ@U~jXAg1*7BX8rm#N&sREkYF=(jRDlsE_<u)Fa#J0BOrf*f0jz~SHSa=#?i+F|MzVTKMzlR74LKnLHa#m92v;!wL=iZ z^p99otylXdv%DNJbAs##=6FPbXapHQA+B)zT%e*fgt;^eM$4 zBzo&qP+3=2#n;W{odPzY039D^VSotGIW!&#OBx$@Vad2Gyfz*a7@CCWb6r@GL5NoS z%F$w31*p?Z;yg)`sNHF%>=bXY2gacm(qbV<2SM3z%E6KrmZ8zq4})~75MV3ZB`Gp^ z=fXm|uCN3Vi^a?_+AOOMjhX+F3(HNr#oRlul4FBF-rUWhRZ9l0bn^^F>Q3W0l>}az=grC(KuOBH2fA(|%dfkMv+oX$NIEbweVRwEoNSd4H%KqyiWL(?*{#d26yAu-I3 zPG;frv89rxa}p0q-7XB)Y!*d zSVWVaU^(9Kx(nltCIbOWJr;Y=g8Us|#g#}bOf^v!y7J1I7m5540YUZZ9gX%JR*DLqs(YWY?B?>tGw9N)R z;-ncK2NdJS{S58INrvG8T*mAipO(10L}}AQ-=|IgI1;7g=R=$n1aO5Wu*Wav(fr?; zWsk*lpTYlMF@&)$cRHE)ugR0|x~<{RFv&-7V=yk$TN1oUZ)!k-I;n8Wns{ae+&446 zFLf7HIhHoRLzU$f4fL$XCwZ5h@1tdY+Phj@gR`%~`2tQD;ZQ*cn{)U8TGUc43aS-1e+F3UeL?_N^u83anXAO{; z_0B?1L1m?{Y*S=Bg_{BY&ROy@&Q}K62{vojVhmDxT=iFdimO}%E{Y;Lq8iiHQ{Ty792eIhn4H>a!aV}p#4O_oYq^1 z4=s55ZE3;Qqf2fCnkQt;I((p}y1l6B`WyOhYjR89T6JYp<4>kbw-()4`r*NvLGqU6 mJ2SpO)(qOQ`t)t;@80hnnAd=tw`Uq3Go_v~cgqX27yb(>KOxHi literal 0 HcmV?d00001 diff --git a/Icons/DefaultTheme/WaveformPlaybackSpeed.png b/Icons/DefaultTheme/WaveformPlaybackSpeed.png index 0f92f18c305b1835427a15b0ece55ae20f161038..6ac68f9d9963c2e89c633e2222f4186b7d3b148a 100644 GIT binary patch delta 692 zcmX>ixJY1vC8Oa+t3D=nGb=+=D`TU{=b6;t>_1EaDu!l;#wjVriMpv~#wofcmL@5> z7KX`|x@kr!DHaAP#%X4jhLa1JwN#7~jSLNpQj&BNO;b{J%?wS9brX{;4Rj4HER)R4 zEi6rp(o!eyV^&eINJ=#~FfzB$O|wik&^0kKNz+YCNwd&RwXiTZF)&X|OiMJK%*GN% zoWcf{|3tcxO$zR@iEOLuOE2EgVqjpL?&;zfV$pkb>c+xD4g#+7a^eew&doGlz|_s> z!d}GMc0o|U@<>R6RRiA|J{_a<6)dF+?BCCC7rHc~oGH!FTYWwp$i8;tS?ByTWj8cbXoWqta1Y`x26eOI;` zM#~R;HYdCyEAC0$f2041$0Eayb=r}lY{{tT)60W=y6*^C*JPSbV9=jC{amUT-;9-$ zrs+(pP(7r%;kft2OZ_ZArl=m+d@OYO4MEejPb7?9CN*6*W##%gz3Z&=wML7}JB(Ra z11~qkL|WPApNZ=@>rmVC{&EzfUt~zV>?PA>A$ww4I~`?`z29`~YRs>z4v4*UD`of6 zyMpJ07H>cQ;&|}$O7}Gxel|~X3pkF59+nmO#_UzYD%N_;<@f$0>W@03CN(Ur5&HA; z`@xfb0=plr*!Vk;<%&{F@l8#}olm)ri2j=*&J&|me?W8P;vG@(_uOvEd{B+=ZmHO> zbJ%Q=>bfn42h;0x#kw|%hpoPQ;B=tTnq>KJ6`WqXEq;~%-y{E0G|hO=we-0RK;Y@> K=d#Wzp$Py*`V4vi delta 728 zcmZ1^a71u|CF8%1R((wDhE|3~Rwf3M&oimP*?*Vl&GxCMBjO z8z!Zg7*5{DtfG>fYG9n4nqs7znrLXEYm#bWsB4*&YNBgsYLH@)mXv62n3yz~jU|jY zg$*qKRgz51Q;dy_lXNXC5|eb3%uOtGEsT=Pb&V}8j1$dL%`MX`%_ldoi13>08W@Eb z8d@1xSeY76UdUoIiA`*>3XACEI95gCe2Q!eB*4I?~f z_M3}W-@d!Q`u~zZBOd1K2kwSOG+wbfnIqmc{Q&ob)9f!Ap`U_)88a1s#s)l36_c?XAisqW^;!&$woN-fm&F`^eJmVp%L7p43nLCb6<;?gN&8 z(T40ok?-H^ud3X7dBK60C~4()4Zj1*6CVH2O`cix{O6AORh+3U6)P9@97xxhl6Piq zMeoHmT_SnsCxoqvZSSzYxm#_w$jq#qznq3Myia!ADPhsRYVvNG|DEK#io;KTFwQd! llAU#ak;T7T~y}o|m@Bjb* z{=e`0x;S^-sFdWM$ry&EGB`xFtvgU`5vXG9@7?v@#Ob1div~WKxR8$XfVb>l4S7Z+{CCx|s^ekAU zjGk@4Nwdf0NwbS3K_-S~;u&QkA_zeX;ANqpYKmnZBFZbGYx^-p;8BQG>>-BR0r7la zE}o?s5EmRYDbX~Iy95X0VkD<4Fa&qfPA5gXDTXH*w@5ohj>Tg?0);c=fH=`RG8PQo zd59v*(nX32hr^CA>(GosiV*~XqMek}Ng@Pkma7&hBUQ6s8-o{`lA-99qN%ve2>e=! z)Qe#ZGFCYj63EM3dKX1R(2^WBPPfl(Pmz`4ylRI)JhBqW|yKg``Oj#VwM4c zr5Sme7HsQOZd=N@lXKAcz$uCk1aa# zsl@KAJ-*fDvL+#pTTxjKGEM>TBy7qF|2?T(6oqm}W(&zvXxVCJ@8w#3eAlRPO z&Pqm%d>YU5Y?_;N2M~pe<7iTF^BgHjyiC)OWdeY=-5fQDI9f4L>&j#EV-kEZb`@0c zs3$}q*AfWi2!595-5e>f zoJ2x~^CRD|0!ee61kp0)0#aP!_7cTSk9<$Jnf_rUipeh(0ksgK6`CR*zL*E|e`}U^ zET;Vo{{M=h>~*=-$<%*M9(~tt4M&EFK0+IVeHq`9&`o?(gDTR=KwDOzWM(mjB^=N3 z4$pHh-BJ0rI*obal|8+(x8|)HRih6%o;Y^Q1m$4zB>qSx9N1~l*n|5@K|a--n|?l_ zY2%WH<$68Q9oGJ{c6{@+)Q_rXd>Wk5cW!28<~6c(SD(FSW=N6V*RkGL_|Uu!wX?!4 z+Xk%(?yG$&a&~EL!T8$!j&HwPy)ohac{`f0{)an`oOMQgq_OjWH-~1Nd>K1E?9|Mq zO`e?xdaU_u$oBKq!-^wcZro6Da!_LTU&pTxt!I{{lZV+IeJd7TsoLyMUsGT8{W?!g z$BvN^D|5dKOs#saOT)^7 z<#jbbCT1OfjN9q_IHll&-B!gjsZ~{DUP$_5vwGP>xqc)jb5gI&55TsD%9)hNT7 z=N-*0dH2%XNai`Or>=U1FDs*k?@*b!>BAmd8mWa_o{cOyv(~>gj_>!0pTIrq}kWBa>aIyGuAxyV&~Bl+S)^X~;a$Th*;37Z=)zIL{} z9wgTUSL_bY>&{I7jruvI>xAEHyKNtI^XNBMspARr=YQ1@R_%|Poa}MlZ6jvR{}-F} BHP`?E literal 0 HcmV?d00001 diff --git a/src/libse/Common/Settings.cs b/src/libse/Common/Settings.cs index b7dd14278..93321a4b6 100644 --- a/src/libse/Common/Settings.cs +++ b/src/libse/Common/Settings.cs @@ -1354,6 +1354,7 @@ $HorzAlign = Center public string VideoPlayerPreviewFontName { get; set; } public int VideoPlayerPreviewFontSize { get; set; } public bool VideoPlayerPreviewFontBold { get; set; } + public int VideoPlayerPreviewVerticalMargin { get; set; } public bool VideoPlayerShowStopButton { get; set; } public bool VideoPlayerShowFullscreenButton { get; set; } public bool VideoPlayerShowMuteButton { get; set; } @@ -1562,6 +1563,7 @@ $HorzAlign = Center VideoPlayerPreviewFontName = "Tahoma"; VideoPlayerPreviewFontSize = 12; VideoPlayerPreviewFontBold = true; + VideoPlayerPreviewVerticalMargin = 12; VideoPlayerShowStopButton = true; VideoPlayerShowMuteButton = true; VideoPlayerShowFullscreenButton = true; @@ -3814,6 +3816,12 @@ $HorzAlign = Center settings.General.VideoPlayerPreviewFontBold = Convert.ToBoolean(subNode.InnerText, CultureInfo.InvariantCulture); } + subNode = node.SelectSingleNode("VideoPlayerPreviewVerticalMargin"); + if (subNode != null) + { + settings.General.VideoPlayerPreviewVerticalMargin = Convert.ToInt32(subNode.InnerText, CultureInfo.InvariantCulture); + } + subNode = node.SelectSingleNode("VideoPlayerShowStopButton"); if (subNode != null) { @@ -10373,6 +10381,7 @@ $HorzAlign = Center textWriter.WriteElementString("VideoPlayerPreviewFontName", settings.General.VideoPlayerPreviewFontName); textWriter.WriteElementString("VideoPlayerPreviewFontSize", settings.General.VideoPlayerPreviewFontSize.ToString(CultureInfo.InvariantCulture)); textWriter.WriteElementString("VideoPlayerPreviewFontBold", settings.General.VideoPlayerPreviewFontBold.ToString(CultureInfo.InvariantCulture)); + textWriter.WriteElementString("VideoPlayerPreviewVerticalMargin", settings.General.VideoPlayerPreviewVerticalMargin.ToString(CultureInfo.InvariantCulture)); textWriter.WriteElementString("VideoPlayerShowStopButton", settings.General.VideoPlayerShowStopButton.ToString(CultureInfo.InvariantCulture)); textWriter.WriteElementString("VideoPlayerShowMuteButton", settings.General.VideoPlayerShowMuteButton.ToString(CultureInfo.InvariantCulture)); textWriter.WriteElementString("VideoPlayerShowFullscreenButton", settings.General.VideoPlayerShowFullscreenButton.ToString(CultureInfo.InvariantCulture)); diff --git a/src/ui/Forms/Main.Designer.cs b/src/ui/Forms/Main.Designer.cs index 8b45f33fa..9277bffd1 100644 --- a/src/ui/Forms/Main.Designer.cs +++ b/src/ui/Forms/Main.Designer.cs @@ -40,9 +40,9 @@ namespace Nikse.SubtitleEdit.Forms { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main)); + Nikse.SubtitleEdit.Core.Common.TimeCode timeCode3 = new Nikse.SubtitleEdit.Core.Common.TimeCode(); Nikse.SubtitleEdit.Core.Common.TimeCode timeCode1 = new Nikse.SubtitleEdit.Core.Common.TimeCode(); Nikse.SubtitleEdit.Core.Common.TimeCode timeCode2 = new Nikse.SubtitleEdit.Core.Common.TimeCode(); - Nikse.SubtitleEdit.Core.Common.TimeCode timeCode3 = new Nikse.SubtitleEdit.Core.Common.TimeCode(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.labelStatus = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripSelected = new System.Windows.Forms.ToolStripStatusLabel(); @@ -357,7 +357,6 @@ namespace Nikse.SubtitleEdit.Forms this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); this.groupBoxVideo = new System.Windows.Forms.GroupBox(); this.labelNextWord = new System.Windows.Forms.Label(); - this.audioVisualizer = new Nikse.SubtitleEdit.Controls.AudioVisualizer(); this.checkBoxSyncListViewWithVideoWhilePlaying = new System.Windows.Forms.CheckBox(); this.labelVideoInfo = new System.Windows.Forms.Label(); this.trackBarWaveformPosition = new System.Windows.Forms.TrackBar(); @@ -393,7 +392,6 @@ namespace Nikse.SubtitleEdit.Forms this.buttonPlayCurrent = new System.Windows.Forms.Button(); this.buttonPlayNext = new System.Windows.Forms.Button(); this.tabPageCreate = new System.Windows.Forms.TabPage(); - this.timeUpDownVideoPosition = new Nikse.SubtitleEdit.Controls.TimeUpDown(); this.buttonGotoSub = new System.Windows.Forms.Button(); this.buttonBeforeText = new System.Windows.Forms.Button(); this.buttonSetEnd = new System.Windows.Forms.Button(); @@ -411,7 +409,6 @@ namespace Nikse.SubtitleEdit.Forms this.labelVideoPosition = new System.Windows.Forms.Label(); this.buttonSecBack1 = new System.Windows.Forms.Button(); this.tabPageAdjust = new System.Windows.Forms.TabPage(); - this.timeUpDownVideoPositionAdjust = new Nikse.SubtitleEdit.Controls.TimeUpDown(); this.buttonAdjustSetEndTime = new System.Windows.Forms.Button(); this.buttonSetEndAndGoToNext = new System.Windows.Forms.Button(); this.buttonSetStartAndOffsetRest = new System.Windows.Forms.Button(); @@ -464,14 +461,12 @@ namespace Nikse.SubtitleEdit.Forms this.splitContainerMain = new System.Windows.Forms.SplitContainer(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.splitContainerListViewAndText = new System.Windows.Forms.SplitContainer(); - this.SubtitleListview1 = new Nikse.SubtitleEdit.Controls.SubtitleListView(); this.imageListBookmarks = new System.Windows.Forms.ImageList(this.components); this.groupBoxEdit = new System.Windows.Forms.GroupBox(); this.numericUpDownLayer = new System.Windows.Forms.NumericUpDown(); this.labelLayer = new System.Windows.Forms.Label(); this.panelBookmark = new System.Windows.Forms.Panel(); this.labelBookmark = new System.Windows.Forms.Label(); - this.textBoxListViewText = new Nikse.SubtitleEdit.Controls.SETextBox(); this.contextMenuStripTextBoxListView = new System.Windows.Forms.ContextMenuStrip(this.components); this.toolStripSeparatorSpellCheckSuggestions = new System.Windows.Forms.ToolStripSeparator(); this.toolStripMenuItemSpellCheckSkipOnce = new System.Windows.Forms.ToolStripMenuItem(); @@ -533,13 +528,11 @@ namespace Nikse.SubtitleEdit.Forms this.labelTextOriginalLineLengths = new System.Windows.Forms.Label(); this.labelOriginalText = new System.Windows.Forms.Label(); this.labelText = new System.Windows.Forms.Label(); - this.textBoxListViewTextOriginal = new Nikse.SubtitleEdit.Controls.SETextBox(); this.buttonAutoBreak = new System.Windows.Forms.Button(); this.labelTextLineLengths = new System.Windows.Forms.Label(); this.labelTextLineTotal = new System.Windows.Forms.Label(); this.labelCharactersPerSecond = new System.Windows.Forms.Label(); this.buttonUnBreak = new System.Windows.Forms.Button(); - this.timeUpDownStartTime = new Nikse.SubtitleEdit.Controls.TimeUpDown(); this.numericUpDownDuration = new System.Windows.Forms.NumericUpDown(); this.buttonPrevious = new System.Windows.Forms.Button(); this.buttonNext = new System.Windows.Forms.Button(); @@ -567,7 +560,6 @@ namespace Nikse.SubtitleEdit.Forms this.startOfLefttorightOverrideLROToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.startOfRighttoleftOverrideRLOToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.panelVideoPlayer = new System.Windows.Forms.Panel(); - this.mediaPlayer = new Nikse.SubtitleEdit.Controls.VideoPlayerContainer(); this.contextMenuStripEmpty = new System.Windows.Forms.ContextMenuStrip(this.components); this.insertLineToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.aSSStylesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -575,6 +567,14 @@ namespace Nikse.SubtitleEdit.Forms this.timerOriginalTextUndo = new System.Windows.Forms.Timer(this.components); this.contextMenuStripShowVideoControls = new System.Windows.Forms.ContextMenuStrip(this.components); this.toolStripMenuItemShowVideoControls = new System.Windows.Forms.ToolStripMenuItem(); + this.SubtitleListview1 = new Nikse.SubtitleEdit.Controls.SubtitleListView(); + this.textBoxListViewText = new Nikse.SubtitleEdit.Controls.SETextBox(); + this.textBoxListViewTextOriginal = new Nikse.SubtitleEdit.Controls.SETextBox(); + this.timeUpDownStartTime = new Nikse.SubtitleEdit.Controls.TimeUpDown(); + this.mediaPlayer = new Nikse.SubtitleEdit.Controls.VideoPlayerContainer(); + this.audioVisualizer = new Nikse.SubtitleEdit.Controls.AudioVisualizer(); + this.timeUpDownVideoPosition = new Nikse.SubtitleEdit.Controls.TimeUpDown(); + this.timeUpDownVideoPositionAdjust = new Nikse.SubtitleEdit.Controls.TimeUpDown(); this.statusStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -3266,55 +3266,6 @@ namespace Nikse.SubtitleEdit.Forms this.labelNextWord.Text = "Next: xxx"; this.labelNextWord.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // audioVisualizer - // - this.audioVisualizer.AllowDrop = true; - this.audioVisualizer.AllowNewSelection = true; - this.audioVisualizer.AllowOverlap = false; - this.audioVisualizer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.audioVisualizer.BackColor = System.Drawing.Color.Black; - this.audioVisualizer.BackgroundColor = System.Drawing.Color.Black; - this.audioVisualizer.Chapters = null; - this.audioVisualizer.ChaptersColor = System.Drawing.Color.Empty; - this.audioVisualizer.ClosenessForBorderSelection = 15; - this.audioVisualizer.Color = System.Drawing.Color.GreenYellow; - this.audioVisualizer.CursorColor = System.Drawing.Color.Empty; - this.audioVisualizer.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); - this.audioVisualizer.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(155)))), ((int)(((byte)(155))))); - this.audioVisualizer.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(18))))); - this.audioVisualizer.InsertAtVideoPositionShortcut = System.Windows.Forms.Keys.Insert; - this.audioVisualizer.Location = new System.Drawing.Point(472, 32); - this.audioVisualizer.Margin = new System.Windows.Forms.Padding(0); - this.audioVisualizer.MouseWheelScrollUpIsForward = true; - this.audioVisualizer.Move100MsLeft = System.Windows.Forms.Keys.None; - this.audioVisualizer.Move100MsRight = System.Windows.Forms.Keys.None; - this.audioVisualizer.MoveOneSecondLeft = System.Windows.Forms.Keys.None; - this.audioVisualizer.MoveOneSecondRight = System.Windows.Forms.Keys.None; - this.audioVisualizer.Name = "audioVisualizer"; - this.audioVisualizer.NewSelectionParagraph = null; - this.audioVisualizer.ParagraphColor = System.Drawing.Color.LimeGreen; - this.audioVisualizer.SelectedColor = System.Drawing.Color.Red; - this.audioVisualizer.ShotChanges = ((System.Collections.Generic.List)(resources.GetObject("audioVisualizer.ShotChanges"))); - this.audioVisualizer.ShowGridLines = true; - this.audioVisualizer.ShowSpectrogram = false; - this.audioVisualizer.ShowWaveform = true; - this.audioVisualizer.Size = new System.Drawing.Size(499, 229); - this.audioVisualizer.StartPositionSeconds = 0D; - this.audioVisualizer.TabIndex = 6; - this.audioVisualizer.TextBold = true; - this.audioVisualizer.TextColor = System.Drawing.Color.Gray; - this.audioVisualizer.TextSize = 9F; - this.audioVisualizer.VerticalZoomFactor = 1D; - this.audioVisualizer.WaveformNotLoadedText = "Click to add waveform"; - this.audioVisualizer.WavePeaks = null; - this.audioVisualizer.ZoomFactor = 1D; - this.audioVisualizer.Click += new System.EventHandler(this.AudioWaveform_Click); - this.audioVisualizer.DragDrop += new System.Windows.Forms.DragEventHandler(this.AudioWaveformDragDrop); - this.audioVisualizer.DragEnter += new System.Windows.Forms.DragEventHandler(this.AudioWaveformDragEnter); - this.audioVisualizer.MouseEnter += new System.EventHandler(this.audioVisualizer_MouseEnter); - // // checkBoxSyncListViewWithVideoWhilePlaying // this.checkBoxSyncListViewWithVideoWhilePlaying.AutoSize = true; @@ -3355,7 +3306,7 @@ namespace Nikse.SubtitleEdit.Forms this.panelWaveformControls.Controls.Add(this.toolStripWaveControls); this.panelWaveformControls.Location = new System.Drawing.Point(474, 265); this.panelWaveformControls.Name = "panelWaveformControls"; - this.panelWaveformControls.Size = new System.Drawing.Size(205, 30); + this.panelWaveformControls.Size = new System.Drawing.Size(212, 30); this.panelWaveformControls.TabIndex = 10; // // toolStripWaveControls @@ -3745,28 +3696,6 @@ namespace Nikse.SubtitleEdit.Forms this.tabPageCreate.Text = "Create"; this.tabPageCreate.UseVisualStyleBackColor = true; // - // timeUpDownVideoPosition - // - this.timeUpDownVideoPosition.AutoSize = true; - this.timeUpDownVideoPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.timeUpDownVideoPosition.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.timeUpDownVideoPosition.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); - this.timeUpDownVideoPosition.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(155)))), ((int)(((byte)(155))))); - this.timeUpDownVideoPosition.Location = new System.Drawing.Point(90, 190); - this.timeUpDownVideoPosition.Margin = new System.Windows.Forms.Padding(4); - this.timeUpDownVideoPosition.Name = "timeUpDownVideoPosition"; - this.timeUpDownVideoPosition.Size = new System.Drawing.Size(113, 27); - this.timeUpDownVideoPosition.TabIndex = 12; - timeCode1.Hours = 0; - timeCode1.Milliseconds = 0; - timeCode1.Minutes = 0; - timeCode1.Seconds = 0; - timeCode1.TimeSpan = System.TimeSpan.Parse("00:00:00"); - timeCode1.TotalMilliseconds = 0D; - timeCode1.TotalSeconds = 0D; - this.timeUpDownVideoPosition.TimeCode = timeCode1; - this.timeUpDownVideoPosition.UseVideoOffset = false; - // // buttonGotoSub // this.buttonGotoSub.Location = new System.Drawing.Point(6, 58); @@ -3987,28 +3916,6 @@ namespace Nikse.SubtitleEdit.Forms this.tabPageAdjust.Text = "Adjust"; this.tabPageAdjust.UseVisualStyleBackColor = true; // - // timeUpDownVideoPositionAdjust - // - this.timeUpDownVideoPositionAdjust.AutoSize = true; - this.timeUpDownVideoPositionAdjust.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.timeUpDownVideoPositionAdjust.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.timeUpDownVideoPositionAdjust.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); - this.timeUpDownVideoPositionAdjust.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(155)))), ((int)(((byte)(155))))); - this.timeUpDownVideoPositionAdjust.Location = new System.Drawing.Point(90, 215); - this.timeUpDownVideoPositionAdjust.Margin = new System.Windows.Forms.Padding(4); - this.timeUpDownVideoPositionAdjust.Name = "timeUpDownVideoPositionAdjust"; - this.timeUpDownVideoPositionAdjust.Size = new System.Drawing.Size(113, 27); - this.timeUpDownVideoPositionAdjust.TabIndex = 13; - timeCode2.Hours = 0; - timeCode2.Milliseconds = 0; - timeCode2.Minutes = 0; - timeCode2.Seconds = 0; - timeCode2.TimeSpan = System.TimeSpan.Parse("00:00:00"); - timeCode2.TotalMilliseconds = 0D; - timeCode2.TotalSeconds = 0D; - this.timeUpDownVideoPositionAdjust.TimeCode = timeCode2; - this.timeUpDownVideoPositionAdjust.UseVideoOffset = false; - // // buttonAdjustSetEndTime // this.buttonAdjustSetEndTime.Location = new System.Drawing.Point(6, 84); @@ -4509,39 +4416,6 @@ namespace Nikse.SubtitleEdit.Forms this.splitContainerListViewAndText.TabIndex = 2; this.splitContainerListViewAndText.VisibleChanged += new System.EventHandler(this.ListViewVisibleChanged); // - // SubtitleListview1 - // - this.SubtitleListview1.AllowColumnReorder = true; - this.SubtitleListview1.AllowDrop = true; - this.SubtitleListview1.ContextMenuStrip = this.contextMenuStripListView; - this.SubtitleListview1.Dock = System.Windows.Forms.DockStyle.Fill; - this.SubtitleListview1.FirstVisibleIndex = -1; - this.SubtitleListview1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.SubtitleListview1.FullRowSelect = true; - this.SubtitleListview1.GridLines = true; - this.SubtitleListview1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; - this.SubtitleListview1.HideSelection = false; - this.SubtitleListview1.Location = new System.Drawing.Point(0, 0); - this.SubtitleListview1.Name = "SubtitleListview1"; - this.SubtitleListview1.OwnerDraw = true; - this.SubtitleListview1.Size = new System.Drawing.Size(740, 105); - this.SubtitleListview1.StateImageList = this.imageListBookmarks; - this.SubtitleListview1.SubtitleFontBold = false; - this.SubtitleListview1.SubtitleFontName = "Tahoma"; - this.SubtitleListview1.SubtitleFontSize = 8; - this.SubtitleListview1.TabIndex = 0; - this.SubtitleListview1.UseCompatibleStateImageBehavior = false; - this.SubtitleListview1.UseSyntaxColoring = true; - this.SubtitleListview1.View = System.Windows.Forms.View.Details; - this.SubtitleListview1.SelectedIndexChanged += new System.EventHandler(this.SubtitleListview1_SelectedIndexChanged); - this.SubtitleListview1.DragDrop += new System.Windows.Forms.DragEventHandler(this.SubtitleListview1_DragDrop); - this.SubtitleListview1.DragEnter += new System.Windows.Forms.DragEventHandler(this.SubtitleListview1_DragEnter); - this.SubtitleListview1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SubtitleListview1KeyDown); - this.SubtitleListview1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.SubtitleListview1_MouseDoubleClick); - this.SubtitleListview1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.SubtitleListview1_MouseDown); - this.SubtitleListview1.MouseEnter += new System.EventHandler(this.SubtitleListview1_MouseEnter); - this.SubtitleListview1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SubtitleListview1_MouseUp); - // // imageListBookmarks // this.imageListBookmarks.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit; @@ -4635,43 +4509,6 @@ namespace Nikse.SubtitleEdit.Forms this.labelBookmark.Text = "labelBookmark"; this.labelBookmark.DoubleClick += new System.EventHandler(this.labelBookmark_DoubleClick); // - // textBoxListViewText - // - this.textBoxListViewText.AllowDrop = true; - this.textBoxListViewText.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.textBoxListViewText.BackColor = System.Drawing.SystemColors.WindowFrame; - this.textBoxListViewText.ContextMenuStrip = this.contextMenuStripTextBoxListView; - this.textBoxListViewText.CurrentLanguage = ""; - this.textBoxListViewText.CurrentLineIndex = 0; - this.textBoxListViewText.Enabled = false; - this.textBoxListViewText.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold); - this.textBoxListViewText.HideSelection = false; - this.textBoxListViewText.IsDictionaryDownloaded = true; - this.textBoxListViewText.IsSpellCheckerInitialized = false; - this.textBoxListViewText.IsSpellCheckRequested = false; - this.textBoxListViewText.IsWrongWord = false; - this.textBoxListViewText.LanguageChanged = false; - this.textBoxListViewText.Location = new System.Drawing.Point(184, 27); - this.textBoxListViewText.Multiline = true; - this.textBoxListViewText.Name = "textBoxListViewText"; - this.textBoxListViewText.Padding = new System.Windows.Forms.Padding(1); - this.textBoxListViewText.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Both; - this.textBoxListViewText.SelectedText = ""; - this.textBoxListViewText.SelectionLength = 0; - this.textBoxListViewText.SelectionStart = 0; - this.textBoxListViewText.Size = new System.Drawing.Size(430, 84); - this.textBoxListViewText.TabIndex = 5; - this.textBoxListViewText.TextBoxFont = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold); - this.textBoxListViewText.TextChanged += new System.EventHandler(this.TextBoxListViewTextTextChanged); - this.textBoxListViewText.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TextBoxListViewTextKeyDown); - this.textBoxListViewText.MouseClick += new System.Windows.Forms.MouseEventHandler(this.TextBoxListViewTextMouseClick); - this.textBoxListViewText.Enter += new System.EventHandler(this.TextBoxListViewTextEnter); - this.textBoxListViewText.KeyUp += new System.Windows.Forms.KeyEventHandler(this.textBoxListViewText_KeyUp); - this.textBoxListViewText.Leave += new System.EventHandler(this.textBoxListViewText_Leave); - this.textBoxListViewText.MouseMove += new System.Windows.Forms.MouseEventHandler(this.textBoxListViewText_MouseMove); - // // contextMenuStripTextBoxListView // this.contextMenuStripTextBoxListView.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -5182,43 +5019,6 @@ namespace Nikse.SubtitleEdit.Forms this.labelText.TabIndex = 5; this.labelText.Text = "Text"; // - // textBoxListViewTextOriginal - // - this.textBoxListViewTextOriginal.AllowDrop = true; - this.textBoxListViewTextOriginal.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.textBoxListViewTextOriginal.BackColor = System.Drawing.SystemColors.WindowFrame; - this.textBoxListViewTextOriginal.ContextMenuStrip = this.contextMenuStripTextBoxListView; - this.textBoxListViewTextOriginal.CurrentLanguage = ""; - this.textBoxListViewTextOriginal.CurrentLineIndex = 0; - this.textBoxListViewTextOriginal.Enabled = false; - this.textBoxListViewTextOriginal.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold); - this.textBoxListViewTextOriginal.HideSelection = false; - this.textBoxListViewTextOriginal.IsDictionaryDownloaded = true; - this.textBoxListViewTextOriginal.IsSpellCheckerInitialized = false; - this.textBoxListViewTextOriginal.IsSpellCheckRequested = false; - this.textBoxListViewTextOriginal.IsWrongWord = false; - this.textBoxListViewTextOriginal.LanguageChanged = false; - this.textBoxListViewTextOriginal.Location = new System.Drawing.Point(946, 28); - this.textBoxListViewTextOriginal.Multiline = true; - this.textBoxListViewTextOriginal.Name = "textBoxListViewTextOriginal"; - this.textBoxListViewTextOriginal.Padding = new System.Windows.Forms.Padding(1); - this.textBoxListViewTextOriginal.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Both; - this.textBoxListViewTextOriginal.SelectedText = ""; - this.textBoxListViewTextOriginal.SelectionLength = 0; - this.textBoxListViewTextOriginal.SelectionStart = 0; - this.textBoxListViewTextOriginal.Size = new System.Drawing.Size(16, 84); - this.textBoxListViewTextOriginal.TabIndex = 33; - this.textBoxListViewTextOriginal.TextBoxFont = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold); - this.textBoxListViewTextOriginal.Visible = false; - this.textBoxListViewTextOriginal.TextChanged += new System.EventHandler(this.textBoxListViewTextOriginal_TextChanged); - this.textBoxListViewTextOriginal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TextBoxListViewTextOriginalKeyDown); - this.textBoxListViewTextOriginal.MouseClick += new System.Windows.Forms.MouseEventHandler(this.TextBoxListViewTextOriginalMouseClick); - this.textBoxListViewTextOriginal.Enter += new System.EventHandler(this.TextBoxListViewTextOriginalEnter); - this.textBoxListViewTextOriginal.KeyUp += new System.Windows.Forms.KeyEventHandler(this.TextBoxListViewTextOriginalKeyUp); - this.textBoxListViewTextOriginal.MouseMove += new System.Windows.Forms.MouseEventHandler(this.TextBoxListViewTextOriginalMouseMove); - // // buttonAutoBreak // this.buttonAutoBreak.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -5271,28 +5071,6 @@ namespace Nikse.SubtitleEdit.Forms this.buttonUnBreak.UseVisualStyleBackColor = true; this.buttonUnBreak.Click += new System.EventHandler(this.ButtonUnBreakClick); // - // timeUpDownStartTime - // - this.timeUpDownStartTime.AutoSize = true; - this.timeUpDownStartTime.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.timeUpDownStartTime.BackColor = System.Drawing.SystemColors.Control; - this.timeUpDownStartTime.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); - this.timeUpDownStartTime.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(155)))), ((int)(((byte)(155))))); - this.timeUpDownStartTime.Location = new System.Drawing.Point(8, 26); - this.timeUpDownStartTime.Margin = new System.Windows.Forms.Padding(4); - this.timeUpDownStartTime.Name = "timeUpDownStartTime"; - this.timeUpDownStartTime.Size = new System.Drawing.Size(113, 27); - this.timeUpDownStartTime.TabIndex = 0; - timeCode3.Hours = 0; - timeCode3.Milliseconds = 0; - timeCode3.Minutes = 0; - timeCode3.Seconds = 0; - timeCode3.TimeSpan = System.TimeSpan.Parse("00:00:00"); - timeCode3.TotalMilliseconds = 0D; - timeCode3.TotalSeconds = 0D; - this.timeUpDownStartTime.TimeCode = timeCode3; - this.timeUpDownStartTime.UseVideoOffset = false; - // // numericUpDownDuration // this.numericUpDownDuration.DecimalPlaces = 3; @@ -5551,35 +5329,6 @@ namespace Nikse.SubtitleEdit.Forms this.panelVideoPlayer.Size = new System.Drawing.Size(220, 246); this.panelVideoPlayer.TabIndex = 5; // - // mediaPlayer - // - this.mediaPlayer.AllowDrop = true; - this.mediaPlayer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.mediaPlayer.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(18)))), ((int)(((byte)(18))))); - this.mediaPlayer.Chapters = null; - this.mediaPlayer.CurrentPosition = 0D; - this.mediaPlayer.FontSizeFactor = 1F; - this.mediaPlayer.LastParagraph = null; - this.mediaPlayer.Location = new System.Drawing.Point(0, 0); - this.mediaPlayer.Margin = new System.Windows.Forms.Padding(0); - this.mediaPlayer.Name = "mediaPlayer"; - this.mediaPlayer.ShowFullscreenButton = true; - this.mediaPlayer.ShowMuteButton = true; - this.mediaPlayer.ShowStopButton = true; - this.mediaPlayer.Size = new System.Drawing.Size(219, 246); - this.mediaPlayer.SubtitleText = ""; - this.mediaPlayer.TabIndex = 5; - this.mediaPlayer.TextRightToLeft = System.Windows.Forms.RightToLeft.No; - this.mediaPlayer.UsingFrontCenterAudioChannelOnly = false; - this.mediaPlayer.VideoHeight = 0; - this.mediaPlayer.VideoPlayer = null; - this.mediaPlayer.VideoWidth = 0; - this.mediaPlayer.Volume = 0D; - this.mediaPlayer.DragDrop += new System.Windows.Forms.DragEventHandler(this.mediaPlayer_DragDrop); - this.mediaPlayer.DragEnter += new System.Windows.Forms.DragEventHandler(this.mediaPlayer_DragEnter); - // // contextMenuStripEmpty // this.contextMenuStripEmpty.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -5628,6 +5377,257 @@ namespace Nikse.SubtitleEdit.Forms this.toolStripMenuItemShowVideoControls.Text = "Show video controls"; this.toolStripMenuItemShowVideoControls.Click += new System.EventHandler(this.toolStripMenuItemShowVideoControls_Click); // + // SubtitleListview1 + // + this.SubtitleListview1.AllowColumnReorder = true; + this.SubtitleListview1.AllowDrop = true; + this.SubtitleListview1.ContextMenuStrip = this.contextMenuStripListView; + this.SubtitleListview1.Dock = System.Windows.Forms.DockStyle.Fill; + this.SubtitleListview1.FirstVisibleIndex = -1; + this.SubtitleListview1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.SubtitleListview1.FullRowSelect = true; + this.SubtitleListview1.GridLines = true; + this.SubtitleListview1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; + this.SubtitleListview1.HideSelection = false; + this.SubtitleListview1.Location = new System.Drawing.Point(0, 0); + this.SubtitleListview1.Name = "SubtitleListview1"; + this.SubtitleListview1.OwnerDraw = true; + this.SubtitleListview1.Size = new System.Drawing.Size(740, 105); + this.SubtitleListview1.StateImageList = this.imageListBookmarks; + this.SubtitleListview1.SubtitleFontBold = false; + this.SubtitleListview1.SubtitleFontName = "Tahoma"; + this.SubtitleListview1.SubtitleFontSize = 8; + this.SubtitleListview1.TabIndex = 0; + this.SubtitleListview1.UseCompatibleStateImageBehavior = false; + this.SubtitleListview1.UseSyntaxColoring = true; + this.SubtitleListview1.View = System.Windows.Forms.View.Details; + this.SubtitleListview1.SelectedIndexChanged += new System.EventHandler(this.SubtitleListview1_SelectedIndexChanged); + this.SubtitleListview1.DragDrop += new System.Windows.Forms.DragEventHandler(this.SubtitleListview1_DragDrop); + this.SubtitleListview1.DragEnter += new System.Windows.Forms.DragEventHandler(this.SubtitleListview1_DragEnter); + this.SubtitleListview1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SubtitleListview1KeyDown); + this.SubtitleListview1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.SubtitleListview1_MouseDoubleClick); + this.SubtitleListview1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.SubtitleListview1_MouseDown); + this.SubtitleListview1.MouseEnter += new System.EventHandler(this.SubtitleListview1_MouseEnter); + this.SubtitleListview1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SubtitleListview1_MouseUp); + // + // textBoxListViewText + // + this.textBoxListViewText.AllowDrop = true; + this.textBoxListViewText.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxListViewText.BackColor = System.Drawing.SystemColors.WindowFrame; + this.textBoxListViewText.ContextMenuStrip = this.contextMenuStripTextBoxListView; + this.textBoxListViewText.CurrentLanguage = ""; + this.textBoxListViewText.CurrentLineIndex = 0; + this.textBoxListViewText.Enabled = false; + this.textBoxListViewText.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold); + this.textBoxListViewText.HideSelection = false; + this.textBoxListViewText.IsDictionaryDownloaded = true; + this.textBoxListViewText.IsSpellCheckerInitialized = false; + this.textBoxListViewText.IsSpellCheckRequested = false; + this.textBoxListViewText.IsWrongWord = false; + this.textBoxListViewText.LanguageChanged = false; + this.textBoxListViewText.Location = new System.Drawing.Point(184, 27); + this.textBoxListViewText.Multiline = true; + this.textBoxListViewText.Name = "textBoxListViewText"; + this.textBoxListViewText.Padding = new System.Windows.Forms.Padding(1); + this.textBoxListViewText.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Both; + this.textBoxListViewText.SelectedText = ""; + this.textBoxListViewText.SelectionLength = 0; + this.textBoxListViewText.SelectionStart = 0; + this.textBoxListViewText.Size = new System.Drawing.Size(430, 84); + this.textBoxListViewText.TabIndex = 5; + this.textBoxListViewText.TextBoxFont = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold); + this.textBoxListViewText.TextChanged += new System.EventHandler(this.TextBoxListViewTextTextChanged); + this.textBoxListViewText.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TextBoxListViewTextKeyDown); + this.textBoxListViewText.MouseClick += new System.Windows.Forms.MouseEventHandler(this.TextBoxListViewTextMouseClick); + this.textBoxListViewText.Enter += new System.EventHandler(this.TextBoxListViewTextEnter); + this.textBoxListViewText.KeyUp += new System.Windows.Forms.KeyEventHandler(this.textBoxListViewText_KeyUp); + this.textBoxListViewText.Leave += new System.EventHandler(this.textBoxListViewText_Leave); + this.textBoxListViewText.MouseMove += new System.Windows.Forms.MouseEventHandler(this.textBoxListViewText_MouseMove); + // + // textBoxListViewTextOriginal + // + this.textBoxListViewTextOriginal.AllowDrop = true; + this.textBoxListViewTextOriginal.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxListViewTextOriginal.BackColor = System.Drawing.SystemColors.WindowFrame; + this.textBoxListViewTextOriginal.ContextMenuStrip = this.contextMenuStripTextBoxListView; + this.textBoxListViewTextOriginal.CurrentLanguage = ""; + this.textBoxListViewTextOriginal.CurrentLineIndex = 0; + this.textBoxListViewTextOriginal.Enabled = false; + this.textBoxListViewTextOriginal.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold); + this.textBoxListViewTextOriginal.HideSelection = false; + this.textBoxListViewTextOriginal.IsDictionaryDownloaded = true; + this.textBoxListViewTextOriginal.IsSpellCheckerInitialized = false; + this.textBoxListViewTextOriginal.IsSpellCheckRequested = false; + this.textBoxListViewTextOriginal.IsWrongWord = false; + this.textBoxListViewTextOriginal.LanguageChanged = false; + this.textBoxListViewTextOriginal.Location = new System.Drawing.Point(946, 28); + this.textBoxListViewTextOriginal.Multiline = true; + this.textBoxListViewTextOriginal.Name = "textBoxListViewTextOriginal"; + this.textBoxListViewTextOriginal.Padding = new System.Windows.Forms.Padding(1); + this.textBoxListViewTextOriginal.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Both; + this.textBoxListViewTextOriginal.SelectedText = ""; + this.textBoxListViewTextOriginal.SelectionLength = 0; + this.textBoxListViewTextOriginal.SelectionStart = 0; + this.textBoxListViewTextOriginal.Size = new System.Drawing.Size(16, 84); + this.textBoxListViewTextOriginal.TabIndex = 33; + this.textBoxListViewTextOriginal.TextBoxFont = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold); + this.textBoxListViewTextOriginal.Visible = false; + this.textBoxListViewTextOriginal.TextChanged += new System.EventHandler(this.textBoxListViewTextOriginal_TextChanged); + this.textBoxListViewTextOriginal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TextBoxListViewTextOriginalKeyDown); + this.textBoxListViewTextOriginal.MouseClick += new System.Windows.Forms.MouseEventHandler(this.TextBoxListViewTextOriginalMouseClick); + this.textBoxListViewTextOriginal.Enter += new System.EventHandler(this.TextBoxListViewTextOriginalEnter); + this.textBoxListViewTextOriginal.KeyUp += new System.Windows.Forms.KeyEventHandler(this.TextBoxListViewTextOriginalKeyUp); + this.textBoxListViewTextOriginal.MouseMove += new System.Windows.Forms.MouseEventHandler(this.TextBoxListViewTextOriginalMouseMove); + // + // timeUpDownStartTime + // + this.timeUpDownStartTime.AutoSize = true; + this.timeUpDownStartTime.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.timeUpDownStartTime.BackColor = System.Drawing.SystemColors.Control; + this.timeUpDownStartTime.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); + this.timeUpDownStartTime.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(155)))), ((int)(((byte)(155))))); + this.timeUpDownStartTime.Location = new System.Drawing.Point(8, 26); + this.timeUpDownStartTime.Margin = new System.Windows.Forms.Padding(4); + this.timeUpDownStartTime.Name = "timeUpDownStartTime"; + this.timeUpDownStartTime.Size = new System.Drawing.Size(113, 27); + this.timeUpDownStartTime.TabIndex = 0; + timeCode3.Hours = 0; + timeCode3.Milliseconds = 0; + timeCode3.Minutes = 0; + timeCode3.Seconds = 0; + timeCode3.TimeSpan = System.TimeSpan.Parse("00:00:00"); + timeCode3.TotalMilliseconds = 0D; + timeCode3.TotalSeconds = 0D; + this.timeUpDownStartTime.TimeCode = timeCode3; + this.timeUpDownStartTime.UseVideoOffset = false; + // + // mediaPlayer + // + this.mediaPlayer.AllowDrop = true; + this.mediaPlayer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.mediaPlayer.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(18)))), ((int)(((byte)(18))))); + this.mediaPlayer.Chapters = null; + this.mediaPlayer.CurrentPosition = 0D; + this.mediaPlayer.FontSizeFactor = 1F; + this.mediaPlayer.LastParagraph = null; + this.mediaPlayer.Location = new System.Drawing.Point(0, 0); + this.mediaPlayer.Margin = new System.Windows.Forms.Padding(0); + this.mediaPlayer.Name = "mediaPlayer"; + this.mediaPlayer.ShowFullscreenButton = true; + this.mediaPlayer.ShowMuteButton = true; + this.mediaPlayer.ShowStopButton = true; + this.mediaPlayer.Size = new System.Drawing.Size(219, 246); + this.mediaPlayer.SubtitleText = ""; + this.mediaPlayer.TabIndex = 5; + this.mediaPlayer.TextRightToLeft = System.Windows.Forms.RightToLeft.No; + this.mediaPlayer.UsingFrontCenterAudioChannelOnly = false; + this.mediaPlayer.VideoHeight = 0; + this.mediaPlayer.VideoPlayer = null; + this.mediaPlayer.VideoWidth = 0; + this.mediaPlayer.Volume = 0D; + this.mediaPlayer.DragDrop += new System.Windows.Forms.DragEventHandler(this.mediaPlayer_DragDrop); + this.mediaPlayer.DragEnter += new System.Windows.Forms.DragEventHandler(this.mediaPlayer_DragEnter); + // + // audioVisualizer + // + this.audioVisualizer.AllowDrop = true; + this.audioVisualizer.AllowNewSelection = true; + this.audioVisualizer.AllowOverlap = false; + this.audioVisualizer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.audioVisualizer.BackColor = System.Drawing.Color.Black; + this.audioVisualizer.BackgroundColor = System.Drawing.Color.Black; + this.audioVisualizer.Chapters = null; + this.audioVisualizer.ChaptersColor = System.Drawing.Color.Empty; + this.audioVisualizer.ClosenessForBorderSelection = 15; + this.audioVisualizer.Color = System.Drawing.Color.GreenYellow; + this.audioVisualizer.CursorColor = System.Drawing.Color.Empty; + this.audioVisualizer.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); + this.audioVisualizer.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(155)))), ((int)(((byte)(155))))); + this.audioVisualizer.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(18))))); + this.audioVisualizer.InsertAtVideoPositionShortcut = System.Windows.Forms.Keys.Insert; + this.audioVisualizer.Location = new System.Drawing.Point(472, 32); + this.audioVisualizer.Margin = new System.Windows.Forms.Padding(0); + this.audioVisualizer.MouseWheelScrollUpIsForward = true; + this.audioVisualizer.Move100MsLeft = System.Windows.Forms.Keys.None; + this.audioVisualizer.Move100MsRight = System.Windows.Forms.Keys.None; + this.audioVisualizer.MoveOneSecondLeft = System.Windows.Forms.Keys.None; + this.audioVisualizer.MoveOneSecondRight = System.Windows.Forms.Keys.None; + this.audioVisualizer.Name = "audioVisualizer"; + this.audioVisualizer.NewSelectionParagraph = null; + this.audioVisualizer.ParagraphColor = System.Drawing.Color.LimeGreen; + this.audioVisualizer.SelectedColor = System.Drawing.Color.Red; + this.audioVisualizer.ShotChanges = ((System.Collections.Generic.List)(resources.GetObject("audioVisualizer.ShotChanges"))); + this.audioVisualizer.ShowGridLines = true; + this.audioVisualizer.ShowSpectrogram = false; + this.audioVisualizer.ShowWaveform = true; + this.audioVisualizer.Size = new System.Drawing.Size(499, 229); + this.audioVisualizer.StartPositionSeconds = 0D; + this.audioVisualizer.TabIndex = 6; + this.audioVisualizer.TextBold = true; + this.audioVisualizer.TextColor = System.Drawing.Color.Gray; + this.audioVisualizer.TextSize = 9F; + this.audioVisualizer.VerticalZoomFactor = 1D; + this.audioVisualizer.WaveformNotLoadedText = "Click to add waveform"; + this.audioVisualizer.WavePeaks = null; + this.audioVisualizer.ZoomFactor = 1D; + this.audioVisualizer.Click += new System.EventHandler(this.AudioWaveform_Click); + this.audioVisualizer.DragDrop += new System.Windows.Forms.DragEventHandler(this.AudioWaveformDragDrop); + this.audioVisualizer.DragEnter += new System.Windows.Forms.DragEventHandler(this.AudioWaveformDragEnter); + this.audioVisualizer.MouseEnter += new System.EventHandler(this.audioVisualizer_MouseEnter); + // + // timeUpDownVideoPosition + // + this.timeUpDownVideoPosition.AutoSize = true; + this.timeUpDownVideoPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.timeUpDownVideoPosition.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); + this.timeUpDownVideoPosition.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); + this.timeUpDownVideoPosition.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(155)))), ((int)(((byte)(155))))); + this.timeUpDownVideoPosition.Location = new System.Drawing.Point(90, 190); + this.timeUpDownVideoPosition.Margin = new System.Windows.Forms.Padding(4); + this.timeUpDownVideoPosition.Name = "timeUpDownVideoPosition"; + this.timeUpDownVideoPosition.Size = new System.Drawing.Size(113, 27); + this.timeUpDownVideoPosition.TabIndex = 12; + timeCode1.Hours = 0; + timeCode1.Milliseconds = 0; + timeCode1.Minutes = 0; + timeCode1.Seconds = 0; + timeCode1.TimeSpan = System.TimeSpan.Parse("00:00:00"); + timeCode1.TotalMilliseconds = 0D; + timeCode1.TotalSeconds = 0D; + this.timeUpDownVideoPosition.TimeCode = timeCode1; + this.timeUpDownVideoPosition.UseVideoOffset = false; + // + // timeUpDownVideoPositionAdjust + // + this.timeUpDownVideoPositionAdjust.AutoSize = true; + this.timeUpDownVideoPositionAdjust.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.timeUpDownVideoPositionAdjust.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); + this.timeUpDownVideoPositionAdjust.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); + this.timeUpDownVideoPositionAdjust.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(155)))), ((int)(((byte)(155))))); + this.timeUpDownVideoPositionAdjust.Location = new System.Drawing.Point(90, 215); + this.timeUpDownVideoPositionAdjust.Margin = new System.Windows.Forms.Padding(4); + this.timeUpDownVideoPositionAdjust.Name = "timeUpDownVideoPositionAdjust"; + this.timeUpDownVideoPositionAdjust.Size = new System.Drawing.Size(113, 27); + this.timeUpDownVideoPositionAdjust.TabIndex = 13; + timeCode2.Hours = 0; + timeCode2.Milliseconds = 0; + timeCode2.Minutes = 0; + timeCode2.Seconds = 0; + timeCode2.TimeSpan = System.TimeSpan.Parse("00:00:00"); + timeCode2.TotalMilliseconds = 0D; + timeCode2.TotalSeconds = 0D; + this.timeUpDownVideoPositionAdjust.TimeCode = timeCode2; + this.timeUpDownVideoPositionAdjust.UseVideoOffset = false; + // // Main // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/src/ui/Forms/Options/Settings.Designer.cs b/src/ui/Forms/Options/Settings.Designer.cs index adcefa531..99b8f801c 100644 --- a/src/ui/Forms/Options/Settings.Designer.cs +++ b/src/ui/Forms/Options/Settings.Designer.cs @@ -441,6 +441,8 @@ this.labelUpdateFileTypeAssociationsStatus = new System.Windows.Forms.Label(); this.imageListFileTypeAssociations = new System.Windows.Forms.ImageList(this.components); this.toolTipDialogStylePreview = new System.Windows.Forms.ToolTip(this.components); + this.numericUpDownMarginVertical = new System.Windows.Forms.NumericUpDown(); + this.labelMarginVertical = new System.Windows.Forms.Label(); this.panelGeneral.SuspendLayout(); this.groupBoxMiscellaneous.SuspendLayout(); this.groupBoxGeneralRules.SuspendLayout(); @@ -523,6 +525,7 @@ this.groupBoxProxySettings.SuspendLayout(); this.groupBoxProxyAuthentication.SuspendLayout(); this.panelFileTypeAssociations.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMarginVertical)).BeginInit(); this.SuspendLayout(); // // buttonOK @@ -2382,6 +2385,8 @@ // this.groupBoxVideoPlayerDefault.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.groupBoxVideoPlayerDefault.Controls.Add(this.numericUpDownMarginVertical); + this.groupBoxVideoPlayerDefault.Controls.Add(this.labelMarginVertical); this.groupBoxVideoPlayerDefault.Controls.Add(this.panelMpvBackColor); this.groupBoxVideoPlayerDefault.Controls.Add(this.buttonMpvBackColor); this.groupBoxVideoPlayerDefault.Controls.Add(this.panelMpvOutlineColor); @@ -5292,14 +5297,35 @@ this.toolTipDialogStylePreview.InitialDelay = 500; this.toolTipDialogStylePreview.ReshowDelay = 100; // + // numericUpDownMarginVertical + // + this.numericUpDownMarginVertical.Location = new System.Drawing.Point(380, 153); + this.numericUpDownMarginVertical.Maximum = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + this.numericUpDownMarginVertical.Name = "numericUpDownMarginVertical"; + this.numericUpDownMarginVertical.Size = new System.Drawing.Size(44, 21); + this.numericUpDownMarginVertical.TabIndex = 21; + // + // labelMarginVertical + // + this.labelMarginVertical.AutoSize = true; + this.labelMarginVertical.Location = new System.Drawing.Point(325, 155); + this.labelMarginVertical.Name = "labelMarginVertical"; + this.labelMarginVertical.Size = new System.Drawing.Size(42, 13); + this.labelMarginVertical.TabIndex = 20; + this.labelMarginVertical.Text = "Vertical"; + // // Settings // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1092, 574); this.Controls.Add(this.labelUpdateFileTypeAssociationsStatus); - this.Controls.Add(this.panelToolBar); this.Controls.Add(this.panelVideoPlayer); + this.Controls.Add(this.panelToolBar); this.Controls.Add(this.panelTools); this.Controls.Add(this.panelWaveform); this.Controls.Add(this.panelGeneral); @@ -5437,6 +5463,7 @@ this.groupBoxProxyAuthentication.ResumeLayout(false); this.groupBoxProxyAuthentication.PerformLayout(); this.panelFileTypeAssociations.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMarginVertical)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -5856,5 +5883,7 @@ private System.Windows.Forms.PictureBox pictureBoxWebVttProperties; private System.Windows.Forms.PictureBox pictureBoxIttProperties; private System.Windows.Forms.PictureBox pictureBoxWebVttStyle; + private System.Windows.Forms.NumericUpDown numericUpDownMarginVertical; + private System.Windows.Forms.Label labelMarginVertical; } } \ No newline at end of file diff --git a/src/ui/Forms/Options/Settings.cs b/src/ui/Forms/Options/Settings.cs index dce4b861e..bc40c0023 100644 --- a/src/ui/Forms/Options/Settings.cs +++ b/src/ui/Forms/Options/Settings.cs @@ -266,6 +266,16 @@ namespace Nikse.SubtitleEdit.Forms.Options comboBoxlVideoPlayerPreviewFontSize.SelectedIndex = 3; } + var verticalMargin = gs.VideoPlayerPreviewVerticalMargin; + if (verticalMargin >= numericUpDownMarginVertical.Minimum && verticalMargin <= numericUpDownMarginVertical.Maximum) + { + numericUpDownMarginVertical.Value = verticalMargin; + } + else + { + numericUpDownMarginVertical.Value = 10; + } + numericUpDownMpvOutline.Value = gs.MpvPreviewTextOutlineWidth; numericUpDownMpvShadowWidth.Value = gs.MpvPreviewTextShadowWidth; checkBoxVideoPlayerPreviewFontBold.Checked = gs.VideoPlayerPreviewFontBold; @@ -642,6 +652,9 @@ namespace Nikse.SubtitleEdit.Forms.Options buttonMpvPrimaryColor.Text = LanguageSettings.Current.SubStationAlphaStyles.Primary; buttonMpvOutlineColor.Text = LanguageSettings.Current.SubStationAlphaStyles.Outline; buttonMpvBackColor.Text = LanguageSettings.Current.SubStationAlphaStyles.Shadow; + labelMarginVertical.Text = language.PreviewVerticalMargin; + numericUpDownMarginVertical.Left = labelMarginVertical.Right + 5; + checkBoxVideoPlayerPreviewFontBold.Text = language.SubtitleBold; var left = labelVideoPlayerPreviewFontName.Left + 5 + Math.Max(labelVideoPlayerPreviewFontName.Width, labelVideoPlayerPreviewFontSize.Width); @@ -2020,6 +2033,7 @@ namespace Nikse.SubtitleEdit.Forms.Options gs.VideoPlayerShowFullscreenButton = checkBoxVideoPlayerShowFullscreenButton.Checked; gs.VideoPlayerPreviewFontName = comboBoxVideoPlayerPreviewFontName.SelectedItem.ToString(); gs.VideoPlayerPreviewFontSize = int.Parse(comboBoxlVideoPlayerPreviewFontSize.Items[0].ToString()) + comboBoxlVideoPlayerPreviewFontSize.SelectedIndex; + gs.VideoPlayerPreviewVerticalMargin = (int)numericUpDownMarginVertical.Value; gs.VideoPlayerPreviewFontBold = checkBoxVideoPlayerPreviewFontBold.Checked; gs.MpvPreviewTextPrimaryColor = panelMpvPrimaryColor.BackColor; gs.MpvPreviewTextOutlineColor = panelMpvOutlineColor.BackColor; diff --git a/src/ui/Logic/Language.cs b/src/ui/Logic/Language.cs index 7ee6cd7b4..b143f9581 100644 --- a/src/ui/Logic/Language.cs +++ b/src/ui/Logic/Language.cs @@ -2616,6 +2616,7 @@ can edit in same subtitle file (collaboration)", ShowFullscreenButton = "Show fullscreen button", PreviewFontName = "Subtitle preview font name", PreviewFontSize = "Subtitle preview font size", + PreviewVerticalMargin = "Vertical margin", MainWindowVideoControls = "Main window video controls", CustomSearchTextAndUrl = "Custom search text and URL", WaveformAppearance = "Waveform appearance", diff --git a/src/ui/Logic/LanguageStructure.cs b/src/ui/Logic/LanguageStructure.cs index a04e76159..a16ea426a 100644 --- a/src/ui/Logic/LanguageStructure.cs +++ b/src/ui/Logic/LanguageStructure.cs @@ -2463,6 +2463,7 @@ namespace Nikse.SubtitleEdit.Logic public string ShowFullscreenButton { get; set; } public string PreviewFontName { get; set; } public string PreviewFontSize { get; set; } + public string PreviewVerticalMargin { get; set; } public string MainWindowVideoControls { get; set; } public string CustomSearchTextAndUrl { get; set; } public string WaveformAppearance { get; set; }