Merge branch 'master' into bug_236_recordpath

diff --combined lib/python/Screens/InfoBar.py
index be1407d,59cc21d..a15c7ac
--- 1/lib/python/Screens/InfoBar.py
--- 2/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@@ -16,7 -16,7 +16,7 @@@ from Screens.InfoBarGenerics import Inf
        InfoBarSubserviceSelection, InfoBarShowMovies, InfoBarTimeshift,  \
        InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \
        InfoBarSummarySupport, InfoBarMoviePlayerSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \
-       InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport, InfoBarJobman
+       InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarServiceErrorPopupSupport, InfoBarJobman
  
  profile("LOAD:InitBar_Components")
  from Components.ActionMap import HelpableActionMap
@@@ -32,7 -32,7 +32,7 @@@ class InfoBar(InfoBarBase, InfoBarShowH
        HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish,
        InfoBarSubserviceSelection, InfoBarTimeshift, InfoBarSeek,
        InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions,
-       InfoBarPiP, InfoBarPlugins, InfoBarSubtitleSupport, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport, InfoBarJobman,
+       InfoBarPiP, InfoBarPlugins, InfoBarSubtitleSupport, InfoBarServiceErrorPopupSupport, InfoBarJobman,
        Screen):
        
        ALLOW_SUSPEND = True
@@@ -56,7 -56,7 +56,7 @@@
                                InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \
                                InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \
                                InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitleSupport, InfoBarJobman, \
-                               InfoBarSleepTimer, InfoBarPlugins, InfoBarServiceErrorPopupSupport:
+                               InfoBarPlugins, InfoBarServiceErrorPopupSupport:
                        x.__init__(self)
  
                self.helpList.append((self["actions"], "InfobarActions", [("showMovies", _("view recordings..."))]))
@@@ -212,6 -212,7 +212,6 @@@ class MoviePlayer(InfoBarBase, InfoBarS
                                        return
  
                if answer in ("quit", "quitanddeleteconfirmed"):
 -                      config.movielist.last_videodir.cancel()
                        self.close()
                elif answer == "movielist":
                        ref = self.session.nav.getCurrentlyPlayingServiceReference()

diff --combined lib/python/Screens/InfoBarGenerics.py
index b27df9d,2cbfeb7..ed41bb2
--- 1/lib/python/Screens/InfoBarGenerics.py
--- 2/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@@ -10,7 -10,6 +10,7 @@@ from Components.ServiceEventTracker imp
  from Components.Sources.Boolean import Boolean
  from Components.config import config, ConfigBoolean, ConfigClock
  from Components.SystemInfo import SystemInfo
 +from Components.UsageConfig import preferredInstantRecordPath, defaultMoviePath
  from EpgSelection import EPGSelection
  from Plugins.Plugin import PluginDescriptor
  
@@@ -25,12 -24,11 +25,11 @@@ from Screens.TimerSelection import Time
  from Screens.PictureInPicture import PictureInPicture
  from Screens.SubtitleDisplay import SubtitleDisplay
  from Screens.RdsDisplay import RdsInfoDisplay, RassInteractive
- from Screens.SleepTimerEdit import SleepTimerEdit
  from Screens.TimeDateInput import TimeDateInput
  from ServiceReference import ServiceReference
  
  from Tools import Notifications
 -from Tools.Directories import SCOPE_HDD, resolveFilename, fileExists
 +from Tools.Directories import fileExists
  
  from enigma import eTimer, eServiceCenter, eDVBServicePMTHandler, iServiceInformation, \
        iPlayableService, eServiceReference, eEPGCache
@@@ -1358,17 -1356,6 +1357,6 @@@ class InfoBarJobman
                job_manager.in_background = in_background
  
  # depends on InfoBarExtensions
- class InfoBarSleepTimer:
-       def __init__(self):
-               self.addExtension((self.getSleepTimerName, self.showSleepTimerSetup, lambda: True), "1")
- 
-       def getSleepTimerName(self):
-               return _("Sleep Timer")
- 
-       def showSleepTimerSetup(self):
-               self.session.open(SleepTimerEdit)
- 
- # depends on InfoBarExtensions
  class InfoBarPiP:
        def __init__(self):
                try:
@@@ -1497,7 -1484,7 +1485,7 @@@ class InfoBarInstantRecord
                if isinstance(serviceref, eServiceReference):
                        serviceref = ServiceReference(serviceref)
  
 -              recording = RecordTimerEntry(serviceref, begin, end, name, description, eventid, dirname = config.movielist.last_videodir.value)
 +              recording = RecordTimerEntry(serviceref, begin, end, name, description, eventid, dirname = preferredInstantRecordPath())
                recording.dontSave = True
                
                if event is None or limitEvent == False:
@@@ -1598,9 -1585,9 +1586,9 @@@
                        self.session.nav.RecordTimer.timeChanged(entry)
  
        def instantRecord(self):
 -              dir = config.movielist.last_videodir.value
 -              if not fileExists(dir, 'w'):
 -                      dir = resolveFilename(SCOPE_HDD)
 +              dir = preferredInstantRecordPath()
 +              if not dir or not fileExists(dir, 'w'):
 +                      dir = defaultMoviePath()
                try:
                        stat = os_stat(dir)
                except: