Merge lp:~meese/pantheon-photos/fix-1272573 into lp:~pantheon-photos/pantheon-photos/trunk

[meese]

changes context menu rating stuff to a rating widget

changes context menu rating stuff to a rating widget

[Danielle Foré (danrabbit)]

I can confirm that it does what it's supposed to do :)

review: Approve (ux)

=== modified file 'src/CollectionPage.vala'
--- src/CollectionPage.vala	2014-08-25 06:04:50 +0000
+++ src/CollectionPage.vala	2014-08-28 00:04:23 +0000
@@ -249,7 +249,9 @@
         }
 
         populate_contractor_menu (menu, "/CollectionContextMenu/ContractorPlaceholder");
-
+        populate_rating_widget_menu_item (menu, "/CollectionContextMenu/RatingWidgetPlaceholder");
+        update_rating_sensitivities ();
+        menu.show_all ();
         return menu;
     }
 
@@ -496,7 +498,6 @@
         case "KP_End":
             key_press_event (event);
             break;
-
         case "bracketright":
             activate_action ("RotateClockwise");
             break;
 
=== modified file 'src/MediaPage.vala'
--- src/MediaPage.vala	2014-08-25 06:10:33 +0000
+++ src/MediaPage.vala	2014-08-28 00:04:23 +0000
@@ -333,42 +333,6 @@
         rate_rejected.label = Resources.rating_menu (Rating.REJECTED);
         actions += rate_rejected;
 
-        Gtk.ActionEntry rate_unrated = { "RateUnrated", null, TRANSLATABLE,
-                                         "0", TRANSLATABLE, on_rate_unrated
-                                       };
-        rate_unrated.label = Resources.rating_menu (Rating.UNRATED);
-        actions += rate_unrated;
-
-        Gtk.ActionEntry rate_one = { "RateOne", null, TRANSLATABLE,
-                                     "1", TRANSLATABLE, on_rate_one
-                                   };
-        rate_one.label = Resources.rating_menu (Rating.ONE);
-        actions += rate_one;
-
-        Gtk.ActionEntry rate_two = { "RateTwo", null, TRANSLATABLE,
-                                     "2", TRANSLATABLE, on_rate_two
-                                   };
-        rate_two.label = Resources.rating_menu (Rating.TWO);
-        actions += rate_two;
-
-        Gtk.ActionEntry rate_three = { "RateThree", null, TRANSLATABLE,
-                                       "3", TRANSLATABLE, on_rate_three
-                                     };
-        rate_three.label = Resources.rating_menu (Rating.THREE);
-        actions += rate_three;
-
-        Gtk.ActionEntry rate_four = { "RateFour", null, TRANSLATABLE,
-                                      "4", TRANSLATABLE, on_rate_four
-                                    };
-        rate_four.label = Resources.rating_menu (Rating.FOUR);
-        actions += rate_four;
-
-        Gtk.ActionEntry rate_five = { "RateFive", null, TRANSLATABLE,
-                                      "5", TRANSLATABLE, on_rate_five
-                                    };
-        rate_five.label = Resources.rating_menu (Rating.FIVE);
-        actions += rate_five;
-
         Gtk.ActionEntry sort_photos = { "SortPhotos", null, TRANSLATABLE, null, null, null };
         sort_photos.label = _ ("Sort _Photos");
         actions += sort_photos;
@@ -523,18 +487,19 @@
         }
     }
 
