git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add missing invert
[enigma2.git]
/
skin.py
diff --git
a/skin.py
b/skin.py
index 9c18fda6bfaa3a57c8006a9deecb06a5eaf6a199..b2daa7fcd0f2bb15d1b023f41e13cd94b81eb671 100644
(file)
--- a/
skin.py
+++ b/
skin.py
@@
-1,13
+1,15
@@
-from enigma import *
import xml.dom.minidom
from xml.dom import EMPTY_NAMESPACE
import xml.dom.minidom
from xml.dom import EMPTY_NAMESPACE
-from Tools.Import import my_import
-import os
+from os import path
+
+from enigma import eSize, ePoint, gFont, eWindow, eLabel, ePixmap, eWindowStyleManager, \
+ loadPNG, addFont, gRGB, eWindowStyleSkinned
from Components.config import ConfigSubsection, ConfigText, config
from Components.Element import Element
from Components.Converter.Converter import Converter
from Components.config import ConfigSubsection, ConfigText, config
from Components.Element import Element
from Components.Converter.Converter import Converter
-
+from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS
+from Tools.Import import my_import
from Tools.XMLTools import elementsWithTag, mergeText
colorNames = dict()
from Tools.XMLTools import elementsWithTag, mergeText
colorNames = dict()
@@
-20,8
+22,6
@@
def dump(x, i=0):
except:
None
except:
None
-from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS
-
class SkinError(Exception):
def __init__(self, message):
self.message = message
class SkinError(Exception):
def __init__(self, message):
self.message = message
@@
-34,8
+34,8
@@
dom_skins = [ ]
def loadSkin(name):
# read the skin
filename = resolveFilename(SCOPE_SKIN, name)
def loadSkin(name):
# read the skin
filename = resolveFilename(SCOPE_SKIN, name)
-
path = os.
path.dirname(filename) + "/"
- dom_skins.append((path, xml.dom.minidom.parse(filename)))
+
mpath =
path.dirname(filename) + "/"
+ dom_skins.append((
m
path, xml.dom.minidom.parse(filename)))
# we do our best to always select the "right" value
# skins are loaded in order of priority: skin with
# we do our best to always select the "right" value
# skins are loaded in order of priority: skin with
@@
-53,7
+53,7
@@
config.skin.primary_skin = ConfigText(default = "skin.xml")
try:
loadSkin(config.skin.primary_skin.value)
try:
loadSkin(config.skin.primary_skin.value)
-except
SkinError
, err:
+except
(SkinError, IOError)
, err:
print "SKIN ERROR:", err
print "defaulting to standard skin..."
loadSkin('skin.xml')
print "SKIN ERROR:", err
print "defaulting to standard skin..."
loadSkin('skin.xml')
@@
-262,8
+262,7
@@
def loadSingleSkinData(desktop, dom_skin, path_prefix):
except:
raise ("Unknown color %s" % (type))
except:
raise ("Unknown color %s" % (type))
- x = eWindowStyleManagerPtr()
- eWindowStyleManager.getInstance(x)
+ x = eWindowStyleManager.getInstance()
x.setStyle(id, style)
def loadSkinData(desktop):
x.setStyle(id, style)
def loadSkinData(desktop):