From: Andreas Monzner Date: Tue, 27 Jun 2006 09:33:42 +0000 (+0000) Subject: add some skin fixes/extensions made by Nemesis (thanks for this) X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=25b529dd304871c705456047049dd29935f1ffe3 add some skin fixes/extensions made by Nemesis (thanks for this) --- diff --git a/data/arrowdown.png b/data/arrowdown.png index 02b5573..e69de29 100755 Binary files a/data/arrowdown.png and b/data/arrowdown.png differ diff --git a/data/arrowup.png b/data/arrowup.png index c0883b4..e69de29 100644 Binary files a/data/arrowup.png and b/data/arrowup.png differ diff --git a/data/cancel.png b/data/cancel.png index baeefd0..e69de29 100644 Binary files a/data/cancel.png and b/data/cancel.png differ diff --git a/data/dvr-buttons-small-fs8.png b/data/dvr-buttons-small-fs8.png index 90cae68..e69de29 100644 Binary files a/data/dvr-buttons-small-fs8.png and b/data/dvr-buttons-small-fs8.png differ diff --git a/data/error.png b/data/error.png index 01b777b..e69de29 100644 Binary files a/data/error.png and b/data/error.png differ diff --git a/data/expandable-plugins.png b/data/expandable-plugins.png index 2076d55..e69de29 100644 Binary files a/data/expandable-plugins.png and b/data/expandable-plugins.png differ diff --git a/data/expanded-plugins.png b/data/expanded-plugins.png index ec355fe..e69de29 100644 Binary files a/data/expanded-plugins.png and b/data/expanded-plugins.png differ diff --git a/data/extensions/directory.png b/data/extensions/directory.png index eb561c7..e7d2bc3 100644 Binary files a/data/extensions/directory.png and b/data/extensions/directory.png differ diff --git a/data/extensions/movie.png b/data/extensions/movie.png index 532c232..2ffaaf9 100644 Binary files a/data/extensions/movie.png and b/data/extensions/movie.png differ diff --git a/data/extensions/music.png b/data/extensions/music.png index 0f630eb..17ce017 100644 Binary files a/data/extensions/music.png and b/data/extensions/music.png differ diff --git a/data/extensions/picture.png b/data/extensions/picture.png index 9eb05a5..035fbd7 100644 Binary files a/data/extensions/picture.png and b/data/extensions/picture.png differ diff --git a/data/folder.png b/data/folder.png index 7342726..e69de29 100644 Binary files a/data/folder.png and b/data/folder.png differ diff --git a/data/info.png b/data/info.png index 3a429fa..e69de29 100644 Binary files a/data/info.png and b/data/info.png differ diff --git a/data/init.png b/data/init.png index 1522cc5..e69de29 100644 Binary files a/data/init.png and b/data/init.png differ diff --git a/data/key_0-fs8.png b/data/key_0-fs8.png index ea5485e..e69de29 100644 Binary files a/data/key_0-fs8.png and b/data/key_0-fs8.png differ diff --git a/data/key_1-fs8.png b/data/key_1-fs8.png index dbce1fa..e69de29 100644 Binary files a/data/key_1-fs8.png and b/data/key_1-fs8.png differ diff --git a/data/key_2-fs8.png b/data/key_2-fs8.png index 1a7bf90..e69de29 100644 Binary files a/data/key_2-fs8.png and b/data/key_2-fs8.png differ diff --git a/data/key_3-fs8.png b/data/key_3-fs8.png index 5c280d3..e69de29 100644 Binary files a/data/key_3-fs8.png and b/data/key_3-fs8.png differ diff --git a/data/key_4-fs8.png b/data/key_4-fs8.png index 9509f0e..e69de29 100644 Binary files a/data/key_4-fs8.png and b/data/key_4-fs8.png differ diff --git a/data/key_5-fs8.png b/data/key_5-fs8.png index 18e2990..e69de29 100644 Binary files a/data/key_5-fs8.png and b/data/key_5-fs8.png differ diff --git a/data/key_6-fs8.png b/data/key_6-fs8.png index 42f6f58..e69de29 100644 Binary files a/data/key_6-fs8.png and b/data/key_6-fs8.png differ diff --git a/data/key_7-fs8.png b/data/key_7-fs8.png index a98d711..e69de29 100644 Binary files a/data/key_7-fs8.png and b/data/key_7-fs8.png differ diff --git a/data/key_8-fs8.png b/data/key_8-fs8.png index 4e154b9..e69de29 100644 Binary files a/data/key_8-fs8.png and b/data/key_8-fs8.png differ diff --git a/data/key_9-fs8.png b/data/key_9-fs8.png index 46e3a31..e69de29 100644 Binary files a/data/key_9-fs8.png and b/data/key_9-fs8.png differ diff --git a/data/plugin.png b/data/plugin.png index 8809152..e69de29 100644 Binary files a/data/plugin.png and b/data/plugin.png differ diff --git a/data/position_pointer.png b/data/position_pointer.png index bf8c42d..e69de29 100644 Binary files a/data/position_pointer.png and b/data/position_pointer.png differ diff --git a/data/question.png b/data/question.png index 8b4551d..e69de29 100644 Binary files a/data/question.png and b/data/question.png differ diff --git a/data/rc.png b/data/rc.png index 5293a3c..e69de29 100755 Binary files a/data/rc.png and b/data/rc.png differ diff --git a/data/record.png b/data/record.png index 601fd49..e69de29 100755 Binary files a/data/record.png and b/data/record.png differ diff --git a/data/redx.png b/data/redx.png index e2fcfac..e69de29 100644 Binary files a/data/redx.png and b/data/redx.png differ diff --git a/data/rewind-small-fs8.png b/data/rewind-small-fs8.png index 286b411..e69de29 100644 Binary files a/data/rewind-small-fs8.png and b/data/rewind-small-fs8.png differ diff --git a/data/skin_default.xml b/data/skin_default.xml index 3a094a5..72f3467 100644 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -14,53 +14,57 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + - - + + - + - - + + - + @@ -68,59 +72,58 @@ - + - - - - - + + + + - + - + - + - + - + - + - + - + - + - + - + @@ -129,7 +132,7 @@ - + @@ -173,10 +176,9 @@ - - - - + + + @@ -270,7 +272,7 @@ - + @@ -355,11 +357,11 @@ newwidth = wsize[0] - - - - - + + + + + # this should be factored out into some helper code, but currently demonstrates applets. @@ -397,4 +399,4 @@ newwidth = wsize[0] self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - \ No newline at end of file + diff --git a/data/stop-small-fs8.png b/data/stop-small-fs8.png index ba2e14d..e69de29 100644 Binary files a/data/stop-small-fs8.png and b/data/stop-small-fs8.png differ diff --git a/data/verticalline-plugins.png b/data/verticalline-plugins.png index a692cf1..e69de29 100644 Binary files a/data/verticalline-plugins.png and b/data/verticalline-plugins.png differ diff --git a/data/volumeslider-fs8.png b/data/volumeslider-fs8.png index 20c55ee..e69de29 100644 Binary files a/data/volumeslider-fs8.png and b/data/volumeslider-fs8.png differ diff --git a/data/wizard.png b/data/wizard.png index 1377998..e69de29 100644 Binary files a/data/wizard.png and b/data/wizard.png differ diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py index 0d8245c..7411730 100644 --- a/lib/python/Components/FileList.py +++ b/lib/python/Components/FileList.py @@ -32,7 +32,7 @@ EXTENSIONS = { def FileEntryComponent(name, absolute = None, isDir = False): res = [ (absolute, isDir) ] - res.append((eListboxPythonMultiContent.TYPE_TEXT, 35, 1, 200, 20, 0, RT_HALIGN_LEFT, name)) + res.append((eListboxPythonMultiContent.TYPE_TEXT, 35, 1, 470, 20, 0, RT_HALIGN_LEFT, name)) if isDir: png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "extensions/directory.png")) else: diff --git a/lib/python/Components/MediaPlayer.py b/lib/python/Components/MediaPlayer.py index c271c3c..45551cc 100644 --- a/lib/python/Components/MediaPlayer.py +++ b/lib/python/Components/MediaPlayer.py @@ -24,15 +24,15 @@ STATE_REWIND = 3 STATE_FORWARD = 4 STATE_NONE = 5 -PlayIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "play-small-fs8.png")) -PauseIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "pause-small-fs8.png")) -StopIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "stop-small-fs8.png")) -RewindIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "rewind-small-fs8.png")) -ForwardIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "forward-small-fs8.png")) +PlayIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_play.png")) +PauseIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_pause.png")) +StopIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_stop.png")) +RewindIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_rewind.png")) +ForwardIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_forward.png")) def PlaylistEntryComponent(serviceref, state): res = [ serviceref ] - res.append((eListboxPythonMultiContent.TYPE_TEXT, 35, 0, 250, 32, 0, RT_VALIGN_CENTER, os.path.split(serviceref.getPath().split('/')[-1])[1])) + res.append((eListboxPythonMultiContent.TYPE_TEXT,25, 0, 470, 32, 0, RT_VALIGN_CENTER, os.path.split(serviceref.getPath().split('/')[-1])[1])) png = None if state == STATE_PLAY: png = PlayIcon @@ -46,7 +46,7 @@ def PlaylistEntryComponent(serviceref, state): png = ForwardIcon if png is not None: - res.append((eListboxPythonMultiContent.TYPE_PIXMAP, 0, 0, 33, 32, png)) + res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 5, 0, 16, 16, png)) return res @@ -70,7 +70,7 @@ class PlayList(MenuList, HTMLComponent, GUIComponent): def postWidgetCreate(self, instance): instance.setContent(self.l) - instance.setItemHeight(32) + instance.setItemHeight(22) def getSelection(self): return self.l.getCurrentSelection()[0] diff --git a/lib/python/Components/PluginList.py b/lib/python/Components/PluginList.py index 7220f0a..9b9cfea 100644 --- a/lib/python/Components/PluginList.py +++ b/lib/python/Components/PluginList.py @@ -11,36 +11,36 @@ from enigma import * def PluginEntryComponent(plugin): res = [ plugin ] - res.append(MultiContentEntryText(pos=(80, 5), size=(300, 25), font=0, text=plugin.name)) - res.append(MultiContentEntryText(pos=(80, 26), size=(300, 17), font=1, text=plugin.description)) + res.append(MultiContentEntryText(pos=(120, 5), size=(320, 25), font=0, text=plugin.name)) + res.append(MultiContentEntryText(pos=(120, 26), size=(320, 17), font=1, text=plugin.description)) if plugin.icon is None: png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "plugin.png")) else: png = plugin.icon - res.append(MultiContentEntryPixmapAlphaTest(pos=(10, 5), size=(60, 40), png = png)) + res.append(MultiContentEntryPixmapAlphaTest(pos=(10, 5), size=(100, 40), png = png)) return res def PluginCategoryComponent(name, png): res = [ name ] - res.append(MultiContentEntryText(pos=(80, 5), size=(300, 25), font=0, text=name)) - res.append(MultiContentEntryPixmapAlphaTest(pos=(0, 0), size=(60, 50), png = png)) + res.append(MultiContentEntryText(pos=(120, 5), size=(320, 25), font=0, text=name)) + res.append(MultiContentEntryPixmapAlphaTest(pos=(10, 0), size=(100, 50), png = png)) return res def PluginDownloadComponent(plugin, name): res = [ plugin ] - res.append(MultiContentEntryText(pos=(80, 5), size=(300, 25), font=0, text=name)) - res.append(MultiContentEntryText(pos=(80, 26), size=(300, 17), font=1, text=plugin.description)) + res.append(MultiContentEntryText(pos=(120, 5), size=(320, 25), font=0, text=name)) + res.append(MultiContentEntryText(pos=(120, 26), size=(320, 17), font=1, text=plugin.description)) if plugin.icon is None: png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "plugin.png")) else: png = plugin.icon - res.append(MultiContentEntryPixmapAlphaTest(pos=(0, 0), size=(60, 50), png = png)) + res.append(MultiContentEntryPixmapAlphaTest(pos=(10, 0), size=(100, 50), png = png)) return res diff --git a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/backup.png b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/backup.png index bb219a4..4962a05 100644 Binary files a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/backup.png and b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/backup.png differ diff --git a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/blue.png b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/blue.png index f75db7a..a392bbe 100644 Binary files a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/blue.png and b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/blue.png differ diff --git a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/green.png b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/green.png index 118c3f4..f168e4d 100644 Binary files a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/green.png and b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/green.png differ diff --git a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py index 5bffb71..f47886c 100644 --- a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py +++ b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py @@ -34,16 +34,16 @@ MountPoints = { class BackupSetup(Screen): skin = """ - - - - - - - - - - + + + + + + + + + + """ def keyLeft(self): @@ -150,12 +150,12 @@ class BackupSetup(Screen): class RestoreMenu(Screen): skin = """ - - - - - - + + + + + + """ def __init__(self, session, args = None): diff --git a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/red.png b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/red.png index 4f7e97f..8096045 100644 Binary files a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/red.png and b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/red.png differ diff --git a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/yellow.png b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/yellow.png index 48b3e68..dacb80e 100644 Binary files a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/yellow.png and b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/yellow.png differ diff --git a/lib/python/Plugins/SystemPlugins/SoftwareUpdate/update.png b/lib/python/Plugins/SystemPlugins/SoftwareUpdate/update.png index 6bc17b1..0ece6c7 100644 Binary files a/lib/python/Plugins/SystemPlugins/SoftwareUpdate/update.png and b/lib/python/Plugins/SystemPlugins/SoftwareUpdate/update.png differ diff --git a/lib/python/Screens/MediaPlayer.py b/lib/python/Screens/MediaPlayer.py index 3e238e0..32296b6 100644 --- a/lib/python/Screens/MediaPlayer.py +++ b/lib/python/Screens/MediaPlayer.py @@ -10,7 +10,7 @@ from Components.Label import Label from Components.FileList import FileEntryComponent, FileList from Components.MediaPlayer import PlayList, PlaylistEntryComponent from Plugins.Plugin import PluginDescriptor -from Tools.Directories import resolveFilename, SCOPE_MEDIA, SCOPE_CONFIG +from Tools.Directories import resolveFilename, SCOPE_MEDIA, SCOPE_CONFIG, SCOPE_SKIN_IMAGE from Components.ServicePosition import ServicePositionGauge from Screens.ChoiceBox import ChoiceBox from Components.ServiceEventTracker import ServiceEventTracker @@ -32,7 +32,7 @@ class MediaPlayer(Screen, InfoBarSeek): self.addPlaylistParser(PlaylistIOPLS, "pls") self.addPlaylistParser(PlaylistIOInternal, "e2pls") - self.filelist = FileList(resolveFilename(SCOPE_MEDIA), matchingPattern = "(?i)^.*\.(mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob)", useServiceRef = True) + self.filelist = FileList(resolveFilename(SCOPE_MEDIA), matchingPattern = "^.*\.(mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob)", useServiceRef = True) self["filelist"] = self.filelist self.playlist = PlayList() @@ -52,6 +52,7 @@ class MediaPlayer(Screen, InfoBarSeek): self["year"] = Label("") self["genretext"] = Label(_("Genre:")) self["genre"] = Label("") + self["coverArt"] = Pixmap() #self["text"] = Input("1234", maxSize=True, type=Input.NUMBER) @@ -129,6 +130,8 @@ class MediaPlayer(Screen, InfoBarSeek): self.infoTimer.start(500) self.currList = "filelist" + + self.coverArtFileName = "" self.playlistIOInternal = PlaylistIOInternal() list = self.playlistIOInternal.open(resolveFilename(SCOPE_CONFIG, "playlist.e2pls")) @@ -169,8 +172,10 @@ class MediaPlayer(Screen, InfoBarSeek): album = currPlay.info().getInfoString(iServiceInformation.sAlbum), genre = currPlay.info().getInfoString(iServiceInformation.sGenre), clear = True) + self.updateCoverArtPixmap( currPlay.info().getName() ) else: self.updateMusicInformation() + self.updateCoverArtPixmap( "" ) def updateMusicInformation(self, artist = "", title = "", album = "", year = "", genre = "", clear = False): self.updateSingleMusicInformation("artist", artist, clear) @@ -184,6 +189,19 @@ class MediaPlayer(Screen, InfoBarSeek): if self[name].getText() != info: self[name].setText(info) + def updateCoverArtPixmap(self, currentServiceName): + filename = currentServiceName + # The "getName" usually adds something like "MP3 File:" infront of filename + # Get rid of this...by finding the first "/" + filename = filename[filename.find("/"):] + path = os.path.dirname(filename) + pngname = path + "/" + "folder.png" + if not os.path.exists(pngname): + pngname = resolveFilename(SCOPE_SKIN_IMAGE, "no_coverArt.png") + if self.coverArtFileName != pngname: + self.coverArtFileName = pngname + self["coverArt"].instance.setPixmapFromFile(self.coverArtFileName) + def fwdTimerFire(self): self.fwdKeyTimer.stop() self.fwdtimer = False