X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0e3e7773e5d8e7ff159316db3de7fcfad57bb9e8..8bfa53742165d0893dbd623d217bc855390a5663:/data/skin_default.xml
diff --git a/data/skin_default.xml b/data/skin_default.xml
index 9d397b43..d5d5a8d6 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 @@
-
-
+
+
-
-
+
+
+
@@ -126,8 +127,8 @@
-
-
+
+
@@ -142,18 +143,32 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
@@ -206,6 +221,12 @@
+
+
+
+
+
+
@@ -230,8 +251,8 @@
-
- RadioText
+
+ RadioText
@@ -245,26 +266,29 @@
Progress
-
- StartTime
- Default
+
+ RasInteractiveAvailable
+
-
+
StartTime
Default
-
- Name
-
-
+
Name
-
-
+
Remaining
InMinutes
-
+
+ Name
+
+
+ StartTime
+ Default
+
+
Duration
InMinutes
@@ -311,13 +335,52 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -346,6 +409,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -358,36 +436,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)))
+
@@ -402,6 +480,8 @@ newwidth = wsize[0]
+
+
@@ -436,7 +516,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)
@@ -445,7 +525,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)
@@ -454,12 +534,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]
@@ -480,4 +560,20 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+