[nautilus/wip/csoriano/flow] f
- From: Carlos Soriano <csoriano src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/csoriano/flow] f
- Date: Wed, 30 Nov 2016 16:38:27 +0000 (UTC)
commit 3b49d5cb98e333b09380ca2e78ad985a561454ec
Author: Carlos Soriano <csoriano gnome org>
Date: Wed Nov 30 11:37:34 2016 +0100
f
src/nautilus-icon-view.c | 491 ++++++++++++++++++++++++----------------------
1 files changed, 257 insertions(+), 234 deletions(-)
---
diff --git a/src/nautilus-icon-view.c b/src/nautilus-icon-view.c
index f2714dc..9f66d6d 100644
--- a/src/nautilus-icon-view.c
+++ b/src/nautilus-icon-view.c
@@ -30,10 +30,10 @@ static int n_files = 0;
typedef struct
{
- GtkWidget *flow_box;
- GtkWidget *view_icon;
- GListModel *model;
- GActionGroup *view_action_group;
+ GtkWidget *flow_box;
+ GtkWidget *view_icon;
+ GListModel *model;
+ GActionGroup *view_action_group;
gint zoom_level;
} NautilusIconViewPrivate;
@@ -42,27 +42,26 @@ G_DEFINE_TYPE_WITH_PRIVATE (NautilusIconView, nautilus_icon_view, NAUTILUS_TYPE_
static gint
get_default_zoom_level ()
{
- NautilusCanvasZoomLevel 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);
+ default_zoom_level = g_settings_get_enum (nautilus_icon_view_preferences,
+ NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL);
- return NAUTILUS_CANVAS_ZOOM_LEVEL_LARGE;
+ 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);
+ NautilusIconViewPrivate *priv = nautilus_icon_view_get_instance_private (self);
- g_list_store_remove_all (G_LIST_STORE (priv->model));
- n_files = 0;
+ g_list_store_remove_all (G_LIST_STORE (priv->model));
+ n_files = 0;
}
@@ -76,22 +75,22 @@ real_file_changed (NautilusFilesView *self,
static GList *
real_get_selection (NautilusFilesView *self)
{
- return NULL;
+ return NULL;
}
static GList *
real_get_selection_for_file_transfer (NautilusFilesView *self)
{
- return NULL;
+ return NULL;
}
static gboolean
real_is_empty (NautilusFilesView *self)
{
- NautilusIconViewPrivate *priv = nautilus_icon_view_get_instance_private (self);
+ NautilusIconViewPrivate *priv = nautilus_icon_view_get_instance_private (self);
- return g_list_model_get_n_items (priv->model) == 0;
+ return g_list_model_get_n_items (priv->model) == 0;
}
static void
@@ -104,20 +103,20 @@ real_remove_file (NautilusFilesView *self,
NautilusFile *file,
NautilusDirectory *directory)
{
- NautilusIconViewPrivate *priv;
- NautilusFile *current_file;
- guint i = 0;
+ NautilusIconViewPrivate *priv;
+ NautilusFile *current_file;
+ guint i = 0;
- priv = nautilus_icon_view_get_instance_private (self);
+ priv = nautilus_icon_view_get_instance_private (self);
- while (current_file = g_list_model_get_item (priv->model, i))
+ while (current_file = g_list_model_get_item (priv->model, i))
{
- if (current_file == file)
+ if (current_file == file)
{
- g_list_store_remove (G_LIST_STORE (priv->model), i);
- break;
+ g_list_store_remove (G_LIST_STORE (priv->model), i);
+ break;
}
- i++;
+ i++;
}
}
@@ -125,7 +124,7 @@ static void
real_set_selection (NautilusFilesView *self,
GList *selection)
{
- nautilus_files_view_notify_selection_changed (self);
+ nautilus_files_view_notify_selection_changed (self);
}
static void
@@ -141,7 +140,7 @@ 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);
+ NAUTILUS_FILES_VIEW_CLASS (nautilus_icon_view_parent_class)->update_actions_state (self);
}
static void
@@ -165,9 +164,9 @@ real_bump_zoom_level (NautilusFilesView *self,
static guint
real_get_zoom_level (NautilusFilesView *self)
{
- NautilusIconViewPrivate *priv = nautilus_icon_view_get_instance_private (self);
+ NautilusIconViewPrivate *priv = nautilus_icon_view_get_instance_private (self);
- return priv->zoom_level;
+ return priv->zoom_level;
}
static guint
@@ -202,89 +201,89 @@ get_icon_size_for_zoom_level (NautilusCanvasZoomLevel zoom_level)
g_return_val_if_reached (NAUTILUS_CANVAS_ICON_SIZE_STANDARD);
}
-static GtkWidget*
+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);
+ 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);
+ 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));
+ 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}
+ /*.icon-background {background-color:#fbfbfb; box-shadow: 0px 0px 4px #DDD; margin-bottom:4px} */
gtk_style_context_add_class (style_contet, "icon-background");
#if 0
- gtk_widget_set_size_request (fixed_height_box, 130,
- -1);
+ gtk_widget_set_size_request (fixed_height_box, 130,
+ -1);
#endif
- gtk_box_pack_start (fixed_height_box, icon, FALSE, FALSE, 0);
+ gtk_box_pack_start (fixed_height_box, icon, FALSE, FALSE, 0);
- gtk_widget_show_all (fixed_height_box);
+ gtk_widget_show_all (fixed_height_box);
- return 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;
+ GtkWidget *new_icon;
+ GtkWidget *old_icon;
+ GtkWidget *box;
GtkWidget *label;
- NautilusFile *file;
+ 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");
+ 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");
- 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);
+ 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;
+ 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);
+ items = gtk_container_get_children (priv->flow_box);
- for (l = items; l; l = l->next)
+ for (l = items; l; l = l->next)
{
- flow_box_item = GTK_WIDGET (l->data);
- replace_icon (self, flow_box_item);
+ flow_box_item = GTK_WIDGET (l->data);
+ replace_icon (self, flow_box_item);
}
}
@@ -323,19 +322,19 @@ real_get_zoom_level_percentage (NautilusFilesView *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;
+ NAUTILUS_CANVAS_ICON_SIZE_LARGE;
}
static gboolean
real_can_zoom_in (NautilusFilesView *self)
{
- return TRUE;
+ return TRUE;
}
static gboolean
real_can_zoom_out (NautilusFilesView *self)
{
- return TRUE;
+ return TRUE;
}
static void
@@ -348,23 +347,23 @@ real_compare_files (NautilusFilesView *self,
NautilusFile *file1,
NautilusFile *file2)
{
- if (file1 < file2)
+ if (file1 < file2)
{
- return -1;
+ return -1;
}
- if (file1 > file2)
+ if (file1 > file2)
{
- return +1;
+ return +1;
}
- return 0;
+ return 0;
}
static gboolean
real_using_manual_layout (NautilusFilesView *self)
{
- return FALSE;
+ return FALSE;
}
static void
@@ -376,7 +375,7 @@ real_end_loading (NautilusFilesView *self,
static char *
real_get_first_visible_file (NautilusFilesView *self)
{
- return NULL;
+ return NULL;
}
static void
@@ -390,23 +389,23 @@ real_sort_directories_first_changed (NautilusFilesView *self)
{
}
-static gpointer*
+static gpointer *
convert_glist_to_array (GList *list)
{
- gpointer *array;
- GList *l;
- int i = 0;
+ gpointer *array;
+ GList *l;
+ int i = 0;
- g_return_val_if_fail (list != NULL, NULL);
+ g_return_val_if_fail (list != NULL, NULL);
- array = g_malloc (g_list_length (list) * sizeof (list->data));
+ array = g_malloc (g_list_length (list) * sizeof (list->data));
- for (l = list; l != NULL; l = l->next, i++)
+ for (l = list; l != NULL; l = l->next, i++)
{
- array[i] = l->data;
+ array[i] = l->data;
}
- return array;
+ return array;
}
static void
@@ -414,44 +413,43 @@ real_add_files (NautilusFilesView *self,
GList *files,
NautilusDirectory *directory)
{
- NautilusIconViewPrivate *priv;
- g_autofree gpointer *array = NULL;
+ NautilusIconViewPrivate *priv;
+ g_autofree gpointer *array = NULL;
- priv = nautilus_icon_view_get_instance_private (self);
+ priv = nautilus_icon_view_get_instance_private (self);
- clock_t start = clock() ;
+ 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);
+ 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;
+ return NAUTILUS_VIEW_GRID_ID;
}
-static GIcon*
+static GIcon *
real_get_icon (NautilusFilesView *self)
{
- NautilusIconViewPrivate *priv;
+ NautilusIconViewPrivate *priv;
- priv = nautilus_icon_view_get_instance_private (self);
+ priv = nautilus_icon_view_get_instance_private (self);
- return priv->view_icon;
+ return priv->view_icon;
}
static void
real_select_first (NautilusFilesView *self)
{
-
}
static void
@@ -465,62 +463,86 @@ action_zoom_to_level (GSimpleAction *action,
g_simple_action_set_state (G_SIMPLE_ACTION (action), state);
}
-static GtkWidget*
+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;
+ 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;
gint label_nat_size;
gint icon_nat_size;
- GtkLabel *label;
- GtkWidget *icon;
+ GtkLabel *label;
+ GtkWidget *icon;
GtkStyleContext *style_context;
- container = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ container = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- icon = create_icon (self, file);
- gtk_box_pack_start (container, icon, FALSE, FALSE, 0);
+ 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);
+ 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_width_chars (label, 10);
- 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);
+ 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");
+ style_context = gtk_widget_get_style_context (container);
+ gtk_style_context_add_class (style_context, "icon-item-background");
#if 0
-flowboxchild:selected{background-color:transparent;}
-flowboxchild:selected > box .icon-background {background-color:#4a90d9; border-color:#4a90d9;
border-style:solid; border-width:2px; border-radius:4px 4px 0px 0px;}
-flowboxchild > box .icon-background {border-color:transparent; border-style:solid; border-width:2px;
border-radius:4px 4px 0px 0px;}
-flowboxchild:selected > box .label-background{background-color:#4a90d9; border-color:#4a90d9;
border-style:solid; border-width:2px;border-radius:0px 0px 4px 4px;}
-flowboxchild > box .label-background{border-color:transparent; border-style:solid;
border-width:2px;border-radius:0px 0px 4px 4px;}
+flowboxchild: selected {
+ background - color:transparent;
+ }
+flowboxchild: selected > box.icon - background {
+ background - color:#4a90d9;
+ border - color:#4a90d9;
+ border - style:solid;
+ border - width:2px;
+ border - radius:4px 4px 0px 0px;
+ }
+ flowboxchild > box.icon - background {
+ border - color:transparent;
+ border - style:solid;
+ border - width:2px;
+ border - radius:4px 4px 0px 0px;
+ }
+flowboxchild: selected > box.label - background {
+ background - color:#4a90d9;
+ border - color:#4a90d9;
+ border - style:solid;
+ border - width:2px;
+ border - radius:0px 0px 4px 4px;
+ }
+ flowboxchild > box.label - background {
+ border - color:transparent;
+ border - style:solid;
+ border - width:2px;
+ border - radius:0px 0px 4px 4px;
+ }
#endif
- gtk_widget_show_all (container);
+ gtk_widget_show_all (container);
gtk_widget_set_valign (container, GTK_ALIGN_START);
gtk_widget_set_halign (container, GTK_ALIGN_CENTER);
- child = gtk_flow_box_child_new ();
- gtk_container_add (child, 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);
- g_object_set_data (child, "label", label);
- gtk_widget_set_size_request (GTK_WIDGET (child),
- MAX (NAUTILUS_CANVAS_ICON_SIZE_LARGE, get_icon_size_for_zoom_level
(priv->zoom_level)), -1);
+ g_object_set_data (child, "file", file);
+ g_object_set_data (child, "icon", icon);
+ g_object_set_data (child, "label", label);
+ gtk_widget_set_size_request (GTK_WIDGET (child),
+ MAX (NAUTILUS_CANVAS_ICON_SIZE_LARGE, get_icon_size_for_zoom_level
(priv->zoom_level)), -1);
- return child;
+ return child;
}
static void
@@ -528,115 +550,116 @@ 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;
+ 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);
+ 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);
+ 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);
+ 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);
+ NautilusIconView *self = (NautilusIconView *) object;
+ NautilusIconViewPrivate *priv = nautilus_icon_view_get_instance_private (self);
- G_OBJECT_CLASS (nautilus_icon_view_parent_class)->finalize (object);
+ 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 }
+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;
+ 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;
+ 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);
+ 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);
+ 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));
+ g_action_group_change_action_state (priv->view_action_group,
+ "zoom-to-level",
+ g_variant_new_int32 (priv->zoom_level));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
