git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import Setup which was used but not imported
[enigma2.git]
/
lib
/
python
/
Screens
/
InfoBar.py
diff --git
a/lib/python/Screens/InfoBar.py
b/lib/python/Screens/InfoBar.py
index ed193f389bb511ff4680dc10057e2efb78a31c35..c10dad2d6a8573ec47916b02c344ffd7e1884837 100644
(file)
--- a/
lib/python/Screens/InfoBar.py
+++ b/
lib/python/Screens/InfoBar.py
@@
-7,6
+7,7
@@
from Components.Button import Button
from Components.ServiceName import ServiceName
from Components.EventInfo import EventInfo
from Components.ServicePosition import ServicePosition
from Components.ServiceName import ServiceName
from Components.EventInfo import EventInfo
from Components.ServicePosition import ServicePosition
+from Components.config import configfile
from Screens.MessageBox import MessageBox
from Screens.MovieSelection import MovieSelection
from Screens.MessageBox import MessageBox
from Screens.MovieSelection import MovieSelection
@@
-32,6
+33,11
@@
class InfoBar(Screen):
self.volumeBar = VolumeBar()
self.state = self.STATE_HIDDEN
self.volumeBar = VolumeBar()
self.state = self.STATE_HIDDEN
+
+ self.hideTimer = eTimer()
+ self.hideTimer.timeout.get().append(self.doTimerHide)
+ #self.hideTimer.start(1000)
+
self["actions"] = ActionMap( [ "InfobarActions" ],
{
self["actions"] = ActionMap( [ "InfobarActions" ],
{
@@
-51,7
+57,8
@@
class InfoBar(Screen):
})
# self["okbutton"] = Button("mainMenu", [self.mainMenu])
})
# self["okbutton"] = Button("mainMenu", [self.mainMenu])
- self["CurrentTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
+ self["CurrentTime"] = Clock()
+ # ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
# Clock()
self["Volume"] = self.volumeBar
# Clock()
self["Volume"] = self.volumeBar
@@
-85,13
+92,23
@@
class InfoBar(Screen):
def hide(self):
self.instance.hide()
def hide(self):
self.instance.hide()
+ def doTimerHide(self):
+ if self.state == self.STATE_SHOWN:
+ self.instance.hide()
+ self.state = self.STATE_HIDDEN
+
def toggleShow(self):
if self.state == self.STATE_SHOWN:
def toggleShow(self):
if self.state == self.STATE_SHOWN:
-# self.instance.hide()
- self.startHide()
+ self.instance.hide()
+ #pls check animation support, sorry
+# self.startHide()
+ self.state = self.STATE_HIDDEN
else:
else:
-# self.instance.show()
- self.startShow()
+ self.instance.show()
+# self.startShow()
+ self.state = self.STATE_SHOWN
+ #TODO: make it customizable
+ self.hideTimer.start(5000)
def zapUp(self):
self.servicelist.moveUp()
def zapUp(self):
self.servicelist.moveUp()
@@
-122,6
+139,7
@@
class InfoBar(Screen):
self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
def quit(self):
self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
def quit(self):
+ configfile.save()
quitMainloop()
def instantRecord(self):
quitMainloop()
def instantRecord(self):
@@
-137,16
+155,16
@@
class InfoBar(Screen):
# try to get event info
epg = None
# try to get event info
epg = None
- service = self.session.nav.getCurrentService()
- if service != None:
- info = iServiceInformationPtr()
- if not service.info(info):
- ev = eServiceEventPtr()
- if info.getEvent(ev, 0) == 0:
- epg = ev
+ try:
+ service = self.session.nav.getCurrentService()
+ info = service.info()
+ ev = info.getEvent(0)
+ epg = ev
+ except:
+ pass
+
# 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)
# 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)
-