use choicebox instead of own menu

diff --git a/orfat/src/ORFIPTV.py b/orfat/src/ORFIPTV.py
index 92116ad..11577d0 100644 (file)
--- a/orfat/src/ORFIPTV.py
+++ b/orfat/src/ORFIPTV.py
@@ -5,10 +5,10 @@
 from Components.ActionMap import ActionMap
 from Components.Pixmap import MovingPixmap
 from enigma import ePoint, eSize
-from Plugins.Extensions.VlcPlayer.VlcServerConfig import vlcServerConfig\r
+from Plugins.Extensions.VlcPlayer.VlcServerConfig import vlcServerConfig
+from Screens.ChoiceBox import ChoiceBox\r
 from Screens.MessageBox import MessageBox\r
-from Screens.Screen import Screen
-from SimpleMenu import SimpleMenu\r
+from Screens.Screen import Screen\r
 from Tools.Directories import fileExists\r
 from Tools.LoadPixmap import LoadPixmap\r
 from twisted.web.client import downloadPage, getPage
@@ -56,12 +56,12 @@ class ORFMain(Screen):
                                else:
                                        list = []
                                        for x in serverList:
-                                               list.append([x.getName(), x])
-                                       self.session.openWithCallback(self.serverChosen, SimpleMenu, list)
+                                               list.append((x.getName(), x))
+                                       self.session.openWithCallback(self.serverChosen, ChoiceBox, title="Waehle den vlc-Server...", list=list)
 
        def serverChosen(self, server):
                if server is not None:
-                       server.play(self.session, self.movies[self.selectedEntry], "ORF.at IPTV")
+                       server[1].play(self.session, self.movies[self.selectedEntry], "ORF.at IPTV")
 \r
        def downloadList(self):
                self.working = True\r

diff --git a/orfat/src/ORFonDemand.py b/orfat/src/ORFonDemand.py
index 22a45b4..06909a9 100644 (file)
--- a/orfat/src/ORFonDemand.py
+++ b/orfat/src/ORFonDemand.py
@@ -2,10 +2,10 @@
 # ORF.at onDemand streaming module by AliAbdul\r
 from Components.ActionMap import ActionMap\r
 from Components.MenuList import MenuList
-from Plugins.Extensions.VlcPlayer.VlcServerConfig import vlcServerConfig\r
+from Plugins.Extensions.VlcPlayer.VlcServerConfig import vlcServerConfig
+from Screens.ChoiceBox import ChoiceBox\r
 from Screens.Screen import Screen\r
-from Screens.MessageBox import MessageBox
-from SimpleMenu import SimpleMenu\r
+from Screens.MessageBox import MessageBox\r
 from Tools.Directories import fileExists\r
 from twisted.web.client import getPage\r
 \r
@@ -96,12 +96,12 @@ class ORFSub(Screen):
                        else:
                                list = []
                                for x in serverList:
-                                       list.append([x.getName(), x])
-                               self.session.openWithCallback(self.serverChosen, SimpleMenu, list)
+                                       list.append((x.getName(), x))
+                               self.session.openWithCallback(self.serverChosen, ChoiceBox, title="Waehle den vlc-Server...", list=list)
 
        def serverChosen(self, server):
                if server is not None:
-                       server.play(self.session, self.urls[self["list"].getSelectedIndex()], self["list"].getCurrent())\r
+                       server[1].play(self.session, self.urls[self["list"].getSelectedIndex()], self["list"].getCurrent())\r
 \r
        def downloadList(self):\r
                getPage(self.url).addCallback(self.downloadListCallback).addErrback(self.downloadListError)\r

diff --git a/orfat/src/SimpleMenu.py b/orfat/src/SimpleMenu.py
deleted file mode 100644 (file)
index 1d4e116..0000000
--- a/orfat/src/SimpleMenu.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from Components.ActionMap import ActionMap\r
-from Components.MenuList import MenuList\r
-from Screens.Screen import Screen\r
-\r
-class SimpleMenu(Screen):\r
-       skin = """\r
-       <screen position="130,90" size="460,380" title="Select..." >\r
-               <widget name="list" position="1,1" size="458,378" transparent="1" scrollbarMode="showOnDemand" />\r
-       </screen>"""\r
-\r
-       def __init__(self, session, list):\r
-               Screen.__init__(self, session)\r
-               \r
-               self.list = []\r
-               self.completeList = list\r
-               \r
-               for x in list:\r
-                       self.list.append(x[0])\r
-               \r
-               self["list"] = MenuList(self.list)\r
-               \r
-               self["actions"] = ActionMap(["OkCancelActions"], {"cancel": self.exit, "ok": self.okClicked}, -1)\r
-\r
-       def exit(self):\r
-               self.close(None)\r
-\r
-       def okClicked(self):\r
-               selected = self["list"].l.getCurrentSelection()\r
-               if selected is not None:\r
-                       for x in self.completeList:\r
-                               if x[0] == selected:\r
-                                       self.close(x[1])\r