[nautilus/wip/gbsneto/actionbar: 520/522] view: add ::get_action_bar() vfunc



commit b4397c24e032d19c4b1f7ca93e6618d66298cdbb
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Wed Mar 2 01:02:33 2016 -0300

    view: add ::get_action_bar() vfunc
    
    This will be used in the next patch so we can
    access the actionbar of the view.

 src/nautilus-files-view.c  |   14 ++++++++++++++
 src/nautilus-places-view.c |    7 +++++++
 src/nautilus-view.c        |   16 ++++++++++++++++
 src/nautilus-view.h        |    6 ++++++
 4 files changed, 43 insertions(+), 0 deletions(-)
---
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 2a4dbba..20aaca5 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -27,6 +27,7 @@
 
 #include "nautilus-files-view.h"
 
+#include "nautilus-action-bar.h"
 #include "nautilus-application.h"
 #ifdef ENABLE_TRACKER
 #include "nautilus-batch-rename-dialog.h"
@@ -278,6 +279,9 @@ struct NautilusFilesViewDetails
 
     gulong stop_signal_handler;
     gulong reload_signal_handler;
+
+    /* Action bar */
+    GtkWidget *actionbar;
 };
 
 typedef struct
@@ -8794,6 +8798,12 @@ nautilus_files_view_key_press_event (GtkWidget   *widget,
     return GDK_EVENT_PROPAGATE;
 }
 
+static GtkWidget *
+nautilus_files_view_get_action_bar (NautilusView *view)
+{
+    return NAUTILUS_FILES_VIEW (view)->details->actionbar;
+}
+
 static NautilusQuery *
 nautilus_files_view_get_search_query (NautilusView *view)
 {
@@ -8906,6 +8916,7 @@ nautilus_files_view_is_loading (NautilusView *view)
 static void
 nautilus_files_view_iface_init (NautilusViewInterface *iface)
 {
+    iface->get_action_bar = nautilus_files_view_get_action_bar;
     iface->get_location = nautilus_files_view_get_location;
     iface->set_location = nautilus_files_view_set_location;
     iface->get_selection = nautilus_files_view_get_selection;
@@ -9121,6 +9132,9 @@ nautilus_files_view_init (NautilusFilesView *view)
 
     gtk_container_add (GTK_CONTAINER (view->details->overlay), view->details->scrolled_window);
 
+    /* Actionbar */
+    view->details->actionbar = nautilus_action_bar_new (NAUTILUS_VIEW (view));
+
     /* Empty states */
     builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-no-search-results.ui");
     view->details->no_search_results_widget = GTK_WIDGET (gtk_builder_get_object (builder, 
"no_search_results"));
diff --git a/src/nautilus-places-view.c b/src/nautilus-places-view.c
index 63300b0..f3151d6 100644
--- a/src/nautilus-places-view.c
+++ b/src/nautilus-places-view.c
@@ -253,6 +253,12 @@ nautilus_places_view_set_location (NautilusView *view,
     }
 }
 
+static GtkWidget *
+nautilus_places_view_get_action_bar (NautilusView *view)
+{
+    return NULL;
+}
+
 static GList *
 nautilus_places_view_get_selection (NautilusView *view)
 {
@@ -334,6 +340,7 @@ nautilus_places_view_get_view_id (NautilusView *view)
 static void
 nautilus_places_view_iface_init (NautilusViewInterface *iface)
 {
+    iface->get_action_bar = nautilus_places_view_get_action_bar;
     iface->get_location = nautilus_places_view_get_location;
     iface->set_location = nautilus_places_view_set_location;
     iface->get_selection = nautilus_places_view_get_selection;
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index d14682d..3920552 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -86,6 +86,22 @@ nautilus_view_default_init (NautilusViewInterface *iface)
 }
 
 /**
+ * nautilus_view_get_action_bar:
+ * @view: a #NautilusView
+ *
+ * Retrieves the action bar of @view.
+ *
+ * Returns: (transfer none): a #GtkWidget or %NULL.
+ */
+GtkWidget*
+nautilus_view_get_action_bar (NautilusView *view)
+{
+        g_return_val_if_fail (NAUTILUS_VIEW_GET_IFACE (view)->get_action_bar, NULL);
+
+        return NAUTILUS_VIEW_GET_IFACE (view)->get_action_bar (view);
+}
+
+/**
  * nautilus_view_get_icon:
  * @view: a #NautilusView
  *
diff --git a/src/nautilus-view.h b/src/nautilus-view.h
index 0f81707..e5ca349 100644
--- a/src/nautilus-view.h
+++ b/src/nautilus-view.h
@@ -47,6 +47,10 @@ struct _NautilusViewInterface
         GTypeInterface parent;
 
         guint                           (*get_view_id)               (NautilusView         *view);
+
+        /* Action bar of the view */
+        GtkWidget*                      (*get_action_bar)            (NautilusView         *view);
+
         /*
          * Returns the menu sections that should be shown in the toolbar menu
          * when this view is active. Implementations must not return %NULL
@@ -79,6 +83,8 @@ GIcon *                        nautilus_view_get_icon                  (guint
 
 guint                          nautilus_view_get_view_id               (NautilusView         *view);
 
+GtkWidget*                     nautilus_view_get_action_bar            (NautilusView         *view);
+
 NautilusToolbarMenuSections *  nautilus_view_get_toolbar_menu_sections (NautilusView         *view);
 
 GFile *                        nautilus_view_get_location              (NautilusView         *view);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]