Photos

Merge lp:~vikoadi/pantheon-photos/clean-menubar into lp:~pantheon-photos/pantheon-photos/trunk

  1. clean-menubar
  2. Merge into trunk
Proposed by Viko Adi Rahmawan
Status: Merged
Approved by: Danielle Foré
Approved revision: 2604
Merged at revision: 2605
Proposed branch: lp:~vikoadi/pantheon-photos/clean-menubar
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 396 lines (+16/-119)
15 files modified
src/CollectionPage.vala (+3/-12)
src/MediaPage.vala (+0/-7)
src/db/PhotoTable.vala (+3/-4)
ui/collection.ui (+3/-0)
ui/direct.ui (+0/-32)
ui/event.ui (+1/-5)
ui/events_directory.ui (+1/-8)
ui/import.ui (+0/-6)
ui/import_queue.ui (+1/-4)
ui/media.ui (+0/-11)
ui/offline.ui (+0/-5)
ui/photo.ui (+0/-2)
ui/photo_context.ui (+1/-0)
ui/tags.ui (+1/-10)
ui/trash.ui (+2/-13)
To merge this branch: bzr merge lp:~vikoadi/pantheon-photos/clean-menubar
Reviewer Review Type Date Requested Status
Danielle Foré ux Approve
meese Approve
Review via email: mp+232400@code.launchpad.net

Commit message

* Move Duplicate and Remove from Library to context menu
* remove Play Video
* clean duplicated menu item
* fix photo duplicating

Description of the change

* Move Duplicate and Remove from Library to context menu
* remove Play Video
* clean duplicated menu item
* fix photo duplicating

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) wrote :

Hm I'm experiencing a crash here that I'm not experiencing with the last daily build. Right-clicking on trash causes the crash:

src/Page.vala:1344:checkerboard_page_real_get_page_sidebar_menu: assertion failed: (menu != null)

lp:~vikoadi/pantheon-photos/clean-menubar updated
2603. By Viko Adi Rahmawan

fix missing popup menu, rearrange remove from library

2604. By Viko Adi Rahmawan

rearrange removetagsfromphoto

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

I'm not really sure where should i put "Duplicate" and the arrangement of Remove from Library-Move to Trash-Remove Tag from

Revision history for this message
meese (meese) wrote :

Works now and code looks fine still needs a UX approve though I think?

(and sorry for breaking duplicate my bad thank you for fixing!)

review: Approve
Revision history for this message
Danielle Foré (danrabbit) wrote :

I want to sit down and come up with a good order for that menu, but let's do it in another merge once its contents settle down a bit :)

