take care of scrollbar size when build movielist and timerlist entries

[enigma2.git] / lib / python / Screens / InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 2b5491b954a9596fbc1d2d002672fa0ea0b28514..85b1d80f3f44a7affff5c8a9a0fd28d61c7af459 100644 (file)
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -5,17 +5,15 @@ from Components.ActionMap import NumberActionMap
 from Components.BlinkingPixmap import BlinkingPixmapConditional
 from Components.Harddisk import harddiskmanager
 from Components.Input import Input
 from Components.BlinkingPixmap import BlinkingPixmapConditional
 from Components.Harddisk import harddiskmanager
 from Components.Input import Input

-from Components.Label import *
-from Components.Pixmap import Pixmap, PixmapConditional
+from Components.Label import Label
+from Components.Pixmap import Pixmap

 from Components.PluginComponent import plugins
 from Components.PluginComponent import plugins

-from Components.ProgressBar import *

 from Components.ServiceEventTracker import ServiceEventTracker
 from Components.Sources.CurrentService import CurrentService
 from Components.Sources.EventInfo import EventInfo
 from Components.Sources.FrontendStatus import FrontendStatus
 from Components.Sources.Boolean import Boolean
 from Components.Sources.Clock import Clock
 from Components.ServiceEventTracker import ServiceEventTracker
 from Components.Sources.CurrentService import CurrentService
 from Components.Sources.EventInfo import EventInfo
 from Components.Sources.FrontendStatus import FrontendStatus
 from Components.Sources.Boolean import Boolean
 from Components.Sources.Clock import Clock

-from Components.TimerList import TimerEntryComponent

 from Components.config import config, ConfigBoolean, ConfigClock
 from EpgSelection import EPGSelection
 from Plugins.Plugin import PluginDescriptor
 from Components.config import config, ConfigBoolean, ConfigClock
 from EpgSelection import EPGSelection
 from Plugins.Plugin import PluginDescriptor


@@ -406,8 +404,17 @@ class InfoBarEPG:
                self["EPGActions"] = HelpableActionMap(self, "InfobarEPGActions", 
                        {
                                "showEventInfo": (self.openEventView, _("show EPG...")),
                self["EPGActions"] = HelpableActionMap(self, "InfobarEPGActions", 
                        {
                                "showEventInfo": (self.openEventView, _("show EPG...")),

+                               "showSingleServiceEPG": (self.openSingleServiceEPG, _("show single service EPG...")),
+                               "showInfobarOrEpgWhenInfobarAlreadyVisible": self.showEventInfoWhenNotVisible,

                        })
 
                        })
 

+       def showEventInfoWhenNotVisible(self):
+               if self.shown:
+                       self.openEventView()
+               else:
+                       self.toggleShow()
+                       return 1
+

        def zapToService(self, service):
                if not service is None:
                        if self.servicelist.getRoot() != self.epg_bouquet: #already in correct bouquet?
        def zapToService(self, service):
                if not service is None:
                        if self.servicelist.getRoot() != self.epg_bouquet: #already in correct bouquet?


@@ -618,7 +625,7 @@ class InfoBarSeek:
 
        SEEK_STATE_EOF = (1, 0, 0, "END")
 
 
        SEEK_STATE_EOF = (1, 0, 0, "END")
 

