X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7cd404df03f85b78738c2650b45479e74e093d0b..287f7c2cfaf264b079cce1bf789d118ee444180f:/lib/python/Plugins/Extensions/MediaPlayer/settings.py

diff --git a/lib/python/Plugins/Extensions/MediaPlayer/settings.py b/lib/python/Plugins/Extensions/MediaPlayer/settings.py
index 594b4534..8a032d16 100644
--- a/lib/python/Plugins/Extensions/MediaPlayer/settings.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/settings.py
@@ -3,30 +3,10 @@ from Screens.HelpMenu import HelpableScreen
 from Components.Label import Label
 from Components.FileList import FileList
 from Components.MediaPlayer import PlayList
-from Components.config import config, getConfigListEntry, ConfigSubsection, configfile, ConfigText, ConfigYesNo
+from Components.config import config, getConfigListEntry, ConfigSubsection, configfile, ConfigText, ConfigYesNo, ConfigDirectory
 from Components.ConfigList import ConfigListScreen
 from Components.ActionMap import ActionMap
 
-class ConfigDirectory(ConfigText):
-	def __init__(self, default="", visible_width=60):
-		ConfigText.__init__(self, default, fixed_size = True, visible_width = visible_width)
-	def handleKey(self, key):
-		pass
-	def getValue(self):
-		if self.text == "":
-			return None
-		else:
-			return ConfigText.getValue(self)
-	def setValue(self, val):
-		if val == None:
-			val = ""
-		ConfigText.setValue(self, val)
-	def getMulti(self, selected):
-		if self.text == "":
-			return ("mtext"[1-selected:], _("List of Storage Devices"), range(0))
-		else:
-			return ConfigText.getMulti(self, selected)
-		
 config.mediaplayer = ConfigSubsection()
 config.mediaplayer.repeat = ConfigYesNo(default=False)
 config.mediaplayer.savePlaylistOnExit = ConfigYesNo(default=True)
@@ -35,11 +15,12 @@ config.mediaplayer.defaultDir = ConfigDirectory()
 
 class DirectoryBrowser(Screen, HelpableScreen):
 	skin = """
-		<screen name="DirectoryBrowser" position="80,150" size="400,376" title="Directory browser" >
+		<screen name="DirectoryBrowser" position="160,62" size="450,376" title="Directory browser" >
 			<ePixmap pixmap="skin_default/buttons/red.png" position="10,0" size="140,40" alphatest="on" />
-			<ePixmap pixmap="skin_default/buttons/green.png" position="250,0" size="140,40" alphatest="on" />		<widget source="key_red" render="Label" position="10,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-			<widget source="key_green" render="Label" position="250,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-			<widget name="filelist" position="0,44" size="400,332" scrollbarMode="showOnDemand" />
+			<ePixmap pixmap="skin_default/buttons/green.png" position="300,0" size="140,40" alphatest="on" />
+			<widget source="key_red" render="Label" position="10,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
+			<widget source="key_green" render="Label" position="300,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
+			<widget name="filelist" position="0,44" size="440,322" scrollbarMode="showOnDemand" />
 		</screen>"""
 	def __init__(self, session, currDir):
 		from Components.Sources.StaticText import StaticText
@@ -47,14 +28,14 @@ class DirectoryBrowser(Screen, HelpableScreen):
 		HelpableScreen.__init__(self)
 		
 		self["key_red"] = StaticText(_("Cancel"))
-		self["key_green"] = StaticText(_("Apply"))
+		self["key_green"] = StaticText(_("Use"))
 
 		self.filelist = FileList(currDir, matchingPattern="")
 		self["filelist"] = self.filelist
 
 		self["FilelistActions"] = ActionMap(["SetupActions", "ColorActions"],
 			{
-				"green": self.apply,
+				"green": self.use,
 				"red": self.exit,
 				"ok": self.ok,
 				"cancel": self.exit
@@ -64,8 +45,8 @@ class DirectoryBrowser(Screen, HelpableScreen):
 		if self.filelist.canDescent():
 			self.filelist.descent()
 
-	def apply(self):
-		if self.filelist.canDescent() and len(self["filelist"].getFilename()) > len(self["filelist"].getCurrentDirectory()):
+	def use(self):
+		if self.filelist.canDescent() and self["filelist"].getFilename() and len(self["filelist"].getFilename()) > len(self["filelist"].getCurrentDirectory()):
 			self.filelist.descent()
 		self.close(self["filelist"].getCurrentDirectory())
 
@@ -74,12 +55,12 @@ class DirectoryBrowser(Screen, HelpableScreen):
 
 class MediaPlayerSettings(Screen,ConfigListScreen):
 	skin = """
-		<screen name="MediaPlayerSettings" position="160,150" size="400,200" title="Edit settings">
+		<screen name="MediaPlayerSettings" position="160,150" size="450,200" title="Edit settings">
 			<ePixmap pixmap="skin_default/buttons/red.png" position="10,0" size="140,40" alphatest="on" />
-			<ePixmap pixmap="skin_default/buttons/green.png" position="250,0" size="140,40" alphatest="on" />
+			<ePixmap pixmap="skin_default/buttons/green.png" position="300,0" size="140,40" alphatest="on" />
 			<widget source="key_red" render="Label" position="10,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-			<widget source="key_green" render="Label" position="250,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-			<widget name="config" position="10,44" size="380,146" />
+			<widget source="key_green" render="Label" position="300,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
+			<widget name="config" position="10,44" size="430,146" />
 		</screen>"""
 
 	def __init__(self, session, parent):