X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3d2488dfc3a21d19ea6557c70eb3db01a3593cca..4cedb788563967100c39c2764be5b9daefc15d1a:/data/skin_default.xml diff --git a/data/skin_default.xml b/data/skin_default.xml index 66276360..b8395e45 100644 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -3,23 +3,21 @@ - - - + + - + - - - - + + + @@ -75,7 +73,7 @@ - + @@ -87,7 +85,9 @@ - + + + @@ -98,14 +98,15 @@ - - + + - - + + + @@ -113,7 +114,7 @@ - + @@ -126,6 +127,9 @@ + + + @@ -139,18 +143,32 @@ - + + + + + - + + + + + + + + + - - - - - + + + + + + + @@ -203,6 +221,12 @@ + + + + + + @@ -214,12 +238,31 @@ - - - - - - + + + + + + + + + + StartTime + + + + EndTime + Format:- %H:%M + + + Progress + + + + + + ExtendedDescription + @@ -227,8 +270,8 @@ - - RadioText + + RadioText @@ -242,26 +285,29 @@ Progress - - StartTime - Default + + RasInteractiveAvailable + - + StartTime Default - + Name - - Name - - - + Remaining InMinutes - + + Name + + + StartTime + Default + + Duration InMinutes @@ -308,18 +354,62 @@ - + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + @@ -338,6 +428,21 @@ + + + + + + + + + + + + + + + @@ -350,36 +455,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))) + @@ -394,6 +499,8 @@ newwidth = wsize[0] + + @@ -428,7 +535,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) @@ -437,7 +544,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) @@ -446,12 +553,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] @@ -472,4 +579,20 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) + + + + + + + + + + + + + + + +