summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvali <vali@andLinux.(none)>2011-02-17 07:21:46 (GMT)
committervali <vali@andLinux.(none)>2011-02-17 07:21:46 (GMT)
commit958f7e4c581f59593dec222a8c6ec7c2d67b5160 (patch)
treefaf84d706f7798f4fb627ca1cf6be87c02c63b76
parent02b31e7a47efdbb998211169457656bc64c1eca8 (diff)
[EasyMedia] user-path for plugin icons
-rw-r--r--easymedia/src/plugin.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/easymedia/src/plugin.py b/easymedia/src/plugin.py
index d08c6a3..841f60c 100644
--- a/easymedia/src/plugin.py
+++ b/easymedia/src/plugin.py
@@ -37,7 +37,7 @@ from Components.ConfigList import ConfigListScreen
from Components.PluginComponent import plugins
from Components.PluginList import *
from Components.config import config, getConfigListEntry, ConfigSubsection, ConfigSelection
-from Tools.Directories import fileExists, resolveFilename, SCOPE_PLUGINS
+from Tools.Directories import fileExists, pathExists, resolveFilename, SCOPE_PLUGINS
from Tools.LoadPixmap import LoadPixmap
from Tools.HardwareInfo import HardwareInfo
from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, gFont, getDesktop
@@ -119,11 +119,11 @@ def notEasy(session, **kwargs):
def MPanelEntryComponent(key, text):
res = [ text ]
res.append((eListboxPythonMultiContent.TYPE_TEXT, 150, 17, 300, 60, 0, RT_HALIGN_LEFT, text[0]))
- png = LoadPixmap('/usr/lib/enigma2/python/Plugins/Extensions/EasyMedia/' + key + ".png")
+ png = LoadPixmap(EasyMedia.EMiconspath + key + '.png')
if png is not None:
res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 25, 5, 100, 50, png))
else:
- png = LoadPixmap('/usr/lib/enigma2/python/Plugins/Extensions/EasyMedia/default.png')
+ png = LoadPixmap(EasyMedia.EMiconspath + 'default.png')
if png is not None:
res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 25, 5, 100, 50, png))
return res
@@ -309,6 +309,10 @@ class EasyMedia(Screen):
<screen position="center,center" size="320,440" title="Easy Media">
<widget name="list" position="10,10" size="300,420" scrollbarMode="showOnDemand" />
</screen>"""
+ if pathExists('/usr/lib/enigma2/python/Plugins/Extensions/EasyMedia/icons/'):
+ EMiconspath = '/usr/lib/enigma2/python/Plugins/Extensions/EasyMedia/icons/'
+ else:
+ EMiconspath = '/usr/lib/enigma2/python/Plugins/Extensions/EasyMedia/'
def __init__(self, session):
Screen.__init__(self, session)
self.session = session
@@ -414,9 +418,6 @@ class EasyMedia(Screen):
def emContextMenu(self):
self.session.open(ConfigEasyMedia)
- def emContextMenu(self):
- self.session.open(ConfigEasyMedia)
-
def createSummary(self):
return EasyMediaSummary