diff options
| author | acid-burn <acidburn@opendreambox.org> | 2009-11-11 10:56:30 +0100 |
|---|---|---|
| committer | acid-burn <acidburn@opendreambox.org> | 2009-11-11 10:56:30 +0100 |
| commit | 39f3d5a554528bcbdc79cc0f2bdd2d59c92b0a4e (patch) | |
| tree | 26eb3798f34956754bef6c9f4a2c1a285601876a /lib/python/Components/EpgList.py | |
| parent | 383faf2da1a60442431dce44760a0392c5829dc8 (diff) | |
| parent | d64e82b37efdf77b557234809d0c81857818bfac (diff) | |
| download | enigma2-39f3d5a554528bcbdc79cc0f2bdd2d59c92b0a4e.tar.gz enigma2-39f3d5a554528bcbdc79cc0f2bdd2d59c92b0a4e.zip | |
Merge branch 'bug_249_current_skin_fallback' into experimental
Conflicts:
lib/python/Components/FileList.py
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
Diffstat (limited to 'lib/python/Components/EpgList.py')
| -rwxr-xr-x[-rw-r--r--] | lib/python/Components/EpgList.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py index 59f92621..41cd1b2c 100644..100755 --- a/lib/python/Components/EpgList.py +++ b/lib/python/Components/EpgList.py @@ -8,7 +8,7 @@ from Tools.LoadPixmap import LoadPixmap from time import localtime, time from ServiceReference import ServiceReference -from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE +from Tools.Directories import resolveFilename, SCOPE_CURRENT_SKIN EPG_TYPE_SINGLE = 0 EPG_TYPE_MULTI = 1 @@ -53,11 +53,11 @@ class EPGList(HTMLComponent, GUIComponent): assert(type == EPG_TYPE_SIMILAR) self.l.setBuildFunc(self.buildSimilarEntry) self.epgcache = eEPGCache.getInstance() - self.clock_pixmap = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, 'skin_default/icons/epgclock.png')) - self.clock_add_pixmap = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, 'skin_default/icons/epgclock_add.png')) - self.clock_pre_pixmap = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, 'skin_default/icons/epgclock_pre.png')) - self.clock_post_pixmap = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, 'skin_default/icons/epgclock_post.png')) - self.clock_prepost_pixmap = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, 'skin_default/icons/epgclock_prepost.png')) + self.clock_pixmap = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, 'skin_default/icons/epgclock.png')) + self.clock_add_pixmap = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, 'skin_default/icons/epgclock_add.png')) + self.clock_pre_pixmap = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, 'skin_default/icons/epgclock_pre.png')) + self.clock_post_pixmap = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, 'skin_default/icons/epgclock_post.png')) + self.clock_prepost_pixmap = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, 'skin_default/icons/epgclock_prepost.png')) def getEventFromId(self, service, eventid): event = None |