add ChoiceBox screen for asking simple multi choice questions

diff --git a/data/skin.xml b/data/skin.xml
index 6898563..c309aee 100644 (file)
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -341,10 +341,14 @@
                        <widget name="scan_state" position="10,65" size="280,60" font="Regular;20" />
                        <widget name="servicelist" position="10,135" size="280,175" selectionDisabled="1" />
                </screen>
                        <widget name="scan_state" position="10,65" size="280,60" font="Regular;20" />
                        <widget name="servicelist" position="10,135" size="280,175" selectionDisabled="1" />
                </screen>

-               <screen name="InputBox" position="100,100" size="550,400" title="Input" >
+               <screen name="InputBox" position="100,100" size="550,60" title="Input" >

                        <widget name="text" position="0,0" size="550,25" font="Regular;20" />
                        <widget name="input" position="0,30" size="550,25" font="Regular;20" />
                        <widget name="text" position="0,0" size="550,25" font="Regular;20" />
                        <widget name="input" position="0,30" size="550,25" font="Regular;20" />

-               </screen>"""
+               </screen>
+               <screen name="ChoiceBox" position="100,100" size="550,400" title="Input" >
+                       <widget name="text" position="0,0" size="550,25" font="Regular;20" />
+                       <widget name="list" position="0,30" size="550,335" />
+               </screen>

                <screen name="TimerEdit" position="70,100" size="590,335" title="Timer Edit">
                        <widget name="description" position="10,10" size="580,40" font="Regular;25" />
                        <widget name="lbegin" position="405,102" size="103,30" font="Regular;25" foregroundColor="red" />
                <screen name="TimerEdit" position="70,100" size="590,335" title="Timer Edit">
                        <widget name="description" position="10,10" size="580,40" font="Regular;25" />
                        <widget name="lbegin" position="405,102" size="103,30" font="Regular;25" foregroundColor="red" />

diff --git a/lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py b/lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py
index 856c2f3..d4d24f3 100644 (file)
--- a/lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py
+++ b/lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py
@@ -7,7 +7,7 @@ from Components.Input import Input
 from Components.GUIComponent import *
 from Components.Pixmap import Pixmap
 from Components.FileList import FileEntryComponent, FileList
 from Components.GUIComponent import *
 from Components.Pixmap import Pixmap
 from Components.FileList import FileEntryComponent, FileList

-from Screens.InputBox import InputBox
+from Screens.ChoiceBox import ChoiceBox

 from Plugins.Plugin import PluginDescriptor
 
 import os
 from Plugins.Plugin import PluginDescriptor
 
 import os


@@ -69,7 +69,7 @@ class Test(Screen):
                self["text"].number(number)
 
 def main(session):
                self["text"].number(number)
 
 def main(session):

-       session.openWithCallback(test, InputBox, title="Hallo", text="1234", maxSize=True, type=Input.NUMBER)
+       session.openWithCallback(test, ChoiceBox, title="Hallo", list=[(_("yes"), "yes"), (_("no"), "no")])

        
 def test(returnValue):
        print "You entered", returnValue
        
 def test(returnValue):
        print "You entered", returnValue

diff --git a/lib/python/Screens/ChoiceBox.py b/lib/python/Screens/ChoiceBox.py
new file mode 100644 (file)
index 0000000..533e78d
--- /dev/null
+++ b/lib/python/Screens/ChoiceBox.py
@@ -0,0 +1,49 @@
+from enigma import *
+from Screens.Screen import Screen
+from Screens.MessageBox import MessageBox
+from Components.ActionMap import NumberActionMap
+from Components.Label import Label
+from Components.MenuList import MenuList
+from Components.GUIComponent import *
+
+import os
+
+class ChoiceBox(Screen):
+       def __init__(self, session, title = "", **kwargs):
+               Screen.__init__(self, session)
+
+               self["text"] = Label(title)
+               self["list"] = MenuList(**kwargs)
+                               
+               self["actions"] = NumberActionMap(["WizardActions", "InputActions"], 
+               {
+                       "ok": self.go,
+                       "back": self.close,
+                       "1": self.keyNumberGlobal,
+                       "2": self.keyNumberGlobal,
+                       "3": self.keyNumberGlobal,
+                       "4": self.keyNumberGlobal,
+                       "5": self.keyNumberGlobal,
+                       "6": self.keyNumberGlobal,
+                       "7": self.keyNumberGlobal,
+                       "8": self.keyNumberGlobal,
+                       "9": self.keyNumberGlobal,
+                       "0": self.keyNumberGlobal
+               }, -1)
+               
+       def keyLeft(self):
+               pass
+       
+       def keyRight(self):
+               pass
+       
+       def keyNumberGlobal(self, number):
+               print "pressed", number
+               #self["input"].number(number)
+               
+       def go(self):
+               self.close(self["list"].l.getCurrentSelection())
+               #self.close(self["input"].getText())
+               
+       def cancel(self):
+               self.close(None)
\ No newline at end of file

diff --git a/lib/python/Screens/Makefile.am b/lib/python/Screens/Makefile.am
index 63eecb1..47586fe 100644 (file)
--- a/lib/python/Screens/Makefile.am
+++ b/lib/python/Screens/Makefile.am
@@ -9,5 +9,5 @@ install_PYTHON = \
        AudioSelection.py InfoBarGenerics.py HelpMenu.py Wizard.py __init__.py \
        Dish.py SubserviceSelection.py LanguageSelection.py StartWizard.py \
        TutorialWizard.py PluginBrowser.py MinuteInput.py Scart.py PVRState.py \
        AudioSelection.py InfoBarGenerics.py HelpMenu.py Wizard.py __init__.py \
        Dish.py SubserviceSelection.py LanguageSelection.py StartWizard.py \
        TutorialWizard.py PluginBrowser.py MinuteInput.py Scart.py PVRState.py \

-       Console.py InputBox.py
+       Console.py InputBox.py ChoiceBox.py

 
 

diff --git a/lib/python/Screens/__init__.py b/lib/python/Screens/__init__.py
index d5323bb..82e4d83 100644 (file)
--- a/lib/python/Screens/__init__.py
+++ b/lib/python/Screens/__init__.py
@@ -5,4 +5,4 @@ __all__ = ["ChannelSelection", "ClockDisplay", "ConfigMenu",
        "Satconfig", "Scanconfig", "Ci.py", "Volume.py", "Mute.py",
        "EpgSelection", "EventView", "Standby", "ServiceInfo",
        "AudioSelection", "SubserviceSelection", "InfoBarGenerics", "HelpMenu", "Wizard",
        "Satconfig", "Scanconfig", "Ci.py", "Volume.py", "Mute.py",
        "EpgSelection", "EventView", "Standby", "ServiceInfo",
        "AudioSelection", "SubserviceSelection", "InfoBarGenerics", "HelpMenu", "Wizard",

-       "PVRState", "Console", "InputBox" ]
+       "PVRState", "Console", "InputBox", "ChoiceBox" ]