review: Approve (ux)

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-25 06:04:50 +0000
3+++ src/CollectionPage.vala 2014-08-28 02:36:47 +0000
4@@ -91,8 +91,8 @@
5 return group;
6 }
7
8- private static InjectionGroup create_edit_menu_injectables () {
9- InjectionGroup group = new InjectionGroup ("/MenuBar/EditMenu/EditExtrasPlaceholder");
10+ private static InjectionGroup create_context_menu_injectables () {
11+ InjectionGroup group = new InjectionGroup ("/CollectionContextMenu/EditExtrasPlaceholder");
12
13 group.add_menu_item ("Duplicate");
14
15@@ -107,14 +107,6 @@
16 return group;
17 }
18
19- private static InjectionGroup create_photos_menu_externals_injectables () {
20- InjectionGroup group = new InjectionGroup ("/MenuBar/PhotosMenu/PhotosExtrasExternalsPlaceholder");
21-
22- group.add_menu_item ("PlayVideo");
23-
24- return group;
25- }
26-
27 protected override void init_collect_ui_filenames (Gee.List<string> ui_filenames) {
28 base.init_collect_ui_filenames (ui_filenames);
29
30@@ -227,9 +219,8 @@
31 InjectionGroup[] groups = base.init_collect_injection_groups ();
32
33 groups += create_file_menu_injectables ();
34- groups += create_edit_menu_injectables ();
35+ groups += create_context_menu_injectables ();
36 groups += create_view_menu_fullscreen_injectables ();
37- groups += create_photos_menu_externals_injectables ();
38
39 return groups;
40 }
41
42=== modified file 'src/MediaPage.vala'
43--- src/MediaPage.vala 2014-08-25 06:10:33 +0000
44+++ src/MediaPage.vala 2014-08-28 02:36:47 +0000
45@@ -377,13 +377,6 @@
46 filter_photos.label = Resources.FILTER_PHOTOS_MENU;
47 actions += filter_photos;
48
49- Gtk.ActionEntry play = { "PlayVideo", Gtk.Stock.MEDIA_PLAY, TRANSLATABLE, "<Ctrl>Y",
50- TRANSLATABLE, on_play_video
51- };
52- play.label = _ ("_Play Video");
53- play.tooltip = _ ("Open the selected videos in the system video player");
54- actions += play;
55-
56 Gtk.ActionEntry raw_developer = { "RawDeveloper", null, TRANSLATABLE, null, null, null };
57 raw_developer.label = _ ("_Developer");
58 actions += raw_developer;
59
60=== modified file 'src/db/PhotoTable.vala'
61--- src/db/PhotoTable.vala 2014-08-22 08:57:09 +0000
62+++ src/db/PhotoTable.vala 2014-08-28 02:36:47 +0000
63@@ -360,7 +360,7 @@
64 + "original_orientation, import_id, event_id, transformations, md5, thumbnail_md5, "
65 + "exif_md5, time_created, flags, rating, file_format, title, backlinks, "
66 + "time_reimported, editable_id, metadata_dirty, developer, develop_shotwell_id, "
67- + "develop_camera_id, develop_embedded_id, comment, enhanced, original_transforms"
68+ + "develop_camera_id, develop_embedded_id, comment, enhanced, original_transforms "
69 + "FROM PhotoTable WHERE id=?",
70 -1, out stmt);
71 assert (res == Sqlite.OK);
72@@ -474,8 +474,8 @@
73 + "timestamp, exposure_time, orientation, original_orientation, import_id, event_id, "
74 + "transformations, md5, thumbnail_md5, exif_md5, time_created, flags, rating, "
75 + "file_format, title, editable_id, developer, develop_shotwell_id, develop_camera_id, "
76- + "develop_embedded_id, comment, enhanced) "
77- + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
78+ + "develop_embedded_id, comment, enhanced, original_transforms) "
79+ + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
80 -1, out stmt);
81 assert (res == Sqlite.OK);
82
83@@ -1283,4 +1283,3 @@
84 update_int64_by_id_2 (id.id, "timestamp", timestamp);
85 }
86 }
87-
88
89=== modified file 'ui/collection.ui'
90--- ui/collection.ui 2014-08-25 06:04:50 +0000
91+++ ui/collection.ui 2014-08-28 02:36:47 +0000
92@@ -29,6 +29,7 @@
93 </menu>
94 <separator />
95 <menuitem name="AdjustDateTime" action="AdjustDateTime" />
96+ <placeholder name="EditExtrasPlaceholder" />
97 <menu name="OpenWith" action="OpenWith">
98 </menu>
99 <menu name="OpenWithRaw" action="OpenWithRaw">
100@@ -41,6 +42,8 @@
101 <menuitem name="ContextExport" action="Export" />
102 <placeholder name="ContractorPlaceholder" />
103 <separator />
104+ <placeholder name="ContextTagsPlaceholder" />
105+ <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
106 <menuitem name="ContextMoveToTrash" action="MoveToTrash" />
107 </popup>
108
109
110=== modified file 'ui/direct.ui'
111--- ui/direct.ui 2014-08-25 01:57:28 +0000
112+++ ui/direct.ui 2014-08-28 02:36:47 +0000
113@@ -4,10 +4,6 @@
114 <menu name="FileMenu" action="FileMenu">
115 <menuitem name="Save" action="Save" />
116 <menuitem name="SaveAs" action="SaveAs" />
117- <separator />
118- <menuitem name="JumpToFile" action="CommonJumpToFile" />
119- <separator />
120- <menuitem name="Quit" action="CommonQuit" />
121 </menu>
122
123 <menu name="EditMenu" action="EditMenu">
124@@ -15,34 +11,6 @@
125 <menuitem name="Redo" action="CommonRedo" />
126 </menu>
127
128- <menu name="ViewMenu" action="ViewMenu">
129- <menuitem name="Fullscreen" action="CommonFullscreen" />
130- <separator />
131- <menuitem name="IncreaseSize" action="IncreaseSize" />
132- <menuitem name="DecreaseSize" action="DecreaseSize" />
133- <separator />
134- <menuitem name="ZoomFit" action="ZoomFit" />
135- <menuitem name="Zoom100" action="Zoom100" />
136- <menuitem name="Zoom200" action="Zoom200" />
137- </menu>
138-
139- <menu name="PhotoMenu" action="PhotoMenu">
140- <menuitem name="PrevPhoto" action="PrevPhoto" />
141- <menuitem name="NextPhoto" action="NextPhoto" />
142- <separator />
143- <menuitem name="RotateClockwise" action="RotateClockwise" />
144- <menuitem name="RotateCounterclockwise" action="RotateCounterclockwise" />
145- <separator />
146- <menu name="Tools" action="Tools">
147- <menuitem name="Enhance" action="Enhance" />
148- <menuitem name="Crop" action="Crop" />
149- <menuitem name="Straighten" action="Straighten" />
150- <menuitem name="RedEye" action="RedEye" />
151- <menuitem name="Adjust" action="Adjust" />
152- </menu>
153- <menuitem name="Revert" action="Revert" />
154- </menu>
155-
156 <menu name="HelpMenu" action="HelpMenu">
157 <menuitem name="About" action="CommonAbout" />
158 </menu>
159
160=== modified file 'ui/event.ui'
161--- ui/event.ui 2014-05-27 06:18:57 +0000
162+++ ui/event.ui 2014-08-28 02:36:47 +0000
163@@ -1,10 +1,6 @@
164 <ui>
165
166 <menubar name="MenuBar">
167- <menu name="PhotosMenu" action="PhotosMenu">
168- <separator />
169- <menuitem name="MakePrimary" action="MakePrimary" />
170- </menu>
171 </menubar>
172
173 <popup name="CollectionContextMenu">
174@@ -17,4 +13,4 @@
175 <menuitem name="EditEventComment" action="EditEventComment" />
176 </popup>
177
178-</ui>
179+</ui>
180\ No newline at end of file
181
182=== modified file 'ui/events_directory.ui'
183--- ui/events_directory.ui 2014-08-21 02:53:28 +0000
184+++ ui/events_directory.ui 2014-08-28 02:36:47 +0000
185@@ -4,19 +4,12 @@
186 <menu name="FileMenu" action="FileMenu">
187 <menuitem name="Import" action="CommonFileImport" />
188 <menuitem name="ImportExternal" action="ExternalLibraryImport" />
189- <separator />
190- <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
191- <separator />
192- <menuitem name="Quit" action="CommonQuit" />
193 </menu>
194
195 <menu name="EditMenu" action="EditMenu">
196 <menuitem name="Undo" action="CommonUndo" />
197 <menuitem name="Redo" action="CommonRedo" />
198 <separator />
199- <menuitem name="Find" action="CommonFind" />
200- <menuitem name="NewSearch" action="CommonNewSearch" />
201- <separator />
202 <menuitem name="Preferences" action="CommonPreferences" />
203 </menu>
204
205@@ -47,4 +40,4 @@
206 <menuitem name="SelectAll" action="CommonSelectAll" />
207 </popup>
208
209-</ui>
210+</ui>
211\ No newline at end of file
212
213=== modified file 'ui/import.ui'
214--- ui/import.ui 2014-08-21 02:53:28 +0000
215+++ ui/import.ui 2014-08-28 02:36:47 +0000
216@@ -6,18 +6,12 @@
217 <menuitem name="ImportSelected" action="ImportSelected" />
218 <menuitem name="ImportAll" action="ImportAll" />
219 <menuitem name="ImportExternal" action="ExternalLibraryImport" />
220- <separator />
221- <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
222- <separator />
223- <menuitem name="Quit" action="CommonQuit" />
224 </menu>
225
226 <menu name="EditMenu" action="EditMenu">
227 <menuitem name="Undo" action="CommonUndo" />
228 <menuitem name="Redo" action="CommonRedo" />
229 <separator />
230- <menuitem name="Find" action="CommonFind" />
231- <separator />
232 <menuitem name="Preferences" action="CommonPreferences" />
233 </menu>
234
235
236=== modified file 'ui/import_queue.ui'
237--- ui/import_queue.ui 2014-08-05 14:06:52 +0000
238+++ ui/import_queue.ui 2014-08-28 02:36:47 +0000
239@@ -7,9 +7,6 @@
240 <menuitem name="Import" action="CommonFileImport" />
241 <menuitem name="ImportExternal" action="ExternalLibraryImport" />
242 <separator />
243- <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
244- <separator />
245- <menuitem name="Quit" action="CommonQuit" />
246 </menu>
247
248 <menu name="ViewMenu" action="ViewMenu">
249@@ -24,4 +21,4 @@
250 </menu>
251 </menubar>
252
253-</ui>
254+</ui>
255\ No newline at end of file
256
257=== modified file 'ui/media.ui'
258--- ui/media.ui 2014-08-25 06:04:50 +0000
259+++ ui/media.ui 2014-08-28 02:36:47 +0000
260@@ -4,26 +4,15 @@
261 <menu name="FileMenu" action="FileMenu">
262 <menuitem name="Import" action="CommonFileImport" />
263 <menuitem name="ImportExternal" action="ExternalLibraryImport" />
264- <separator />
265- <placeholder name="FileExtrasPlaceholder" />
266 </menu>
267
268 <menu name="EditMenu" action="EditMenu">
269 <menuitem name="Undo" action="CommonUndo" />
270 <menuitem name="Redo" action="CommonRedo" />
271 <separator />
272- <placeholder name="EditExtrasPlaceholder" />
273- <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
274- <separator />
275 <menuitem name="Preferences" action="CommonPreferences" />
276 </menu>
277
278- <menu name="PhotosMenu" action="PhotosMenu">
279- <placeholder name="PhotosExtrasEditsPlaceholder" />
280- <separator />
281- <placeholder name="PhotosExtrasExternalsPlaceholder" />
282- </menu>
283-
284 <placeholder name="FacesMenuPlaceholder" />
285
286 <menu name="HelpMenu" action="HelpMenu">
287
288=== modified file 'ui/offline.ui'
289--- ui/offline.ui 2014-08-21 02:53:28 +0000
290+++ ui/offline.ui 2014-08-28 02:36:47 +0000
291@@ -14,11 +14,6 @@
292 <menuitem name="Undo" action="CommonUndo" />
293 <menuitem name="Redo" action="CommonRedo" />
294 <separator />
295- <menuitem name="Find" action="CommonFind" />
296- <menuitem name="NewSearch" action="CommonNewSearch" />
297- <separator />
298- <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
299- <separator />
300 <menuitem name="Preferences" action="CommonPreferences" />
301 </menu>
302
303
304=== modified file 'ui/photo.ui'
305--- ui/photo.ui 2014-08-25 06:04:50 +0000
306+++ ui/photo.ui 2014-08-28 02:36:47 +0000
307@@ -10,8 +10,6 @@
308 <menuitem name="Undo" action="CommonUndo" />
309 <menuitem name="Redo" action="CommonRedo" />
310 <separator />
311- <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
312- <separator />
313 <menuitem name="Preferences" action="CommonPreferences" />
314 </menu>
315
316
317=== modified file 'ui/photo_context.ui'
318--- ui/photo_context.ui 2014-08-25 06:04:50 +0000
319+++ ui/photo_context.ui 2014-08-28 02:36:47 +0000
320@@ -37,6 +37,7 @@
321 <menuitem name="ContextExport" action="Export" />
322 <placeholder name="ContractorPlaceholder" />
323 <separator />
324+ <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
325 <menuitem name="ContextMoveToTrash" action="MoveToTrash" />
326 </popup>
327
328
329=== modified file 'ui/tags.ui'
330--- ui/tags.ui 2011-08-03 02:30:42 +0000
331+++ ui/tags.ui 2014-08-28 02:36:47 +0000
332@@ -1,13 +1,4 @@
333 <ui>
334-
335- <menubar name="MenuBar">
336- <menu name="TagsMenu" action="TagsMenu">
337- <menuitem name="RemoveTagFromPhotos" action="RemoveTagFromPhotos" />
338- <separator />
339- <menuitem name="RenameTag" action="RenameTag" />
340- <menuitem name="DeleteTag" action="DeleteTag" />
341- </menu>
342- </menubar>
343
344 <popup name="CollectionContextMenu">
345 <placeholder name="ContextTagsPlaceholder">
346@@ -22,4 +13,4 @@
347 <menuitem name="ContextRenameTag" action="DeleteTagSidebar" />
348 </popup>
349
350-</ui>
351+</ui>
352\ No newline at end of file
353
354=== modified file 'ui/trash.ui'
355--- ui/trash.ui 2014-08-21 02:53:28 +0000
356+++ ui/trash.ui 2014-08-28 02:36:47 +0000
357@@ -4,23 +4,12 @@
358 <menu name="FileMenu" action="FileMenu">
359 <menuitem name="Import" action="CommonFileImport" />
360 <menuitem name="ImportExternal" action="ExternalLibraryImport" />
361- <separator />
362- <menuitem name="JumpToFile" action="CommonJumpToFile" />
363- <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
364- <separator />
365- <menuitem name="Quit" action="CommonQuit" />
366 </menu>
367
368 <menu name="EditMenu" action="EditMenu">
369 <menuitem name="Undo" action="CommonUndo" />
370 <menuitem name="Redo" action="CommonRedo" />
371 <separator />
372- <menuitem name="Find" action="CommonFind" />
373- <menuitem name="NewSearch" action="CommonNewSearch" />
374- <separator />
375- <menuitem name="Delete" action="Delete" />
376- <menuitem name="Restore" action="Restore" />
377- <separator />
378 <menuitem name="Preferences" action="CommonPreferences" />
379 </menu>
380
381@@ -41,7 +30,7 @@
382 <popup name="TrashPageMenu">
383 <menuitem name="ContextEmptyTrash" action="CommonEmptyTrash" />
384 </popup>
385-
386+
387 <toolbar name="TrashToolbar">
388 <toolitem name="ToolDelete" action="Delete" />
389 <toolitem name="ToolRestore" action="Restore" />
390@@ -74,4 +63,4 @@
391 <menuitem name="SelectAll" action="CommonSelectAll" />
392 </popup>
393
394-</ui>
395+</ui>
396\ No newline at end of file

Subscribers

People subscribed via source and target branches