Skip to content

Commit

Permalink
Small speed up on main template (different handling of remotes)
Browse files Browse the repository at this point in the history
  • Loading branch information
skaman committed Feb 18, 2012
1 parent 3309300 commit e1a0fb9
Show file tree
Hide file tree
Showing 9 changed files with 327 additions and 313 deletions.
14 changes: 14 additions & 0 deletions plugin/controllers/base.py
View file
Expand Up @@ -143,5 +143,19 @@ def prepareMainTemplate(self):
ret['box'] = open("/proc/stb/info/vumodel").read().strip()
elif fileExists("/proc/stb/info/boxtype"):
ret['box'] = open("/proc/stb/info/boxtype").read().strip()

if ret["box"] == "duo" or ret["box"] == "solo" or ret["box"] == "uno":
ret["remote"] = "vu_normal"
elif ret["box"] == "ultimo":
ret["remote"] = "vu_ultimo"
elif ret["box"] == "et9x00" or ret["box"] == "et9000" or ret["box"] == "et9200":
ret["remote"] = "et9x00"
elif ret["box"] == "et5x00" or ret["box"] == "et5000" or ret["box"] == "et6000":
ret["remote"] = "et5x00"
elif ret["box"] == "gigablue":
ret["remote"] = "gigablue"
else:
ret["remote"] = "dmm"

return ret

1 change: 1 addition & 0 deletions plugin/controllers/root.py
View file
Expand Up @@ -33,6 +33,7 @@ def __init__(self, session, path = ""):
self.putChild("mobile", MobileController(session))
self.putChild("js", static.File(getPublicPath() + "/js"))
self.putChild("css", static.File(getPublicPath() + "/css"))
self.putChild("static", static.File(getPublicPath() + "/static"))
self.putChild("images", static.File(getPublicPath() + "/images"))
self.putChild("ipkg", IpkgController(session))
if piconpath:
Expand Down
319 changes: 6 additions & 313 deletions plugin/controllers/views/main.tmpl
View file

Large diffs are not rendered by default.

