[nautilus/wip/gbsneto/actionbar: 7/10] action-bar: implement NautilusActionBar



commit dfa1feaa875710bd0452e6d7742c80db1ebd2372
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Wed Mar 2 00:59:06 2016 -0300

    action-bar: implement NautilusActionBar
    
    The new NautilusActionBar class handles everything
    needed to be an usable actionbar as envisioned by
    the available mockups.

 src/Makefile.am                         |    2 +
 src/nautilus-action-bar.c               |  613 +++++++++++++++++++++++++++++++
 src/nautilus-action-bar.h               |   39 ++
 src/nautilus-canvas-view.c              |    7 +
 src/resources/css/Adwaita.css           |    9 +
 src/resources/nautilus.gresource.xml    |    1 +
 src/resources/ui/nautilus-action-bar.ui |  408 ++++++++++++++++++++
 7 files changed, 1079 insertions(+), 0 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 608e6a6..6103c8b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -139,6 +139,8 @@ nautilus_SOURCES = \
        gtk/nautilusgtkplacesviewprivate.h              \
        gtk/nautilusgtkplacesviewrow.c                  \
        gtk/nautilusgtkplacesviewrowprivate.h           \
+       nautilus-action-bar.c                   \
+       nautilus-action-bar.h                   \
        nautilus-application.c                  \
        nautilus-application.h                  \
        nautilus-bookmark-list.c                \
