Merge lp:~meese/pantheon-photos/searchbutton-header into lp:~pantheon-photos/pantheon-photos/trunk

[meese]

moves search button to headerbar and adds back button

moves search button to headerbar and adds back button for photo pages (same commit because code changes in the same area)

[lp:~meese/pantheon-photos/searchbutton-header]

2624. By meese on 2014-09-08

add back button to header bar

[Danielle Foré (danrabbit)]

Can we change the one that says "Library" to "All Photos"?

Also, can we add one from a specific event back to "All Events"?

[lp:~meese/pantheon-photos/searchbutton-header]

2625. By meese on 2014-09-17

Changes 'Library' to 'All Photos' for back button and adds all events back button

[meese (meese)]

Fixed

[Danielle Foré (danrabbit)]

Looks good to me, thanks Maddie :)

review: Approve (ux)

[Viko Adi Rahmawan (vikoadi)]

Any reason not to use return_to_collection function of PhotoPage.vala?
PhotoPage.vala also save previous CollectionPage in return_page variable, you seems to duplicate with last_checkerboard_page.

review: Needs Information

[lp:~meese/pantheon-photos/searchbutton-header]

2626. By meese on 2014-09-24

fix

[meese (meese)]

fixed

[Viko Adi Rahmawan (vikoadi)]

Will likely need merge trunk and adjustment for get_back_name after my branch got merged.
now Photos and Raw Photos have their own child class of in PhotosPage.vala and RawsPage.vala respectively. And Library.MainPage is no more being used anywhere else

review: Needs Fixing

=== modified file 'src/Page.vala'
--- src/Page.vala	2014-09-02 19:42:49 +0000
+++ src/Page.vala	2014-09-24 23:13:36 +0000
@@ -81,7 +81,7 @@
     private Gtk.ActionGroup? action_group = null;
     private Gtk.ActionGroup[]? common_action_groups = null;
     private GLib.List<Gtk.Widget>? contractor_menu_items = null;
-
+    protected Gtk.Box header_box;
     private uint[] merge_ids = new uint[0];
 
     protected Page (string page_name) {
@@ -144,7 +144,7 @@
         }
         menu.show_all ();
     }
-    
+
     protected void populate_rating_widget_menu_item (Gtk.Menu menu, string placeholder_ui) {
         if (rating_menu_item != null) rating_menu_item.destroy ();
         rating_menu_item = new PhotoRatingMenuItem ();
@@ -156,7 +156,7 @@
                 break;
             pos++;
         }
-        
+
         menu.append (rating_menu_item);
         menu.reorder_child (rating_menu_item, pos);
         rating_menu_item.activate.connect (on_rating_widget_activate);
@@ -581,6 +581,11 @@
         toolbar_path = path;
     }
 
+    public virtual Gtk.Box get_header_buttons () {
+        header_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
+        return header_box;
+    }
+
     // Called from "realize"
     private void attach_view_signals () {
         if (are_actions_attached)
@@ -1323,6 +1328,11 @@
         Resources.style_widget (this, Resources.PAGE_STYLESHEET);
     }
 
+    // Returns the name for the back button that goes to this page
+    public virtual string get_back_name () {
+        return get_page_name ();
+    }
+
     public void init_item_context_menu (string path) {
         item_context_menu_path = path;
     }
 
=== modified file 'src/PhotoPage.vala'
--- src/PhotoPage.vala	2014-09-13 03:34:09 +0000
+++ src/PhotoPage.vala	2014-09-24 23:13:36 +0000
@@ -2410,6 +2410,29 @@
         return toolbar;
     }
 
+    public override Gtk.Box get_header_buttons () {
+        header_box = base.get_header_buttons ();
+        LibraryWindow app = AppWindow.get_instance () as LibraryWindow;
+        if (app == null)
+            return header_box;
+
+        if (return_page != null) {
+            var last_name = return_page.get_back_name ();
+            // Back Button
+            var back_button = new Gtk.Button ();
+            back_button.clicked.connect (return_to_collection);
+            back_button.get_style_context ().add_class ("back-button");
+            back_button.can_focus = false;
+            back_button.valign = Gtk.Align.CENTER;
+            back_button.vexpand = false;
+            back_button.visible = false;
+            back_button.label = last_name;
+            header_box.pack_start (back_button);
+        }
+
+        return header_box;
+    }
+
     public bool not_trashed_view_filter (DataView view) {
         return ! ((MediaSource) view.get_source ()).is_trashed ();
     }
 
