Movie list window: optionally open with initial title and year filter

[cinaest] / src / movie-list-window.vala

diff --git a/src/movie-list-window.vala b/src/movie-list-window.vala
index 1661859..07914e5 100644 (file)
--- a/src/movie-list-window.vala
+++ b/src/movie-list-window.vala
@@ -35,11 +35,14 @@ public class MovieListWindow : StackableWindow {
        private int count;
        private MovieSource source;
        private bool portrait_mode;
+       private bool auto_open_movie_window;
 
-       public MovieListWindow (MovieSource source_) {
+       public MovieListWindow (MovieSource source_, string? title = null, int year = 0) {
                source = source_;
                set_title (source.get_name ());
 
+               auto_open_movie_window = (title != null);
+
                // View menu
                menu = new MovieListMenu (this);
                menu.source = source;
@@ -69,7 +72,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.store;
+               menu.store = movie_list.store;
                store = movie_list.store;
                store.source = source;
 
@@ -122,7 +125,11 @@ public class MovieListWindow : StackableWindow {
 
                filter = new MovieFilter ();
                menu.filter = filter;
-               filter.title = "";
+               filter.title = (title != null) ? title : "";
+               if (year != 0) {
+                       filter.year_min = year;
+                       filter.year_max = year;
+               }
                if (SourceFlags.NOEMPTY in source.get_flags ()) {
                        no_movies.hide ();
                        search_bar_visible = true;
@@ -178,7 +185,10 @@ public class MovieListWindow : StackableWindow {
                        return;
                }
 
-               var dialog = new Note.confirmation (this, _("Delete %d movies?").printf (count));
+               var dialog = new Note.confirmation (this, 
+                                                   ngettext ("Delete %d movie?",
+                                                             "Delete %d movies?",
+                                                             count).printf (count));
                var res = dialog.run ();
 
                if (res == Gtk.ResponseType.OK) {
@@ -264,15 +274,30 @@ public class MovieListWindow : StackableWindow {
                if (count > movies_per_screen ())
                        padding -= MARGIN_DEFAULT;
                alignment.right_padding = padding;
+
+               if (count == 1 && auto_open_movie_window) {
+                       TreeIter iter;
+                       if (store.get_iter_first (out iter)) {
+                               Movie movie;
+                               store.get (iter, MovieListStore.Columns.MOVIE, out movie);
+                               on_movie_activated (movie);
+                       }
+               }
        }
 
        private int movies_per_screen () {
                if (portrait_mode) {
-                       // 3x3 full posters or 10 full list items
-                       return movie_list.poster_mode ? 9 : 10;
+                       // 3x3 full posters or 10 full list items,
+                       // 10 full list items in list mode without search bar
+                       return (search_bar_visible || movie_list.poster_mode) ? 9 : 10;
                } else {
-                       // 5x2 posters or 6 list items
-                       return movie_list.poster_mode ? 10 : 6;
+                       if (search_bar_visible) {
+                               // 5x1 full posters or 5 list items
+                               return 5;
+                       } else {
+                               // 5x2 posters or 6 list items
+                               return movie_list.poster_mode ? 10 : 6;
+                       }
                }
        }
 
@@ -282,7 +307,7 @@ public class MovieListWindow : StackableWindow {
 
                movie_window = new MovieWindow.with_movie (movie, store);
                movie_window.destroy.connect (() => { movie_window = null; });
-               movie_window.show ();
+               get_stack ().push_1 (movie_window);
        }
 
        private void on_row_deleted (TreePath path) {