X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/84702da5d3a6df33717b399b859008a3cf8a1522..1109344c9409572f9829e46971b71a7fe1d3c8cc:/data/skin_default.xml?ds=sidebyside diff --git a/data/skin_default.xml b/data/skin_default.xml index 3ed48eab..5bec0cfb 100644 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -1,66 +1,82 @@ - - - + + + + + + - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + Name + + + - + - - + + - - + + - + - - + + - + @@ -68,68 +84,93 @@ - - + + + + - - - - - + + + + - + - - + + - + - - + + + - + - + - + - + - + + + + + + + + + + - + + + + + - + + + + + + + + + - - - - - - - + + + + + + + + + @@ -173,14 +214,19 @@ - - - - + + + + + + + + + @@ -192,31 +238,76 @@ - - - - - - + + + + + + + + + + StartTime + + + + EndTime + Format:- %H:%M + + + Name + + + ExtendedDescription + - + + + RadioText + - + + Name + - - - - - - - - + + WithSeconds + + + Progress + + + RasInteractiveAvailable + + + + StartTime + Default + + + Name + + + Remaining + InMinutes + + + Name + + + StartTime + Default + + + Duration + InMinutes + @@ -259,16 +350,63 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + @@ -280,6 +418,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -289,37 +452,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 > 10: +if count > 10: count = 10 offset = 25 * count wsizex = textsize[0] + 60 wsizey = textsize[1] + offset -if (450 > wsizex): - wsizex = 450 +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, 25 * count) -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())) - +self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3))) + + @@ -330,9 +493,11 @@ newwidth = wsize[0] - + + + @@ -342,8 +507,10 @@ newwidth = wsize[0] - + + Remaining + @@ -353,11 +520,11 @@ newwidth = wsize[0] - - - - - + + + + + # this should be factored out into some helper code, but currently demonstrates applets. @@ -365,7 +532,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) @@ -374,7 +541,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) @@ -383,16 +550,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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +