From 528c8678e1088993cad4f6dbd380b4cce7dab574 Mon Sep 17 00:00:00 2001
From: Alhaziel01 <alhaziel01@gmail.com>
Date: Mon, 29 Jun 2020 19:50:17 +0200
Subject: [PATCH] Piccoli fix a nextep

---
 platformcode/launcher.py                      |   3 +-
 .../skins/Default/720p/NextDialogCompact.xml  |  86 ++++++++++--------
 .../Default/media/NextDialog/background.png   | Bin 2088 -> 0 bytes
 .../skins/Default/media/NextDialog/close.png  | Bin 11255 -> 11023 bytes
 .../skins/Default/media/NextDialog/play.png   | Bin 2135 -> 2117 bytes
 specials/autoplay.py                          |   5 +-
 6 files changed, 52 insertions(+), 42 deletions(-)
 delete mode 100644 resources/skins/Default/media/NextDialog/background.png

diff --git a/platformcode/launcher.py b/platformcode/launcher.py
index 6116e82d..066d6230 100644
--- a/platformcode/launcher.py
+++ b/platformcode/launcher.py
@@ -434,6 +434,7 @@ def play_from_library(item):
     else:
         # Pop-up window
         from specials import videolibrary, autoplay
+        # from core.support import dbg;dbg()
         p_dialog = platformtools.dialog_progress_bg(config.get_localized_string(20000), config.get_localized_string(60683))
         p_dialog.update(0, '')
         item.play_from = 'window'
@@ -442,7 +443,7 @@ def play_from_library(item):
         while platformtools.is_playing(): # Conventional window
             sleep(1)
         play_time = platformtools.resume_playback(item, True)
-        if not play_time:
+        if not play_time and config.get_setting('autoplay'):
             return
 
         # The number of links to show is limited
diff --git a/resources/skins/Default/720p/NextDialogCompact.xml b/resources/skins/Default/720p/NextDialogCompact.xml
index d698b0da..740f674b 100644
--- a/resources/skins/Default/720p/NextDialogCompact.xml
+++ b/resources/skins/Default/720p/NextDialogCompact.xml
@@ -4,12 +4,11 @@
     <onload>Dialog.Close(fullscreeninfo,true)</onload>
     <onload>Dialog.Close(videoosd,true)</onload>
     <controls>
-        <control type="grouplist" id="20">
-            <orientation>horizontal</orientation>
+        <control type="group">
             <top>15</top>
+            <right>0</right>
+            <width>140</width>
             <height>40</height>
-            <itemgap>0</itemgap>
-            <align>right</align>
             <animation type="WindowOpen" reversible="false">
                 <effect type="fade" start="0" end="100" time="400" />
                 <effect type="slide" start="115,0" end="0,0" time="400" />
@@ -18,43 +17,52 @@
                 <effect type="fade" start="100" end="0" time="300" />
                 <effect type="slide" start="0,0" end="115,0" time="300" />
             </animation>
-            <control type="button" id="3012">
-                <label>[B]$INFO[Player.TimeRemaining(secs),,][/B]</label>
-                <height>40</height>
-                <width>80</width>
-                <font>font30_title</font>
-                <textoffsetx>10</textoffsetx>
-                <textcolor>80FFFFFF</textcolor>
-                <focusedcolor>FFFFFFFF</focusedcolor>
-                <selectedcolor>80FFFFFF</selectedcolor>
-                <shadowcolor>22000000</shadowcolor>
-                <aligny>center</aligny>
-                <align>left</align>
-                <texturefocus border="0" colordiffuse="FFFFFFFF">NextDialog/play.png</texturefocus>
-                <texturenofocus border="0" colordiffuse="80FFFFFF">NextDialog/play.png</texturenofocus>
-                <pulseonselect>no</pulseonselect>
-            </control>
-            <control type="button" id="3013">
-                <label></label>
-                <height>40</height>
-                <width>40</width>
-                <font>font30_title</font>
-                <textoffsetx>30</textoffsetx>
-                <textcolor>80FFFFFF</textcolor>
-                <focusedcolor>FFFFFFFF</focusedcolor>
-                <selectedcolor>80FFFFFF</selectedcolor>
-                <shadowcolor>22000000</shadowcolor>
-                <aligny>center</aligny>
-                <align>center</align>
-                <texturefocus border="10" colordiffuse="FFFFFFFF">NextDialog/close.png</texturefocus>
-                <texturenofocus border="10" colordiffuse="80FFFFFF">NextDialog/close.png</texturenofocus>
-                <pulseonselect>no</pulseonselect>
-            </control>
-                <control type="image">
+            <control type="image">
                 <top>0</top>
