aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Plugins/SystemPlugins
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2009-02-20 02:23:57 +0100
committerghost <andreas.monzner@multimedia-labs.de>2009-02-20 02:23:57 +0100
commit29d62cc699d7043a749e6f184925b7fd14b5daab (patch)
tree2625af9fa842a87817c592d9b7f5a73208856a98 /lib/python/Plugins/SystemPlugins
parente180b709f892553d73784a30dc32e8251ad7b544 (diff)
parenta568c76b75e987a33d2f7a65aa483447cf55e442 (diff)
downloadenigma2-29d62cc699d7043a749e6f184925b7fd14b5daab.tar.gz
enigma2-29d62cc699d7043a749e6f184925b7fd14b5daab.zip
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/python/Plugins/SystemPlugins')
-rw-r--r--lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py4
-rw-r--r--lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml12
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
index 1d7ce7b5..095e94c0 100644
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
@@ -13,8 +13,8 @@ config.misc.showtestcard = ConfigBoolean(default = False)
class VideoWizardSummary(WizardSummary):
skin = """
<screen position="0,0" size="132,64">
- <widget name="text" position="6,4" size="120,42" font="Regular;14" transparent="1" />
- <widget source="parent.list" render="Label" position="6,25" size="120,21" font="Regular;16">
+ <widget name="text" position="6,4" size="120,40" font="Regular;12" transparent="1" />
+ <widget source="parent.list" render="Label" position="6,40" size="120,21" font="Regular;14">
<convert type="StringListSelection" />
</widget>
<!--widget name="pic" pixmap="%s" position="6,22" zPosition="10" size="64,64" transparent="1" alphatest="on"/-->
diff --git a/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml b/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
index 2a592aae..29ac4297 100644
--- a/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
+++ b/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
@@ -1,7 +1,7 @@
<wizard>
- <step id="inputselection" nextstep="modeselection" timeout="10" timeoutaction="selectnext">
+ <step id="inputselection" nextstep="modeselection" timeout="20" timeoutaction="selectnext">
<text value="Video input selection\n\nPlease press OK if you can see this page on your TV (or select a different input port).\n\nThe next input port will be automatically probed in 10 seconds." />
- <displaytext value="Select video input" />
+ <displaytext value="Select video input with up/down buttons" />
<list type="dynamic" source="listInputChannels" evaluation="inputSelectionMade" onselect="inputSelectionMoved" />
<code>
self["portpic"].show()
@@ -9,7 +9,7 @@ self.clearSelectedKeys()
self.selectKey("OK")
</code>
</step>
- <step id="modeselection" nextstep="rateselection" timeout="10" timeoutaction="selectnext">
+ <step id="modeselection" nextstep="rateselection" timeout="20" timeoutaction="selectnext">
<text value="Video mode selection." />
<displaytext value="Select video mode" />
<list type="dynamic" source="listModes" evaluation="modeSelectionMade" onselect="modeSelectionMoved" />
@@ -20,7 +20,7 @@ self.selectKey("DOWN")
self["portpic"].hide()
</code>
</step>
- <step id="rateselection" nextstep="dvirateintroduction" timeout="10" timeoutaction="selectnext">
+ <step id="rateselection" nextstep="dvirateintroduction" timeout="20" timeoutaction="selectnext">
<condition>
self.condition = (self.port != "DVI" or self.mode == "PC")
</condition>
@@ -46,7 +46,7 @@ self.selectKey("DOWN")
self.rateSelect("60Hz")
</code>
</step>
- <step id="dvirateselection" timeout="10" timeoutaction="changestep" timeoutstep="notworking50Hz">
+ <step id="dvirateselection" timeout="20" timeoutaction="changestep" timeoutstep="notworking50Hz">
<condition>
self.condition = (self.port == "DVI" and self.mode in ["720p", "1080i"])
</condition>
@@ -77,7 +77,7 @@ self.selectKey("UP")
self.selectKey("DOWN")
</code>
</step>
- <step id="working50Hz" nextstep="end" timeout="10" timeoutaction="nextstep">
+ <step id="working50Hz" nextstep="end" timeout="20" timeoutaction="nextstep">
<condition>
self.condition = (self.port == "DVI" and self.mode in ["720p", "1080i"])
</condition>