just recalc length of visible entries in movie selection

[enigma2.git] / lib / python / Screens / MovieSelection.py

diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py
index a2763c3ab8de3066ca5b4e1f0458de5011615138..ab36adda36e7e734678fd688a8b0369fe4410124 100644 (file)
--- a/lib/python/Screens/MovieSelection.py
+++ b/lib/python/Screens/MovieSelection.py
@@ -10,6 +10,7 @@ from Plugins.Plugin import PluginDescriptor
 
 from Screens.MessageBox import MessageBox
 from Screens.FixedMenu import FixedMenu
+from Screens.ChoiceBox import ChoiceBox
 
 from Tools.Directories import *
 from Tools.BoundFunction import boundFunction
@@ -103,15 +104,12 @@ class MovieSelection(Screen):
                                "contextMenu": self.doContext,
                                
                                "red": self.showAll,
-                               "yellow": self.showTagsFirst,
-                               "green": self.showTagsSecond,
+                               "green": self.showTagsFirst,
+                               "yellow": self.showTagsSecond,
                                "blue": self.showTagsMenu,
                        })
                self["actions"].csel = self
                self.onShown.append(self.go)
-               
-               self.lengthTimer = eTimer()
-               self.lengthTimer.timeout.get().append(self.updateLengthData)
                self.inited = False
 
        def showEventInformation(self):
@@ -138,12 +136,6 @@ class MovieSelection(Screen):
 
                self.updateTags()
 
-       def updateLengthData(self):
-               self.list.updateLengthOfIndex(self.lengthPosition)
-               self.lengthPosition += 1
-               if self.lengthPosition < self.lengthLength:
-                       self.lengthTimer.start(10, 1)
-
        def moveTo(self):
                self["list"].moveTo(self.selectedmovie)
 
@@ -151,7 +143,6 @@ class MovieSelection(Screen):
                return self["list"].getCurrent()
 
        def movieSelected(self):
-               self.lengthTimer.stop()
                current = self.getCurrent()
                if current is not None:
                        self.close(current)
@@ -164,6 +155,10 @@ class MovieSelection(Screen):
        def abort(self):
                self.close(None)
 
+       def getTagDescription(self, tag):
+               # TODO: access the tag database
+               return tag
+
        def updateTags(self):
                # get a list of tags available in this list
                self.tags = list(self["list"].tags)
@@ -175,10 +170,10 @@ class MovieSelection(Screen):
                # when tags are present, however, the first two are 
                # directly mapped to the second, third ("green", "yellow") buttons
                if len(self.tags) > 0:
-                       self.tag_first = self.tags[0]
+                       self.tag_first = self.getTagDescription(self.tags[0])
                
                if len(self.tags) > 1:
-                       self.tag_second = self.tags[1]
+                       self.tag_second = self.getTagDescription(self.tags[1])
                
                self["key_green"].text = self.tag_first
                self["key_yellow"].text = self.tag_second
@@ -192,9 +187,10 @@ class MovieSelection(Screen):
 
        def reloadList(self):
                self["list"].reload(self.current_ref, self.selected_tags)
-               self.lengthTimer.start(10, 1)
-               self.lengthPosition = 0
-               self.lengthLength = len(self["list"])
+               title = _("Recorded files...")
+               if self.selected_tags is not None:
+                       title += " - " + ','.join(self.selected_tags)
+               self.setTitle(title)
 
        def showAll(self):
                self.selected_tags = None
@@ -204,6 +200,7 @@ class MovieSelection(Screen):
                if len(self.tags) < n:
                        self.showTagWarning()
                else:
+                       print "select tag #%d, %s, %s" % (n, self.tags[n - 1], ','.join(self.tags))
                        self.selected_tags = set([self.tags[n - 1]])
                        self.reloadList()
 
@@ -213,11 +210,18 @@ class MovieSelection(Screen):
        def showTagsSecond(self):
                self.showTagsN(2)
 
+       def tagChosen(self, tag):
+               if tag is not None:
+                       self.selected_tags = set([tag[0]])
+                       self.reloadList()
+
        def showTagsMenu(self):
                if len(self.tags) < 3:
                        self.showTagWarning()
                else:
-                       pass
+                       list = [(tag, self.getTagDescription(tag)) for tag in self.tags ]
+                       self.session.openWithCallback(self.tagChosen, ChoiceBox, title=_("Please select keyword to filter..."), list = list)
 
        def showTagWarning(self):
-               print "select some tags first!"
+               # TODO
+               self.session.open(MessageBox, _("You need to define some keywords first!\nPress the menu-key to define keywords.\nDo you want to define keywords now?"), MessageBox.TYPE_ERROR)