diff options
| -rw-r--r-- | data/skin_default.xml | 3 | ||||
| -rwxr-xr-x | data/skin_default/icons/repeat_off.png | bin | 0 -> 1192 bytes | |||
| -rwxr-xr-x | data/skin_default/icons/repeat_on.png | bin | 0 -> 1275 bytes | |||
| -rw-r--r-- | data/skin_default/mediaplayer_bg.png | bin | 25183 -> 24870 bytes | |||
| -rw-r--r-- | lib/python/Plugins/Extensions/MediaPlayer/plugin.py | 18 | ||||
| -rw-r--r-- | po/de.po | 3 |
6 files changed, 20 insertions, 4 deletions
diff --git a/data/skin_default.xml b/data/skin_default.xml index 55849a93..c84352d3 100644 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -445,7 +445,8 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3) <widget name="title" position="20,108" size="413,18" font="Regular;16" valign="top" transparent="1" /> <widget name="coverArt" pixmap="skin_default/no_coverArt.png" position="446,11" size="116,116" transparent="1" alphatest="blend" /> <ePixmap pixmap="skin_default/icons/mp_buttons.png" position="454,136" size="108,13" alphatest="on" /> - <widget name="PositionGauge" position="15,138" size="418,10" pointer="skin_default/position_pointer.png:540,0" seek_pointer="skin_default/position_pointer.png:540,0" transparent="1" /> + <widget name="PositionGauge" position="15,138" size="396,10" pointer="skin_default/position_pointer.png:540,0" seek_pointer="skin_default/position_pointer.png:540,0" transparent="1" /> + <widget name="repeat" pixmaps="skin_default/icons/repeat_off.png,skin_default/icons/repeat_on.png" position="416,135" size="22,15" transparent="1" alphatest="on"/> <widget name="filelist" position="15,163" size="550,138" scrollbarMode="showOnDemand" /> <widget name="playlist" position="15,314" size="550,154" scrollbarMode="showOnDemand" selectionDisabled="1" /> <widget name="currenttext" position="0,0" size="0,0" /> diff --git a/data/skin_default/icons/repeat_off.png b/data/skin_default/icons/repeat_off.png Binary files differnew file mode 100755 index 00000000..493aa423 --- /dev/null +++ b/data/skin_default/icons/repeat_off.png diff --git a/data/skin_default/icons/repeat_on.png b/data/skin_default/icons/repeat_on.png Binary files differnew file mode 100755 index 00000000..2729eec5 --- /dev/null +++ b/data/skin_default/icons/repeat_on.png diff --git a/data/skin_default/mediaplayer_bg.png b/data/skin_default/mediaplayer_bg.png Binary files differindex 7b469ae1..620d58d0 100644 --- a/data/skin_default/mediaplayer_bg.png +++ b/data/skin_default/mediaplayer_bg.png diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py index 27b47768..22fe7c5d 100644 --- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py @@ -6,7 +6,7 @@ from Screens.MessageBox import MessageBox from Screens.InputBox import InputBox from Components.ActionMap import NumberActionMap, HelpableActionMap from Components.Label import Label -from Components.Pixmap import Pixmap +from Components.Pixmap import Pixmap,MultiPixmap from Components.Label import Label from Components.FileList import FileList from Components.MediaPlayer import PlayList @@ -87,7 +87,9 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB self["genretext"] = Label(_("Genre:")) self["genre"] = Label("") self["coverArt"] = MediaPixmap() + self["repeat"] = MultiPixmap() + self.repeat = False self.seek_target = None class MoviePlayerActionMap(NumberActionMap): @@ -163,7 +165,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB self.coverArtFileName = "" self.isAudioCD = False self.AudioCD_albuminfo = {} - + self.playlistIOInternal = PlaylistIOInternal() list = self.playlistIOInternal.open(resolveFilename(SCOPE_CONFIG, "playlist.e2pls")) if list: @@ -437,6 +439,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB menu.append((_("save playlist"), "saveplaylist")); menu.append((_("load playlist"), "loadplaylist")); menu.append((_("delete saved playlist"), "deleteplaylist")); + menu.append((_("repeat playlist"), "repeat")); self.session.openWithCallback(self.menuCallback, ChoiceBox, title="", list=menu) def menuCallback(self, choice): @@ -472,7 +475,13 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB self.delete_saved_playlist() elif choice[1] == "shuffle": self.playlist.PlayListShuffle() - + elif choice[1] == "repeat": + if self.repeat == True: + self.repeat = False + self["repeat"].setPixmapNum(0) + else: + self.repeat = True + self["repeat"].setPixmapNum(1) def showEventInformation(self): from Screens.EventView import EventViewSimple @@ -599,6 +608,9 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB next = self.playlist.getCurrentIndex() + 1 if next < len(self.playlist): self.changeEntry(next) + elif ( len(self.playlist) > 0 ) and ( self.repeat == True ): + self.stopEntry() + self.changeEntry(0) def nextMarkOrEntry(self): if not self.jumpPreviousNextMark(lambda x: x): @@ -3872,6 +3872,9 @@ msgstr "Entferne gewählten Satellit" msgid "remove this mark" msgstr "Diese Markierung entfernen" +msgid "repeat playlist" +msgstr "Wiederholung der Wiedergabeliste" + msgid "repeated" msgstr "wiederholend" |
