aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Plugins
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2007-12-13 01:25:52 +0000
committerFelix Domke <tmbinc@elitedvb.net>2007-12-13 01:25:52 +0000
commit5db2dc5c63948651b3e4b337d7057cd940ccc644 (patch)
treecdb77048bb1954de6ea7e983302371b33e6f812f /lib/python/Plugins
parent7bcaff119363f42cd4263a5e07982de7671734a7 (diff)
downloadenigma2-5db2dc5c63948651b3e4b337d7057cd940ccc644.tar.gz
enigma2-5db2dc5c63948651b3e4b337d7057cd940ccc644.zip
factor out loadPNG into generic LoadPixmap
Diffstat (limited to 'lib/python/Plugins')
-rw-r--r--lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py5
-rw-r--r--lib/python/Plugins/Plugin.py4
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py b/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
index 3148879a..d6d27595 100644
--- a/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
+++ b/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
@@ -17,7 +17,8 @@ from Screens.EpgSelection import EPGSelection
from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
from RecordTimer import RecordTimerEntry, parseEvent
from ServiceReference import ServiceReference
-from enigma import eEPGCache, eListbox, gFont, loadPNG, eListboxPythonMultiContent, \
+from Tools.LoadPixmap import LoadPixmap
+from enigma import eEPGCache, eListbox, gFont, eListboxPythonMultiContent, \
RT_HALIGN_LEFT, RT_HALIGN_CENTER, RT_VALIGN_CENTER, RT_WRAP, eRect, eTimer
from time import localtime, time, strftime
@@ -38,7 +39,7 @@ class EPGList(HTMLComponent, GUIComponent):
if overjump_empty:
self.l.setSelectableFunc(self.isSelectable)
self.epgcache = eEPGCache.getInstance()
- self.clock_pixmap = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, 'epgclock-fs8.png'))
+ self.clock_pixmap = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, 'epgclock-fs8.png'))
self.time_base = None
self.time_epoch = time_epoch
self.list = None
diff --git a/lib/python/Plugins/Plugin.py b/lib/python/Plugins/Plugin.py
index b01b9b8f..f6f9b481 100644
--- a/lib/python/Plugins/Plugin.py
+++ b/lib/python/Plugins/Plugin.py
@@ -1,5 +1,5 @@
-from enigma import loadPNG
from Components.config import ConfigSubsection, config
+from Tools.LoadPixmap import LoadPixmap
config.plugins = ConfigSubsection()
@@ -63,7 +63,7 @@ class PluginDescriptor:
def updateIcon(self, path):
if type(self.iconstr) is str:
- self.icon = loadPNG(path + "/" + self.iconstr)
+ self.icon = LoadPixmap(path + "/" + self.iconstr)
else:
self.icon = None