Merge lp:~tristang4/pantheon-photos/fix-1272484 into lp:~pantheon-photos/pantheon-photos/trunk

Proposed by Tristan Petersen on 2014-01-26
Status: Merged
Approved by: Daniel Fore on 2014-01-27
Approved revision: 2504
Merged at revision: 2504
Proposed branch: lp:~tristang4/pantheon-photos/fix-1272484
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 267 lines (+4/-125)
4 files modified
src/CollectionPage.vala (+0/-11)
src/PhotoPage.vala (+0/-5)
ui/media.ui (+3/-51)
ui/photo.ui (+1/-58)
To merge this branch: bzr merge lp:~tristang4/pantheon-photos/fix-1272484
Reviewer Review Type Date Requested Status
David Gomes 2014-01-26 Approve on 2014-01-27
Review via email: mp+203228@code.launchpad.net

Commit message

Remove menubar items already present in UI

To post a comment you must log in.
David Gomes (davidgomes) :
review: Approve

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 2013-09-19 19:20:52 +0000
3+++ src/CollectionPage.vala 2014-01-26 05:09:05 +0000
4@@ -73,7 +73,6 @@
5
6 group.add_menu_item("Print");
7 group.add_separator();
8- group.add_menu_item("Publish");
9 group.add_menu_item("SendTo");
10 group.add_menu_item("SetBackground");
11
12@@ -101,14 +100,6 @@
13 private static InjectionGroup create_photos_menu_edits_injectables() {
14 InjectionGroup group = new InjectionGroup("/MenuBar/PhotosMenu/PhotosExtrasEditsPlaceholder");
15
16- group.add_menu_item("RotateClockwise");
17- group.add_menu_item("RotateCounterclockwise");
18- group.add_menu_item("FlipHorizontally");
19- group.add_menu_item("FlipVertically");
20- group.add_separator();
21- group.add_menu_item("Enhance");
22- group.add_menu_item("Revert");
23- group.add_separator();
24 group.add_menu_item("CopyColorAdjustments");
25 group.add_menu_item("PasteColorAdjustments");
26
27@@ -126,8 +117,6 @@
28 private static InjectionGroup create_photos_menu_externals_injectables() {
29 InjectionGroup group = new InjectionGroup("/MenuBar/PhotosMenu/PhotosExtrasExternalsPlaceholder");
30
31- group.add_menu_item("ExternalEdit");
32- group.add_menu_item("ExternalEditRAW");
33 group.add_menu_item("PlayVideo");
34
35 return group;
36
37=== modified file 'src/PhotoPage.vala'
38--- src/PhotoPage.vala 2013-11-19 23:38:42 +0000
39+++ src/PhotoPage.vala 2014-01-26 05:09:05 +0000
40@@ -2667,11 +2667,6 @@
41
42 groups += print_group;
43
44- InjectionGroup publish_group = new InjectionGroup("/MenuBar/FileMenu/PublishPlaceholder");
45- publish_group.add_menu_item("Publish");
46-
47- groups += publish_group;
48-
49 InjectionGroup bg_group = new InjectionGroup("/MenuBar/FileMenu/SetBackgroundPlaceholder");
50 bg_group.add_menu_item("SetBackground");
51
52
53=== modified file 'ui/media.ui'
54--- ui/media.ui 2013-01-28 22:35:44 +0000
55+++ ui/media.ui 2014-01-26 05:09:05 +0000
56@@ -7,24 +7,14 @@
57 <menuitem name="Export" action="Export" />
58 <separator />
59 <placeholder name="FileExtrasPlaceholder" />
60- <separator />
61- <menuitem name="JumpToFile" action="CommonJumpToFile" />
62- <separator />
63- <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
64- <separator />
65- <menuitem name="Quit" action="CommonQuit" />
66 </menu>
67
68 <menu name="EditMenu" action="EditMenu">
69 <menuitem name="Undo" action="CommonUndo" />
70 <menuitem name="Redo" action="CommonRedo" />
71 <separator />
72- <menuitem name="Find" action="CommonFind" />
73- <menuitem name="NewSearch" action="CommonNewSearch" />
74- <separator />
75 <placeholder name="EditExtrasPlaceholder" />
76 <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
77- <menuitem name="MoveToTrash" action="MoveToTrash" />
78 <separator />
79 <menuitem name="SelectAll" action="CommonSelectAll" />
80 <separator />
81@@ -34,7 +24,6 @@
82 <menu name="ViewMenu" action="ViewMenu">
83 <menuitem name="DisplayBasicProperties" action="CommonDisplayBasicProperties" />
84 <menuitem name="DisplayExtendedProperties" action="CommonDisplayExtendedProperties" />
85- <menuitem name="DisplaySearchbar" action="CommonDisplaySearchbar" />
86 <menuitem name="DisplaySidebar" action="CommonDisplaySidebar" />
87 <separator />
88 <menuitem name="ViewTitle" action="ViewTitle" />
89@@ -42,17 +31,6 @@
90 <menuitem name="ViewTags" action="ViewTags" />
91 <menuitem name="ViewRatings" action="ViewRatings" />
92 <separator />
93- <menu name="FilterPhotos" action="CommonFilterPhotos">
94- <menuitem name="DisplayFiveOrHigher" action="CommonDisplayFiveOrHigher" />
95- <menuitem name="DisplayFourOrHigher" action="CommonDisplayFourOrHigher" />
96- <menuitem name="DisplayThreeOrHigher" action="CommonDisplayThreeOrHigher" />
97- <menuitem name="DisplayTwoOrHigher" action="CommonDisplayTwoOrHigher" />
98- <menuitem name="DisplayOneOrHigher" action="CommonDisplayOneOrHigher" />
99- <menuitem name="DisplayUnratedOrHigher" action="CommonDisplayUnratedOrHigher" />
100- <menuitem name="DisplayRejectedOrHigher" action="CommonDisplayRejectedOrHigher" />
101- <menuitem name="DisplayRejectedOnly" action="CommonDisplayRejectedOnly" />
102- </menu>
103- <separator />
104 <menu name="SortPhotos" action="SortPhotos">
105 <menuitem name="SortByTitle" action="SortByTitle" />
106 <menuitem name="SortByExposureDate" action="SortByExposureDate" />
107@@ -66,38 +44,17 @@
108 <menuitem name="SortEventsDescending" action="CommonSortEventsDescending" />
109 </menu>
110 <separator />
111- <menuitem name="IncreaseSize" action="IncreaseSize" />
112- <menuitem name="DecreaseSize" action="DecreaseSize" />
113- <separator />
114 <placeholder name="ViewExtrasFullscreenSlideshowPlaceholder" />
115 </menu>
116
117 <menu name="PhotosMenu" action="PhotosMenu">
118+ <menuitem name="FlipHorizontally" action="FlipHorizontally" />
119+ <menuitem name="FlipVertically" action="FlipVertically" />
120+ <separator />
121 <placeholder name="PhotosExtrasEditsPlaceholder" />
122 <separator />
123- <menuitem name="Flag" action="Flag" />
124- <menu name="Rate" action="Rate">
125- <menuitem name="RateFive" action="RateFive" />
126- <menuitem name="RateFour" action="RateFour" />
127- <menuitem name="RateThree" action="RateThree" />
128- <menuitem name="RateTwo" action="RateTwo" />
129- <menuitem name="RateOne" action="RateOne" />
130- <menuitem name="RateUnrated" action="RateUnrated" />
131- <menuitem name="RateRejected" action="RateRejected" />
132- <separator />
133- <menuitem name="IncreaseRating" action="IncreaseRating" />
134- <menuitem name="DecreaseRating" action="DecreaseRating" />
135- </menu>
136- <separator />
137- <menuitem name="EditTitle" action="EditTitle" />
138- <menuitem name="EditComment" action="EditComment" />
139 <placeholder name="PhotosExtrasDateTimePlaceholder" />
140 <separator />
141- <menu name="RawDeveloper" action="RawDeveloper">
142- <menuitem name="RawDeveloperShotwell" action="RawDeveloperShotwell" />
143- <menuitem name="RawDeveloperCamera" action="RawDeveloperCamera" />
144- </menu>
145- <separator />
146 <placeholder name="PhotosExtrasExternalsPlaceholder" />
147 </menu>
148
149@@ -106,11 +63,6 @@
150 <menuitem name="CommonJumpToEvent" action="CommonJumpToEvent" />
151 </menu>
152
153- <menu name="TagsMenu" action="TagsMenu">
154- <menuitem name="AddTags" action="AddTags" />
155- <menuitem name="ModifyTags" action="ModifyTags" />
156- </menu>
157-
158 <placeholder name="FacesMenuPlaceholder" />
159
160 <menu name="HelpMenu" action="HelpMenu">
161
162=== modified file 'ui/photo.ui'
163--- ui/photo.ui 2013-08-27 21:36:49 +0000
164+++ ui/photo.ui 2014-01-26 05:09:05 +0000
165@@ -8,25 +8,15 @@
166 <separator />
167 <placeholder name="PrintPlaceholder" />
168 <separator />
169- <placeholder name="PublishPlaceholder" />
170 <menuitem name="SendTo" action="SendTo" />
171 <placeholder name="SetBackgroundPlaceholder" />
172- <separator />
173- <menuitem name="JumpToFile" action="CommonJumpToFile" />
174- <separator />
175- <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
176- <separator />
177- <menuitem name="Quit" action="CommonQuit" />
178 </menu>
179
180 <menu name="EditMenu" action="EditMenu">
181 <menuitem name="Undo" action="CommonUndo" />
182 <menuitem name="Redo" action="CommonRedo" />
183 <separator />
184- <menuitem name="NewSearch" action="CommonNewSearch" />
185- <separator />
186 <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
187- <menuitem name="MoveToTrash" action="MoveToTrash" />
188 <separator />
189 <menuitem name="Preferences" action="CommonPreferences" />
190 </menu>
191@@ -43,9 +33,6 @@
192 <menuitem name="SortEventsDescending" action="CommonSortEventsDescending" />
193 </menu>
194 <separator />
195- <menuitem name="IncreaseSize" action="IncreaseSize" />
196- <menuitem name="DecreaseSize" action="DecreaseSize" />
197- <separator />
198 <menuitem name="ZoomFit" action="ZoomFit" />
199 <menuitem name="Zoom100" action="Zoom100" />
200 <menuitem name="Zoom200" action="Zoom200" />
201@@ -56,58 +43,15 @@
202 </menu>
203
204 <menu name="PhotoMenu" action="PhotoMenu">
205- <menuitem name="PrevPhoto" action="PrevPhoto" />
206- <menuitem name="NextPhoto" action="NextPhoto" />
207- <separator />
208- <menuitem name="RotateClockwise" action="RotateClockwise" />
209- <menuitem name="RotateCounterclockwise" action="RotateCounterclockwise" />
210 <menuitem name="FlipHorizontally" action="FlipHorizontally" />
211 <menuitem name="FlipVertically" action="FlipVertically" />
212 <separator />
213- <menu name="Tools" action="Tools">
214- <menuitem name="Enhance" action="Enhance" />
215- <menuitem name="Crop" action="Crop" />
216- <menuitem name="Straighten" action="Straighten" />
217- <menuitem name="RedEye" action="RedEye" />
218- <menuitem name="Adjust" action="Adjust" />
219- </menu>
220- <menuitem name="Revert" action="Revert" />
221- <separator />
222 <menuitem name="CopyColorAdjustments" action="CopyColorAdjustments" />
223 <menuitem name="PasteColorAdjustments" action="PasteColorAdjustments" />
224 <separator/>
225- <menuitem name="Flag" action="Flag" />
226- <menu name="Rate" action="Rate">
227- <menuitem name="RateFive" action="RateFive" />
228- <menuitem name="RateFour" action="RateFour" />
229- <menuitem name="RateThree" action="RateThree" />
230- <menuitem name="RateTwo" action="RateTwo" />
231- <menuitem name="RateOne" action="RateOne" />
232- <menuitem name="RateUnrated" action="RateUnrated" />
233- <menuitem name="RateRejected" action="RateRejected" />
234- <separator />
235- <menuitem name="IncreaseRating" action="IncreaseRating" />
236- <menuitem name="DecreaseRating" action="DecreaseRating" />
237- </menu>
238- <separator />
239- <menuitem name="EditTitle" action="EditTitle" />
240- <menuitem name="EditComment" action="EditComment" />
241 <menuitem name="AdjustDateTime" action="AdjustDateTime" />
242- <separator />
243- <menu name="RawDeveloper" action="RawDeveloper">
244- <menuitem name="RawDeveloperShotwell" action="RawDeveloperShotwell" />
245- <menuitem name="RawDeveloperCamera" action="RawDeveloperCamera" />
246- </menu>
247- <separator />
248- <menuitem name="ExternalEdit" action="ExternalEdit" />
249- <menuitem name="ExternalEditRAW" action="ExternalEditRAW" />
250 </menu>
251
252- <menu name="TagsMenu" action="TagsMenu">
253- <menuitem name="AddTags" action="AddTags" />
254- <menuitem name="ModifyTags" action="ModifyTags" />
255- </menu>
256-
257 <menu name="HelpMenu" action="HelpMenu">
258 <menuitem name="Contents" action="CommonHelpContents" />
259 <menuitem name="Frequently Asked Questions" action="CommonHelpFAQ" />
260@@ -124,5 +68,4 @@
261 </placeholder>
262 </popup>
263
264-</ui>
265-
266+</ui>
267\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: