actionbar: initial prototype for handling overflow

It's WIP.

4 files changed, 814 insertions, 448 deletions

diff --git a/src/nautilus-action-bar.c b/src/nautilus-action-bar.c
index 6a664c9cb..e03026f2c 100644
--- a/src/nautilus-action-bar.c
+++ b/src/nautilus-action-bar.c
@@ -19,6 +19,7 @@
 #include "nautilus-action-bar.h"
 #include "nautilus-clipboard.h"
 #include "nautilus-file.h"
+#include "nautilus-mime-actions.h"
 #include "nautilus-previewer.h"
 
 #include <gdk/gdkx.h>
@@ -27,21 +28,55 @@
 
 #define               UPDATE_STATUS_TIMEOUT  200 //ms
 
+typedef enum
+{
+  MODE_NO_SELECTION,
+  MODE_FILES_ONLY,
+  MODE_FOLDERS_ONLY,
+  MODE_MIXED
+} ActionBarMode;
+
 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;
 
+  /* No selection buttons */
+  GtkWidget          *new_folder_0_button;
+  GtkWidget          *paste_button;
+  GtkWidget          *select_all_button;
+  GtkWidget          *no_selection_separator;
+  GtkWidget          *bookmark_button;
+  GtkWidget          *properties_0_button;
+  GtkWidget          *no_selection_overflow_button;
+  GtkWidget          *no_selection_folder_label;
+
+  /* Folders buttons */
+  GtkWidget          *open_file_box;
+  GtkWidget          *open_folders_button;
+  GtkWidget          *move_folders_button;
+  GtkWidget          *move_trash_folders_button;
+  GtkWidget          *copy_folders_button;
+  GtkWidget          *rename_folders_button;
+  GtkWidget          *properties_folders_button;
+  GtkWidget          *folders_overflow_button;
+
+  GtkWidget          *no_selection_widgets    [5];
+  GtkWidget          *files_folders_widgets   [5];
+
+  /* Labels */
+  GtkWidget          *selection_label;
+  GtkWidget          *size_label;
+
+  /* Default app widgets */
+  GtkWidget          *default_app_button;
+  GtkWidget          *default_app_icon;
+  GtkWidget          *default_app_label;
+
   NautilusView       *view;
-  gboolean            show_thumbnail;
+  ActionBarMode       mode;
   gint                update_status_timeout_id;
 };
 
@@ -49,44 +84,10 @@ 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);
-}
-
 #if 0
 static void
 update_paste_button (NautilusActionBar *self)
@@ -119,39 +120,47 @@ update_paste_button (NautilusActionBar *self)
 #endif
 
 static void
-setup_multiple_files_selection (NautilusActionBar *actionbar,
-                                GList             *selection)
+setup_selection_label (NautilusActionBar *self)
 {
   NautilusFile *file;
-  goffset non_folder_size;
-  gboolean non_folder_size_known;
+  goffset total_size;
+  gboolean total_size_known;
   guint non_folder_count, folder_count, folder_item_count;
   gboolean folder_item_count_known;
   guint file_item_count;
+  GList *selection;
   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;
+  gchar *first_item_name;
+  gchar *non_folder_count_str;
+  gchar *total_size_string;
+  gchar *folder_count_str;
+  gchar *folder_item_count_str;
+  gchar *status;
+
+  selection = nautilus_view_get_selection (self->view);
 
   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;
+  total_size_known = FALSE;
   first_item_name = NULL;
   folder_count_str = NULL;
   folder_item_count_str = NULL;
   non_folder_count_str = NULL;
-  non_folder_item_count_str = NULL;
+  total_size_string = NULL;
+  total_size = 0;
 
   for (p = selection; p != NULL; p = p->next)
     {
       file = p->data;
 
+      if (!nautilus_file_can_get_size (file))
+        {
+          total_size_known = TRUE;
+          total_size += nautilus_file_get_size (file);
+        }
+
       if (nautilus_file_is_directory (file))
         {
           folder_count++;
@@ -164,20 +173,12 @@ setup_multiple_files_selection (NautilusActionBar *actionbar,
       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.
@@ -233,7 +234,7 @@ setup_multiple_files_selection (NautilusActionBar *actionbar,
                                                                    non_folder_count),
                                                           non_folder_count);
           }
-        }
+       }
       else
         {
           /* Folders selected also, use "other" terminology */
@@ -242,154 +243,140 @@ setup_multiple_files_selection (NautilusActionBar *actionbar,
                                                            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 (total_size_known)
+    total_size_string = g_format_size (total_size);
+
   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);
+      status = g_strdup_printf ("%s", non_folder_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");
+  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"),
+                                folder_count_str,
+                                folder_item_count_str,
+                                non_folder_count_str);
+    }
+
+  gtk_label_set_label (GTK_LABEL (self->selection_label), status);
+  gtk_label_set_label (GTK_LABEL (self->size_label), total_size_string);
 
   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 (total_size_string);
   g_free (status);
 }
 
 static void
-setup_single_file_selection (NautilusActionBar *actionbar,
-                             NautilusFile      *file)
+setup_file_button (NautilusActionBar *self)
 {
-  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)
+  GAppInfo *app;
+  GIcon *icon;
+  GList *selection, *l;
+  gchar *label;
+  gboolean show_app, show_run;
+
+  selection = nautilus_view_get_selection (self->view);
+  app = nautilus_mime_get_default_application_for_files (selection);
+  show_app = show_run = g_list_length (selection) > 0;
+  icon = NULL;
+
+  for (l = selection; l != NULL; l = l->next)
     {
-      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;
+      NautilusFile *file;
 
-      sensitive = FALSE;
-      icon = nautilus_file_get_gicon (file, 0);
+      file = NAUTILUS_FILE (selection->data);
 
-      gtk_image_set_from_gicon (GTK_IMAGE (actionbar->preview_icon), icon, GTK_ICON_SIZE_DND);
-      gtk_widget_set_margin_start (actionbar->preview_button, 6);
+      if (!nautilus_mime_file_opens_in_external_app (file))
+        show_app = FALSE;
 
-      g_clear_object (&icon);
-    }
+      if (!nautilus_mime_file_launches (file))
+        show_run = FALSE;
 
+      if (!show_app && !show_run)
+        break;
+    }
 
-  /* We don't want to preview folders */
-  gtk_widget_set_sensitive (actionbar->preview_button, sensitive && !is_directory);
+  if (app)
+    {
+      label = g_strdup_printf (_("Open With %s"), g_app_info_get_name (app));
+      icon = g_app_info_get_icon (app);
 
-  /* Primary label is the file name */
-  gtk_label_set_label (GTK_LABEL (actionbar->file_name_label), nautilus_file_get_display_name (file));
+      if (icon)
+        g_object_ref (icon);
 
-  /*
-   * If the selected item is a folder, display the number of
-   * children. Otherwise, display the file size.
-   */
-  if (is_directory)
+      g_clear_object (&app);
+    }
+  else if (show_run)
     {
-      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);
-        }
+      label = g_strdup (_("Run"));
     }
   else
     {
-      description = g_format_size (nautilus_file_get_size (file));
+      label = g_strdup (_("Open"));
     }
 
   /*
-   * If there is no description available, we hide the second label so
-   * the filename is vertically centralized against the icon.
+   * Change the visibility of the icon widget because otherwise the box
+   * will calculate the spacing considering it.
    */
-  gtk_widget_set_visible (actionbar->file_size_label, description != NULL);
-  gtk_label_set_label (GTK_LABEL (actionbar->file_size_label), description ? description : "");
+  gtk_widget_set_visible (self->default_app_icon, icon != NULL);
 
-  gtk_stack_set_visible_child_name (GTK_STACK (actionbar->stack), "single-selection");
+  gtk_image_set_from_gicon (GTK_IMAGE (self->default_app_icon), icon, GTK_ICON_SIZE_MENU);
+  gtk_label_set_label (GTK_LABEL (self->default_app_label), label);
 
