X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6eeefece35e4269e02fdb7abab4f79d8e7b8f98b..5bff4bdd4a2877410b8e6daa070641fed1ab8ce1:/skin.py

diff --git a/skin.py b/skin.py
index 9c18fda6..b2daa7fc 100644
--- a/skin.py
+++ b/skin.py
@@ -1,13 +1,15 @@
-from enigma import *
 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 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()
@@ -20,8 +22,6 @@ def dump(x, i=0):
 	except:
 		None
 
-from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS
-
 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)
-	path = os.path.dirname(filename) + "/"
-	dom_skins.append((path, xml.dom.minidom.parse(filename)))
+	mpath = path.dirname(filename) + "/"
+	dom_skins.append((mpath, xml.dom.minidom.parse(filename)))
 
 # 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)
-except SkinError, err:
+except (SkinError, IOError), err:
 	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))
 			
-		x = eWindowStyleManagerPtr()
-		eWindowStyleManager.getInstance(x)
+		x = eWindowStyleManager.getInstance()
 		x.setStyle(id, style)
 
 def loadSkinData(desktop):