aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2008-04-23 13:47:57 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2008-04-23 13:47:57 +0000
commitb091da4dc002ef1b8c830dd7d307be349c414d7a (patch)
tree1e39069eb7673a434e9ce14cb1387008ad48e572
parentfe0534f76b59b814caca3648933c45d3add31889 (diff)
downloadenigma2-b091da4dc002ef1b8c830dd7d307be349c414d7a.tar.gz
enigma2-b091da4dc002ef1b8c830dd7d307be349c414d7a.zip
fix subtitles
-rw-r--r--data/skin_default.xml4
-rw-r--r--skin.py3
2 files changed, 4 insertions, 3 deletions
diff --git a/data/skin_default.xml b/data/skin_default.xml
index 37f03ab3..678e5033 100644
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -659,7 +659,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
<widget name="footer" position="10,310" size="400,20" font="Regular;20" halign="center" />
</screen>
<!-- Scart -->
- <screen name="Scart" position="0,0" size="720,576" />
+ <screen name="Scart" position="0,0" size="720,576" backgroundColor="transparent" />
<!-- Service info -->
<screen name="ServiceInfo" position="90,95" size="560,430" title="Serviceinfo">
<ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
@@ -777,7 +777,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
<widget name="config" position="10,10" zPosition="1" size="360,275" scrollbarMode="showOnDemand" />
</screen>
<!-- Subtitle area -->
- <screen name="SubtitleDisplay" position="0,0" size="720,576" zPosition="-1" flags="wfNoBorder" />
+ <screen name="SubtitleDisplay" position="0,0" size="720,576" zPosition="-1" flags="wfNoBorder" backgroundColor="transparent" />
<!-- Time & date input -->
<screen name="TimeDateInput" position="160,150" size="400,200" title="Time/Date Input">
<widget name="cancel" pixmap="skin_default/buttons/red.png" position="10,0" size="140,40" alphatest="on" />
diff --git a/skin.py b/skin.py
index 8789e877..9eb5d4f5 100644
--- a/skin.py
+++ b/skin.py
@@ -370,7 +370,8 @@ def readSkin(screen, skin, names, desktop):
break
# otherwise try embedded skin
- myscreen = myscreen or getattr(screen, "parsedSkin", None)
+ if myscreen is None:
+ myscreen = getattr(screen, "parsedSkin", None)
# try uncompiled embedded skin
if myscreen is None and getattr(screen, "skin", None):