-  g_clear_pointer (&description, g_free);
-  g_clear_pointer (&file, nautilus_file_unref);
+  g_free (label);
+}
+
+static void
+set_internal_mode (NautilusActionBar *self,
+                   ActionBarMode      mode)
+{
+  self->mode = mode;
+
+  switch (mode)
+    {
+    case MODE_NO_SELECTION:
+      gtk_stack_set_visible_child_name (GTK_STACK (self->stack), "no-selection");
+      break;
+
+    case MODE_FILES_ONLY:
+      gtk_stack_set_visible_child_name (GTK_STACK (self->stack), "files-folders");
+      setup_selection_label (self);
+      setup_file_button (self);
+      break;
+
+    case MODE_FOLDERS_ONLY:
+      gtk_stack_set_visible_child_name (GTK_STACK (self->stack), "files-folders");
+      setup_selection_label (self);
+      break;
+
+    case MODE_MIXED:
+      gtk_stack_set_visible_child_name (GTK_STACK (self->stack), "files-folders");
+      setup_selection_label (self);
+      break;
+    }
+
+  gtk_widget_queue_resize (self->stack);
 }
 
 static gboolean
@@ -406,18 +393,31 @@ real_update_status (gpointer data)
     }
   else
     {
-      GList *selection;
-      gint number_of_files;
+      GList *selection, *l;
+      gint number_of_files, number_of_folders;
 
       selection = nautilus_view_get_selection (actionbar->view);
-      number_of_files = g_list_length (selection);
+      number_of_files = number_of_folders = 0;
+
+      /* Count the number of selected files and folders */
+      for (l = selection; l != NULL; l = l->next)
+        {
+          if (nautilus_file_is_directory (l->data))
+            number_of_folders++;
+          else
+            number_of_files++;
+        }
 
-      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);
+      if (number_of_files > 0 && number_of_folders > 0)
+        set_internal_mode (actionbar, MODE_MIXED);
+      else if (number_of_files > 0)
+        set_internal_mode (actionbar, MODE_FILES_ONLY);
+      else if (number_of_folders > 0)
+        set_internal_mode (actionbar, MODE_FOLDERS_ONLY);
       else
-        setup_multiple_files_selection (actionbar, selection);
+        set_internal_mode (actionbar, MODE_NO_SELECTION);
+
+      nautilus_file_list_free (selection);
     }
 
   actionbar->update_status_timeout_id = 0;
@@ -440,6 +440,31 @@ update_status (NautilusActionBar *actionbar)
 }
 
 static void
