X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/359b7184acb84b5409e10a97d11762bcbc63f7ed..50f45bd77792ce7a0edb012346629b069e81a966:/data/skin_default.xml diff --git a/data/skin_default.xml b/data/skin_default.xml index 5ab25f3f..bb64b4ae 100644 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -1,66 +1,82 @@ - - - + + + + + + - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + Name + + + - + - - + + - - + + - + - - + + - + @@ -68,68 +84,93 @@ - - + + + + - - - - - + + + + - + - - + + - + - - + + + - + - + - + - + - + + + + + + + + + + - + + + + + - + + + + + + + + + - - - - - - - + + + + + + + + + @@ -173,17 +214,22 @@ - - - - + + + + + + + + + - + @@ -193,7 +239,7 @@ - + @@ -204,19 +250,48 @@ - + + + RadioText + - + + Name + - - - - - - - - + + WithSeconds + + + Progress + + + RasInteractiveAvailable + + + + StartTime + Default + + + Name + + + Remaining + InMinutes + + + Name + + + StartTime + Default + + + Duration + InMinutes + @@ -259,13 +334,63 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + @@ -277,6 +402,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -286,36 +436,37 @@ from enigma import eSize, ePoint orgwidth = self.instance.size().width() orgpos = self.instance.position() -textsize = self["text"].getSize() +textsize = self["text"].getSize() # y size still must be fixed in font stuff... textsize = (textsize[0] + 50, textsize[1] + 50) count = len(self.list) -if count > 6: - count = 6 -offset = 30 * count +if count > 10: + count = 10 +offset = 25 * count wsizex = textsize[0] + 60 wsizey = textsize[1] + offset -if (400 > wsizex): - wsizex = 400 -wsize = (wsizex, wsizey) +if (520 > wsizex): + wsizex = 520 +wsize = (wsizex, wsizey) # resize self.instance.resize(eSize(*wsize)) # resize label -self["text"].instance.resize(eSize(*textsize)) +self["text"].instance.resize(eSize(*textsize)) # move list -listsize = (wsizex, 30 * len(self.list)) -self["list"].instance.move(ePoint(0, textsize[1])) -self["list"].instance.resize(eSize(*listsize)) +listsize = (wsizex, 25 * count) +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())) - +self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3))) + + @@ -326,7 +477,7 @@ newwidth = wsize[0] - + @@ -338,14 +489,24 @@ newwidth = wsize[0] - + + Remaining + + + + + + + + - - - - - + + + + + + # this should be factored out into some helper code, but currently demonstrates applets. @@ -353,7 +514,7 @@ from enigma import eSize, ePoint orgwidth = self.instance.size().width() orgpos = self.instance.position() -textsize = self["text"].getSize() +textsize = self["text"].getSize() # y size still must be fixed in font stuff... textsize = (textsize[0] + 50, textsize[1] + 50) @@ -362,7 +523,7 @@ if self.type == self.TYPE_YESNO: offset = 60 wsizex = textsize[0] + 60 wsizey = textsize[1] + offset -if (280 > wsizex): +if (280 > wsizex): wsizex = 280 wsize = (wsizex, wsizey) @@ -371,16 +532,46 @@ wsize = (wsizex, wsizey) self.instance.resize(eSize(*wsize)) # resize label -self["text"].instance.resize(eSize(*textsize)) +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)) +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())) - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +