From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Wed, 26 Apr 2006 11:00:16 +0000 (+0000)
Subject: more space in movieplayer for movie/mp3 title
X-Git-Tag: 2.6.0~3566
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/f8e1f4b8f24d9b9cd22f5466824bbc1b5b58d486

more space in movieplayer for movie/mp3 title
add ability to hide movieplayer via contextmenu
---

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 34e69f58..55e7efaf 100644
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -15,10 +15,10 @@
 	<screen name="Scart" position="0,0" size="720,576">
 	</screen>
 	<screen name="MediaPlayer" position="100,100" size="550,400" title="MediaPlayer" >
-		<widget name="currenttext" position="0,0" size="550,30" font="Regular;18" valign="center" backgroundColor="#101258" />
+		<widget name="currenttext" position="0,0" size="550,40" font="Regular;18" valign="center" backgroundColor="#101258" />
 		
-		<widget name="filelist" position="10,30" size="255,265" scrollbarMode="showOnDemand" />
-		<widget name="playlist" position="265,30" size="285,265" scrollbarMode="showOnDemand" selectionDisabled="1" />
+		<widget name="filelist" position="10,42" size="255,255" scrollbarMode="showOnDemand" />
+		<widget name="playlist" position="275,42" size="275,255" scrollbarMode="showOnDemand" selectionDisabled="1" />
 			
 		<ePixmap position="10,365" zPosition="0" size="177,32" pixmap="dvr-buttons-small-fs8.png" />
 		<widget name="PositionGauge" position="10,335" size="177,20" zPosition="2" pointer="position_pointer.png:3,5"/>
diff --git a/lib/python/Screens/MediaPlayer.py b/lib/python/Screens/MediaPlayer.py
index 5a461848..7574118d 100644
--- a/lib/python/Screens/MediaPlayer.py
+++ b/lib/python/Screens/MediaPlayer.py
@@ -46,8 +46,17 @@ class MediaPlayer(Screen, InfoBarSeek):
 		self["genre"] = Label("")
 		
 		#self["text"] = Input("1234", maxSize=True, type=Input.NUMBER)
-                
-		self["actions"] = NumberActionMap(["OkCancelActions", "DirectionActions", "NumberActions", "MediaPlayerSeekActions"],
+
+		class MoviePlayerActionMap(NumberActionMap):
+			def __init__(self, player, contexts = [ ], actions = { }, prio=0):
+				NumberActionMap.__init__(self, contexts, actions, prio)
+				self.player = player
+
+			def action(self, contexts, action):
+				self.player.show()
+				return NumberActionMap.action(self, contexts, action)
+
+		self["actions"] = MoviePlayerActionMap(self, ["OkCancelActions", "DirectionActions", "NumberActions", "MediaPlayerSeekActions"],
 		{
 			"ok": self.ok,
 			"cancel": self.exit,
@@ -253,6 +262,7 @@ class MediaPlayer(Screen, InfoBarSeek):
 			menu.append((_("switch to filelist"), "filelist"))
 			menu.append((_("delete"), "delete"))
 			menu.append((_("clear playlist"), "clear"))
+		menu.append((_("hide"), "hide"));
 		self.session.openWithCallback(self.menuCallback, ChoiceBox, title="", list=menu)
 		
 	def menuCallback(self, choice):
@@ -273,7 +283,9 @@ class MediaPlayer(Screen, InfoBarSeek):
 			self.stopEntry()
 			self.playlist.clear()
 			self.switchToFileList()
-			
+		elif choice[1] == "hide":
+			self.hide()
+
 	def copyDirectory(self, directory):
 		filelist = FileList(directory, useServiceRef = True, isTop = True)