add possibility to choose record location on timer creation and choose

record location in movieplayer (only in expert user level)

7 files changed, 371 insertions, 142 deletions

diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py
index a2c31d26..edad3596 100644
--- a/lib/python/Screens/EpgSelection.py
+++ b/lib/python/Screens/EpgSelection.py
@@ -184,7 +184,7 @@ class EPGSelection(Screen):
 		serviceref = cur[1]
 		if event is None:
 			return
-		newEntry = RecordTimerEntry(serviceref, checkOldTimers = True, *parseEvent(event))
+		newEntry = RecordTimerEntry(serviceref, checkOldTimers = True, dirname = config.movielist.last_timer_videodir.value, *parseEvent(event))
 		self.session.openWithCallback(self.timerEditFinished, TimerEntry, newEntry)
 
 	def timerEditFinished(self, answer):
diff --git a/lib/python/Screens/EventView.py b/lib/python/Screens/EventView.py
index 1bb3d0b1..964973d3 100644
--- a/lib/python/Screens/EventView.py
+++ b/lib/python/Screens/EventView.py
@@ -7,6 +7,7 @@ from enigma import eEPGCache, eTimer, eServiceReference
 from RecordTimer import RecordTimerEntry, parseEvent
 from TimerEntry import TimerEntry
 from time import localtime
+from Components.config import config
 
 class EventViewBase:
 	def __init__(self, Event, Ref, callback=None, similarEPGCB=None):
@@ -58,7 +59,7 @@ class EventViewBase:
 
 	def timerAdd(self):
 		if not self.isRecording:
-			newEntry = RecordTimerEntry(self.currentService, checkOldTimers = True, *parseEvent(self.event))
+			newEntry = RecordTimerEntry(self.currentService, checkOldTimers = True, dirname = config.movielist.last_timer_videodir.value, *parseEvent(self.event))
 			self.session.openWithCallback(self.timerEditFinished, TimerEntry, newEntry)
 
 	def timerEditFinished(self, answer):
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 6ece2784..e7f71daf 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -1356,7 +1356,7 @@ class InfoBarPiP:
 		elif "stop" == use:
 			self.showPiP()
 
-from RecordTimer import parseEvent
+from RecordTimer import parseEvent, RecordTimerEntry
 
 class InfoBarInstantRecord:
 	"""Instant Record - handles the instantRecord action in order to
@@ -1406,10 +1406,14 @@ class InfoBarInstantRecord:
 			if limitEvent:
 				self.session.open(MessageBox, _("No event info found, recording indefinitely."), MessageBox.TYPE_INFO)
 
-		data = (begin, end, name, description, eventid)
+		# TODO: needed?
+		if isinstance(serviceref, eServiceReference):
+			serviceref = ServiceReference(serviceref)
 
-		recording = self.session.nav.recordWithTimer(serviceref, *data)
+		recording = RecordTimerEntry(serviceref, begin, end, name, description, eventid, dirname = config.movielist.last_videodir.value)
 		recording.dontSave = True
+
+		self.session.nav.RecordTimer.record(recording)
 		self.recording.append(recording)
 
 	def isInstantRecordRunning(self):
diff --git a/lib/python/Screens/LocationBox.py b/lib/python/Screens/LocationBox.py
index de7923e4..132f1401 100644
--- a/lib/python/Screens/LocationBox.py
+++ b/lib/python/Screens/LocationBox.py
@@ -6,40 +6,54 @@
 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
 from Screens.InputBox import InputBox
+from Screens.HelpMenu import HelpableScreen
+from Screens.ChoiceBox import ChoiceBox
 
 # Generic
 from Tools.BoundFunction import boundFunction
+from Tools.Directories import *
+from Components.config import config, configfile, ConfigSubList, ConfigSubsection, \
+		ConfigText, ConfigNumber, ConfigBoolean
+import os
 
 # Quickselect
 from Tools.NumericalTextInput import NumericalTextInput
 
 # GUI (Components)
-from Components.ActionMap import NumberActionMap
+from Components.ActionMap import NumberActionMap, HelpableActionMap
 from Components.Label import Label
 from Components.Pixmap import Pixmap
 from Components.Button import Button
 from Components.FileList import FileList
+from Components.MenuList import MenuList
 
 # Timer
 from enigma import eTimer
 
-class LocationBox(Screen, NumericalTextInput):
+class LocationBox(Screen, NumericalTextInput, HelpableScreen):
 	"""Simple Class similar to MessageBox / ChoiceBox but used to choose a folder/pathname combination"""
 
-	skin = """<screen name="LocationBox" position="100,130" size="540,340" >
+	skin = """<screen name="LocationBox" position="100,75" size="540,460" >
 			<widget name="text" position="0,2" size="540,22" font="Regular;22" />
-			<widget name="filelist" position="0,25" size="540,235" />
-			<widget name="target" position="0,260" size="540,40" valign="center" font="Regular;22" />
-			<widget name="yellow" position="260,300" zPosition="1" size="140,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on" />
-			<widget name="key_yellow" position="260,300" zPosition="2" size="140,40" halign="center" valign="center" font="Regular;22" transparent="1" shadowColor="black" shadowOffset="-1,-1" />
-			<widget name="green" position="400,300" zPosition="1" size="140,40" pixmap="skin_default/buttons/green.png" transparent="1" alphatest="on" />
-			<widget name="key_green" position="400,300" zPosition="2" size="140,40" halign="center" valign="center" font="Regular;22" transparent="1" shadowColor="black" shadowOffset="-1,-1" />
+			<widget name="target" position="0,23" size="540,22" valign="center" font="Regular;22" />
+			<widget name="filelist" position="0,55" zPosition="1" size="540,210" scrollbarMode="showOnDemand" selectionDisabled="1" />
+			<widget name="textbook" position="0,272" size="540,22" font="Regular;22" />
+			<widget name="booklist" position="5,302" zPosition="2" size="535,100" scrollbarMode="showOnDemand" />
+			<widget name="red" position="0,415" zPosition="1" size="135,40" pixmap="skin_default/buttons/red.png" transparent="1" alphatest="on" />
+			<widget name="key_red" position="0,415" zPosition="2" size="135,40" halign="center" valign="center" font="Regular;22" transparent="1" shadowColor="black" shadowOffset="-1,-1" />   
+			<widget name="green" position="135,415" zPosition="1" size="135,40" pixmap="skin_default/buttons/green.png" transparent="1" alphatest="on" />
+			<widget name="key_green" position="135,415" zPosition="2" size="135,40" halign="center" valign="center" font="Regular;22" transparent="1" shadowColor="black" shadowOffset="-1,-1" />
+			<widget name="yellow" position="270,415" zPosition="1" size="135,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on" />
+			<widget name="key_yellow" position="270,415" zPosition="2" size="135,40" halign="center" valign="center" font="Regular;22" transparent="1" shadowColor="black" shadowOffset="-1,-1" />
+			<widget name="blue" position="405,415" zPosition="1" size="135,40" pixmap="skin_default/buttons/blue.png" transparent="1" alphatest="on" />
+			<widget name="key_blue" position="405,415" zPosition="2" size="135,40" halign="center" valign="center" font="Regular;22" transparent="1" shadowColor="black" shadowOffset="-1,-1" />            
 		</screen>"""
 
