From 2a8ecd871020fdd668cf5500460e5a6e7851b4b0 Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Sun, 13 Apr 2008 23:00:47 +0000 Subject: png cleanup by nemesis, source changes. --- lib/python/Components/ChoiceList.py | 6 +++--- lib/python/Components/EpgList.py | 2 +- lib/python/Components/MediaPlayer.py | 10 +++++----- lib/python/Components/ParentalControlList.py | 2 +- lib/python/Components/PluginList.py | 4 ++-- lib/python/Components/Renderer/Picon.py | 2 +- lib/python/Components/SelectionList.py | 2 +- lib/python/Components/ServiceList.py | 4 ++-- lib/python/Components/TimerList.py | 2 +- lib/python/Plugins/Extensions/CutListEditor/plugin.py | 2 +- .../Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py | 2 +- lib/python/Plugins/Extensions/MediaPlayer/plugin.py | 2 +- lib/python/Plugins/Extensions/PicturePlayer/plugin.py | 18 +++++++++--------- lib/python/Plugins/SystemPlugins/Satfinder/plugin.py | 4 ++-- .../Plugins/SystemPlugins/Videomode/VideoWizard.py | 14 +++++++------- lib/python/Screens/LocationBox.py | 4 ++-- lib/python/Screens/PluginBrowser.py | 6 +++--- lib/python/Screens/RdsDisplay.py | 8 ++++---- lib/python/Screens/StartWizard.py | 12 ++++++------ lib/python/Screens/TimerEntry.py | 2 +- lib/python/Screens/TutorialWizard.py | 8 ++++---- 21 files changed, 58 insertions(+), 58 deletions(-) (limited to 'lib/python') 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 diff --git a/lib/python/Plugins/Extensions/CutListEditor/plugin.py b/lib/python/Plugins/Extensions/CutListEditor/plugin.py index e2bf7235..4c520689 100644 --- a/lib/python/Plugins/Extensions/CutListEditor/plugin.py +++ b/lib/python/Plugins/Extensions/CutListEditor/plugin.py @@ -162,7 +162,7 @@ class CutListEditor(Screen, InfoBarSeek, InfoBarCueSheetSupport, InfoBarServiceN + pointer="/usr/share/enigma2/skin_default/position_arrow.png:3,5" foregroundColor="#ffffff" /> """ def __init__(self, session, service): diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py b/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py index 6743161f..e41ecaf2 100644 --- a/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py +++ b/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py @@ -39,7 +39,7 @@ class EPGList(HTMLComponent, GUIComponent): if overjump_empty: self.l.setSelectableFunc(self.isSelectable) 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')) self.time_base = None self.time_epoch = time_epoch self.list = None diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py index fa7f1643..dcc601fd 100644 --- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py @@ -39,7 +39,7 @@ class MediaPixmap(Pixmap): self.default_pixmap = value break if self.default_pixmap is None: - self.default_pixmap = resolveFilename(SCOPE_SKIN_IMAGE, "no_coverArt.png") + self.default_pixmap = resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/no_coverArt.png") return Pixmap.applySkin(self, desktop) class MediaPlayer(Screen, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSupport, InfoBarNotifications, HelpableScreen): diff --git a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py index 6d41305e..a426866e 100644 --- a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py +++ b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py @@ -196,13 +196,13 @@ class PicView(Screen): - + - - - - - + + + + + """ def __init__(self, session, filelist, name, path): @@ -420,9 +420,9 @@ class PicSetup(Screen): class picmain(Screen): skin = """ - - - + + + diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py index c3e270b1..73a857ec 100644 --- a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py +++ b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py @@ -69,11 +69,11 @@ class Satfinder(ScanSetup): BER - + LOCK - + LOCK Invert diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py index fb8f4016..2f8e8e78 100644 --- a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py +++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py @@ -39,15 +39,15 @@ class VideoWizard(WizardLanguage): - - - + + + - - - - + + + + """ % (resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/Scart.png")) def __init__(self, session): diff --git a/lib/python/Screens/LocationBox.py b/lib/python/Screens/LocationBox.py index b15fece5..de7923e4 100644 --- a/lib/python/Screens/LocationBox.py +++ b/lib/python/Screens/LocationBox.py @@ -30,9 +30,9 @@ class LocationBox(Screen, NumericalTextInput): - + - + """ diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py index 3b4ff116..6d0439ed 100644 --- a/lib/python/Screens/PluginBrowser.py +++ b/lib/python/Screens/PluginBrowser.py @@ -187,9 +187,9 @@ class PluginDownloadBrowser(Screen): def updateList(self): self.list = [] - expandableIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "expandable-plugins.png")) - expandedIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "expanded-plugins.png")) - verticallineIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "verticalline-plugins.png")) + expandableIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/expandable-plugins.png")) + expandedIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/expanded-plugins.png")) + verticallineIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/verticalline-plugins.png")) self.plugins = {} for x in self.pluginlist: diff --git a/lib/python/Screens/RdsDisplay.py b/lib/python/Screens/RdsDisplay.py index d4b22572..36d45908 100644 --- a/lib/python/Screens/RdsDisplay.py +++ b/lib/python/Screens/RdsDisplay.py @@ -122,10 +122,10 @@ class RassInteractive(Screen): 9 : self["subpages_9"] } self.subpage_png = { - 1 : LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "rass_page1.png")), - 2 : LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "rass_page2.png")), - 3 : LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "rass_page3.png")), - 4 : LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "rass_page4.png")) } + 1 : LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/rass_page1.png")), + 2 : LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/rass_page2.png")), + 3 : LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/rass_page3.png")), + 4 : LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/rass_page4.png")) } self.current_page=0; self.current_subpage=0; diff --git a/lib/python/Screens/StartWizard.py b/lib/python/Screens/StartWizard.py index 64ab425c..aff6e742 100644 --- a/lib/python/Screens/StartWizard.py +++ b/lib/python/Screens/StartWizard.py @@ -18,14 +18,14 @@ class StartWizard(WizardLanguage): - + - - - - - + + + + + """ def __init__(self, session): diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py index e550519f..6cbd18ec 100644 --- a/lib/python/Screens/TimerEntry.py +++ b/lib/python/Screens/TimerEntry.py @@ -26,7 +26,7 @@ class TimerEntry(Screen, ConfigListScreen): self["oktext"] = Label(_("OK")) self["canceltext"] = Label(_("Cancel")) - self["locationtext"] = Label(_("Choose Location")) + self["locationtext"] = Label(_("Location")) self["ok"] = Pixmap() self["cancel"] = Pixmap() self["location"] = Pixmap() diff --git a/lib/python/Screens/TutorialWizard.py b/lib/python/Screens/TutorialWizard.py index 9e97b7e7..8c0b79d6 100644 --- a/lib/python/Screens/TutorialWizard.py +++ b/lib/python/Screens/TutorialWizard.py @@ -10,10 +10,10 @@ class TutorialWizard(Wizard): - - - - + + + + """ def __init__(self, session): -- cgit v1.2.3