allow burning DVDs with multiple titles where playback automatically jumps to the...

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

diff --git a/lib/python/Screens/LocationBox.py b/lib/python/Screens/LocationBox.py
index 132f14014f2cb901e2f4e61bcd64fd27c9b5bb0d..e41601a94147e5b23e04bfe7e14c533ea37e4f65 100644 (file)
--- a/lib/python/Screens/LocationBox.py
+++ b/lib/python/Screens/LocationBox.py
@@ -12,8 +12,7 @@ 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
+from Components.config import config
 import os
 
 # Quickselect
@@ -325,12 +324,17 @@ class LocationBox(Screen, NumericalTextInput, HelpableScreen):
                else:
                        return self["booklist"].getCurrent()
 
-       def selectConfirmed(self, res):
-               if res:
+       def selectConfirmed(self, ret):
+               if ret:
                        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()
+                       if self.realBookmarks:
+                               if self.autoAdd and not ret in self.bookmarks:
+                                       self.bookmarks.append(self.getPreferredFolder())
+                                       self.bookmarks.sort()
+
+                               if self.bookmarks != self.realBookmarks.value:
+                                       self.realBookmarks.value = self.bookmarks
+                                       self.realBookmarks.save()
                        self.close(ret)
 
        def select(self):
@@ -355,16 +359,10 @@ class LocationBox(Screen, NumericalTextInput, HelpableScreen):
                                        _("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
+                       # 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?
@@ -402,13 +400,13 @@ class LocationBox(Screen, NumericalTextInput, HelpableScreen):
                        menu = []
                        if self.currList == "filelist":
                                menu.append((_("switch to bookmarks"), self.switchToBookList))
-                               menu.append((_("add bookmark"), self.AddRemoveBookmark))
+                               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))
+                               menu.append((_("remove bookmark"), self.addRemoveBookmark))
 
                        self.session.openWithCallback(
                                self.menuCallback,
@@ -501,7 +499,5 @@ class LocationBox(Screen, NumericalTextInput, HelpableScreen):
 
 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)
+               inhibitDirs = ["/bin", "/boot", "/dev", "/etc", "/lib", "/proc", "/sbin", "/sys", "/usr", "/var"]
+               LocationBox.__init__(self, session, text = text, currDir = dir, bookmarks = config.movielist.videodirs, autoAdd = True, editDir = True, inhibitDirs = inhibitDirs, minFree = minFree)