-	def __init__(self, session, text = "", filename = "", currDir = None, windowTitle = _("Select Location"), minFree = None):
+	def __init__(self, session, text = "", filename = "", currDir = None, bookmarks = None, userMode = False, windowTitle = _("Select Location"), minFree = None, autoAdd = False, editDir = False, inhibitDirs = [], inhibitMounts = []):
 		# Init parents
 		Screen.__init__(self, session)
 		NumericalTextInput.__init__(self, handleTimeout = False)
+		HelpableScreen.__init__(self)
 
 		# Set useable chars
 		self.setUseableChars(u'1234567890abcdefghijklmnopqrstuvwxyz')
@@ -55,50 +69,84 @@ class LocationBox(Screen, NumericalTextInput):
 
 		# Set Text
 		self["text"] = Label(text)
+		self["textbook"] = Label(_("Bookmarks"))
 
 		# Save parameters locally
 		self.text = text
 		self.filename = filename
 		self.minFree = minFree
+		self.realBookmarks = bookmarks
+		self.bookmarks = bookmarks and bookmarks.value[:] or []
+		self.userMode = userMode
+		self.autoAdd = autoAdd
+		self.editDir = editDir
+		self.inhibitDirs = inhibitDirs
 
 		# Initialize FileList
-		self["filelist"] = FileList(currDir, showDirectories = True, showFiles = False)
+		self["filelist"] = FileList(currDir, showDirectories = True, showFiles = False, inhibitMounts = inhibitMounts, inhibitDirs = inhibitDirs)
+
+		# Initialize BookList
+		self["booklist"] = MenuList(self.bookmarks)
 
 		# Buttons
-		self["key_green"] = Button(_("Confirm"))
+		self["key_green"] = Button(_("OK"))
 		self["key_yellow"] = Button(_("Rename"))
+		self["key_blue"] = Button(_("Remove Bookmark"))
+		self["key_red"] = Button(_("Cancel"))
 
 		# Background for Buttons
 		self["green"] = Pixmap()
 		self["yellow"] = Pixmap()
+		self["blue"] = Pixmap()
+		self["red"] = Pixmap()
 
 		# Initialize Target
 		self["target"] = Label()
 
+		if self.userMode:
+			self.usermodeOn()
+
 		# Custom Action Handler
-		class LocationBoxActionMap(NumberActionMap):
-			def __init__(self, box, contexts = [ ], actions = { }, prio=0):																													   
-				NumberActionMap.__init__(self, contexts, actions, prio)
-				self.box = box
+		class LocationBoxActionMap(HelpableActionMap):
+			def __init__(self, parent, context, actions = { }, prio=0):
+				HelpableActionMap.__init__(self, parent, context, actions, prio)
+				self.box = parent
 
 			def action(self, contexts, action):
 				# Reset Quickselect
 				self.box.timeout(force = True)
 
-				return NumberActionMap.action(self, contexts, action)
+				return HelpableActionMap.action(self, contexts, action)
 
 		# Actions that will reset quickselect
