[nautilus/wip/csoriano/flow: 14/15] views: Add flow box based view
- From: Carlos Soriano <csoriano src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/csoriano/flow: 14/15] views: Add flow box based view
- Date: Fri, 2 Dec 2016 10:49:46 +0000 (UTC)
commit 4f2d1d7f34a16c26fce6f69e584dfcd42f254dbf
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 | 4 +
src/nautilus-file.c | 4 +-
src/nautilus-files-view.c | 23 ++-
src/nautilus-files-view.h | 6 +
src/nautilus-icon-info.h | 4 +-
src/nautilus-icon-view-item.c | 214 ++++++++++++++
src/nautilus-icon-view-item.h | 24 ++
src/nautilus-icon-view.c | 641 +++++++++++++++++++++++++++++++++++++++++
src/nautilus-icon-view.h | 42 +++
src/resources/css/Adwaita.css | 12 +-
10 files changed, 965 insertions(+), 9 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 562af23..3e2dd1a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -166,6 +166,10 @@ 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-icon-view-item.c \
+ nautilus-icon-view-item.h \
nautilus-image-properties-page.c \
nautilus-image-properties-page.h \
nautilus-list-model.c \
diff --git a/src/nautilus-file.c b/src/nautilus-file.c
index 8c388b8..30c790a 100644
--- a/src/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -5336,11 +5336,11 @@ nautilus_file_get_thumbnail_icon (NautilusFile *file,
{
if (nautilus_is_video_file (file))
{
- nautilus_ui_frame_video (&pixbuf);
+ /*nautilus_ui_frame_video (&pixbuf); */
}
else
{
- nautilus_ui_frame_image (&pixbuf);
+ /*nautilus_ui_frame_image (&pixbuf); */
}
}
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index e93ffb3..758d8ee 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -35,6 +35,7 @@
#include "nautilus-error-reporting.h"
#include "nautilus-file-undo-manager.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"
@@ -130,10 +131,10 @@
#define MIN_COMMON_FILENAME_PREFIX_LENGTH 4
-
enum
{
ADD_FILE,
+ ADD_FILES,
BEGIN_FILE_CHANGES,
BEGIN_LOADING,
CLEAR,
@@ -3871,6 +3872,7 @@ process_old_files (NautilusFilesView *view)
GList *files_added, *files_changed, *node;
FileAndDirectory *pending;
GList *selection, *files;
+ g_autoptr (GList) pending_additions = NULL;
files_added = view->details->old_added_files;
files_changed = view->details->old_changed_files;
@@ -3885,8 +3887,7 @@ process_old_files (NautilusFilesView *view)
for (node = files_added; node != NULL; node = node->next)
{
pending = node->data;
- g_signal_emit (view,
- signals[ADD_FILE], 0, pending->file, pending->directory);
+ pending_additions = g_list_prepend (pending_additions, pending->file);
/* Acknowledge the files that were pending to be revealed */
if (g_hash_table_contains (view->details->pending_reveal, pending->file))
{
@@ -3896,6 +3897,12 @@ process_old_files (NautilusFilesView *view)
}
}
+ if (files_added != NULL)
+ {
+ g_signal_emit (view,
+ signals[ADD_FILES], 0, pending_additions, pending->directory);
+ }
+
for (node = files_changed; node != NULL; node = node->next)
{
gboolean should_show_file;
@@ -8916,6 +8923,14 @@ nautilus_files_view_class_init (NautilusFilesViewClass *klass)
NULL, NULL,
g_cclosure_marshal_generic,
G_TYPE_NONE, 2, NAUTILUS_TYPE_FILE, NAUTILUS_TYPE_DIRECTORY);
+ signals[ADD_FILES] =
+ g_signal_new ("add-files",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusFilesViewClass, add_files),
+ NULL, NULL,
+ g_cclosure_marshal_generic,
+ G_TYPE_NONE, 2, G_TYPE_POINTER, NAUTILUS_TYPE_DIRECTORY);
signals[BEGIN_FILE_CHANGES] =
g_signal_new ("begin-file-changes",
G_TYPE_FROM_CLASS (klass),
@@ -9269,7 +9284,7 @@ nautilus_files_view_new (guint id,
{
case NAUTILUS_VIEW_GRID_ID:
{
- view = nautilus_canvas_view_new (slot);
+ view = nautilus_icon_view_new (slot);
}
break;
diff --git a/src/nautilus-files-view.h b/src/nautilus-files-view.h
index 70dcb2d..e465afb 100644
--- a/src/nautilus-files-view.h
+++ b/src/nautilus-files-view.h
@@ -80,6 +80,12 @@ struct NautilusFilesViewClass {
void (* add_file) (NautilusFilesView *view,
NautilusFile *file,
NautilusDirectory *directory);
+ /* The 'add_files' signal is emitted to add a set of files to the view.
+ * It must be replaced by each subclass.
+ */
+ void (* add_files) (NautilusFilesView *view,
+ GList *files,
+ NautilusDirectory *directory);
void (* remove_file) (NautilusFilesView *view,
NautilusFile *file,
NautilusDirectory *directory);
diff --git a/src/nautilus-icon-info.h b/src/nautilus-icon-info.h
index f034ba8..65e3abb 100644
--- a/src/nautilus-icon-info.h
+++ b/src/nautilus-icon-info.h
@@ -38,10 +38,10 @@ typedef enum {
#define NAUTILUS_LIST_ICON_SIZE_LARGE 48
#define NAUTILUS_LIST_ICON_SIZE_LARGER 64
-#define NAUTILUS_CANVAS_ICON_SIZE_SMALL 48
+#define NAUTILUS_CANVAS_ICON_SIZE_SMALL 32
#define NAUTILUS_CANVAS_ICON_SIZE_STANDARD 64
#define NAUTILUS_CANVAS_ICON_SIZE_LARGE 96
-#define NAUTILUS_CANVAS_ICON_SIZE_LARGER 128
+#define NAUTILUS_CANVAS_ICON_SIZE_LARGER 256
/* Maximum size of an icon that the icon factory will ever produce */
#define NAUTILUS_ICON_MAXIMUM_SIZE 320
diff --git a/src/nautilus-icon-view-item.c b/src/nautilus-icon-view-item.c
new file mode 100644
index 0000000..0e9ef0d
--- /dev/null
+++ b/src/nautilus-icon-view-item.c
@@ -0,0 +1,214 @@
+#include "nautilus-icon-view-item.h"
+
+struct _NautilusIconViewItem
+{
+ GtkBin parent_instance;
+ guint max_width;
+};
+
+G_DEFINE_TYPE (NautilusIconViewItem, nautilus_icon_view_item, GTK_TYPE_BIN)
+
+enum
+{
+ PROP_0,
+ PROP_FILE,
+ PROP_MAX_WIDTH,
+ N_PROPS
+};
+
+static GParamSpec *properties [N_PROPS];
+
+void
+nautilus_icon_view_item_set_max_width (NautilusIconViewItem *self,
+ guint max_width)
+{
+ self->max_width = max_width;
+ gtk_widget_queue_allocate (GTK_WIDGET (self));
+}
+
+guint
+nautilus_icon_view_item_get_max_width (NautilusIconViewItem *self)
+{
+ return self->max_width;
+}
+
+NautilusIconViewItem *
+nautilus_icon_view_item_new (void)
+{
+ return g_object_new (NAUTILUS_TYPE_ICON_VIEW_ITEM, NULL);
+}
+
+static void
+nautilus_icon_view_item_finalize (GObject *object)
+{
+ NautilusIconViewItem *self = (NautilusIconViewItem *) object;
+
+ G_OBJECT_CLASS (nautilus_icon_view_item_parent_class)->finalize (object);
+}
+
+static void
+nautilus_icon_view_item_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ NautilusIconViewItem *self = NAUTILUS_ICON_VIEW_ITEM (object);
+
+ switch (prop_id)
+ {
+ case PROP_MAX_WIDTH:
+ {
+ g_value_set_int (value, self->max_width);
+ }
+
+ default:
+ {
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ }
+ break;
+ }
+}
+
+static void
+nautilus_icon_view_item_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ NautilusIconViewItem *self = NAUTILUS_ICON_VIEW_ITEM (object);
+
+ switch (prop_id)
+ {
+ case PROP_MAX_WIDTH:
+ {
+ nautilus_icon_view_item_set_max_width (self, g_value_get_int (value));
+ }
+ break;
+
+ default:
+ {
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ }
+ break;
+ }
+}
+
+static void
+get_preferred_width (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ GtkWidget *child;
+ NautilusIconViewItem *self;
+ GtkStyleContext *style_context;
+ GtkBorder padding;
+
+ self = NAUTILUS_ICON_VIEW_ITEM (widget);
+ child = gtk_bin_get_child (GTK_BIN (self));
+
+ *natural_size = 0;
+ *minimum_size = 0;
+ gtk_widget_get_preferred_width (child, minimum_size, natural_size);
+
+ *minimum_size = self->max_width == -1 ? *minimum_size : 96;
+ *natural_size = self->max_width == -1 ? *natural_size :
+ MAX (*minimum_size, MIN (self->max_width, *natural_size));
+
+ style_context = gtk_widget_get_style_context (child);
+ gtk_style_context_get_padding (style_context,
+ gtk_widget_get_state_flags (child),
+ &padding);
+ *minimum_size += padding.left + padding.right;
+ *natural_size += padding.left + padding.right;
+}
+
+static void
+get_preferred_height (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ GtkWidget *child;
+ NautilusIconViewItem *self;
+ gint minimum_width = 0;
+ gint natural_width = 0;
+ GtkStyleContext *style_context;
+ GtkBorder padding;
+
+ self = NAUTILUS_ICON_VIEW_ITEM (widget);
+ child = gtk_bin_get_child (GTK_BIN (self));
+
+ get_preferred_width (widget, &minimum_width, &natural_width);
+ natural_width = self->max_width == -1 ? natural_width : MIN (self->max_width, natural_width);
+
+ gtk_widget_get_preferred_height_for_width (child, natural_width, minimum_size, natural_size);
+
+ style_context = gtk_widget_get_style_context (child);
+ gtk_style_context_get_padding (style_context,
+ gtk_widget_get_state_flags (child),
+ &padding);
+ *minimum_size += padding.top + padding.bottom;
+ *natural_size += padding.top + padding.bottom;
+
+ g_print ("preferred height %d %d\n", *minimum_size, *natural_size);
+}
+
+static void
+get_preferred_height_for_width (GtkWidget *widget,
+ gint width,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ get_preferred_height (widget, minimum_size, natural_size);
+}
+
+static void
+size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ GTK_WIDGET_CLASS (nautilus_icon_view_item_parent_class)->size_allocate (widget, allocation);
+}
+
+static void
+get_preferred_width_for_height (GtkWidget *widget,
+ gint height,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ get_preferred_width (widget, minimum_size, natural_size);
+ g_print ("get preffered width for height %d\n", *natural_size);
+}
+
+static void
+constructed (GObject *obj)
+{
+ NautilusIconViewItem *self = NAUTILUS_ICON_VIEW_ITEM (obj);
+
+ G_OBJECT_CLASS (nautilus_icon_view_item_parent_class)->constructed (obj);
+
+ /* We want our parent to gives our preferred width */
+ gtk_widget_set_halign (GTK_WIDGET (self), GTK_ALIGN_CENTER);
+ self->max_width = -1;
+}
+
+static void
+nautilus_icon_view_item_class_init (NautilusIconViewItemClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+ object_class->finalize = nautilus_icon_view_item_finalize;
+ object_class->get_property = nautilus_icon_view_item_get_property;
+ object_class->set_property = nautilus_icon_view_item_set_property;
+ object_class->constructed = constructed;
+
+ widget_class->get_preferred_width = get_preferred_width;
+ widget_class->get_preferred_width_for_height = get_preferred_width_for_height;
+ widget_class->get_preferred_height = get_preferred_height;
+ widget_class->get_preferred_height_for_width = get_preferred_height_for_width;
+ widget_class->size_allocate = size_allocate;
+}
+
+static void
+nautilus_icon_view_item_init (NautilusIconViewItem *self)
+{
+}
diff --git a/src/nautilus-icon-view-item.h b/src/nautilus-icon-view-item.h
new file mode 100644
index 0000000..9c3b3f6
--- /dev/null
+++ b/src/nautilus-icon-view-item.h
@@ -0,0 +1,24 @@
+#ifndef NAUTILUS_ICON_VIEW_ITEM_H
+#define NAUTILUS_ICON_VIEW_ITEM_H
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define NAUTILUS_TYPE_ICON_VIEW_ITEM (nautilus_icon_view_item_get_type())
+
+G_DECLARE_FINAL_TYPE (NautilusIconViewItem, nautilus_icon_view_item, NAUTILUS, ICON_VIEW_ITEM, GtkBin)
+
+NautilusIconViewItem *nautilus_icon_view_item_new (void);
+
+void
+nautilus_icon_view_item_set_max_width (NautilusIconViewItem *self,
+ guint max_width);
+guint
+nautilus_icon_view_item_get_max_width (NautilusIconViewItem *self);
+
+G_END_DECLS
+
+#endif /* NAUTILUS_ICON_VIEW_ITEM_H */
+
diff --git a/src/nautilus-icon-view.c b/src/nautilus-icon-view.c
new file mode 100644
index 0000000..ddee020
--- /dev/null
+++ b/src/nautilus-icon-view.c
@@ -0,0 +1,641 @@
+/* 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 "nautilus-file.h"
+#include "nautilus-directory.h"
+#include "nautilus-global-preferences.h"
+
+#include "nautilus-icon-view-item.h"
+
+#include <glib.h>
+
+static int n_files = 0;
+
+typedef struct
+{
+ GtkWidget *flow_box;
+ GtkWidget *view_icon;
+ GListModel *model;
+ GActionGroup *view_action_group;
+ gint zoom_level;
+} 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 NAUTILUS_CANVAS_ZOOM_LEVEL_LARGE;
+}
+
+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));
+ n_files = 0;
+}
+
+
+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)
+{
+ NautilusIconViewPrivate *priv = nautilus_icon_view_get_instance_private (self);
+ NautilusCanvasZoomLevel new_level;
+
+ new_level = priv->zoom_level + zoom_increment;
+
+ if (new_level >= NAUTILUS_CANVAS_ZOOM_LEVEL_SMALL &&
+ new_level <= NAUTILUS_CANVAS_ZOOM_LEVEL_LARGER)
+ {
+ g_action_group_change_action_state (priv->view_action_group,
+ "zoom-to-level",
+ g_variant_new_int32 (new_level));
+ }
+}
+
+static guint
+real_get_zoom_level (NautilusFilesView *self)
+{
+ NautilusIconViewPrivate *priv = nautilus_icon_view_get_instance_private (self);
+
+ return priv->zoom_level;
+}
+
+static guint
+get_icon_size_for_zoom_level (NautilusCanvasZoomLevel zoom_level)
+{
+ switch (zoom_level)
+ {
+ case NAUTILUS_CANVAS_ZOOM_LEVEL_SMALL:
+ {
+ return NAUTILUS_CANVAS_ICON_SIZE_SMALL;
+ }
+ break;
+
+ case NAUTILUS_CANVAS_ZOOM_LEVEL_STANDARD:
+ {
+ return NAUTILUS_CANVAS_ICON_SIZE_STANDARD;
+ }
+ break;
+
+ case NAUTILUS_CANVAS_ZOOM_LEVEL_LARGE:
+ {
+ return NAUTILUS_CANVAS_ICON_SIZE_LARGE;
+ }
+ break;
+
+ case NAUTILUS_CANVAS_ZOOM_LEVEL_LARGER:
+ {
+ return NAUTILUS_CANVAS_ICON_SIZE_LARGER;
+ }
+ break;
+ }
+ g_return_val_if_reached (NAUTILUS_CANVAS_ICON_SIZE_STANDARD);
+}
+
+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, get_icon_size_for_zoom_level (priv->zoom_level),
+ TRUE, 1, flags);
+ icon = gtk_image_new_from_pixbuf (icon_pixbuf);
+ gtk_widget_set_hexpand (icon, TRUE);
+ gtk_widget_set_vexpand (icon, TRUE);
+ gtk_widget_set_valign (icon, GTK_ALIGN_CENTER);
+ gtk_widget_set_halign (icon, GTK_ALIGN_CENTER);
+
+ fixed_height_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ gtk_widget_set_valign (fixed_height_box, GTK_ALIGN_CENTER);
+ gtk_widget_set_halign (fixed_height_box, GTK_ALIGN_CENTER);
+ gtk_widget_set_size_request (fixed_height_box, get_icon_size_for_zoom_level (priv->zoom_level),
+ get_icon_size_for_zoom_level (priv->zoom_level));
+
+
+ GtkStyleContext *style_contet = gtk_widget_get_style_context (fixed_height_box);
+ /*.icon-background {background-color:#fbfbfb; box-shadow: 0px 0px 4px #DDD; margin-bottom:4px} */
+ gtk_style_context_add_class (style_contet, "icon-background");
+
+ gtk_box_pack_start (fixed_height_box, icon, FALSE, FALSE, 0);
+
+ gtk_widget_show_all (fixed_height_box);
+
+ return fixed_height_box;
+}
+
+static void
+replace_icon (NautilusIconView *self,
+ GtkWidget *flow_box_item)
+{
+ NautilusIconViewPrivate *priv = nautilus_icon_view_get_instance_private (self);
+ GtkWidget *new_icon;
+ GtkWidget *old_icon;
+ GtkWidget *box;
+ GtkWidget *label;
+ GtkWidget *icon_item;
+ NautilusFile *file;
+ gint label_nat_size;
+ gint icon_nat_size;
+
+ file = g_object_get_data (flow_box_item, "file");
+ old_icon = g_object_get_data (flow_box_item, "icon");
+ label = g_object_get_data (flow_box_item, "label");
+
+ icon_item = gtk_bin_get_child (GTK_BIN (flow_box_item));
+ nautilus_icon_view_item_set_max_width (NAUTILUS_ICON_VIEW_ITEM (icon_item),
+ get_icon_size_for_zoom_level (priv->zoom_level));
+ box = gtk_bin_get_child (GTK_BIN (icon_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;
+
+ 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
+set_zoom_level (NautilusIconView *self,
+ guint new_level)
+{
+ NautilusIconViewPrivate *priv;
+ guint icon_size;
+
+ priv = nautilus_icon_view_get_instance_private (self);
+
+ priv->zoom_level = new_level;
+
+ icon_size = get_icon_size_for_zoom_level (new_level);
+ set_icon_size (self, icon_size);
+}
+static void
+real_zoom_to_level (NautilusFilesView *files_view,
+ guint new_level)
+{
+}
+
+static void
+real_restore_standard_zoom_level (NautilusFilesView *self)
+{
+}
+
+static gfloat
+real_get_zoom_level_percentage (NautilusFilesView *files_view)
+{
+ NautilusIconView *self;
+ NautilusIconViewPrivate *priv;
+
+ self = NAUTILUS_ICON_VIEW (files_view);
+ priv = nautilus_icon_view_get_instance_private (self);
+
+ return (gfloat) get_icon_size_for_zoom_level (priv->zoom_level) /
+ NAUTILUS_CANVAS_ICON_SIZE_LARGE;
+}
+
+static gboolean
+real_can_zoom_in (NautilusFilesView *self)
+{
+ return TRUE;
+}
+
+static gboolean
+real_can_zoom_out (NautilusFilesView *self)
+{
+ return TRUE;
+}
+
+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 gpointer *
+convert_glist_to_array (GList *list)
+{
+ gpointer *array;
+ GList *l;
+ int i = 0;
+
+ g_return_val_if_fail (list != NULL, NULL);
+
+ array = g_malloc (g_list_length (list) * sizeof (list->data));
+
+ for (l = list; l != NULL; l = l->next, i++)
+ {
+ array[i] = l->data;
+ }
+
+ return array;
+}
+
+static void
+real_add_files (NautilusFilesView *self,
+ GList *files,
+ NautilusDirectory *directory)
+{
+ NautilusIconViewPrivate *priv;
+ g_autofree gpointer *array = NULL;
+
+ priv = nautilus_icon_view_get_instance_private (self);
+
+ clock_t start = clock ();
+
+ g_print ("add files %d\n", g_list_length (files));
+ array = convert_glist_to_array (files);
+ g_list_store_splice (G_LIST_STORE (priv->model),
+ g_list_model_get_n_items (priv->model),
+ 0, array, g_list_length (files));
+ clock_t end = clock ();
+ double elapsed_time = (end - start) / (double) CLOCKS_PER_SEC;
+ g_print ("add file finished %d %f\n", g_list_model_get_n_items (priv->model), elapsed_time);
+}
+
+
+static guint
+real_get_view_id (NautilusFilesView *self)
+{
+ return NAUTILUS_VIEW_GRID_ID;
+}
+
+static GIcon *
+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 void
+action_zoom_to_level (GSimpleAction *action,
+ GVariant *state,
+ gpointer user_data)
+{
+ NautilusIconView *self = NAUTILUS_ICON_VIEW (user_data);
+
+ set_zoom_level (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;
+ NautilusIconViewItem *icon_item;
+ gint label_nat_size;
+ gint icon_nat_size;
+ GtkLabel *label;
+ GtkWidget *icon;
+ GtkStyleContext *style_context;
+
+ container = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ icon_item = nautilus_icon_view_item_new ();
+
+ 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_line_wrap (label, TRUE);
+ gtk_label_set_line_wrap_mode (label, PANGO_WRAP_WORD_CHAR);
+ gtk_label_set_lines (label, 4);
+ gtk_label_set_justify (label, GTK_JUSTIFY_CENTER);
+ gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_START);
+ gtk_box_pack_end (container, label, TRUE, TRUE, 0);
+
+ style_context = gtk_widget_get_style_context (container);
+ gtk_style_context_add_class (style_context, "icon-item-background");
+
+ gtk_widget_show_all (container);
+ gtk_widget_set_valign (container, GTK_ALIGN_START);
+ gtk_widget_set_halign (container, GTK_ALIGN_CENTER);
+
+ gtk_container_add (icon_item, container);
+ nautilus_icon_view_item_set_max_width (NAUTILUS_ICON_VIEW_ITEM (icon_item),
+ get_icon_size_for_zoom_level (priv->zoom_level));
+
+ child = gtk_flow_box_child_new ();
+ gtk_container_add (child, icon_item);
+
+ g_object_set_data (child, "file", file);
+ g_object_set_data (child, "icon", icon);
+ g_object_set_data (child, "label", label);
+
+ gtk_widget_show_all (child);
+
+ return child;
+}
+
+static void
+on_child_activated (GtkFlowBox *flow_box,
+ GtkFlowBoxChild *child,
+ gpointer user_data)
+{
+ NautilusIconView *self = NAUTILUS_ICON_VIEW (user_data);
+ NautilusIconViewPrivate *priv = nautilus_icon_view_get_instance_private (self);
+ NautilusFile *file;
+ g_autoptr (GList) list = NULL;
+
+ file = g_object_get_data (G_OBJECT (child), "file");
+ list = g_list_append (list, file);
+
+ nautilus_files_view_activate_files (NAUTILUS_FILES_VIEW (self), list, 0, TRUE);
+}
+
+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, "3", 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_files = real_add_files;
+ 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->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;
+ files_view_class->restore_standard_zoom_level = real_restore_standard_zoom_level;
+ files_view_class->get_zoom_level_percentage = real_get_zoom_level_percentage;
+}
+
+static void
+nautilus_icon_view_init (NautilusIconView *self)
+{
+ NautilusIconViewPrivate *priv;
+ 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_set_activate_on_single_click (priv->flow_box, FALSE);
+ gtk_flow_box_set_max_children_per_line (priv->flow_box, 20);
+ gtk_flow_box_set_selection_mode (priv->flow_box, GTK_SELECTION_MULTIPLE);
+ 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, FALSE);
+ gtk_flow_box_set_row_spacing (priv->flow_box, 4);
+ gtk_flow_box_set_column_spacing (priv->flow_box, 8);
+ gtk_widget_set_valign (priv->flow_box, GTK_ALIGN_START);
+ gtk_widget_set_margin_top (priv->flow_box, 10);
+ gtk_widget_set_margin_start (priv->flow_box, 10);
+ gtk_widget_set_margin_bottom (priv->flow_box, 10);
+ gtk_widget_set_margin_end (priv->flow_box, 10);
+
+ g_signal_connect (priv->flow_box, "child-activated", (GCallback) on_child_activated, self);
+
+ 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);
+
+ priv->view_action_group = nautilus_files_view_get_action_group (NAUTILUS_FILES_VIEW (self));
+ g_action_map_add_action_entries (G_ACTION_MAP (priv->view_action_group),
+ icon_view_entries,
+ G_N_ELEMENTS (icon_view_entries),
+ self);
+ priv->zoom_level = get_default_zoom_level ();
+ g_action_group_change_action_state (priv->view_action_group,
+ "zoom-to-level",
+ g_variant_new_int32 (priv->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/css/Adwaita.css b/src/resources/css/Adwaita.css
index 48beeee..fc05297 100644
--- a/src/resources/css/Adwaita.css
+++ b/src/resources/css/Adwaita.css
@@ -184,4 +184,14 @@ searchbar { border-top: 1px solid @borders; }
.conflict-row:selected {
background: @theme_selected_bg_color;
color: @theme_selected_fg_color;
-}
\ No newline at end of file
+}
+
+/* Icon view */
+flowboxchild:selected{background-color:transparent;}
+
+flowboxchild > widget > box > .icon-background {padding:0px; background-color:black; border-color:#4a90d9;
border-style:solid; border-width:0px;}
+flowboxchild:selected > widget > box > .icon-background {padding:0px; background-color:black;
border-color:#4a90d9; border-style:solid; border-width:0px;}
+
+flowboxchild > widget > .icon-item-background {padding:4px;}
+flowboxchild:selected > widget > .icon-item-background {padding:4px; background-color:#4a90d9;
border-color:#4a90d9; border-style:solid; border-width:0px; border-radius:4px 4px 4px 4px;}
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
