[nautilus/wip/csoriano/flow: 139/140] views: Add flow box based view

[Carlos Soriano Sánchez <csoriano src gnome org>]

commit f27fb6e64a501486923389b41c0a9cbbe618ad82
Author: Carlos Soriano <csoriano gnome org>
Date:   Thu Apr 7 21:51:52 2016 +0200

    views: Add flow box based view
    
    After all the rework on the window slots, views, and splitting
    the desktop, we can go ahead and use a flow box based view for Nautilus.
    
    This is just a prototype.

 src/Makefile.am                                |    2 +
 src/nautilus-files-view.c                      |    3 +-
 src/nautilus-icon-view.c                       |  480 ++++++++++++++++++++++++
 src/nautilus-icon-view.h                       |   42 ++
 src/resources/ui/nautilus-toolbar-view-menu.ui |   15 +-
 5 files changed, 529 insertions(+), 13 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 4dc71ca..465f630 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -182,6 +182,8 @@ nautilus_no_main_sources = \
        nautilus-floating-bar.h                 \
        nautilus-freedesktop-dbus.c             \
        nautilus-freedesktop-dbus.h             \
+       nautilus-icon-view.c                    \
+       nautilus-icon-view.h                    \
        nautilus-image-properties-page.c        \
        nautilus-image-properties-page.h        \
        nautilus-list-model.c                   \
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 9452cda..7bd3924 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -30,6 +30,7 @@
 #include "nautilus-application.h"
 #include "nautilus-error-reporting.h"
 #include "nautilus-floating-bar.h"
+#include "nautilus-icon-view.h"
 #include "nautilus-list-view.h"
 #include "nautilus-canvas-view.h"
 #include "nautilus-mime-actions.h"