=== modified file 'src/camera/ImportPage.vala'
--- src/camera/ImportPage.vala	2014-08-08 21:13:09 +0000
+++ src/camera/ImportPage.vala	2014-09-24 23:13:36 +0000
@@ -817,12 +817,6 @@
 
             toolbar.insert (progress_item, -1);
 
-            // Find button
-            Gtk.ToggleToolButton find_button = new Gtk.ToggleToolButton ();
-            find_button.set_related_action (get_action ("CommonDisplaySearchbar"));
-
-            toolbar.insert (find_button, -1);
-
             // Separator
             toolbar.insert (new Gtk.SeparatorToolItem (), -1);
 
 
=== modified file 'src/events/EventPage.vala'
--- src/events/EventPage.vala	2014-09-08 04:47:32 +0000
+++ src/events/EventPage.vala	2014-09-24 23:13:36 +0000
@@ -103,10 +103,32 @@
     private void on_rename () {
         LibraryWindow.get_app ().rename_event_in_sidebar (page_event);
     }
+
+    public override Gtk.Box get_header_buttons () {
+        header_box = base.get_header_buttons ();
+        // Back Button
+        var back_button = new Gtk.Button ();
+        back_button.clicked.connect (back_to_master_clicked);
+        back_button.get_style_context ().add_class ("back-button");
+        back_button.can_focus = false;
+        back_button.valign = Gtk.Align.CENTER;
+        back_button.vexpand = false;
+        back_button.visible = false;
+        back_button.label = _("All Events");
+        header_box.pack_start (back_button);
+
+        return header_box;
+    }
+
+    public void back_to_master_clicked () {
+        LibraryWindow app = AppWindow.get_instance () as LibraryWindow;
+        app.switch_to_event_directory ();
+    }
+
 }
 
 public class NoEventPage : CollectionPage {
-    public const string NAME = _ ("No Event");
+    public const string NAME = _("No Event");
 
     // This seems very similar to EventSourceCollection -> ViewManager
     private class NoEventViewManager : CollectionViewManager {
 
=== modified file 'src/library/Branch.vala'
--- src/library/Branch.vala	2014-08-08 21:13:09 +0000
+++ src/library/Branch.vala	2014-09-24 23:13:36 +0000
@@ -163,5 +163,9 @@
     protected override void set_config_photos_sort (bool sort_order, int sort_by) {
         Config.Facade.get_instance ().set_library_photos_sort (sort_order, sort_by);
     }
+
+    public override string get_back_name () {
+        return _("All Photos");
+    }
 }
 
 
=== modified file 'src/library/LibraryWindow.vala'
--- src/library/LibraryWindow.vala	2014-09-07 01:47:31 +0000
+++ src/library/LibraryWindow.vala	2014-09-24 23:13:36 +0000
@@ -118,7 +118,6 @@
     private Gee.HashMap<Page, Sidebar.Entry> page_map = new Gee.HashMap<Page, Sidebar.Entry> ();
 
     private LibraryPhotoPage photo_page = null;
-
     // this is to keep track of cameras which initiate the app
     private static Gee.HashSet<string> initial_camera_uris = new Gee.HashSet<string> ();
 
@@ -129,6 +128,7 @@
     // AppWindows instead.
     private SearchFilterToolbar search_toolbar;
 
+    private Gtk.Box page_header_box;
     private Gtk.Box top_section = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
     private Gtk.Frame background_progress_frame = new Gtk.Frame (null);
     private Gtk.ProgressBar background_progress_bar = new Gtk.ProgressBar ();
@@ -137,7 +137,6 @@
     private Gtk.Notebook notebook = new Gtk.Notebook ();
     private Gtk.Box layout = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
     private Gtk.Box right_vbox;
-
     private int current_progress_priority = 0;
     private uint background_progress_pulse_id = 0;
 
@@ -221,8 +220,19 @@
         CameraTable.get_instance ().camera_added.connect (on_camera_added);
 
         background_progress_bar.set_show_text (true);
-
+    }
+
+    protected override void build_header_bar () {
+        // Left side of header bar
+        base.build_header_bar ();
+
+        // Right side of header bar
         build_settings_header ();
+
+        // Find button
+        Gtk.ToggleToolButton find_button = new Gtk.ToggleToolButton ();
+        find_button.set_related_action (get_common_action ("CommonDisplaySearchbar"));    
+        header.pack_end (find_button);
     }
 
     protected void build_settings_header () {
@@ -692,7 +702,6 @@
         CollectionPage collection;
         Photo start;
         bool can_fullscreen = get_fullscreen_photo (page, out collection, out start);
-
         set_common_action_sensitive ("CommonEmptyTrash", can_empty_trash ());
         set_common_action_visible ("CommonJumpToEvent", true);
         set_common_action_sensitive ("CommonJumpToEvent", can_jump_to_event ());
@@ -979,6 +988,10 @@
         switch_to_page (library_branch.photos_entry.get_page ());
     }
 