-                <width>20</width>
+                <right>0</right>
+                <width>100%</width>
+                <height>100%</height>
+                <texture colordiffuse="80232323">white.png</texture>
+            </control>
+            <control type="grouplist" id="20">
+                <orientation>horizontal</orientation>
+                <top>0</top>
+                <right>20</right>
                 <height>40</height>
-                <texture>NextDialog/background.png</texture>
+                <itemgap>0</itemgap>
+                <align>right</align>
+                <control type="button" id="3012">
+                    <label>[B]$INFO[Player.TimeRemaining(secs),,][/B]</label>
+                    <height>40</height>
+                    <width>80</width>
+                    <font>font30_title</font>
+                    <textoffsetx>10</textoffsetx>
+                    <textcolor>80FFFFFF</textcolor>
+                    <focusedcolor>FFFFFFFF</focusedcolor>
+                    <selectedcolor>80FFFFFF</selectedcolor>
+                    <shadowcolor>22000000</shadowcolor>
+                    <aligny>center</aligny>
+                    <align>left</align>
+                    <texturefocus border="0" colordiffuse="FFFFFFFF">NextDialog/play.png</texturefocus>
+                    <texturenofocus border="0" colordiffuse="80FFFFFF">NextDialog/play.png</texturenofocus>
+                    <pulseonselect>no</pulseonselect>
+                </control>
+                <control type="button" id="3013">
+                    <label></label>
+                    <height>40</height>
+                    <width>40</width>
+                    <font>font30_title</font>
+                    <textoffsetx>30</textoffsetx>
+                    <textcolor>80FFFFFF</textcolor>
+                    <focusedcolor>FFFFFFFF</focusedcolor>
+                    <selectedcolor>80FFFFFF</selectedcolor>
+                    <shadowcolor>22000000</shadowcolor>
+                    <aligny>center</aligny>
+                    <align>center</align>
+                    <texturefocus border="10" colordiffuse="FFFFFFFF">NextDialog/close.png</texturefocus>
+                    <texturenofocus border="10" colordiffuse="80FFFFFF">NextDialog/close.png</texturenofocus>
+                    <pulseonselect>no</pulseonselect>
+                </control>
             </control>
         </control>
     </controls>
diff --git a/resources/skins/Default/media/NextDialog/background.png b/resources/skins/Default/media/NextDialog/background.png
deleted file mode 100644
index bdd2689e824baa75c9db0f00698dfc74b2216577..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2088
zcma)7Yi!e26n4kTqo`t9%Zm8HjEfMD#gDW}iIvc$cG_m(5}H8MjtN}bX)bN-U^^r&
z3~gmRI`OLL7(-0FhQvc`ViJ2WMmtys6Qb1^ph-xeiiu5Ifq}%v7>HdvX;PrD{cvL6
z?>pZ;=R4QOZN93C+???_2!iB#E7@xJZ#Axw!{P6Q(zS;XB>Nf&1oa>{n--J^&WlRD
zgeM|Vh$D!zG!f;6MoCBOr3N6ou$y0XVki(@SdEP%xhNxrL1l|7`CF<2LQA9I5V6vk
zInD$P1tOBpqlrk9tkDS<X6n-L-dH9u)THQ*E-c9TP)1QD)P~z|5}TQWI#n@5SF`1*
zVEE+1!nz)%2_hbk<MAR~Q5y)#;cyV7m9SbZkYUl9Wt~r0WUbJUNNTW>Ca55)14Tv+
zO}<`<=`IX|IGPgYV=%XrxU8kBhdvNe0)z+(Cke<P21gixCzuWrK$OQ9M>G7vTpffm
zxj!OrAg26aIy5b<`v^P1M~5PF+_UMC$Rn9+x@RdYf2e8)HqZjiQHiLQG$p1Al4q$T
z>xF|eG>RWuA??>-dNi!)iWXL$QdSzy6bId=XG^k{>Qd5dbA?kxsVTK=xJP><e1inJ
z4SLvx*+_HW3{V5a$JdRrnqtOjm?r~hgf$Zq%wR68#0t-$aYjtF+94s>Dw<IxURTtB
zqQJb|#(RVM1`0+Qza5>z@dA(y2d0{OMi49mgqm4imtX><m9&tQg|Y`Ik|s&I$UdE<
z;7x`NUlx(q`Txo1IGR<2SOm7s%epYQA1(rsb~{+B-R^Nv4wj-QkKHk&YzAA*Fb<~N
z#ugWO2DXFYURl$5S&#<8K_-00GsBHe(LRunnu08V324yfbXziD?NdNTX;M@_oHfuE
z%FHKyIA{|y+V8@O9)r9L<5QIoXo8qlT~UU5J&c`l*zFc8PML!MbwU?lVU<9Gy=pdQ
zLuxwsr6tLy<gjQ0CWNBqYeMsaaZp@XR8_>7Ac^M2Ff@s3N=T3Ms^o5fR>S6pLI57A
z=4Ag-3NOKvnWh8cVF`*oz2QVEF~XQr1DQFACvtb1gh7K1#wFL_z=V^RNRM9lkRINW
z3@5e<NAsGJE$<>oRx5zMJ>eIEOlgm`cg`xCn}4cwaeGI#k7ZWAV*?%T^XGPUWM9}h
zyw-B>cE!#=6LUs^+`3h*`}Qtm9%LUGe%9^FcNg1=3yuVi_5Ap1oAdo;H-1@h)3Ih*
zZ+7FPJ>s3!S*NevuAA~}{A@+R0<Je0KDl9Y&(_@si~8C|#;#wj+TAT53mv+*<YC<z
zwXCMAzF>ksU?H4SonLRM;V!>)!*}km)aU0nPA<qlZo89MwQzRTyt`*a%ZoX09pQd@
z??7K7cRH|4e}y>p;o1C-EB|aImP}GLzIK_obWa|(_T>Wqy1YeO-R0e5u69>+_V3$V
z>g(Ad%~QwTn&v5<U)er+W5xN_z?{?D@?8@PnIHNeUOE2T_Y)WHJ$iD?`Z=p_T^!B5
z{>K~Eb-m2VyEC7=RJh>h1AiYJLEgq&_8<82uU)ZWJ@~=8<s*7ZcKz;N4-S7SZU)@s
zzB|uvpBwI6eXaYo-W9!$<7-YIU4CI~{|)z!Z$HN$AbBerx~3h{--I98QPIj;4M9fd
z8CMpvZTmR5Sm$Nkf$-bcd$UG$kuP+0eK!B{rTeq?wS9Bq3;(A651KEI+5X9}%k>|9
rSGm4@e4(v;@w)Tl_EXiue=cZQn}n>Q6ZhS7jSsxnQ^kH<wy5=AQIo*F

diff --git a/resources/skins/Default/media/NextDialog/close.png b/resources/skins/Default/media/NextDialog/close.png
index b6e4ece7835837b3bd8bff583cf180f42f752848..cd19c599a5af672b5fce9ab873fd4171d9b04358 100644
GIT binary patch
delta 423
zcmew!-XAtWnTa)EqpB9;<T^&n$^MM`leaT2m^_h5Y;q8j)nrZP$jSSe<R-6Sl9+s#
z$!GEgW(i?4T_ej7LrW_YBP$aVZ381K1B1!6%+dnr;*)PMTPauM7Wn#FB_@|-=I7Ze
z6%^&ClqRR9C~+x(0a$jjDT@vlL|u7CYTo1t%rZb%{AG^Rwa_z$sVpvWEi17C$=fO!
z85kMp8emx0%#zKr`^pC0&7W9KsMIrT@pN$viD-R$&5^6wK)@|gu>Voup8u?O(k=?`
zsMWKYW@e(6>uc2dzfqh0lcP$S#FQYfm3oZ9y*Is?#1dGaHQl_KHeGBR^Y%jhIf}gE
zIc2N+dJ5(!D$87*cpxSE>pJlirt&ReztxPn*{kQzUD>4Va_`N{W^I>mM{65%`n$a+
ztkgYv?{ACr`a`=;e-*25$nHP$;Fp}SWX%2MS@u7#{@kmhGGX7kXu(U*Tfb%|?hmh9
dIwk1UMZQO?;xzm>J6vP{0#8>zmvv4FO#q4mo}2&x

delta 686
zcmV;f0#W^sR`*wsBLW1)u_Y=2lZXK?lTQITleYn&lX3zzlTrd3lNkdYlLZ4AlQsiP
zlcxe%ld=OAlXC<VlYRpnlXC<VliUL~lbr-a5H~I}A_^cNARr(hb96;^bdzQTD3cil
zU<7gXOO~^J1;`|S0w+mCK~z|U?byGI+F%$5@F!_Ff~K_64Az3s>+m*;Epk|tf^MZM
zt_2BQ>wf=0C&j67I2S4<lajq60gIb=liX4f4s%zB3>I6YL)*7gO5n_oH?Ptg-tQRl
z^8N6>$rA{N5PAbQIQ;(x_=N#!!+^A5K-w@MZ9)SDLEr*^m+*Yxd#|kxv#3(3B*x?M
z+iJD?z_)<sxn8gLTGO;wVY+U~vV25}YqeU(k|f<Ll}bmZX`at!v+rKGbUOV!kw_dC
z3WbQS>*sp|+Bi`ZZvy}bf^gu5bmHu5VUR>eoXh2sq9{tvYoaJh&1Uo1dEDD@c9O~D
zBUzRYf_4&r?ciuMx{Sx;t5hoW1OWa$_|Bc2&*wkfaF%6VsH%FhTrPj^1qc9O7>4PE
ztkr4{5kk-0aErxaL()eK^h3sCvHQEig$8;dcZs6{I*{KKMS03`*Nv;y>TA7Te-{=9
zK>4ZTd7e`g<!~Dg03Z^H+{t7zF`AChJLok^?0C(8$-M%-a2R87?kFvi80dwwEbGEB
zj86!mG`P%3QX~=352vc?Nx$F!;y27mkVL>vr}HwO&%bcP*>9`YoGccLSzXsZZ#J9X
zI|oju)2nj1{5Tqo-gU#-*@naz|Isw<<6tl_gLV=D*X#AK;c$3nBmIW36Nxd#-EQ}N
zyWKuP4cbQxbRx6aY_!p6eDE8>HgYnVOh|D6037>yL>UI84Fl4K0cpd4w7K!XzXL=*
Up&tW)SpWb407*qoM6N<$f|SZWWB>pF

diff --git a/resources/skins/Default/media/NextDialog/play.png b/resources/skins/Default/media/NextDialog/play.png
index 12aedfa5a9efe5392c9620b786d4a1199d05a316..70d3cbb6224ff7a2e2918decbe2a9b589a3c65c0 100644
GIT binary patch
delta 548
zcmcaEa8zJ|G80?CM%6@SZX?SOLrW_YBP(Oe$rG8Ck@=hVGY2zH{=@9TXffH5MP_mf
zv&iH^7O}}ftjWmACO5F=)$iILCc?nLa3|B*Il#RrwX!%lF(*~Q#nga-L1JoYfIl~*
zqfD)KVc~)~E^h-DO*s*Igq1x^aeD3=`<tn=WHa|q&tFu-<er|MufqOuwfTF~zxQU}
zW4Lxm+)-jZ)4{ma_g0wBKKHEbQyUA{i3J^#w4E#^%4Pq|JuW)!q4&|0zxV5ZTYg+B
z&h=?#2FFU1pMGEbqk^J+U%fdexpn35D=!b&cWuAEXV#~0lMOB1pImHiYUfa7iTQEG
z%xcBqFTdZe-dE!+vqQ7OYnSM@h-Btoqx^m!W6Ray+m2s3@#kWB`Ae<um$kxH+cMt#
zV03<ssg3~9qnrgEk;M!Q+`=Ht$WT9Pjs#G2v!{z=NJQ(~Ya0a}9Yx$8rm7gNoWZoh
zfxGGgvuyygX#kVx9=0b=MvTQOHu=xr=KYF)R`-!DJuUtHJ%KsJ=XTCN(zkEdLXH&@
ztF^fpb{K}2r+nPFaCx5Rqt{0QVkbLXZk@SndFzeIqOzsIE!&uxOGBNN1kU+fjos>>
zqHrhj$n#yZ_UJIZYT159)c;ECR+oGCJ}Fmj*kY5`!~bgW+x2<5m61Dc#ckJed)39X
i?O1r-^Et)!k624SGF~(5b-e?0KZB>MpUXO@geCw9aq2w)

delta 646
zcmV;10(t$#5Z4fpBLW4*u_a*xlXV3Wlb8b>lXV3Wv&I8V0h65tW0Q3S8Iu_XU<mp*
zI1vB<0Ns;;1{Z(53c^4bOQq=IAmStrf~$fc{;Z<dr8-yz6_;|>A8hrwR;2Icn+QIE
zqqDO)5eKm!<PwfAIdXup^hFSwbs#uI${Kg)v-zT&xg(7{vS_2?ick)n!32r(yur|X
zt?8`fy}x6wyikxYL`z5&kspM8jwH3wp)Twv;~uq5oeO{bllXY`t6A?bb;w1c1Pclt
zVuTQI;Zv8<M-#f=e_#FW8{x=J!Bf($u)_vhM5yxi#5A3=erJ13jrAY>c9*VlzpYY@
z#tYBzGRM-!YHI)h010qNS#tmY3ljhU3ljkVnw%H_00B=)L_t(og=5r6V;IzcX`mfI
z2#h+AQZRq&KuW==11SZg4#W<GSmn5gQ#n8ml;T`n=^{al$^naFKC#})JUznd1~3h>
zab#vq^<-kiuWDd338PcMh7?hDd`bp97pt1AFEtm&EkEE6WMB}Mol%vbhD&x3IFNyX
zgQv8x(*b*G925>@U|?eMi(C=S!-7SI{*J)~bZvh(7isaKiw+_OGB8LeFRluaM->}X
z4rE|pVEBi|#}exU2VUIGo^kCHs@NcM;N`<fE57_e7ab%H{P%D3imF5Z{$t7v3J3o9
zGGWHT+t}p>fdk(@E}nk!EiTysci`<a$%|h9#4SIt4*b7&W8MyIDGvb#(1E{x%$YO!
zG9gY?1LnX_FRQ2Rc|lkm<G_q=39<69KKe$C$^i<&cfa5LCQjv`tBcXWr~@elqYk7L
gj5?4~Fz6i!0Fd5BF}8X>#sB~S07*qoM6N<$f;1-|MF0Q*

diff --git a/specials/autoplay.py b/specials/autoplay.py
index 3b15f8bb..e0a771c5 100644
--- a/specials/autoplay.py
+++ b/specials/autoplay.py
@@ -182,8 +182,9 @@ def start(itemlist, item):
             autoplay_list.sort(key=lambda orden: (orden['indice_quality'], orden['indice_server']))
 
         # Plan b is prepared, in case it is active the non-favorite elements are added at the end
-        try: plan_b = settings_node['plan_b']
-        except: plan_b = True
+        # try: plan_b = settings_node['plan_b']
+        # except: 
+        plan_b = True
         text_b = ''
         if plan_b: autoplay_list.extend(autoplay_b)
         # If there are elements in the autoplay list, an attempt is made to reproduce each element, until one is found or all fail.