-		self["actions"] = LocationBoxActionMap(self, ["WizardActions", "ColorActions"],
-		{
-			"ok": self.ok,
-			"back": self.cancel,
-			"green": self.select,
-			"yellow": self.changeName,
-			"left": self.left,
-			"right": self.right,
-			"up": self.up,
-			"down": self.down,
-		}, -2)
+		self["WizardActions"] = LocationBoxActionMap(self, "WizardActions",
+			{
+				"left": self.left,
+				"right": self.right,
+				"up": self.up,
+				"down": self.down,
+				"ok": (self.ok, _("select")),
+				"back": (self.cancel, _("cancel")),
+			}, -2)
+
+		self["ColorActions"] = LocationBoxActionMap(self, "ColorActions",
+			{
+				"red": self.cancel,
+				"green": self.select,
+				"yellow": self.changeName,
+				"blue": self.addRemoveBookmark,
+			}, -2)
+
+		self["EPGSelectActions"] = LocationBoxActionMap(self, "EPGSelectActions",
+			{
+				"prevBouquet": (self.switchToBookList, _("switch to bookmarks")),
+				"nextBouquet": (self.switchToFileList, _("switch to filelist")),
+			}, -2)
+
+		self["MenuActions"] = LocationBoxActionMap(self, "MenuActions",
+			{
+				"menu": (self.showMenu, _("menu")),
+			}, -2)
 
 		# Actions used by quickselect
 		self["NumberActions"] = NumberActionMap(["NumberActions"],
@@ -119,55 +167,181 @@ class LocationBox(Screen, NumericalTextInput):
 		self.onShown.extend([
 			boundFunction(self.setTitle, windowTitle),
 			self.updateTarget,
-			self.showHideRename
+			self.showHideRename,
 		])
+
+		self.onLayoutFinish.append(self.switchToFileListOnStart)
  
 		# Make sure we remove our callback
 		self.onClose.append(self.disableTimer)
 
+	def switchToFileListOnStart(self):
+		if self.realBookmarks and self.realBookmarks.value:
+			self.currList = "booklist"
+			currDir = self["filelist"].current_directory
+			if currDir in self.bookmarks:
+				self["booklist"].moveToIndex(self.bookmarks.index(currDir))
+		else:
+			self.switchToFileList()
+
 	def disableTimer(self):
 		self.qs_timer.callback.remove(self.timeout)
 
 	def showHideRename(self):
 		# Don't allow renaming when filename is empty
 		if self.filename == "":
-			self["yellow"].hide()
 			self["key_yellow"].hide()
 
+	def switchToFileList(self):
+		if not self.userMode:
+			self.currList = "filelist"
+			self["filelist"].selectionEnabled(1)
+			self["booklist"].selectionEnabled(0)
+			self["key_blue"].text = _("Add Bookmark")
+			self.updateTarget()
+
+	def switchToBookList(self):
+		self.currList = "booklist"
+		self["filelist"].selectionEnabled(0)
+		self["booklist"].selectionEnabled(1)
+		self["key_blue"].text = _("Remove Bookmark")
+		self.updateTarget()
+
+	def addRemoveBookmark(self):
+		if self.currList == "filelist":
+			# add bookmark
+			folder = self["filelist"].getSelection()[0]
+			if folder is not None and not folder in self.bookmarks:
+				self.bookmarks.append(folder)
+				self.bookmarks.sort()
+				self["booklist"].setList(self.bookmarks)
+		else:
+			# remove bookmark
+			if not self.userMode:
+				name = self["booklist"].getCurrent()
+				self.session.openWithCallback(
+					boundFunction(self.removeBookmark, name),
+					MessageBox,
+					_("Do you really want to remove your bookmark of %s?") % (name),
+				)
+
+	def removeBookmark(self, name, ret):
+		if not ret:
+			return
+		if name in self.bookmarks:
+			self.bookmarks.remove(name)
+			self["booklist"].setList(self.bookmarks)
+
+	def createDir(self):
+		if self["filelist"].current_directory != None:
+			self.session.openWithCallback(
+				self.createDirCallback,
+				InputBox,
+				title = _("Please enter name of the new directory"),
+				text = ""
+			)
+
+	def createDirCallback(self, res):
+		if res is not None and len(res):
+			path = os.path.join(self["filelist"].current_directory, res)
+			if not pathExists(path):
+				if not createDir(path):
+					self.session.open(
+						MessageBox,
+						_("Creating directory %s failed.") % (path),
+						type = MessageBox.TYPE_ERROR,
+						timeout = 5
+					)
+				self["filelist"].refresh()
+			else:
+				self.session.open(
+					MessageBox,
+					_("The path %s already exists.") % (path),
+					type = MessageBox.TYPE_ERROR,
+					timeout = 5
+				)
+
+	def removeDir(self):
+		sel = self["filelist"].getSelection()
+		if sel and pathExists(sel[0]):
+			self.session.openWithCallback(
+				boundFunction(self.removeDirCallback, sel[0]),
+				MessageBox,
+				_("Do you really want to remove directory %s from the disk?") % (sel[0]),
+				type = MessageBox.TYPE_YESNO
+			)
+		else:
+			self.session.open(
+				MessageBox,
+				_("Invalid directory selected: %s") % (sel[0]),
+				type = MessageBox.TYPE_ERROR,
+				timeout = 5
+			)
+
+	def removeDirCallback(self, name, res):
+		if res:
+			if not removeDir(name):
+				self.session.open(
+					MessageBox,
+					_("Removing directory %s failed. (Maybe not empty.)") % (name),
+					type = MessageBox.TYPE_ERROR,
+					timeout = 5
+				)
+			else:
+				self["filelist"].refresh()
+				self.removeBookmark(name, True)
+
 	def up(self):
-		self["filelist"].up()
+		self[self.currList].up()
+		self.updateTarget()
 
 	def down(self):
-		self["filelist"].down()
+		self[self.currList].down()
+		self.updateTarget()
 
 	def left(self):
-		self["filelist"].pageUp()
+		self[self.currList].pageUp()
+		self.updateTarget()
 
 	def right(self):
-		self["filelist"].pageDown()
+		self[self.currList].pageDown()
+		self.updateTarget()
 
 	def ok(self):
-		if self["filelist"].canDescent():
-			self["filelist"].descent()
-			self.updateTarget()
+		if self.currList == "filelist":
+			if self["filelist"].canDescent():
+				self["filelist"].descent()
+				self.updateTarget()
+		else:
+			self.select()
 
 	def cancel(self):
 		self.close(None)
 
+	def getPreferredFolder(self):
+		if self.currList == "filelist":
+			# XXX: We might want to change this for parent folder...
+			return self["filelist"].getSelection()[0]
+		else:
+			return self["booklist"].getCurrent()
+
 	def selectConfirmed(self, res):
-		if res: 
-			self.close(''.join([self["filelist"].getCurrentDirectory(), self.filename]))
+		if res:
+			ret = ''.join([self.getPreferredFolder(), self.filename])
+			if self.realBookmarks and self.autoAdd and not ret in self.bookmarks:
+				self.bookmarks.append(self.getPreferredFolder())
+				self.bookmarks.sort()
+			self.close(ret)
 
 	def select(self):
+		currentFolder = self.getPreferredFolder()
 		# Do nothing unless current Directory is valid
-		if self["filelist"].getCurrentDirectory() is not None:
+		if currentFolder is not None:
 			# Check if we need to have a minimum of free Space available
 			if self.minFree is not None:
 				# Try to read fs stats
 				try:
-					from os import statvfs
-
-					s = statvfs(self["filelist"].getCurrentDirectory())
+					s = os.statvfs(currentFolder)
 					if (s.f_bavail * s.f_bsize) / 1000000 > self.minFree:
 						# Automatically confirm if we have enough free disk Space available
 						return self.selectConfirmed(True)
@@ -181,14 +355,19 @@ class LocationBox(Screen, NumericalTextInput):
 					_("There might not be enough Space on the selected Partition.\nDo you really want to continue?"),
 					type = MessageBox.TYPE_YESNO
 				)