diff --git a/src/nautilus-action-bar.c b/src/nautilus-action-bar.c
new file mode 100644
index 0000000..c6abf92
--- /dev/null
+++ b/src/nautilus-action-bar.c
@@ -0,0 +1,613 @@
+/* nautilus-action-bar.c
+ *
+ * Copyright (C) 2016 Georges Basile Stavracas Neto <georges stavracas gmail com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "nautilus-action-bar.h"
+#include "nautilus-previewer.h"
+
+#include <gdk/gdkx.h>
+#include <libnautilus-private/nautilus-clipboard.h>
+#include <libnautilus-private/nautilus-clipboard-monitor.h>
+#include <libnautilus-private/nautilus-file.h>
+
+#include <glib/gi18n.h>
+
+#define               UPDATE_STATUS_TIMEOUT  200 //ms
+
+struct _NautilusActionBar
+{
+  GtkFrame            parent;
+
+  GtkWidget          *file_name_label;
+  GtkWidget          *file_size_label;
+  GtkWidget          *loading_label;
+  GtkWidget          *multi_selection_label;
+  GtkWidget          *paste_button;
+  GtkWidget          *preview_button;
+  GtkWidget          *preview_icon;
+  GtkWidget          *stack;
+
+  NautilusView       *view;
+  gboolean            show_thumbnail;
+  gint                update_status_timeout_id;
+};
+
+G_DEFINE_TYPE (NautilusActionBar, nautilus_action_bar, GTK_TYPE_FRAME)
+
+enum {
+  PROP_0,
+  PROP_SHOW_THUMBNAIL,
+  PROP_VIEW,
+  N_PROPS
+};
+
+static void
+open_preview_cb (NautilusActionBar *actionbar)
+{
+  GtkWidget *toplevel;
+  GdkWindow *window;
+  GList *selection;
+  gchar *uri;
+  guint xid;
+
+  xid = 0;
+  uri = NULL;
+  selection = nautilus_view_get_selection (actionbar->view);
+
+  /* Only preview if exact 1 file is selected */
+  if (g_list_length (selection) != 1)
+    goto out;
+
+  uri = nautilus_file_get_uri (selection->data);
+  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (actionbar));
+
+#ifdef GDK_WINDOWING_X11
+        window = gtk_widget_get_window (toplevel);
+        if (GDK_IS_X11_WINDOW (window))
+          xid = gdk_x11_window_get_xid (gtk_widget_get_window (toplevel));
+#endif
+
+  nautilus_previewer_call_show_file (uri, xid, TRUE);
+
+out:
+  g_clear_pointer (&selection, nautilus_file_list_free);
+  g_clear_pointer (&uri, g_free);
+}
+
+static void
+update_paste_button (NautilusActionBar *self)
+{
+  NautilusClipboardMonitor *monitor;
+  NautilusClipboardInfo *info;
+
+  monitor = nautilus_clipboard_monitor_get ();
+  info = nautilus_clipboard_monitor_get_clipboard_info (monitor);
+
+  gtk_widget_set_visible (self->paste_button, info != NULL);
+
+  if (info)
+    {
+      gchar *label;
+      gint length;
+
+      length = g_list_length (info->files);
+
+      if (info->cut)
+        label = g_strdup_printf (g_dngettext(NULL, "Move %d file", "Move %d files", length), length);
+      else
+        label = g_strdup_printf (g_dngettext(NULL, "Paste %d file", "Paste %d files", length), length);
+
+      gtk_button_set_label (GTK_BUTTON (self->paste_button), label);
+
+      g_free (label);
+    }
+}
+
+static void
+setup_multiple_files_selection (NautilusActionBar *actionbar,
+                                GList             *selection)
+{
+  NautilusFile *file;
+  goffset non_folder_size;
+  gboolean non_folder_size_known;
+  guint non_folder_count, folder_count, folder_item_count;
+  gboolean folder_item_count_known;
+  guint file_item_count;
+  GList *p;
+  char *first_item_name;
+  char *non_folder_count_str;
+  char *non_folder_item_count_str;
+  char *folder_count_str;
+  char *folder_item_count_str;
+  char *status;
+
+  folder_item_count_known = TRUE;
+  folder_count = 0;
+  folder_item_count = 0;
+  non_folder_count = 0;
+  non_folder_size_known = FALSE;
+  non_folder_size = 0;
+  first_item_name = NULL;
+  folder_count_str = NULL;
+  folder_item_count_str = NULL;
+  non_folder_count_str = NULL;
+  non_folder_item_count_str = NULL;
+
+  for (p = selection; p != NULL; p = p->next)
+    {
+      file = p->data;
+
+      if (nautilus_file_is_directory (file))
+        {
+          folder_count++;
+
+          if (nautilus_file_get_directory_item_count (file, &file_item_count, NULL))
+            folder_item_count += file_item_count;
+          else
+            folder_item_count_known = FALSE;
+        }
+      else
+        {
+          non_folder_count++;
+
+          if (!nautilus_file_can_get_size (file))
+            {
+              non_folder_size_known = TRUE;
+              non_folder_size += nautilus_file_get_size (file);
+            }
+        }
+
+      if (first_item_name == NULL)
+        first_item_name = nautilus_file_get_display_name (file);
+    }
+
+  nautilus_file_list_free (selection);
+
+  /*
+   * Break out cases for localization's sake. But note that there are still pieces
+   * being assembled in a particular order, which may be a problem for some localizers.
+   */
+  if (folder_count != 0)
+    {
+      if (folder_count == 1 && non_folder_count == 0)
+        {
+          folder_count_str = g_strdup_printf (_("“%s” selected"), first_item_name);
+        }
+      else
+        {
+          folder_count_str = g_strdup_printf (ngettext("%'d folder selected",
+                                                       "%'d folders selected",
+                                                       folder_count),
+                                              folder_count);
+        }
+
+      if (folder_count == 1)
+        {
+          if (!folder_item_count_known)
+            folder_item_count_str = g_strdup ("");
+          else
+            folder_item_count_str = g_strdup_printf (ngettext("(containing %'d item)", "(containing %'d 
items)", folder_item_count),
+                                                     folder_item_count);
+        }
+      else
+        {
+          if (!folder_item_count_known)
+            {
+              folder_item_count_str = g_strdup ("");
+            }
+          else
+            {
+              /* translators: this is preceded with a string of form 'N folders' (N more than 1) */
+              folder_item_count_str = g_strdup_printf (ngettext("(containing a total of %'d item)",
+                                                                "(containing a total of %'d items)",
+                                                                folder_item_count),
+                                                       folder_item_count);
+            }
+        }
+    }
+
+  if (non_folder_count != 0)
+    {
+      if (folder_count == 0)
+        {
+          if (non_folder_count == 1) {
+                  non_folder_count_str = g_strdup_printf (_("“%s” selected"), first_item_name);
+          } else {
+                  non_folder_count_str = g_strdup_printf (ngettext("%'d item selected",
+                                                                   "%'d items selected",
+                                                                   non_folder_count),
+                                                          non_folder_count);
+          }
+        }
+      else
+        {
+          /* Folders selected also, use "other" terminology */
+          non_folder_count_str = g_strdup_printf (ngettext("%'d other item selected",
+                                                           "%'d other items selected",
+                                                           non_folder_count),
+                                                  non_folder_count);
+        }
+
+      if (non_folder_size_known)
+        {
+          char *size_string;
+
+          size_string = g_format_size (non_folder_size);
+          /* This is marked for translation in case a localiser
+           * needs to use something other than parentheses. The
+           * the message in parentheses is the size of the selected items.
+           */
+          non_folder_item_count_str = g_strdup_printf (_("(%s)"), size_string);
+          g_free (size_string);
+        }
+      else
+        {
+          non_folder_item_count_str = g_strdup ("");
+        }
+    }
+
+  if (folder_count == 0 && non_folder_count == 0)
+    {
+      status = NULL;
+    }
+  else if (folder_count == 0)
+    {
+      status = g_strdup_printf ("%s, %s", non_folder_count_str, non_folder_item_count_str);
+    }
+  else if (non_folder_count == 0)
+    {
+      status = g_strdup_printf ("%s %s", folder_count_str, folder_item_count_str);
+    }
+  else {
+          /* This is marked for translation in case a localizer
+           * needs to change ", " to something else. The comma
+           * is between the message about the number of folders
+           * and the number of items in those folders and the
+           * message about the number of other items and the
+           * total size of those items.
+           */
+          status = g_strdup_printf (_("%s %s, %s %s"),
+                                    folder_count_str,
+                                    folder_item_count_str,
+                                    non_folder_count_str,
+                                    non_folder_item_count_str);
+  }
+
+  gtk_label_set_label (GTK_LABEL (actionbar->multi_selection_label), status);
+  gtk_stack_set_visible_child_name (GTK_STACK (actionbar->stack), "multi-selection");
+
+  g_free (first_item_name);
+  g_free (folder_count_str);
+  g_free (folder_item_count_str);
+  g_free (non_folder_count_str);
+  g_free (non_folder_item_count_str);
+  g_free (status);
+}
+
+static void
+setup_single_file_selection (NautilusActionBar *actionbar,
+                             NautilusFile      *file)
+{
+  gboolean is_directory, sensitive;
+  gchar *thumbnail_path;
+  gchar *description;
+
+  description = NULL;
+  is_directory = nautilus_file_is_directory (file);
+
+  /* Setup the thumbnail icon */
+  thumbnail_path = nautilus_file_get_thumbnail_path (file);
+
+  if (thumbnail_path && actionbar->show_thumbnail)
+    {
+      GtkStyleContext *context;
+      GdkPixbuf *thumbnail;
+      gint border_top, border_bottom;
+      gint height;
+
+      context = gtk_widget_get_style_context (actionbar->preview_button);
+
+      gtk_style_context_get (context,
+                             gtk_style_context_get_state (context),
+                             "border-top-width", &border_top,
+                             "border-bottom-width", &border_bottom,
+                             NULL);
+
+      sensitive = TRUE;
+      height = gtk_widget_get_allocated_height (actionbar->preview_button) - border_top - border_bottom;
+      thumbnail = gdk_pixbuf_new_from_file_at_size (thumbnail_path,
+                                                    -1,
+                                                    height,
+                                                    NULL);
+
+      gtk_image_set_from_pixbuf (GTK_IMAGE (actionbar->preview_icon), thumbnail);
+      gtk_widget_set_margin_start (actionbar->preview_button, 0);
+
+      g_clear_object (&thumbnail);
+    }
+  else
+    {
+      GIcon *icon;
+
+      sensitive = FALSE;
+      icon = nautilus_file_get_gicon (file, 0);
+
+      gtk_image_set_from_gicon (GTK_IMAGE (actionbar->preview_icon), icon, GTK_ICON_SIZE_DND);
+      gtk_widget_set_margin_start (actionbar->preview_button, 6);
+
+      g_clear_object (&icon);
+    }
+
+
+  /* We don't want to preview folders */
+  gtk_widget_set_sensitive (actionbar->preview_button, sensitive && !is_directory);
+
+  /* Primary label is the file name */
+  gtk_label_set_label (GTK_LABEL (actionbar->file_name_label), nautilus_file_get_display_name (file));
+
+  /*
+   * If the selected item is a folder, display the number of
+   * children. Otherwise, display the file size.
+   */
+  if (is_directory)
+    {
+      guint folder_children;
+
+      if (nautilus_file_get_directory_item_count (file, &folder_children, NULL))
+        {
+          description = g_strdup_printf (ngettext("Contains %'d item", "Contains %'d items", 
folder_children),
+                                         folder_children);
+        }
+    }
+  else
+    {
+      description = g_format_size (nautilus_file_get_size (file));
+    }
+
+  /*
+   * If there is no description available, we hide the second label so
+   * the filename is vertically centralized against the icon.
+   */
+  gtk_widget_set_visible (actionbar->file_size_label, description != NULL);
+  gtk_label_set_label (GTK_LABEL (actionbar->file_size_label), description ? description : "");
+
+  gtk_stack_set_visible_child_name (GTK_STACK (actionbar->stack), "single-selection");
+
+  g_clear_pointer (&description, g_free);
+  g_clear_pointer (&file, nautilus_file_unref);
+}
+
+static gboolean
+real_update_status (gpointer data)
+{
+  NautilusActionBar *actionbar = data;
+
+  if (nautilus_view_is_loading (actionbar->view))
+    {
+      gtk_label_set_label (GTK_LABEL (actionbar->loading_label),
+                           nautilus_view_is_searching (actionbar->view) ? _("Searching") : _("Loading"));
+
+      gtk_stack_set_visible_child_name (GTK_STACK (actionbar->stack), "loading");
+    }
+  else
+    {
+      GList *selection;
+      gint number_of_files;
+
+      selection = nautilus_view_get_selection (actionbar->view);
+      number_of_files = g_list_length (selection);
+
+      if (number_of_files == 0)
+        gtk_stack_set_visible_child_name (GTK_STACK (actionbar->stack), "normal");
+      else if (number_of_files == 1)
+        setup_single_file_selection (actionbar, selection->data);
+      else
+        setup_multiple_files_selection (actionbar, selection);
+    }
+
+  actionbar->update_status_timeout_id = 0;
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+update_status (NautilusActionBar *actionbar)
+{
+  if (actionbar->update_status_timeout_id > 0)
+    {
+      g_source_remove (actionbar->update_status_timeout_id);
+      actionbar->update_status_timeout_id = 0;
+    }
+
+  actionbar->update_status_timeout_id = g_timeout_add (UPDATE_STATUS_TIMEOUT,
+                                                       real_update_status,
+                                                       actionbar);
+}
+
+static void
+nautilus_action_bar_finalize (GObject *object)
+{
+  NautilusActionBar *self = NAUTILUS_ACTION_BAR (object);
+
+  if (self->update_status_timeout_id > 0)
+    {
+      g_source_remove (self->update_status_timeout_id);
+      self->update_status_timeout_id = 0;
+    }
+
+  g_signal_handlers_disconnect_by_func (nautilus_clipboard_monitor_get (), update_paste_button, self);
+  g_signal_handlers_disconnect_by_func (self->view, update_status, self);
+
+  g_clear_object (&self->view);
+
+  G_OBJECT_CLASS (nautilus_action_bar_parent_class)->finalize (object);
+}
+
+static void
+nautilus_action_bar_get_property (GObject    *object,
+                                  guint       prop_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
+{
+  NautilusActionBar *self = NAUTILUS_ACTION_BAR (object);
+
+  switch (prop_id)
+    {
+    case PROP_SHOW_THUMBNAIL:
+      g_value_set_boolean (value, self->show_thumbnail);
+      break;
+
+    case PROP_VIEW:
+      g_value_set_object (value, self->view);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+static void
+nautilus_action_bar_set_property (GObject      *object,
+                                  guint         prop_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  NautilusActionBar *self = NAUTILUS_ACTION_BAR (object);
+
+  switch (prop_id)
+    {
+    case PROP_SHOW_THUMBNAIL:
+      nautilus_action_bar_set_show_thumbnail (self, g_value_get_boolean (value));
+      break;
+
+    case PROP_VIEW:
+      if (g_set_object (&self->view, g_value_get_object (value)))
+        {
+          g_signal_connect_swapped (self->view, "notify::selection", G_CALLBACK (update_status), self);
+          g_signal_connect_swapped (self->view, "notify::is-loading", G_CALLBACK (update_status), self);
+          g_signal_connect_swapped (self->view, "notify::is-searching", G_CALLBACK (update_status), self);
+          g_object_notify (object, "view");
+        }
+
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+static void
+nautilus_action_bar_class_init (NautilusActionBarClass *klass)
+{
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = nautilus_action_bar_finalize;
+  object_class->get_property = nautilus_action_bar_get_property;
+  object_class->set_property = nautilus_action_bar_set_property;
+
+  /**
+   * NautilusActionBar::show-thumbnail:
+   *
+   * Whether the view shows the available thumbnails.
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_SHOW_THUMBNAIL,
+                                   g_param_spec_boolean ("show-thumbnail",
+                                                         "Whether the view shows thumbnails",
+                                                         "Whether the view shows thumbnails or not",
+                                                         TRUE,
+                                                         G_PARAM_READWRITE));
+
+  /**
+   * NautilusActionBar::view:
+   *
+   * The view related to this actionbar.
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_VIEW,
+                                   g_param_spec_object ("view",
+                                                        "View of the actionbar",
+                                                        "The view related to this actionbar",
+                                                        NAUTILUS_TYPE_VIEW,
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/nautilus/ui/nautilus-action-bar.ui");
+
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, file_name_label);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, file_size_label);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, loading_label);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, multi_selection_label);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, paste_button);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, preview_button);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, preview_icon);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, stack);
+
+  gtk_widget_class_bind_template_callback (widget_class, open_preview_cb);
+
+  gtk_widget_class_set_css_name (widget_class, "actionbar");
+}
+
+static void
+nautilus_action_bar_init (NautilusActionBar *self)
+{
+  self->show_thumbnail = TRUE;
+
+  gtk_widget_init_template (GTK_WIDGET (self));
+
+  update_paste_button (self);
+
+  g_signal_connect_swapped (nautilus_clipboard_monitor_get (), "clipboard-changed",
+                            G_CALLBACK (update_paste_button), self);
+}
+
+/**
+ * nautilus_action_bar_new:
+ * @view: a #NautilusView
+ *
+ * Creates a new actionbar related to @view.
+ *
+ * Returns: (transfer full): a #NautilusActionBar
+ */
+GtkWidget*
+nautilus_action_bar_new (NautilusView *view)
+{
+  return g_object_new (NAUTILUS_TYPE_ACTION_BAR,
+                       "view", view,
+                       NULL);
+}
+
+/**
+ * nautilus_action_bar_set_show_thumbnail:
+ * @actionbar: a #NautilusActionBar
+ * @show_thumbnail: %TRUE if it shows available thumbnails, %FALSE otherwise
+ *
+ * Sets whether @actionbar should show the thumbnail or not.
+ */
+void
+nautilus_action_bar_set_show_thumbnail (NautilusActionBar *actionbar,
+                                        gboolean           show_thumbnail)
+{
+  g_return_if_fail (NAUTILUS_IS_ACTION_BAR (actionbar));
+
+  if (actionbar->show_thumbnail != show_thumbnail)
+    {
+      actionbar->show_thumbnail = show_thumbnail;
+
+      g_object_notify (G_OBJECT (actionbar), "show-thumbnail");
+    }
+}
diff --git a/src/nautilus-action-bar.h b/src/nautilus-action-bar.h
new file mode 100644
index 0000000..0af85b3
--- /dev/null
+++ b/src/nautilus-action-bar.h
@@ -0,0 +1,39 @@
+/* nautilus-action-bar.h
+ *
+ * Copyright (C) 2016 Georges Basile Stavracas Neto <georges stavracas gmail com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NAUTILUS_ACTION_BAR_H
+#define NAUTILUS_ACTION_BAR_H
+
+#include <gtk/gtk.h>
+
+#include "nautilus-view.h"
+
+G_BEGIN_DECLS
+
+#define NAUTILUS_TYPE_ACTION_BAR (nautilus_action_bar_get_type())
+
+G_DECLARE_FINAL_TYPE (NautilusActionBar, nautilus_action_bar, NAUTILUS, ACTION_BAR, GtkFrame)
+
+GtkWidget*           nautilus_action_bar_new                     (NautilusView      *view);
+
+void                 nautilus_action_bar_set_show_thumbnail      (NautilusActionBar *actionbar,
+                                                                  gboolean           show_thumbnail);
+
+G_END_DECLS
+
+#endif /* NAUTILUS_ACTION_BAR_H */
diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c
index 5e31bc8..193a39b 100644
--- a/src/nautilus-canvas-view.c
+++ b/src/nautilus-canvas-view.c
@@ -25,6 +25,7 @@
 
 #include "nautilus-canvas-view.h"
 
+#include "nautilus-action-bar.h"
 #include "nautilus-canvas-view-container.h"
 #include "nautilus-desktop-canvas-view.h"
 #include "nautilus-error-reporting.h"
@@ -1965,6 +1966,7 @@ static void
 nautilus_canvas_view_init (NautilusCanvasView *canvas_view)
 {
        NautilusCanvasContainer *canvas_container;
+        NautilusView *view;
        GActionGroup *view_action_group;
 
        canvas_view->details = g_new0 (NautilusCanvasViewDetails, 1);
@@ -2015,6 +2017,11 @@ nautilus_canvas_view_init (NautilusCanvasView *canvas_view)
        /* Keep the action synced with the actual value, so the toolbar can poll it */
        g_action_group_change_action_state (nautilus_files_view_get_action_group (NAUTILUS_FILES_VIEW 
(canvas_view)),
                                            "zoom-to-level", g_variant_new_int32 (get_default_zoom_level 
(canvas_view)));
+
+        /* Don't show thumbnails */
+        view = NAUTILUS_VIEW (canvas_view);
+        nautilus_action_bar_set_show_thumbnail (NAUTILUS_ACTION_BAR (nautilus_view_get_action_bar (view)),
+                                                FALSE);
 }
 
 NautilusFilesView *
diff --git a/src/resources/css/Adwaita.css b/src/resources/css/Adwaita.css
index c09ac4e..53d3145 100644
--- a/src/resources/css/Adwaita.css
+++ b/src/resources/css/Adwaita.css
@@ -93,6 +93,13 @@
     box-shadow: none;
 }
 
+button.thumbnail-button {
+    padding: 0px;
+    margin: 0px;
+    border: 0px;
+    border-radius: 0px;
+}
+
 @define-color disk_space_unknown #888a85;
 @define-color disk_space_used #729fcf;
 @define-color disk_space_free #eeeeec;
@@ -169,3 +176,5 @@
  * always allocates at least 1 pixel */
 searchbar { border-top: 1px solid @borders; }
 .searchbar-container { margin-top: -1px; }
+
+actionbar { border-top: 1px solid @borders; }
diff --git a/src/resources/nautilus.gresource.xml b/src/resources/nautilus.gresource.xml
index 0acbc70..8920b7e 100644
--- a/src/resources/nautilus.gresource.xml
+++ b/src/resources/nautilus.gresource.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/nautilus">
+    <file compressed="true">ui/nautilus-action-bar.ui</file>
     <file compressed="true">ui/nautilus-preferences-window.ui</file>
     <file compressed="true">ui/nautilus-search-popover.ui</file>
     <file>gtk/menus.ui</file>
diff --git a/src/resources/ui/nautilus-action-bar.ui b/src/resources/ui/nautilus-action-bar.ui
new file mode 100644
index 0000000..c296f25
--- /dev/null
+++ b/src/resources/ui/nautilus-action-bar.ui
@@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="3.18"/>
+  <template class="NautilusActionBar" parent="GtkFrame">
+    <property name="visible">True</property>
+    <property name="vexpand">False</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkStack" id="stack">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="hhomogeneous">False</property>
+        <property name="transition_type">crossfade</property>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="valign">center</property>
+            <property name="hexpand">True</property>
+            <property name="border_width">6</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkButton" id="paste_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="action_name">view.paste</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton">
+                <property name="label" translatable="yes">New Folder…</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="action_name">view.new-folder</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkMenuButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="menu_model">no-selection-menu</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">view-more-symbolic</property>
+                  </object>
+                </child>
+                <style>
+                  <class name="image-button"/>
+                </style>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="pack_type">end</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="name">normal</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkGrid">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="column_spacing">6</property>
+            <child>
+              <object class="GtkButton" id="preview_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="vexpand">True</property>
+                <property name="relief">none</property>
+                <signal name="clicked" handler="open_preview_cb" object="NautilusActionBar" swapped="yes"/>
+                <child>
+                  <object class="GtkImage" id="preview_icon">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-missing-image</property>
+                  </object>
+                </child>
+                <style>
+                  <class name="thumbnail-button"/>
+                </style>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+                <property name="height">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="file_name_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="valign">end</property>
+                <property name="hexpand">True</property>
+                <property name="ellipsize">end</property>
+                <property name="xalign">0</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="file_size_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="valign">start</property>
+                <property name="xalign">0</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="valign">center</property>
+                <property name="action_name">view.move-to-trash</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">user-trash-symbolic</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">0</property>
+                <property name="height">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton">
+                <property name="label" translatable="yes">Move To…</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="valign">center</property>
+                <property name="action_name">view.move-to</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="top_attach">0</property>
+                <property name="height">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton">
+                <property name="label" translatable="yes">Open</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="valign">center</property>
+                <property name="margin_end">6</property>
+                <property name="action_name">view.open-with-default-application</property>
+                <style>
+                  <class name="suggested-action"/>
+                </style>
+              </object>
+              <packing>
+                <property name="left_attach">4</property>
+                <property name="top_attach">0</property>
+                <property name="height">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="name">single-selection</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="valign">center</property>
+            <property name="hexpand">True</property>
+            <property name="border_width">6</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkLabel" id="multi_selection_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="ellipsize">end</property>
+                <property name="lines">2</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkMenuButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="menu-model">multi-selection-menu</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">view-more-symbolic</property>
+                  </object>
+                </child>
+                <style>
+                  <class name="image-button"/>
+                </style>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="pack_type">end</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton">
+                <property name="label" translatable="yes">New Folder With Selection…</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="action_name">view.new-folder-with-selection</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="pack_type">end</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton">
+                <property name="label" translatable="yes">Move To…</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="action_name">view.move-to</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="pack_type">end</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton">
+                <property name="label" translatable="yes">Copy To…</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="action_name">view.copy-to</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="pack_type">end</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="action_name">view.move-to-trash</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">user-trash-symbolic</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="pack_type">end</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="name">multi-selection</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="valign">center</property>
+            <property name="border_width">6</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkSpinner">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="active">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="loading_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Loading</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="action_name">view.stop-loading</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">process-stop-symbolic</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="pack_type">end</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="name">loading</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </template>
+  <menu id="no-selection-menu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Properties</attribute>
+        <attribute name="action">view.properties</attribute>
+      </item>
+    </section>
+  </menu>
+  <menu id="multi-selection-menu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Open in New Window</attribute>
+        <attribute name="action">view.open-item-new-window</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Open in New Tab</attribute>
+        <attribute name="action">view.open-item-new-tab</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Properties</attribute>
+        <attribute name="action">view.properties</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>



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