39 changes: 39 additions & 0 deletions plugin/public/static/remotes/dmm.html
View file
@@ -0,0 +1,39 @@
<img border='0' src='/images/remotes/dm_normal.png' usemap='#map' >
<map name="map">
<area shape="circle" coords="38,336,9" alt="tv" onclick="pressMenuRemote('377');">
<area shape="circle" coords="62,337,9" alt="radio" onclick="pressMenuRemote('385');">
<area shape="circle" coords="85,337,9" alt="text" onclick="pressMenuRemote('388');">
<area shape="circle" coords="108,336,9" alt="help" onclick="pressMenuRemote('138');">
<area shape="circle" coords="112,306,9" alt="blue" onclick="pressMenuRemote('401');">
<area shape="circle" coords="86,307,9" alt="yellow" onclick="pressMenuRemote('400');">
<area shape="circle" coords="61,307,9" alt="green" onclick="pressMenuRemote('399');">
<area shape="circle" coords="35,307,9" alt="red" onclick="pressMenuRemote('398');">
<area shape="circle" coords="116,275,9" alt="video" onclick="pressMenuRemote('393');">
<area shape="circle" coords="32,276,9" alt="audio" onclick="pressMenuRemote('392');">
<area shape="circle" coords="119,218,9" alt="menu" onclick="pressMenuRemote('139');">
<area shape="circle" coords="28,217,9" alt="info" onclick="pressMenuRemote('358');">
<area shape="rect" coords="52,210,94,228" alt="up" onclick="pressMenuRemote('103');">
<area shape="rect" coords="52,259,94,277" alt="down" onclick="pressMenuRemote('108');">
<area shape="rect" coords="91,231,114,257" alt="right" onclick="pressMenuRemote('106');">
<area shape="rect" coords="33,231,56,257" alt="left" onclick="pressMenuRemote('105');">
<area shape="rect" coords="62,234,85,253" alt="ok" onclick="pressMenuRemote('352');">
<area shape="rect" coords="95,183,118,202" alt="bouquet down" onclick="pressMenuRemote('403');">
<area shape="rect" coords="103,159,126,178" alt="bouquet up" onclick="pressMenuRemote('402');">
<area shape="rect" coords="29,183,52,202" alt="volume down" onclick="pressMenuRemote('115');">
<area shape="rect" coords="22,159,45,178" alt="volume up" onclick="pressMenuRemote('114');">
<area shape="rect" coords="59,154,86,169" alt="mute" onclick="pressMenuRemote('113');">
<area shape="rect" coords="59,174,86,189" alt="exit" onclick="pressMenuRemote('174');">
<area shape="rect" coords="94,126,121,141" alt="next" onclick="pressMenuRemote('407');">
<area shape="rect" coords="60,127,87,142" alt="0" onclick="pressMenuRemote('11');">
<area shape="rect" coords="25,127,52,142" alt="previous" onclick="pressMenuRemote('412');">
<area shape="rect" coords="94,107,121,122" alt="9" onclick="pressMenuRemote('10');">
<area shape="rect" coords="60,107,87,122" alt="8" onclick="pressMenuRemote('9');">
<area shape="rect" coords="26,108,53,123" alt="7" onclick="pressMenuRemote('8');">
<area shape="rect" coords="94,88,121,103" alt="6" onclick="pressMenuRemote('7');">
<area shape="rect" coords="60,88,87,103" alt="5" onclick="pressMenuRemote('6');">
<area shape="rect" coords="26,88,53,103" alt="4" onclick="pressMenuRemote('5');">
<area shape="rect" coords="94,69,121,84" alt="3" onclick="pressMenuRemote('4');">
<area shape="rect" coords="61,69,88,84" alt="2" onclick="pressMenuRemote('3');">
<area shape="rect" coords="26,69,53,84" alt="1" onclick="pressMenuRemote('2');">
<area shape="rect" coords="76,15,103,30" alt="power" onclick="pressMenuRemote('116');">
</map>
55 changes: 55 additions & 0 deletions plugin/public/static/remotes/et5x00.html
View file
@@ -0,0 +1,55 @@
<img border='0' src='/images/remotes/et_rc5_normal.png' usemap='#map' >
<map name="map">
<area shape="circle" coords="89,47,12" alt="Power" onclick="pressMenuRemote('116');">
<area shape="circle" coords="30,86,12" alt="1" onclick="pressMenuRemote('2');">
<area shape="circle" coords="59,86,12" alt="2" onclick="pressMenuRemote('3');">
<area shape="circle" coords="88,86,12" alt="3" onclick="pressMenuRemote('4');">
<area shape="circle" coords="30,104,12" alt="4" onclick="pressMenuRemote('5');">
<area shape="circle" coords="59,104,12" alt="5" onclick="pressMenuRemote('6');">
<area shape="circle" coords="88,104,12" alt="6" onclick="pressMenuRemote('7');">
<area shape="circle" coords="30,122,12" alt="7" onclick="pressMenuRemote('8');">
<area shape="circle" coords="59,122,12" alt="8" onclick="pressMenuRemote('9');">
<area shape="circle" coords="88,122,12" alt="9" onclick="pressMenuRemote('10');">
<area shape="circle" coords="30,139,12" alt="previous" onclick="pressMenuRemote('412');">
<area shape="circle" coords="59,139,12" alt="0" onclick="pressMenuRemote('11');">
<area shape="circle" coords="88,139,12" alt="next" onclick="pressMenuRemote('407');">
<area shape="circle" coords="24,161,10" alt="red" onclick="pressMenuRemote('398');">
<area shape="circle" coords="47,161,10" alt="green" onclick="pressMenuRemote('399');">
<area shape="circle" coords="70,161,10" alt="yellow" onclick="pressMenuRemote('400');">
<area shape="circle" coords="93,161,10" alt="blue" onclick="pressMenuRemote('401');">
<area shape="circle" coords="26,195,10" alt="menu" onclick="pressMenuRemote('139');">
<area shape="circle" coords="46,181,10" alt="epg" onclick="pressMenuRemote('365');">
<area shape="circle" coords="72,181,10" alt="info" onclick="pressMenuRemote('358');">
<area shape="circle" coords="93,194,10" alt="exit" onclick="pressMenuRemote('174');">
<area shape="circle" coords="59,202,12" alt="up" onclick="pressMenuRemote('103');">
<area shape="circle" coords="59,244,12" alt="down" onclick="pressMenuRemote('108');">
<area shape="circle" coords="38,223,12" alt="left" onclick="pressMenuRemote('105');">
<area shape="circle" coords="80,223,12" alt="right" onclick="pressMenuRemote('106');">
<area shape="circle" coords="59,222,15" alt="OK" onclick="pressMenuRemote('352');">
<area shape="circle" coords="29,268,15" alt="volume up" onclick="pressMenuRemote('115');">
<area shape="circle" coords="29,291,15" alt="volume down" onclick="pressMenuRemote('114');">
<area shape="circle" coords="59,267,10" alt="mute" onclick="pressMenuRemote('113');">
<area shape="circle" coords="59,283,12" alt="filelist" onclick="pressMenuRemote('393');">
<area shape="circle" coords="59,299,12" alt="playlist" onclick="pressMenuRemote('395');">
<area shape="circle" coords="88,268,10" alt="channel up" onclick="pressMenuRemote('402');">
<area shape="circle" coords="88,291,10" alt="channel down" onclick="pressMenuRemote('403');">
<area shape="circle" coords="30,319,12" alt="rewind" onclick="pressMenuRemote('168');">
<area shape="circle" coords="59,319,12" alt="play" onclick="pressMenuRemote('207');">
<area shape="circle" coords="59,319,12" alt="pause" onclick="pressMenuRemote('119');">
<area shape="circle" coords="88,319,12" alt="forward" onclick="pressMenuRemote('208');">
<area shape="circle" coords="30,335,12" alt="record" onclick="pressMenuRemote('167');">
<area shape="circle" coords="59,335,12" alt="stop" onclick="pressMenuRemote('128');">
<area shape="circle" coords="88,335,12" alt="jump" onclick="pressMenuRemote('519');">
<area shape="circle" coords="30,352,12" alt="timeshift" onclick="pressMenuRemote('359');">
<area shape="circle" coords="59,352,12" alt="mark" onclick="pressMenuRemote('834');">
<area shape="circle" coords="88,352,12" alt="search" onclick="pressMenuRemote('535');">
<area shape="circle" coords="30,370,12" alt="timer" onclick="pressMenuRemote('362');">
<area shape="circle" coords="59,370,12" alt="pip" onclick="pressMenuRemote('375');">
<area shape="circle" coords="88,370,12" alt="vkey" onclick="pressMenuRemote('393');">
<area shape="circle" coords="30,388,12" alt="text" onclick="pressMenuRemote('388');">
<area shape="circle" coords="88,388,12" alt="subtitle" onclick="pressMenuRemote('370');">
<area shape="circle" coords="28,46,12" alt="audio" onclick="pressMenuRemote('392');">
<area shape="circle" coords="29,67,12" alt="tv" onclick="pressMenuRemote('377');">
<area shape="circle" coords="59,67,12" alt="radio" onclick="pressMenuRemote('385');">
<area shape="circle" coords="90,68,12" alt="help" onclick="pressMenuRemote('138');">
</map>
55 changes: 55 additions & 0 deletions plugin/public/static/remotes/et9x00.html
View file
@@ -0,0 +1,55 @@
<img border='0' src='/images/remotes/et_rc7_normal.png' usemap='#map' >
<map name="map">
<area shape="circle" coords="89,47,12" alt="Power" onclick="pressMenuRemote('116');">
<area shape="circle" coords="30,86,12" alt="1" onclick="pressMenuRemote('2');">
<area shape="circle" coords="59,86,12" alt="2" onclick="pressMenuRemote('3');">
<area shape="circle" coords="88,86,12" alt="3" onclick="pressMenuRemote('4');">
<area shape="circle" coords="30,104,12" alt="4" onclick="pressMenuRemote('5');">
<area shape="circle" coords="59,104,12" alt="5" onclick="pressMenuRemote('6');">
<area shape="circle" coords="88,104,12" alt="6" onclick="pressMenuRemote('7');">
<area shape="circle" coords="30,122,12" alt="7" onclick="pressMenuRemote('8');">
<area shape="circle" coords="59,122,12" alt="8" onclick="pressMenuRemote('9');">
<area shape="circle" coords="88,122,12" alt="9" onclick="pressMenuRemote('10');">
<area shape="circle" coords="30,139,12" alt="previous" onclick="pressMenuRemote('412');">
<area shape="circle" coords="59,139,12" alt="0" onclick="pressMenuRemote('11');">
<area shape="circle" coords="88,139,12" alt="next" onclick="pressMenuRemote('407');">
<area shape="circle" coords="24,161,10" alt="red" onclick="pressMenuRemote('398');">
<area shape="circle" coords="47,161,10" alt="green" onclick="pressMenuRemote('399');">
<area shape="circle" coords="70,161,10" alt="yellow" onclick="pressMenuRemote('400');">
<area shape="circle" coords="93,161,10" alt="blue" onclick="pressMenuRemote('401');">
<area shape="circle" coords="26,195,10" alt="menu" onclick="pressMenuRemote('139');">
<area shape="circle" coords="46,181,10" alt="epg" onclick="pressMenuRemote('365');">
<area shape="circle" coords="72,181,10" alt="info" onclick="pressMenuRemote('358');">
<area shape="circle" coords="93,194,10" alt="exit" onclick="pressMenuRemote('174');">
<area shape="circle" coords="59,202,12" alt="up" onclick="pressMenuRemote('103');">
<area shape="circle" coords="59,244,12" alt="down" onclick="pressMenuRemote('108');">
<area shape="circle" coords="38,223,12" alt="left" onclick="pressMenuRemote('105');">
<area shape="circle" coords="80,223,12" alt="right" onclick="pressMenuRemote('106');">
<area shape="circle" coords="59,222,15" alt="OK" onclick="pressMenuRemote('352');">
<area shape="circle" coords="29,268,15" alt="volume up" onclick="pressMenuRemote('115');">
<area shape="circle" coords="29,291,15" alt="volume down" onclick="pressMenuRemote('114');">
<area shape="circle" coords="59,267,10" alt="mute" onclick="pressMenuRemote('113');">
<area shape="circle" coords="59,283,12" alt="filelist" onclick="pressMenuRemote('393');">
<area shape="circle" coords="59,299,12" alt="playlist" onclick="pressMenuRemote('395');">
<area shape="circle" coords="88,268,10" alt="channel up" onclick="pressMenuRemote('402');">
<area shape="circle" coords="88,291,10" alt="channel down" onclick="pressMenuRemote('403');">
<area shape="circle" coords="30,319,12" alt="rewind" onclick="pressMenuRemote('168');">
<area shape="circle" coords="59,319,12" alt="play" onclick="pressMenuRemote('207');">
<area shape="circle" coords="59,319,12" alt="pause" onclick="pressMenuRemote('119');">
<area shape="circle" coords="88,319,12" alt="forward" onclick="pressMenuRemote('208');">
<area shape="circle" coords="30,335,12" alt="record" onclick="pressMenuRemote('167');">
<area shape="circle" coords="59,335,12" alt="stop" onclick="pressMenuRemote('128');">
<area shape="circle" coords="88,335,12" alt="jump" onclick="pressMenuRemote('519');">
<area shape="circle" coords="30,352,12" alt="timeshift" onclick="pressMenuRemote('359');">
<area shape="circle" coords="59,352,12" alt="mark" onclick="pressMenuRemote('834');">
<area shape="circle" coords="88,352,12" alt="search" onclick="pressMenuRemote('535');">
<area shape="circle" coords="30,370,12" alt="timer" onclick="pressMenuRemote('362');">
<area shape="circle" coords="59,370,12" alt="pip" onclick="pressMenuRemote('375');">
<area shape="circle" coords="88,370,12" alt="vkey" onclick="pressMenuRemote('393');">
<area shape="circle" coords="30,388,12" alt="text" onclick="pressMenuRemote('388');">
<area shape="circle" coords="88,388,12" alt="subtitle" onclick="pressMenuRemote('370');">
<area shape="circle" coords="59,388,12" alt="audio" onclick="pressMenuRemote('392');">
<area shape="circle" coords="30,406,12" alt="tv" onclick="pressMenuRemote('377');">
<area shape="circle" coords="59,406,12" alt="radio" onclick="pressMenuRemote('385');">
<area shape="circle" coords="88,406,12" alt="help" onclick="pressMenuRemote('138');">
</map>
63 changes: 63 additions & 0 deletions plugin/public/static/remotes/gigablue.html
View file
@@ -0,0 +1,63 @@
<img border='0' src='/images/remotes/gigablue_black.png' usemap='#map' >
<map name="map">
<area shape="rect" coords="60,25,95,44" alt="Power" onclick="pressMenuRemote('116');">
<area shape="rect" coords="20,408,55,428" alt="1" onclick="pressMenuRemote('2');">
<area shape="rect" coords="60,408,94,428" alt="2" onclick="pressMenuRemote('3');">
<area shape="rect" coords="100,408,133,428" alt="3" onclick="pressMenuRemote('4');">
<area shape="rect" coords="20,434,55,455" alt="4" onclick="pressMenuRemote('5');">
<area shape="rect" coords="60,434,94,455" alt="5" onclick="pressMenuRemote('6');">
<area shape="rect" coords="100,434,133,455" alt="6" onclick="pressMenuRemote('7');">
<area shape="rect" coords="20,461,55,482" alt="7" onclick="pressMenuRemote('8');">
<area shape="rect" coords="60,461,94,482" alt="8" onclick="pressMenuRemote('9');">
<area shape="rect" coords="100,461,133,482" alt="9" onclick="pressMenuRemote('10');">
<area shape="rect" coords="20,488,55,508" alt="previous" onclick="pressMenuRemote('412');">
<area shape="rect" coords="60,488,94,508" alt="0" onclick="pressMenuRemote('11');">
<area shape="rect" coords="100,488,133,508" alt="next" onclick="pressMenuRemote('407');">
<area shape="rect" coords="28,381,50,391" alt="red" onclick="pressMenuRemote('398');">
<area shape="rect" coords="54,381,76,391" alt="green" onclick="pressMenuRemote('399');">
<area shape="rect" coords="79,381,101,391" alt="yellow" onclick="pressMenuRemote('400');">
<area shape="rect" coords="104,381,125,391" alt="blue" onclick="pressMenuRemote('401');">
<area shape="circle" coords="118,243,20" alt="menu" onclick="pressMenuRemote('139');">
<area shape="circle" coords="77,157,20" alt="epg" onclick="pressMenuRemote('365');">
<area shape="circle" coords="36,244,20" alt="info" onclick="pressMenuRemote('358');">
<area shape="circle" coords="77,197,20" alt="exit" onclick="pressMenuRemote('174');">
<area shape="circle" coords="77,258,20" alt="up" onclick="pressMenuRemote('103');">
<area shape="circle" coords="77,322,20" alt="down" onclick="pressMenuRemote('108');">
<area shape="circle" coords="46,290,20" alt="left" onclick="pressMenuRemote('105');">
<area shape="circle" coords="109,290,20" alt="right" onclick="pressMenuRemote('106');">
<area shape="circle" coords="77,290,20" alt="OK" onclick="pressMenuRemote('352');">
<area shape="circle" coords="35,158,15" alt="volume up" onclick="pressMenuRemote('115');">
<area shape="circle" coords="35,200,15" alt="volume down" onclick="pressMenuRemote('114');">
<area shape="circle" coords="121,35,10" alt="mute" onclick="pressMenuRemote('113');">
<area shape="rect" coords="19,80,44,91" alt="filelist" onclick="pressMenuRemote('393');">
<!--
<area shape="circle" coords="59,299,12" alt="playlist" onclick="pressMenuRemote('395');">
-->
<area shape="circle" coords="119,158,15" alt="channel up" onclick="pressMenuRemote('402');">
<area shape="circle" coords="119,200,15" alt="channel down" onclick="pressMenuRemote('403');">
<area shape="rect" coords="49,98,75,110" alt="rewind" onclick="pressMenuRemote('168');">
<area shape="rect" coords="80,117,104,129" alt="play" onclick="pressMenuRemote('207');">
<!--
<area shape="rect" coords="80,117,104,129" alt="pause" onclick="pressMenuRemote('119');">
-->
<area shape="rect" coords="80,98,104,110" alt="forward" onclick="pressMenuRemote('208');">
<area shape="rect" coords="110,117,134,129" alt="record" onclick="pressMenuRemote('167');">
<area shape="rect" coords="50,117,75,129" alt="stop" onclick="pressMenuRemote('128');">
<!--
<area shape="circle" coords="88,335,12" alt="jump" onclick="pressMenuRemote('519');">
<area shape="rect" coords="80,117,104,129" alt="timeshift" onclick="pressMenuRemote('359');">
<area shape="circle" coords="59,352,12" alt="mark" onclick="pressMenuRemote('834');">
<area shape="circle" coords="88,352,12" alt="search" onclick="pressMenuRemote('535');">
<area shape="circle" coords="30,370,12" alt="timer" onclick="pressMenuRemote('362');">
<area shape="circle" coords="59,370,12" alt="pip" onclick="pressMenuRemote('375');">
<area shape="circle" coords="88,370,12" alt="vkey" onclick="pressMenuRemote('393');">
-->
<area shape="rect" coords="94,363,125,371" alt="text" onclick="pressMenuRemote('388');">
<area shape="circle" coords="88,388,12" alt="subtitle" onclick="pressMenuRemote('370');">
<area shape="circle" coords="36,336,20" alt="audio" onclick="pressMenuRemote('392');">
<!--
<area shape="circle" coords="33,34,12" alt="tv" onclick="pressMenuRemote('377');">
<area shape="circle" coords="33,34,12" alt="radio" onclick="pressMenuRemote('385');">
<area shape="circle" coords="90,68,12" alt="help" onclick="pressMenuRemote('138');">
-->
</map>

0 comments on commit e1a0fb9

Please sign in to comment.