-			# No minimum free Space means we can safely close
-			else:   
+				# No minimum free Space means we can safely close
+			else:
 				self.selectConfirmed(True)
 
+	def close(self, ret):
+		if ret and self.realBookmarks and self.bookmarks != self.realBookmarks.value:
+			self.realBookmarks.value = self.bookmarks
+			self.realBookmarks.save()
+		Screen.close(self, ret)
+
 	def changeName(self):
 		if self.filename != "":
 			# TODO: Add Information that changing extension is bad? disallow?
-			# TODO: decide if using an inputbox is ok - we could also keep this in here
 			self.session.openWithCallback(
 				self.nameChanged,
 				InputBox,
@@ -211,12 +390,42 @@ class LocationBox(Screen, NumericalTextInput):
 
 	def updateTarget(self):
 		# Write Combination of Folder & Filename when Folder is valid
-		if self["filelist"].getCurrentDirectory() is not None:
-			self["target"].setText(''.join([self["filelist"].getCurrentDirectory(), self.filename]))
-		# Warning else
+		currFolder = self.getPreferredFolder()
+		if currFolder is not None:
+			self["target"].setText(''.join([currFolder, self.filename]))
+		# Display a Warning otherwise
 		else:
 			self["target"].setText(_("Invalid Location"))
 
+	def showMenu(self):
+		if not self.userMode and self.realBookmarks:
+			menu = []
+			if self.currList == "filelist":
+				menu.append((_("switch to bookmarks"), self.switchToBookList))
+				menu.append((_("add bookmark"), self.AddRemoveBookmark))
+				if self.editDir:
+					menu.append((_("create directory"), self.createDir))
+					menu.append((_("remove directory"), self.removeDir))
+			else:
+				menu.append((_("switch to filelist"), self.switchToFileList))
+				menu.append((_("remove bookmark"), self.AddRemoveBookmark))
+
+			self.session.openWithCallback(
+				self.menuCallback,
+				ChoiceBox,
+				title = "",
+				list = menu
+			)
+
+	def menuCallback(self, choice):
+		if choice:
+			choice[1]()
+			
+	def usermodeOn(self):
+		self.switchToBookList()
+		self["filelist"].hide()
+		self["key_blue"].hide()
+
 	def keyNumberGlobal(self, number):
 		# Cancel Timeout
 		self.qs_timer.stop()
@@ -290,3 +499,9 @@ class LocationBox(Screen, NumericalTextInput):
 	def __repr__(self):
 		return str(type(self)) + "(" + self.text + ")"
 
+class MovieLocationBox(LocationBox):
+	def __init__(self, session, text, dir, minFree = None):
+		inhibitMounts = []
+		if config.usage.setup_level.index < 2: # -expert
+			inhibitMounts.append("/")
+		LocationBox.__init__(self, session, text = text, currDir = dir, bookmarks = config.movielist.videodirs, autoAdd = True, editDir = True, inhibitMounts = inhibitMounts, minFree = minFree)
diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py
index a2ccb79a..c05f145f 100644
--- a/lib/python/Screens/MovieSelection.py
+++ b/lib/python/Screens/MovieSelection.py
@@ -7,14 +7,14 @@ from Components.DiskInfo import DiskInfo
 from Components.Pixmap import Pixmap
 from Components.Label import Label
 from Components.PluginComponent import plugins
-from Components.config import config, ConfigSubsection, ConfigText, ConfigInteger, configfile
+from Components.config import config, ConfigSubsection, ConfigText, ConfigInteger, ConfigLocations
 from Components.Sources.ServiceEvent import ServiceEvent
 
 from Plugins.Plugin import PluginDescriptor
 
 from Screens.MessageBox import MessageBox
 from Screens.ChoiceBox import ChoiceBox
-from Screens.LocationBox import LocationBox
+from Screens.LocationBox import MovieLocationBox
 from Screens.HelpMenu import HelpableScreen
 
 from Tools.Directories import *
@@ -26,8 +26,9 @@ config.movielist = ConfigSubsection()
 config.movielist.moviesort = ConfigInteger(default=MovieList.SORT_RECORDED)
 config.movielist.listtype = ConfigInteger(default=MovieList.LISTTYPE_ORIGINAL)
 config.movielist.description = ConfigInteger(default=MovieList.HIDE_DESCRIPTION)
-# FIXME: see if this is always accessible by InfoBarGenerics
 config.movielist.last_videodir = ConfigText(default=resolveFilename(SCOPE_HDD))
+config.movielist.last_timer_videodir = ConfigText(default=resolveFilename(SCOPE_HDD))
+config.movielist.videodirs = ConfigLocations(default=[resolveFilename(SCOPE_HDD)])
 
 class MovieContextMenu(Screen):
 	def __init__(self, session, csel, service):
@@ -69,7 +70,6 @@ class MovieContextMenu(Screen):
 		self.close(False)
 
 	def sortBy(self, newType):
-		self.csel.saveflag = True
 		config.movielist.moviesort.value = newType
 		self.csel.selectedmovie = self.csel.getCurrent()
 		self.csel.setSortType(newType)
@@ -78,14 +78,12 @@ class MovieContextMenu(Screen):
 		self.close()
 
 	def listType(self, newType):
-		self.csel.saveflag = True
 		config.movielist.listtype.value = newType
 		self.csel.setListType(newType)
 		self.csel.list.redrawList()
 		self.close()
 
 	def showDescription(self, newType):
-		self.csel.saveflag = True
 		config.movielist.description.value = newType
 		self.csel.setDescriptionState(newType)
 		self.csel.updateDescription()
@@ -124,7 +122,8 @@ class MovieContextMenu(Screen):
 		if result == False:
 			self.session.openWithCallback(self.close, MessageBox, _("Delete failed!"), MessageBox.TYPE_ERROR)
 		else:
-			list = self.csel["list"].removeService(self.service)
+			self.csel["list"].removeService(self.service)
+ 			self.csel["freeDiskSpace"].update()
 			self.close()
 
 class SelectionEventInfo:
@@ -148,13 +147,9 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
 		Screen.__init__(self, session)
 		HelpableScreen.__init__(self)
 
-		self.saveflag = False
-
 		self.tags = [ ]
 		self.selected_tags = None
 
-		self.current_ref = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + config.movielist.last_videodir.value)
-
 		self.movemode = False
 		self.bouquet_mark_edit = False
 
