update lithuanian translation

[enigma2.git] / skin.py

diff --git a/skin.py b/skin.py
index 7c075b0db6913c5b8732575b461515080415dedf..a7824f918b011a358fcd727490ad22a9344d59ab 100644 (file)
--- a/skin.py
+++ b/skin.py
@@ -68,17 +68,17 @@ profile("LoadSkinDefault")
 loadSkin('skin_default.xml')
 profile("LoadSkinDefaultDone")
 
-def parsePosition(str):
+def parsePosition(str, scale):
        x, y = str.split(',')
-       return ePoint(int(x), int(y))
+       return ePoint(int(x) * scale[0][0] / scale[0][1], int(y) * scale[1][0] / scale[1][1])
 
-def parseSize(str):
+def parseSize(str, scale):
        x, y = str.split(',')
-       return eSize(int(x), int(y))
+       return eSize(int(x) * scale[0][0] / scale[0][1], int(y) * scale[1][0] / scale[1][1])
 
-def parseFont(str):
+def parseFont(str, scale):
        name, size = str.split(';')
-       return gFont(name, int(size))
+       return gFont(name, int(size) * scale[0][0] / scale[0][1])
 
 def parseColor(str):
        if str[0] != '#':
@@ -113,19 +113,19 @@ def loadPixmap(path, desktop):
                raise SkinError("pixmap file %s not found!" % (path))
        return ptr
 
-def applySingleAttribute(guiObject, desktop, attrib, value):
+def applySingleAttribute(guiObject, desktop, attrib, value, scale = ((1,1),(1,1))):
        # and set attributes
        try:
                if attrib == 'position':
-                       guiObject.move(parsePosition(value))
+                       guiObject.move(parsePosition(value, scale))
                elif attrib == 'size':
-                       guiObject.resize(parseSize(value))
+                       guiObject.resize(parseSize(value, scale))
                elif attrib == 'title':
                        guiObject.setTitle(_(value))
                elif attrib == 'text':
                        guiObject.setText(_(value))
                elif attrib == 'font':
-                       guiObject.setFont(parseFont(value))
+                       guiObject.setFont(parseFont(value, scale))
                elif attrib == 'zPosition':
                        guiObject.setZPosition(int(value))
                elif attrib in ["pixmap", "backgroundPixmap", "selectionPixmap"]:
@@ -206,11 +206,11 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
                        guiObject.setWrapAround(True)
                elif attrib == "pointer" or attrib == "seek_pointer":
                        (name, pos) = value.split(':')
-                       pos = parsePosition(pos)
+                       pos = parsePosition(pos, scale)
                        ptr = loadPixmap(name, desktop)
                        guiObject.setPointer({"pointer": 0, "seek_pointer": 1}[attrib], ptr, pos)
                elif attrib == 'shadowOffset':
-                       guiObject.setShadowOffset(parsePosition(value))
+                       guiObject.setShadowOffset(parsePosition(value, scale))
                elif attrib == 'noWrap':
                        guiObject.setNoWrap(1)
                else:
@@ -219,9 +219,9 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
 # AttributeError:
                print "widget %s (%s) doesn't support attribute %s!" % ("", guiObject.__class__.__name__, attrib)
 
-def applyAllAttributes(guiObject, desktop, attributes):
+def applyAllAttributes(guiObject, desktop, attributes, scale):
        for (attrib, value) in attributes:
-               applySingleAttribute(guiObject, desktop, attrib, value)
+               applySingleAttribute(guiObject, desktop, attrib, value, scale)
 
 def loadSingleSkinData(desktop, skin, path_prefix):
        """loads skin data like colors, windowstyle etc."""
@@ -237,7 +237,7 @@ def loadSingleSkinData(desktop, skin, path_prefix):
                        id = 0
                if id == 0: # framebuffer
                        for res in c.findall("resolution"):
-                               get_attr = c.attrib.get
+                               get_attr = res.attrib.get
                                xres = get_attr("xres")
                                if xres:
                                        xres = int(xres)
