Merge lp:~meese/pantheon-photos/kill-menubar into lp:~pantheon-photos/pantheon-photos/trunk

[meese]

kills menu bar

Kills the menu bar with nonviolent action. Also I put undo and redo up in the header bar because the gear icon looked lonely by itself.

[Danielle Foré (danrabbit)]

peace and love, star child. Perhaps we use color icons for undo and redo instead of symbolic?

[lp:~meese/pantheon-photos/kill-menubar]

2611. By meese on 2014-09-03

change undo icons to non symbolic and fix menu separator not showing up

[meese (meese)]

Done! (and I spent 20 minutes trying to figure out why the menu separator was deciding not to show up... of course menu.show_all () needed to be called, there will be no love for GTK)

[lp:~meese/pantheon-photos/kill-menubar]

2612. By meese on 2014-09-03

fix ui file

[Viko Adi Rahmawan (vikoadi)]

as we've move about menuitem to the quicklist, should we remove it too from the gear button?

[Danielle Foré (danrabbit)]

Yes we should remove it from the gear button

[lp:~meese/pantheon-photos/kill-menubar]

2613. By meese on 2014-09-05

remove about from gear menu

[meese (meese)]

fixed

[Danielle Foré (danrabbit)]

I'm good with this :)

review: Approve (ux)

[Viko Adi Rahmawan (vikoadi)]

for me, the code is good

review: Approve (code)

=== modified file 'src/AppWindow.vala'
--- src/AppWindow.vala	2014-08-08 21:13:09 +0000
+++ src/AppWindow.vala	2014-09-05 23:00:47 +0000
@@ -434,6 +434,7 @@
     protected Dimensions dimensions;
     protected int pos_x = 0;
     protected int pos_y = 0;
+    protected Gtk.HeaderBar header;
 
     private Gtk.ActionGroup common_action_group = new Gtk.ActionGroup ("AppWindowGlobalActionGroup");
 
@@ -442,10 +443,8 @@
         assert (instance == null);
         instance = this;
 
-        var header = new Gtk.HeaderBar ();
+        header = new Gtk.HeaderBar ();
         header.set_show_close_button (true);
-        header.get_style_context ().remove_class ("header-bar");
-
         this.set_titlebar (header);
 
         title = _ (Resources.APP_TITLE);
@@ -489,6 +488,20 @@
 
         ui.ensure_update ();
         add_accel_group (ui.get_accel_group ());
+
+        build_header_bar ();
+    }
+
+    protected virtual void build_header_bar () {
+        var undo_action = get_common_action ("CommonUndo");
+        var undo_btn = undo_action.create_tool_item ();
+        undo_btn.sensitive = true;
+        header.pack_start (undo_btn);
+
+        var redo_action = get_common_action ("CommonRedo");
+        var redo_btn = redo_action.create_tool_item ();
+        redo_btn.sensitive = true;
+        header.pack_start (redo_btn);
     }
 
     private Gtk.ActionEntry[] create_common_actions () {
@@ -500,25 +513,19 @@
         quit.label = _ ("_Quit");
         actions += quit;
 
-        Gtk.ActionEntry about = { "CommonAbout", Gtk.Stock.ABOUT, TRANSLATABLE, null,
-                                  TRANSLATABLE, on_about
-                                };
-        about.label = _ ("_About");
-        actions += about;
-
         Gtk.ActionEntry fullscreen = { "CommonFullscreen", Gtk.Stock.FULLSCREEN,
                                        TRANSLATABLE, "F11", TRANSLATABLE, on_fullscreen
                                      };
         fullscreen.label = _ ("Fulls_creen");
         actions += fullscreen;
 
-        Gtk.ActionEntry undo = { "CommonUndo", Gtk.Stock.UNDO, TRANSLATABLE, "<Ctrl>Z",
+        Gtk.ActionEntry undo = { "CommonUndo", "edit-undo", TRANSLATABLE, "<Ctrl>Z",
                                  TRANSLATABLE, on_undo
                                };
         undo.label = Resources.UNDO_MENU;
         actions += undo;
 
-        Gtk.ActionEntry redo = { "CommonRedo", Gtk.Stock.REDO, TRANSLATABLE, "<Ctrl><Shift>Z",
+        Gtk.ActionEntry redo = { "CommonRedo", "edit-redo", TRANSLATABLE, "<Ctrl><Shift>Z",
                                  TRANSLATABLE, on_redo
                                };
         redo.label = Resources.REDO_MENU;
@@ -870,7 +877,7 @@
 
         if (desc != null) {
             action.label = "%s %s".printf (prefix, desc.get_name ());
-            action.tooltip = desc.get_explanation ();
+            action.tooltip = action.label;
             action.sensitive = true;
         } else {
             action.label = prefix;
@@ -880,12 +887,12 @@
     }
 
     public void decorate_undo_action () {
-        decorate_command_manager_action ("CommonUndo", Resources.UNDO_MENU, "",
+        decorate_command_manager_action ("CommonUndo", Resources.UNDO_LABEL, "",
                                          get_command_manager ().get_undo_description ());
     }
 
     public void decorate_redo_action () {
-        decorate_command_manager_action ("CommonRedo", Resources.REDO_MENU, "",
+        decorate_command_manager_action ("CommonRedo", Resources.REDO_LABEL, "",
                                          get_command_manager ().get_redo_description ());
     }
 
 
=== modified file 'src/CollectionPage.vala'
--- src/CollectionPage.vala	2014-08-28 14:41:02 +0000
+++ src/CollectionPage.vala	2014-09-05 23:00:47 +0000
@@ -85,12 +85,6 @@
         return toolbar;
     }
 
-    private static InjectionGroup create_file_menu_injectables () {
-        InjectionGroup group = new InjectionGroup ("/MenuBar/FileMenu/FileExtrasPlaceholder");
-
-        return group;
-    }
-
     private static InjectionGroup create_context_menu_injectables () {
         InjectionGroup group = new InjectionGroup ("/CollectionContextMenu/EditExtrasPlaceholder");
 
@@ -218,7 +212,6 @@
     protected override InjectionGroup[] init_collect_injection_groups () {
         InjectionGroup[] groups = base.init_collect_injection_groups ();
 
-        groups += create_file_menu_injectables ();
         groups += create_context_menu_injectables ();
         groups += create_view_menu_fullscreen_injectables ();
 
 
=== modified file 'src/Page.vala'
--- src/Page.vala	2014-08-27 23:59:02 +0000
+++ src/Page.vala	2014-09-05 23:00:47 +0000
@@ -264,13 +264,6 @@
         return event_source;
     }
 
-    public virtual Gtk.MenuBar get_menubar () {
-        Gtk.MenuBar? menubar = ui.get_widget ("/MenuBar") as Gtk.MenuBar;
-        assert (menubar != null);
-
-        return menubar;
-    }
-
     public virtual unowned Gtk.Widget get_page_ui_widget (string path) {
         return ui.get_widget (path);
     }
 
=== modified file 'src/direct/DirectPhotoPage.vala'
--- src/direct/DirectPhotoPage.vala	2014-08-25 06:04:50 +0000
+++ src/direct/DirectPhotoPage.vala	2014-09-05 23:00:47 +0000
@@ -47,14 +47,14 @@
         file.label = _ ("_File");
         actions += file;
 
-        Gtk.ActionEntry save = { "Save", Gtk.Stock.SAVE, TRANSLATABLE, "<Ctrl>S", TRANSLATABLE,
+        Gtk.ActionEntry save = { "Save", "document-save", TRANSLATABLE, "<Ctrl>S", TRANSLATABLE,
                                  on_save
                                };
         save.label = _ ("_Save");
         save.tooltip = _ ("Save photo");
         actions += save;
 
-        Gtk.ActionEntry save_as = { "SaveAs", Gtk.Stock.SAVE_AS, TRANSLATABLE,
+        Gtk.ActionEntry save_as = { "SaveAs", "document-save-as", TRANSLATABLE,
                                     "<Ctrl><Shift>S", TRANSLATABLE, on_save_as
                                   };
         save_as.label = _ ("Save _As...");
 
=== modified file 'src/direct/DirectWindow.vala'
--- src/direct/DirectWindow.vala	2014-08-08 21:13:09 +0000
+++ src/direct/DirectWindow.vala	2014-09-05 23:00:47 +0000
@@ -21,11 +21,21 @@
         // simple layout: menu on top, photo in center, toolbar along bottom (mimicking the
         // PhotoPage in the library, but without the sidebar)
         Gtk.Box layout = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-        layout.pack_start (direct_photo_page.get_menubar (), false, false, 0);
         layout.pack_start (direct_photo_page, true, true, 0);
         layout.pack_end (direct_photo_page.get_toolbar (), false, false, 0);
 
         add (layout);
+        header.pack_start (new Gtk.Separator (Gtk.Orientation.VERTICAL));
+
+        var save_action = get_direct_page ().get_action ("Save");
+        var save_btn = save_action.create_tool_item ();
+        save_btn.sensitive = true;
+        header.pack_start (save_btn);
+
+        var save_as_action = get_direct_page ().get_action ("SaveAs");
+        var save_as_btn = save_as_action.create_tool_item ();
+        save_as_btn.sensitive = true;
+        header.pack_start (save_as_btn);
     }
 
     public static DirectWindow get_app () {
 
=== modified file 'src/library/LibraryWindow.vala'
--- src/library/LibraryWindow.vala	2014-08-28 06:02:48 +0000
+++ src/library/LibraryWindow.vala	2014-09-05 23:00:47 +0000
@@ -187,13 +187,6 @@
             error (e.message);
         }
 
-        Gtk.MenuBar? menubar = ui.get_widget ("/MenuBar") as Gtk.MenuBar;
-        layout.add (menubar);
-
-        // We never want to invoke show_all () on the menubar since that will show empty menus,
-        // which should be hidden.
-        menubar.no_show_all = true;
-
         // create the main layout & start at the Library page
         create_layout (library_branch.photos_entry.get_page ());
 
@@ -229,6 +222,29 @@
 
         background_progress_bar.set_show_text (true);
 
+        build_settings_header ();
+    }
+
+    protected void build_settings_header () {
+        var settings_menu = new Gtk.Menu ();
+
+        var import_action = get_common_action ("CommonFileImport");
+        settings_menu.add (import_action.create_menu_item ());
+
+        var sep = new Gtk.SeparatorMenuItem ();
+        settings_menu.add (sep);
+
+        var pref_action = get_common_action ("CommonPreferences");
+        settings_menu.add (pref_action.create_menu_item ());
+
+        settings_menu.show_all ();
+
+        var settings = new Gtk.MenuButton ();
+        settings.image = new Gtk.Image.from_icon_name ("document-properties", Gtk.IconSize.LARGE_TOOLBAR);
+        settings.set_tooltip_text (_ ("Settings"));
+        settings.popup = settings_menu;
+        settings.show_all ();
+        header.pack_end (settings);
     }
 
     ~LibraryWindow () {
@@ -374,11 +390,11 @@
                                         };
         sidebar.label = _ ("S_idebar");
         sidebar.tooltip = _ ("Display the sidebar");
-        actions += sidebar;        
+        actions += sidebar;
 
         Gtk.ToggleActionEntry meta_sidebar = { "CommonDisplayMetadataSidebar", null, TRANSLATABLE,
-                                          "F10", TRANSLATABLE, on_display_metadata_sidebar, is_metadata_sidebar_visible ()
-                                        };
+                                               "F10", TRANSLATABLE, on_display_metadata_sidebar, is_metadata_sidebar_visible ()
+                                             };
         meta_sidebar.label = _ ("Edit Photo In_fo");
         actions += meta_sidebar;
 
@@ -788,7 +804,7 @@
     private void on_display_sidebar (Gtk.Action action) {
         set_sidebar_visible (((Gtk.ToggleAction) action).get_active ());
 
-    }    
+    }
 
     private void on_display_metadata_sidebar (Gtk.Action action) {
         set_metadata_sidebar_visible (((Gtk.ToggleAction) action).get_active ());
@@ -1245,7 +1261,7 @@
         client_paned.pack2 (right_frame, true, false);
         client_paned.set_position (Config.Facade.get_instance ().get_sidebar_position ());
 
-       int metadata_sidebar_pos = Config.Facade.get_instance ().get_metadata_sidebar_position ();
+        int metadata_sidebar_pos = Config.Facade.get_instance ().get_metadata_sidebar_position ();
         if (metadata_sidebar_pos > 0)
             right_client_paned.set_position (metadata_sidebar_pos);
 
@@ -1523,4 +1539,4 @@
 
         return false;
     }
-}
+}
 \ No newline at end of file
 
=== modified file 'ui/direct.ui'
--- ui/direct.ui	2014-08-25 06:55:28 +0000
+++ ui/direct.ui	2014-09-05 23:00:47 +0000
@@ -1,21 +1,4 @@
 <ui>
-
-    <menubar name="MenuBar">
-        <menu name="FileMenu" action="FileMenu">
-            <menuitem name="Save" action="Save" />
-            <menuitem name="SaveAs" action="SaveAs" />
-        </menu>
-        
-        <menu name="EditMenu" action="EditMenu">
-            <menuitem name="Undo" action="CommonUndo" />
-            <menuitem name="Redo" action="CommonRedo" />
-        </menu>
-        
-        <menu name="HelpMenu" action="HelpMenu">
-            <menuitem name="About" action="CommonAbout" />
-        </menu>
-    </menubar>
-
     <popup name="DirectContextMenu">
         <placeholder name="ContextJumpPlaceholder">
             <menuitem name="ContextJumpToFile" action="CommonJumpToFile" />
 
=== modified file 'ui/event.ui'
--- ui/event.ui	2014-08-25 06:55:28 +0000
+++ ui/event.ui	2014-09-05 23:00:47 +0000
@@ -1,8 +1,4 @@
 <ui>
-
-    <menubar name="MenuBar">
-    </menubar>
-
     <popup name="CollectionContextMenu">
         <separator />
         <menuitem name="ContextMakePrimary" action="MakePrimary" />
 
=== modified file 'ui/events_directory.ui'
--- ui/events_directory.ui	2014-08-27 12:43:58 +0000
+++ ui/events_directory.ui	2014-09-05 23:00:47 +0000
@@ -1,23 +1,4 @@
 <ui>
-
-    <menubar name="MenuBar">
-        <menu name="FileMenu" action="FileMenu">
-            <menuitem name="Import" action="CommonFileImport" />
-            <menuitem name="ImportExternal" action="ExternalLibraryImport" />
-        </menu>
-
-        <menu name="EditMenu" action="EditMenu">
-            <menuitem name="Undo" action="CommonUndo" />
-            <menuitem name="Redo" action="CommonRedo" />
-            <separator />
-            <menuitem name="Preferences" action="CommonPreferences" />
-        </menu>
-        
-        <menu name="HelpMenu" action="HelpMenu">
-            <menuitem name="About" action="CommonAbout" />
-        </menu>
-    </menubar>
-
     <popup name="EventsDirectoryContextMenu">
         <menuitem name="ContextMerge" action="Merge" />
         <menuitem name="ContextRename" action="Rename" />
 
=== modified file 'ui/import.ui'
--- ui/import.ui	2014-08-27 12:43:58 +0000
+++ ui/import.ui	2014-09-05 23:00:47 +0000
@@ -1,25 +1,4 @@
 <ui>
-
-    <menubar name="MenuBar">
-        <menu name="FileMenu" action="FileMenu">
-            <menuitem name="Import" action="CommonFileImport" />
-            <menuitem name="ImportSelected" action="ImportSelected" />
-            <menuitem name="ImportAll" action="ImportAll" />
-            <menuitem name="ImportExternal" action="ExternalLibraryImport" />
-        </menu>
-        
-        <menu name="EditMenu" action="EditMenu">
-            <menuitem name="Undo" action="CommonUndo" />
-            <menuitem name="Redo" action="CommonRedo" />
-            <separator />
-            <menuitem name="Preferences" action="CommonPreferences" />
-        </menu>
-        
-        <menu name="HelpMenu" action="HelpMenu">
-            <menuitem name="About" action="CommonAbout" />
-        </menu>
-    </menubar>
-
     <popup name="ImportContextMenu">
             <menuitem name="ContextImportSelected" action="ImportSelected" />
             <menuitem name="ContextImportAll" action="ImportAll" />
 
=== modified file 'ui/import_queue.ui'
--- ui/import_queue.ui	2014-08-27 12:43:58 +0000
+++ ui/import_queue.ui	2014-09-05 23:00:47 +0000
@@ -1,24 +1,2 @@
 <ui>
-
-    <menubar name="MenuBar">
-        <menu name="FileMenu" action="FileMenu">
-            <menuitem name="Stop" action="Stop" />
-            <separator />
-            <menuitem name="Import" action="CommonFileImport" />
-            <menuitem name="ImportExternal" action="ExternalLibraryImport" />
-            <separator />
-        </menu>
-        
-        <menu name="ViewMenu" action="ViewMenu">
-            <menu name="SortEvents" action="CommonSortEvents">
-                <menuitem name="SortEventsAscending" action="CommonSortEventsAscending" />
-                <menuitem name="SortEventsDescending" action="CommonSortEventsDescending" />
-            </menu>
-        </menu>
-        
-        <menu name="HelpMenu" action="HelpMenu">
-            <menuitem name="About" action="CommonAbout" />
-        </menu>
-    </menubar>
-
 </ui>
 \ No newline at end of file
 
=== modified file 'ui/media.ui'
--- ui/media.ui	2014-08-27 12:43:58 +0000
+++ ui/media.ui	2014-09-05 23:00:47 +0000
@@ -1,25 +1,4 @@
 <ui>
-
-    <menubar name="MenuBar">
-        <menu name="FileMenu" action="FileMenu">
-            <menuitem name="Import" action="CommonFileImport" />
-            <menuitem name="ImportExternal" action="ExternalLibraryImport" />
-        </menu>
-        
-        <menu name="EditMenu" action="EditMenu">
-            <menuitem name="Undo" action="CommonUndo" />
-            <menuitem name="Redo" action="CommonRedo" />
-            <separator />
-            <menuitem name="Preferences" action="CommonPreferences" />
-        </menu>
-
-        <placeholder name="FacesMenuPlaceholder" />
-
-        <menu name="HelpMenu" action="HelpMenu">
-            <menuitem name="About" action="CommonAbout" />
-        </menu>
-    </menubar>
-
     <popup name="MediaViewMenu" action="ViewMenu">
         <menuitem name="DisplaySidebar" action="CommonDisplaySidebar" />
         <menuitem name="DisplayMetadataSidebar" action="CommonDisplayMetadataSidebar" /> 
 
=== modified file 'ui/offline.ui'
--- ui/offline.ui	2014-08-27 12:43:58 +0000
+++ ui/offline.ui	2014-09-05 23:00:47 +0000
@@ -1,27 +1,4 @@
 <ui>
-
-    <menubar name="MenuBar">
-        <menu name="FileMenu" action="FileMenu">
-            <menuitem name="Import" action="CommonFileImport" />
-            <menuitem name="ImportExternal" action="ExternalLibraryImport" />
-            <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="Preferences" action="CommonPreferences" />
-        </menu>
-        
-        <menu name="HelpMenu" action="HelpMenu">
-            <menuitem name="About" action="CommonAbout" />
-        </menu>
-    </menubar>
-    
     <popup name="OfflineContextMenu">
         <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
     </popup>
 
=== modified file 'ui/photo.ui'
--- ui/photo.ui	2014-08-27 12:43:58 +0000
+++ ui/photo.ui	2014-09-05 23:00:47 +0000
@@ -1,23 +1,4 @@
 <ui>
-
-    <menubar name="MenuBar">
-        <menu name="FileMenu" action="FileMenu">
-            <menuitem name="Import" action="CommonFileImport" />
-            <menuitem name="ImportExternal" action="ExternalLibraryImport" />
-        </menu>
-        
-        <menu name="EditMenu" action="EditMenu">
-            <menuitem name="Undo" action="CommonUndo" />
-            <menuitem name="Redo" action="CommonRedo" />
-            <separator />
-            <menuitem name="Preferences" action="CommonPreferences" />
-        </menu>
-
-        <menu name="HelpMenu" action="HelpMenu">
-            <menuitem name="About" action="CommonAbout" />
-        </menu>
-    </menubar>
-
     <popup name="PhotoContextMenu">
         <placeholder name="ContextJumpPlaceholder">
             <menuitem name="ContextJumpToEvent" action="CommonJumpToEvent" />
 
=== modified file 'ui/trash.ui'
--- ui/trash.ui	2014-08-28 02:19:38 +0000
+++ ui/trash.ui	2014-09-05 23:00:47 +0000
@@ -1,23 +1,4 @@
 <ui>
-
-    <menubar name="MenuBar">
-        <menu name="FileMenu" action="FileMenu">
-            <menuitem name="Import" action="CommonFileImport" />
-            <menuitem name="ImportExternal" action="ExternalLibraryImport" />
-        </menu>
-        
-        <menu name="EditMenu" action="EditMenu">
-            <menuitem name="Undo" action="CommonUndo" />
-            <menuitem name="Redo" action="CommonRedo" />
-            <separator />
-            <menuitem name="Preferences" action="CommonPreferences" />
-        </menu>
-        
-        <menu name="HelpMenu" action="HelpMenu">
-            <menuitem name="About" action="CommonAbout" />
-        </menu>
-    </menubar>
-    
     <popup name="TrashContextMenu">
         <menuitem name="ContextDelete" action="Delete" />
         <menuitem name="ContextRestore" action="Restore" />