@@ -167,6 +162,11 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
 		self["DescriptionBorder"] = Pixmap()
 		self["DescriptionBorder"].hide()
 
+		if not pathExists(config.movielist.last_videodir.value):
+			config.movielist.last_videodir.value = resolveFilename(SCOPE_HDD)
+			config.movielist.last_videodir.save()
+		self.current_ref = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + config.movielist.last_videodir.value)
+
 		self["list"] = MovieList(None,
 			config.movielist.listtype.value,
 			config.movielist.moviesort.value,
@@ -183,8 +183,7 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
 		self["key_yellow"] = Button("")
 		self["key_blue"] = Button("")
 
-		#self["freeDiskSpace"] = DiskInfo(resolveFilename(SCOPE_HDD), DiskInfo.FREE, update=False)
-		self["freeDiskSpace"] = self.diskinfo = DiskInfo(resolveFilename(SCOPE_HDD), DiskInfo.FREE, update=False)
+		self["freeDiskSpace"] = self.diskinfo = DiskInfo(config.movielist.last_videodir.value, DiskInfo.FREE, update=False)
 
 		if config.usage.setup_level.index >= 2: # expert+
 			self["InfobarActions"] = HelpableActionMap(self, "InfobarActions", 
@@ -214,6 +213,7 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
 			})
 
 		self.onShown.append(self.go)
