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
1=== modified file 'src/CollectionPage.vala'
2--- src/CollectionPage.vala 2014-08-08 21:13:09 +0000
3+++ src/CollectionPage.vala 2014-08-10 12:22:43 +0000
4@@ -71,8 +71,6 @@
5 private static InjectionGroup create_file_menu_injectables () {
6 InjectionGroup group = new InjectionGroup ("/MenuBar/FileMenu/FileExtrasPlaceholder");
7
8- group.add_menu_item ("Print");
9- group.add_separator ();
10 group.add_menu_item ("SendTo");
11 group.add_menu_item ("SetBackground");
12
13
14=== modified file 'src/PhotoPage.vala'
15--- src/PhotoPage.vala 2014-08-09 13:57:30 +0000
16+++ src/PhotoPage.vala 2014-08-10 12:22:43 +0000
17@@ -2706,9 +2706,8 @@
18 protected override InjectionGroup[] init_collect_injection_groups () {
19 InjectionGroup[] groups = base.init_collect_injection_groups ();
20
21- InjectionGroup print_group = new InjectionGroup ("/MenuBar/FileMenu/PrintPlaceholder");
22+ InjectionGroup print_group = new InjectionGroup ("/PhotoContextMenu/PrintPlaceholder");
23 print_group.add_menu_item ("Print");
24-
25 groups += print_group;
26
27 InjectionGroup bg_group = new InjectionGroup ("/MenuBar/FileMenu/SetBackgroundPlaceholder");
28@@ -3398,4 +3397,4 @@
29 get_command_manager ().execute (new ModifyTagsCommand (photo, new_tags));
30 }
31
32-}
33+}
34\ No newline at end of file
35
36=== modified file 'src/direct/DirectPhotoPage.vala'
37--- src/direct/DirectPhotoPage.vala 2014-08-08 21:13:09 +0000
38+++ src/direct/DirectPhotoPage.vala 2014-08-10 12:22:43 +0000
39@@ -231,9 +231,8 @@
40 protected override InjectionGroup[] init_collect_injection_groups () {
41 InjectionGroup[] groups = base.init_collect_injection_groups ();
42
43- InjectionGroup print_group = new InjectionGroup ("/MenuBar/FileMenu/PrintPlaceholder");
44+ InjectionGroup print_group = new InjectionGroup ("/DirectContextMenu/PrintPlaceholder");
45 print_group.add_menu_item ("Print");
46-
47 groups += print_group;
48
49 InjectionGroup bg_group = new InjectionGroup ("/MenuBar/FileMenu/SetBackgroundPlaceholder");
50@@ -599,4 +598,4 @@
51 // direct.ui.
52 ui_filenames.add ("direct_context.ui");
53 }
54-}
55+}
56\ No newline at end of file
57
58=== modified file 'ui/collection.ui'
59--- ui/collection.ui 2014-07-27 04:42:53 +0000
60+++ ui/collection.ui 2014-08-10 12:22:43 +0000
61@@ -39,6 +39,7 @@
62 <menuitem name="NewEvent" action="NewEvent" />
63 <menuitem name="ContextJumpToEvent" action="CommonJumpToEvent" />
64 <menuitem name="ContextJumpToFile" action="CommonJumpToFile" />
65+ <menuitem name="ContextPrint" action="Print"/>
66 <menuitem name="ContextSendTo" action="SendToContextMenu" />
67 <separator />
68 <menuitem name="ContextMoveToTrash" action="MoveToTrash" />
69@@ -52,4 +53,4 @@
70 <separator />
71 <toolitem name="ToolFind" action="CommonDisplaySearchbar" />
72 </toolbar>
73-</ui>
74+</ui>
75\ No newline at end of file
76
77=== modified file 'ui/direct.ui'
78--- ui/direct.ui 2014-07-27 04:42:53 +0000
79+++ ui/direct.ui 2014-08-10 12:22:43 +0000
80@@ -5,8 +5,6 @@
81 <menuitem name="Save" action="Save" />
82 <menuitem name="SaveAs" action="SaveAs" />
83 <separator />
84- <placeholder name="PrintPlaceholder"/>
85- <separator />
86 <menuitem name="SendTo" action="SendTo" />
87 <placeholder name="SetBackgroundPlaceholder" />
88 <separator />
89
90=== modified file 'ui/direct_context.ui'
91--- ui/direct_context.ui 2014-07-27 04:17:06 +0000
92+++ ui/direct_context.ui 2014-08-10 12:22:43 +0000
93@@ -6,6 +6,7 @@
94 <menuitem name="AdjustDateTime" action="AdjustDateTime" />
95 <separator />
96 <placeholder name="ContextJumpPlaceholder" />
97+ <placeholder name="PrintPlaceholder"/>
98 <menuitem name="ContextSendTo" action="SendTo" />
99 </popup>
100-</ui>
101+</ui>
102\ No newline at end of file
103
104=== modified file 'ui/photo.ui'
105--- ui/photo.ui 2014-07-27 04:42:53 +0000
106+++ ui/photo.ui 2014-08-10 12:22:43 +0000
107@@ -6,8 +6,6 @@
108 <menuitem name="ImportExternal" action="ExternalLibraryImport" />
109 <menuitem name="Export" action="Export" />
110 <separator />
111- <placeholder name="PrintPlaceholder" />
112- <separator />
113 <menuitem name="SendTo" action="SendTo" />
114 <placeholder name="SetBackgroundPlaceholder" />
115 </menu>
116
117=== modified file 'ui/photo_context.ui'
118--- ui/photo_context.ui 2014-07-27 04:42:53 +0000
119+++ ui/photo_context.ui 2014-08-10 12:22:43 +0000
120@@ -35,6 +35,7 @@
121 <menuitem name="ContextExternalEditRAW" action="ExternalEditRAW" />
122 <separator />
123 <placeholder name="ContextJumpPlaceholder" />
124+ <placeholder name="PrintPlaceholder" />
125 <menuitem name="ContextSendTo" action="SendToContextMenu" />
126 <separator />
127 <menuitem name="ContextMoveToTrash" action="MoveToTrash" />

Subscribers

People subscribed via source and target branches