Merge lp:~meese/pantheon-photos/fix1275112 into lp:~pantheon-photos/pantheon-photos/trunk

[meese]

Moves copy and paste color adjustments out of menubar and into context menu

Fixes bug #1275112

[Danielle Foré (danrabbit)]

Works here! Thanks Madelynn!

review: Approve

=== modified file 'src/CollectionPage.vala'
--- src/CollectionPage.vala	2014-05-22 07:11:31 +0000
+++ src/CollectionPage.vala	2014-07-09 10:46:06 +0000
@@ -96,15 +96,6 @@
         
         return group;
     }
-
-    private static InjectionGroup create_photos_menu_edits_injectables() {
-        InjectionGroup group = new InjectionGroup("/MenuBar/PhotosMenu/PhotosExtrasEditsPlaceholder");
-        
-        group.add_menu_item("CopyColorAdjustments");
-        group.add_menu_item("PasteColorAdjustments");
-        
-        return group;
-    }
   
     private static InjectionGroup create_photos_menu_date_injectables() {
         InjectionGroup group = new InjectionGroup("/MenuBar/PhotosMenu/PhotosExtrasDateTimePlaceholder");
@@ -229,7 +220,6 @@
         groups += create_file_menu_injectables();
         groups += create_edit_menu_injectables();
         groups += create_view_menu_fullscreen_injectables();
-        groups += create_photos_menu_edits_injectables();
         groups += create_photos_menu_date_injectables();
         groups += create_photos_menu_externals_injectables();
         
 
=== modified file 'ui/collection.ui'
--- ui/collection.ui	2014-05-27 06:18:57 +0000
+++ ui/collection.ui	2014-07-09 10:46:06 +0000
@@ -3,6 +3,9 @@
         <menuitem name="ContextEnhance" action="Enhance" />
         <menuitem name="ContextRevert" action="Revert" />
         <separator />
+        <menuitem name="ContextCopyColorAdjustments" action="CopyColorAdjustments" />
+        <menuitem name="ContextPasteColorAdjustments" action="PasteColorAdjustments" />
+        <separator />
         <menuitem name="ContextAddTags" action="AddTagsContextMenu" />
         <menuitem name="ContextModifyTags" action="ModifyTags" />
         <placeholder name="ContextTagsPlaceholder" />
 
=== modified file 'ui/photo.ui'
--- ui/photo.ui	2014-06-06 01:18:33 +0000
+++ ui/photo.ui	2014-07-09 10:46:06 +0000
@@ -25,9 +25,6 @@
             <menuitem name="FlipHorizontally" action="FlipHorizontally" />
             <menuitem name="FlipVertically" action="FlipVertically" />
             <separator />
-            <menuitem name="CopyColorAdjustments" action="CopyColorAdjustments" />
-            <menuitem name="PasteColorAdjustments" action="PasteColorAdjustments" />
-            <separator/>
             <menuitem name="AdjustDateTime" action="AdjustDateTime" />
         </menu>
 
 
=== modified file 'ui/photo_context.ui'
--- ui/photo_context.ui	2013-02-28 01:46:30 +0000
+++ ui/photo_context.ui	2014-07-09 10:46:06 +0000
@@ -3,6 +3,9 @@
         <menuitem name="ContextEnhance" action="Enhance" />
         <menuitem name="ContextRevert" action="Revert" />
         <separator />
+        <menuitem name="ContextCopyColorAdjustments" action="CopyColorAdjustments" />
+        <menuitem name="ContextPasteColorAdjustments" action="PasteColorAdjustments" />
+        <separator />
         <menuitem name="ContextAddTags" action="AddTagsContextMenu" />
         <menuitem name="ContextModifyTags" action="ModifyTags" />
         <placeholder name="ContextTagsPlaceholder" />