X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmovie-list-view.vala;h=30a5780235c9e1ab85cdc27e3b0be5afe60a803a;hb=73561c2b8d12a9b549b3114e8afa95c6c0635b39;hp=cc7cc33a67fc9bd5923eeaa33ae21a01266da22f;hpb=3f4c7ec27c1ac76b19a2f74c1526c996d7e87804;p=cinaest diff --git a/src/movie-list-view.vala b/src/movie-list-view.vala index cc7cc33..30a5780 100644 --- a/src/movie-list-view.vala +++ b/src/movie-list-view.vala @@ -24,9 +24,11 @@ public class MovieListView : PannableArea { TreeView tree; public TreeSortable sorted_store; + private bool more_movies_available; + public signal void movie_activated (Movie movie); - construct { + public MovieListView (Gtk.Window window) { store = new MovieListStore (); // Add filter wrapper @@ -58,6 +60,7 @@ public class MovieListView : PannableArea { // Add poster icon to column var pixbuf_renderer = new CellRendererPixbuf (); pixbuf_renderer.width = 64; + pixbuf_renderer.xalign = 0.0f; title_column.pack_start (pixbuf_renderer, false); title_column.add_attribute (pixbuf_renderer, "pixbuf", MovieListStore.Columns.POSTER); @@ -65,31 +68,29 @@ public class MovieListView : PannableArea { var vbox_renderer = new CellRendererVBox (); var renderer = new CellRendererText (); - renderer.set ("ellipsize", Pango.EllipsizeMode.END); - title_column.add_attribute (renderer, "text", MovieListStore.Columns.TITLE); + renderer.yalign = 1.0f; + renderer.ellipsize = Pango.EllipsizeMode.END; vbox_renderer.append (renderer, true); vbox_renderer.set_data ("title", renderer); // Add secondary text to column (Genres, Director, etc.) renderer = new CellRendererText (); - renderer.set ("ellipsize", Pango.EllipsizeMode.END); + renderer.yalign = 0; + renderer.ellipsize = Pango.EllipsizeMode.END; Pango.AttrList attr_list = new Pango.AttrList (); - var style = Gtk.rc_get_style_by_paths (this.get_settings (), "SmallSystemFont", null, typeof (void)); + var style = Gtk.rc_get_style_by_paths (Gtk.Settings.get_default (), "SmallSystemFont", null, typeof (void)); if (style != null) { - Pango.Attribute attr_font_desc = Pango.attr_font_desc_new (style.font_desc.copy ()); + var attr_font_desc = new Pango.AttrFontDesc (style.font_desc.copy ()); attr_list.insert ((owned) attr_font_desc); - } else { - Pango.Attribute attr_font_scale = Pango.attr_scale_new (Pango.Scale.SMALL); - attr_list.insert ((owned) attr_font_scale); } Gdk.Color color; - if (!style.lookup_color ("SecondaryTextColor", out color)) { - Gdk.Color.parse ("grey", out color); + window.ensure_style (); + if (window.style.lookup_color ("SecondaryTextColor", out color)) { + Pango.Attribute attr_color = Pango.attr_foreground_new (color.red, color.green, color.blue); + attr_list.insert ((owned) attr_color); } - Pango.Attribute attr_color = Pango.attr_foreground_new (color.red, color.green, color.blue); - attr_list.insert ((owned) attr_color); renderer.attributes = attr_list; vbox_renderer.append (renderer, true); @@ -105,31 +106,38 @@ public class MovieListView : PannableArea { // Year column renderer = new CellRendererText (); - var year_column = new TreeViewColumn.with_attributes (_("Year"), renderer, "text", MovieListStore.Columns.YEAR); + var year_column = new TreeViewColumn (); + year_column.set_title (_("Rating")); year_column.set_sort_column_id (MovieListStore.Columns.YEAR); year_column.set_reorderable (false); year_column.set_sort_order (SortType.DESCENDING); + year_column.pack_start (renderer, true); + year_column.set_cell_data_func (renderer, year_data_func); tree.append_column (year_column); // Rating column renderer = new CellRendererText (); - var rating_column = new TreeViewColumn.with_attributes (_("Rating"), renderer, "text", MovieListStore.Columns.RATING); + var rating_column = new TreeViewColumn (); + rating_column.set_title (_("Rating")); rating_column.set_sort_column_id (MovieListStore.Columns.RATING); rating_column.set_reorderable (false); rating_column.set_sort_order (SortType.DESCENDING); + rating_column.pack_start (renderer, true); rating_column.set_cell_data_func (renderer, rating_data_func); rating_column.xalign = (float) 1.0; tree.append_column (rating_column); // Connect signals + get_vadjustment ().value_changed.connect (on_adjustment_value_changed); tree.row_activated.connect (on_row_activated); + store.search_finished.connect (on_search_finished); } public void set_hildon_ui_mode (UIMode mode) { var selection = tree.get_selection (); if (mode == UIMode.NORMAL) { - selection.set_mode (SelectionMode.SINGLE); + selection.set_mode (SelectionMode.NONE); } Hildon.gtk_tree_view_set_ui_mode (tree, mode); if (mode == UIMode.EDIT) { @@ -141,8 +149,19 @@ public class MovieListView : PannableArea { return tree.get_selection (); } - private void on_row_activated (TreeView tree, TreePath path_, TreeViewColumn column) { - TreePath path = path_.copy (); // FIXME - calling model.get_iter with path_ directly causes a C qualifier warning + // TODO: after scrolling down 80% of the list, load more + // results if available. + private void on_adjustment_value_changed () { + if (more_movies_available) { + var vadj = get_vadjustment (); + if (vadj.value > 0.8 * vadj.upper) { + Banner.show_information (this, null, _("More results available - refine search to reduce the dataset")); + more_movies_available = false; + } + } + } + + private void on_row_activated (TreeView tree, TreePath path, TreeViewColumn column) { TreeModel model = tree.model; TreeIter iter; @@ -153,23 +172,34 @@ public class MovieListView : PannableArea { } } + private void on_search_finished (int movies) { + more_movies_available = (movies > 100); // FIXME + } + private void vbox_data_func (CellLayout cell_layout, CellRenderer cell, TreeModel model, TreeIter iter) { Movie movie; CellRendererText renderer; model.get (iter, MovieListStore.Columns.MOVIE, out movie); - renderer = (CellRendererText) cell.get_data ("title"); + renderer = cell.get_data ("title"); renderer.text = movie.title; - renderer = (CellRendererText) cell.get_data ("secondary"); + renderer = cell.get_data ("secondary"); renderer.text = movie.secondary; } + private void year_data_func (CellLayout cell_layout, CellRenderer cell, TreeModel model, TreeIter iter) { + int year; + + model.get (iter, MovieListStore.Columns.YEAR, out year); + ((CellRendererText) cell).text = (year > 0) ? year.to_string () : ""; + } + private void rating_data_func (CellLayout cell_layout, CellRenderer cell, TreeModel model, TreeIter iter) { int rating; model.get (iter, MovieListStore.Columns.RATING, out rating); - ((CellRendererText) cell).text = "%d.%d".printf (rating / 10, rating % 10); + ((CellRendererText) cell).text = (rating > 0) ? "%d.%d".printf (rating / 10, rating % 10) : ""; } }