+		self.onLayoutFinish.append(self.saveListsize)
 		self.inited = False
 
 	def updateDescription(self):
@@ -238,8 +238,8 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
 		# this is of course not the right way to do this.
 			self.delayTimer.start(10, 1)
 			self.inited=True
-		# as this workaround is here anyways we can wait until the skin is initialized
-		# and afterwards read out the information we need to draw the dynamic style
+
+	def saveListsize(self):
 			listsize = self["list"].instance.size()
 			self.listWidth = listsize.width()
 			self.listHeight = listsize.height()
@@ -250,7 +250,6 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
  		if self.selectedmovie is not None:
 			self.moveTo()
 		self["waitingtext"].visible = False
-		self["freeDiskSpace"].update()
 		self.updateTags()
 
 	def moveTo(self):
@@ -275,12 +274,9 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
 		self.close(None)
 
 	def saveconfig(self):
-		if self.saveflag == True:
-			config.movielist.moviesort.save()
-			config.movielist.listtype.save()
-			config.movielist.description.save()
-			configfile.save()
-			self.saveflag = False
+		config.movielist.moviesort.save()
+		config.movielist.listtype.save()
+		config.movielist.description.save()
 
 	def getTagDescription(self, tag):
 		# TODO: access the tag database
@@ -322,6 +318,12 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
 		self["list"].setSortType(type)
 
 	def reloadList(self):
+		if not pathExists(config.movielist.last_videodir.value):
+			path = resolveFilename(SCOPE_HDD)
+			config.movielist.last_videodir.value = path
+			config.movielist.last_videodir.save()
+			self.current_ref = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + path)
+			self["freeDiskSpace"].path = path
 		self["list"].reload(self.current_ref, self.selected_tags)
 		title = _("Recorded files...")
 		if self.selected_tags is not None:
@@ -329,21 +331,31 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
 		if config.usage.setup_level.index >= 2: # expert+
 			title += "  " + config.movielist.last_videodir.value
 		self.setTitle(title)
+		self["freeDiskSpace"].update()
 
 	def doPathSelect(self):
 		self.session.openWithCallback(
 			self.gotFilename,
-			LocationBox,
+			MovieLocationBox,
 			_("Please select the movie path..."),
-			currDir = config.movielist.last_videodir.value
+			config.movielist.last_videodir.value
 		)
 
 	def gotFilename(self, res):
 		if res is not None and res is not config.movielist.last_videodir.value:
-			config.movielist.last_videodir.value = res
-			self.current_ref = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + res)
-			self.reloadList()
-			self.updateTags()
+			if pathExists(res):
+				config.movielist.last_videodir.value = res
+				config.movielist.last_videodir.save()
+				self.current_ref = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + res)
+				self["freeDiskSpace"].path = res
+				self.reloadList()
+			else:
+				self.session.open(
+					MessageBox,
+					_("Directory %s nonexistent.") % (res),
+					type = MessageBox.TYPE_ERROR,
+					timeout = 5
+					)
 
 	def showAll(self):
 		self.selected_tags = None
diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index 5a7109f2..bdf3527d 100644
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -1,5 +1,6 @@
 from Components.ActionMap import ActionMap
 from Components.Button import Button
+from Components.config import config
 from Components.MenuList import MenuList
 from Components.TimerList import TimerList
 from Components.TimerSanityCheck import TimerSanityCheck
@@ -174,7 +175,7 @@ class TimerEditList(Screen):
 		else:
 			data = parseEvent(event, description = False)
 
-		self.addTimer(RecordTimerEntry(serviceref, checkOldTimers = True, *data))
+		self.addTimer(RecordTimerEntry(serviceref, checkOldTimers = True, dirname = config.movielist.last_timer_videodir.value, *data))
 		
 	def addTimer(self, timer):
 		self.session.openWithCallback(self.finishedAdd, TimerEntry, timer)
diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index 6cbd18ec..b490f6dd 100644
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -1,5 +1,4 @@
 from Screen import Screen
-from LocationBox import LocationBox
 import ChannelSelection
 from ServiceReference import ServiceReference
 from Components.config import config, ConfigSelection, ConfigText, ConfigSubList, ConfigDateTime, ConfigClock, ConfigYesNo, getConfigListEntry
@@ -9,9 +8,13 @@ from Components.MenuList import MenuList
 from Components.Button import Button
 from Components.Label import Label
 from Components.Pixmap import Pixmap
+from Components.SelectionList import SelectionList, SelectionEntryComponent
+from Components.MovieList import MovieList
+from Screens.LocationBox import MovieLocationBox
 from Screens.ChoiceBox import ChoiceBox
 from RecordTimer import AFTEREVENT
-from enigma import eEPGCache
+from Tools.Directories import resolveFilename, SCOPE_HDD
+from enigma import eEPGCache, eServiceReference
 import time
 import datetime
 
@@ -19,44 +22,34 @@ class TimerEntry(Screen, ConfigListScreen):
 	def __init__(self, session, timer):
 		Screen.__init__(self, session)
 		self.timer = timer
-		
+
 		self.entryStartDate = None
 		self.entryEndDate = None
 		self.entryService = None
-		
+
 		self["oktext"] = Label(_("OK"))
 		self["canceltext"] = Label(_("Cancel"))
