Merge lp:~vikoadi/pantheon-photos/adjustdatetime-context into lp:~pantheon-photos/pantheon-photos/trunk

[Viko Adi Rahmawan]

Move "Adjust date and time" to the context-menu from the menubar.

move Adjust date and time menuitem from menubar to context menu in PhotoPage, CollectionPage and DirectPage

[lp:~vikoadi/pantheon-photos/adjustdatetime-context]

2525. By Viko Adi Rahmawan on 2014-07-27

resolve conflict

[Raphael Isemann (teemperor)]

I don't think we need a design-review as the bug from dan states exactly what to do.

Code is fine, codestyle is fine and i couldn't find any bugs in the test.

review: Approve (functionality, codestyle)

=== modified file 'src/CollectionPage.vala'
--- src/CollectionPage.vala	2014-07-09 10:33:53 +0000
+++ src/CollectionPage.vala	2014-07-27 04:44:32 +0000
@@ -96,14 +96,6 @@
         
         return group;
     }
-  
-    private static InjectionGroup create_photos_menu_date_injectables() {
-        InjectionGroup group = new InjectionGroup("/MenuBar/PhotosMenu/PhotosExtrasDateTimePlaceholder");
-        
-        group.add_menu_item("AdjustDateTime");
-        
-        return group;
-    }
 
     private static InjectionGroup create_photos_menu_externals_injectables() {
         InjectionGroup group = new InjectionGroup("/MenuBar/PhotosMenu/PhotosExtrasExternalsPlaceholder");
@@ -220,7 +212,6 @@
         groups += create_file_menu_injectables();
         groups += create_edit_menu_injectables();
         groups += create_view_menu_fullscreen_injectables();
-        groups += create_photos_menu_date_injectables();
         groups += create_photos_menu_externals_injectables();
         
         return groups;
@@ -740,5 +731,4 @@
     public override SearchViewFilter get_search_view_filter() {
         return search_filter;
     }
-}
-
+}
\ No newline at end of file

=== modified file 'ui/collection.ui'
--- ui/collection.ui	2014-07-09 10:33:53 +0000
+++ ui/collection.ui	2014-07-27 04:44:32 +0000
@@ -32,6 +32,7 @@
         <separator />
         <menuitem name="ContextEditTitle" action="EditTitle" />
         <menuitem name="ContextEditComment" action="EditComment" />
+        <menuitem name="AdjustDateTime" action="AdjustDateTime" />
         <menuitem name="ContextExternalEdit" action="ExternalEdit" />
         <menuitem name="ContextExternalEditRAW" action="ExternalEditRAW" />
         <separator />

=== modified file 'ui/direct.ui'
--- ui/direct.ui	2014-06-06 01:18:33 +0000
+++ ui/direct.ui	2014-07-27 04:44:32 +0000
@@ -48,8 +48,6 @@
                 <menuitem name="Adjust" action="Adjust" />
             </menu>
             <menuitem name="Revert" action="Revert" />
-            <separator />
-            <menuitem name="AdjustDateTime" action="AdjustDateTime" />
         </menu>
         
         <menu name="HelpMenu" action="HelpMenu">
@@ -62,5 +60,4 @@
             <menuitem name="ContextJumpToFile" action="CommonJumpToFile" />
         </placeholder>
     </popup>
-    
 </ui>
\ No newline at end of file

=== modified file 'ui/direct_context.ui'
--- ui/direct_context.ui	2012-03-22 03:23:03 +0000
+++ ui/direct_context.ui	2014-07-27 04:44:32 +0000
@@ -3,8 +3,9 @@
         <menuitem name="ContextEnhance" action="Enhance" />
         <menuitem name="ContextRevert" action="Revert" />
         <separator />
+        <menuitem name="AdjustDateTime" action="AdjustDateTime" />
+        <separator />
         <placeholder name="ContextJumpPlaceholder" />
         <menuitem name="ContextSendTo" action="SendTo" />
     </popup>
 </ui>
-

=== modified file 'ui/media.ui'
--- ui/media.ui	2014-06-12 21:00:40 +0000
+++ ui/media.ui	2014-07-27 04:44:32 +0000
@@ -25,8 +25,6 @@
             <separator />
             <placeholder name="PhotosExtrasEditsPlaceholder" />
             <separator />
-            <placeholder name="PhotosExtrasDateTimePlaceholder" />
-            <separator />
             <placeholder name="PhotosExtrasExternalsPlaceholder" />
         </menu>
 

=== modified file 'ui/photo.ui'
--- ui/photo.ui	2014-07-09 10:33:53 +0000
+++ ui/photo.ui	2014-07-27 04:44:32 +0000
@@ -24,8 +24,6 @@
         <menu name="PhotoMenu" action="PhotoMenu">
             <menuitem name="FlipHorizontally" action="FlipHorizontally" />
             <menuitem name="FlipVertically" action="FlipVertically" />
-            <separator />
-            <menuitem name="AdjustDateTime" action="AdjustDateTime" />
         </menu>
 
         <menu name="HelpMenu" action="HelpMenu">
@@ -61,4 +59,4 @@
         <menuitem name="Slideshow" action="Slideshow" />
     </popup>
     
-</ui>
+</ui>
\ No newline at end of file

=== modified file 'ui/photo_context.ui'
--- ui/photo_context.ui	2014-07-09 10:33:53 +0000
+++ ui/photo_context.ui	2014-07-27 04:44:32 +0000
@@ -30,6 +30,7 @@
         <separator />
         <menuitem name="ContextEditTitle" action="EditTitle" />
         <menuitem name="ContextEditComment" action="EditComment" />
+        <menuitem name="AdjustDateTime" action="AdjustDateTime" />
         <menuitem name="ContextExternalEdit" action="ExternalEdit" />
         <menuitem name="ContextExternalEditRAW" action="ExternalEditRAW" />
         <separator />
@@ -39,4 +40,4 @@
         <menuitem name="ContextMoveToTrash" action="MoveToTrash" />
     </popup>
 
-</ui>
+</ui>
\ No newline at end of file