-       def __init__(self):
+       def __init__(self, actionmap = "InfobarSeekActions"):

                self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
                        {
                                iPlayableService.evSeekableStatusChanged: self.__seekableStatusChanged,
                self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
                        {
                                iPlayableService.evSeekableStatusChanged: self.__seekableStatusChanged,


@@ -638,53 +645,49 @@ class InfoBarSeek:
                                if action[:5] == "seek:":
                                        time = int(action[5:])
                                        self.screen.seekRelative(time * 90000)
                                if action[:5] == "seek:":
                                        time = int(action[5:])
                                        self.screen.seekRelative(time * 90000)

-                                       self.screen.doShow()
+                                       self.screen.showAfterSeek()

                                        return 1
                                else:
                                        return HelpableActionMap.action(self, contexts, action)
 
                                        return 1
                                else:
                                        return HelpableActionMap.action(self, contexts, action)
 

-               self["SeekActions"] = InfoBarSeekActionMap(self, "InfobarSeekActions", 
+               self["SeekActions"] = InfoBarSeekActionMap(self, actionmap, 

                        {
                        {

-                               "playpauseService": (self.playpauseService, _("pause")),
+                               "playpauseService": self.playpauseService,

                                "pauseService": (self.pauseService, _("pause")),
                                "unPauseService": (self.unPauseService, _("continue")),
 
                                "seekFwd": (self.seekFwd, _("skip forward")),
                                "pauseService": (self.pauseService, _("pause")),
                                "unPauseService": (self.unPauseService, _("continue")),
 
                                "seekFwd": (self.seekFwd, _("skip forward")),

-                               "seekFwdDown": self.seekFwdDown,
-                               "seekFwdUp": self.seekFwdUp,
+                               "seekFwdManual": (self.seekFwdManual, _("skip forward (enter time)")),

                                "seekBack": (self.seekBack, _("skip backward")),
                                "seekBack": (self.seekBack, _("skip backward")),

-                               "seekBackDown": self.seekBackDown,
-                               "seekBackUp": self.seekBackUp,
+                               "seekBackManual": (self.seekBackManual, _("skip backward (enter time)")),
+                               
+                               "seekFwdDef": (self.seekFwdDef, _("skip forward (self defined)")),
+                               "seekBackDef": (self.seekBackDef, _("skip backward (self defined)"))

                        }, prio=-1)
                        # give them a little more priority to win over color buttons
 
                self["SeekActions"].setEnabled(False)
 
                self.seekstate = self.SEEK_STATE_PLAY
                        }, prio=-1)
                        # give them a little more priority to win over color buttons
 
                self["SeekActions"].setEnabled(False)
 
                self.seekstate = self.SEEK_STATE_PLAY

-               self.onClose.append(self.delTimer)
-
-               self.fwdtimer = False
-               self.fwdKeyTimer = eTimer()
-               self.fwdKeyTimer.timeout.get().append(self.fwdTimerFire)
-
-               self.rwdtimer = False
-               self.rwdKeyTimer = eTimer()
-               self.rwdKeyTimer.timeout.get().append(self.rwdTimerFire)
+               
+               self.seek_flag = True

 
                self.onPlayStateChanged = [ ]
 
                self.lockedBecauseOfSkipping = False
 
 
                self.onPlayStateChanged = [ ]
 
                self.lockedBecauseOfSkipping = False
 

+               self.__seekableStatusChanged()
+
+       def showAfterSeek(self):
+               if isinstance(self, InfoBarShowHide):
+                       self.doShow()
+

        def up(self):
                pass
 
        def down(self):
                pass
 
        def up(self):
                pass
 
        def down(self):
                pass
 

-       def delTimer(self):
-               del self.fwdKeyTimer
-               del self.rwdKeyTimer
-

        def getSeek(self):
                service = self.session.nav.getCurrentService()
                if service is None:
        def getSeek(self):
                service = self.session.nav.getCurrentService()
                if service is None:


@@ -782,23 +785,6 @@ class InfoBarSeek:
 
                seekable.seekTo(90 * seektime)
 
 
                seekable.seekTo(90 * seektime)
 

-       def seekFwdDown(self):
-               print "start fwd timer"
-               self.fwdtimer = True
-               self.fwdKeyTimer.start(1000)
-
-       def seekBackDown(self):
-               print "start rewind timer"
-               self.rwdtimer = True
-               self.rwdKeyTimer.start(1000)
-
-       def seekFwdUp(self):
-               print "seekFwdUp"
-               if self.fwdtimer:
-                       self.fwdKeyTimer.stop()
-                       self.fwdtimer = False
-                       self.seekFwd()
-

        def seekFwd(self):
                lookup = {
                                self.SEEK_STATE_PLAY: self.SEEK_STATE_FF_2X,
        def seekFwd(self):
                lookup = {
                                self.SEEK_STATE_PLAY: self.SEEK_STATE_FF_2X,


@@ -820,13 +806,6 @@ class InfoBarSeek:
                        }
                self.setSeekState(lookup[self.seekstate])
 
                        }
                self.setSeekState(lookup[self.seekstate])
 

-       def seekBackUp(self):
-               print "seekBackUp"
-               if self.rwdtimer:
-                       self.rwdKeyTimer.stop()
-                       self.rwdtimer = False
-                       self.seekBack()
-

        def seekBack(self):
                lookup = {
                                self.SEEK_STATE_PLAY: self.SEEK_STATE_BACK_16X,
        def seekBack(self):
                lookup = {
                                self.SEEK_STATE_PLAY: self.SEEK_STATE_BACK_16X,


@@ -853,10 +832,23 @@ class InfoBarSeek:
                        if seekable is not None:
                                seekable.seekRelative(-1, 3)
 
                        if seekable is not None:
                                seekable.seekRelative(-1, 3)
 

-       def fwdTimerFire(self):
-               print "Display seek fwd"
-               self.fwdKeyTimer.stop()
-               self.fwdtimer = False
+       def seekFwdDef(self):
+               self.seek_flag = False
+               seconds = config.usage.self_defined_seek.value
+               print "Seek", seconds, "seconds self defined forward"
+               seekable = self.getSeek()
+               if seekable is not None:
+                       seekable.seekRelative(1, seconds * 90000)
+               
+       def seekBackDef(self):
+               self.seek_flag = False
+               seconds = config.usage.self_defined_seek.value
+               print "Seek", seconds, "seconds self defined backward"
+               seekable = self.getSeek()
+               if seekable is not None:
+                       seekable.seekRelative(1, 0 - seconds * 90000)
+               
+       def seekFwdManual(self):

                self.session.openWithCallback(self.fwdSeekTo, MinuteInput)
 
        def fwdSeekTo(self, minutes):
                self.session.openWithCallback(self.fwdSeekTo, MinuteInput)
 
        def fwdSeekTo(self, minutes):


@@ -866,10 +858,7 @@ class InfoBarSeek:
                        if seekable is not None:
                                seekable.seekRelative(1, minutes * 60 * 90000)
 
                        if seekable is not None:
                                seekable.seekRelative(1, minutes * 60 * 90000)
 

-       def rwdTimerFire(self):
-               print "rwdTimerFire"
-               self.rwdKeyTimer.stop()
-               self.rwdtimer = False
+       def seekBackManual(self):

                self.session.openWithCallback(self.rwdSeekTo, MinuteInput)
 
        def rwdSeekTo(self, minutes):
                self.session.openWithCallback(self.rwdSeekTo, MinuteInput)
 
        def rwdSeekTo(self, minutes):


@@ -907,11 +896,14 @@ class InfoBarSeek:
                self.doSeek(0)
 
        def seekRelative(self, diff):
                self.doSeek(0)
 
        def seekRelative(self, diff):

-               seekable = self.getSeek()
-               if seekable is not None:
-                       print "seekRelative: res:", seekable.seekRelative(1, diff)
+               if self.seek_flag == True:
+                       seekable = self.getSeek()
+                       if seekable is not None:
+                               print "seekRelative: res:", seekable.seekRelative(1, diff)
+                       else:
+                               print "seek failed!"

                else:
                else:

-                       print "seek failed!"
+                       self.seek_flag = True

 
        def seekRelativeToEnd(self, diff):
                assert diff <= 0, "diff is expected to be negative!"
 
        def seekRelativeToEnd(self, diff):
                assert diff <= 0, "diff is expected to be negative!"


@@ -964,9 +956,9 @@ class InfoBarShowMovies:
        def __init__(self):
                self["MovieListActions"] = HelpableActionMap(self, "InfobarMovieListActions", 
                        {
        def __init__(self):
                self["MovieListActions"] = HelpableActionMap(self, "InfobarMovieListActions", 
                        {

-                               "movieList": (self.showMovies, "movie list"),
-                               "up": (self.showMovies, "movie list"),
-                               "down": (self.showMovies, "movie list")
+                               "movieList": (self.showMovies, _("movie list")),
+                               "up": (self.showMovies, _("movie list")),
+                               "down": (self.showMovies, _("movie list"))

                        })
 
 # InfoBarTimeshift requires InfoBarSeek, instantiated BEFORE!
                        })
 
 # InfoBarTimeshift requires InfoBarSeek, instantiated BEFORE!


@@ -1211,7 +1203,7 @@ class InfoBarPlugins:
                return list
 
        def runPlugin(self, plugin):
                return list
 
        def runPlugin(self, plugin):

-               plugin(session = self.session)
+               plugin(session = self.session, servicelist = self.servicelist)

 
 # depends on InfoBarExtensions
 class InfoBarSleepTimer:
 
 # depends on InfoBarExtensions
 class InfoBarSleepTimer:


@@ -1260,6 +1252,7 @@ class InfoBarPiP:
                        self.session.pipshown = False
                else:
                        self.session.pip = self.session.instantiateDialog(PictureInPicture)
                        self.session.pipshown = False
                else:
                        self.session.pip = self.session.instantiateDialog(PictureInPicture)

+                       self.session.pip.show()

                        newservice = self.session.nav.getCurrentlyPlayingServiceReference()
                        if self.session.pip.playService(newservice):
                                self.session.pipshown = True
                        newservice = self.session.nav.getCurrentlyPlayingServiceReference()
                        if self.session.pip.playService(newservice):
                                self.session.pipshown = True


@@ -1365,7 +1358,7 @@ class InfoBarInstantRecord:
                        if not x in self.session.nav.RecordTimer.timer_list:
                                self.recording.remove(x)
                        elif x.dontSave and x.isRunning():
                        if not x in self.session.nav.RecordTimer.timer_list:
                                self.recording.remove(x)
                        elif x.dontSave and x.isRunning():

-                               list.append(TimerEntryComponent(x, False))
+                               list.append((x, False))

 
                if answer[1] == "changeduration":
                        if len(self.recording) == 1:
 
                if answer[1] == "changeduration":
                        if len(self.recording) == 1:


@@ -1737,12 +1730,12 @@ class InfoBarCueSheetSupport:
 
        ENABLE_RESUME_SUPPORT = False
 
 
        ENABLE_RESUME_SUPPORT = False
 

-       def __init__(self):
-               self["CueSheetActions"] = HelpableActionMap(self, "InfobarCueSheetActions", 
+       def __init__(self, actionmap = "InfobarCueSheetActions"):
+               self["CueSheetActions"] = HelpableActionMap(self, actionmap, 

                        {
                        {

-                               "jumpPreviousMark": (self.jumpPreviousMark, "jump to next marked position"),
-                               "jumpNextMark": (self.jumpNextMark, "jump to previous marked position"),
-                               "toggleMark": (self.toggleMark, "toggle a cut mark at the current position")
+                               "jumpPreviousMark": (self.jumpPreviousMark, _("jump to previous marked position")),
+                               "jumpNextMark": (self.jumpNextMark, _("jump to next marked position")),
+                               "toggleMark": (self.toggleMark, _("toggle a cut mark at the current position"))

                        }, prio=1) 
 
                self.cut_list = [ ]
                        }, prio=1) 
 
                self.cut_list = [ ]


@@ -1774,6 +1767,11 @@ class InfoBarCueSheetSupport:
                        seekable = self.__getSeekable()
                        if seekable is not None:
                                seekable.seekTo(self.resume_point)
                        seekable = self.__getSeekable()
                        if seekable is not None:
                                seekable.seekTo(self.resume_point)

+               self.hideAfterResume()
+       
+       def hideAfterResume(self):
+               if isinstance(self, InfoBarShowHide):
+                       self.hide()

 
        def __getSeekable(self):
                service = self.session.nav.getCurrentService()
 
        def __getSeekable(self):
                service = self.session.nav.getCurrentService()


@@ -1819,7 +1817,7 @@ class InfoBarCueSheetSupport:
                nearest = None
                for cp in self.cut_list:
                        diff = cmp(cp[0] - pts)
                nearest = None
                for cp in self.cut_list:
                        diff = cmp(cp[0] - pts)

-                       if diff >= 0 and (nearest is None or cmp(nearest[0] - pts) > diff):
+                       if cp[1] == self.CUT_TYPE_MARK and diff >= 0 and (nearest is None or cmp(nearest[0] - pts) > diff):

                                nearest = cp
                return nearest
 
                                nearest = cp
                return nearest
 


@@ -1845,10 +1843,16 @@ class InfoBarCueSheetSupport:
        def addMark(self, point):
                insort(self.cut_list, point)
                self.uploadCuesheet()
        def addMark(self, point):
                insort(self.cut_list, point)
                self.uploadCuesheet()

+               self.showAfterCuesheetOperation()

 
        def removeMark(self, point):
                self.cut_list.remove(point)
                self.uploadCuesheet()
 
        def removeMark(self, point):
                self.cut_list.remove(point)
                self.uploadCuesheet()

+               self.showAfterCuesheetOperation()
+
+       def showAfterCuesheetOperation(self):
+               if isinstance(self, InfoBarShowHide):
+                       self.doShow()

 
        def __getCuesheet(self):
                service = self.session.nav.getCurrentService()
 
        def __getCuesheet(self):
                service = self.session.nav.getCurrentService()


@@ -1868,9 +1872,10 @@ class InfoBarCueSheetSupport:
                cue = self.__getCuesheet()
 
                if cue is None:
                cue = self.__getCuesheet()
 
                if cue is None:

-                       print "upload failed, no cuesheet interface"
-                       return
-               self.cut_list = cue.getCutList()
+                       print "download failed, no cuesheet interface"
+                       self.cut_list = [ ]
+               else:
+                       self.cut_list = cue.getCutList()

 
 class InfoBarSummary(Screen):
        skin = """
 
 class InfoBarSummary(Screen):
        skin = """