Photos

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

  1. fix-1272484
  2. Merge into trunk
Proposed by Tristan Petersen
Status: Merged
Approved by: Danielle Foré
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 (community) Approve
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.
Revision history for this message
David Gomes (davidgomes) :
review: Approve

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 2013-09-19 19:20:52 +0000
+++ src/CollectionPage.vala 2014-01-26 05:09:05 +0000
@@ -73,7 +73,6 @@
73 73
74 group.add_menu_item("Print");74 group.add_menu_item("Print");
75 group.add_separator();75 group.add_separator();
76 group.add_menu_item("Publish");
77 group.add_menu_item("SendTo");76 group.add_menu_item("SendTo");
78 group.add_menu_item("SetBackground");77 group.add_menu_item("SetBackground");
79 78
@@ -101,14 +100,6 @@
101 private static InjectionGroup create_photos_menu_edits_injectables() {100 private static InjectionGroup create_photos_menu_edits_injectables() {
102 InjectionGroup group = new InjectionGroup("/MenuBar/PhotosMenu/PhotosExtrasEditsPlaceholder");101 InjectionGroup group = new InjectionGroup("/MenuBar/PhotosMenu/PhotosExtrasEditsPlaceholder");
103 102
104 group.add_menu_item("RotateClockwise");
105 group.add_menu_item("RotateCounterclockwise");
106 group.add_menu_item("FlipHorizontally");
107 group.add_menu_item("FlipVertically");
108 group.add_separator();
109 group.add_menu_item("Enhance");
110 group.add_menu_item("Revert");
111 group.add_separator();
112 group.add_menu_item("CopyColorAdjustments");103 group.add_menu_item("CopyColorAdjustments");
113 group.add_menu_item("PasteColorAdjustments");104 group.add_menu_item("PasteColorAdjustments");
114 105
@@ -126,8 +117,6 @@
126 private static InjectionGroup create_photos_menu_externals_injectables() {117 private static InjectionGroup create_photos_menu_externals_injectables() {
127 InjectionGroup group = new InjectionGroup("/MenuBar/PhotosMenu/PhotosExtrasExternalsPlaceholder");118 InjectionGroup group = new InjectionGroup("/MenuBar/PhotosMenu/PhotosExtrasExternalsPlaceholder");
128 119
129 group.add_menu_item("ExternalEdit");
130 group.add_menu_item("ExternalEditRAW");
131 group.add_menu_item("PlayVideo");120 group.add_menu_item("PlayVideo");
132 121
133 return group;122 return group;
134123
=== modified file 'src/PhotoPage.vala'
--- src/PhotoPage.vala 2013-11-19 23:38:42 +0000
+++ src/PhotoPage.vala 2014-01-26 05:09:05 +0000
@@ -2667,11 +2667,6 @@
2667 2667
2668 groups += print_group;2668 groups += print_group;
2669 2669
2670 InjectionGroup publish_group = new InjectionGroup("/MenuBar/FileMenu/PublishPlaceholder");
2671 publish_group.add_menu_item("Publish");
2672
2673 groups += publish_group;
2674
2675 InjectionGroup bg_group = new InjectionGroup("/MenuBar/FileMenu/SetBackgroundPlaceholder");2670 InjectionGroup bg_group = new InjectionGroup("/MenuBar/FileMenu/SetBackgroundPlaceholder");
2676 bg_group.add_menu_item("SetBackground");2671 bg_group.add_menu_item("SetBackground");
2677 2672
26782673
=== modified file 'ui/media.ui'
--- ui/media.ui 2013-01-28 22:35:44 +0000
+++ ui/media.ui 2014-01-26 05:09:05 +0000
@@ -7,24 +7,14 @@
7 <menuitem name="Export" action="Export" />7 <menuitem name="Export" action="Export" />
8 <separator />8 <separator />
9 <placeholder name="FileExtrasPlaceholder" />9 <placeholder name="FileExtrasPlaceholder" />
10 <separator />
11 <menuitem name="JumpToFile" action="CommonJumpToFile" />
12 <separator />
13 <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
14 <separator />
15 <menuitem name="Quit" action="CommonQuit" />
16 </menu>10 </menu>
17 11
18 <menu name="EditMenu" action="EditMenu">12 <menu name="EditMenu" action="EditMenu">
19 <menuitem name="Undo" action="CommonUndo" />13 <menuitem name="Undo" action="CommonUndo" />
20 <menuitem name="Redo" action="CommonRedo" />14 <menuitem name="Redo" action="CommonRedo" />
21 <separator />15 <separator />
22 <menuitem name="Find" action="CommonFind" />
23 <menuitem name="NewSearch" action="CommonNewSearch" />
24 <separator />
25 <placeholder name="EditExtrasPlaceholder" />16 <placeholder name="EditExtrasPlaceholder" />
26 <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />17 <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
27 <menuitem name="MoveToTrash" action="MoveToTrash" />
28 <separator />18 <separator />
29 <menuitem name="SelectAll" action="CommonSelectAll" />19 <menuitem name="SelectAll" action="CommonSelectAll" />
30 <separator />20 <separator />
@@ -34,7 +24,6 @@
34 <menu name="ViewMenu" action="ViewMenu">24 <menu name="ViewMenu" action="ViewMenu">
35 <menuitem name="DisplayBasicProperties" action="CommonDisplayBasicProperties" />25 <menuitem name="DisplayBasicProperties" action="CommonDisplayBasicProperties" />
36 <menuitem name="DisplayExtendedProperties" action="CommonDisplayExtendedProperties" />26 <menuitem name="DisplayExtendedProperties" action="CommonDisplayExtendedProperties" />
37 <menuitem name="DisplaySearchbar" action="CommonDisplaySearchbar" />
38 <menuitem name="DisplaySidebar" action="CommonDisplaySidebar" />27 <menuitem name="DisplaySidebar" action="CommonDisplaySidebar" />
39 <separator />28 <separator />
40 <menuitem name="ViewTitle" action="ViewTitle" />29 <menuitem name="ViewTitle" action="ViewTitle" />
@@ -42,17 +31,6 @@
42 <menuitem name="ViewTags" action="ViewTags" />31 <menuitem name="ViewTags" action="ViewTags" />
43 <menuitem name="ViewRatings" action="ViewRatings" />32 <menuitem name="ViewRatings" action="ViewRatings" />
44 <separator />33 <separator />
45 <menu name="FilterPhotos" action="CommonFilterPhotos">
46 <menuitem name="DisplayFiveOrHigher" action="CommonDisplayFiveOrHigher" />
47 <menuitem name="DisplayFourOrHigher" action="CommonDisplayFourOrHigher" />
48 <menuitem name="DisplayThreeOrHigher" action="CommonDisplayThreeOrHigher" />
49 <menuitem name="DisplayTwoOrHigher" action="CommonDisplayTwoOrHigher" />
50 <menuitem name="DisplayOneOrHigher" action="CommonDisplayOneOrHigher" />
51 <menuitem name="DisplayUnratedOrHigher" action="CommonDisplayUnratedOrHigher" />
52 <menuitem name="DisplayRejectedOrHigher" action="CommonDisplayRejectedOrHigher" />
53 <menuitem name="DisplayRejectedOnly" action="CommonDisplayRejectedOnly" />
54 </menu>
55 <separator />
56 <menu name="SortPhotos" action="SortPhotos">34 <menu name="SortPhotos" action="SortPhotos">
57 <menuitem name="SortByTitle" action="SortByTitle" />35 <menuitem name="SortByTitle" action="SortByTitle" />
58 <menuitem name="SortByExposureDate" action="SortByExposureDate" />36 <menuitem name="SortByExposureDate" action="SortByExposureDate" />
@@ -66,38 +44,17 @@
66 <menuitem name="SortEventsDescending" action="CommonSortEventsDescending" />44 <menuitem name="SortEventsDescending" action="CommonSortEventsDescending" />
67 </menu>45 </menu>
68 <separator />46 <separator />
69 <menuitem name="IncreaseSize" action="IncreaseSize" />
70 <menuitem name="DecreaseSize" action="DecreaseSize" />
71 <separator />
72 <placeholder name="ViewExtrasFullscreenSlideshowPlaceholder" />47 <placeholder name="ViewExtrasFullscreenSlideshowPlaceholder" />
73 </menu>48 </menu>
74 49
75 <menu name="PhotosMenu" action="PhotosMenu">50 <menu name="PhotosMenu" action="PhotosMenu">
51 <menuitem name="FlipHorizontally" action="FlipHorizontally" />
52 <menuitem name="FlipVertically" action="FlipVertically" />
53 <separator />
76 <placeholder name="PhotosExtrasEditsPlaceholder" />54 <placeholder name="PhotosExtrasEditsPlaceholder" />
77 <separator />55 <separator />
78 <menuitem name="Flag" action="Flag" />
79 <menu name="Rate" action="Rate">
80 <menuitem name="RateFive" action="RateFive" />
81 <menuitem name="RateFour" action="RateFour" />
82 <menuitem name="RateThree" action="RateThree" />
83 <menuitem name="RateTwo" action="RateTwo" />
84 <menuitem name="RateOne" action="RateOne" />
85 <menuitem name="RateUnrated" action="RateUnrated" />
86 <menuitem name="RateRejected" action="RateRejected" />
87 <separator />
88 <menuitem name="IncreaseRating" action="IncreaseRating" />
89 <menuitem name="DecreaseRating" action="DecreaseRating" />
90 </menu>
91 <separator />
92 <menuitem name="EditTitle" action="EditTitle" />
93 <menuitem name="EditComment" action="EditComment" />
94 <placeholder name="PhotosExtrasDateTimePlaceholder" />56 <placeholder name="PhotosExtrasDateTimePlaceholder" />
95 <separator />57 <separator />
96 <menu name="RawDeveloper" action="RawDeveloper">
97 <menuitem name="RawDeveloperShotwell" action="RawDeveloperShotwell" />
98 <menuitem name="RawDeveloperCamera" action="RawDeveloperCamera" />
99 </menu>
100 <separator />
101 <placeholder name="PhotosExtrasExternalsPlaceholder" />58 <placeholder name="PhotosExtrasExternalsPlaceholder" />
102 </menu>59 </menu>
10360
@@ -106,11 +63,6 @@
106 <menuitem name="CommonJumpToEvent" action="CommonJumpToEvent" />63 <menuitem name="CommonJumpToEvent" action="CommonJumpToEvent" />
107 </menu>64 </menu>
10865
109 <menu name="TagsMenu" action="TagsMenu">
110 <menuitem name="AddTags" action="AddTags" />
111 <menuitem name="ModifyTags" action="ModifyTags" />
112 </menu>
113
114 <placeholder name="FacesMenuPlaceholder" />66 <placeholder name="FacesMenuPlaceholder" />
11567
116 <menu name="HelpMenu" action="HelpMenu">68 <menu name="HelpMenu" action="HelpMenu">
11769
=== modified file 'ui/photo.ui'
--- ui/photo.ui 2013-08-27 21:36:49 +0000
+++ ui/photo.ui 2014-01-26 05:09:05 +0000
@@ -8,25 +8,15 @@
8 <separator />8 <separator />
9 <placeholder name="PrintPlaceholder" />9 <placeholder name="PrintPlaceholder" />
10 <separator />10 <separator />
11 <placeholder name="PublishPlaceholder" />
12 <menuitem name="SendTo" action="SendTo" />11 <menuitem name="SendTo" action="SendTo" />
13 <placeholder name="SetBackgroundPlaceholder" />12 <placeholder name="SetBackgroundPlaceholder" />
14 <separator />
15 <menuitem name="JumpToFile" action="CommonJumpToFile" />
16 <separator />
17 <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
18 <separator />
19 <menuitem name="Quit" action="CommonQuit" />
20 </menu>13 </menu>
21 14
22 <menu name="EditMenu" action="EditMenu">15 <menu name="EditMenu" action="EditMenu">
23 <menuitem name="Undo" action="CommonUndo" />16 <menuitem name="Undo" action="CommonUndo" />
24 <menuitem name="Redo" action="CommonRedo" />17 <menuitem name="Redo" action="CommonRedo" />
25 <separator />18 <separator />
26 <menuitem name="NewSearch" action="CommonNewSearch" />
27 <separator />
28 <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />19 <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
29 <menuitem name="MoveToTrash" action="MoveToTrash" />
30 <separator />20 <separator />
31 <menuitem name="Preferences" action="CommonPreferences" />21 <menuitem name="Preferences" action="CommonPreferences" />
32 </menu>22 </menu>
@@ -43,9 +33,6 @@
43 <menuitem name="SortEventsDescending" action="CommonSortEventsDescending" />33 <menuitem name="SortEventsDescending" action="CommonSortEventsDescending" />
44 </menu>34 </menu>
45 <separator />35 <separator />
46 <menuitem name="IncreaseSize" action="IncreaseSize" />
47 <menuitem name="DecreaseSize" action="DecreaseSize" />
48 <separator />
49 <menuitem name="ZoomFit" action="ZoomFit" />36 <menuitem name="ZoomFit" action="ZoomFit" />
50 <menuitem name="Zoom100" action="Zoom100" />37 <menuitem name="Zoom100" action="Zoom100" />
51 <menuitem name="Zoom200" action="Zoom200" />38 <menuitem name="Zoom200" action="Zoom200" />
@@ -56,58 +43,15 @@
56 </menu>43 </menu>
57 44
58 <menu name="PhotoMenu" action="PhotoMenu">45 <menu name="PhotoMenu" action="PhotoMenu">
59 <menuitem name="PrevPhoto" action="PrevPhoto" />
60 <menuitem name="NextPhoto" action="NextPhoto" />
61 <separator />
62 <menuitem name="RotateClockwise" action="RotateClockwise" />
63 <menuitem name="RotateCounterclockwise" action="RotateCounterclockwise" />
64 <menuitem name="FlipHorizontally" action="FlipHorizontally" />46 <menuitem name="FlipHorizontally" action="FlipHorizontally" />
65 <menuitem name="FlipVertically" action="FlipVertically" />47 <menuitem name="FlipVertically" action="FlipVertically" />
66 <separator />48 <separator />
67 <menu name="Tools" action="Tools">
68 <menuitem name="Enhance" action="Enhance" />
69 <menuitem name="Crop" action="Crop" />
70 <menuitem name="Straighten" action="Straighten" />
71 <menuitem name="RedEye" action="RedEye" />
72 <menuitem name="Adjust" action="Adjust" />
73 </menu>
74 <menuitem name="Revert" action="Revert" />
75 <separator />
76 <menuitem name="CopyColorAdjustments" action="CopyColorAdjustments" />49 <menuitem name="CopyColorAdjustments" action="CopyColorAdjustments" />
77 <menuitem name="PasteColorAdjustments" action="PasteColorAdjustments" />50 <menuitem name="PasteColorAdjustments" action="PasteColorAdjustments" />
78 <separator/>51 <separator/>
79 <menuitem name="Flag" action="Flag" />
80 <menu name="Rate" action="Rate">
81 <menuitem name="RateFive" action="RateFive" />
82 <menuitem name="RateFour" action="RateFour" />
83 <menuitem name="RateThree" action="RateThree" />
84 <menuitem name="RateTwo" action="RateTwo" />
85 <menuitem name="RateOne" action="RateOne" />
86 <menuitem name="RateUnrated" action="RateUnrated" />
87 <menuitem name="RateRejected" action="RateRejected" />
88 <separator />
89 <menuitem name="IncreaseRating" action="IncreaseRating" />
90 <menuitem name="DecreaseRating" action="DecreaseRating" />
91 </menu>
92 <separator />
93 <menuitem name="EditTitle" action="EditTitle" />
94 <menuitem name="EditComment" action="EditComment" />
95 <menuitem name="AdjustDateTime" action="AdjustDateTime" />52 <menuitem name="AdjustDateTime" action="AdjustDateTime" />
96 <separator />
97 <menu name="RawDeveloper" action="RawDeveloper">
98 <menuitem name="RawDeveloperShotwell" action="RawDeveloperShotwell" />
99 <menuitem name="RawDeveloperCamera" action="RawDeveloperCamera" />
100 </menu>
101 <separator />
102 <menuitem name="ExternalEdit" action="ExternalEdit" />
103 <menuitem name="ExternalEditRAW" action="ExternalEditRAW" />
104 </menu>53 </menu>
10554
106 <menu name="TagsMenu" action="TagsMenu">
107 <menuitem name="AddTags" action="AddTags" />
108 <menuitem name="ModifyTags" action="ModifyTags" />
109 </menu>
110
111 <menu name="HelpMenu" action="HelpMenu">55 <menu name="HelpMenu" action="HelpMenu">
112 <menuitem name="Contents" action="CommonHelpContents" />56 <menuitem name="Contents" action="CommonHelpContents" />
113 <menuitem name="Frequently Asked Questions" action="CommonHelpFAQ" />57 <menuitem name="Frequently Asked Questions" action="CommonHelpFAQ" />
@@ -124,5 +68,4 @@
124 </placeholder>68 </placeholder>
125 </popup>69 </popup>
126 70
127</ui>71</ui>
128
129\ No newline at end of file72\ No newline at end of file

Subscribers

People subscribed via source and target branches