@@ -255,8 +255,8 @@ def loadSingleSkinData(desktop, skin, path_prefix):
                                        bpp = 32
                                #print "Resolution:", xres,yres,bpp
                                from enigma import gFBDC
-                               i = gFBDC.getInstance()
-                               i.setResolution(xres, yres)
+                               gFBDC.getInstance().setResolution(xres, yres)
+                               desktop.resize(eSize(xres, yres))
                                if bpp != 32:
                                        # load palette (not yet implemented)
                                        pass
@@ -266,7 +266,6 @@ def loadSingleSkinData(desktop, skin, path_prefix):
                        get_attr = color.attrib.get
                        name = get_attr("name")
                        color = get_attr("value")
-
                        if name and color:
                                colorNames[name] = parseColor(color)
                                #print "Color:", name, color
@@ -307,8 +306,8 @@ def loadSingleSkinData(desktop, skin, path_prefix):
 
                for title in windowstyle.findall("title"):
                        get_attr = title.attrib.get
-                       offset = parseSize(get_attr("offset"))
-                       font = parseFont(get_attr("font"))
+                       offset = parseSize(get_attr("offset"), ((1,1),(1,1)))
+                       font = parseFont(get_attr("font"), ((1,1),(1,1)))
 
                style.setTitleFont(font);
                style.setTitleOffset(offset)
@@ -354,6 +353,9 @@ def lookupScreen(name):
                                return x, path
        return None, None
 
+class additionalWidget:
+       pass
+
 def readSkin(screen, skin, names, desktop):
        if not isinstance(names, list):
                names = [names]
@@ -369,7 +371,8 @@ def readSkin(screen, skin, names, desktop):
                        break
 
        # otherwise try embedded skin
-       myscreen = myscreen or getattr(screen, "parsedSkin", None)
+       if myscreen is None:
+               myscreen = getattr(screen, "parsedSkin", None)
 
        # try uncompiled embedded skin
        if myscreen is None and getattr(screen, "skin", None):
@@ -382,7 +385,6 @@ def readSkin(screen, skin, names, desktop):
                emptySkin = "<screen></screen>"
                myscreen = screen.parsedSkin = xml.etree.cElementTree.fromstring(emptySkin)
 
-
        screen.skinAttributes = [ ]
 
        skin_path_prefix = getattr(screen, "skin_path", path)
@@ -408,7 +410,6 @@ def readSkin(screen, skin, names, desktop):
                        continue
 
                if wname:
-
                        #print "Widget name=", wname
                        visited_components.add(wname)
 
@@ -504,16 +505,16 @@ def readSkin(screen, skin, names, desktop):
 
        from Components.GUIComponent import GUIComponent
        nonvisited_components = [x for x in set(screen.keys()) - visited_components if isinstance(x, GUIComponent)]
-
        assert not nonvisited_components, "the following components in %s don't have a skin entry: %s" % (name, ', '.join(nonvisited_components))
 
        # now walk additional objects
        for widget in myscreen.getchildren():
+               w_tag = widget.tag
 
-               if widget.tag == "widget":
+               if w_tag == "widget":
                        continue
 
-               if widget.tag == "applet":
+               if w_tag == "applet":
                        try:
                                codeText = widget.text.strip()
                        except:
@@ -521,7 +522,7 @@ def readSkin(screen, skin, names, desktop):
 
                        #print "Found code:"
                        #print codeText
-                       type = get_attr('type')
+                       type = widget.attrib.get('type')
 
                        code = compile(codeText, "skin applet", "exec")
 
@@ -534,17 +535,14 @@ def readSkin(screen, skin, names, desktop):
 
                        continue
 
-               class additionalWidget:
-                       pass
-
                w = additionalWidget()
 
-               if widget.tag == "eLabel":
+               if w_tag == "eLabel":
                        w.widget = eLabel
-               elif widget.tag == "ePixmap":
+               elif w_tag == "ePixmap":
                        w.widget = ePixmap
                else:
-                       raise SkinError("unsupported stuff : %s" % widget.tag)
+                       raise SkinError("unsupported stuff : %s" % w_tag)
                        #print "unsupported stuff : %s" % widget.tag
 
                w.skinAttributes = [ ]