git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- split out meta parser
[enigma2.git]
/
lib
/
python
/
Screens
/
InfoBar.py
diff --git
a/lib/python/Screens/InfoBar.py
b/lib/python/Screens/InfoBar.py
index 5eb5ab10f2d075b91ae6ac55a98851b8af63cabb..be6b65c9de45c837fb3ca02a4d90251ae6409727 100644
(file)
--- a/
lib/python/Screens/InfoBar.py
+++ b/
lib/python/Screens/InfoBar.py
@@
-6,12
+6,15
@@
from Components.Button import Button
from Components.ServiceName import ServiceName
from Components.EventInfo import EventInfo
from Components.ServiceName import ServiceName
from Components.EventInfo import EventInfo
+from Screens.MessageBox import MessageBox
+from Screens.MovieSelection import MovieSelection
+
from enigma import *
import time
# hack alert!
from enigma import *
import time
# hack alert!
-from Menu import
*
+from Menu import
MainMenu, mdom
class InfoBar(Screen):
def __init__(self, session):
class InfoBar(Screen):
def __init__(self, session):
@@
-22,13
+25,17
@@
class InfoBar(Screen):
self["actions"] = ActionMap( [ "InfobarActions" ],
{
self["actions"] = ActionMap( [ "InfobarActions" ],
{
- "switchChannel": self.switchChannel,
+ "switchChannelUp": self.switchChannelUp,
+ "switchChannelDown": self.switchChannelDown,
"mainMenu": self.mainMenu,
"zapUp": self.zapUp,
"zapDown": self.zapDown,
"mainMenu": self.mainMenu,
"zapUp": self.zapUp,
"zapDown": self.zapDown,
- "instantRecord": self.instantRecord
+ "instantRecord": self.instantRecord,
+ "hide": self.hide,
+ "toggleShow": self.toggleShow,
+ "showMovies": self.showMovies,
})
})
-
self["okbutton"] = Button("mainMenu", [self.mainMenu])
+
#
self["okbutton"] = Button("mainMenu", [self.mainMenu])
self["CurrentTime"] = Clock()
self["CurrentTime"] = Clock()
@@
-46,18
+53,37
@@
class InfoBar(Screen):
print "loading mainmenu XML..."
menu = mdom.childNodes[0]
assert menu.tagName == "menu", "root element in menu must be 'menu'!"
print "loading mainmenu XML..."
menu = mdom.childNodes[0]
assert menu.tagName == "menu", "root element in menu must be 'menu'!"
- self.session.open(Menu, menu, menu.childNodes)
+ self.session.open(MainMenu, menu, menu.childNodes)
+
+ def switchChannelUp(self):
+ self.servicelist.moveUp()
+ self.session.execDialog(self.servicelist)
- def switchChannel(self):
+ def switchChannelDown(self):
+ self.servicelist.moveDown()
self.session.execDialog(self.servicelist)
self.session.execDialog(self.servicelist)
+ def hide(self):
+ self.instance.hide()
+
+ def toggleShow(self):
+ if self.instance.isVisible():
+ self.instance.hide()
+ else:
+ self.instance.show()
+
def zapUp(self):
def zapUp(self):
- self.servicelist.zapUp()
+ self.servicelist.moveUp()
+ self.servicelist.zap()
def zapDown(self):
def zapDown(self):
- self.servicelist.zapDown()
+ self.servicelist.moveDown()
+ self.servicelist.zap()
def instantRecord(self):
def instantRecord(self):
+ self.session.open(MessageBox, "this would be an instant recording! do you really know what you're doing?!")
+ return
+
if self.recording != None:
print "remove entry"
self.session.nav.RecordTimer.removeEntry(self.recording)
if self.recording != None:
print "remove entry"
self.session.nav.RecordTimer.removeEntry(self.recording)
@@
-74,7
+100,8
@@
class InfoBar(Screen):
ev = eServiceEventPtr()
if info.getEvent(ev, 0) == 0:
epg = ev
ev = eServiceEventPtr()
if info.getEvent(ev, 0) == 0:
epg = ev
-
- self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 30, serviceref, epg)
- print "got entry: %s" % (str(self.recording))
-
+ # fix me, description.
+ self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 30, serviceref, epg, "instant record")
+
+ def showMovies(self):
+ self.session.open(MovieSelection)