diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-02-13 03:47:44 +0100 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-02-13 03:47:44 +0100 |
| commit | a4b8eb676ba549ebe8cf347f15888e51d8914789 (patch) | |
| tree | f88416c61e96ec26675c8817a6961a74207f0f7b /lib/python/Screens/LocationBox.py | |
| parent | dce87891f204f8e1f7151c4a3ba00b9dd048e795 (diff) | |
| parent | c46312d7f5ce4113ece4c33595b7192eccadcb1d (diff) | |
| download | enigma2-a4b8eb676ba549ebe8cf347f15888e51d8914789.tar.gz enigma2-a4b8eb676ba549ebe8cf347f15888e51d8914789.zip | |
Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
Conflicts:
lib/python/Screens/InfoBarGenerics.py
Diffstat (limited to 'lib/python/Screens/LocationBox.py')
| -rw-r--r-- | lib/python/Screens/LocationBox.py | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/lib/python/Screens/LocationBox.py b/lib/python/Screens/LocationBox.py index 68d4f772..389d3624 100644 --- a/lib/python/Screens/LocationBox.py +++ b/lib/python/Screens/LocationBox.py @@ -326,7 +326,7 @@ class LocationBox(Screen, NumericalTextInput, HelpableScreen): def selectConfirmed(self, ret): if ret: - ret = ''.join([self.getPreferredFolder(), self.filename]) + ret = ''.join((self.getPreferredFolder(), self.filename)) if self.realBookmarks: if self.autoAdd and not ret in self.bookmarks: self.bookmarks.append(self.getPreferredFolder()) @@ -390,23 +390,28 @@ class LocationBox(Screen, NumericalTextInput, HelpableScreen): # Write Combination of Folder & Filename when Folder is valid currFolder = self.getPreferredFolder() if currFolder is not None: - self["target"].setText(''.join([currFolder, self.filename])) + 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)) + menu = [ + (_("switch to bookmarks"), self.switchToBookList), + (_("add bookmark"), self.addRemoveBookmark) + ] if self.editDir: - menu.append((_("create directory"), self.createDir)) - menu.append((_("remove directory"), self.removeDir)) + menu.extend(( + (_("create directory"), self.createDir), + (_("remove directory"), self.removeDir) + )) else: - menu.append((_("switch to filelist"), self.switchToFileList)) - menu.append((_("remove bookmark"), self.addRemoveBookmark)) + menu = ( + (_("switch to filelist"), self.switchToFileList) + (_("remove bookmark"), self.addRemoveBookmark) + ) self.session.openWithCallback( self.menuCallback, |