X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d5f16996b3acbbd748916d1d5bb101f1eb789cac..1109344c9409572f9829e46971b71a7fe1d3c8cc:/data/skin_default.xml diff --git a/data/skin_default.xml b/data/skin_default.xml index 0813609e..5bec0cfb 100644 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -3,8 +3,7 @@ - - + @@ -18,8 +17,7 @@ - - + @@ -75,7 +73,7 @@ - + @@ -87,7 +85,9 @@ - + + + @@ -98,14 +98,15 @@ - - + + - - + + + @@ -142,18 +143,32 @@ - + + + + + - + + + + + + + + + - - + + + + @@ -223,12 +238,28 @@ - - - - - - + + + + + + + + + + StartTime + + + + EndTime + Format:- %H:%M + + + Name + + + ExtendedDescription + @@ -236,8 +267,8 @@ - - RadioText + + RadioText @@ -251,26 +282,29 @@ Progress - - StartTime - Default + + RasInteractiveAvailable + - + StartTime Default - - Name - - + Name - - + Remaining InMinutes - + + Name + + + StartTime + Default + + Duration InMinutes @@ -317,13 +351,52 @@ - + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -379,36 +452,36 @@ 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))) + @@ -423,6 +496,8 @@ newwidth = wsize[0] + + @@ -457,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) @@ -466,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) @@ -475,12 +550,12 @@ 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]