From babc7d0c2163ec23f86425dc888e21d2857b8cea Mon Sep 17 00:00:00 2001 From: vali Date: Sun, 20 Feb 2011 08:07:49 -0500 Subject: [PATCH] [EasyInfo] change startroutine (thanx Dr.Best), bugfix: Timeshift-end and some code clean --- easyinfo/src/easysel.png | Bin 0 -> 2250 bytes easyinfo/src/plugin.py | 26 ++++++++++++++++++++++++-- easyinfo/src/sleep.png | Bin 0 -> 2613 bytes 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 easyinfo/src/easysel.png create mode 100644 easyinfo/src/sleep.png diff --git a/easyinfo/src/easysel.png b/easyinfo/src/easysel.png new file mode 100644 index 0000000000000000000000000000000000000000..5e6767bc3800ff1f4295743e5daed5a1944dfdd0 GIT binary patch literal 2250 zcmd^A_ct4k77w*&@E(5?AdSm+PlxHtv0d6 zp0#RK&DbM&>A&&bJ?C>j=bn3ix#!;dxlstX7Aq5o2><}F>S#YlQrMOPd4_uwkK1pR zqY#xRQVR+wA9=V<325xq_0$1?syJq{H7x*e4}f@Sp!vIqii(<=nvIPO2n2F+a`N!- zJb3VcpPye)Q1Ho3JMB}ii%1~O3KR0 z5C}v~O$`Qv>FVn0>FL4Y@K>*1>Fetwkw^mr10y3NV`F0z6B9EtGfPWLD=RB&Yik=D z8#_BYG#YJhZ|~^n=;Y+&?Ck8~;^OY^?&0C#>FJ5VV7$D%e0_aCeE8t!=ZD2&{r&v| z0s;a9193Q9P*6~CaBxUSNN8wiSXfwicz8raL}X-SR8&-SbTl51kBNzijg5_qi;Its zPfScqN=iyjPEJWlNli^nOG`^nPyh7k)925hGcqzVGc&WYva++Yb8>QWb93|Z^78ZZ z3knJf3k!>iii(SiOG``3%F4cc`BGk9UQtm|Sy@?CRaISG{q^hDnwpy0+S>a1`i6#v z#>U2`rl#iR=5OD=wY0RfwzjslwY9gmcXV`gc6N4kb#-@l_w@7-2!!6=-oC!R{{H@f zfq}un!J(m{;o;$tkr5)1I668yHa0dsK0YxqF*!LoH8nLoJv}osGdnvwH#avwKfkcB z@csMu#l^*?rKRQN<&~9{)z#G>KYpyOt*x)GZ)|LAZfgwwH`kG88-`w2X z-rnBb-BC8=f7trF=7uOI0Kg#OC`z;c&jvu9(+g8Z&FH3W>eTK z8evebXpE1whaCW6?f4D@hHDx;_Lc?9gQekHN|zLY5!89EZeXM}oEGH+(tOxE_TDs( zPzAn4 zopP#0mf%qP21;()_Pmj6YN%kFoa(f{5FmBBi1dxB1 zgq2D%GvDueC6g+#t}j4OE_v@nqE@xVJk64bc@~zuj+3m)Fj9(RA47Z0`5s zGR1w@wl`#k$n^yfJ)9l){m4RrMKasu`-0tk(co}DlE4gCi7hOe!F@<;Q$x?fHU?}x z`~oZN|Au|M`yg+tGhy5FLI=ien3@=vvxq0ob$0MB8)N&jn02cf=s0W`FGKzoaZQG8 zfMN-oX%zy{zHCXUOV)tIvIGZPcN*65cV~Y7RS`5W zTmA1TWii5$Z~*62{tVXzAL|i5wrXsh=K@$TxORrmeD4>rG(XBw+=Vc&7ki+IU83&Z z_HN8z(VM`ZsH5bB``PU7C8kQdZBWxRd3!R)Tk^pp{%o|n5A(d*?HfL5N~ynUgUE^> z*Eu{@2kT3r-MuLnV%ODlqdlDZfjli{&?b+oY;ev2(d{A@2**Zb+p8b~-5q zJtGwj)fgnO8h5-jeTg22rZX~I%OsovagWs*f 1: if config.plugins.EasyInfo.buttTV.value == "easysel": InfoBar_instance.dlg_stack.append(InfoBar_instance.session.open(EasySelection, IBservices, EINzapTo, None, EINchangeBouquetCB)) @@ -533,11 +541,22 @@ def EINcallbackFunc(answer): cnt = 0 else: cnt = len(bouquets) - IBservices = InfoBar_instance.getBouquetServices(bouquets[0][1]) + IBservices = InfoBar_instance.getBouquetServices(InfoBar_instance.servicelist.getRoot()) if cnt > 1: InfoBar_instance.dlg_stack.append(InfoBar_instance.session.open(EasyPG, IBservices, EINzapTo, None, EINchangeBouquetCB)) elif cnt == 1: InfoBar_instance.dlg_stack.append(InfoBar_instance.session.open(EasyPG, IBservices, EINzapTo, None, None)) + elif answer == "easysel": + bouquets = InfoBar_instance.servicelist.getBouquetList() + if bouquets is None: + cnt = 0 + else: + cnt = len(bouquets) + IBservices = InfoBar_instance.getBouquetServices(InfoBar_instance.servicelist.getRoot()) + if cnt > 1: + InfoBar_instance.dlg_stack.append(InfoBar_instance.session.open(EasySelection, IBservices, EINzapTo, None, EINchangeBouquetCB)) + elif cnt == 1: + InfoBar_instance.dlg_stack.append(InfoBar_instance.session.open(EasySelection, IBservices, EINzapTo, None, None)) elif answer == "timers": EINsession.open(TimerEditList) elif answer == "multiepg": @@ -634,6 +653,9 @@ def EINcallbackFunc(answer): EINsession.open(SherlockII) else: EINsession.open(MessageBox, text = _('Sherlock is not installed!'), type = MessageBox.TYPE_INFO) + elif answer == "sleep": + from Screens.SleepTimerEdit import SleepTimerEdit + EINsession.open(SleepTimerEdit) else: EINsession.open(MessageBox, text = _('This function is yet not available!'), type = MessageBox.TYPE_INFO) diff --git a/easyinfo/src/sleep.png b/easyinfo/src/sleep.png new file mode 100644 index 0000000000000000000000000000000000000000..471b21920086c456cb5d0ee3eaadfe372659b86a GIT binary patch literal 2613 zcmd^A_ct318;u<+Hlg0q+O+njBbpc?YP4pJ5R??DM%0YGYPS(9w6-d$C>mn6R%%o! zO3hNEsJ+_0-oN4d@w?~T=bm$ae9m+4lVE0Qz|JDX0ssKmjSQg{=ZZR~GLY_klGam_ z&V}9sf`9-3wW+LUNCp6a4q#?-2X^k$(9qD*($dk<(bLm2FfcGOGBPnS0f9hfW@Z)^ z7FJePHa0ePc6Ja5#KFPA$;rvZ#l_9d&BMdP%gf8h$H&jlFCZWQ27?6!1%-r!goTAK zUc4wGB69iiWic@^adB}82?uy?Rw%US2^#K~Ygr zNl8grSy@FzMO9T*O-)ThLqkhTOIur8M@L6jSNHn$>o;%Sgg_vAdU{YO6b6Io>+2gB z7#JBD!QpTd6B7giVQOl6`}S=!Gc$8@a|;U#OH0eUckfzRSy@|K+t}FH+S=OL+1cCM zJ2*HvIyyQzIXOE!BauiK7Z+DoR}>26=H}+^?(X5?;pyq=<>iG&qrJVoeSCa;eSI+) z%)^Hd{rvo}SggOlKMscr2ncxm_;FxhU{Fv{aBy%)NJwaCXjoVn9*++X508k5h>VPk zii(Pkj*f|miH(hoi;Ihok55QQNK8z8^5jWUQc`kqa!N`{YHDg)T3UK~dPYXZvuDo; z1VUzJCXql&d$xv&CAOpkx2RZ`7d6)C@Lx{E-o%9DJd;2Eh{T4FE6jCsCfDE zWo2dMt5>h8s;a81t7~d%UcY`_TU-0)&6~Qqy88P1hK7c>Z{IdHHa0aiH8(fEd-sk^ zCbzV-w6?ZVD3rFgw)Xb+j*gDb&d#o`uI}#c_wV0-`0$~pr>D2Kx390SzrTNAV1P=c ze*E}xaBy&FXlQtNcw}Vc)2C0Pqobcce;ykf8y_G4^5x6K#Kh#}AFT zX1;yE{M8LwfpP z{Y_jYwNmAOE2^*!jgp7zhNyuagC3MegMqUu;eSLJ!R)TCI9TXbcvTG~pGPC-H2M~9 zMT0|!1R~GOV>C&)P)MY6idnCD_d<9$exr*ja;7EBuZj@W2crz$TmA?G%RbcOqlQc2 z$aiavIrTZ0T0AlL?_+xBHzcc-DQ%b)cySw?HL;L;%pMk$vI;!ef?$Kr6~@Y{bq4Ff6Old^E%u=KzQiDFi=0 zppG8~Q}4uwyN)zmc;dkHNd^rM_Qrtb$2wV?zxg(Ru*>ooF@TN5ot@GZGi{Bpn$Dr_ zt$habQD>;tMjNulW$}wWbIA+q#w}7A+o+y+z{V3*pE_lWt3`zIoYd&NgeA%A8JI{LOF!)9zmXRoQ{7Tjas-4#|1nA|Dh3X3(f z^=)h}ARjan%1s<*-tk>0rq90A2@awnZcsMsS}niMxP9`2&qs@|=_HkY?t9fW_T549 z>EwgWFq03pAD)Xzy2c@I2*mJMOpH&-csycmu^aYL6*@2QOK`5m5<`B1e?voNeC%_^ zs7tQer__W7Z%ln-02Z9=T{a=is#S_dwYzFc--92FHG)-ZX&if#Mi2K+;)siF(hoen z(F%cI(IO&hfdTAwED(v13E|CPfqqr z=PaaD`>y0Tu%6UCL4QZPNQHSD|8d?#W$sX3yG zK!9m~Ny9I@ywc4lwR%t4A$~gD``$}%@FH1}H)B-&leJf1HP4Q2s8O48HDhX{LlEU? z`4(=3CmIcvHTOh&x%9L(1p9XSsVo0tNwml;3Cbiqtob=zcNoPyBAcAa&0Jw-xmNY< zW51YNFoTh!6I0edF{E@KtBNrfI;Y~o@=!_^Sy5z}3z|a4i7)ETB{0L`{&$Nr9z|Oa z__UN`qP z1@*Ejo+(3}uW1Vh2+=NNLm(-2vESscH)pt7ATUGAmtNxv0>)_#RoGtzS6>PJa>0qX z(h7{6KI>*rZ`wgmzd^%=2YA_!ZBme^e$~G#-)tj9iD&94K&kNMhbFa-s?ih^=f};y zh`9P~-KIg!tyAPVpM_p=o^-L~FZHgwXCZZB(6d8sFQB^6tmGPz?)bJp0gEhh}M8E)v#($=EXe)UkQWDlQFV#>z`rSc`j`9`8^Jz z`AnRJ^o~JIdd7;5MiLBhiCEHoIZOIpPTt3<1$$msceghq7Qq!TEddz5<)#Gnsy&`! z8Q3T!<{X~Ze`C;>r&P~|C3TyxAS)+7?5rI$58z50(K>XzmiR>i)IPnh@IjI8fPzBf P|9h84FjHu?o^#~C