-    private void update_rating_sensitivities () {
-        set_action_sensitive ("RateRejected", can_rate_selected (Rating.REJECTED));
-        set_action_sensitive ("RateUnrated", can_rate_selected (Rating.UNRATED));
-        set_action_sensitive ("RateOne", can_rate_selected (Rating.ONE));
-        set_action_sensitive ("RateTwo", can_rate_selected (Rating.TWO));
-        set_action_sensitive ("RateThree", can_rate_selected (Rating.THREE));
-        set_action_sensitive ("RateFour", can_rate_selected (Rating.FOUR));
-        set_action_sensitive ("RateFive", can_rate_selected (Rating.FIVE));
+    protected void update_rating_sensitivities () {
+        if (rating_menu_item != null) {
+            rating_menu_item.sensitive =  can_rate_selected ();
+            rating_menu_item.rating_value = Resources.int_to_rating (get_selected_rating ());
+        }
         set_action_sensitive ("IncreaseRating", can_increase_selected_rating ());
         set_action_sensitive ("DecreaseRating", can_decrease_selected_rating ());
     }
 
+    protected override void on_rating_widget_activate () {
+        on_set_rating (Resources.int_to_rating(rating_menu_item.rating_value));
+    }
+
     private void update_development_menu_item_sensitivity () {
         if (get_view ().get_selected ().size == 0) {
             set_action_sensitive ("RawDeveloper", false);
@@ -614,13 +579,22 @@
             action.set_active (display);
     }
 
-    private bool can_rate_selected (Rating rating) {
+    private bool can_rate_selected () {
+        return get_view ().get_selected ().size > 0;
+    }
+
+    private Rating get_selected_rating () {
+        bool init = false;
+        Rating last_rating = Rating.UNRATED;
         foreach (DataView view in get_view ().get_selected ()) {
-            if (((Thumbnail) view).get_media_source ().get_rating () != rating)
-                return true;
+            var rating = ((Thumbnail) view).get_media_source ().get_rating ();
+            if (!init)
+                init = true;
+            else if (last_rating != rating)
+                return Rating.UNRATED;
+            last_rating = rating;
         }
-
-        return false;
+        return last_rating;
     }
 
     private bool can_increase_selected_rating () {
@@ -702,31 +676,31 @@
             activate_action ("DecreaseRating");
             break;
 
-        case "KP_1":
-            activate_action ("RateOne");
-            break;
-
-        case "KP_2":
-            activate_action ("RateTwo");
-            break;
-
-        case "KP_3":
-            activate_action ("RateThree");
-            break;
-
-        case "KP_4":
-            activate_action ("RateFour");
-            break;
-
-        case "KP_5":
-            activate_action ("RateFive");
-            break;
-
-        case "KP_0":
-            activate_action ("RateUnrated");
-            break;
-
-        case "KP_9":
+        case "1":
+            on_set_rating (Rating.ONE);
+            break;
+
+        case "2":
+            on_set_rating (Rating.TWO);
+            break;
+
+        case "3":
+            on_set_rating (Rating.THREE);
+            break;
+
+        case "4":
+            on_set_rating (Rating.FOUR);
+            break;
+
+        case "5":
+            on_set_rating (Rating.FIVE);    
+            break;
+
+        case "0":
+            on_set_rating (Rating.UNRATED);
+            break;
+
+        case "9":
             activate_action ("RateRejected");
             break;
 
@@ -920,30 +894,6 @@
         on_set_rating (Rating.REJECTED);
     }
 
-    protected virtual void on_rate_unrated () {
-        on_set_rating (Rating.UNRATED);
-    }
-
-    protected virtual void on_rate_one () {
-        on_set_rating (Rating.ONE);
-    }
-
-    protected virtual void on_rate_two () {
-        on_set_rating (Rating.TWO);
-    }
-
-    protected virtual void on_rate_three () {
-        on_set_rating (Rating.THREE);
-    }
-
-    protected virtual void on_rate_four () {
-        on_set_rating (Rating.FOUR);
-    }
-
-    protected virtual void on_rate_five () {
-        on_set_rating (Rating.FIVE);
-    }
-
     private void on_remove_from_library () {
         remove_photos_from_library ((Gee.Collection<LibraryPhoto>) get_view ().get_selected_sources ());
     }
 
=== modified file 'src/Page.vala'
--- src/Page.vala	2014-08-27 03:08:01 +0000
+++ src/Page.vala	2014-08-28 00:04:23 +0000
@@ -53,6 +53,7 @@
     protected Gtk.Toolbar toolbar;
     protected bool in_view = false;
     protected Gtk.ToolButton show_sidebar_button;
+    protected PhotoRatingMenuItem rating_menu_item;
 
     private string page_name;
     private ViewCollection view = null;
@@ -119,11 +120,13 @@
             warning (e.message);
         }
         // Remove old contracts
-        contractor_menu_items.foreach ((item) => { if (item != null) item.destroy (); });
+        contractor_menu_items.foreach ((item) => {
+            if (item != null) item.destroy ();
+        });
 
         //find where is contractor_placeholder in the menu
-        Gtk.Widget holder= ui.get_widget (placeholder_ui);
-        int pos=0;
+        Gtk.Widget holder = ui.get_widget (placeholder_ui);
+        int pos = 0;
         foreach (Gtk.Widget w in menu.get_children ()) {
             if (w == holder)
                 break;
@@ -141,8 +144,30 @@
         }
         menu.show_all ();
     }
-
-    // This is called by the page controller when it has removed this page ... pages should override
+    
+    protected void populate_rating_widget_menu_item (Gtk.Menu menu, string placeholder_ui) {
+        if (rating_menu_item != null) rating_menu_item.destroy ();
+        rating_menu_item = new PhotoRatingMenuItem ();
+        //find where is rating_placeholder in the menu
+        Gtk.Widget holder = ui.get_widget (placeholder_ui);
+        int pos = 0;
+        foreach (Gtk.Widget w in menu.get_children ()) {
+            if (w == holder)
+                break;
+            pos++;
+        }
+        
+        menu.append (rating_menu_item);
+        menu.reorder_child (rating_menu_item, pos);
+        rating_menu_item.activate.connect (on_rating_widget_activate);
+        menu.show_all ();
+    }
+
+    protected virtual void on_rating_widget_activate () {
+    }
+
+    // This is called by the page
+    // controller when it has removed this page ... pages should override
     // this (or the signal) to clean up
     public override void destroy () {
         if (is_destroyed)
@@ -370,7 +395,7 @@
 
         return null;
     }
-    
+
     public void update_sidebar_action (bool show) {
         if (show_sidebar_button == null)
             return;
 
=== modified file 'src/PhotoPage.vala'
--- src/PhotoPage.vala	2014-08-27 06:20:32 +0000
+++ src/PhotoPage.vala	2014-08-28 00:04:23 +0000
@@ -2595,42 +2595,6 @@
         rate_rejected.label = Resources.rating_menu (Rating.REJECTED);
         actions += rate_rejected;
 
-        Gtk.ActionEntry rate_unrated = { "RateUnrated", null, TRANSLATABLE,
-                                         "0", TRANSLATABLE, on_rate_unrated
-                                       };
-        rate_unrated.label = Resources.rating_menu (Rating.UNRATED);
-        actions += rate_unrated;
-
-        Gtk.ActionEntry rate_one = { "RateOne", null, TRANSLATABLE,
-                                     "1", TRANSLATABLE, on_rate_one
-                                   };
-        rate_one.label = Resources.rating_menu (Rating.ONE);
-        actions += rate_one;
-
-        Gtk.ActionEntry rate_two = { "RateTwo", null, TRANSLATABLE,
-                                     "2", TRANSLATABLE, on_rate_two
-                                   };
-        rate_two.label = Resources.rating_menu (Rating.TWO);
-        actions += rate_two;
-
-        Gtk.ActionEntry rate_three = { "RateThree", null, TRANSLATABLE,
-                                       "3", TRANSLATABLE, on_rate_three
-                                     };
-        rate_three.label = Resources.rating_menu (Rating.THREE);
-        actions += rate_three;
-
-        Gtk.ActionEntry rate_four = { "RateFour", null, TRANSLATABLE,
-                                      "4", TRANSLATABLE, on_rate_four
-                                    };
-        rate_four.label = Resources.rating_menu (Rating.FOUR);
-        actions += rate_four;
-
-        Gtk.ActionEntry rate_five = { "RateFive", null, TRANSLATABLE,
-                                      "5", TRANSLATABLE, on_rate_five
-                                    };
-        rate_five.label = Resources.rating_menu (Rating.FIVE);
-        actions += rate_five;
-
         Gtk.ActionEntry increase_size = { "IncreaseSize", Gtk.Stock.ZOOM_IN, TRANSLATABLE,
                                           "<Ctrl>plus", TRANSLATABLE, on_increase_size
                                         };
@@ -3004,31 +2968,31 @@
             activate_action ("DecreaseRating");
             break;
 
-        case "KP_1":
-            activate_action ("RateOne");
-            break;
-
-        case "KP_2":
-            activate_action ("RateTwo");
-            break;
-
-        case "KP_3":
-            activate_action ("RateThree");
-            break;
-
-        case "KP_4":
-            activate_action ("RateFour");
-            break;
-
-        case "KP_5":
-            activate_action ("RateFive");
-            break;
-
-        case "KP_0":
-            activate_action ("RateUnrated");
-            break;
-
-        case "KP_9":
+        case "1":
+            on_set_rating (Rating.ONE);
+            break;
+
+        case "2":
+            on_set_rating (Rating.TWO);
+            break;
+
+        case "3":
+            on_set_rating (Rating.THREE);
+            break;
+
+        case "4":
+            on_set_rating (Rating.FOUR);
+            break;
+
+        case "5":
+            on_set_rating (Rating.FIVE);    
+            break;
+
+        case "0":
+            on_set_rating (Rating.UNRATED);
+            break;
+
+        case "9":
             activate_action ("RateRejected");
             break;
 
@@ -3090,6 +3054,9 @@
         }
 
         populate_contractor_menu (menu, "/PhotoContextMenu/ContractorPlaceholder");
+        populate_rating_widget_menu_item (menu, "/PhotoContextMenu/RatingWidgetPlaceholder");
+        update_rating_menu_item_sensitivity ();
+        menu.show_all ();
         return menu;
     }
 
