Enigma2{skin_default.xml,Plugins-DVDBurn,DVDPlayer}: - move FileBrowser Skin into skin_default and allow individual skinning

2 files changed, 15 insertions, 7 deletions

diff --git a/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py b/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py
index 9b4e2d54..513c0c86 100755
--- a/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py
@@ -57,12 +57,12 @@ class FileBrowser(Screen, HelpableScreen):
 		self.filelist = FileList(currDir, matchingPattern=pattern)
 		self["filelist"] = self.filelist
 
-		self["FilelistActions"] = ActionMap(["OkCancelActions"],
+		self["FilelistActions"] = ActionMap(["SetupActions"],
 			{
+				"save": self.ok,
 				"ok": self.ok,
 				"cancel": self.exit
 			})
-
 		self["key_red"] = StaticText(_("Cancel"))
 		self["key_green"] = StaticText(_("OK"))
 		self.onLayoutFinish.append(self.layoutFinished)
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
index ce5fa9d2..e895a141 100644..100755
--- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
@@ -7,6 +7,7 @@ from Screens.HelpMenu import HelpableScreen
 from Screens.InfoBarGenerics import InfoBarSeek, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarShowHide, InfoBarNotifications
 from Components.ActionMap import ActionMap, NumberActionMap, HelpableActionMap
 from Components.Label import Label
+from Components.Sources.StaticText import StaticText
 from Components.Pixmap import Pixmap
 from Components.FileList import FileList
 from Components.MenuList import MenuList
@@ -20,13 +21,13 @@ import servicedvd # load c++ part of dvd player plugin
 lastpath = ""
 
 class FileBrowser(Screen):
-	skin = """
-	<screen name="FileBrowser" position="100,100" size="520,376" title="DVD File Browser" >
-		<widget name="filelist" position="0,0" size="520,376" scrollbarMode="showOnDemand" />
-	</screen>"""
+
 	def __init__(self, session, dvd_filelist = [ ]):
 		Screen.__init__(self, session)
 
+		# for the skin: first try FileBrowser_DVDPlayer, then FileBrowser, this allows individual skinning
+		self.skinName = ["FileBrowser_DVDPlayer", "FileBrowser" ]
+
 		self.dvd_filelist = dvd_filelist
 		if len(dvd_filelist):	
 			self["filelist"] = MenuList(self.dvd_filelist)
@@ -42,11 +43,18 @@ class FileBrowser(Screen):
 			self.filelist = FileList(currDir, matchingPattern = "(?i)^.*\.(iso)", useServiceRef = True)
 			self["filelist"] = self.filelist
 
-		self["FilelistActions"] = ActionMap(["OkCancelActions"],
+		self["FilelistActions"] = ActionMap(["SetupActions"],
 			{
+				"save": self.ok,
 				"ok": self.ok,
 				"cancel": self.exit
 			})
+		self["key_red"] = StaticText(_("Cancel"))
+		self["key_green"] = StaticText(_("OK"))
+		self.onLayoutFinish.append(self.layoutFinished)
+
+	def layoutFinished(self):
+		self.setTitle(_("DVD File Browser"))
 
 	def ok(self):
 		if len(self.dvd_filelist):