git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9820830
)
fix not-a-string when using english
author
Stefan Pluecken
<stefan.pluecken@multimedia-labs.de>
Sun, 18 Dec 2005 23:21:59 +0000
(23:21 +0000)
committer
Stefan Pluecken
<stefan.pluecken@multimedia-labs.de>
Sun, 18 Dec 2005 23:21:59 +0000
(23:21 +0000)
add some wizard-stuff
data/startwizard.xml
patch
|
blob
|
history
data/tutorialwizard.xml
patch
|
blob
|
history
lib/python/Components/Language.py
patch
|
blob
|
history
lib/python/Components/config.py
patch
|
blob
|
history
lib/python/Screens/TutorialWizard.py
patch
|
blob
|
history
diff --git
a/data/startwizard.xml
b/data/startwizard.xml
index 37a5b1e5c33edf9940dbf47cbf572868a5892144..d31765f83ca7d3bba2a84324df069a9f00917089 100644
(file)
--- a/
data/startwizard.xml
+++ b/
data/startwizard.xml
@@
-43,7
+43,6
@@
self["arrowup2"].moveTo(590, 320, 1)
self["arrowup2"].startMoving()
self["arrowdown"].moveTo(740, 355, 1)
self["arrowdown"].startMoving()
self["arrowup2"].startMoving()
self["arrowdown"].moveTo(740, 355, 1)
self["arrowdown"].startMoving()
-
</code>
</step>
<step number="4">
</code>
</step>
<step number="4">
@@
-54,16
+53,26
@@
self.condition = nimmanager.nimCount > 1
<text value="Please set up tuner B" />
<config screen="NimSetup" module="Satconfig" args="1" type="ConfigList" />
<code>
<text value="Please set up tuner B" />
<config screen="NimSetup" module="Satconfig" args="1" type="ConfigList" />
<code>
-self["rc"].moveTo(
8
00, 50, 1)
+self["rc"].moveTo(
5
00, 50, 1)
self["rc"].startMoving()
self["rc"].startMoving()
-self["arrowup"].moveTo(
800, 31
0, 1)
+self["arrowup"].moveTo(
525, 32
0, 1)
self["arrowup"].startMoving()
self["arrowup"].startMoving()
-self["arrowup2"].moveTo(
800, 31
0, 1)
+self["arrowup2"].moveTo(
590, 32
0, 1)
self["arrowup2"].startMoving()
self["arrowup2"].startMoving()
+self["arrowdown"].moveTo(740, 355, 1)
+self["arrowdown"].startMoving()
</code>
</step>
<step number="5">
<text value="Do you want to do a service scan?" />
</code>
</step>
<step number="5">
<text value="Do you want to do a service scan?" />
+ <code>
+self["rc"].moveTo(800, 50, 1)
+self["rc"].startMoving()
+self["arrowup"].moveTo(800, 310, 1)
+self["arrowup"].startMoving()
+self["arrowup2"].moveTo(800, 310, 1)
+self["arrowup2"].startMoving()
+ </code>
<list>
<listentry caption="Yes, scan now" step="next" />
<listentry caption="No, scan later manually" step="7" />
<list>
<listentry caption="Yes, scan now" step="next" />
<listentry caption="No, scan later manually" step="7" />
diff --git
a/data/tutorialwizard.xml
b/data/tutorialwizard.xml
index 06d48bc64e7700cc6a49558a6d596a775c0d922a..a63dbb38e3a659235ec3f376f31ac73b844c9b91 100644
(file)
--- a/
data/tutorialwizard.xml
+++ b/
data/tutorialwizard.xml
@@
-1,5
+1,13
@@
<wizard>
<step number="1">
<wizard>
<step number="1">
+ <text value="Do you want to view a tutorial?" />
+ <list>
+ <listentry caption="Yes, view the tutorial" step="next" />
+ <listentry caption="No, just start my dreambox" step="end" />
+ </list>
+ </step>
+
+ <step number="2">
<text value="By pressing the OK Button on your remote control, the info bar is being displayed." />
<code>
from Screens.InfoBar import InfoBar
<text value="By pressing the OK Button on your remote control, the info bar is being displayed." />
<code>
from Screens.InfoBar import InfoBar
@@
-13,7
+21,8
@@
del self.infobardialog
</code>
</step>
</code>
</step>
- <step number="2">
+
+ <step number="3">
<text value="This is step number 2." />
</step>
</wizard>
<text value="This is step number 2." />
</step>
</wizard>
diff --git
a/lib/python/Components/Language.py
b/lib/python/Components/Language.py
index c60b39b2a82e2499d4ecd952d289b5fe30bc5572..d6e43a5d229f821ef41bfb373334324182a79aae 100644
(file)
--- a/
lib/python/Components/Language.py
+++ b/
lib/python/Components/Language.py
@@
-5,7
+5,7
@@
from Tools.Directories import *
class Language:
def __init__(self):
class Language:
def __init__(self):
- gettext.install('enigma2',
'/enigma2/po', unicode=1
)
+ gettext.install('enigma2',
resolveFilename(SCOPE_LANGUAGE, ""), unicode=0, codeset="utf-8"
)
self.activeLanguage = 0
self.lang = []
# FIXME make list dynamically
self.activeLanguage = 0
self.lang = []
# FIXME make list dynamically
diff --git
a/lib/python/Components/config.py
b/lib/python/Components/config.py
index 3bbdde107af8f15d4ed8b19b5c6f91a1c266af3a..9400565da0842b577e8266242a07b7cc79edeb88 100644
(file)
--- a/
lib/python/Components/config.py
+++ b/
lib/python/Components/config.py
@@
-78,6
+78,8
@@
class configSelection:
def __call__(self, selected): #needed by configlist
self.checkValues()
def __call__(self, selected): #needed by configlist
self.checkValues()
+ print "[config.py] orgstring: ", self.parent.vals[self.parent.value]
+ print "[config.py] translation: ", _(self.parent.vals[self.parent.value])
return ("text", _(self.parent.vals[self.parent.value]))
class configDateTime:
return ("text", _(self.parent.vals[self.parent.value]))
class configDateTime:
diff --git
a/lib/python/Screens/TutorialWizard.py
b/lib/python/Screens/TutorialWizard.py
index 0ba97d3a1f0bbe252c66aa23da26d94d31e87a83..95318724111f03fba7b234c5fa829a48259bfa1b 100644
(file)
--- a/
lib/python/Screens/TutorialWizard.py
+++ b/
lib/python/Screens/TutorialWizard.py
@@
-10,8
+10,9
@@
config.misc.firstruntutorial = configElementBoolean("config.misc.firstruntutoria
class TutorialWizard(Wizard):
skin = """
class TutorialWizard(Wizard):
skin = """
- <screen position="0,0" size="720,
30
0" title="Welcome..." flags="wfNoBorder" >
+ <screen position="0,0" size="720,
56
0" title="Welcome..." flags="wfNoBorder" >
<widget name="text" position="50,100" size="440,200" font="Arial;23" />
<widget name="text" position="50,100" size="440,200" font="Arial;23" />
+ <widget name="list" position="50,300" zPosition="1" size="440,200" />
<widget name="rc" pixmap="/usr/share/enigma2/rc.png" position="500,600" zPosition="10" size="154,475" transparent="1" alphatest="on"/>
<widget name="arrowdown" pixmap="/usr/share/enigma2/arrowdown.png" position="0,0" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
<widget name="arrowup" pixmap="/usr/share/enigma2/arrowup.png" position="-100,-100" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
<widget name="rc" pixmap="/usr/share/enigma2/rc.png" position="500,600" zPosition="10" size="154,475" transparent="1" alphatest="on"/>
<widget name="arrowdown" pixmap="/usr/share/enigma2/arrowdown.png" position="0,0" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
<widget name="arrowup" pixmap="/usr/share/enigma2/arrowup.png" position="-100,-100" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
@@
-22,7
+23,7
@@
class TutorialWizard(Wizard):
self.skin = TutorialWizard.skin
self.xmlfile = "tutorialwizard.xml"
self.skin = TutorialWizard.skin
self.xmlfile = "tutorialwizard.xml"
- Wizard.__init__(self, session, showSteps=False, showStepSlider=False, showList=
Fals
e, showConfig=False)
+ Wizard.__init__(self, session, showSteps=False, showStepSlider=False, showList=
Tru
e, showConfig=False)
self["rc"] = MovingPixmap()
self["arrowdown"] = MovingPixmap()
self["arrowup"] = MovingPixmap()
self["rc"] = MovingPixmap()
self["arrowdown"] = MovingPixmap()
self["arrowup"] = MovingPixmap()