From 297c5a7db3d7359f3a445758c4ac8a8b4887391e Mon Sep 17 00:00:00 2001 From: Jakob Haufe Date: Tue, 29 Sep 2020 10:49:35 +0200 Subject: [PATCH] New upstream version 3.4.2 --- icons/dark/16/search-duration_active.png | Bin 317 -> 369 bytes icons/dark/16/search-duration_active@2x.png | Bin 574 -> 722 bytes icons/dark/16/search-duration_disabled.png | Bin 317 -> 567 bytes icons/dark/16/search-duration_disabled@2x.png | Bin 574 -> 1070 bytes icons/dark/16/search-duration_normal.png | Bin 317 -> 537 bytes icons/dark/16/search-duration_normal@2x.png | Bin 574 -> 1066 bytes icons/dark/16/search-time_active.png | Bin 322 -> 208 bytes icons/dark/16/search-time_active@2x.png | Bin 406 -> 253 bytes icons/dark/16/search-time_disabled.png | Bin 382 -> 245 bytes icons/dark/16/search-time_disabled@2x.png | Bin 480 -> 353 bytes icons/dark/16/search-time_normal.png | Bin 379 -> 236 bytes icons/dark/16/search-time_normal@2x.png | Bin 483 -> 328 bytes icons/light/16/search-duration_active.png | Bin 317 -> 343 bytes icons/light/16/search-duration_active@2x.png | Bin 574 -> 676 bytes icons/light/16/search-duration_disabled.png | Bin 317 -> 542 bytes .../light/16/search-duration_disabled@2x.png | Bin 574 -> 1074 bytes icons/light/16/search-duration_normal.png | Bin 317 -> 567 bytes icons/light/16/search-duration_normal@2x.png | Bin 574 -> 1070 bytes icons/light/16/search-time_active.png | Bin 252 -> 200 bytes icons/light/16/search-time_active@2x.png | Bin 329 -> 248 bytes icons/light/16/search-time_disabled.png | Bin 385 -> 247 bytes icons/light/16/search-time_disabled@2x.png | Bin 489 -> 350 bytes icons/light/16/search-time_normal.png | Bin 382 -> 245 bytes icons/light/16/search-time_normal@2x.png | Bin 480 -> 353 bytes lib/media/src/mpv/mediampv.cpp | 20 +++++++++++++----- lib/media/src/mpv/mediampv.h | 2 ++ minitube.pro | 2 +- src/aboutview.cpp | 2 +- src/channelview.cpp | 2 +- src/iconutils.cpp | 9 +++++++- src/iconutils.h | 2 ++ src/main.cpp | 2 ++ src/mainwindow.cpp | 2 +- src/ytvideo.cpp | 2 +- 34 files changed, 34 insertions(+), 11 deletions(-) diff --git a/icons/dark/16/search-duration_active.png b/icons/dark/16/search-duration_active.png index a1d937283f7857fdf6d1b7e01f282e08a187277d..9f4c7516a3503751e1f5f5437a4e4e7d250ee7e0 100644 GIT binary patch delta 325 zcmV-L0lNOZ0`UTnHGcsnNkl^_T5<>tC=6DGOI{m;xfcV^E0;h&L;K(!3)0V{yO0O+Qa zKBuawNj+7c)fe?Xo}v1rHq^q8j>#Rhub!!knOs$EsRQ-8P=7={3G!A3+f ze$5i1$8NG-Om<{m)I(5Tdk-U>b%-kd*dZ$i<;qcZPNVe zcGT31l1aUZfL?m4IDfHK0DD%k(vAyg$b` XZsjjaEHdTf00000NkvXXu0mjfavGm# delta 273 zcmV+s0q*|s0=)u|HGcr|NklOYF20 zCz^XM+ld768i%Wrh31h=Gn4d!_(J{*C^U~`jvJhZr~@}_i*rsL93+#(&$P&O{xg>H Xy)V44CXG-4015yANkvXXu0mjfl~;QV diff --git a/icons/dark/16/search-duration_active@2x.png b/icons/dark/16/search-duration_active@2x.png index 4a38e7ecb539ef308089a7668f2266fdb538ac52..1b5d46af1590f3b1fd3f1f47523a9f6ebd24e42c 100644 GIT binary patch delta 681 zcmV;a0#^OL1kweNHGcw!Nkl0^qdyR6gFa@ZHAth6VFlg334)5C2v9wHn{uZ>Ui%x`>5c=1)I$| zXT9%w_d5HmwGV9C2AgGZmedX$28MywFa-Pz<1z5i%)YLx0Dnn6z*%50lJ^xbW@fL~ zBtTLFFa{h=_$~mSfw^$M73ct(Jsh|WjGEc+Na6nlZtA8J%dbTj({ zd`iTqD4-?Gzt$_bv-vP@uO&cX&eEj1CGCswD|0T@5`R!$c?;?G0eA!Cfk%?YQ%Y`m z<@5e#Qa~}xot5gnH!~{&M}RYwHtlhsAn8OBE2$pXn~1T}B%N}lbD)-h1TGgc@I7Gf zOX_gXhaB(8T10!C<3y|ghu2_hlmfI-`pz4j&k}GII3IdJb^%UE z7jO<3itz`Y0vF8eeVSv|ACo-GKPGLIj^j|u#3CH<1bAR(-?H#-+J@RcQ|@p*L+^Zz P00000NkvXXu0mjfhUGf8 delta 532 zcmV+v0_*+K1-=B3HGcu~Nkl@iP2IT!cPyvd-9&jC%K#L4;4AhnD0+@*+aSYf5YC`-3Y=2>PAq{lNO3S-#@u^G9 zx^Ogw9^gdC-hpKxu850^Z&hMXgew$cI9px;vJL#sWO-p6xD}35pfiks4GAm*NgqFZ z=8cdPjykZWO`gG=-#aiB;2R{s@>PX1h!1eKeo5i05dg3vex)GCVVv8pxo}zm37mgN z>iZAvF2{n{U4P(JL9E3KurJSfKLN914tL7)*QEaa=@wr|jePSQ{1l)-oRg&f~yXCcVF5eNc z_kIG3Vi%MG!eG&r!xLc(kroXLkr!+!UXD<}D#}s}rhj47FbyOVLGr9{eE^f%pmlWZ zI0#L(V}K5R4kXh}B%k0H0}1>b$*P!^noz_gFlTN@vSXSU$t+@+=^AD?e~mHV2>n=ILV4lB*8CKvpU+`FO6&zKV=7z;^I>umlJ_62!zT}s Wn9ChB;|=lv00006y{6o#LZ(3_id(7A(DRLJB|BQDiN97J$) zlX5BCd%H**5e5H%2u(XgD7{}Rg?4eRxH$$XmUPGuP^usf9jwGga!X!^=7w6M4t=-p zeD8VSJ?FqFWy6ZqYPHyIw{Mu)xS0v~SSpnoi;Ih${{bwDqJJ4+7ATt8ZofV*>4&5R z=iCaQVE~Kc_=Tj~lIDHi->BE?-vOd1Is@DX9!YxboSV%c13(ytGiLTUpU>Z0T3TxM z8_U36k|cY5&s8&fCFz-S&H?1I%w{$xX+CQPFtZ21we0Pj+XfcQ>|qcD{s3@ra4-oJ zec#_0Hq;YZH-EFyk&%(f0YK74;8T|QUrLf>U(#nYyKo#JNq?+V(pO+Qj^j%wzO29A zqans|d`r>_a5+hm{o~Fs4DXuRQ{W9y>vp?dp-^b`dcA4q+}j*LsZ?qJ9gbG@o1Al- zolfVbnSC1@8$0woZ%R@-P16QI9$;&0>#$O(bb%)m6Mqx$c6N5Y9EY@8t+d%}zAu-{ zS0vTU?D^{I>h>T)mMe;)I&cT50qa?uAPCNSo;L+lfz2dI<~Vss86=M5P*T;*MkVb^ zvRp2APEy;OYF20 zCz^XM+ld768i%Wrh31h=Gn4d!_(J{*C^U~`jvJhZr~@}_i*rsL93+#(&$P&O{xg>H Xy)V44CXG-4015yANkvXXu0mjfS)F>+ diff --git a/icons/dark/16/search-duration_disabled@2x.png b/icons/dark/16/search-duration_disabled@2x.png index 4a38e7ecb539ef308089a7668f2266fdb538ac52..101333a9f1cf4a3dcc3259408daf5c46b2154177 100644 GIT binary patch delta 1032 zcmV+j1o!*C1g;2>HGc!+Nkl%X}L4&Ca^vOFOHgZJjvKk$?=L9Ua&-z9`t7 zpAR{K<4w{ebg-9wa5?9m-*8I?lY(pvg^919Dm0d2QUVp-&{;YceK`b zgb-^&h^vc>i@)Df1BpapSO}41<`>$`yFo;A>2!MYNCu>oL1vyKqPKnAJt8VF^9~Ua zfPQ8U0|;3h29O7ERw?yw#|EaRrh2=&x^e)Xw-PREt@Gt_d1Gm5sbceEv6vGIg(A#6 z3E;I_ZX)`YnSbL-sdC!}q?ADbmo4$z%zP%3$^6{RunpIBpAG~9pEC1fW@sJ2Ta9Ky zG)lnCbC&pq<2V!TiUU9{m%AZ^cm+Uh4ZH~8Y$I;n3?veXVIum{#Qq2dgA)r23xE1~ zGcz+Mwbm0vR7j`OUpGo_UgHXYlK@z2{c<*&{l(_g&3}LpB5A~#nP(b_qZ)i1KoYDf1~>z=Z<+Hxn;-V92qp8#Az)xk@i=M6M9U=EoYE*@39 z24=og>mM8(*cx@OV9d08rBbQoA<{02#o~_uN&rAaV|L7M;88>R&A-o&g4Na40|2*d zjb;XpnSb`~y%M*uYue+78DIcl=C+HJ*7~XG>FLw0cveo`)BrQre)%!901^Gl%v(e> zz|7aAl;@?CJ%{j*n|9Y8_s_t#X`hJ2V$NX(QmNE-CX;y`!21C90K5y}dnsky|7SN40oxrBZn{ zm&@H~*GMg=lyXQZbqfGI&l{;!Dqk3_>q@CNZE{^LAfodyXSWa{H9I@|aEAui67Q>2 zDu44vTx+dA@ssNo+Sb~BLIeps7GrZi9{k-H#ax`>BNQWx*=x%jEGJH05f06 zX0w<5yk_469|HK!+>UCkSEQ8Bv@7m;-iYHkD?~J6hSrP4;zy0RO%EI?We*W$t?I}C zt}yeZ{r&wP{6}>(8Vw8%4n7+Q1SXkz!hg!W-re0DpP!%qt0M!(L=e?4nJFK)1fW1f zI{?7UCs5tzy%t9UxKJn*&Y4=!5N#c~@p$}6A;br$?v9pV=5L7TW2My1R@{#Mn0THy zptT-n<}o5V!OZ<8v}3O8LWr+YsnqRG@;< C)9!8n delta 532 zcmV+v0_***2)+c6HGcu~Nkl@iP2IT!cPyvd-9&jC%K#L4;4AhnD0+@*+aSYf5YC`-3Y=2>PAq{lNO3S-#@u^G9 zx^Ogw9^gdC-hpKxu850^Z&hMXgew$cI9px;vJL#sWO-p6xD}35pfiks4GAm*NgqFZ z=8cdPjykZWO`gG=-#aiB;2R{s@>PX1h!1eKeo5i05dg3vex)GCVVv8pxo}zm37mgN z>iZAvF2{n{U4P(JL9E3KurJSfKLN914tL7)*QEaa=@wr|jePSQ{1l)-oRg&f~yXCcVF5eNc z_kIG3Vi%MG!eG&r!xLc(kroXLkr!+!UXD<}D#}s}rhj47FbyOVLGr9{eE^f%pmlWZ zI0#L(V}K5R4kXh}B%k0H0}1>b$*P!^noz_gFlTN@vSXSU$t+@+=^AD?e~mHV2>n=ILV4lB*8CKvpU+`FO6&zKV=7z;^I>umlJ_62!zT}s Wn9ChB;|=lv0000^p;GC6O#D z#4kh?prAB}gc6C0Hc0~|LW-O($PZj&xw%>I7hnr$C;ll46Y6C4c!`M0@}r=UeLlzKh6F zx7&RuA}r2asvLd`-~q{lAP7#{?e;eSP}MaN*(UkY7;|UdfLIJw-Bs18F(zEVZma5* zBDdD|<~2J7<`tSr?m6cU!Z0)oyw3pKE0Rv9lZeO>$ro`PuapG7?{A2R-)gl^mJPKs zry+pVX0y3b5`W}*eha{-Li0rtMbR0_&j4eV@Xh})jj~Y zrmAa|Zm*ql$9bL)RrQssUbfZ-B68I^H!TUWEE|!`L}a^qgXpDKPsxxbC?>zlUlH66*S&}4AN-f2Lq-Ut=8xeUZB8Mc0Q52m4fVDQ5 zcisnZ8iwIsVWhvTJef>(NbUnz#cwMMfa?HKl7~?gyOYF20 zCz^XM+ld768i%Wrh31h=Gn4d!_(J{*C^U~`jvJhZr~@}_i*rsL93+#(&$P&O{xg>H Xy)V44CXG-4015yANkvXXu0mjfIiGsA diff --git a/icons/dark/16/search-duration_normal@2x.png b/icons/dark/16/search-duration_normal@2x.png index 4a38e7ecb539ef308089a7668f2266fdb538ac52..e6c4ad3608e89ed762aa5ec1f5ee535723c4ba75 100644 GIT binary patch delta 1027 zcmV+e1pNEH1gZ#-HGc!&NklQxQa~&<7F0A5g)%b^QZ^_@H*zCy8%%trj0b*IG$urlS?K6k3YV$}ZS-4Mm8Z zIX>i$PNzwl(1m^314F)X2a=(*Q2C!YApZQmNT|KJT8&fa|(x0J8vIPH^`DY?9m)5kYMw&I9N< z>VsEAWJW3VPum83-|r5?@Dq|x#sudL!??1wwdG7qOayU$u~B=BoQQk~AgeDe19++4N*E0^W~1aJ zopd@q-fD6Hux;DVWHQf?jP}4qk~8(V$5udZxUclsZ$S`@kBp4`k>vTl-y4SExM3KZ zxm@nsdg8wCcOM=eE{I4k0E)=dmSwHSImcE&?{)#eFnhJHLFPF>bBVK1`=Mw-SmP zw*6L(pf*W7&l^-qZ2*Ahc^1hpQESE5ZQFh^&ad|_xD4I9MdYJ$xqN>+2J~au0D$%N z^?&;Se4w>L!!X`ImM?iBpU?kf7)I1OA2JMMP7Ae#m6esAYPI?q$zA{;IhTAB)-?bC zVHmz6A}jiiRJB@Na9uawYI4u>tV|}e0Kn3hmMfLYyY;vY8;-8&kMaM9C`II25Cm6u zc6Q3iR$VHU%#MzZ5fPaLFdoxh?&|8A8hjWS_^T}g+C*AJW=Ou8;NAkT31Cm3pGB?C zyZ;jw2}yohsZ=f%3WdW)Ia+GDp65MA@@>?rqZNDy;60_(&nFSv`eWiaPM?U3ksK9~ xv#5QJgXA87JrTK{N~ONe<#Idi=-$I!#lJ`#m1^z5mIMF*002ovPDHLkV1nB5=?nk> delta 532 zcmV+v0_**%2)+c6HGcu~Nkl@iP2IT!cPyvd-9&jC%K#L4;4AhnD0+@*+aSYf5YC`-3Y=2>PAq{lNO3S-#@u^G9 zx^Ogw9^gdC-hpKxu850^Z&hMXgew$cI9px;vJL#sWO-p6xD}35pfiks4GAm*NgqFZ z=8cdPjykZWO`gG=-#aiB;2R{s@>PX1h!1eKeo5i05dg3vex)GCVVv8pxo}zm37mgN z>iZAvF2{n{U4P(JL9E3KurJSfKLN914tL7)*QEaa=@wr|jePSQ{1l)-oRg&f~yXCcVF5eNc z_kIG3Vi%MG!eG&r!xLc(kroXLkr!+!UXD<}D#}s}rhj47FbyOVLGr9{eE^f%pmlWZ zI0#L(V}K5R4kXh}B%k0H0}1>b$*P!^noz_gFlTN@vSXSU$t+@+=^AD?e~mHV2>n=ILV4lB*8CKvpU+`FO6&zKV=7z;^I>umlJ_62!zT}s Wn9ChB;|=lv0000 diff --git a/icons/dark/16/search-time_active.png b/icons/dark/16/search-time_active.png index 4196de9b4c3af95a03ce7622ed641cc222d24b8f..9696953b4350c70671d21fb796b5ed273cde5405 100644 GIT binary patch delta 162 zcmV;T0A2sW0?+}FHh+alL_t(Ijop$x4uU`sM&E8cfT89bP+RG-yp^RrXMu17pM|?* zHG*iP@l})gelo?t&!LWQYig?w-q<=%)&{i!h^b=_RB4{QpwKGdP!`0e_GKc#rdV{q zd1ZK)hqB-lLO8BTtCR1O)9?7Bf(uZq;Z-1c>Xez5joL4K;2R@-{>1Nd1zLiGde-KJ Q`2YX_07*qoM6N<$g6)$}YybcN delta 277 zcmV+w0qXwH0m1^1Hh=d?L_t(IjjfO|PQySDMW5GEB)fAJikx9BBzI7*kWEeKxdA8Q z0vrG-XRu<)M@Wi5<37b|XeP+OZnP47X|ywc=l|JR_-8z8B;RLx-q&^gQdQL|&vTll z399?P$9vB-O&{YpJ^^n4SZm+C_a{k&_x@z9JpvejuIpCDn15yJp2nDE+qPE#3xJ|1 z0Jgx8=y6?^<=t21oD&f#LY*SA7LkqS8?6iHoP6txjZ)E0^WE9(rzUD}0RsAovuTea zGH5>N^j}=mP4|14J$)VG=9)#oEQ@hjmc3rwC-h-+E~Gi*0Nljf1GokDbD~p15@WBL bzvB}nx6b(#Bn~|v00000NkvXXu0mjf)jWhB diff --git a/icons/dark/16/search-time_active@2x.png b/icons/dark/16/search-time_active@2x.png index 417dd9ba6ce2bdb711a08174ce61f4ebf74e6ac5..0c92bb8813ab7ef34034a60d49c5cff87240cde2 100644 GIT binary patch delta 208 zcmV;>05AWR1N{MzHGcrINkld3wZXbs|5kjr4AT?2&6IqBbB<8vj1F+3a3}DN1 zd*2OKKz4FRgkONKBVyu506PE=p|)#0YXp4p>V1aVF7f0t;S&+<_!?>pV(o_~iRagk zp^Kn^SaaQILSsK4Ia?5Gu97B%AYtRqIi3MiVU8RmKZ(Bz6cxcjWCs+|K!ng9jB zGw~f)v~4>DZ~!y&9^2hU?=*vRLDCM`_SBEfj2i_MZBh)dtw(eLpu29lDb zlJ2oyz$BHD5_DI{vTT!5T1CX7=it4&&p(R%b({b$&^iKG-pEY=0000V^0saDzHGcs!Nkl%kF_^0SLp;4F-b~5vf-hQ-4*zX0zExmStxKpxfFtJMHrRCQ4?pce$e3tF+3-t%{S17|OMQd}^C$N&HU07*qoM6N<$f{Xo~N&o-= diff --git a/icons/dark/16/search-time_disabled@2x.png b/icons/dark/16/search-time_disabled@2x.png index 7b388eff629ca2c07b7c1ff850aca8b897a735af..4b22ab733f0b899030ac394ca696b269542a11f4 100644 GIT binary patch delta 308 zcmV-40n7g21K|RYHh&gLL_t(oh3%FxZo@DPML&Z&2WUF?DDBer49#wE@g;N#FLFKR z67|#`rGPah*<-_C7p1TT8L0{-K>_`ZBFO(l8n%I?q!VK19W!swRd@4?UbmsY;yo8 z%W~&CzxoOiKmter3BU`Wl!^{E*V8@h0KgdY8WTb(wP@RRZNtMjH~ARZf3{};8)M9d znWF$0V?ablk1fw}ZgNW^%0;AsokV1H0N#lxKSS@Nf2?oXZEJI+`H-go0000 zJ}L@h_3gy73-o~JL`9V|;`M{5Z8t7x#qP_%qvJS-Qc66}V}Cdt0#L8l_2b;YU@!on zR;w|cP8pBK%;)nL;23yHcA)1t&S|632!#+Lm*N(}FbwWInzPRZ1=styb$&DRmB9b-Ue*O}R9kLOh_9>HrSV z(dE)8%7oXzYjoA+wCwuf$))r6wqcyC=K7`ySJ2KtR&$v&VODePO_&>FCd`U46Bg0| z3>q$tfOm7a+Y0VLnXf3D^@rOv`Hm!gQ%q_@&2FMySG_(A1FbOmb;?xvm%6Sm?=ZDs0qlVy&+}>1G*3$&*xB|bBC4!qE1&=vl6$O> zv tq5X*|rMaX%FdI4eWP2MC)u)?(FE?cUK>4AHW?=vT002ovPDHLkV1nKQSJMCh delta 335 zcmV-V0kHn;0s8`wHGcsxNklcCo7UR6*XzA6m&>CH zKoA72vSI)csdYM?LjVI%uh#({fq6-flSZR){%sIN5pf(}1wrt+KRKC9j*T&0-}gtV z8YW3HPSf-)ilUF5vx-)!YN)C+m(Nr+%+nMa`~VA3$uiUF^jcNtZrfZ{!#pmlG1+3f z-9A;T)mvBIB}hp!2FT-b4FE($ia6i*NBg~<6O1ukVBpGuF{Zo672+8<{cR|NGhm%1 hE*xP?#@cEAjxVaTfT5Vt%`yN0002ovPDHLkV1nu@oHhUe diff --git a/icons/dark/16/search-time_normal@2x.png b/icons/dark/16/search-time_normal@2x.png index 0a1b0c63a2a52a297ddf51bbe4623010441509f5..2e59fd4bc4e9c388f5900da64d6dcbeada6ad110 100644 GIT binary patch delta 284 zcmV+%0ptGT1IPl9HGcs8NklnxtnXYtk5GuQrfH3pD$?nbFLDyJJ}kMMd98RS&BA_FH{d7tFd&HBaeVOaoQD z1)hNoumTW~#aOcx_eh@yUVxp5yhZ_>bFG=(PjkaC+yGQnm4CE`FZx;$dHe`wD=@RW za8Ro81$~=oundZ;pO__T<`Dw?xe7q^Kj6JzH%)WQY1DPyI`&~kZy>ihKwZ~|SpMHv zPyh-*0Vn`b05i)Dc5Y^v^Z?GeZB7U?TlRhbG=}ffTKFd10}r{3&uI1}3s1QNTE?5m iED!8QkD{VaofQCpt6A7POE*{m0000M5chE<~q=X#RX8@TzX7c)LbVM9s_MAtV946 z8}48MIt`bGkWX`%d4)%y!S^5X9^B~WQ&gyf{5j%yNHHrgfhFb707YX-#wu?QCSk?^ iWh0DcuJaN9Lwo=U*B}~d1=y$n0000@n^+?}qWwcr3HlhIgZa!^9o=wpQ6_Q}$?F+z4GWolGk;>*`Q&QY?&SDB_HtY= zu2X@TAU8wgy2x4%SExnKL|{eQsP`!Z-tdCutiV`tV_tE9)f}Hh&IG&CvDFJi_HmCh z%%Kr(cd|j>P3)G~uHgi;IK_i#Vit$eIX6p0U?XB$MTZG4BcPYNP9rK0aqgGbcqpCo x2)EKdFbdnPd?a$2QUzOBiv1vjKFccq8DGN_G%Obp-m(Ay002ovPDHLkV1lfliOm22 delta 273 zcmV+s0q*|S0=)u|HGcr|NklOYF20 zCz^XM+ld768i%Wrh31h=Gn4d!_(J{*C^U~`jvJhZr~@}_i*rsL93+#(&$P&O{xg>H Xy)V44CXG-4015yANkvXXu0mjfd7XOl diff --git a/icons/light/16/search-duration_active@2x.png b/icons/light/16/search-duration_active@2x.png index 4a38e7ecb539ef308089a7668f2266fdb538ac52..cdb735d93c5d3f3db83d0f13507c967959c43c16 100644 GIT binary patch delta 634 zcmV-=0)_p)1f&I!HGcwGNklZvovngzY8mAAjR0p8TtT=18+yUiI*J4gWX{jcL+}I_W{L5afL(F? zu0#^4fJd0h#i%J@WgK7Q*E|aNi8r|zH3ck-UPQkM?5pA16rWAvViDm1 zY3l4NAs|7EFasZ>?+u|kCfJeT-CsnsHe-0Yf`9~@gxc{At1|b8GQ4Z*k&H-FanBq? zG+;yKx>uTtFO?zKoN;()_F_~9tCx^P(7&t-5A$MCYAVbvd#4(X3cyU>o4PWN5h#D|K!3;2Kd4T1BJ Uw=&*%d;kCd07*qoM6N<$g52vc5C8xG delta 532 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 Wn9ChB;|=lv0000`; diff --git a/icons/light/16/search-duration_normal.png b/icons/light/16/search-duration_normal.png index a1d937283f7857fdf6d1b7e01f282e08a187277d..4f83f8da39512bff9bf29940cccad5529d060f7a 100644 GIT binary patch delta 525 zcmV+o0`mR60=EQ^HGcu@Nkl6y{6o#LZ(3_id(7A(DRLJB|BQDiN97J$) zlX5BCd%H**5e5H%2u(XgD7{}Rg?4eRxH$$XmUPGuP^usf9jwGga!X!^=7w6M4t=-p zeD8VSJ?FqFWy6ZqYPHyIw{Mu)xS0v~SSpnoi;Ih${{bwDqJJ4+7ATt8ZofV*>4&5R z=iCaQVE~Kc_=Tj~lIDHi->BE?-vOd1Is@DX9!YxboSV%c13(ytGiLTUpU>Z0T3TxM z8_U36k|cY5&s8&fCFz-S&H?1I%w{$xX+CQPFtZ21we0Pj+XfcQ>|qcD{s3@ra4-oJ zec#_0Hq;YZH-EFyk&%(f0YK74;8T|QUrLf>U(#nYyKo#JNq?+V(pO+Qj^j%wzO29A zqans|d`r>_a5+hm{o~Fs4DXuRQ{W9y>vp?dp-^b`dcA4q+}j*LsZ?qJ9gbG@o1Al- zolfVbnSC1@8$0woZ%R@-P16QI9$;&0>#$O(bb%)m6Mqx$c6N5Y9EY@8t+d%}zAu-{ zS0vTU?D^{I>h>T)mMe;)I&cT50qa?uAPCNSo;L+lfz2dI<~Vss86=M5P*T;*MkVb^ zvRp2APEy;OYF20 zCz^XM+ld768i%Wrh31h=Gn4d!_(J{*C^U~`jvJhZr~@}_i*rsL93+#(&$P&O{xg>H Xy)V44CXG-4015yANkvXXu0mjfS)F>+ diff --git a/icons/light/16/search-duration_normal@2x.png b/icons/light/16/search-duration_normal@2x.png index 4a38e7ecb539ef308089a7668f2266fdb538ac52..101333a9f1cf4a3dcc3259408daf5c46b2154177 100644 GIT binary patch delta 1032 zcmV+j1o!*C1g;2>HGc!+Nkl%X}L4&Ca^vOFOHgZJjvKk$?=L9Ua&-z9`t7 zpAR{K<4w{ebg-9wa5?9m-*8I?lY(pvg^919Dm0d2QUVp-&{;YceK`b zgb-^&h^vc>i@)Df1BpapSO}41<`>$`yFo;A>2!MYNCu>oL1vyKqPKnAJt8VF^9~Ua zfPQ8U0|;3h29O7ERw?yw#|EaRrh2=&x^e)Xw-PREt@Gt_d1Gm5sbceEv6vGIg(A#6 z3E;I_ZX)`YnSbL-sdC!}q?ADbmo4$z%zP%3$^6{RunpIBpAG~9pEC1fW@sJ2Ta9Ky zG)lnCbC&pq<2V!TiUU9{m%AZ^cm+Uh4ZH~8Y$I;n3?veXVIum{#Qq2dgA)r23xE1~ zGcz+Mwbm0vR7j`OUpGo_UgHXYlK@z2{c<*&{l(_g&3}LpB5A~#nP(b_qZ)i1KoYDf1~>z=Z<+Hxn;-V92qp8#Az)xk@i=M6M9U=EoYE*@39 z24=og>mM8(*cx@OV9d08rBbQoA<{02#o~_uN&rAaV|L7M;88>R&A-o&g4Na40|2*d zjb;XpnSb`~y%M*uYue+78DIcl=C+HJ*7~XG>FLw0cveo`)BrQre)%!901^Gl%v(e> zz|7aAl;@?CJ%{j*n|9Y8_s_t#X`hJ2V$NX(QmNE-CX;y`!21C90K5y}dnsky|7SN40oxrBZn{ zm&@H~*GMg=lyXQZbqfGI&l{;!Dqk3_>q@CNZE{^LAfodyXSWa{H9I@|aEAui67Q>2 zDu44vTx+dA@ssNo+Sb~BLIeps7GrZi9{k-H#ax`>BNQWx*=x%jEGJH05f06 zX0w<5yk_469|HK!+>UCkSEQ8Bv@7m;-iYHkD?~J6hSrP4;zy0RO%EI?We*W$t?I}C zt}yeZ{r&wP{6}>(8Vw8%4n7+Q1SXkz!hg!W-re0DpP!%qt0M!(L=e?4nJFK)1fW1f zI{?7UCs5tzy%t9UxKJn*&Y4=!5N#c~@p$}6A;br$?v9pV=5L7TW2My1R@{#Mn0THy zptT-n<}o5V!OZ<8v}3O8LWr+YsnqRG@;< C)9!8n delta 532 zcmV+v0_***2)+c6HGcu~Nkl@iP2IT!cPyvd-9&jC%K#L4;4AhnD0+@*+aSYf5YC`-3Y=2>PAq{lNO3S-#@u^G9 zx^Ogw9^gdC-hpKxu850^Z&hMXgew$cI9px;vJL#sWO-p6xD}35pfiks4GAm*NgqFZ z=8cdPjykZWO`gG=-#aiB;2R{s@>PX1h!1eKeo5i05dg3vex)GCVVv8pxo}zm37mgN z>iZAvF2{n{U4P(JL9E3KurJSfKLN914tL7)*QEaa=@wr|jePSQ{1l)-oRg&f~yXCcVF5eNc z_kIG3Vi%MG!eG&r!xLc(kroXLkr!+!UXD<}D#}s}rhj47FbyOVLGr9{eE^f%pmlWZ zI0#L(V}K5R4kXh}B%k0H0}1>b$*P!^noz_gFlTN@vSXSU$t+@+=^AD?e~mHV2>n=ILV4lB*8CKvpU+`FO6&zKV=7z;^I>umlJ_62!zT}s Wn9ChB;|=lv0000ID0muQ6Hh+CdL_t(Ijos2Q4uU`sh2f742Qbu}18XWhmbbE`_bd=^05pqP z4Vs0D_>##^X5RZV#d1VF_w3FXFyR#6wOV!q8VC_^LABw63fB}6R_(tPpiBl2beZ9H zX;Q!)w@kpxx99XX{Sjb9jUppcMDLgm8}z>az|ZPq<^Y-j!xPpZ+UHQ~&j0`b07*qo IM6N<$g1wqWuK)l5 delta 206 zcmV;<05Si_0sH}wHh-~6L_t(IjjfZ-4Z<)Cg})#!-GL=I!x^cZ33IR)8!$w>LphKY zdI|?zFp*Qah$mUHU*cywKk#Q<#1^j~fdpiyC7{&;2^bd$jKBjRh(PvF`Gv4n!42r0 ziCf^Hi3~KA%^M(!A0=)mx}F;$0-gAs5_1dGkO5W&dFFEty+>5DI9rX^d?)dzc`fdp zqivPM22PGiD zF=beR2{^?Bww(1AzH^681EZLL=JTbV8)Ps4h^#;>R{4KF0z(rp0TVERm_Q4$V5WXJ z`Rlc^!~opy&i4NlLcnY1zlHenEtqzR+Jk<6J|S3mny{{dBqz#Y( zyn+W_mL$m*zyX+<8_}+(J2UILNHuU8$*;|fUVxb$i=sG;p+iFm-Q48Uhx(TQNl{X6 zW_kyhnIz?sBD9}amgUkpR{@KWi_bB}z4yNU^z!fN2KG5Zz6hs6`Tzg`07*qoM6N<$ Ef-(GGaR2}S delta 341 zcmV-b0jmD@0f7UMHGcs%Nkl-OhprPDoZK9Qp_EyuH z?I^ZG{$U~U2lxOJKR`;#ZMFd+(L$?55{ns|fh_A1H_@BCOx~S$@7y==&$#nd`Cj~a z*=#l+YPDKjL};~IrRv#ihI5WA%ifmD!UR4YrBD&pf9|0TyXsrRBL}XeqL04;izBNeGl+|i=6^7xuI6NASPOPxs3Lr@m%ESQH+5qVJwr8yk!Z2JXNwS-&O7!9;+Z8q#4u?0+xt=km z8^`e!7>I}zIZk8Dc%#`d5RqqV?Y(aYN~wuo;|Eu2;7w#7mw$N!m2b*EtibKX3vl|| nP!4CnJWpJB!d0xf*Zdvdk++F*bfV|y00000NkvXXu0mjfZTg{& diff --git a/icons/light/16/search-time_disabled@2x.png b/icons/light/16/search-time_disabled@2x.png index 992f29bf871e3bf0d032b24a568cd1f5be376cd7..1472701a19376088fdb2868b00c97c8fc29e81b6 100644 GIT binary patch delta 305 zcmV-10nYyE1Kt9VHh&XIL_t(oh3%FxZo@DPML+F22S~ceLyyufZO@SGg0=V%I)oPj zU2}T<5P8Rx<4ws{NfU`NF90j0Kcvb5PT1mWx3K??^7CeUAGE7n8698HV1&V zZFiygpRXVTWPl8i0fGS5+T>t!J^kPS07|KKN(gIhQP=gx9lxfzqmPmMXL|y$RZ4A{ zITZs$jVc%3B~3&<+$0if0Prdz`U<_X{;|FRUB_CP1)=JL00000NkvXXu0mjf DoqLL1 delta 445 zcmV;u0Yd)X0_g*gHh-Q;L_t(oh3%KIPQpMK$A8y2kaz>cjlkmG_ymSWpsP-7B$wdE zWSB@?m~?0uUBs11AAkoi;Q^Se8>RyTQ|sWNrIb=jPh-L_`O@CkyZe8={x5CeKspm0 ze>I*^hq3WitX%^}z*}r!m@}f|Jw10VDkvi7b>O8^shl{DgMV$?xULI8x7$s>&n*lF z0|1m#Os7-E<1xPPzXNB$YrKF_xm>>J^?FMwWhs~94i<~WvfuBQeBXZrE@AxGdG0+3P~FCeZF-v!1ILaeoq;vK>;oCHD8QcBH= z6n0(r)UvF5A%DbqG{3O|Cd2`hQnMfkTJd~zJ;H=sCWgb|jS%7rxNW!F*V}SQI)!*Z z2+;wKflgX3iK0w+2Q2h4Etkr^FP>aFzrGFQY;40QSw2X(%`kT)3Vi%+_v2{!R(t?`i5p$5#!{|}Hg=A^9h n>c_-OnILa?`p!*0;(y2oc{|{{fNWJ&00000NkvXXu0mjfqt4Y^ diff --git a/icons/light/16/search-time_normal.png b/icons/light/16/search-time_normal.png index 59f9bc97a16a2deab1e62e1c97f43bb62b4f1abc..82972a22244478fee5c52b6f238cb3124488e222 100644 GIT binary patch delta 200 zcmV;(05|{s0`&oqHGcrANkl%AYtRqIi3MiVU8RmKZ(Bz6cxcjWCs+|K!ng9jB zGw~f)v~4>DZ~!y&9^2hU?=*vRLDCM`_SBEfj2i_MZBh)dtw(eLpu29lDb zlJ2oyz$BHD5_DI{vTT!5T1CX7=it4&&p(R%b({b$&^iKG-pEY=0000V^0saDzHGcs!Nkl%kF_^0SLp;4F-b~5vf-hQ-4*zX0zExmStxKpxfFtJMHrRCQ4?pce$e3tF+3-t%{S17|OMQd}^C$N&HU07*qoM6N<$f{Xo~N&o-= diff --git a/icons/light/16/search-time_normal@2x.png b/icons/light/16/search-time_normal@2x.png index 7b388eff629ca2c07b7c1ff850aca8b897a735af..4b22ab733f0b899030ac394ca696b269542a11f4 100644 GIT binary patch delta 308 zcmV-40n7g21K|RYHh&gLL_t(oh3%FxZo@DPML&Z&2WUF?DDBer49#wE@g;N#FLFKR z67|#`rGPah*<-_C7p1TT8L0{-K>_`ZBFO(l8n%I?q!VK19W!swRd@4?UbmsY;yo8 z%W~&CzxoOiKmter3BU`Wl!^{E*V8@h0KgdY8WTb(wP@RRZNtMjH~ARZf3{};8)M9d znWF$0V?ablk1fw}ZgNW^%0;AsokV1H0N#lxKSS@Nf2?oXZEJI+`H-go0000 zJ}L@h_3gy73-o~JL`9V|;`M{5Z8t7x#qP_%qvJS-Qc66}V}Cdt0#L8l_2b;YU@!on zR;w|cP8pBK%;)nL;23yHcA)1t&S|632!#+Lm*N(}FbwWInzPRZ1=styb$&DRmB9b-Ue*O}R9kLOh_9>HrSV z(dE)8%7oXzYjoA+wCwuf$))r6wqcyC=K7`ySJ2KtR&$v&VODePO_&>FCd`U46Bg0| z3>q$tfOm7a+Y0VLnXf3D^@rOv`Hm!gQ%q_@&2FMySG_(A1FbOmbprocessEvents(); - - const QByteArray audioUtf8 = audio.toUtf8(); - const char *args2[] = {"audio-add", audioUtf8.constData(), nullptr}; - sendCommand(args2); + // We are playing audio as separate file. The add audio command must executed when the main file is loaded + // Otherwise the audio file doesn't gets played + audioFileToAdd = audio; + qApp->processEvents(); clearTrackState(); } @@ -320,6 +327,8 @@ Media::State MediaMPV::state() const { } void MediaMPV::play(const QString &file) { + audioFileToAdd.clear(); + const QByteArray fileUtf8 = file.toUtf8(); const char *args[] = {"loadfile", fileUtf8.constData(), nullptr}; sendCommand(args); @@ -366,6 +375,7 @@ void MediaMPV::setUserAgent(const QString &value) { } void MediaMPV::enqueue(const QString &file) { + audioFileToAdd.clear(); const QByteArray fileUtf8 = file.toUtf8(); const char *args[] = {"loadfile", fileUtf8.constData(), "append", nullptr}; sendCommand(args); diff --git a/lib/media/src/mpv/mediampv.h b/lib/media/src/mpv/mediampv.h index 1621148..9f8e0c4 100644 --- a/lib/media/src/mpv/mediampv.h +++ b/lib/media/src/mpv/mediampv.h @@ -59,6 +59,8 @@ private: Media::State currentState = Media::StoppedState; bool aboutToFinishEmitted = false; QString lastErrorString; + + QString audioFileToAdd; }; #endif // MEDIAMPV_H diff --git a/minitube.pro b/minitube.pro index d4f247f..652392f 100644 --- a/minitube.pro +++ b/minitube.pro @@ -1,7 +1,7 @@ CONFIG += c++14 exceptions_off rtti_off optimize_full TEMPLATE = app -VERSION = 3.4.1 +VERSION = 3.4.2 DEFINES += APP_VERSION="$$VERSION" APP_NAME = Minitube diff --git a/src/aboutview.cpp b/src/aboutview.cpp index 2c5b456..8820f2d 100644 --- a/src/aboutview.cpp +++ b/src/aboutview.cpp @@ -150,8 +150,8 @@ AboutView::AboutView(QWidget *parent) : View(parent) { buttonLayout->setAlignment(Qt::AlignLeft); closeButton = new QPushButton(tr("&Close"), this); closeButton->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); - closeButton->setDefault(true); + closeButton->setShortcut(Qt::Key_Escape); closeButton->setFocus(); connect(closeButton, SIGNAL(clicked()), MainWindow::instance(), SLOT(goBack())); buttonLayout->addWidget(closeButton); diff --git a/src/channelview.cpp b/src/channelview.cpp index eb6ccf9..0ce9a2c 100644 --- a/src/channelview.cpp +++ b/src/channelview.cpp @@ -150,7 +150,7 @@ QString ChannelView::noSubscriptionsMessage() { } void ChannelView::appear() { - updateQuery(); + updateQuery(true); MainWindow::instance()->showActionsInStatusBar(statusActions, true); setFocus(); ChannelAggregator::instance()->start(); diff --git a/src/iconutils.cpp b/src/iconutils.cpp index b58368e..5246272 100644 --- a/src/iconutils.cpp +++ b/src/iconutils.cpp @@ -33,8 +33,15 @@ void addIconFile(QIcon &icon, icon.addFile(filename, QSize(size, size), mode, state); } } + +QVector sizes; + } // namespace +void IconUtils::setSizes(const QVector &value) { + sizes = value; +} + QIcon IconUtils::fromTheme(const QString &name) { static const QLatin1String symbolic("-symbolic"); if (name.endsWith(symbolic)) return QIcon::fromTheme(name); @@ -62,7 +69,7 @@ QIcon IconUtils::fromResources(const char *name) { QIcon icon; // WARN keep these sizes updated with what we really use - for (int size : {16, 24, 32, 88}) { + for (int size : qAsConst(sizes)) { const QString pathAndName = path + QString::number(size) + QLatin1Char('/') + QLatin1String(name); QString iconFilename = pathAndName + normal + ext; diff --git a/src/iconutils.h b/src/iconutils.h index 00e764e..4db2ed3 100644 --- a/src/iconutils.h +++ b/src/iconutils.h @@ -25,6 +25,8 @@ $END_LICENSE */ class IconUtils { public: + static void setSizes(const QVector &value); + static QIcon fromTheme(const QString &name); static QIcon fromResources(const char *name); diff --git a/src/main.cpp b/src/main.cpp index e2a0c44..6332b1a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -138,6 +138,8 @@ int main(int argc, char **argv) { QNetworkProxyFactory::setUseSystemConfiguration(true); + IconUtils::setSizes({16, 24, 32, 88}); + showWindow(app, pkgDataDir); return app.exec(); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 1cfe622..abf71e5 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -157,7 +157,7 @@ MainWindow::MainWindow() showHome(); #endif - QTimer::singleShot(1000, this, &MainWindow::lazyInit); + QTimer::singleShot(100, this, &MainWindow::lazyInit); } void MainWindow::lazyInit() { diff --git a/src/ytvideo.cpp b/src/ytvideo.cpp index fca388a..1235481 100644 --- a/src/ytvideo.cpp +++ b/src/ytvideo.cpp @@ -245,7 +245,7 @@ void YTVideo::parseFmtUrlMap(const QString &fmtUrlMap) { qDebug() << "available formats" << urlMap.keys(); const QVector &definitions = VideoDefinition::getDefinitions(); - int previousIndex = std::max(definitions.indexOf(definition) - 1, 0); + int previousIndex = std::max(definitions.indexOf(definition), 0); for (; previousIndex >= 0; previousIndex--) { const VideoDefinition &previousDefinition = definitions.at(previousIndex); qDebug() << "Testing format" << previousDefinition.getCode(); -- 2.39.2