@@ -8270,7 +8271,7 @@ nautilus_files_view_new (guint                id,
 
         switch (id) {
         case NAUTILUS_VIEW_GRID_ID:
-                view = nautilus_canvas_view_new (slot);
+                view = nautilus_icon_view_new (slot);
         break;
         case NAUTILUS_VIEW_LIST_ID:
                 view = nautilus_list_view_new (slot);
diff --git a/src/nautilus-icon-view.c b/src/nautilus-icon-view.c
new file mode 100644
index 0000000..9bc3d4e
--- /dev/null
+++ b/src/nautilus-icon-view.c
@@ -0,0 +1,480 @@
+/* nautilus-icon-view.c
+ *
+ * Copyright (C) 2016 Carlos Soriano <csoriano gnome org>
+ *
+ * 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 <config.h>
+
+#include "nautilus-icon-view.h"
+#include "nautilus-files-view.h"
+
+#include <glib.h>
+#include <libnautilus-private/nautilus-file.h>
+#include <libnautilus-private/nautilus-directory.h>
+#include <libnautilus-private/nautilus-global-preferences.h>
+
+typedef struct
+{
+  GtkWidget *flow_box;
+  GtkWidget *view_icon;
+  guint icon_size;
+  GListModel *model;
+} NautilusIconViewPrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE (NautilusIconView, nautilus_icon_view, NAUTILUS_TYPE_FILES_VIEW)
+
+static gint
+get_default_zoom_level ()
+{
+  NautilusCanvasZoomLevel default_zoom_level;
+
+  default_zoom_level = g_settings_get_enum (nautilus_icon_view_preferences,
+                                            NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL);
+
+  return 96;
+}
+
+static void
+real_begin_loading (NautilusFilesView *self)
+{
+
+}
+
+static void
+real_clear (NautilusFilesView *self)
+{
+  NautilusIconViewPrivate *priv = nautilus_icon_view_get_instance_private (self);
+
+  g_list_store_remove_all (G_LIST_STORE (priv->model));
+}
+
+
+static void
+real_file_changed (NautilusFilesView *self,
+                   NautilusFile      *file,
+                   NautilusDirectory *directory)
+{
+}
+
+static GList *
+real_get_selection (NautilusFilesView *self)
+{
+  return NULL;
+}
+
+
+static GList *
+real_get_selection_for_file_transfer (NautilusFilesView *self)
+{
+  return NULL;
+}
+
+static gboolean
+real_is_empty (NautilusFilesView *self)
+{
+  NautilusIconViewPrivate *priv = nautilus_icon_view_get_instance_private (self);
+
+  return g_list_model_get_n_items (priv->model) == 0;
+}
+
+static void
+real_end_file_changes (NautilusFilesView *self)
+{
+}
+
+static void
+real_remove_file (NautilusFilesView *self,
+                  NautilusFile      *file,
+                  NautilusDirectory *directory)
+{
+  NautilusIconViewPrivate *priv;
+  NautilusFile *current_file;
+  guint i = 0;
+
+
+  priv = nautilus_icon_view_get_instance_private (self);
+
+  while (current_file = g_list_model_get_item (priv->model, i))
+    {
+      if (current_file == file)
+        {
+          g_list_store_remove (G_LIST_STORE (priv->model), i);
+          break;
+        }
+      i++;
+    }
+}
+
+static void
+real_set_selection (NautilusFilesView *self,
+                    GList             *selection)
+{
+  nautilus_files_view_notify_selection_changed (self);
+}
+
+static void
+real_select_all (NautilusFilesView *self)
+{
+}
+
+static void
+real_reveal_selection (NautilusFilesView *self)
+{
+}
+
+static void
+real_update_actions_state (NautilusFilesView *self)
+{
+  NAUTILUS_FILES_VIEW_CLASS (nautilus_icon_view_parent_class)->update_actions_state (self);
+}
+
+static void
+real_bump_zoom_level (NautilusFilesView *self,
+                      int                zoom_increment)
+{
+}
+
+static guint
+real_get_zoom_level (NautilusFilesView *self)
+{
+  NautilusIconViewPrivate *priv = nautilus_icon_view_get_instance_private (self);
+
+  return priv->icon_size;
+}
+
+static void
+real_zoom_to_level (NautilusFilesView *self,
+                    guint              icon_size)
+{
+}
+
+static void
+real_restore_default_zoom_level (NautilusFilesView *self)
+{
+}
+
+static gboolean
+real_can_zoom_in (NautilusFilesView *self)
+{
+  return FALSE;
+}
+
+static gboolean
+real_can_zoom_out (NautilusFilesView *self)
+{
+  return FALSE;
+}
+
+static void
+real_click_policy_changed (NautilusFilesView *self)
+{
+}
+
+static int
+real_compare_files (NautilusFilesView *self,
+                    NautilusFile      *file1,
+                    NautilusFile      *file2)
+{
+  if (file1 < file2)
+    {
+      return -1;
+    }
+
+  if (file1 > file2)
+    {
+      return +1;
+    }
+
+  return 0;
+}
+
+static gboolean
+real_using_manual_layout (NautilusFilesView *self)
+{
+  return FALSE;
+}
+
+static void
+real_end_loading (NautilusFilesView *self,
+                  gboolean           all_files_seen)
+{
+}
+
+static char *
+real_get_first_visible_file (NautilusFilesView *self)
+{
+  return NULL;
+}
+
+static void
+real_scroll_to_file (NautilusFilesView *self,
+                     const char        *uri)
+{
+}
+
+static void
+real_sort_directories_first_changed (NautilusFilesView *self)
+{
+}
+
+static void
+real_add_file (NautilusFilesView *self,
+               NautilusFile      *file,
+               NautilusDirectory *directory)
+{
+  NautilusIconViewPrivate *priv;
+
+  priv = nautilus_icon_view_get_instance_private (self);
+
+  g_list_store_append (G_LIST_STORE (priv->model), file);
+}
+
+
+static guint
+real_get_view_id (NautilusFilesView *self)
+{
+  return NAUTILUS_VIEW_GRID_ID;
+}
+
+static guint
+real_get_icon (NautilusFilesView *self)
+{
+  NautilusIconViewPrivate *priv;
+
+  priv = nautilus_icon_view_get_instance_private (self);
+
+  return priv->view_icon;
+}
+
+static void
+real_select_first (NautilusFilesView *self)
+{
+
+}
+
+static GtkWidget*
+create_icon (NautilusIconView *self,
+             NautilusFile     *file)
+{
+  NautilusIconViewPrivate *priv = nautilus_icon_view_get_instance_private (self);
+  NautilusFileIconFlags flags;
+  g_autoptr (GdkPixbuf) icon_pixbuf;
+  GtkImage *icon;
+  GtkWidget *fixed_height_box;
+
+  flags = NAUTILUS_FILE_ICON_FLAGS_USE_THUMBNAILS |
+          NAUTILUS_FILE_ICON_FLAGS_FORCE_THUMBNAIL_SIZE |
+          NAUTILUS_FILE_ICON_FLAGS_USE_EMBLEMS |
+          NAUTILUS_FILE_ICON_FLAGS_USE_ONE_EMBLEM;
+
+  icon_pixbuf = nautilus_file_get_icon_pixbuf (file, priv->icon_size, TRUE, 1, flags);
+  icon = gtk_image_new_from_pixbuf (icon_pixbuf);
+  gtk_widget_set_valign (icon, GTK_ALIGN_CENTER);
+  fixed_height_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_widget_set_size_request (fixed_height_box, -1, priv->icon_size);
+  gtk_box_pack_start (fixed_height_box, icon, TRUE, TRUE, 0);
+
+  gtk_widget_show_all (fixed_height_box);
+
+  return fixed_height_box;
+}
+
+static void
+replace_icon (NautilusIconView *self,
+              GtkWidget        *flow_box_item)
+{
+  GtkWidget *new_icon;
+  GtkWidget *old_icon;
+  GtkWidget *box;
+  NautilusFile *file;
+
+  file = g_object_get_data (flow_box_item, "file");
+  old_icon = g_object_get_data (flow_box_item, "icon");
+
+  box = gtk_bin_get_child (GTK_BIN (flow_box_item));
+  gtk_container_remove (GTK_CONTAINER (box), old_icon);
+  new_icon = create_icon (self, file);
+  gtk_box_pack_start (box, new_icon, FALSE, FALSE, 0);
+  g_object_set_data (flow_box_item, "icon", new_icon);
+}
+
+static void
+set_icon_size (NautilusIconView *self,
+               gint              icon_size)
+{
+  NautilusIconViewPrivate *priv = nautilus_icon_view_get_instance_private (self);
+  g_autoptr (GList) items;
+  GList *l;
+  g_autoptr (GList) box_children;
+  GtkWidget *flow_box_item;
+
+  g_print ("new size %d\n", icon_size);
+  priv->icon_size = icon_size;
+  items = gtk_container_get_children (priv->flow_box);
+
+  for (l = items; l; l = l->next)
+    {
+      flow_box_item = GTK_WIDGET (l->data);
+      replace_icon (self, flow_box_item);
+    }
+}
+
+static void
+action_zoom_to_level (GSimpleAction *action,
+                      GVariant      *state,
+                      gpointer       user_data)
+{
+  NautilusIconView *self = NAUTILUS_ICON_VIEW (user_data);
+  NautilusIconViewPrivate *priv = nautilus_icon_view_get_instance_private (self);
+
+  set_icon_size (self, g_variant_get_int32 (state));
+  g_simple_action_set_state (G_SIMPLE_ACTION (action), state);
+}
+
+
+static GtkWidget*
+create_widget_func (gpointer item,
+                    gpointer user_data)
+{
+  NautilusIconView *self = NAUTILUS_ICON_VIEW (user_data);
+  NautilusFile *file = NAUTILUS_FILE (item);
+  NautilusIconViewPrivate *priv = nautilus_icon_view_get_instance_private (self);
+  GtkFlowBoxChild *child;
+  GtkBox *container;
+  GtkLabel *label;
+  GtkWidget *icon;
+
+  container = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+
+  icon = create_icon (self, file);
+  gtk_box_pack_start (container, icon, FALSE, FALSE, 0);
+
+  label = gtk_label_new (nautilus_file_get_display_name (file));
+  gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
+  gtk_label_set_max_width_chars (label, 0);
+  gtk_label_set_line_wrap (label, TRUE);
+  gtk_label_set_line_wrap_mode (label, PANGO_WRAP_WORD_CHAR);
+  gtk_label_set_lines (label, 2);
+  gtk_label_set_justify (label, GTK_JUSTIFY_CENTER);
+  gtk_widget_set_valign (label, GTK_ALIGN_START);
+  gtk_box_pack_end (container, label, TRUE, TRUE, 0);
+
+  gtk_widget_show_all (container);
+
+  child = gtk_flow_box_child_new ();
+  gtk_container_add (child, container);
+
+  g_object_set_data (child, "file", file);
+  g_object_set_data (child, "icon", icon);
+
+  return child;
+}
+
+NautilusIconView *
+nautilus_icon_view_new (NautilusWindowSlot *slot)
+{
+  return g_object_new (NAUTILUS_TYPE_ICON_VIEW,
+                       "window-slot", slot,
+                       NULL);
+}
+
+static void
+nautilus_icon_view_finalize (GObject *object)
+{
+  NautilusIconView *self = (NautilusIconView *)object;
+  NautilusIconViewPrivate *priv = nautilus_icon_view_get_instance_private (self);
+
+  G_OBJECT_CLASS (nautilus_icon_view_parent_class)->finalize (object);
+}
+
+const GActionEntry icon_view_entries[] = {
+  { "zoom-to-level", NULL, NULL, "96", action_zoom_to_level }
+};
+
+static void
+nautilus_icon_view_class_init (NautilusIconViewClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  NautilusFilesViewClass *files_view_class = NAUTILUS_FILES_VIEW_CLASS (klass);
+
+  object_class->finalize = nautilus_icon_view_finalize;
+
+  files_view_class->add_file = real_add_file;
+  files_view_class->begin_loading = real_begin_loading;
+  files_view_class->bump_zoom_level = real_bump_zoom_level;
+  files_view_class->can_zoom_in = real_can_zoom_in;
+  files_view_class->can_zoom_out = real_can_zoom_out;
+  files_view_class->click_policy_changed = real_click_policy_changed;
+  files_view_class->clear = real_clear;
+  files_view_class->file_changed = real_file_changed;
+  files_view_class->get_selection = real_get_selection;
+  files_view_class->get_selection_for_file_transfer = real_get_selection_for_file_transfer;
+  files_view_class->is_empty = real_is_empty;
+  files_view_class->remove_file = real_remove_file;
+  files_view_class->update_actions_state = real_update_actions_state;
+  files_view_class->restore_default_zoom_level = real_restore_default_zoom_level;
+  files_view_class->reveal_selection = real_reveal_selection;
+  files_view_class->select_all = real_select_all;
+  files_view_class->set_selection = real_set_selection;
+  files_view_class->compare_files = real_compare_files;
+  files_view_class->sort_directories_first_changed = real_sort_directories_first_changed;
+  files_view_class->end_file_changes = real_end_file_changes;
+  files_view_class->using_manual_layout = real_using_manual_layout;
+  files_view_class->end_loading = real_end_loading;
+  files_view_class->get_view_id = real_get_view_id;
+  files_view_class->get_first_visible_file = real_get_first_visible_file;
+  files_view_class->scroll_to_file = real_scroll_to_file;
+  files_view_class->get_icon = real_get_icon;
+  files_view_class->select_first = real_select_first;
+}
+
+static void
+nautilus_icon_view_init (NautilusIconView *self)
+{
+  NautilusIconViewPrivate *priv;
+  GActionGroup *view_action_group;
+  GtkWidget *content_widget;
+
+  priv = nautilus_icon_view_get_instance_private (self);
+  priv->view_icon = g_themed_icon_new ("view-grid-symbolic");
+  priv->model = g_list_store_new (NAUTILUS_TYPE_FILE);
+  priv->flow_box = gtk_flow_box_new ();
+  gtk_flow_box_bind_model (GTK_FLOW_BOX (priv->flow_box), priv->model,
+                           create_widget_func, self, NULL);
+  gtk_flow_box_set_homogeneous (priv->flow_box, TRUE);
+  gtk_flow_box_set_row_spacing (priv->flow_box, 6);
+  gtk_flow_box_set_column_spacing (priv->flow_box, 6);
+  gtk_widget_set_valign (priv->flow_box, GTK_ALIGN_START);
+  gtk_widget_set_margin_top (priv->flow_box, 20);
+  gtk_widget_set_margin_right (priv->flow_box, 20);
+  gtk_widget_set_margin_bottom (priv->flow_box, 20);
+  gtk_widget_set_margin_left (priv->flow_box, 20);
+
+  gtk_widget_show (priv->flow_box);
+
+  content_widget = nautilus_files_view_get_content_widget (NAUTILUS_FILES_VIEW (self));
+
+  gtk_container_add (GTK_CONTAINER (content_widget), priv->flow_box);
+
+  view_action_group = nautilus_files_view_get_action_group (NAUTILUS_FILES_VIEW (self));
+  g_action_map_add_action_entries (G_ACTION_MAP (view_action_group),
+                                   icon_view_entries,
+                                   G_N_ELEMENTS (icon_view_entries),
+                                   self);
+  g_action_group_change_action_state (view_action_group,
+                                      "zoom-to-level",
+                                      g_variant_new_int32 (get_default_zoom_level ()));
+}
diff --git a/src/nautilus-icon-view.h b/src/nautilus-icon-view.h
new file mode 100644
index 0000000..7063ba2
--- /dev/null
+++ b/src/nautilus-icon-view.h
@@ -0,0 +1,42 @@
+/* nautilus-icon-view.h
+ *
+ * Copyright (C) 2016 Carlos Soriano <csoriano gnome org>
+ *
+ * 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_ICON_VIEW_H
+#define NAUTILUS_ICON_VIEW_H
+
+#include <glib.h>
+#include <gtk/gtk.h>
+#include "nautilus-files-view.h"
+#include "nautilus-window-slot.h"
+
+G_BEGIN_DECLS
+
+#define NAUTILUS_TYPE_ICON_VIEW (nautilus_icon_view_get_type())
+
+G_DECLARE_DERIVABLE_TYPE (NautilusIconView, nautilus_icon_view, NAUTILUS, ICON_VIEW, NautilusFilesView)
+
+struct _NautilusIconViewClass
+{
+  NautilusFilesViewClass parent;
+};
+
+NautilusIconView *nautilus_icon_view_new (NautilusWindowSlot *slot);
+
+G_END_DECLS
+
+#endif /* NAUTILUS_ICON_VIEW_H */
+
diff --git a/src/resources/ui/nautilus-toolbar-view-menu.ui b/src/resources/ui/nautilus-toolbar-view-menu.ui
index 7cb336d..fe1ac7d 100644
--- a/src/resources/ui/nautilus-toolbar-view-menu.ui
+++ b/src/resources/ui/nautilus-toolbar-view-menu.ui
@@ -57,14 +57,7 @@
             <property name="draw_value">False</property>
             <property name="has_origin">False</property>
             <property name="adjustment">zoom_adjustment</property>
-            <property name="round_digits">0</property>
             <property name="restrict_to_fill_level">False</property>
-            <marks>
-              <mark value="0" position="bottom"/>
-              <mark value="1" position="bottom"/>
-              <mark value="2" position="bottom"/>
-              <mark value="3" position="bottom"/>
-            </marks>
           </object>
           <packing>
             <property name="expand">True</property>
@@ -218,10 +211,8 @@
     <property name="name">view-list-symbolic</property>
   </object>
   <object class="GtkAdjustment" id="zoom_adjustment">
-    <property name="lower">0</property>
-    <property name="upper">3</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">1</property>
-    <property name="value">1</property>
+    <property name="lower">16</property>
+    <property name="upper">200</property>
+    <property name="value">96</property>
   </object>
 </interface>