Movie list menu: improve value display of the year filter picker button

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

diff --git a/src/movie-list-menu.vala b/src/movie-list-menu.vala
index 3e16769..4bb8727 100644 (file)
--- a/src/movie-list-menu.vala
+++ b/src/movie-list-menu.vala
@@ -26,7 +26,6 @@ public class MovieListMenu : AppMenu {
        private Hildon.Button filter_year;
        private Hildon.Button filter_rating;
        private Hildon.Button filter_genres;
-       private Hildon.Button select_source;
        private Gtk.Button delete_movies;
 
        public signal void filter_changed ();
@@ -71,27 +70,23 @@ public class MovieListMenu : AppMenu {
                filter_year = new Hildon.Button.with_text (SizeType.FINGER_HEIGHT, ButtonArrangement.VERTICAL, _("Filter by year"), _("Off"));
                filter_rating = new Hildon.Button.with_text (SizeType.FINGER_HEIGHT, ButtonArrangement.VERTICAL, _("Filter by rating"), _("Off"));
                filter_genres = new Hildon.Button.with_text (SizeType.FINGER_HEIGHT, ButtonArrangement.VERTICAL, _("Filter by genres"), _("Off"));
-               select_source = new Hildon.Button.with_text (SizeType.FINGER_HEIGHT, ButtonArrangement.VERTICAL, _("Source"), _("None"));
                delete_movies = new Gtk.Button.with_label (_("Delete movies"));
                var settings = new Gtk.Button.with_label (_("Settings"));
 
                filter_year.set_style (ButtonStyle.PICKER);
                filter_rating.set_style (ButtonStyle.PICKER);
                filter_genres.set_style (ButtonStyle.PICKER);
-               select_source.set_style (ButtonStyle.PICKER);
 
                // Connect signals
                filter_year.clicked.connect (on_filter_year_clicked);
                filter_rating.clicked.connect (on_filter_rating_clicked);
                filter_genres.clicked.connect (on_filter_genres_clicked);
-               select_source.clicked.connect (on_select_source_clicked);
                delete_movies.clicked.connect (() => { movie_list_window.on_delete_movies_clicked (); });
                settings.clicked.connect (on_settings_clicked);
 
                append (filter_year);
                append (filter_rating);
                append (filter_genres);
-               append (select_source);
                append (delete_movies);
                append (settings);
 
@@ -100,7 +95,6 @@ public class MovieListMenu : AppMenu {
 
        public MovieSource source {
                set {
-                       select_source.value = value.get_name ();
                        if (value.get_editable ()) {
                                delete_movies.show ();
                        } else {
@@ -133,6 +127,7 @@ public class MovieListMenu : AppMenu {
                } else {
                        selector.set_active (1, 127);
                }
+               selector.center_on_selected ();
                dialog.set_selector (selector);
 
                var res = dialog.run ();
@@ -150,6 +145,8 @@ public class MovieListMenu : AppMenu {
                                filter_year.set_value (_("Until %d").printf (filter.year_max));
                        else if (filter.year_max == 0)
                                filter_year.set_value (_("Since %d").printf (filter.year_min));
+                       else if (filter.year_min == filter.year_max)
+                               filter_year.set_value ("%d".printf (filter.year_min));
                        else
                                filter_year.set_value ("%d - %d".printf (filter.year_min, filter.year_max));
 
@@ -200,17 +197,6 @@ public class MovieListMenu : AppMenu {
                }
        }
 
-       public void on_select_source_clicked (Gtk.Button button) {
-               Hildon.Button select_source = (Hildon.Button) button;
-               var dialog = new SourceDialog (movie_list_window);
-
-               var source = movie_list_window.source;
-               dialog.run (ref source);
-               movie_list_window.source = source;
-
-               select_source.value = source.get_name ();
-       }
-
        public void on_settings_clicked (Gtk.Button button) {
                var dialog = new SettingsDialog (movie_list_window);