+    public void switch_to_event_directory () {
+        switch_to_page (events_branch.get_master_entry ().get_page ());
+    }
+
     public void switch_to_event (Event event) {
         Events.EventEntry? entry = events_branch.get_entry_for_event (event);
         if (entry != null)
@@ -1007,7 +1020,7 @@
             // before switching to it
             spin_event_loop ();
         }
-
+        
         photo_page.display_for_collection (controller, current);
         switch_to_page (photo_page);
     }
@@ -1298,6 +1311,8 @@
             Gtk.Toolbar toolbar = current_page.get_toolbar ();
             if (toolbar != null)
                 right_vbox.remove (toolbar);
+            if (page_header_box != null)
+                header.remove (page_header_box);
 
             current_page.switching_from ();
 
@@ -1315,7 +1330,9 @@
         // do this prior to changing selection, as the change will fire a cursor-changed event,
         // which will then call this function again
         base.set_current_page (page);
-
+        page_header_box = page.get_header_buttons ();
+        header.pack_start (page_header_box);
+        header.show_all ();
         // if the visible page is the LibraryPhotoPage, we need to prevent single-click inline
         // renaming in the sidebar because a single click while in the LibraryPhotoPage indicates
         // the user wants to return to the controlling page ... that is, in this special case, the
 
=== modified file 'ui/collection.ui'
--- ui/collection.ui	2014-08-28 14:41:02 +0000
+++ ui/collection.ui	2014-09-24 23:13:36 +0000
@@ -43,6 +43,5 @@
         <separator />
         <toolitem name="ToolPublish" action="Publish" />
         <separator />
-        <toolitem name="ToolFind" action="CommonDisplaySearchbar" />
     </toolbar>
 </ui>
 \ No newline at end of file
 
=== modified file 'ui/offline.ui'
--- ui/offline.ui	2014-09-02 19:42:49 +0000
+++ ui/offline.ui	2014-09-24 23:13:36 +0000
@@ -6,7 +6,6 @@
     <toolbar name="OfflineToolbar">
         <toolitem name="ToolRemoveFromLibrary" action="RemoveFromLibrary" />
         <separator />
-        <toolitem name="ToolFind" action="CommonDisplaySearchbar" />
     </toolbar>
     
     <popup name="OfflineViewMenu" action="ViewMenu">
 
=== modified file 'ui/trash.ui'
--- ui/trash.ui	2014-09-06 19:39:38 +0000
+++ ui/trash.ui	2014-09-24 23:13:36 +0000
@@ -13,7 +13,6 @@
     </popup>
 
     <toolbar name="TrashToolbar">
-        <toolitem name="ToolFind" action="CommonDisplaySearchbar" />
     </toolbar>
 
     <popup name="TrashViewMenu" action="ViewMenu">