From 273598cb3bc4ffb61d4207f0b06ab3f9756359a8 Mon Sep 17 00:00:00 2001 From: niksedk Date: Sat, 16 Sep 2023 20:00:33 +0200 Subject: [PATCH] Add new Layout images - thx jmaraujouy :) --- Icons/Black/Layout.png | Bin 3045 -> 2263 bytes Icons/DarkTheme/Layout.png | Bin 3083 -> 2270 bytes Icons/DefaultTheme/Layout.png | Bin 3074 -> 2298 bytes Icons/Legacy/Layout.png | Bin 3074 -> 2498 bytes src/ui/Forms/Main.cs | 41 ++++++++++++++++++++++++---------- 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/Icons/Black/Layout.png b/Icons/Black/Layout.png index 1be25feb7dcf50708bcaecf6039454701f63c681..5a2983ea41fc77ba528ecfcf2b1d004e5230c4ec 100644 GIT binary patch literal 2263 zcmb_eYitx%7~RUFr3$XvR8ozMQy@H?o#*b(3|*jffo^3>Eh{Ysjd$+c-5uDSna)hR zZNXTpgl9-BkANY9e+VQ5AyGoWKoKE9V+rwr0Zkx4f=0q45+nM>&}9K&%mBhqYuVnvzZWPvC0KN8DXYFus(&&iA7 zs}PxV98;$0OeW*Y@IJ#z(5xg$G{eyxM_~kIcj*r3q;$Kwzz{|@v^3Mv44rTpfnu~f zArf27#gI0Ow7Q+o6V4dj2~3*xF>Xv*pbCpPv)xK%#Z^e76iOrAu`!k{V$G!C7|XZW2|2m7?~3&hL;&82aOu4 z7VjDil_)k4V|l!~7<~^E*Nh4r@KCS{<+x#`0S;J8g9M^YJwX!1G|F{G%CN97cE@L3 zM5A&n}3KtPnjBZU$~R*g%nz$2s<*ydXrZZwb@%<8&QF(c$9 zMPTD1n=cTMF&K- zMr8oq-V2e?Ejl+Nx!c+h>+?vN$j{Ft5hi^=G3I1!Bkp8?g=!OcEgxF!^!?1+pyR>T zS;TPx0mi8S8&q(832sF|Nb!moM1BTvq97DPAJV!cGg6^B9>;nc-tOdz$8b_-4gQ@m;ZPO^xRN@!YiQ*9LwcIJ6mUowEP6$$!7mKc(!abx%k7`d{*$ zd2xBmvqx^On)<~~ZOuRB!i}ClN5jPDmme55x4L7@z^$iB#S_1*8(4Pm*ohCWH<~XT z+&$&j%k=lf0o*H`=lU_`)z8~_T#&}KMy~=R-S&7U2>yh z!}*hyM{WcNXHQRL#Fe94ChhQk_x(z;V#4i)2^Y6FeD1kC#rK!Dru2NX`SRq8spROk z-6zIv7$2#+lR5BC&94c4>#j>>baJP5Zo;@;-}*DhmYurXd%E$$)sq9~?wn0gJC>Bp Zn7?jeTi<&<``k~D$n3`O-dS(={tM`O^Y{P& delta 3032 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 delta 3070 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 diff --git a/Icons/DefaultTheme/Layout.png b/Icons/DefaultTheme/Layout.png index af478ea1b44740253c56410f8eb7d91d5c48c026..ddc7ad9695efa715927318adf8f469bc720e3c0c 100644 GIT binary patch literal 2298 zcmb_eYitx%7@b{cT?!Q<1(66$rlz7eJI{U0(51B9LL1yl+BGebl+N6_yE}AuXPudL zw_8y_#6T$N4+A1#NUhM`UnCG`4P21fB^oJA6d7MToZs zmgBXW4spRrlYpja+#@&{4+B_F=oOr$S(c)`6yqituSl~Z&*8Zrf#`H4BsTe%71V1!@t|m-Xi{loeBx{|f zk3dqhIm8kL*tn6a6RH@Mk`ff-q^+DXfeI+ZB|7zJhFk#@jKUa$*@Hxq^%vZ3Md$kZOX4)~N$n*M(%3TiGPUS{+KJ zrUx}GnqR5qdC54-J867=iyBw7r18?23D7T@&_|$E<4D>=vaTTG5_wu=d6MQtn$Cs> zG(`<{j|~+_#vNohk>^F`{!ru@MKYyF1}i`eX?jdT39B(F45>ssOyGqwinUr)(-ARJ z$7NIm0%AklFr_$v4SpYia(1e!B1#GbE)NKi9$Imeg21z+Bynz1@o*to;$;Cn&CmC1 zpwn7eYkt<{iUttIJ=PE>c)czUGB%6Q0K?Oy08n8(ZrKeP0o@J3JlboziW*IdjzzUp zDF_j8g3L1^FX{3?j^qK)ld{YrST~>{EhxN;l`J>kW6q;gqx=lCkVdXsYNT*(6jc`$ z;N6Vm^70DlQ5cSt+-T%=10Jd7Bv#;|5|X`@l+_w&5}qApfvATwA_7$Bdeu_Uo#SnW zZx$5b8IOt*uzJr&0LyexA#%6Xan|RtDv_I?j6ekX5Hn`k4J~9QB^_3W(ON#z?9_wA z8&cQ9r8AIa-8{0EoAJmb4S0d{N&t|Y?DaqwEwNsn&!;}FbU~zrd>=iD^juj$M2d$Y zdXrPclPB|deUeo5W{Tg27h(1^}Wm6s~W$h%igbQ*^hrHviQu6_0c&!y~NXlr}d)pCH_z5_WSJX zJLs<3(ZQ30=O#^b3{5#&KHPhztY-I~fuSD;Zr&Nad-r$8K^Jp&^PeY*BKEgPisz19+~AGR`pe7)%7z< zKDJHYU9o+^72kv_TZSDoJ4U|SGWGoSzmG(te;w_!+4|4CaBjz?;}@oG;GUUsK79-8 zIAx!)?#s^(E~wjoe#xqhJME6!(TVu6z~TKEJaFun3kSZg*@kThE<1JEQ!;ezo7qCq zjy+|+-FkiHzIA=8N1kskE)HV7K I)wHkw7jYNn+a delta 3061 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 diff --git a/Icons/Legacy/Layout.png b/Icons/Legacy/Layout.png index af478ea1b44740253c56410f8eb7d91d5c48c026..a4ad93747c9a44e2a0f0b8121d86228878c44e30 100644 GIT binary patch literal 2498 zcmbVO3se(l8XZ6ZQCfNEveqNBL#u#JX7Yd}1L2_oc{CuHE_7|TPG%+$NircbK!PB_ zx)v01TY(~?AhlZ-UmV%21wpauS_=h>N2$wVb!|lvq-wQTq}>UR)VB6}EJ^(QD zoJN_-rYc^<2wKO(Nm@nmOgaOH27u6TlL03(C>B&vX&Su@8aZ|X0yU%zN(oY+3d0I2 zT@#aQq*mu9D2dz*LP|p6VPL2U;|O#Vi-RVeR?lE288pF*ackRc1Og`@Y=#VqvS?;lQWWPELk2s zCB|LJpmdfsU=2r57X0+>UBw@!HvW(gZagsnNEv2LMEW=^> zcB~7rDwO~isMSK4ASo402t;aFCE%-I z9G6mJQldh|;^681a+=7pRo1qDvdc-D;5fclm8e8Q5kab8R3Hw5RZ>wfERl-EFey@r z)IwaSLWM!oY>7q<_oCt2Cs}Q-NRCmhCMBqv#9=fjNCNYPoGYoC;==+0rwB?ysVP;k zt(zwr1dGuyT3}6$8S=e+Mkn7aiqUc z{7H3&R%Xm(lb(KR{YTCC|5%?&3z3fN(PUK7ur7)R4^ZpPV`_UX!9*yl5)=ctX`^o7>9Tm}HAnpkC&nec`}j%cwaaD}p35`XJ-WHBgVD!XQ%neP#D)Bp5W1#>&wV>4Xp zijucTQbZRE10-Ji0^4#%tP6+kx4zf5eetc0A=0tCV_o#YriaI!zeEby+gl6XX+G~2 zRqo|ZfK8iMC(z^O;SWN93&Iroc2nuj{YU3j{qiVhqr6;JKH|H zqcRY>dij-COj|qFq>Sbj)Qq{f9F#Km@3$Vamfu*SxIVU|UpBfYk%w%|Z7=ml);juL z8GXhwc4ARuzUDcPfV9+%%l-YjgIWilg$;Yg={r{soLcJ~w=}No!!t+4{694>hW;~l zZDk3+KJdA;-oosLH2@Ip?sa)aS8mDg9c$ytEJ;rJjW1V}1JdESz~2{V9qIA`q8bL> zwtRiuxmKg})>_kM*H#X;o!$8fP@>3KfYe{D-VfZ1e6z?}uI+Q^`Mk8d(eIMQ>w?LA zamMv(*kQ{x{~rHgXNw#bKj_*%2mIH*uM;26^ESQK7k1dGxF>aFtIqS)Wpiq;hxlCI z{NX@VaB{8RMP}d?Vo}xc$`*Bv)0uTI++UOtoe^Ew7y~hHN--y`hSiH^ZZt)?CtEA!1ma^vUNgs)@zPBAk+rno>{3Gy#&YYX{ zve)O9v1ReYYcsnBdNeiP-VL_I=*!=dhR=_t}C$ITx>DQL8n`tI9+p)7(uDn+}uz(m&sE;dovu4A$UsQg+y7lfio(=zg|8G{H z?)1HalbxMxov+c?XZ{0a!!yH98~?Cd)zs9q((}%<13l-k#(8g?CpK&-+_hd@vwV4n zpSZlBueteA%B;P;&i;qe_x4elnT7B6R&4&We2;TtlxsgPOY!Vqo7usGH8SQv-Rlrj z@tvC`p!?MC4&^_}L)?~(BOg~iANGZLR2-0mI5O?=B^SOao$vN|=3~8OPNgH(9n)IG c`?C8xtw$)(ee%dr+gDa>RD%4_^0gcP2TO#tlK=n! delta 3061 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 Configuration.Settings.General.MinimumMillisecondsBetweenLines; private bool _isOriginalActive; private bool IsOriginalEditable => _isOriginalActive && Configuration.Settings.General.AllowEditOfOriginalSubtitle; + private bool IsVideoVisible => _layout != 7; private Subtitle _subtitle = new Subtitle(); private Subtitle _subtitleOriginal = new Subtitle(); @@ -3884,7 +3885,7 @@ namespace Nikse.SubtitleEdit.Forms _findHelper = null; _spellCheckForm = null; - if (panelVideoPlayer.Visible || groupBoxVideo.Visible) + if (IsVideoVisible) { if (!Configuration.Settings.General.DisableVideoAutoLoading) { @@ -3892,7 +3893,7 @@ namespace Nikse.SubtitleEdit.Forms { OpenVideo(videoFileName, audioTrack); } - else if (!string.IsNullOrEmpty(fileName) && (panelVideoPlayer.Visible || toolStripButtonLayout.Checked)) + else if (!string.IsNullOrEmpty(fileName)) { TryToFindAndOpenVideoFile(Utilities.GetPathAndFileNameWithoutExtension(fileName)); } @@ -23503,7 +23504,7 @@ namespace Nikse.SubtitleEdit.Forms left = tabControlModes.Left + tabControlModes.Width + 5; } splitContainerMain.Panel2Collapsed = false; - if (panelVideoPlayer.Visible) + if (IsVideoVisible) { if (audioVisualizer.Visible) { @@ -23554,7 +23555,7 @@ namespace Nikse.SubtitleEdit.Forms } _videoPlayerUndocked.Visible = false; - if (panelVideoPlayer.Visible) + if (IsVideoVisible) { _videoPlayerUndocked.Show(this); if (_videoPlayerUndocked.WindowState == FormWindowState.Minimized) @@ -23578,7 +23579,7 @@ namespace Nikse.SubtitleEdit.Forms } } - if (panelVideoPlayer.Visible || toolStripButtonLayout.Checked) + if (IsVideoVisible) { if (_videoControlsUndocked == null || _videoControlsUndocked.IsDisposed) { @@ -24432,7 +24433,7 @@ namespace Nikse.SubtitleEdit.Forms } openFileDialog1.InitialDirectory = Path.GetDirectoryName(openFileDialog1.FileName); - if (!panelVideoPlayer.Visible) + if (!IsVideoVisible) { _layout = 0; LayoutManager.SetLayout(_layout, Controls, panelVideoPlayer, SubtitleListview1, groupBoxVideo, groupBoxEdit); @@ -24941,7 +24942,7 @@ namespace Nikse.SubtitleEdit.Forms audioVisualizer.Left = tabControlModes.Left + tabControlModes.Width + 5; } - if (!toolStripButtonLayout.Checked && panelVideoPlayer.Visible) + if (!IsVideoVisible) { panelVideoPlayer.Left = tabControlModes.Left + tabControlModes.Width + 5; panelVideoPlayer.Width = groupBoxVideo.Width - (panelVideoPlayer.Left + 10); @@ -28502,6 +28503,9 @@ namespace Nikse.SubtitleEdit.Forms #endregion Networking + + private Control _videoPlayerUndockParent; + private void UnDockVideoPlayer() { bool firstUndock = _videoPlayerUndocked != null && !_videoPlayerUndocked.IsDisposed; @@ -28514,6 +28518,7 @@ namespace Nikse.SubtitleEdit.Forms } Control control = panelVideoPlayer; + _videoPlayerUndockParent = control.Parent; if (control.Parent != null) { control.Parent.Controls.Remove(control); @@ -28531,18 +28536,30 @@ namespace Nikse.SubtitleEdit.Forms public void ReDockVideoPlayer(Control control) { - groupBoxVideo.Controls.Add(control); + if (_videoPlayerUndockParent != null) + { + _videoPlayerUndockParent.Controls.Add(control); + control.Dock = DockStyle.Fill; + } + mediaPlayer.FontSizeFactor = 1.0F; mediaPlayer.SetSubtitleFont(); mediaPlayer.SubtitleText = string.Empty; } + private Control _waveformUndockParent; + private void UnDockWaveform() { _waveformUndocked = new WaveformUndocked(this); var control = audioVisualizer; - groupBoxVideo.Controls.Remove(control); + _waveformUndockParent = control.Parent; + if (_waveformUndockParent != null) + { + _waveformUndockParent.Controls.Remove(control); + } + control.Top = 0; control.Left = 0; control.Width = _waveformUndocked.PanelContainer.Width; @@ -28633,7 +28650,7 @@ namespace Nikse.SubtitleEdit.Forms // ignore } - if (panelVideoPlayer.Visible) + if (IsVideoVisible) { _videoPlayerUndocked.Show(this); if (_videoPlayerUndocked.Top < 0 || _videoPlayerUndocked.Left < 0) @@ -28736,7 +28753,7 @@ namespace Nikse.SubtitleEdit.Forms audioVisualizer.Visible = toolStripButtonLayout.Checked; trackBarWaveformPosition.Visible = toolStripButtonLayout.Checked; panelWaveformControls.Visible = toolStripButtonLayout.Checked; - if (!panelVideoPlayer.Visible) + if (!IsVideoVisible) { HideVideoPlayer(); } @@ -33660,7 +33677,7 @@ namespace Nikse.SubtitleEdit.Forms audioVisualizer.Chapters = Array.Empty(); } - if (!panelVideoPlayer.Visible) + if (!IsVideoVisible) { _layout = 0; LayoutManager.SetLayout(_layout, Controls, panelVideoPlayer, SubtitleListview1, groupBoxVideo, groupBoxEdit);