[shotwell/pantheon: 4/4] Remove menubar items already in UI (r2504)

[Jim Nelson <jnelson src gnome org>]

commit dd0eede6a24a7b41e6aebf7783c1093241d5ca76
Author: Tristan Petersen <tristang4 me com>
Date:   Tue Feb 4 16:56:11 2014 -0800

    Remove menubar items already in UI (r2504)
    
    See http://bazaar.launchpad.net/~pantheon-photos/pantheon-photos/trunk/revision/2504

 src/CollectionPage.vala |   11 --------
 src/PhotoPage.vala      |    5 ----
 ui/media.ui             |   54 ++----------------------------------------
 ui/photo.ui             |   59 +----------------------------------------------
 4 files changed, 4 insertions(+), 125 deletions(-)
---
diff --git a/src/CollectionPage.vala b/src/CollectionPage.vala
index 070452c..c20e453 100644
--- a/src/CollectionPage.vala
+++ b/src/CollectionPage.vala
@@ -73,7 +73,6 @@ public abstract class CollectionPage : MediaPage {
         
         group.add_menu_item("Print");
         group.add_separator();
-        group.add_menu_item("Publish");
         group.add_menu_item("SendTo");
         group.add_menu_item("SetBackground");
         
@@ -101,14 +100,6 @@ public abstract class CollectionPage : MediaPage {
     private static InjectionGroup create_photos_menu_edits_injectables() {
         InjectionGroup group = new InjectionGroup("/MenuBar/PhotosMenu/PhotosExtrasEditsPlaceholder");
         
-        group.add_menu_item("RotateClockwise");
-        group.add_menu_item("RotateCounterclockwise");
-        group.add_menu_item("FlipHorizontally");
-        group.add_menu_item("FlipVertically");
-        group.add_separator();
-        group.add_menu_item("Enhance");
-        group.add_menu_item("Revert");
-        group.add_separator();
         group.add_menu_item("CopyColorAdjustments");
         group.add_menu_item("PasteColorAdjustments");
         
@@ -126,8 +117,6 @@ public abstract class CollectionPage : MediaPage {
     private static InjectionGroup create_photos_menu_externals_injectables() {
         InjectionGroup group = new InjectionGroup("/MenuBar/PhotosMenu/PhotosExtrasExternalsPlaceholder");
         
-        group.add_menu_item("ExternalEdit");
-        group.add_menu_item("ExternalEditRAW");
         group.add_menu_item("PlayVideo");
         
         return group;
diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala
index d74d004..0ad97ba 100644
--- a/src/PhotoPage.vala
+++ b/src/PhotoPage.vala
@@ -2667,11 +2667,6 @@ public class LibraryPhotoPage : EditingHostPage {
         
         groups += print_group;
         
-        InjectionGroup publish_group = new InjectionGroup("/MenuBar/FileMenu/PublishPlaceholder");
-        publish_group.add_menu_item("Publish");
-        
-        groups += publish_group;
-        
         InjectionGroup bg_group = new InjectionGroup("/MenuBar/FileMenu/SetBackgroundPlaceholder");
         bg_group.add_menu_item("SetBackground");
         
diff --git a/ui/media.ui b/ui/media.ui
index 52489ef..c28ef2c 100644
--- a/ui/media.ui
+++ b/ui/media.ui
@@ -7,24 +7,14 @@
             <menuitem name="Export" action="Export" />
             <separator />
             <placeholder name="FileExtrasPlaceholder" />
-            <separator />
-            <menuitem name="JumpToFile" action="CommonJumpToFile" />
-            <separator />
-            <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
-            <separator />
-            <menuitem name="Quit" action="CommonQuit" />
         </menu>
         
         <menu name="EditMenu" action="EditMenu">
             <menuitem name="Undo" action="CommonUndo" />
             <menuitem name="Redo" action="CommonRedo" />
             <separator />
-            <menuitem name="Find" action="CommonFind" />
-            <menuitem name="NewSearch" action="CommonNewSearch" />
-            <separator />
             <placeholder name="EditExtrasPlaceholder" />
             <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
-            <menuitem name="MoveToTrash" action="MoveToTrash" />
             <separator />
             <menuitem name="SelectAll" action="CommonSelectAll" />
             <separator />
@@ -34,7 +24,6 @@
         <menu name="ViewMenu" action="ViewMenu">
             <menuitem name="DisplayBasicProperties" action="CommonDisplayBasicProperties" />
             <menuitem name="DisplayExtendedProperties" action="CommonDisplayExtendedProperties" />
-            <menuitem name="DisplaySearchbar" action="CommonDisplaySearchbar" />
             <menuitem name="DisplaySidebar" action="CommonDisplaySidebar" />
             <separator />
             <menuitem name="ViewTitle" action="ViewTitle" />
@@ -42,17 +31,6 @@
             <menuitem name="ViewTags" action="ViewTags" />
             <menuitem name="ViewRatings" action="ViewRatings" />
             <separator />
-            <menu name="FilterPhotos" action="CommonFilterPhotos">
-                <menuitem name="DisplayFiveOrHigher" action="CommonDisplayFiveOrHigher" />
-                <menuitem name="DisplayFourOrHigher" action="CommonDisplayFourOrHigher" />
-                <menuitem name="DisplayThreeOrHigher" action="CommonDisplayThreeOrHigher" />
-                <menuitem name="DisplayTwoOrHigher" action="CommonDisplayTwoOrHigher" />
-                <menuitem name="DisplayOneOrHigher" action="CommonDisplayOneOrHigher" />
-                <menuitem name="DisplayUnratedOrHigher" action="CommonDisplayUnratedOrHigher" />
-                <menuitem name="DisplayRejectedOrHigher" action="CommonDisplayRejectedOrHigher" />
-                <menuitem name="DisplayRejectedOnly" action="CommonDisplayRejectedOnly" />
-            </menu>
-            <separator />
             <menu name="SortPhotos" action="SortPhotos">
                 <menuitem name="SortByTitle" action="SortByTitle" />
                 <menuitem name="SortByExposureDate" action="SortByExposureDate" />
@@ -66,38 +44,17 @@
                 <menuitem name="SortEventsDescending" action="CommonSortEventsDescending" />
             </menu>
             <separator />
-            <menuitem name="IncreaseSize" action="IncreaseSize" />
-            <menuitem name="DecreaseSize" action="DecreaseSize" />
-            <separator />
             <placeholder name="ViewExtrasFullscreenSlideshowPlaceholder" />
         </menu>
                 
         <menu name="PhotosMenu" action="PhotosMenu">
-            <placeholder name="PhotosExtrasEditsPlaceholder" />
+            <menuitem name="FlipHorizontally" action="FlipHorizontally" />
+            <menuitem name="FlipVertically" action="FlipVertically" />
             <separator />
-            <menuitem name="Flag" action="Flag" />
-            <menu name="Rate" action="Rate">
-                <menuitem name="RateFive" action="RateFive" />
-                <menuitem name="RateFour" action="RateFour" />
-                <menuitem name="RateThree" action="RateThree" />
-                <menuitem name="RateTwo" action="RateTwo" />
-                <menuitem name="RateOne" action="RateOne" />
-                <menuitem name="RateUnrated" action="RateUnrated" />
-                <menuitem name="RateRejected" action="RateRejected" />
-                <separator />
-                <menuitem name="IncreaseRating" action="IncreaseRating" />
-                <menuitem name="DecreaseRating" action="DecreaseRating" />
-            </menu>
+            <placeholder name="PhotosExtrasEditsPlaceholder" />
             <separator />
-            <menuitem name="EditTitle" action="EditTitle" />
-            <menuitem name="EditComment" action="EditComment" />
             <placeholder name="PhotosExtrasDateTimePlaceholder" />
             <separator />
-            <menu name="RawDeveloper" action="RawDeveloper">
-                <menuitem name="RawDeveloperShotwell" action="RawDeveloperShotwell" />
-                <menuitem name="RawDeveloperCamera" action="RawDeveloperCamera" />
-            </menu>
-            <separator />
             <placeholder name="PhotosExtrasExternalsPlaceholder" />
         </menu>
 
@@ -106,11 +63,6 @@
             <menuitem name="CommonJumpToEvent" action="CommonJumpToEvent" />
         </menu>
 
-        <menu name="TagsMenu" action="TagsMenu">
-            <menuitem name="AddTags" action="AddTags" />
-            <menuitem name="ModifyTags" action="ModifyTags" />
-        </menu>
-        
         <placeholder name="FacesMenuPlaceholder" />
 
         <menu name="HelpMenu" action="HelpMenu">
diff --git a/ui/photo.ui b/ui/photo.ui
index f11a25b..6532fa4 100644
--- a/ui/photo.ui
+++ b/ui/photo.ui
@@ -8,25 +8,15 @@
             <separator />
             <placeholder name="PrintPlaceholder" />
             <separator />
-            <placeholder name="PublishPlaceholder" />
             <menuitem name="SendTo" action="SendTo" />
             <placeholder name="SetBackgroundPlaceholder" />
-            <separator />
-            <menuitem name="JumpToFile" action="CommonJumpToFile" />
-            <separator />
-            <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
-            <separator />
-            <menuitem name="Quit" action="CommonQuit" />
         </menu>
         
         <menu name="EditMenu" action="EditMenu">
             <menuitem name="Undo" action="CommonUndo" />
             <menuitem name="Redo" action="CommonRedo" />
             <separator />
-            <menuitem name="NewSearch" action="CommonNewSearch" />
-            <separator />
             <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
-            <menuitem name="MoveToTrash" action="MoveToTrash" />
             <separator />
             <menuitem name="Preferences" action="CommonPreferences" />
         </menu>
@@ -43,9 +33,6 @@
                 <menuitem name="SortEventsDescending" action="CommonSortEventsDescending" />
             </menu>
             <separator />
-            <menuitem name="IncreaseSize" action="IncreaseSize" />
-            <menuitem name="DecreaseSize" action="DecreaseSize" />
-            <separator />
             <menuitem name="ZoomFit" action="ZoomFit" />
             <menuitem name="Zoom100" action="Zoom100" />
             <menuitem name="Zoom200" action="Zoom200" />
@@ -56,58 +43,15 @@
         </menu>
         
         <menu name="PhotoMenu" action="PhotoMenu">
-            <menuitem name="PrevPhoto" action="PrevPhoto" />
-            <menuitem name="NextPhoto" action="NextPhoto" />
-            <separator />
-            <menuitem name="RotateClockwise" action="RotateClockwise" />
-            <menuitem name="RotateCounterclockwise" action="RotateCounterclockwise" />
             <menuitem name="FlipHorizontally" action="FlipHorizontally" />
             <menuitem name="FlipVertically" action="FlipVertically" />
             <separator />
-            <menu name="Tools" action="Tools">
-                <menuitem name="Enhance" action="Enhance" />
-                <menuitem name="Crop" action="Crop" />
-                <menuitem name="Straighten" action="Straighten" />
-                <menuitem name="RedEye" action="RedEye" />
-                <menuitem name="Adjust" action="Adjust" />
-            </menu>
-            <menuitem name="Revert" action="Revert" />
-            <separator />
             <menuitem name="CopyColorAdjustments" action="CopyColorAdjustments" />
             <menuitem name="PasteColorAdjustments" action="PasteColorAdjustments" />
             <separator/>
-            <menuitem name="Flag" action="Flag" />
-            <menu name="Rate" action="Rate">
-                <menuitem name="RateFive" action="RateFive" />
-                <menuitem name="RateFour" action="RateFour" />
-                <menuitem name="RateThree" action="RateThree" />
-                <menuitem name="RateTwo" action="RateTwo" />
-                <menuitem name="RateOne" action="RateOne" />
-                <menuitem name="RateUnrated" action="RateUnrated" />
-                <menuitem name="RateRejected" action="RateRejected" />
-                <separator />
-                <menuitem name="IncreaseRating" action="IncreaseRating" />
-                <menuitem name="DecreaseRating" action="DecreaseRating" />
-            </menu>
-            <separator />
-            <menuitem name="EditTitle" action="EditTitle" />
-            <menuitem name="EditComment" action="EditComment" />
             <menuitem name="AdjustDateTime" action="AdjustDateTime" />
-            <separator />
-            <menu name="RawDeveloper" action="RawDeveloper">
-                <menuitem name="RawDeveloperShotwell" action="RawDeveloperShotwell" />
-                <menuitem name="RawDeveloperCamera" action="RawDeveloperCamera" />
-            </menu>
-            <separator />
-            <menuitem name="ExternalEdit" action="ExternalEdit" />
-            <menuitem name="ExternalEditRAW" action="ExternalEditRAW" />
         </menu>
 
-        <menu name="TagsMenu" action="TagsMenu">
-            <menuitem name="AddTags" action="AddTags" />
-            <menuitem name="ModifyTags" action="ModifyTags" />
-        </menu>
-        
         <menu name="HelpMenu" action="HelpMenu">
             <menuitem name="Contents" action="CommonHelpContents" />
             <menuitem name="Frequently Asked Questions" action="CommonHelpFAQ" />
@@ -124,5 +68,4 @@
         </placeholder>
     </popup>
     
-</ui>
-
+</ui>
\ No newline at end of file