Photos

Merge lp:~vikoadi/pantheon-photos/print-contextmenu into lp:~pantheon-photos/pantheon-photos/trunk

  1. print-contextmenu
  2. Merge into trunk
Proposed by Viko Adi Rahmawan
Status: Merged
Approved by: Cody Garver
Approved revision: 2569
Merged at revision: 2579
Proposed branch: lp:~vikoadi/pantheon-photos/print-contextmenu
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 127 lines (+9/-14)
8 files modified
src/CollectionPage.vala (+0/-2)
src/PhotoPage.vala (+2/-3)
src/direct/DirectPhotoPage.vala (+2/-3)
ui/collection.ui (+2/-1)
ui/direct.ui (+0/-2)
ui/direct_context.ui (+2/-1)
ui/photo.ui (+0/-2)
ui/photo_context.ui (+1/-0)
To merge this branch: bzr merge lp:~vikoadi/pantheon-photos/print-contextmenu
Reviewer Review Type Date Requested Status
Robert Roth (community) code style Needs Fixing
Review via email: mp+230135@code.launchpad.net

Commit message

move print menu from menubar to contextmenu in CollectionPage, PhotoPage and DirectPage

Description of the change

move print menu from menubar to contextmenu in CollectionPage, PhotoPage and DirectPage

To post a comment you must log in.
Revision history for this message
Robert Roth (evfool) wrote :

Please merge from trunk because of the full code reformat.

review: Needs Fixing (code style)
lp:~vikoadi/pantheon-photos/print-contextmenu updated
2569. By Viko Adi Rahmawan

merge trunk

Revision history for this message
Viko Adi Rahmawan (vikoadi) wrote :

