X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmovie-list-window.vala;h=6cc6addf726e4ab617b0ee7fd31753c75c2abdb8;hb=db58340a7fc45ea299263835be40bffa7bb5303f;hp=958a2066d0d2c62fa34ff54d7892dbe046999ef4;hpb=7d9cdb818f4024c08f619be7f40d5b1087551c86;p=cinaest

diff --git a/src/movie-list-window.vala b/src/movie-list-window.vala
index 958a206..6cc6add 100644
--- a/src/movie-list-window.vala
+++ b/src/movie-list-window.vala
@@ -33,9 +33,12 @@ public class MovieListWindow : StackableWindow {
 	private MovieWindow movie_window;
 	private Alignment alignment;
 	private int count;
+	private MovieSource source;
+	private bool portrait_mode;
 
-	public MovieListWindow (MovieSource source) {
-		set_title (source.get_description ());
+	public MovieListWindow (MovieSource source_) {
+		source = source_;
+		set_title (source.get_name ());
 
 		// View menu
 		menu = new MovieListMenu (this);
@@ -66,7 +69,7 @@ public class MovieListWindow : StackableWindow {
 
 		// Movie list - connected to menu for sorting
 		movie_list = new MovieListView (this, source.get_name () == _("Watched movies"));
-		menu.sortable = movie_list.sorted_store;
+		menu.store = movie_list.store;
 		store = movie_list.store;
 		store.source = source;
 
@@ -82,8 +85,11 @@ public class MovieListWindow : StackableWindow {
 
 		alignment = new Alignment (0.0f, 0.0f, 1.0f, 1.0f);
 		alignment.top_padding = MARGIN_HALF;
-		alignment.left_padding = MARGIN_DOUBLE;
-		alignment.right_padding = MARGIN_DOUBLE;
+
+		// Reduced padding in portrait mode to fit 3 posters in width
+		int padding = portrait_mode ? MARGIN_DEFAULT : MARGIN_DOUBLE;
+		alignment.left_padding = padding;
+		alignment.right_padding = padding;
 
 		alignment.add (vbox);
 		add (alignment);
@@ -92,7 +98,7 @@ 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);
@@ -101,6 +107,7 @@ public class MovieListWindow : StackableWindow {
 		movie_list.movie_activated.connect (on_movie_activated);
 		store.row_deleted.connect (on_row_deleted);
 		store.row_inserted.connect (on_row_inserted);
+		Gdk.Screen.get_default ().size_changed.connect (on_orientation_changed);
 		store.search_finished.connect (on_search_finished);
 
 		store.notify["update-running"].connect (on_update_running_changed);
@@ -116,7 +123,7 @@ public class MovieListWindow : StackableWindow {
 		filter = new MovieFilter ();
 		menu.filter = filter;
 		filter.title = "";
-		if (SourceFlags.ONLINE in source.get_flags ()) {
+		if (SourceFlags.NOEMPTY in source.get_flags ()) {
 			no_movies.hide ();
 			search_bar_visible = true;
 			search_bar.show ();
@@ -130,18 +137,41 @@ 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_name ());
+			set_markup (markup.str);
+		} else {
+			set_markup (source.get_name ());
+		}
+
+		start_search ();
+	}
+
 	public void on_delete_movies_clicked () {
 		fullscreen ();
 		edit_toolbar.show ();
 		movie_list.set_hildon_ui_mode (UIMode.EDIT);
 
-		var selection = movie_list.get_selection ();
-		selection.unselect_all ();
+		movie_list.unselect_all ();
 	}
 
 	private void on_delete_button_clicked () {
-		var selection = movie_list.get_selection ();
-		int count = selection.count_selected_rows ();
+		var movies = movie_list.get_selected_movies ();
+		int count = (int) movies.length ();
 		if (count == 0) {
 			Banner.show_information (this, null, _("No movies selected"));
 			leave_edit_mode ();
@@ -152,25 +182,7 @@ public class MovieListWindow : StackableWindow {
 		var res = dialog.run ();
 
 		if (res == Gtk.ResponseType.OK) {
-			weak TreeModel model;
-			var rows = selection.get_selected_rows (out model);
-
-			var movies = new List<Movie> ();
-
-			// get selected movies from the store
-			foreach (TreePath path in rows) {
-				TreeIter iter;
-
-				if (model.get_iter (out iter, path)) {
-					Movie movie;
-
-					model.get (iter, MovieListStore.Columns.MOVIE, out movie);
-					if (movie != null) {
-						movies.append (movie);
-					}
-				}
-			}
-			// and remove them
+			// Remove selected movies
 			foreach (Movie movie in movies) {
 				store.remove (movie);
 			}
@@ -229,11 +241,39 @@ public class MovieListWindow : StackableWindow {
 		return false;
 	}
 
+	private void on_orientation_changed (Gdk.Screen screen) {
+		if (CinaestProgram.orientation.portrait == portrait_mode)
+			return;
+
+		portrait_mode = CinaestProgram.orientation.portrait;
+
+		// Reduced padding in portrait mode to fit 3 posters in width
+		int padding = portrait_mode ? MARGIN_DEFAULT : MARGIN_DOUBLE;
+		alignment.left_padding = padding;
+
+		// Make space for the pannable area's scroll position indicator
+		if (count > movies_per_screen ())
+			padding -= MARGIN_DEFAULT;
+		alignment.right_padding = padding;
+	}
+
 	private void on_search_finished (int movies) {
-		if (movies > 6)
-			alignment.right_padding = MARGIN_DEFAULT;
-		else
-			alignment.right_padding = MARGIN_DOUBLE;
+		int padding = portrait_mode ? MARGIN_DEFAULT : MARGIN_DOUBLE;
+
+		// Make space for the pannable area's scroll position indicator
+		if (count > movies_per_screen ())
+			padding -= MARGIN_DEFAULT;
+		alignment.right_padding = padding;
+	}
+
+	private int movies_per_screen () {
+		if (portrait_mode) {
+			// 3x3 full posters or 10 full list items
+			return movie_list.poster_mode ? 9 : 10;
+		} else {
+			// 5x2 posters or 6 list items
+			return movie_list.poster_mode ? 10 : 6;
+		}
 	}
 
 	private void on_movie_activated (Movie movie) {
@@ -269,5 +309,9 @@ public class MovieListWindow : StackableWindow {
 			no_movies.show ();
 		}
 	}
+
+	public unowned MovieListView get_movie_list_view () {
+		return movie_list;
+	}
 }