+location_changed_cb (NautilusActionBar *self)
+{
+  NautilusFile *file;
+  gchar *display_name;
+
+  file = nautilus_file_get (nautilus_view_get_location (self->view));
+
+  if (nautilus_file_is_home (file))
+    display_name = g_strdup (_("Home"));
+  else
+    display_name = nautilus_file_get_display_name (file);
+
+  gtk_label_set_label (GTK_LABEL (self->no_selection_folder_label), display_name);
+
+  g_clear_pointer (&file, nautilus_file_unref);
+  g_free (display_name);
+}
+
+static void
+clear_selection_cb (NautilusActionBar *self)
+{
+  nautilus_view_set_selection (self->view, NULL);
+}
+
+static void
 nautilus_action_bar_finalize (GObject *object)
 {
   NautilusActionBar *self = NAUTILUS_ACTION_BAR (object);
@@ -468,10 +493,6 @@ nautilus_action_bar_get_property (GObject    *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;
@@ -491,13 +512,10 @@ nautilus_action_bar_set_property (GObject      *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::location", G_CALLBACK (location_changed_cb), self);
           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);
@@ -512,6 +530,143 @@ nautilus_action_bar_set_property (GObject      *object,
 }
 
 static void
+set_visible_buttons (GtkWidget **widgets,
+                     GtkWidget  *overflow,
+                     gint        visible_items)
+{
+  const gint length = 5;
+  gint i;
+
+  gtk_widget_set_visible (overflow, visible_items < length);
+
+  for (i = 0; i < length; i++)
+    gtk_widget_set_visible (widgets[i], i < visible_items);
+}
+
+static void
+nautilus_action_bar_size_allocate (GtkWidget     *widget,
+                                   GtkAllocation *allocation)
+{
+  NautilusActionBar *self;
+  GtkWidget **widgets;
+  GtkWidget *overflow_button, *reference_button;
+  gint visible_items, button_width, overflow_button_width, static_button_width;
+  gint max_width;
+
+  self = NAUTILUS_ACTION_BAR (widget);
+  max_width = 2 * allocation->width / 3 - 2 * gtk_container_get_border_width (GTK_CONTAINER (self->stack));
+  reference_button = overflow_button = NULL;
+  static_button_width = 0;
+
+  switch (self->mode)
+    {
+    case MODE_NO_SELECTION:
+      overflow_button = self->no_selection_overflow_button;
+      reference_button = self->new_folder_0_button;
+      widgets = self->no_selection_widgets;
+      break;
+
+    case MODE_FILES_ONLY:
+      overflow_button = self->folders_overflow_button;
+      reference_button = self->move_folders_button;
+      widgets = self->files_folders_widgets;
+
+      gtk_widget_get_preferred_width (self->open_file_box, &static_button_width, NULL);
+
+      gtk_widget_show (self->open_file_box);
+      gtk_widget_hide (self->open_folders_button);
+      break;
+
+    case MODE_FOLDERS_ONLY:
+      overflow_button = self->folders_overflow_button;
+      reference_button = self->move_folders_button;
+      widgets = self->files_folders_widgets;
+
+      gtk_widget_get_preferred_width (self->open_folders_button, &static_button_width, NULL);
+
+      gtk_widget_hide (self->open_file_box);
+      gtk_widget_show (self->open_folders_button);
+      break;
+
+    case MODE_MIXED:
+      overflow_button = self->folders_overflow_button;
+      reference_button = self->move_folders_button;
+      widgets = self->files_folders_widgets;
+
+      gtk_widget_hide (self->open_file_box);
+      gtk_widget_hide (self->open_folders_button);
+      break;
+    }
+
+  gtk_widget_get_preferred_width (reference_button, &button_width, NULL);
+  gtk_widget_get_preferred_width (overflow_button, &overflow_button_width, NULL);
+
+  /*
+   * When in the files-only mode and selecting 2+ files with different
+   * types, the "Open" label shrinks way too much. Because of that, we
+   * have to setup a reasonable size request here.
+   */
+  if (self->mode == MODE_FILES_ONLY &&
+      static_button_width < button_width)
+    {
+      static_button_width = button_width;
+
+      gtk_widget_set_size_request (self->default_app_button, button_width, -1);
+    }
+
+  /* Number of visible widgets */
+  visible_items = CLAMP ((max_width - overflow_button_width - static_button_width) / MAX (button_width, 1), 0, 5);
+
+  if (visible_items > 0)
+    set_visible_buttons (widgets, overflow_button, visible_items);
+
+  /* Hide the separator if needed */
+  if (self->mode == MODE_NO_SELECTION)
+    gtk_widget_set_visible (self->no_selection_separator, visible_items > 3);
+
+  /* Let GtkBox allocate and position the widgets */
+  GTK_WIDGET_CLASS (nautilus_action_bar_parent_class)->size_allocate (widget, allocation);
+}
+
+static void
+nautilus_action_bar_get_preferred_width (GtkWidget *widget,
+                                         gint      *minimum,
+                                         gint      *natural)
+{
+  NautilusActionBar *self;
+  gint button_width;
+
+  self = NAUTILUS_ACTION_BAR (widget);
+
+  switch (self->mode)
+    {
+    case MODE_NO_SELECTION:
+      gtk_widget_get_preferred_width (self->new_folder_0_button, &button_width, NULL);
+      break;
+
+    case MODE_FILES_ONLY:
+      gtk_widget_get_preferred_width (self->open_folders_button, &button_width, NULL);
+      break;
+
+    case MODE_FOLDERS_ONLY:
+      gtk_widget_get_preferred_width (self->open_folders_button, &button_width, NULL);
+      break;
+
+    case MODE_MIXED:
+      gtk_widget_get_preferred_width (self->open_folders_button, &button_width, NULL);
+      break;
+    }
+
+  button_width += 2 * gtk_container_get_border_width (GTK_CONTAINER (self->stack));
+
+  if (minimum)
+    *minimum = button_width;
+
+  if (natural)
+    *natural = button_width;
+}
+
+static void
 nautilus_action_bar_class_init (NautilusActionBarClass *klass)
 {
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
@@ -521,18 +676,8 @@ nautilus_action_bar_class_init (NautilusActionBarClass *klass)
   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));
+  widget_class->size_allocate = nautilus_action_bar_size_allocate;
+  widget_class->get_preferred_width = nautilus_action_bar_get_preferred_width;
 
   /**
    * NautilusActionBar::view:
@@ -549,16 +694,31 @@ nautilus_action_bar_class_init (NautilusActionBarClass *klass)
 
   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, bookmark_button);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, copy_folders_button);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, default_app_button);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, default_app_icon);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, default_app_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, folders_overflow_button);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, move_folders_button);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, move_trash_folders_button);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, new_folder_0_button);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, no_selection_folder_label);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, no_selection_overflow_button);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, no_selection_separator);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, open_file_box);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, open_folders_button);
   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, properties_0_button);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, properties_folders_button);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, rename_folders_button);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, select_all_button);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, selection_label);
+  gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, size_label);
   gtk_widget_class_bind_template_child (widget_class, NautilusActionBar, stack);
 
-  gtk_widget_class_bind_template_callback (widget_class, open_preview_cb);
+  gtk_widget_class_bind_template_callback (widget_class, clear_selection_cb);
 
   gtk_widget_class_set_css_name (widget_class, "actionbar");
 }
@@ -566,10 +726,22 @@ nautilus_action_bar_class_init (NautilusActionBarClass *klass)
 static void
 nautilus_action_bar_init (NautilusActionBar *self)
 {
-  self->show_thumbnail = TRUE;
-
   gtk_widget_init_template (GTK_WIDGET (self));
 
+  /* No selection widgets */
+  self->no_selection_widgets[0] = self->new_folder_0_button;
+  self->no_selection_widgets[1] = self->paste_button;
+  self->no_selection_widgets[2] = self->select_all_button;
+  self->no_selection_widgets[3] = self->bookmark_button;
+  self->no_selection_widgets[4] = self->properties_0_button;
+
+  /* Folder- and folder-only widgets */
+  self->files_folders_widgets[0] = self->move_folders_button;
+  self->files_folders_widgets[1] = self->copy_folders_button;
+  self->files_folders_widgets[2] = self->rename_folders_button;
+  self->files_folders_widgets[3] = self->move_trash_folders_button;
+  self->files_folders_widgets[4] = self->properties_folders_button;
+
 #if 0
   update_paste_button (self);
 
@@ -593,24 +765,3 @@ nautilus_action_bar_new (NautilusView *view)
                        "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
index 0af85b3a9..3c7ec1671 100644
--- a/src/nautilus-action-bar.h
+++ b/src/nautilus-action-bar.h
@@ -31,9 +31,6 @@ G_DECLARE_FINAL_TYPE (NautilusActionBar, nautilus_action_bar, NAUTILUS, ACTION_B
 
 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 cddb675dc..708153fff 100644
--- a/src/nautilus-canvas-view.c
+++ b/src/nautilus-canvas-view.c
@@ -2046,7 +2046,6 @@ nautilus_canvas_view_init (NautilusCanvasView *canvas_view)
     NautilusCanvasContainer *canvas_container;
     GActionGroup *view_action_group;
     GtkClipboard *clipboard;
-    NautilusView *view;
 
     canvas_view->details = g_new0 (NautilusCanvasViewDetails, 1);
     canvas_view->details->sort = &sort_criteria[0];
@@ -2097,11 +2096,6 @@ 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/ui/nautilus-action-bar.ui b/src/resources/ui/nautilus-action-bar.ui
index c296f2581..2d4835a33 100644
--- a/src/resources/ui/nautilus-action-bar.ui
+++ b/src/resources/ui/nautilus-action-bar.ui
@@ -3,13 +3,16 @@
   <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>
+    <property name="vexpand">False</property>
+    <property name="label_xalign">0</property>
     <child>
       <object class="GtkStack" id="stack">
         <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="hhomogeneous">False</property>
         <property name="transition_type">crossfade</property>
         <child>
@@ -18,14 +21,14 @@
             <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">
+              <object class="GtkButton" id="new_folder_0_button">
+                <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.paste</property>
+                <property name="action_name">view.new-folder</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -34,12 +37,12 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton">
-                <property name="label" translatable="yes">New Folder…</property>
+              <object class="GtkButton" id="paste_button">
+                <property name="label" translatable="yes">Paste</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>
+                <property name="action_name">view.paste</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -48,155 +51,99 @@
               </packing>
             </child>
             <child>
-              <object class="GtkMenuButton">
+              <object class="GtkButton" id="select_all_button">
+                <property name="label" translatable="yes">Select All</property>
                 <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>
+                <property name="action_name">view.select-all</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>
-          </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">
+              <object class="GtkSeparator" id="no_selection_separator">
                 <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>
+                <property name="can_focus">False</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="height">2</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="file_name_label">
+              <object class="GtkButton" id="bookmark_button">
+                <property name="label" translatable="yes">Bookmark</property>
                 <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>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">4</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="file_size_label">
+              <object class="GtkButton" id="properties_0_button">
+                <property name="label" translatable="yes">Properties</property>
                 <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>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="action_name">view.properties</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">5</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton">
+              <object class="GtkMenuButton" id="no_selection_overflow_button">
                 <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>
+                <property name="direction">up</property>
+                <property name="popover">no_selection_popover</property>
                 <child>
                   <object class="GtkImage">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">user-trash-symbolic</property>
+                    <property name="icon_name">view-more-symbolic</property>
                   </object>
                 </child>
+                <style>
+                  <class name="image-button"/>
+                </style>
               </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>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">6</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton">
-                <property name="label" translatable="yes">Open</property>
+              <object class="GtkLabel" id="no_selection_folder_label">
                 <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>
+                <property name="can_focus">False</property>
+                <property name="margin_end">12</property>
+                <property name="margin_start">12</property>
+                <property name="ellipsize">middle</property>
               </object>
               <packing>
-                <property name="left_attach">4</property>
-                <property name="top_attach">0</property>
-                <property name="height">2</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="pack_type">end</property>
+                <property name="position">7</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="name">single-selection</property>
-            <property name="position">1</property>
+            <property name="name">no-selection</property>
           </packing>
         </child>
         <child>
@@ -204,17 +151,12 @@
             <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">
+              <object class="GtkSpinner">
                 <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>
+                <property name="active">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -223,143 +165,226 @@
               </packing>
             </child>
             <child>
-              <object class="GtkMenuButton">
+              <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="menu-model">multi-selection-menu</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">view-more-symbolic</property>
+                    <property name="icon_name">process-stop-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>
+                <property name="position">2</property>
               </packing>
             </child>
+          </object>
+          <packing>
+            <property name="name">loading</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="hexpand">True</property>
+            <property name="spacing">6</property>
             <child>
-              <object class="GtkButton">
-                <property name="label" translatable="yes">New Folder With Selection…</property>
+              <object class="GtkBox" id="open_file_box">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <style>
+                  <class name="linked" />
+                </style>
+                <child>
+                  <object class="GtkButton" id="default_app_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="action_name">view.open-with-default-application</property>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">False</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkImage" id="default_app_icon">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="default_app_label">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="hexpand">True</property>
+                            <property name="halign">center</property>
+                            <property name="xalign">0.5</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkMenuButton" id="other_apps_button">
+                    <property name="visible" bind-source="other_apps_button" bind-property="sensitive" bind-flags="default" />
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">pan-up-symbolic</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="open_folders_button">
+                <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="action_name">view.new-folder-with-selection</property>
+                <property name="action_name">view.open-with-default-application</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">
+              <object class="GtkButton" id="move_folders_button">
                 <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">
+              <object class="GtkButton" id="copy_folders_button">
                 <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">
+              <object class="GtkButton" id="rename_folders_button">
+                <property name="label" translatable="yes">Rename…</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="action_name">view.rename</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="move_trash_folders_button">
+                <property name="label" translatable="yes">Move to Trash</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-trash</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="properties_folders_button">
+                <property name="label" translatable="yes">Properties</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="action_name">view.properties</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuButton" id="folders_overflow_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="direction">up</property>
+                <property name="popover">folders_popover</property>
                 <child>
                   <object class="GtkImage">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">user-trash-symbolic</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">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">
+              <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="active">True</property>
+                <property name="orientation">vertical</property>
+                <property name="margin_start">12</property>
+                <child>
+                  <object class="GtkLabel" id="selection_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="ellipsize">middle</property>
+                    <property name="xalign">1.0</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="size_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="ellipsize">middle</property>
+                    <property name="xalign">1.0</property>
+                    <style>
+                      <class name="dim-label" />
+                    </style>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="pack_type">end</property>
+                <property name="position">7</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="loading_label">
+              <object class="GtkButton" id="clear_selection_0_button">
                 <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>
+                <property name="tooltip-text" translatable="yes">Clear the selection</property>
+                <signal name="clicked" handler="clear_selection_cb" object="NautilusActionBar" swapped="yes" />
+                <style>
+                  <class name="image-button" />
+                  <class name="flat" />
+                  <class name="circular" />
+                </style>
                 <child>
                   <object class="GtkImage">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">process-stop-symbolic</property>
+                    <property name="icon_name">window-close-symbolic</property>
                   </object>
                 </child>
               </object>
@@ -367,42 +392,241 @@
                 <property name="expand">False</property>
                 <property name="fill">True</property>
                 <property name="pack_type">end</property>
-                <property name="position">2</property>
+                <property name="position">6</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="name">loading</property>
-            <property name="position">3</property>
+            <property name="name">files-folders</property>
+            <property name="position">2</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>
+  <object class="GtkPopoverMenu" id="no_selection_popover">
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">6</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible" bind-source="new_folder_0_button" bind-property="visible" bind-flags="default|invert-boolean" />
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="action_name">view.new-folder</property>
+            <property name="text" translatable="yes">New Folder…</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible" bind-source="paste_button" bind-property="visible" bind-flags="default|invert-boolean" />
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="action_name">view.paste</property>
+            <property name="text" translatable="yes">Paste</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible" bind-source="select_all_button" bind-property="visible" bind-flags="default|invert-boolean" />
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="action_name">view.select-all</property>
+            <property name="text" translatable="yes">Select All</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkSeparator">
+            <property name="visible" bind-source="select_all_button" bind-property="visible" bind-flags="default|invert-boolean" />
+            <property name="can_focus">False</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible" bind-source="bookmark_button" bind-property="visible" bind-flags="default|invert-boolean" />
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="action_name">view.bookmark</property>
+            <property name="text" translatable="yes">Bookmark</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="action_name">view.properties</property>
+            <property name="text" translatable="yes">Properties</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">5</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="submenu">submenu0</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+  </object>
+  <object class="GtkPopoverMenu" id="folders_popover">
+    <property name="can_focus">False</property>
+    <property name="relative_to">folders_overflow_button</property>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">6</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="action_name">view.open-with-default-application</property>
+            <property name="text" translatable="yes">Open</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible" bind-source="move_folders_button" bind-property="visible" bind-flags="default|invert-boolean" />
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="action_name">view.move-to</property>
+            <property name="text" translatable="yes">Move To…</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible" bind-source="copy_folders_button" bind-property="visible" bind-flags="default|invert-boolean" />
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="action_name">view.copy-to</property>
+            <property name="text" translatable="yes">Copy To…</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible" bind-source="rename_folders_button" bind-property="visible" bind-flags="default|invert-boolean" />
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="action_name">view.rename</property>
+            <property name="text" translatable="yes">Rename…</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible" bind-source="move_trash_folders_button" bind-property="visible" bind-flags="default|invert-boolean" />
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="action_name">view.move-to-trash</property>
+            <property name="text" translatable="yes">Move to Trash</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkSeparator">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">5</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible" bind-source="properties_folders_button" bind-property="visible" bind-flags="default|invert-boolean" />
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="action_name">view.properties</property>
+            <property name="text" translatable="yes">Properties</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">6</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="submenu">submenu0</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+  </object>
+  <object class="GtkSizeGroup" id="files_folders_size_group">
+    <widgets>
+      <widget name="open_folders_button"/>
+      <widget name="move_folders_button"/>
+      <widget name="copy_folders_button"/>
+      <widget name="rename_folders_button"/>
+      <widget name="move_trash_folders_button"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup" id="no_selection_size_group">
+    <widgets>
+      <widget name="new_folder_0_button"/>
+      <widget name="paste_button"/>
+      <widget name="select_all_button"/>
+      <widget name="bookmark_button"/>
+      <widget name="properties_0_button"/>
+    </widgets>
+  </object>
 </interface>