Done

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/CollectionPage.vala'
--- src/CollectionPage.vala 2014-08-08 21:13:09 +0000
+++ src/CollectionPage.vala 2014-08-10 12:22:43 +0000
@@ -71,8 +71,6 @@
71 private static InjectionGroup create_file_menu_injectables () {71 private static InjectionGroup create_file_menu_injectables () {
72 InjectionGroup group = new InjectionGroup ("/MenuBar/FileMenu/FileExtrasPlaceholder");72 InjectionGroup group = new InjectionGroup ("/MenuBar/FileMenu/FileExtrasPlaceholder");
7373
74 group.add_menu_item ("Print");
75 group.add_separator ();
76 group.add_menu_item ("SendTo");74 group.add_menu_item ("SendTo");
77 group.add_menu_item ("SetBackground");75 group.add_menu_item ("SetBackground");
7876
7977
=== modified file 'src/PhotoPage.vala'
--- src/PhotoPage.vala 2014-08-09 13:57:30 +0000
+++ src/PhotoPage.vala 2014-08-10 12:22:43 +0000
@@ -2706,9 +2706,8 @@
2706 protected override InjectionGroup[] init_collect_injection_groups () {2706 protected override InjectionGroup[] init_collect_injection_groups () {
2707 InjectionGroup[] groups = base.init_collect_injection_groups ();2707 InjectionGroup[] groups = base.init_collect_injection_groups ();
27082708
2709 InjectionGroup print_group = new InjectionGroup ("/MenuBar/FileMenu/PrintPlaceholder");2709 InjectionGroup print_group = new InjectionGroup ("/PhotoContextMenu/PrintPlaceholder");
2710 print_group.add_menu_item ("Print");2710 print_group.add_menu_item ("Print");
2711
2712 groups += print_group;2711 groups += print_group;
27132712
2714 InjectionGroup bg_group = new InjectionGroup ("/MenuBar/FileMenu/SetBackgroundPlaceholder");2713 InjectionGroup bg_group = new InjectionGroup ("/MenuBar/FileMenu/SetBackgroundPlaceholder");
@@ -3398,4 +3397,4 @@
3398 get_command_manager ().execute (new ModifyTagsCommand (photo, new_tags));3397 get_command_manager ().execute (new ModifyTagsCommand (photo, new_tags));
3399 }3398 }
34003399
3401}3400}
3402\ No newline at end of file3401\ No newline at end of file
34033402
=== modified file 'src/direct/DirectPhotoPage.vala'
--- src/direct/DirectPhotoPage.vala 2014-08-08 21:13:09 +0000
+++ src/direct/DirectPhotoPage.vala 2014-08-10 12:22:43 +0000
@@ -231,9 +231,8 @@
231 protected override InjectionGroup[] init_collect_injection_groups () {231 protected override InjectionGroup[] init_collect_injection_groups () {
232 InjectionGroup[] groups = base.init_collect_injection_groups ();232 InjectionGroup[] groups = base.init_collect_injection_groups ();
233233
234 InjectionGroup print_group = new InjectionGroup ("/MenuBar/FileMenu/PrintPlaceholder");234 InjectionGroup print_group = new InjectionGroup ("/DirectContextMenu/PrintPlaceholder");
235 print_group.add_menu_item ("Print");235 print_group.add_menu_item ("Print");
236
237 groups += print_group;236 groups += print_group;
238237
239 InjectionGroup bg_group = new InjectionGroup ("/MenuBar/FileMenu/SetBackgroundPlaceholder");238 InjectionGroup bg_group = new InjectionGroup ("/MenuBar/FileMenu/SetBackgroundPlaceholder");
@@ -599,4 +598,4 @@
599 // direct.ui.598 // direct.ui.
600 ui_filenames.add ("direct_context.ui");599 ui_filenames.add ("direct_context.ui");
601 }600 }
602}601}
603\ No newline at end of file602\ No newline at end of file
604603
=== modified file 'ui/collection.ui'
--- ui/collection.ui 2014-07-27 04:42:53 +0000
+++ ui/collection.ui 2014-08-10 12:22:43 +0000
@@ -39,6 +39,7 @@
39 <menuitem name="NewEvent" action="NewEvent" />39 <menuitem name="NewEvent" action="NewEvent" />
40 <menuitem name="ContextJumpToEvent" action="CommonJumpToEvent" />40 <menuitem name="ContextJumpToEvent" action="CommonJumpToEvent" />
41 <menuitem name="ContextJumpToFile" action="CommonJumpToFile" />41 <menuitem name="ContextJumpToFile" action="CommonJumpToFile" />
42 <menuitem name="ContextPrint" action="Print"/>
42 <menuitem name="ContextSendTo" action="SendToContextMenu" />43 <menuitem name="ContextSendTo" action="SendToContextMenu" />
43 <separator />44 <separator />
44 <menuitem name="ContextMoveToTrash" action="MoveToTrash" />45 <menuitem name="ContextMoveToTrash" action="MoveToTrash" />
@@ -52,4 +53,4 @@
52 <separator />53 <separator />
53 <toolitem name="ToolFind" action="CommonDisplaySearchbar" />54 <toolitem name="ToolFind" action="CommonDisplaySearchbar" />
54 </toolbar>55 </toolbar>
55</ui>56</ui>
56\ No newline at end of file57\ No newline at end of file
5758
=== modified file 'ui/direct.ui'
--- ui/direct.ui 2014-07-27 04:42:53 +0000
+++ ui/direct.ui 2014-08-10 12:22:43 +0000
@@ -5,8 +5,6 @@
5 <menuitem name="Save" action="Save" />5 <menuitem name="Save" action="Save" />
6 <menuitem name="SaveAs" action="SaveAs" />6 <menuitem name="SaveAs" action="SaveAs" />
7 <separator />7 <separator />
8 <placeholder name="PrintPlaceholder"/>
9 <separator />
10 <menuitem name="SendTo" action="SendTo" />8 <menuitem name="SendTo" action="SendTo" />
11 <placeholder name="SetBackgroundPlaceholder" />9 <placeholder name="SetBackgroundPlaceholder" />
12 <separator />10 <separator />
1311
=== modified file 'ui/direct_context.ui'
--- ui/direct_context.ui 2014-07-27 04:17:06 +0000
+++ ui/direct_context.ui 2014-08-10 12:22:43 +0000
@@ -6,6 +6,7 @@
6 <menuitem name="AdjustDateTime" action="AdjustDateTime" />6 <menuitem name="AdjustDateTime" action="AdjustDateTime" />
7 <separator />7 <separator />
8 <placeholder name="ContextJumpPlaceholder" />8 <placeholder name="ContextJumpPlaceholder" />
9 <placeholder name="PrintPlaceholder"/>
9 <menuitem name="ContextSendTo" action="SendTo" />10 <menuitem name="ContextSendTo" action="SendTo" />
10 </popup>11 </popup>
11</ui>12</ui>
12\ No newline at end of file13\ No newline at end of file
1314
=== modified file 'ui/photo.ui'
--- ui/photo.ui 2014-07-27 04:42:53 +0000
+++ ui/photo.ui 2014-08-10 12:22:43 +0000
@@ -6,8 +6,6 @@
6 <menuitem name="ImportExternal" action="ExternalLibraryImport" />6 <menuitem name="ImportExternal" action="ExternalLibraryImport" />
7 <menuitem name="Export" action="Export" />7 <menuitem name="Export" action="Export" />
8 <separator />8 <separator />
9 <placeholder name="PrintPlaceholder" />
10 <separator />
11 <menuitem name="SendTo" action="SendTo" />9 <menuitem name="SendTo" action="SendTo" />
12 <placeholder name="SetBackgroundPlaceholder" />10 <placeholder name="SetBackgroundPlaceholder" />
13 </menu>11 </menu>
1412
=== modified file 'ui/photo_context.ui'
--- ui/photo_context.ui 2014-07-27 04:42:53 +0000
+++ ui/photo_context.ui 2014-08-10 12:22:43 +0000
@@ -35,6 +35,7 @@
35 <menuitem name="ContextExternalEditRAW" action="ExternalEditRAW" />35 <menuitem name="ContextExternalEditRAW" action="ExternalEditRAW" />
36 <separator />36 <separator />
37 <placeholder name="ContextJumpPlaceholder" />37 <placeholder name="ContextJumpPlaceholder" />
38 <placeholder name="PrintPlaceholder" />
38 <menuitem name="ContextSendTo" action="SendToContextMenu" />39 <menuitem name="ContextSendTo" action="SendToContextMenu" />
39 <separator />40 <separator />
40 <menuitem name="ContextMoveToTrash" action="MoveToTrash" />41 <menuitem name="ContextMoveToTrash" action="MoveToTrash" />

Subscribers

People subscribed via source and target branches