X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmovie-list-window.vala;h=acc9bce375aeb87ad923e31decd38829fc87e2f7;hb=a0bcf1e4d6b7f4cbba2cd7d16be74c5499194f01;hp=be461bd6ef7fe7d5c11517865c8e2de61d388c6f;hpb=2235c609e140ab57036c62172569816ea824b153;p=cinaest

diff --git a/src/movie-list-window.vala b/src/movie-list-window.vala
index be461bd..acc9bce 100644
--- a/src/movie-list-window.vala
+++ b/src/movie-list-window.vala
@@ -32,8 +32,11 @@ public class MovieListWindow : StackableWindow {
 	private bool search_bar_visible;
 	private MovieWindow movie_window;
 	private Alignment alignment;
+	private int count;
+	private MovieSource source;
 
-	public MovieListWindow (MovieSource source) {
+	public MovieListWindow (MovieSource source_) {
+		source = source_;
 		set_title (source.get_description ());
 
 		// View menu
@@ -59,12 +62,13 @@ public class MovieListWindow : StackableWindow {
 		search_bar = new Toolbar ();
 		search_bar.insert (search_field_item, 0);
 		search_bar.insert (close_button, 1);
+		search_bar.show_all ();
 
 		add_toolbar (search_bar);
 
 		// Movie list - connected to menu for sorting
-		movie_list = new MovieListView ();
-		menu.sortable = movie_list.sorted_store;
+		movie_list = new MovieListView (this, source.get_name () == _("Watched movies"));
+		menu.sortable = movie_list.store;
 		store = movie_list.store;
 		store.source = source;
 
@@ -90,13 +94,15 @@ public class MovieListWindow : StackableWindow {
 		set_edit_toolbar (edit_toolbar);
 
 		// Connect signals
-		menu.filter_changed.connect (() => { start_search (); });
+		menu.filter_changed.connect (on_filter_changed);
 		edit_toolbar.button_clicked.connect (on_delete_button_clicked);
 		edit_toolbar.arrow_clicked.connect (leave_edit_mode); 
 		search_field.changed.connect (on_search_field_changed);
 		close_button.clicked.connect (on_close_button_clicked);
 		key_press_event.connect (on_key_press_event);
 		movie_list.movie_activated.connect (on_movie_activated);
+		store.row_deleted.connect (on_row_deleted);
+		store.row_inserted.connect (on_row_inserted);
 		store.search_finished.connect (on_search_finished);
 
 		store.notify["update-running"].connect (on_update_running_changed);
@@ -104,7 +110,7 @@ public class MovieListWindow : StackableWindow {
 		search_field.set_flags (WidgetFlags.CAN_DEFAULT);
 		search_field.grab_default ();
 
-		show_all ();
+		alignment.show_all ();
 		edit_toolbar.hide ();
 		search_bar_visible = false;
 		search_bar.hide ();
@@ -112,6 +118,13 @@ public class MovieListWindow : StackableWindow {
 		filter = new MovieFilter ();
 		menu.filter = filter;
 		filter.title = "";
+		if (SourceFlags.ONLINE in source.get_flags ()) {
+			no_movies.hide ();
+			search_bar_visible = true;
+			search_bar.show ();
+			search_field.grab_focus ();
+			return;
+		}
 		if (store.start_search (filter)) {
 			no_movies.hide ();
 		} else {
@@ -119,6 +132,30 @@ public class MovieListWindow : StackableWindow {
 		}
 	}
 
+	private void on_filter_changed () {
+		var markup = new StringBuilder ();
+		if (filter.year_min != 0 || filter.year_max != 0)
+			markup.append (_(" - years"));
+		if (filter.rating_min != 0)
+			markup.append (_(" - rating"));
+		if (filter.genres.field != 0)
+			markup.append (_(" - genres"));
+		if (markup.str.length > 0) {
+			Gdk.Color color;
+			this.ensure_style ();
+			if (this.style.lookup_color ("ActiveTextColor", out color)) {
+				markup.prepend ("<span fgcolor=\"%s\">".printf (color.to_string ()));
+				markup.append ("</span>");
+			}
+			markup.prepend (source.get_description ());
+			set_markup (markup.str);
+		} else {
+			set_markup (source.get_description ());
+		}
+
+		start_search ();
+	}
+
 	public void on_delete_movies_clicked () {
 		fullscreen ();
 		edit_toolbar.show ();
@@ -223,9 +260,6 @@ public class MovieListWindow : StackableWindow {
 			alignment.right_padding = MARGIN_DEFAULT;
 		else
 			alignment.right_padding = MARGIN_DOUBLE;
-		if (movies > 100) {
-			Banner.show_information (this, null, _("More results available - refine search to reduce the dataset"));
-		}
 	}
 
 	private void on_movie_activated (Movie movie) {
@@ -237,6 +271,20 @@ public class MovieListWindow : StackableWindow {
 		movie_window.show ();
 	}
 
+	private void on_row_deleted (TreePath path) {
+		if (--count == 0) {
+			no_movies.show ();
+			movie_list.hide ();
+		}
+	}
+
+	private void on_row_inserted (TreePath path, TreeIter iter) {
+		if (count++ == 0) {
+			no_movies.hide ();
+			movie_list.show ();
+		}
+	}
+
 	private void on_update_running_changed (GLib.Object source, ParamSpec spec) {
 		TreeIter iter;