X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fe6a0874378bbf19d0727b6d83c98339407a1142..29dda647f09e42ac3a621bbb537558c2d1bbc7b4:/data/skin.xml?ds=sidebyside diff --git a/data/skin.xml b/data/skin.xml index 21f735b4..ec26d555 100644 --- a/data/skin.xml +++ b/data/skin.xml @@ -1,5 +1,4 @@ - @@ -9,16 +8,20 @@ + - + - + - + + + + @@ -29,79 +32,98 @@ - """ """ - - - - + + + + + + + + + + + + - + + - + + + + + + + - - - - - + + + + + + - - - - - + + + + + + + - - + + - - + + - - + + - - - - - + + - - + + - - + + + + + - - - + + + + + + - - - - + + + + - - - + + + + + + - - - - - - + + - - - - - - + + + + + + @@ -115,9 +137,20 @@ - - - + + + + + + + + + + + + + + @@ -125,55 +158,157 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - - - - + + + + + + + + + - + + + + -# this should be factored out into some helper code, but currently demonstrated applets. +# this should be factored out into some helper code, but currently demonstrates applets. from enigma import eSize, ePoint orgwidth = self.instance.size().width() @@ -181,8 +316,16 @@ orgpos = self.instance.position() textsize = self["text"].getSize() # y size still must be fixed in font stuff... -textsize = (textsize[0], textsize[1] + 20) -wsize = (textsize[0] + 20, textsize[1] + 20) +textsize = (textsize[0] + 50, textsize[1] + 50) +offset = 0 +if self.type == self.TYPE_YESNO: + offset = 60 +wsizex = textsize[0] + 60 +wsizey = textsize[1] + offset +if (280 > wsizex): + wsizex = 280 +wsize = (wsizex, wsizey) + # resize self.instance.resize(eSize(*wsize)) @@ -190,6 +333,11 @@ self.instance.resize(eSize(*wsize)) # resize label self["text"].instance.resize(eSize(*textsize)) +# move list +listsize = (wsizex, 50) +self["list"].instance.move(ePoint(0, textsize[1])) +self["list"].instance.resize(eSize(*listsize)) + # center window newwidth = wsize[0] self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))