-		self["locationtext"] = Label(_("Location"))
 		self["ok"] = Pixmap()
 		self["cancel"] = Pixmap()
-		self["location"] = Pixmap()
 
 		self.createConfig()
 
-		self["actions"] = NumberActionMap(["SetupActions", "ColorActions"],
+		self["actions"] = NumberActionMap(["SetupActions"],
 		{
 			"ok": self.keySelect,
 			"save": self.keyGo,
 			"cancel": self.keyCancel,
-			"yellow": self.selectPath,
 		}, -2)
 
 		self.list = []
 		ConfigListScreen.__init__(self, self.list, session = session)
 		self.createSetup("config")
 
-		self.onLayoutFinish.append(self.handleLocation)
-
-	def handleLocation(self):
-		if config.usage.setup_level.index < 2: # -expert
-			self["locationtext"].hide()
-			self["location"].hide()
-
 	def createConfig(self):
 			justplay = self.timer.justplay
-				
+
 			afterevent = { AFTEREVENT.NONE: "nothing", AFTEREVENT.DEEPSTANDBY: "deepstandby", AFTEREVENT.STANDBY: "standby"}[self.timer.afterEvent]
-			
+
 			weekday_table = ["mon", "tue", "wed", "thu", "fri", "sat", "sun"]
 
 			# calculate default values
@@ -91,7 +84,7 @@ class TimerEntry(Screen, ConfigListScreen):
 				repeated = None
 				weekday = (int(time.strftime("%w", time.localtime(self.timer.begin))) - 1) % 7
 				day[weekday] = 1
-			
+
 			self.timerentry_justplay = ConfigSelection(choices = [("zap", _("zap")), ("record", _("record"))], default = {0: "record", 1: "zap"}[justplay])
 			self.timerentry_afterevent = ConfigSelection(choices = [("nothing", _("do nothing")), ("standby", _("go to standby")), ("deepstandby", _("go to deep standby"))], default = afterevent)
 			self.timerentry_type = ConfigSelection(choices = [("once",_("once")), ("repeated", _("repeated"))], default = type)
@@ -106,7 +99,10 @@ class TimerEntry(Screen, ConfigListScreen):
 			self.timerentry_enddate = ConfigDateTime(default = self.timer.end, formatstring =  _("%d.%B %Y"), increment = 86400)
 			self.timerentry_endtime = ConfigClock(default = self.timer.end)
 
-			self.timerentry_dirname = ConfigSelection(choices = [self.timer.dirname or "/hdd/movie/"])
+			tmp = config.movielist.videodirs.value
+			if self.timer.dirname and not self.timer.dirname in tmp:
+				tmp.append(self.timer.dirname)
+			self.timerentry_dirname = ConfigSelection(default = self.timer.dirname or resolveFilename(SCOPE_HDD), choices = tmp)
 
 			self.timerentry_repeatedbegindate = ConfigDateTime(default = self.timer.repeatedbegindate, formatstring = _("%d.%B %Y"), increment = 86400)
 
@@ -124,7 +120,7 @@ class TimerEntry(Screen, ConfigListScreen):
 				pass
 			self.timerentry_service_ref = self.timer.service_ref
 			self.timerentry_service = ConfigSelection([servicename])
-			
+
 			self.timerentry_startdate.addNotifier(self.checkDate)
 			self.timerentry_enddate.addNotifier(self.checkDate)
 
@@ -191,7 +187,8 @@ class TimerEntry(Screen, ConfigListScreen):
 
 		if self.timerentry_justplay.value != "zap":
 			if config.usage.setup_level.index >= 2: # expert+
-				self.list.append(getConfigListEntry(_("Location"), self.timerentry_dirname))
+				self.dirname = getConfigListEntry(_("Location"), self.timerentry_dirname)
+				self.list.append(self.dirname)
 			self.list.append(getConfigListEntry(_("After event"), self.timerentry_afterevent))
 
 		self.channelEntry = getConfigListEntry(_("Channel"), self.timerentry_service)
@@ -222,10 +219,23 @@ class TimerEntry(Screen, ConfigListScreen):
 		else:
 			ConfigListScreen.keyRight(self)
 			self.newConfig()
-		
+
 	def keySelect(self):
-		if self["config"].getCurrent() == self.channelEntry:
-			self.session.openWithCallback(self.finishedChannelSelection, ChannelSelection.SimpleChannelSelection, _("Select channel to record from"))
+		cur = self["config"].getCurrent()
+		if cur == self.channelEntry:
+			self.session.openWithCallback(
+				self.finishedChannelSelection,
+				ChannelSelection.SimpleChannelSelection,
+				_("Select channel to record from")
+			)
+		elif config.usage.setup_level.index >= 2 and cur == self.dirname:
+			self.session.openWithCallback(
+				self.pathSelected,
+				MovieLocationBox,
+				_("Choose target folder"),
+				self.timerentry_dirname.value,
+				minFree = 100 # We require at least 100MB free space
+			)
 		else:
 			self.keyGo()
 
@@ -248,13 +258,13 @@ class TimerEntry(Screen, ConfigListScreen):
 	def getBeginEnd(self):
 		enddate = self.timerentry_enddate.value
 		endtime = self.timerentry_endtime.value
-		
+
 		startdate = self.timerentry_startdate.value
 		starttime = self.timerentry_starttime.value
-		
+
 		begin = self.getTimestamp(startdate, starttime)
 		end = self.getTimestamp(enddate, endtime)
-		
+
 		# because of the dateChecks, startdate can't be < enddate.
 		# however, the endtime can be less than the starttime.
 		# in this case, add 1 day.
@@ -270,11 +280,9 @@ class TimerEntry(Screen, ConfigListScreen):
 		self.timer.afterEvent = {"nothing": AFTEREVENT.NONE, "deepstandby": AFTEREVENT.DEEPSTANDBY, "standby": AFTEREVENT.STANDBY}[self.timerentry_afterevent.value]
 		self.timer.service_ref = self.timerentry_service_ref
 
-		# TODO: fix that thing with none (this might as well just be ignored)
-		if self.timerentry_dirname.value == "/hdd/movie/":
-			self.timer.dirname = None
-		else:
-			self.timer.dirname = self.timerentry_dirname.value
+		self.timer.dirname = self.timerentry_dirname.value
+		config.movielist.last_timer_videodir.value = self.timer.dirname
+		config.movielist.last_timer_videodir.save()
 
 		if self.timerentry_type.value == "once":
 			self.timer.begin, self.timer.end = self.getBeginEnd()
@@ -285,11 +293,11 @@ class TimerEntry(Screen, ConfigListScreen):
 
 			if self.timerentry_repeated.value == "weekly":
 				self.timer.setRepeated(self.timerentry_weekday.index)
-				
+
 			if self.timerentry_repeated.value == "weekdays":
 				for x in range(0,5):
 					self.timer.setRepeated(x)
-				
+
 			if self.timerentry_repeated.value == "user":
 				for x in range(0,7):
 					if self.timerentry_day[x].value:
@@ -298,7 +306,7 @@ class TimerEntry(Screen, ConfigListScreen):
 			self.timer.repeatedbegindate = self.buildRepeatedBegin(self.timerentry_repeatedbegindate.value, self.timerentry_starttime.value)
 			self.timer.begin = self.getTimestamp(time.time(), self.timerentry_starttime.value)
 			self.timer.end = self.getTimestamp(time.time(), self.timerentry_endtime.value)
-			
+
 			# when a timer end is set before the start, add 1 day
 			if self.timer.end < self.timer.begin:
 				self.timer.end += 86400
@@ -335,22 +343,10 @@ class TimerEntry(Screen, ConfigListScreen):
 	def keyCancel(self):
 		self.close((False,))
 
-	def selectPath(self):
-		if config.usage.setup_level.index < 2: #-expert
-			return
-		self.session.openWithCallback(
-			self.pathSelected,
-			LocationBox,
-			text = _("Choose target folder"),
-			filename = "",
-			currDir = None, # TODO: fix FileList to correctly determine mountpoint
-			minFree = 100
-		)
-
 	def pathSelected(self, res):
 		if res is not None:
-			self.timerentry_dirname.choices.append(res)
-			self.timerentry_dirname.description[res] = res
+			if config.movielist.videodirs.value != self.timerentry_dirname.choices:
+				self.timerentry_dirname.setChoices(config.movielist.videodirs.value, default=res)
 			self.timerentry_dirname.value = res
 
 class TimerLog(Screen):
@@ -358,17 +354,17 @@ class TimerLog(Screen):
 		Screen.__init__(self, session)
 		self.timer = timer;
 		self.log_entries = self.timer.log_entries[:]
-		
+
 		self.fillLogList()
-		
+
 		self["loglist"] = MenuList(self.list)
 		self["logentry"] = Label()
-		
+
 		self["key_red"] = Button(_("Delete entry"))
 		self["key_green"] = Button()
 		self["key_yellow"] = Button("")
 		self["key_blue"] = Button(_("Clear log"))
-		
+
 		self.onShown.append(self.updateText)
 
 		self["actions"] = NumberActionMap(["OkCancelActions", "DirectionActions", "ColorActions"],
@@ -396,24 +392,24 @@ class TimerLog(Screen):
 		self.list = [ ]
 		for x in self.log_entries:
 			self.list.append((str(time.strftime("%Y-%m-%d %H-%M", time.localtime(x[0])) + " - " + x[2]), x))
-	
-	def clearLog(self):		
+
+	def clearLog(self):
 		self.log_entries = []
 		self.fillLogList()
 		self["loglist"].l.setList(self.list)
 		self.updateText()
-		
+
 	def keyClose(self):
 		if self.timer.log_entries != self.log_entries:
 			self.timer.log_entries = self.log_entries
 			self.close((True, self.timer))
 		else:
 			self.close((False,))
-		
+
 	def up(self):
 		self["loglist"].instance.moveSelection(self["loglist"].instance.moveUp)
 		self.updateText()
-		
+
 	def down(self):
 		self["loglist"].instance.moveSelection(self["loglist"].instance.moveDown)
 		self.updateText()
@@ -421,7 +417,7 @@ class TimerLog(Screen):
 	def left(self):
 		self["loglist"].instance.moveSelection(self["loglist"].instance.pageUp)
 		self.updateText()
-		
+
 	def right(self):
 		self["loglist"].instance.moveSelection(self["loglist"].instance.pageDown)
 		self.updateText()