aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Components
diff options
context:
space:
mode:
Diffstat (limited to 'lib/python/Components')
-rw-r--r--lib/python/Components/ChoiceList.py6
-rw-r--r--lib/python/Components/EpgList.py2
-rw-r--r--lib/python/Components/MediaPlayer.py10
-rw-r--r--lib/python/Components/ParentalControlList.py2
-rw-r--r--lib/python/Components/PluginList.py4
-rw-r--r--lib/python/Components/Renderer/Picon.py2
-rw-r--r--lib/python/Components/SelectionList.py2
-rw-r--r--lib/python/Components/ServiceList.py4
-rw-r--r--lib/python/Components/TimerList.py2
9 files changed, 17 insertions, 17 deletions
diff --git a/lib/python/Components/ChoiceList.py b/lib/python/Components/ChoiceList.py
index 2a7a0904..16778749 100644
--- a/lib/python/Components/ChoiceList.py
+++ b/lib/python/Components/ChoiceList.py
@@ -8,11 +8,11 @@ def ChoiceEntryComponent(key, text):
if text[0] == "--":
res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 00, 800, 25, 0, RT_HALIGN_LEFT, "-"*200))
else:
- res.append((eListboxPythonMultiContent.TYPE_TEXT, 32, 00, 800, 25, 0, RT_HALIGN_LEFT, text[0]))
+ res.append((eListboxPythonMultiContent.TYPE_TEXT, 45, 00, 800, 25, 0, RT_HALIGN_LEFT, text[0]))
- png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "key_" + key + "-fs8.png"))
+ png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/buttons/key_" + key + ".png"))
if png is not None:
- res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 0, 0, 30, 20, png))
+ res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 5, 0, 35, 25, png))
return res
diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py
index e0d5227c..dbcd572b 100644
--- a/lib/python/Components/EpgList.py
+++ b/lib/python/Components/EpgList.py
@@ -51,7 +51,7 @@ 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, 'epgclock-fs8.png'))
+ self.clock_pixmap = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, 'skin_default/icons/epgclock.png'))
def getEventFromId(self, service, eventid):
event = None
diff --git a/lib/python/Components/MediaPlayer.py b/lib/python/Components/MediaPlayer.py
index c5b0efec..ef8d3a41 100644
--- a/lib/python/Components/MediaPlayer.py
+++ b/lib/python/Components/MediaPlayer.py
@@ -14,11 +14,11 @@ STATE_REWIND = 3
STATE_FORWARD = 4
STATE_NONE = 5
-PlayIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_play.png"))
-PauseIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_pause.png"))
-StopIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_stop.png"))
-RewindIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_rewind.png"))
-ForwardIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_forward.png"))
+PlayIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/ico_mp_play.png"))
+PauseIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/ico_mp_pause.png"))
+StopIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/ico_mp_stop.png"))
+RewindIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/ico_mp_rewind.png"))
+ForwardIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/ico_mp_forward.png"))
def PlaylistEntryComponent(serviceref, state):
res = [ serviceref ]
diff --git a/lib/python/Components/ParentalControlList.py b/lib/python/Components/ParentalControlList.py
index 5415fe24..31483865 100644
--- a/lib/python/Components/ParentalControlList.py
+++ b/lib/python/Components/ParentalControlList.py
@@ -5,7 +5,7 @@ from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
from enigma import eListbox, eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT
from Tools.LoadPixmap import LoadPixmap
-lockPicture = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "lock-fs8.png"))
+lockPicture = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/lock.png"))
def ParentalControlEntryComponent(service, name, locked = True):
res = [ (service, name, locked) ]
diff --git a/lib/python/Components/PluginList.py b/lib/python/Components/PluginList.py
index 538cb029..b13567ea 100644
--- a/lib/python/Components/PluginList.py
+++ b/lib/python/Components/PluginList.py
@@ -13,7 +13,7 @@ def PluginEntryComponent(plugin):
res.append(MultiContentEntryText(pos=(120, 26), size=(320, 17), font=1, text=plugin.description))
if plugin.icon is None:
- png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "plugin.png"))
+ png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/plugin.png"))
else:
png = plugin.icon
res.append(MultiContentEntryPixmapAlphaTest(pos=(10, 5), size=(100, 40), png = png))
@@ -35,7 +35,7 @@ def PluginDownloadComponent(plugin, name):
res.append(MultiContentEntryText(pos=(120, 26), size=(320, 17), font=1, text=plugin.description))
if plugin.icon is None:
- png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "plugin.png"))
+ png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/plugin.png"))
else:
png = plugin.icon
res.append(MultiContentEntryPixmapAlphaTest(pos=(10, 0), size=(100, 50), png = png))
diff --git a/lib/python/Components/Renderer/Picon.py b/lib/python/Components/Renderer/Picon.py
index bf52454a..27741d69 100644
--- a/lib/python/Components/Renderer/Picon.py
+++ b/lib/python/Components/Renderer/Picon.py
@@ -55,7 +55,7 @@ class Picon(Renderer):
if fileExists(str):
pngname = str
if pngname == "": # Fallback to enigma2 logo
- pngname = resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/enigma2.png")
+ pngname = resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/picon_default.png")
self.nameCache["default"] = pngname
if self.pngname != pngname:
self.instance.setPixmapFromFile(pngname)
diff --git a/lib/python/Components/SelectionList.py b/lib/python/Components/SelectionList.py
index d5215dc0..a4f1d71a 100644
--- a/lib/python/Components/SelectionList.py
+++ b/lib/python/Components/SelectionList.py
@@ -3,7 +3,7 @@ from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
from enigma import eListboxPythonMultiContent, eListbox, gFont, RT_HALIGN_LEFT
from Tools.LoadPixmap import LoadPixmap
-selectionpng = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "selectioncross-fs8.png"))
+selectionpng = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/selectioncross.png"))
def SelectionEntryComponent(description, value, index, selected):
res = [ (description, value, index, selected) ]
diff --git a/lib/python/Components/ServiceList.py b/lib/python/Components/ServiceList.py
index 2ed32647..ced4b0c3 100644
--- a/lib/python/Components/ServiceList.py
+++ b/lib/python/Components/ServiceList.py
@@ -17,11 +17,11 @@ class ServiceList(HTMLComponent, GUIComponent):
GUIComponent.__init__(self)
self.l = eListboxServiceContent()
- pic = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "folder.png"))
+ pic = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/folder.png"))
if pic:
self.l.setPixmap(self.l.picFolder, pic)
- pic = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "marker-fs8.png"))
+ pic = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/marker.png"))
if pic:
self.l.setPixmap(self.l.picMarker, pic)
diff --git a/lib/python/Components/TimerList.py b/lib/python/Components/TimerList.py
index 269eb3b6..0912a4d0 100644
--- a/lib/python/Components/TimerList.py
+++ b/lib/python/Components/TimerList.py
@@ -63,7 +63,7 @@ class TimerList(HTMLComponent, GUIComponent, object):
res.append((eListboxPythonMultiContent.TYPE_TEXT, width-240, 50, 240, 20, 1, RT_HALIGN_RIGHT|RT_VALIGN_CENTER, state))
if timer.disabled:
- png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "redx.png"))
+ png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/redx.png"))
res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 490, 5, 40, 40, png))
return res
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-19 13:59:18 +0000