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
=== modified file 'src/CollectionPage.vala'
--- src/CollectionPage.vala 2014-08-25 06:04:50 +0000
+++ src/CollectionPage.vala 2014-08-28 02:36:47 +0000
@@ -91,8 +91,8 @@
91 return group;91 return group;
92 }92 }
9393
94 private static InjectionGroup create_edit_menu_injectables () {94 private static InjectionGroup create_context_menu_injectables () {
95 InjectionGroup group = new InjectionGroup ("/MenuBar/EditMenu/EditExtrasPlaceholder");95 InjectionGroup group = new InjectionGroup ("/CollectionContextMenu/EditExtrasPlaceholder");
9696
97 group.add_menu_item ("Duplicate");97 group.add_menu_item ("Duplicate");
9898
@@ -107,14 +107,6 @@
107 return group;107 return group;
108 }108 }
109109
110 private static InjectionGroup create_photos_menu_externals_injectables () {
111 InjectionGroup group = new InjectionGroup ("/MenuBar/PhotosMenu/PhotosExtrasExternalsPlaceholder");
112
113 group.add_menu_item ("PlayVideo");
114
115 return group;
116 }
117
118 protected override void init_collect_ui_filenames (Gee.List<string> ui_filenames) {110 protected override void init_collect_ui_filenames (Gee.List<string> ui_filenames) {
119 base.init_collect_ui_filenames (ui_filenames);111 base.init_collect_ui_filenames (ui_filenames);
120112
@@ -227,9 +219,8 @@
227 InjectionGroup[] groups = base.init_collect_injection_groups ();219 InjectionGroup[] groups = base.init_collect_injection_groups ();
228220
229 groups += create_file_menu_injectables ();221 groups += create_file_menu_injectables ();
230 groups += create_edit_menu_injectables ();222 groups += create_context_menu_injectables ();
231 groups += create_view_menu_fullscreen_injectables ();223 groups += create_view_menu_fullscreen_injectables ();
232 groups += create_photos_menu_externals_injectables ();
233224
234 return groups;225 return groups;
235 }226 }
236227
=== modified file 'src/MediaPage.vala'
--- src/MediaPage.vala 2014-08-25 06:10:33 +0000
+++ src/MediaPage.vala 2014-08-28 02:36:47 +0000
@@ -377,13 +377,6 @@
377 filter_photos.label = Resources.FILTER_PHOTOS_MENU;377 filter_photos.label = Resources.FILTER_PHOTOS_MENU;
378 actions += filter_photos;378 actions += filter_photos;
379379
380 Gtk.ActionEntry play = { "PlayVideo", Gtk.Stock.MEDIA_PLAY, TRANSLATABLE, "<Ctrl>Y",
381 TRANSLATABLE, on_play_video
382 };
383 play.label = _ ("_Play Video");
384 play.tooltip = _ ("Open the selected videos in the system video player");
385 actions += play;
386
387 Gtk.ActionEntry raw_developer = { "RawDeveloper", null, TRANSLATABLE, null, null, null };380 Gtk.ActionEntry raw_developer = { "RawDeveloper", null, TRANSLATABLE, null, null, null };
388 raw_developer.label = _ ("_Developer");381 raw_developer.label = _ ("_Developer");
389 actions += raw_developer;382 actions += raw_developer;
390383
=== modified file 'src/db/PhotoTable.vala'
--- src/db/PhotoTable.vala 2014-08-22 08:57:09 +0000
+++ src/db/PhotoTable.vala 2014-08-28 02:36:47 +0000
@@ -360,7 +360,7 @@
360 + "original_orientation, import_id, event_id, transformations, md5, thumbnail_md5, "360 + "original_orientation, import_id, event_id, transformations, md5, thumbnail_md5, "
361 + "exif_md5, time_created, flags, rating, file_format, title, backlinks, "361 + "exif_md5, time_created, flags, rating, file_format, title, backlinks, "
362 + "time_reimported, editable_id, metadata_dirty, developer, develop_shotwell_id, "362 + "time_reimported, editable_id, metadata_dirty, developer, develop_shotwell_id, "
363 + "develop_camera_id, develop_embedded_id, comment, enhanced, original_transforms"363 + "develop_camera_id, develop_embedded_id, comment, enhanced, original_transforms "
364 + "FROM PhotoTable WHERE id=?",364 + "FROM PhotoTable WHERE id=?",
365 -1, out stmt);365 -1, out stmt);
366 assert (res == Sqlite.OK);366 assert (res == Sqlite.OK);
@@ -474,8 +474,8 @@
474 + "timestamp, exposure_time, orientation, original_orientation, import_id, event_id, "474 + "timestamp, exposure_time, orientation, original_orientation, import_id, event_id, "
475 + "transformations, md5, thumbnail_md5, exif_md5, time_created, flags, rating, "475 + "transformations, md5, thumbnail_md5, exif_md5, time_created, flags, rating, "
476 + "file_format, title, editable_id, developer, develop_shotwell_id, develop_camera_id, "476 + "file_format, title, editable_id, developer, develop_shotwell_id, develop_camera_id, "
477 + "develop_embedded_id, comment, enhanced) "477 + "develop_embedded_id, comment, enhanced, original_transforms) "
478 + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",478 + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
479 -1, out stmt);479 -1, out stmt);
480 assert (res == Sqlite.OK);480 assert (res == Sqlite.OK);
481481
@@ -1283,4 +1283,3 @@
1283 update_int64_by_id_2 (id.id, "timestamp", timestamp);1283 update_int64_by_id_2 (id.id, "timestamp", timestamp);
1284 }1284 }
1285}1285}
1286
12871286
=== modified file 'ui/collection.ui'
--- ui/collection.ui 2014-08-25 06:04:50 +0000
+++ ui/collection.ui 2014-08-28 02:36:47 +0000
@@ -29,6 +29,7 @@
29 </menu>29 </menu>
30 <separator />30 <separator />
31 <menuitem name="AdjustDateTime" action="AdjustDateTime" />31 <menuitem name="AdjustDateTime" action="AdjustDateTime" />
32 <placeholder name="EditExtrasPlaceholder" />
32 <menu name="OpenWith" action="OpenWith">33 <menu name="OpenWith" action="OpenWith">
33 </menu>34 </menu>
34 <menu name="OpenWithRaw" action="OpenWithRaw">35 <menu name="OpenWithRaw" action="OpenWithRaw">
@@ -41,6 +42,8 @@
41 <menuitem name="ContextExport" action="Export" />42 <menuitem name="ContextExport" action="Export" />
42 <placeholder name="ContractorPlaceholder" />43 <placeholder name="ContractorPlaceholder" />
43 <separator />44 <separator />
45 <placeholder name="ContextTagsPlaceholder" />
46 <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
44 <menuitem name="ContextMoveToTrash" action="MoveToTrash" />47 <menuitem name="ContextMoveToTrash" action="MoveToTrash" />
45 </popup>48 </popup>
46 49
4750
=== modified file 'ui/direct.ui'
--- ui/direct.ui 2014-08-25 01:57:28 +0000
+++ ui/direct.ui 2014-08-28 02:36:47 +0000
@@ -4,10 +4,6 @@
4 <menu name="FileMenu" action="FileMenu">4 <menu name="FileMenu" action="FileMenu">
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 />
8 <menuitem name="JumpToFile" action="CommonJumpToFile" />
9 <separator />
10 <menuitem name="Quit" action="CommonQuit" />
11 </menu>7 </menu>
12 8
13 <menu name="EditMenu" action="EditMenu">9 <menu name="EditMenu" action="EditMenu">
@@ -15,34 +11,6 @@
15 <menuitem name="Redo" action="CommonRedo" />11 <menuitem name="Redo" action="CommonRedo" />
16 </menu>12 </menu>
17 13
18 <menu name="ViewMenu" action="ViewMenu">
19 <menuitem name="Fullscreen" action="CommonFullscreen" />
20 <separator />
21 <menuitem name="IncreaseSize" action="IncreaseSize" />
22 <menuitem name="DecreaseSize" action="DecreaseSize" />
23 <separator />
24 <menuitem name="ZoomFit" action="ZoomFit" />
25 <menuitem name="Zoom100" action="Zoom100" />
26 <menuitem name="Zoom200" action="Zoom200" />
27 </menu>
28
29 <menu name="PhotoMenu" action="PhotoMenu">
30 <menuitem name="PrevPhoto" action="PrevPhoto" />
31 <menuitem name="NextPhoto" action="NextPhoto" />
32 <separator />
33 <menuitem name="RotateClockwise" action="RotateClockwise" />
34 <menuitem name="RotateCounterclockwise" action="RotateCounterclockwise" />
35 <separator />
36 <menu name="Tools" action="Tools">
37 <menuitem name="Enhance" action="Enhance" />
38 <menuitem name="Crop" action="Crop" />
39 <menuitem name="Straighten" action="Straighten" />
40 <menuitem name="RedEye" action="RedEye" />
41 <menuitem name="Adjust" action="Adjust" />
42 </menu>
43 <menuitem name="Revert" action="Revert" />
44 </menu>
45
46 <menu name="HelpMenu" action="HelpMenu">14 <menu name="HelpMenu" action="HelpMenu">
47 <menuitem name="About" action="CommonAbout" />15 <menuitem name="About" action="CommonAbout" />
48 </menu>16 </menu>
4917
=== modified file 'ui/event.ui'
--- ui/event.ui 2014-05-27 06:18:57 +0000
+++ ui/event.ui 2014-08-28 02:36:47 +0000
@@ -1,10 +1,6 @@
1<ui>1<ui>
22
3 <menubar name="MenuBar">3 <menubar name="MenuBar">
4 <menu name="PhotosMenu" action="PhotosMenu">
5 <separator />
6 <menuitem name="MakePrimary" action="MakePrimary" />
7 </menu>
8 </menubar>4 </menubar>
95
10 <popup name="CollectionContextMenu">6 <popup name="CollectionContextMenu">
@@ -17,4 +13,4 @@
17 <menuitem name="EditEventComment" action="EditEventComment" />13 <menuitem name="EditEventComment" action="EditEventComment" />
18 </popup>14 </popup>
19 15
20</ui>16</ui>
21\ No newline at end of file17\ No newline at end of file
2218
=== modified file 'ui/events_directory.ui'
--- ui/events_directory.ui 2014-08-21 02:53:28 +0000
+++ ui/events_directory.ui 2014-08-28 02:36:47 +0000
@@ -4,19 +4,12 @@
4 <menu name="FileMenu" action="FileMenu">4 <menu name="FileMenu" action="FileMenu">
5 <menuitem name="Import" action="CommonFileImport" />5 <menuitem name="Import" action="CommonFileImport" />
6 <menuitem name="ImportExternal" action="ExternalLibraryImport" />6 <menuitem name="ImportExternal" action="ExternalLibraryImport" />
7 <separator />
8 <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
9 <separator />
10 <menuitem name="Quit" action="CommonQuit" />
11 </menu>7 </menu>
128
13 <menu name="EditMenu" action="EditMenu">9 <menu name="EditMenu" action="EditMenu">
14 <menuitem name="Undo" action="CommonUndo" />10 <menuitem name="Undo" action="CommonUndo" />
15 <menuitem name="Redo" action="CommonRedo" />11 <menuitem name="Redo" action="CommonRedo" />
16 <separator />12 <separator />
17 <menuitem name="Find" action="CommonFind" />
18 <menuitem name="NewSearch" action="CommonNewSearch" />
19 <separator />
20 <menuitem name="Preferences" action="CommonPreferences" />13 <menuitem name="Preferences" action="CommonPreferences" />
21 </menu>14 </menu>
22 15
@@ -47,4 +40,4 @@
47 <menuitem name="SelectAll" action="CommonSelectAll" />40 <menuitem name="SelectAll" action="CommonSelectAll" />
48 </popup>41 </popup>
4942
50</ui>43</ui>
51\ No newline at end of file44\ No newline at end of file
5245
=== modified file 'ui/import.ui'
--- ui/import.ui 2014-08-21 02:53:28 +0000
+++ ui/import.ui 2014-08-28 02:36:47 +0000
@@ -6,18 +6,12 @@
6 <menuitem name="ImportSelected" action="ImportSelected" />6 <menuitem name="ImportSelected" action="ImportSelected" />
7 <menuitem name="ImportAll" action="ImportAll" />7 <menuitem name="ImportAll" action="ImportAll" />
8 <menuitem name="ImportExternal" action="ExternalLibraryImport" />8 <menuitem name="ImportExternal" action="ExternalLibraryImport" />
9 <separator />
10 <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
11 <separator />
12 <menuitem name="Quit" action="CommonQuit" />
13 </menu>9 </menu>
14 10
15 <menu name="EditMenu" action="EditMenu">11 <menu name="EditMenu" action="EditMenu">
16 <menuitem name="Undo" action="CommonUndo" />12 <menuitem name="Undo" action="CommonUndo" />
17 <menuitem name="Redo" action="CommonRedo" />13 <menuitem name="Redo" action="CommonRedo" />
18 <separator />14 <separator />
19 <menuitem name="Find" action="CommonFind" />
20 <separator />
21 <menuitem name="Preferences" action="CommonPreferences" />15 <menuitem name="Preferences" action="CommonPreferences" />
22 </menu>16 </menu>
23 17
2418
=== modified file 'ui/import_queue.ui'
--- ui/import_queue.ui 2014-08-05 14:06:52 +0000
+++ ui/import_queue.ui 2014-08-28 02:36:47 +0000
@@ -7,9 +7,6 @@
7 <menuitem name="Import" action="CommonFileImport" />7 <menuitem name="Import" action="CommonFileImport" />
8 <menuitem name="ImportExternal" action="ExternalLibraryImport" />8 <menuitem name="ImportExternal" action="ExternalLibraryImport" />
9 <separator />9 <separator />
10 <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
11 <separator />
12 <menuitem name="Quit" action="CommonQuit" />
13 </menu>10 </menu>
14 11
15 <menu name="ViewMenu" action="ViewMenu">12 <menu name="ViewMenu" action="ViewMenu">
@@ -24,4 +21,4 @@
24 </menu>21 </menu>
25 </menubar>22 </menubar>
2623
27</ui>24</ui>
28\ No newline at end of file25\ No newline at end of file
2926
=== modified file 'ui/media.ui'
--- ui/media.ui 2014-08-25 06:04:50 +0000
+++ ui/media.ui 2014-08-28 02:36:47 +0000
@@ -4,26 +4,15 @@
4 <menu name="FileMenu" action="FileMenu">4 <menu name="FileMenu" action="FileMenu">
5 <menuitem name="Import" action="CommonFileImport" />5 <menuitem name="Import" action="CommonFileImport" />
6 <menuitem name="ImportExternal" action="ExternalLibraryImport" />6 <menuitem name="ImportExternal" action="ExternalLibraryImport" />
7 <separator />
8 <placeholder name="FileExtrasPlaceholder" />
9 </menu>7 </menu>
10 8
11 <menu name="EditMenu" action="EditMenu">9 <menu name="EditMenu" action="EditMenu">
12 <menuitem name="Undo" action="CommonUndo" />10 <menuitem name="Undo" action="CommonUndo" />
13 <menuitem name="Redo" action="CommonRedo" />11 <menuitem name="Redo" action="CommonRedo" />
14 <separator />12 <separator />
15 <placeholder name="EditExtrasPlaceholder" />
16 <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
17 <separator />
18 <menuitem name="Preferences" action="CommonPreferences" />13 <menuitem name="Preferences" action="CommonPreferences" />
19 </menu>14 </menu>
2015
21 <menu name="PhotosMenu" action="PhotosMenu">
22 <placeholder name="PhotosExtrasEditsPlaceholder" />
23 <separator />
24 <placeholder name="PhotosExtrasExternalsPlaceholder" />
25 </menu>
26
27 <placeholder name="FacesMenuPlaceholder" />16 <placeholder name="FacesMenuPlaceholder" />
2817
29 <menu name="HelpMenu" action="HelpMenu">18 <menu name="HelpMenu" action="HelpMenu">
3019
=== modified file 'ui/offline.ui'
--- ui/offline.ui 2014-08-21 02:53:28 +0000
+++ ui/offline.ui 2014-08-28 02:36:47 +0000
@@ -14,11 +14,6 @@
14 <menuitem name="Undo" action="CommonUndo" />14 <menuitem name="Undo" action="CommonUndo" />
15 <menuitem name="Redo" action="CommonRedo" />15 <menuitem name="Redo" action="CommonRedo" />
16 <separator />16 <separator />
17 <menuitem name="Find" action="CommonFind" />
18 <menuitem name="NewSearch" action="CommonNewSearch" />
19 <separator />
20 <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
21 <separator />
22 <menuitem name="Preferences" action="CommonPreferences" />17 <menuitem name="Preferences" action="CommonPreferences" />
23 </menu>18 </menu>
24 19
2520
=== modified file 'ui/photo.ui'
--- ui/photo.ui 2014-08-25 06:04:50 +0000
+++ ui/photo.ui 2014-08-28 02:36:47 +0000
@@ -10,8 +10,6 @@
10 <menuitem name="Undo" action="CommonUndo" />10 <menuitem name="Undo" action="CommonUndo" />
11 <menuitem name="Redo" action="CommonRedo" />11 <menuitem name="Redo" action="CommonRedo" />
12 <separator />12 <separator />
13 <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
14 <separator />
15 <menuitem name="Preferences" action="CommonPreferences" />13 <menuitem name="Preferences" action="CommonPreferences" />
16 </menu>14 </menu>
1715
1816
=== modified file 'ui/photo_context.ui'
--- ui/photo_context.ui 2014-08-25 06:04:50 +0000
+++ ui/photo_context.ui 2014-08-28 02:36:47 +0000
@@ -37,6 +37,7 @@
37 <menuitem name="ContextExport" action="Export" />37 <menuitem name="ContextExport" action="Export" />
38 <placeholder name="ContractorPlaceholder" />38 <placeholder name="ContractorPlaceholder" />
39 <separator />39 <separator />
40 <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
40 <menuitem name="ContextMoveToTrash" action="MoveToTrash" />41 <menuitem name="ContextMoveToTrash" action="MoveToTrash" />
41 </popup>42 </popup>
4243
4344
=== modified file 'ui/tags.ui'
--- ui/tags.ui 2011-08-03 02:30:42 +0000
+++ ui/tags.ui 2014-08-28 02:36:47 +0000
@@ -1,13 +1,4 @@
1<ui>1<ui>
2
3 <menubar name="MenuBar">
4 <menu name="TagsMenu" action="TagsMenu">
5 <menuitem name="RemoveTagFromPhotos" action="RemoveTagFromPhotos" />
6 <separator />
7 <menuitem name="RenameTag" action="RenameTag" />
8 <menuitem name="DeleteTag" action="DeleteTag" />
9 </menu>
10 </menubar>
11 2
12 <popup name="CollectionContextMenu">3 <popup name="CollectionContextMenu">
13 <placeholder name="ContextTagsPlaceholder">4 <placeholder name="ContextTagsPlaceholder">
@@ -22,4 +13,4 @@
22 <menuitem name="ContextRenameTag" action="DeleteTagSidebar" />13 <menuitem name="ContextRenameTag" action="DeleteTagSidebar" />
23 </popup>14 </popup>
2415
25</ui>16</ui>
26\ No newline at end of file17\ No newline at end of file
2718
=== modified file 'ui/trash.ui'
--- ui/trash.ui 2014-08-21 02:53:28 +0000
+++ ui/trash.ui 2014-08-28 02:36:47 +0000
@@ -4,23 +4,12 @@
4 <menu name="FileMenu" action="FileMenu">4 <menu name="FileMenu" action="FileMenu">
5 <menuitem name="Import" action="CommonFileImport" />5 <menuitem name="Import" action="CommonFileImport" />
6 <menuitem name="ImportExternal" action="ExternalLibraryImport" />6 <menuitem name="ImportExternal" action="ExternalLibraryImport" />
7 <separator />
8 <menuitem name="JumpToFile" action="CommonJumpToFile" />
9 <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
10 <separator />
11 <menuitem name="Quit" action="CommonQuit" />
12 </menu>7 </menu>
13 8
14 <menu name="EditMenu" action="EditMenu">9 <menu name="EditMenu" action="EditMenu">
15 <menuitem name="Undo" action="CommonUndo" />10 <menuitem name="Undo" action="CommonUndo" />
16 <menuitem name="Redo" action="CommonRedo" />11 <menuitem name="Redo" action="CommonRedo" />
17 <separator />12 <separator />
18 <menuitem name="Find" action="CommonFind" />
19 <menuitem name="NewSearch" action="CommonNewSearch" />
20 <separator />
21 <menuitem name="Delete" action="Delete" />
22 <menuitem name="Restore" action="Restore" />
23 <separator />
24 <menuitem name="Preferences" action="CommonPreferences" />13 <menuitem name="Preferences" action="CommonPreferences" />
25 </menu>14 </menu>
26 15
@@ -41,7 +30,7 @@
41 <popup name="TrashPageMenu">30 <popup name="TrashPageMenu">
42 <menuitem name="ContextEmptyTrash" action="CommonEmptyTrash" />31 <menuitem name="ContextEmptyTrash" action="CommonEmptyTrash" />
43 </popup>32 </popup>
44 33
45 <toolbar name="TrashToolbar">34 <toolbar name="TrashToolbar">
46 <toolitem name="ToolDelete" action="Delete" />35 <toolitem name="ToolDelete" action="Delete" />
47 <toolitem name="ToolRestore" action="Restore" />36 <toolitem name="ToolRestore" action="Restore" />
@@ -74,4 +63,4 @@
74 <menuitem name="SelectAll" action="CommonSelectAll" />63 <menuitem name="SelectAll" action="CommonSelectAll" />
75 </popup>64 </popup>
76 65
77</ui>66</ui>
78\ No newline at end of file67\ No newline at end of file

Subscribers

People subscribed via source and target branches