ui: Completed basic search functionality

[maevies] / ui / maeviesui / maeviesui / gui.py

diff --git a/ui/maeviesui/maeviesui/gui.py b/ui/maeviesui/maeviesui/gui.py
index 925a110..f7781de 100644 (file)
--- a/ui/maeviesui/maeviesui/gui.py
+++ b/ui/maeviesui/maeviesui/gui.py
@@ -160,43 +160,40 @@ class ResultsWindow(hildon.StackableWindow):
         super(ResultsWindow, self).__init__()
         self.set_title("Search results")
 
-        self.search_term = search_term
-        self.search_category = search_category
+        self.add(self._create_contents())
 
-        self.moviemanager = MovieManager(self._populate_view)
+        self.moviemanager = MovieManager(response_received_cb = self._response_received_cb)
+        self._start_search(search_term, search_category)
+        self.show_all()
 
+    def _create_contents(self):
         content_area = hildon.PannableArea()
         self._movies_view = MoviesView()
         self._movies_view.connect('row-activated', self._row_activated_cb)
 
         content_area.add(self._movies_view)
-        self.add(content_area)
-
-        self._start_search()
-        self.show_all()
+        return content_area
 
     def _row_activated_cb(self, view, path, column):
-        #movie = view.get_movie_from_path(path)
-        MovieWindow(None)
+        movie = view.get_movie_from_path(path)
+        MovieWindow(movie)
 
-    def _start_search(self):
-        self._show_banner()
+    def _start_search(self, search_term, search_category):
+        self._show_banner(search_term, search_category)
         hildon.hildon_gtk_window_set_progress_indicator(self, True)
-        self.moviemanager.query(self.search_term)
+        self.moviemanager.query(search_term)
 
-    def _populate_view(self, movies):
+    def _response_received_cb(self, movies):
         self._movies_view.add_movies(movies)
         hildon.hildon_gtk_window_set_progress_indicator(self, False)
-        return False
 
-    def _show_banner(self):
-        message = "Searching <i>%(category)s</i> for <i>%(term)s</i>" % {'category': self.search_category,
-                                                                         'term' : self.search_term}
+    def _show_banner(self, search_term, search_category):
+        message = "Searching <i>%(category)s</i> for <i>%(term)s</i>" % {'category': search_category,
+                                                                         'term' : search_term}
         banner = hildon.hildon_banner_show_information_with_markup(self,
                                                                    "ignored",
                                                                    message)
         banner.set_timeout(constants.TIMEOUT_TIME_MILLIS)
-        pass
 
 class MoviesView(gtk.TreeView):
 
@@ -220,6 +217,10 @@ class MoviesView(gtk.TreeView):
         model = self.get_model()
         model.add(movie_list)
 
+    def get_movie_from_path(self, path):
+        model = self.get_model()
+        return model[path][model.MOVIE_COLUMN]
+
 class MoviesListStore(gtk.ListStore):
 
     IMAGE_COLUMN = 0
@@ -246,20 +247,17 @@ class AboutDialog(gtk.Dialog):
         super(AboutDialog, self).__init__(parent = parent,
                                           flags = gtk.DIALOG_DESTROY_WITH_PARENT)
         self.set_title("About Maevies")
+
         self.show_all()
 
 class MovieWindow(hildon.StackableWindow):
 
-    _zombieland = {'Title' : "Zombieland", 'Release date' : "27 November 2009",
-                   'Genre' : "Action | Adventure | Comedy", 'Score' : "7.8",
-                   'Popularity' : "down 4%", 'Overview' : constants.LOREM_IPSUM}
-
     def _create_contents(self, movie):
         main_area = hildon.PannableArea()
 
         main_box = gtk.VBox(False, 20)
         main_box.set_border_width(20)
-        upper_content = gtk.HBox(False, 20)
+        upper_content = gtk.HBox(False, 40)
         upper_content.set_border_width(20)
 
         image = gtk.Image()
@@ -267,30 +265,38 @@ class MovieWindow(hildon.StackableWindow):
 
         side_content = gtk.VBox(False, 30)
 
-        for key in ["Title", "Release date", "Genre", "Score", "Popularity"]:
+        for key in movie.fields:
             label = gtk.Label()
             label.set_markup("<b>%(field)s:</b> <small>%(value)s</small>" % {'field' : key,
-                                                                             'value' : movie[key]})
+                                                                             'value' : movie.get_value(key)})
             label.set_alignment(constants.LEFT_ALIGNMENT, constants.CENTER_ALIGNMENT)
             side_content.pack_start(label, False, False)
 
         upper_content.pack_start(image, False, False)
-        upper_content.pack_start(side_content, True, True)
+        upper_content.pack_start(side_content, False, False)
+
+        movie_overview = hildon.TextView()
+        movie_overview.set_placeholder("Overview")
+        movie_overview.set_wrap_mode(gtk.WRAP_WORD)
+        movie_overview.get_buffer().set_text(movie.get_overview())
 
         label = gtk.Label()
-        label.set_markup("<b>%(field)s:</b>\n %(value)s" % {'field' : 'Overview',
-                                                            'value' : movie['Overview']})
+        label.set_markup("<b>Overview:</b>")
         label.set_alignment(constants.LEFT_ALIGNMENT, constants.CENTER_ALIGNMENT)
 
         main_box.pack_start(upper_content, False, False)
         main_box.pack_start(label, False, False)
+        main_box.pack_start(movie_overview, False, False)
 
         main_area.add_with_viewport(main_box)
+        main_area.set_size_request_policy(hildon.SIZE_REQUEST_CHILDREN)
+
         return main_area
 
     def __init__(self, movie):
         super(MovieWindow, self).__init__()
-        self.add(self._create_contents(self._zombieland))
+        self.set_title("Movie info")
+        self.add(self._create_contents(movie))
         self.show_all()
 
 if __name__ == "__main__":