@@ -3320,6 +3287,10 @@
 
         update_rating_menu_item_sensitivity ();
     }
+    
+    protected virtual void on_rate_rejected () {
+        on_set_rating (Rating.REJECTED);
+    }
 
     private void on_set_rating (Rating rating) {
         if (!has_photo () || get_photo_missing ())
@@ -3331,42 +3302,16 @@
         update_rating_menu_item_sensitivity ();
     }
 
-    private void on_rate_rejected () {
-        on_set_rating (Rating.REJECTED);
-    }
-
-    private void on_rate_unrated () {
-        on_set_rating (Rating.UNRATED);
-    }
-
-    private void on_rate_one () {
-        on_set_rating (Rating.ONE);
-    }
-
-    private void on_rate_two () {
-        on_set_rating (Rating.TWO);
-    }
-
-    private void on_rate_three () {
-        on_set_rating (Rating.THREE);
-    }
-
-    private void on_rate_four () {
-        on_set_rating (Rating.FOUR);
-    }
-
-    private void on_rate_five () {
-        on_set_rating (Rating.FIVE);
+    protected override void on_rating_widget_activate () {
+        on_set_rating (Resources.int_to_rating(rating_menu_item.rating_value));
     }
 
     private void update_rating_menu_item_sensitivity () {
         set_action_sensitive ("RateRejected", get_photo ().get_rating () != Rating.REJECTED);
-        set_action_sensitive ("RateUnrated", get_photo ().get_rating () != Rating.UNRATED);
-        set_action_sensitive ("RateOne", get_photo ().get_rating () != Rating.ONE);
-        set_action_sensitive ("RateTwo", get_photo ().get_rating () != Rating.TWO);
-        set_action_sensitive ("RateThree", get_photo ().get_rating () != Rating.THREE);
-        set_action_sensitive ("RateFour", get_photo ().get_rating () != Rating.FOUR);
-        set_action_sensitive ("RateFive", get_photo ().get_rating () != Rating.FIVE);
+        if (rating_menu_item != null) {
+            rating_menu_item.sensitive =  (get_photo () != null);
+            rating_menu_item.rating_value = get_photo ().get_rating ();
+        }
         set_action_sensitive ("IncreaseRating", get_photo ().get_rating ().can_increase ());
         set_action_sensitive ("DecreaseRating", get_photo ().get_rating ().can_decrease ());
     }
 
=== modified file 'ui/collection.ui'
--- ui/collection.ui	2014-08-25 06:04:50 +0000
+++ ui/collection.ui	2014-08-28 00:04:23 +0000
@@ -11,18 +11,8 @@
         <placeholder name="ContextFacesPlaceholder" />
         <separator />
         <menuitem name="ContextFlag" action="Flag" />
-        <menu name="Rate" action="Rate">
-            <menuitem name="RateFive" action="RateFive" />
-            <menuitem name="RateFour" action="RateFour" />
-            <menuitem name="RateThree" action="RateThree" />
-            <menuitem name="RateTwo" action="RateTwo" />
-            <menuitem name="RateOne" action="RateOne" />
-            <menuitem name="RateUnrated" action="RateUnrated" />
-            <menuitem name="RateRejected" action="RateRejected" />
-            <separator />
-            <menuitem name="IncreaseRating" action="IncreaseRating" />
-            <menuitem name="DecreaseRating" action="DecreaseRating" />
-        </menu>
+        <menuitem name="RateRejected" action="RateRejected" />
+        <placeholder name="RatingWidgetPlaceholder" />
         <menu name="RawDeveloper" action="RawDeveloper">
             <menuitem name="RawDeveloperShotwell" action="RawDeveloperShotwell" />
             <menuitem name="RawDeveloperCamera" action="RawDeveloperCamera" />
 
=== modified file 'ui/photo_context.ui'
--- ui/photo_context.ui	2014-08-25 06:04:50 +0000
+++ ui/photo_context.ui	2014-08-28 00:04:23 +0000
@@ -9,18 +9,8 @@
         <menuitem name="ContextPasteColorAdjustments" action="PasteColorAdjustments" />
         <separator />
         <menuitem name="ContextFlag" action="Flag" />
-        <menu name="Rate" action="Rate">
-            <menuitem name="RateFive" action="RateFive" />
-            <menuitem name="RateFour" action="RateFour" />
-            <menuitem name="RateThree" action="RateThree" />
-            <menuitem name="RateTwo" action="RateTwo" />
-            <menuitem name="RateOne" action="RateOne" />
-            <menuitem name="RateUnrated" action="RateUnrated" />
-            <menuitem name="RateRejected" action="RateRejected" />
-            <separator />
-            <menuitem name="IncreaseRating" action="IncreaseRating" />
-            <menuitem name="DecreaseRating" action="DecreaseRating" />
-        </menu>
+        <menuitem name="RateRejected" action="RateRejected" />
+        <placeholder name="RatingWidgetPlaceholder" />
         <menu name="RawDeveloper" action="RawDeveloper">
             <menuitem name="RawDeveloperShotwell" action="RawDeveloperShotwell" />
             <menuitem name="RawDeveloperCamera" action="RawDeveloperCamera" />