[nautilus: 41/47] Rename FMListModel/View -> NautilusListModel/View
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus: 41/47] Rename FMListModel/View -> NautilusListModel/View
- Date: Tue, 11 Jan 2011 16:04:06 +0000 (UTC)
commit 690909b8eb0b346d76b28da03c9228494e700db6
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Tue Jan 11 14:42:23 2011 +0100
Rename FMListModel/View -> NautilusListModel/View
And move them outside of src/file-manager
src/Makefile.am | 5 +
src/file-manager/Makefile.am | 5 -
src/file-manager/fm-list-model.h | 136 ----
src/nautilus-application.c | 4 +-
.../fm-list-model.c => nautilus-list-model.c} | 452 +++++++-------
src/nautilus-list-model.h | 136 ++++
...view-private.h => nautilus-list-view-private.h} | 0
.../fm-list-view.c => nautilus-list-view.c} | 673 ++++++++++----------
.../fm-list-view.h => nautilus-list-view.h} | 44 +-
src/nautilus-view.c | 6 +-
10 files changed, 731 insertions(+), 730 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 97e4913..5a41c9d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -88,6 +88,11 @@ nautilus_SOURCES = \
nautilus-icon-view-container.h \
nautilus-image-properties-page.c \
nautilus-image-properties-page.h \
+ nautilus-list-model.c \
+ nautilus-list-model.h \
+ nautilus-list-view-private.h \
+ nautilus-list-view.c \
+ nautilus-list-view.h \
nautilus-location-bar.c \
nautilus-location-bar.h \
nautilus-location-dialog.c \
diff --git a/src/file-manager/Makefile.am b/src/file-manager/Makefile.am
index 6e468e4..9d143ea 100644
--- a/src/file-manager/Makefile.am
+++ b/src/file-manager/Makefile.am
@@ -18,11 +18,6 @@ INCLUDES = \
libnautilus_file_manager_la_SOURCES= \
fm-ditem-page.c \
fm-ditem-page.h \
- fm-list-model.c \
- fm-list-model.h \
- fm-list-view-private.h \
- fm-list-view.c \
- fm-list-view.h \
fm-properties-window.c \
fm-properties-window.h \
$(NULL)
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 53d03ed..898bb8a 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -30,7 +30,6 @@
#include "nautilus-application.h"
-#include "file-manager/fm-list-view.h"
#if ENABLE_EMPTY_VIEW
#include "file-manager/fm-empty-view.h"
#endif /* ENABLE_EMPTY_VIEW */
@@ -39,6 +38,7 @@
#include "nautilus-desktop-window.h"
#include "nautilus-icon-view.h"
#include "nautilus-image-properties-page.h"
+#include "nautilus-list-view.h"
#include "nautilus-navigation-window.h"
#include "nautilus-navigation-window-slot.h"
#include "nautilus-self-check-functions.h"
@@ -1533,7 +1533,7 @@ nautilus_application_startup (GApplication *app)
/* register views */
nautilus_icon_view_register ();
nautilus_desktop_icon_view_register ();
- fm_list_view_register ();
+ nautilus_list_view_register ();
nautilus_icon_view_compact_register ();
#if ENABLE_EMPTY_VIEW
fm_empty_view_register ();
diff --git a/src/file-manager/fm-list-model.c b/src/nautilus-list-model.c
similarity index 72%
rename from src/file-manager/fm-list-model.c
rename to src/nautilus-list-model.c
index e7adfdd..e916073 100644
--- a/src/file-manager/fm-list-model.c
+++ b/src/nautilus-list-model.c
@@ -25,15 +25,17 @@
*/
#include <config.h>
-#include "fm-list-model.h"
-#include <libegg/eggtreemultidnd.h>
+
+#include "nautilus-list-model.h"
#include <string.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <gtk/gtk.h>
+#include <glib.h>
#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+#include <libegg/eggtreemultidnd.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
#include <libnautilus-private/nautilus-dnd.h>
-#include <glib.h>
enum {
SUBDIRECTORY_UNLOADED,
@@ -49,14 +51,14 @@ static GQuark attribute_name_q,
static guint list_model_signals[LAST_SIGNAL] = { 0 };
-static int fm_list_model_file_entry_compare_func (gconstpointer a,
- gconstpointer b,
- gpointer user_data);
-static void fm_list_model_tree_model_init (GtkTreeModelIface *iface);
-static void fm_list_model_sortable_init (GtkTreeSortableIface *iface);
-static void fm_list_model_multi_drag_source_init (EggTreeMultiDragSourceIface *iface);
+static int nautilus_list_model_file_entry_compare_func (gconstpointer a,
+ gconstpointer b,
+ gpointer user_data);
+static void nautilus_list_model_tree_model_init (GtkTreeModelIface *iface);
+static void nautilus_list_model_sortable_init (GtkTreeSortableIface *iface);
+static void nautilus_list_model_multi_drag_source_init (EggTreeMultiDragSourceIface *iface);
-struct FMListModelDetails {
+struct NautilusListModelDetails {
GSequence *files;
GHashTable *directory_reverse_map; /* map from directory to GSequenceIter's */
GHashTable *top_reverse_map; /* map from files in top dir to GSequenceIter's */
@@ -78,7 +80,7 @@ struct FMListModelDetails {
};
typedef struct {
- FMListModel *model;
+ NautilusListModel *model;
GList *path_list;
} DragDataGetInfo;
@@ -95,13 +97,13 @@ struct FileEntry {
guint loaded : 1;
};
-G_DEFINE_TYPE_WITH_CODE (FMListModel, fm_list_model, G_TYPE_OBJECT,
+G_DEFINE_TYPE_WITH_CODE (NautilusListModel, nautilus_list_model, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
- fm_list_model_tree_model_init)
+ nautilus_list_model_tree_model_init)
G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_SORTABLE,
- fm_list_model_sortable_init)
+ nautilus_list_model_sortable_init)
G_IMPLEMENT_INTERFACE (EGG_TYPE_TREE_MULTI_DRAG_SOURCE,
- fm_list_model_multi_drag_source_init));
+ nautilus_list_model_multi_drag_source_init));
static const GtkTargetEntry drag_types [] = {
{ NAUTILUS_ICON_DND_GNOME_ICON_LIST_TYPE, 0, NAUTILUS_ICON_DND_GNOME_ICON_LIST },
@@ -128,37 +130,37 @@ file_entry_free (FileEntry *file_entry)
}
static GtkTreeModelFlags
-fm_list_model_get_flags (GtkTreeModel *tree_model)
+nautilus_list_model_get_flags (GtkTreeModel *tree_model)
{
return GTK_TREE_MODEL_ITERS_PERSIST;
}
static int
-fm_list_model_get_n_columns (GtkTreeModel *tree_model)
+nautilus_list_model_get_n_columns (GtkTreeModel *tree_model)
{
- return FM_LIST_MODEL_NUM_COLUMNS + FM_LIST_MODEL (tree_model)->details->columns->len;
+ return NAUTILUS_LIST_MODEL_NUM_COLUMNS + NAUTILUS_LIST_MODEL (tree_model)->details->columns->len;
}
static GType
-fm_list_model_get_column_type (GtkTreeModel *tree_model, int index)
+nautilus_list_model_get_column_type (GtkTreeModel *tree_model, int index)
{
switch (index) {
- case FM_LIST_MODEL_FILE_COLUMN:
+ case NAUTILUS_LIST_MODEL_FILE_COLUMN:
return NAUTILUS_TYPE_FILE;
- case FM_LIST_MODEL_SUBDIRECTORY_COLUMN:
+ case NAUTILUS_LIST_MODEL_SUBDIRECTORY_COLUMN:
return NAUTILUS_TYPE_DIRECTORY;
- case FM_LIST_MODEL_SMALLEST_ICON_COLUMN:
- case FM_LIST_MODEL_SMALLER_ICON_COLUMN:
- case FM_LIST_MODEL_SMALL_ICON_COLUMN:
- case FM_LIST_MODEL_STANDARD_ICON_COLUMN:
- case FM_LIST_MODEL_LARGE_ICON_COLUMN:
- case FM_LIST_MODEL_LARGER_ICON_COLUMN:
- case FM_LIST_MODEL_LARGEST_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_SMALLEST_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_SMALLER_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_SMALL_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_STANDARD_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_LARGE_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_LARGER_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_LARGEST_ICON_COLUMN:
return GDK_TYPE_PIXBUF;
- case FM_LIST_MODEL_FILE_NAME_IS_EDITABLE_COLUMN:
+ case NAUTILUS_LIST_MODEL_FILE_NAME_IS_EDITABLE_COLUMN:
return G_TYPE_BOOLEAN;
default:
- if (index < FM_LIST_MODEL_NUM_COLUMNS + FM_LIST_MODEL (tree_model)->details->columns->len) {
+ if (index < NAUTILUS_LIST_MODEL_NUM_COLUMNS + NAUTILUS_LIST_MODEL (tree_model)->details->columns->len) {
return G_TYPE_STRING;
} else {
return G_TYPE_INVALID;
@@ -167,7 +169,7 @@ fm_list_model_get_column_type (GtkTreeModel *tree_model, int index)
}
static void
-fm_list_model_ptr_to_iter (FMListModel *model, GSequenceIter *ptr, GtkTreeIter *iter)
+nautilus_list_model_ptr_to_iter (NautilusListModel *model, GSequenceIter *ptr, GtkTreeIter *iter)
{
g_assert (!g_sequence_iter_is_end (ptr));
if (iter != NULL) {
@@ -177,15 +179,15 @@ fm_list_model_ptr_to_iter (FMListModel *model, GSequenceIter *ptr, GtkTreeIter *
}
static gboolean
-fm_list_model_get_iter (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreePath *path)
+nautilus_list_model_get_iter (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreePath *path)
{
- FMListModel *model;
+ NautilusListModel *model;
GSequence *files;
GSequenceIter *ptr;
FileEntry *file_entry;
int i, d;
- model = (FMListModel *)tree_model;
+ model = (NautilusListModel *)tree_model;
ptr = NULL;
files = model->details->files;
@@ -201,21 +203,21 @@ fm_list_model_get_iter (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreePath
files = file_entry->files;
}
- fm_list_model_ptr_to_iter (model, ptr, iter);
+ nautilus_list_model_ptr_to_iter (model, ptr, iter);
return TRUE;
}
static GtkTreePath *
-fm_list_model_get_path (GtkTreeModel *tree_model, GtkTreeIter *iter)
+nautilus_list_model_get_path (GtkTreeModel *tree_model, GtkTreeIter *iter)
{
GtkTreePath *path;
- FMListModel *model;
+ NautilusListModel *model;
GSequenceIter *ptr;
FileEntry *file_entry;
- model = (FMListModel *)tree_model;
+ model = (NautilusListModel *)tree_model;
g_return_val_if_fail (iter->stamp == model->details->stamp, NULL);
@@ -240,9 +242,9 @@ fm_list_model_get_path (GtkTreeModel *tree_model, GtkTreeIter *iter)
}
static void
-fm_list_model_get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, int column, GValue *value)
+nautilus_list_model_get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, int column, GValue *value)
{
- FMListModel *model;
+ NautilusListModel *model;
FileEntry *file_entry;
NautilusFile *file;
char *str;
@@ -258,7 +260,7 @@ fm_list_model_get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, int column
int i;
NautilusFileIconFlags flags;
- model = (FMListModel *)tree_model;
+ model = (NautilusListModel *)tree_model;
g_return_if_fail (model->details->stamp == iter->stamp);
g_return_if_fail (!g_sequence_iter_is_end (iter->user_data));
@@ -267,27 +269,27 @@ fm_list_model_get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, int column
file = file_entry->file;
switch (column) {
- case FM_LIST_MODEL_FILE_COLUMN:
+ case NAUTILUS_LIST_MODEL_FILE_COLUMN:
g_value_init (value, NAUTILUS_TYPE_FILE);
g_value_set_object (value, file);
break;
- case FM_LIST_MODEL_SUBDIRECTORY_COLUMN:
+ case NAUTILUS_LIST_MODEL_SUBDIRECTORY_COLUMN:
g_value_init (value, NAUTILUS_TYPE_DIRECTORY);
g_value_set_object (value, file_entry->subdirectory);
break;
- case FM_LIST_MODEL_SMALLEST_ICON_COLUMN:
- case FM_LIST_MODEL_SMALLER_ICON_COLUMN:
- case FM_LIST_MODEL_SMALL_ICON_COLUMN:
- case FM_LIST_MODEL_STANDARD_ICON_COLUMN:
- case FM_LIST_MODEL_LARGE_ICON_COLUMN:
- case FM_LIST_MODEL_LARGER_ICON_COLUMN:
- case FM_LIST_MODEL_LARGEST_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_SMALLEST_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_SMALLER_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_SMALL_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_STANDARD_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_LARGE_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_LARGER_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_LARGEST_ICON_COLUMN:
g_value_init (value, GDK_TYPE_PIXBUF);
if (file != NULL) {
- zoom_level = fm_list_model_get_zoom_level_from_column_id (column);
+ zoom_level = nautilus_list_model_get_zoom_level_from_column_id (column);
icon_size = nautilus_get_icon_size_for_zoom_level (zoom_level);
flags = NAUTILUS_FILE_ICON_FLAGS_USE_THUMBNAILS |
@@ -367,16 +369,16 @@ fm_list_model_get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, int column
g_object_unref (icon);
}
break;
- case FM_LIST_MODEL_FILE_NAME_IS_EDITABLE_COLUMN:
+ case NAUTILUS_LIST_MODEL_FILE_NAME_IS_EDITABLE_COLUMN:
g_value_init (value, G_TYPE_BOOLEAN);
g_value_set_boolean (value, file != NULL && nautilus_file_can_rename (file));
break;
default:
- if (column >= FM_LIST_MODEL_NUM_COLUMNS || column < FM_LIST_MODEL_NUM_COLUMNS + model->details->columns->len) {
+ if (column >= NAUTILUS_LIST_MODEL_NUM_COLUMNS || column < NAUTILUS_LIST_MODEL_NUM_COLUMNS + model->details->columns->len) {
NautilusColumn *nautilus_column;
GQuark attribute;
- nautilus_column = model->details->columns->pdata[column - FM_LIST_MODEL_NUM_COLUMNS];
+ nautilus_column = model->details->columns->pdata[column - NAUTILUS_LIST_MODEL_NUM_COLUMNS];
g_value_init (value, G_TYPE_STRING);
g_object_get (nautilus_column,
@@ -400,11 +402,11 @@ fm_list_model_get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, int column
}
static gboolean
-fm_list_model_iter_next (GtkTreeModel *tree_model, GtkTreeIter *iter)
+nautilus_list_model_iter_next (GtkTreeModel *tree_model, GtkTreeIter *iter)
{
- FMListModel *model;
+ NautilusListModel *model;
- model = (FMListModel *)tree_model;
+ model = (NautilusListModel *)tree_model;
g_return_val_if_fail (model->details->stamp == iter->stamp, FALSE);
@@ -414,13 +416,13 @@ fm_list_model_iter_next (GtkTreeModel *tree_model, GtkTreeIter *iter)
}
static gboolean
-fm_list_model_iter_children (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreeIter *parent)
+nautilus_list_model_iter_children (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreeIter *parent)
{
- FMListModel *model;
+ NautilusListModel *model;
GSequence *files;
FileEntry *file_entry;
- model = (FMListModel *)tree_model;
+ model = (NautilusListModel *)tree_model;
if (parent == NULL) {
files = model->details->files;
@@ -440,12 +442,12 @@ fm_list_model_iter_children (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTre
}
static gboolean
-fm_list_model_iter_has_child (GtkTreeModel *tree_model, GtkTreeIter *iter)
+nautilus_list_model_iter_has_child (GtkTreeModel *tree_model, GtkTreeIter *iter)
{
FileEntry *file_entry;
if (iter == NULL) {
- return !fm_list_model_is_empty (FM_LIST_MODEL (tree_model));
+ return !nautilus_list_model_is_empty (NAUTILUS_LIST_MODEL (tree_model));
}
file_entry = g_sequence_get (iter->user_data);
@@ -454,13 +456,13 @@ fm_list_model_iter_has_child (GtkTreeModel *tree_model, GtkTreeIter *iter)
}
static int
-fm_list_model_iter_n_children (GtkTreeModel *tree_model, GtkTreeIter *iter)
+nautilus_list_model_iter_n_children (GtkTreeModel *tree_model, GtkTreeIter *iter)
{
- FMListModel *model;
+ NautilusListModel *model;
GSequence *files;
FileEntry *file_entry;
- model = (FMListModel *)tree_model;
+ model = (NautilusListModel *)tree_model;
if (iter == NULL) {
files = model->details->files;
@@ -473,14 +475,14 @@ fm_list_model_iter_n_children (GtkTreeModel *tree_model, GtkTreeIter *iter)
}
static gboolean
-fm_list_model_iter_nth_child (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreeIter *parent, int n)
+nautilus_list_model_iter_nth_child (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreeIter *parent, int n)
{
- FMListModel *model;
+ NautilusListModel *model;
GSequenceIter *child;
GSequence *files;
FileEntry *file_entry;
- model = (FMListModel *)tree_model;
+ model = (NautilusListModel *)tree_model;
if (parent != NULL) {
file_entry = g_sequence_get (parent->user_data);
@@ -502,12 +504,12 @@ fm_list_model_iter_nth_child (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTr
}
static gboolean
-fm_list_model_iter_parent (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreeIter *child)
+nautilus_list_model_iter_parent (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreeIter *child)
{
- FMListModel *model;
+ NautilusListModel *model;
FileEntry *file_entry;
- model = (FMListModel *)tree_model;
+ model = (NautilusListModel *)tree_model;
file_entry = g_sequence_get (child->user_data);
@@ -522,7 +524,7 @@ fm_list_model_iter_parent (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreeI
}
static GSequenceIter *
-lookup_file (FMListModel *model, NautilusFile *file,
+lookup_file (NautilusListModel *model, NautilusFile *file,
NautilusDirectory *directory)
{
FileEntry *file_entry;
@@ -550,7 +552,7 @@ lookup_file (FMListModel *model, NautilusFile *file,
struct GetIters {
- FMListModel *model;
+ NautilusListModel *model;
NautilusFile *file;
GList *iters;
};
@@ -565,7 +567,7 @@ dir_to_iters (struct GetIters *data,
if (ptr) {
GtkTreeIter *iter;
iter = g_new0 (GtkTreeIter, 1);
- fm_list_model_ptr_to_iter (data->model, ptr, iter);
+ nautilus_list_model_ptr_to_iter (data->model, ptr, iter);
data->iters = g_list_prepend (data->iters, iter);
}
}
@@ -584,7 +586,7 @@ file_to_iter_cb (gpointer key,
}
GList *
-fm_list_model_get_all_iters_for_file (FMListModel *model, NautilusFile *file)
+nautilus_list_model_get_all_iters_for_file (NautilusListModel *model, NautilusFile *file)
{
struct GetIters data;
@@ -600,16 +602,16 @@ fm_list_model_get_all_iters_for_file (FMListModel *model, NautilusFile *file)
}
gboolean
-fm_list_model_get_first_iter_for_file (FMListModel *model,
- NautilusFile *file,
- GtkTreeIter *iter)
+nautilus_list_model_get_first_iter_for_file (NautilusListModel *model,
+ NautilusFile *file,
+ GtkTreeIter *iter)
{
GList *list;
gboolean res;
res = FALSE;
- list = fm_list_model_get_all_iters_for_file (model, file);
+ list = nautilus_list_model_get_all_iters_for_file (model, file);
if (list != NULL) {
res = TRUE;
*iter = *(GtkTreeIter *)list->data;
@@ -621,9 +623,9 @@ fm_list_model_get_first_iter_for_file (FMListModel *model,
gboolean
-fm_list_model_get_tree_iter_from_file (FMListModel *model, NautilusFile *file,
- NautilusDirectory *directory,
- GtkTreeIter *iter)
+nautilus_list_model_get_tree_iter_from_file (NautilusListModel *model, NautilusFile *file,
+ NautilusDirectory *directory,
+ GtkTreeIter *iter)
{
GSequenceIter *ptr;
@@ -632,22 +634,22 @@ fm_list_model_get_tree_iter_from_file (FMListModel *model, NautilusFile *file,
return FALSE;
}
- fm_list_model_ptr_to_iter (model, ptr, iter);
+ nautilus_list_model_ptr_to_iter (model, ptr, iter);
return TRUE;
}
static int
-fm_list_model_file_entry_compare_func (gconstpointer a,
- gconstpointer b,
- gpointer user_data)
+nautilus_list_model_file_entry_compare_func (gconstpointer a,
+ gconstpointer b,
+ gpointer user_data)
{
FileEntry *file_entry1;
FileEntry *file_entry2;
- FMListModel *model;
+ NautilusListModel *model;
int result;
- model = (FMListModel *)user_data;
+ model = (NautilusListModel *)user_data;
file_entry1 = (FileEntry *)a;
file_entry2 = (FileEntry *)b;
@@ -667,9 +669,9 @@ fm_list_model_file_entry_compare_func (gconstpointer a,
}
int
-fm_list_model_compare_func (FMListModel *model,
- NautilusFile *file1,
- NautilusFile *file2)
+nautilus_list_model_compare_func (NautilusListModel *model,
+ NautilusFile *file1,
+ NautilusFile *file2)
{
int result;
@@ -682,7 +684,7 @@ fm_list_model_compare_func (FMListModel *model,
}
static void
-fm_list_model_sort_file_entries (FMListModel *model, GSequence *files, GtkTreePath *path)
+nautilus_list_model_sort_file_entries (NautilusListModel *model, GSequence *files, GtkTreePath *path)
{
GSequenceIter **old_order;
GtkTreeIter iter;
@@ -706,7 +708,7 @@ fm_list_model_sort_file_entries (FMListModel *model, GSequence *files, GtkTreePa
file_entry = g_sequence_get (ptr);
if (file_entry->files != NULL) {
gtk_tree_path_append_index (path, i);
- fm_list_model_sort_file_entries (model, file_entry->files, path);
+ nautilus_list_model_sort_file_entries (model, file_entry->files, path);
gtk_tree_path_up (path);
}
@@ -714,7 +716,7 @@ fm_list_model_sort_file_entries (FMListModel *model, GSequence *files, GtkTreePa
}
/* sort */
- g_sequence_sort (files, fm_list_model_file_entry_compare_func, model);
+ g_sequence_sort (files, nautilus_list_model_file_entry_compare_func, model);
/* generate new order */
new_order = g_new (int, length);
@@ -743,28 +745,28 @@ fm_list_model_sort_file_entries (FMListModel *model, GSequence *files, GtkTreePa
}
static void
-fm_list_model_sort (FMListModel *model)
+nautilus_list_model_sort (NautilusListModel *model)
{
GtkTreePath *path;
path = gtk_tree_path_new ();
- fm_list_model_sort_file_entries (model, model->details->files, path);
+ nautilus_list_model_sort_file_entries (model, model->details->files, path);
gtk_tree_path_free (path);
}
static gboolean
-fm_list_model_get_sort_column_id (GtkTreeSortable *sortable,
- gint *sort_column_id,
- GtkSortType *order)
+nautilus_list_model_get_sort_column_id (GtkTreeSortable *sortable,
+ gint *sort_column_id,
+ GtkSortType *order)
{
- FMListModel *model;
+ NautilusListModel *model;
int id;
- model = (FMListModel *)sortable;
+ model = (NautilusListModel *)sortable;
- id = fm_list_model_get_sort_column_id_from_attribute
+ id = nautilus_list_model_get_sort_column_id_from_attribute
(model, model->details->sort_attribute);
if (id == -1) {
@@ -783,28 +785,28 @@ fm_list_model_get_sort_column_id (GtkTreeSortable *sortable,
}
static void
-fm_list_model_set_sort_column_id (GtkTreeSortable *sortable, gint sort_column_id, GtkSortType order)
+nautilus_list_model_set_sort_column_id (GtkTreeSortable *sortable, gint sort_column_id, GtkSortType order)
{
- FMListModel *model;
+ NautilusListModel *model;
- model = (FMListModel *)sortable;
+ model = (NautilusListModel *)sortable;
- model->details->sort_attribute = fm_list_model_get_attribute_from_sort_column_id (model, sort_column_id);
+ model->details->sort_attribute = nautilus_list_model_get_attribute_from_sort_column_id (model, sort_column_id);
model->details->order = order;
- fm_list_model_sort (model);
+ nautilus_list_model_sort (model);
gtk_tree_sortable_sort_column_changed (sortable);
}
static gboolean
-fm_list_model_has_default_sort_func (GtkTreeSortable *sortable)
+nautilus_list_model_has_default_sort_func (GtkTreeSortable *sortable)
{
return FALSE;
}
static gboolean
-fm_list_model_multi_row_draggable (EggTreeMultiDragSource *drag_source, GList *path_list)
+nautilus_list_model_multi_row_draggable (EggTreeMultiDragSource *drag_source, GList *path_list)
{
return TRUE;
}
@@ -833,7 +835,7 @@ each_path_get_data_binder (NautilusDragEachSelectedItemDataGet data_get,
row = l->data;
path = gtk_tree_row_reference_get_path (row);
- file = fm_list_model_file_for_path (info->model, path);
+ file = nautilus_list_model_file_for_path (info->model, path);
if (file) {
gtk_tree_view_get_cell_area
(info->model->details->drag_view,
@@ -859,21 +861,21 @@ each_path_get_data_binder (NautilusDragEachSelectedItemDataGet data_get,
}
static gboolean
-fm_list_model_multi_drag_data_get (EggTreeMultiDragSource *drag_source,
- GList *path_list,
- GtkSelectionData *selection_data)
+nautilus_list_model_multi_drag_data_get (EggTreeMultiDragSource *drag_source,
+ GList *path_list,
+ GtkSelectionData *selection_data)
{
- FMListModel *model;
+ NautilusListModel *model;
DragDataGetInfo context;
guint target_info;
- model = FM_LIST_MODEL (drag_source);
+ model = NAUTILUS_LIST_MODEL (drag_source);
context.model = model;
context.path_list = path_list;
if (!drag_target_list) {
- drag_target_list = fm_list_model_get_drag_target_list ();
+ drag_target_list = nautilus_list_model_get_drag_target_list ();
}
if (gtk_target_list_find (drag_target_list,
@@ -893,13 +895,13 @@ fm_list_model_multi_drag_data_get (EggTreeMultiDragSource *drag_source,
}
static gboolean
-fm_list_model_multi_drag_data_delete (EggTreeMultiDragSource *drag_source, GList *path_list)
+nautilus_list_model_multi_drag_data_delete (EggTreeMultiDragSource *drag_source, GList *path_list)
{
return TRUE;
}
static void
-add_dummy_row (FMListModel *model, FileEntry *parent_entry)
+add_dummy_row (NautilusListModel *model, FileEntry *parent_entry)
{
FileEntry *dummy_file_entry;
GtkTreeIter iter;
@@ -908,7 +910,7 @@ add_dummy_row (FMListModel *model, FileEntry *parent_entry)
dummy_file_entry = g_new0 (FileEntry, 1);
dummy_file_entry->parent = parent_entry;
dummy_file_entry->ptr = g_sequence_insert_sorted (parent_entry->files, dummy_file_entry,
- fm_list_model_file_entry_compare_func, model);
+ nautilus_list_model_file_entry_compare_func, model);
iter.stamp = model->details->stamp;
iter.user_data = dummy_file_entry->ptr;
@@ -918,8 +920,8 @@ add_dummy_row (FMListModel *model, FileEntry *parent_entry)
}
gboolean
-fm_list_model_add_file (FMListModel *model, NautilusFile *file,
- NautilusDirectory *directory)
+nautilus_list_model_add_file (NautilusListModel *model, NautilusFile *file,
+ NautilusDirectory *directory)
{
GtkTreeIter iter;
GtkTreePath *path;
@@ -979,7 +981,7 @@ fm_list_model_add_file (FMListModel *model, NautilusFile *file,
file_entry->ptr = g_sequence_insert_sorted (files, file_entry,
- fm_list_model_file_entry_compare_func, model);
+ nautilus_list_model_file_entry_compare_func, model);
g_hash_table_insert (parent_hash, file, file_entry->ptr);
@@ -1007,8 +1009,8 @@ fm_list_model_add_file (FMListModel *model, NautilusFile *file,
}
void
-fm_list_model_file_changed (FMListModel *model, NautilusFile *file,
- NautilusDirectory *directory)
+nautilus_list_model_file_changed (NautilusListModel *model, NautilusFile *file,
+ NautilusDirectory *directory)
{
FileEntry *parent_file_entry;
GtkTreeIter iter;
@@ -1027,7 +1029,7 @@ fm_list_model_file_changed (FMListModel *model, NautilusFile *file,
pos_before = g_sequence_iter_get_position (ptr);
- g_sequence_sort_changed (ptr, fm_list_model_file_entry_compare_func, model);
+ g_sequence_sort_changed (ptr, nautilus_list_model_file_entry_compare_func, model);
pos_after = g_sequence_iter_get_position (ptr);
@@ -1042,7 +1044,7 @@ fm_list_model_file_changed (FMListModel *model, NautilusFile *file,
files = model->details->files;
} else {
has_iter = TRUE;
- fm_list_model_ptr_to_iter (model, parent_file_entry->ptr, &iter);
+ nautilus_list_model_ptr_to_iter (model, parent_file_entry->ptr, &iter);
parent_path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter);
files = parent_file_entry->files;
}
@@ -1067,26 +1069,26 @@ fm_list_model_file_changed (FMListModel *model, NautilusFile *file,
g_free (new_order);
}
- fm_list_model_ptr_to_iter (model, ptr, &iter);
+ nautilus_list_model_ptr_to_iter (model, ptr, &iter);
path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter);
gtk_tree_model_row_changed (GTK_TREE_MODEL (model), path, &iter);
gtk_tree_path_free (path);
}
gboolean
-fm_list_model_is_empty (FMListModel *model)
+nautilus_list_model_is_empty (NautilusListModel *model)
{
return (g_sequence_get_length (model->details->files) == 0);
}
guint
-fm_list_model_get_length (FMListModel *model)
+nautilus_list_model_get_length (NautilusListModel *model)
{
return g_sequence_get_length (model->details->files);
}
static void
-fm_list_model_remove (FMListModel *model, GtkTreeIter *iter)
+nautilus_list_model_remove (NautilusListModel *model, GtkTreeIter *iter)
{
GSequenceIter *ptr, *child_ptr;
FileEntry *file_entry, *child_file_entry, *parent_file_entry;
@@ -1101,7 +1103,7 @@ fm_list_model_remove (FMListModel *model, GtkTreeIter *iter)
child_ptr = g_sequence_get_begin_iter (file_entry->files);
child_file_entry = g_sequence_get (child_ptr);
if (child_file_entry->file != NULL) {
- fm_list_model_remove_file (model,
+ nautilus_list_model_remove_file (model,
child_file_entry->file,
file_entry->subdirectory);
} else {
@@ -1164,18 +1166,18 @@ fm_list_model_remove (FMListModel *model, GtkTreeIter *iter)
}
void
-fm_list_model_remove_file (FMListModel *model, NautilusFile *file,
+nautilus_list_model_remove_file (NautilusListModel *model, NautilusFile *file,
NautilusDirectory *directory)
{
GtkTreeIter iter;
- if (fm_list_model_get_tree_iter_from_file (model, file, directory, &iter)) {
- fm_list_model_remove (model, &iter);
+ if (nautilus_list_model_get_tree_iter_from_file (model, file, directory, &iter)) {
+ nautilus_list_model_remove (model, &iter);
}
}
static void
-fm_list_model_clear_directory (FMListModel *model, GSequence *files)
+nautilus_list_model_clear_directory (NautilusListModel *model, GSequence *files)
{
GtkTreeIter iter;
FileEntry *file_entry;
@@ -1185,24 +1187,24 @@ fm_list_model_clear_directory (FMListModel *model, GSequence *files)
file_entry = g_sequence_get (iter.user_data);
if (file_entry->files != NULL) {
- fm_list_model_clear_directory (model, file_entry->files);
+ nautilus_list_model_clear_directory (model, file_entry->files);
}
iter.stamp = model->details->stamp;
- fm_list_model_remove (model, &iter);
+ nautilus_list_model_remove (model, &iter);
}
}
void
-fm_list_model_clear (FMListModel *model)
+nautilus_list_model_clear (NautilusListModel *model)
{
g_return_if_fail (model != NULL);
- fm_list_model_clear_directory (model, model->details->files);
+ nautilus_list_model_clear_directory (model, model->details->files);
}
NautilusFile *
-fm_list_model_file_for_path (FMListModel *model, GtkTreePath *path)
+nautilus_list_model_file_for_path (NautilusListModel *model, GtkTreePath *path)
{
NautilusFile *file;
GtkTreeIter iter;
@@ -1212,14 +1214,14 @@ fm_list_model_file_for_path (FMListModel *model, GtkTreePath *path)
&iter, path)) {
gtk_tree_model_get (GTK_TREE_MODEL (model),
&iter,
- FM_LIST_MODEL_FILE_COLUMN, &file,
+ NAUTILUS_LIST_MODEL_FILE_COLUMN, &file,
-1);
}
return file;
}
gboolean
-fm_list_model_load_subdirectory (FMListModel *model, GtkTreePath *path, NautilusDirectory **directory)
+nautilus_list_model_load_subdirectory (NautilusListModel *model, GtkTreePath *path, NautilusDirectory **directory)
{
GtkTreeIter iter;
FileEntry *file_entry;
@@ -1258,7 +1260,7 @@ fm_list_model_load_subdirectory (FMListModel *model, GtkTreePath *path, Nautilus
/* removes all children of the subfolder and unloads the subdirectory */
void
-fm_list_model_unload_subdirectory (FMListModel *model, GtkTreeIter *iter)
+nautilus_list_model_unload_subdirectory (NautilusListModel *model, GtkTreeIter *iter)
{
GSequenceIter *child_ptr;
FileEntry *file_entry, *child_file_entry;
@@ -1280,8 +1282,8 @@ fm_list_model_unload_subdirectory (FMListModel *model, GtkTreeIter *iter)
/* Don't delete the dummy node */
break;
} else {
- fm_list_model_ptr_to_iter (model, child_ptr, &child_iter);
- fm_list_model_remove (model, &child_iter);
+ nautilus_list_model_ptr_to_iter (model, child_ptr, &child_iter);
+ nautilus_list_model_remove (model, &child_iter);
}
}
@@ -1304,19 +1306,19 @@ fm_list_model_unload_subdirectory (FMListModel *model, GtkTreeIter *iter)
void
-fm_list_model_set_should_sort_directories_first (FMListModel *model, gboolean sort_directories_first)
+nautilus_list_model_set_should_sort_directories_first (NautilusListModel *model, gboolean sort_directories_first)
{
if (model->details->sort_directories_first == sort_directories_first) {
return;
}
model->details->sort_directories_first = sort_directories_first;
- fm_list_model_sort (model);
+ nautilus_list_model_sort (model);
}
int
-fm_list_model_get_sort_column_id_from_attribute (FMListModel *model,
- GQuark attribute)
+nautilus_list_model_get_sort_column_id_from_attribute (NautilusListModel *model,
+ GQuark attribute)
{
guint i;
@@ -1341,7 +1343,7 @@ fm_list_model_get_sort_column_id_from_attribute (FMListModel *model,
"attribute_q", &column_attribute,
NULL);
if (column_attribute == attribute) {
- return FM_LIST_MODEL_NUM_COLUMNS + i;
+ return NAUTILUS_LIST_MODEL_NUM_COLUMNS + i;
}
}
@@ -1349,14 +1351,14 @@ fm_list_model_get_sort_column_id_from_attribute (FMListModel *model,
}
GQuark
-fm_list_model_get_attribute_from_sort_column_id (FMListModel *model,
- int sort_column_id)
+nautilus_list_model_get_attribute_from_sort_column_id (NautilusListModel *model,
+ int sort_column_id)
{
NautilusColumn *column;
int index;
GQuark attribute;
- index = sort_column_id - FM_LIST_MODEL_NUM_COLUMNS;
+ index = sort_column_id - NAUTILUS_LIST_MODEL_NUM_COLUMNS;
if (index < 0 || index >= model->details->columns->len) {
g_warning ("unknown sort column id: %d", sort_column_id);
@@ -1370,22 +1372,22 @@ fm_list_model_get_attribute_from_sort_column_id (FMListModel *model,
}
NautilusZoomLevel
-fm_list_model_get_zoom_level_from_column_id (int column)
+nautilus_list_model_get_zoom_level_from_column_id (int column)
{
switch (column) {
- case FM_LIST_MODEL_SMALLEST_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_SMALLEST_ICON_COLUMN:
return NAUTILUS_ZOOM_LEVEL_SMALLEST;
- case FM_LIST_MODEL_SMALLER_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_SMALLER_ICON_COLUMN:
return NAUTILUS_ZOOM_LEVEL_SMALLER;
- case FM_LIST_MODEL_SMALL_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_SMALL_ICON_COLUMN:
return NAUTILUS_ZOOM_LEVEL_SMALL;
- case FM_LIST_MODEL_STANDARD_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_STANDARD_ICON_COLUMN:
return NAUTILUS_ZOOM_LEVEL_STANDARD;
- case FM_LIST_MODEL_LARGE_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_LARGE_ICON_COLUMN:
return NAUTILUS_ZOOM_LEVEL_LARGE;
- case FM_LIST_MODEL_LARGER_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_LARGER_ICON_COLUMN:
return NAUTILUS_ZOOM_LEVEL_LARGER;
- case FM_LIST_MODEL_LARGEST_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_LARGEST_ICON_COLUMN:
return NAUTILUS_ZOOM_LEVEL_LARGEST;
}
@@ -1393,36 +1395,36 @@ fm_list_model_get_zoom_level_from_column_id (int column)
}
int
-fm_list_model_get_column_id_from_zoom_level (NautilusZoomLevel zoom_level)
+nautilus_list_model_get_column_id_from_zoom_level (NautilusZoomLevel zoom_level)
{
switch (zoom_level) {
case NAUTILUS_ZOOM_LEVEL_SMALLEST:
- return FM_LIST_MODEL_SMALLEST_ICON_COLUMN;
+ return NAUTILUS_LIST_MODEL_SMALLEST_ICON_COLUMN;
case NAUTILUS_ZOOM_LEVEL_SMALLER:
- return FM_LIST_MODEL_SMALLER_ICON_COLUMN;
+ return NAUTILUS_LIST_MODEL_SMALLER_ICON_COLUMN;
case NAUTILUS_ZOOM_LEVEL_SMALL:
- return FM_LIST_MODEL_SMALL_ICON_COLUMN;
+ return NAUTILUS_LIST_MODEL_SMALL_ICON_COLUMN;
case NAUTILUS_ZOOM_LEVEL_STANDARD:
- return FM_LIST_MODEL_STANDARD_ICON_COLUMN;
+ return NAUTILUS_LIST_MODEL_STANDARD_ICON_COLUMN;
case NAUTILUS_ZOOM_LEVEL_LARGE:
- return FM_LIST_MODEL_LARGE_ICON_COLUMN;
+ return NAUTILUS_LIST_MODEL_LARGE_ICON_COLUMN;
case NAUTILUS_ZOOM_LEVEL_LARGER:
- return FM_LIST_MODEL_LARGER_ICON_COLUMN;
+ return NAUTILUS_LIST_MODEL_LARGER_ICON_COLUMN;
case NAUTILUS_ZOOM_LEVEL_LARGEST:
- return FM_LIST_MODEL_LARGEST_ICON_COLUMN;
+ return NAUTILUS_LIST_MODEL_LARGEST_ICON_COLUMN;
}
- g_return_val_if_reached (FM_LIST_MODEL_STANDARD_ICON_COLUMN);
+ g_return_val_if_reached (NAUTILUS_LIST_MODEL_STANDARD_ICON_COLUMN);
}
void
-fm_list_model_set_drag_view (FMListModel *model,
- GtkTreeView *view,
- int drag_begin_x,
- int drag_begin_y)
+nautilus_list_model_set_drag_view (NautilusListModel *model,
+ GtkTreeView *view,
+ int drag_begin_x,
+ int drag_begin_y)
{
g_return_if_fail (model != NULL);
- g_return_if_fail (FM_IS_LIST_MODEL (model));
+ g_return_if_fail (NAUTILUS_IS_LIST_MODEL (model));
g_return_if_fail (!view || GTK_IS_TREE_VIEW (view));
model->details->drag_view = view;
@@ -1431,7 +1433,7 @@ fm_list_model_set_drag_view (FMListModel *model,
}
GtkTargetList *
-fm_list_model_get_drag_target_list ()
+nautilus_list_model_get_drag_target_list ()
{
GtkTargetList *target_list;
@@ -1442,18 +1444,18 @@ fm_list_model_get_drag_target_list ()
}
int
-fm_list_model_add_column (FMListModel *model,
- NautilusColumn *column)
+nautilus_list_model_add_column (NautilusListModel *model,
+ NautilusColumn *column)
{
g_ptr_array_add (model->details->columns, column);
g_object_ref (column);
- return FM_LIST_MODEL_NUM_COLUMNS + (model->details->columns->len - 1);
+ return NAUTILUS_LIST_MODEL_NUM_COLUMNS + (model->details->columns->len - 1);
}
int
-fm_list_model_get_column_number (FMListModel *model,
- const char *column_name)
+nautilus_list_model_get_column_number (NautilusListModel *model,
+ const char *column_name)
{
int i;
@@ -1467,7 +1469,7 @@ fm_list_model_get_column_number (FMListModel *model,
if (!strcmp (name, column_name)) {
g_free (name);
- return FM_LIST_MODEL_NUM_COLUMNS + i;
+ return NAUTILUS_LIST_MODEL_NUM_COLUMNS + i;
}
g_free (name);
}
@@ -1476,12 +1478,12 @@ fm_list_model_get_column_number (FMListModel *model,
}
static void
-fm_list_model_dispose (GObject *object)
+nautilus_list_model_dispose (GObject *object)
{
- FMListModel *model;
+ NautilusListModel *model;
int i;
- model = FM_LIST_MODEL (object);
+ model = NAUTILUS_LIST_MODEL (object);
if (model->details->columns) {
for (i = 0; i < model->details->columns->len; i++) {
@@ -1505,15 +1507,15 @@ fm_list_model_dispose (GObject *object)
model->details->directory_reverse_map = NULL;
}
- G_OBJECT_CLASS (fm_list_model_parent_class)->dispose (object);
+ G_OBJECT_CLASS (nautilus_list_model_parent_class)->dispose (object);
}
static void
-fm_list_model_finalize (GObject *object)
+nautilus_list_model_finalize (GObject *object)
{
- FMListModel *model;
+ NautilusListModel *model;
- model = FM_LIST_MODEL (object);
+ model = NAUTILUS_LIST_MODEL (object);
if (model->details->highlight_files != NULL) {
nautilus_file_list_free (model->details->highlight_files);
@@ -1522,13 +1524,13 @@ fm_list_model_finalize (GObject *object)
g_free (model->details);
- G_OBJECT_CLASS (fm_list_model_parent_class)->finalize (object);
+ G_OBJECT_CLASS (nautilus_list_model_parent_class)->finalize (object);
}
static void
-fm_list_model_init (FMListModel *model)
+nautilus_list_model_init (NautilusListModel *model)
{
- model->details = g_new0 (FMListModelDetails, 1);
+ model->details = g_new0 (NautilusListModelDetails, 1);
model->details->files = g_sequence_new ((GDestroyNotify)file_entry_free);
model->details->top_reverse_map = g_hash_table_new (g_direct_hash, g_direct_equal);
model->details->directory_reverse_map = g_hash_table_new (g_direct_hash, g_direct_equal);
@@ -1538,7 +1540,7 @@ fm_list_model_init (FMListModel *model)
}
static void
-fm_list_model_class_init (FMListModelClass *klass)
+nautilus_list_model_class_init (NautilusListModelClass *klass)
{
GObjectClass *object_class;
@@ -1547,14 +1549,14 @@ fm_list_model_class_init (FMListModelClass *klass)
attribute_date_modified_q = g_quark_from_static_string ("date_modified");
object_class = (GObjectClass *)klass;
- object_class->finalize = fm_list_model_finalize;
- object_class->dispose = fm_list_model_dispose;
+ object_class->finalize = nautilus_list_model_finalize;
+ object_class->dispose = nautilus_list_model_dispose;
list_model_signals[SUBDIRECTORY_UNLOADED] =
g_signal_new ("subdirectory_unloaded",
- FM_TYPE_LIST_MODEL,
+ NAUTILUS_TYPE_LIST_MODEL,
G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (FMListModelClass, subdirectory_unloaded),
+ G_STRUCT_OFFSET (NautilusListModelClass, subdirectory_unloaded),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
@@ -1562,40 +1564,40 @@ fm_list_model_class_init (FMListModelClass *klass)
}
static void
-fm_list_model_tree_model_init (GtkTreeModelIface *iface)
+nautilus_list_model_tree_model_init (GtkTreeModelIface *iface)
{
- iface->get_flags = fm_list_model_get_flags;
- iface->get_n_columns = fm_list_model_get_n_columns;
- iface->get_column_type = fm_list_model_get_column_type;
- iface->get_iter = fm_list_model_get_iter;
- iface->get_path = fm_list_model_get_path;
- iface->get_value = fm_list_model_get_value;
- iface->iter_next = fm_list_model_iter_next;
- iface->iter_children = fm_list_model_iter_children;
- iface->iter_has_child = fm_list_model_iter_has_child;
- iface->iter_n_children = fm_list_model_iter_n_children;
- iface->iter_nth_child = fm_list_model_iter_nth_child;
- iface->iter_parent = fm_list_model_iter_parent;
+ iface->get_flags = nautilus_list_model_get_flags;
+ iface->get_n_columns = nautilus_list_model_get_n_columns;
+ iface->get_column_type = nautilus_list_model_get_column_type;
+ iface->get_iter = nautilus_list_model_get_iter;
+ iface->get_path = nautilus_list_model_get_path;
+ iface->get_value = nautilus_list_model_get_value;
+ iface->iter_next = nautilus_list_model_iter_next;
+ iface->iter_children = nautilus_list_model_iter_children;
+ iface->iter_has_child = nautilus_list_model_iter_has_child;
+ iface->iter_n_children = nautilus_list_model_iter_n_children;
+ iface->iter_nth_child = nautilus_list_model_iter_nth_child;
+ iface->iter_parent = nautilus_list_model_iter_parent;
}
static void
-fm_list_model_sortable_init (GtkTreeSortableIface *iface)
+nautilus_list_model_sortable_init (GtkTreeSortableIface *iface)
{
- iface->get_sort_column_id = fm_list_model_get_sort_column_id;
- iface->set_sort_column_id = fm_list_model_set_sort_column_id;
- iface->has_default_sort_func = fm_list_model_has_default_sort_func;
+ iface->get_sort_column_id = nautilus_list_model_get_sort_column_id;
+ iface->set_sort_column_id = nautilus_list_model_set_sort_column_id;
+ iface->has_default_sort_func = nautilus_list_model_has_default_sort_func;
}
static void
-fm_list_model_multi_drag_source_init (EggTreeMultiDragSourceIface *iface)
+nautilus_list_model_multi_drag_source_init (EggTreeMultiDragSourceIface *iface)
{
- iface->row_draggable = fm_list_model_multi_row_draggable;
- iface->drag_data_get = fm_list_model_multi_drag_data_get;
- iface->drag_data_delete = fm_list_model_multi_drag_data_delete;
+ iface->row_draggable = nautilus_list_model_multi_row_draggable;
+ iface->drag_data_get = nautilus_list_model_multi_drag_data_get;
+ iface->drag_data_delete = nautilus_list_model_multi_drag_data_delete;
}
void
-fm_list_model_subdirectory_done_loading (FMListModel *model, NautilusDirectory *directory)
+nautilus_list_model_subdirectory_done_loading (NautilusListModel *model, NautilusDirectory *directory)
{
GtkTreeIter iter;
GtkTreePath *path;
@@ -1641,14 +1643,14 @@ refresh_row (gpointer data,
gpointer user_data)
{
NautilusFile *file;
- FMListModel *model;
+ NautilusListModel *model;
GList *iters, *l;
GtkTreePath *path;
model = user_data;
file = data;
- iters = fm_list_model_get_all_iters_for_file (model, file);
+ iters = nautilus_list_model_get_all_iters_for_file (model, file);
for (l = iters; l != NULL; l = l->next) {
path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), l->data);
gtk_tree_model_row_changed (GTK_TREE_MODEL (model), path, l->data);
@@ -1660,8 +1662,8 @@ refresh_row (gpointer data,
}
void
-fm_list_model_set_highlight_for_files (FMListModel *model,
- GList *files)
+nautilus_list_model_set_highlight_for_files (NautilusListModel *model,
+ GList *files)
{
if (model->details->highlight_files != NULL) {
g_list_foreach (model->details->highlight_files,
diff --git a/src/nautilus-list-model.h b/src/nautilus-list-model.h
new file mode 100644
index 0000000..0b07e8c
--- /dev/null
+++ b/src/nautilus-list-model.h
@@ -0,0 +1,136 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* fm-list-model.h - a GtkTreeModel for file lists.
+
+ Copyright (C) 2001, 2002 Anders Carlsson
+
+ The Gnome Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The Gnome Library 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the Gnome Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+
+ Authors: Anders Carlsson <andersca gnu org>
+*/
+
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+#include <libnautilus-private/nautilus-file.h>
+#include <libnautilus-private/nautilus-directory.h>
+#include <libnautilus-extension/nautilus-column.h>
+
+#ifndef NAUTILUS_LIST_MODEL_H
+#define NAUTILUS_LIST_MODEL_H
+
+#define NAUTILUS_TYPE_LIST_MODEL nautilus_list_model_get_type()
+#define NAUTILUS_LIST_MODEL(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_LIST_MODEL, NautilusListModel))
+#define NAUTILUS_LIST_MODEL_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_LIST_MODEL, NautilusListModelClass))
+#define NAUTILUS_IS_LIST_MODEL(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_LIST_MODEL))
+#define NAUTILUS_IS_LIST_MODEL_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_LIST_MODEL))
+#define NAUTILUS_LIST_MODEL_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), NAUTILUS_TYPE_LIST_MODEL, NautilusListModelClass))
+
+enum {
+ NAUTILUS_LIST_MODEL_FILE_COLUMN,
+ NAUTILUS_LIST_MODEL_SUBDIRECTORY_COLUMN,
+ NAUTILUS_LIST_MODEL_SMALLEST_ICON_COLUMN,
+ NAUTILUS_LIST_MODEL_SMALLER_ICON_COLUMN,
+ NAUTILUS_LIST_MODEL_SMALL_ICON_COLUMN,
+ NAUTILUS_LIST_MODEL_STANDARD_ICON_COLUMN,
+ NAUTILUS_LIST_MODEL_LARGE_ICON_COLUMN,
+ NAUTILUS_LIST_MODEL_LARGER_ICON_COLUMN,
+ NAUTILUS_LIST_MODEL_LARGEST_ICON_COLUMN,
+ NAUTILUS_LIST_MODEL_FILE_NAME_IS_EDITABLE_COLUMN,
+ NAUTILUS_LIST_MODEL_NUM_COLUMNS
+};
+
+typedef struct NautilusListModelDetails NautilusListModelDetails;
+
+typedef struct NautilusListModel {
+ GObject parent_instance;
+ NautilusListModelDetails *details;
+} NautilusListModel;
+
+typedef struct {
+ GObjectClass parent_class;
+
+ void (* subdirectory_unloaded)(NautilusListModel *model,
+ NautilusDirectory *subdirectory);
+} NautilusListModelClass;
+
+GType nautilus_list_model_get_type (void);
+gboolean nautilus_list_model_add_file (NautilusListModel *model,
+ NautilusFile *file,
+ NautilusDirectory *directory);
+void nautilus_list_model_file_changed (NautilusListModel *model,
+ NautilusFile *file,
+ NautilusDirectory *directory);
+gboolean nautilus_list_model_is_empty (NautilusListModel *model);
+guint nautilus_list_model_get_length (NautilusListModel *model);
+void nautilus_list_model_remove_file (NautilusListModel *model,
+ NautilusFile *file,
+ NautilusDirectory *directory);
+void nautilus_list_model_clear (NautilusListModel *model);
+gboolean nautilus_list_model_get_tree_iter_from_file (NautilusListModel *model,
+ NautilusFile *file,
+ NautilusDirectory *directory,
+ GtkTreeIter *iter);
+GList * nautilus_list_model_get_all_iters_for_file (NautilusListModel *model,
+ NautilusFile *file);
+gboolean nautilus_list_model_get_first_iter_for_file (NautilusListModel *model,
+ NautilusFile *file,
+ GtkTreeIter *iter);
+void nautilus_list_model_set_should_sort_directories_first (NautilusListModel *model,
+ gboolean sort_directories_first);
+
+int nautilus_list_model_get_sort_column_id_from_attribute (NautilusListModel *model,
+ GQuark attribute);
+GQuark nautilus_list_model_get_attribute_from_sort_column_id (NautilusListModel *model,
+ int sort_column_id);
+void nautilus_list_model_sort_files (NautilusListModel *model,
+ GList **files);
+
+NautilusZoomLevel nautilus_list_model_get_zoom_level_from_column_id (int column);
+int nautilus_list_model_get_column_id_from_zoom_level (NautilusZoomLevel zoom_level);
+
+NautilusFile * nautilus_list_model_file_for_path (NautilusListModel *model, GtkTreePath *path);
+gboolean nautilus_list_model_load_subdirectory (NautilusListModel *model, GtkTreePath *path, NautilusDirectory **directory);
+void nautilus_list_model_unload_subdirectory (NautilusListModel *model, GtkTreeIter *iter);
+
+void nautilus_list_model_set_drag_view (NautilusListModel *model,
+ GtkTreeView *view,
+ int begin_x,
+ int begin_y);
+
+GtkTargetList * nautilus_list_model_get_drag_target_list (void);
+
+int nautilus_list_model_compare_func (NautilusListModel *model,
+ NautilusFile *file1,
+ NautilusFile *file2);
+
+
+int nautilus_list_model_add_column (NautilusListModel *model,
+ NautilusColumn *column);
+int nautilus_list_model_get_column_number (NautilusListModel *model,
+ const char *column_name);
+
+void nautilus_list_model_subdirectory_done_loading (NautilusListModel *model,
+ NautilusDirectory *directory);
+
+void nautilus_list_model_set_highlight_for_files (NautilusListModel *model,
+ GList *files);
+
+#endif /* NAUTILUS_LIST_MODEL_H */
diff --git a/src/file-manager/fm-list-view-private.h b/src/nautilus-list-view-private.h
similarity index 100%
rename from src/file-manager/fm-list-view-private.h
rename to src/nautilus-list-view-private.h
diff --git a/src/file-manager/fm-list-view.c b/src/nautilus-list-view.c
similarity index 80%
rename from src/file-manager/fm-list-view.c
rename to src/nautilus-list-view.c
index 165ede3..41b5217 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/nautilus-list-view.c
@@ -26,10 +26,9 @@
*/
#include <config.h>
-#include "fm-list-view.h"
+#include "nautilus-list-view.h"
-#include <string.h>
-#include "fm-list-model.h"
+#include "nautilus-list-model.h"
#include "nautilus-error-reporting.h"
#include "nautilus-view-dnd.h"
#include "nautilus-view-factory.h"
@@ -64,9 +63,9 @@
#define DEBUG_FLAG NAUTILUS_DEBUG_LIST_VIEW
#include <libnautilus-private/nautilus-debug.h>
-struct FMListViewDetails {
+struct NautilusListViewDetails {
GtkTreeView *tree_view;
- FMListModel *model;
+ NautilusListModel *model;
GtkActionGroup *list_action_group;
guint list_merge_id;
@@ -140,22 +139,22 @@ static GdkCursor * hand_cursor = NULL;
static GtkTargetList * source_target_list = NULL;
-static GList *fm_list_view_get_selection (NautilusView *view);
-static GList *fm_list_view_get_selection_for_file_transfer (NautilusView *view);
-static void fm_list_view_set_zoom_level (FMListView *view,
- NautilusZoomLevel new_level,
- gboolean always_set_level);
-static void fm_list_view_scale_font_size (FMListView *view,
- NautilusZoomLevel new_level);
-static void fm_list_view_scroll_to_file (FMListView *view,
- NautilusFile *file);
-static void fm_list_view_rename_callback (NautilusFile *file,
- GFile *result_location,
- GError *error,
- gpointer callback_data);
+static GList *nautilus_list_view_get_selection (NautilusView *view);
+static GList *nautilus_list_view_get_selection_for_file_transfer (NautilusView *view);
+static void nautilus_list_view_set_zoom_level (NautilusListView *view,
+ NautilusZoomLevel new_level,
+ gboolean always_set_level);
+static void nautilus_list_view_scale_font_size (NautilusListView *view,
+ NautilusZoomLevel new_level);
+static void nautilus_list_view_scroll_to_file (NautilusListView *view,
+ NautilusFile *file);
+static void nautilus_list_view_rename_callback (NautilusFile *file,
+ GFile *result_location,
+ GError *error,
+ gpointer callback_data);
-G_DEFINE_TYPE (FMListView, fm_list_view, NAUTILUS_TYPE_VIEW);
+G_DEFINE_TYPE (NautilusListView, nautilus_list_view, NAUTILUS_TYPE_VIEW);
static const char * default_trash_visible_columns[] = {
"name", "size", "type", "trashed_on", "trash_orig_path", NULL
@@ -166,7 +165,7 @@ static const char * default_trash_columns_order[] = {
};
/* for EEL_CALL_PARENT */
-#define parent_class fm_list_view_parent_class
+#define parent_class nautilus_list_view_parent_class
static const gchar*
@@ -235,11 +234,11 @@ tree_view_has_selection (GtkTreeView *view)
}
static void
-activate_selected_items (FMListView *view)
+activate_selected_items (NautilusListView *view)
{
GList *file_list;
- file_list = fm_list_view_get_selection (NAUTILUS_VIEW (view));
+ file_list = nautilus_list_view_get_selection (NAUTILUS_VIEW (view));
if (view->details->renaming_file) {
@@ -267,7 +266,7 @@ activate_selected_items (FMListView *view)
}
static void
-activate_selected_items_alternate (FMListView *view,
+activate_selected_items_alternate (NautilusListView *view,
NautilusFile *file,
gboolean open_in_tab)
{
@@ -286,7 +285,7 @@ activate_selected_items_alternate (FMListView *view,
nautilus_file_ref (file);
file_list = g_list_prepend (NULL, file);
} else {
- file_list = fm_list_view_get_selection (NAUTILUS_VIEW (view));
+ file_list = nautilus_list_view_get_selection (NAUTILUS_VIEW (view));
}
nautilus_view_activate_files (NAUTILUS_VIEW (view),
file_list,
@@ -304,8 +303,8 @@ button_event_modifies_selection (GdkEventButton *event)
}
static void
-fm_list_view_did_not_drag (FMListView *view,
- GdkEventButton *event)
+nautilus_list_view_did_not_drag (NautilusListView *view,
+ GdkEventButton *event)
{
GtkTreeView *tree_view;
GtkTreeSelection *selection;
@@ -424,13 +423,13 @@ ref_list_free (GList *ref_list)
}
static void
-stop_drag_check (FMListView *view)
+stop_drag_check (NautilusListView *view)
{
view->details->drag_button = 0;
}
static GdkPixbuf *
-get_drag_pixbuf (FMListView *view)
+get_drag_pixbuf (NautilusListView *view)
{
GtkTreeModel *model;
GtkTreePath *path;
@@ -447,7 +446,7 @@ get_drag_pixbuf (FMListView *view)
model = gtk_tree_view_get_model (view->details->tree_view);
gtk_tree_model_get_iter (model, &iter, path);
gtk_tree_model_get (model, &iter,
- fm_list_model_get_column_id_from_zoom_level (view->details->zoom_level),
+ nautilus_list_model_get_column_id_from_zoom_level (view->details->zoom_level),
&ret,
-1);
@@ -465,7 +464,7 @@ get_drag_pixbuf (FMListView *view)
static void
drag_begin_callback (GtkWidget *widget,
GdkDragContext *context,
- FMListView *view)
+ NautilusListView *view)
{
GList *ref_list;
GdkPixbuf *pixbuf;
@@ -495,10 +494,10 @@ motion_notify_callback (GtkWidget *widget,
GdkEventMotion *event,
gpointer callback_data)
{
- FMListView *view;
+ NautilusListView *view;
GdkDragContext *context;
- view = FM_LIST_VIEW (callback_data);
+ view = NAUTILUS_LIST_VIEW (callback_data);
if (event->window != gtk_tree_view_get_bin_window (GTK_TREE_VIEW (widget))) {
return FALSE;
@@ -528,7 +527,7 @@ motion_notify_callback (GtkWidget *widget,
if (view->details->drag_button != 0) {
if (!source_target_list) {
- source_target_list = fm_list_model_get_drag_target_list ();
+ source_target_list = nautilus_list_model_get_drag_target_list ();
}
if (gtk_drag_check_threshold (widget,
@@ -554,9 +553,9 @@ leave_notify_callback (GtkWidget *widget,
GdkEventCrossing *event,
gpointer callback_data)
{
- FMListView *view;
+ NautilusListView *view;
- view = FM_LIST_VIEW (callback_data);
+ view = NAUTILUS_LIST_VIEW (callback_data);
if (click_policy_auto_value == NAUTILUS_CLICK_POLICY_SINGLE &&
view->details->hover_path != NULL) {
@@ -572,9 +571,9 @@ enter_notify_callback (GtkWidget *widget,
GdkEventCrossing *event,
gpointer callback_data)
{
- FMListView *view;
+ NautilusListView *view;
- view = FM_LIST_VIEW (callback_data);
+ view = NAUTILUS_LIST_VIEW (callback_data);
if (click_policy_auto_value == NAUTILUS_CLICK_POLICY_SINGLE) {
if (view->details->hover_path != NULL) {
@@ -595,7 +594,7 @@ enter_notify_callback (GtkWidget *widget,
}
static void
-do_popup_menu (GtkWidget *widget, FMListView *view, GdkEventButton *event)
+do_popup_menu (GtkWidget *widget, NautilusListView *view, GdkEventButton *event)
{
if (tree_view_has_selection (GTK_TREE_VIEW (widget))) {
nautilus_view_pop_up_selection_context_menu (NAUTILUS_VIEW (view), event);
@@ -607,7 +606,7 @@ do_popup_menu (GtkWidget *widget, FMListView *view, GdkEventButton *event)
static gboolean
button_press_callback (GtkWidget *widget, GdkEventButton *event, gpointer callback_data)
{
- FMListView *view;
+ NautilusListView *view;
GtkTreeView *tree_view;
GtkTreePath *path;
gboolean call_parent;
@@ -621,7 +620,7 @@ button_press_callback (GtkWidget *widget, GdkEventButton *event, gpointer callba
int expander_size, horizontal_separator;
gboolean on_expander;
- view = FM_LIST_VIEW (callback_data);
+ view = NAUTILUS_LIST_VIEW (callback_data);
tree_view = GTK_TREE_VIEW (widget);
tree_view_class = GTK_WIDGET_GET_CLASS (tree_view);
selection = gtk_tree_view_get_selection (tree_view);
@@ -630,8 +629,8 @@ button_press_callback (GtkWidget *widget, GdkEventButton *event, gpointer callba
return FALSE;
}
- fm_list_model_set_drag_view
- (FM_LIST_MODEL (gtk_tree_view_get_model (tree_view)),
+ nautilus_list_model_set_drag_view
+ (NAUTILUS_LIST_MODEL (gtk_tree_view_get_model (tree_view)),
tree_view,
event->x, event->y);
@@ -698,7 +697,7 @@ button_press_callback (GtkWidget *widget, GdkEventButton *event, gpointer callba
} else if (event->button == 1 &&
(event->state & GDK_SHIFT_MASK) != 0) {
NautilusFile *file;
- file = fm_list_model_file_for_path (view->details->model, path);
+ file = nautilus_list_model_file_for_path (view->details->model, path);
if (file != NULL) {
activate_selected_items_alternate (view, file, TRUE);
nautilus_file_unref (file);
@@ -810,15 +809,15 @@ button_release_callback (GtkWidget *widget,
GdkEventButton *event,
gpointer callback_data)
{
- FMListView *view;
+ NautilusListView *view;
- view = FM_LIST_VIEW (callback_data);
+ view = NAUTILUS_LIST_VIEW (callback_data);
if (event->button == view->details->drag_button) {
stop_drag_check (view);
if (!view->details->drag_started &&
!view->details->ignore_button_release) {
- fm_list_view_did_not_drag (view, event);
+ nautilus_list_view_did_not_drag (view, event);
}
}
return FALSE;
@@ -827,9 +826,9 @@ button_release_callback (GtkWidget *widget,
static gboolean
popup_menu_callback (GtkWidget *widget, gpointer callback_data)
{
- FMListView *view;
+ NautilusListView *view;
- view = FM_LIST_VIEW (callback_data);
+ view = NAUTILUS_LIST_VIEW (callback_data);
do_popup_menu (widget, view, NULL);
@@ -837,20 +836,20 @@ popup_menu_callback (GtkWidget *widget, gpointer callback_data)
}
static void
-subdirectory_done_loading_callback (NautilusDirectory *directory, FMListView *view)
+subdirectory_done_loading_callback (NautilusDirectory *directory, NautilusListView *view)
{
- fm_list_model_subdirectory_done_loading (view->details->model, directory);
+ nautilus_list_model_subdirectory_done_loading (view->details->model, directory);
}
static void
row_expanded_callback (GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *path, gpointer callback_data)
{
- FMListView *view;
+ NautilusListView *view;
NautilusDirectory *directory;
- view = FM_LIST_VIEW (callback_data);
+ view = NAUTILUS_LIST_VIEW (callback_data);
- if (fm_list_model_load_subdirectory (view->details->model, path, &directory)) {
+ if (nautilus_list_model_load_subdirectory (view->details->model, path, &directory)) {
char *uri;
uri = nautilus_directory_get_uri (directory);
@@ -860,7 +859,7 @@ row_expanded_callback (GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *pa
nautilus_view_add_subdirectory (NAUTILUS_VIEW (view), directory);
if (nautilus_directory_are_all_files_seen (directory)) {
- fm_list_model_subdirectory_done_loading (view->details->model,
+ nautilus_list_model_subdirectory_done_loading (view->details->model,
directory);
} else {
g_signal_connect_object (directory, "done_loading",
@@ -875,7 +874,7 @@ row_expanded_callback (GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *pa
struct UnloadDelayData {
NautilusFile *file;
NautilusDirectory *directory;
- FMListView *view;
+ NautilusListView *view;
};
static gboolean
@@ -883,19 +882,19 @@ unload_file_timeout (gpointer data)
{
struct UnloadDelayData *unload_data = data;
GtkTreeIter iter;
- FMListModel *model;
+ NautilusListModel *model;
GtkTreePath *path;
if (unload_data->view != NULL) {
model = unload_data->view->details->model;
- if (fm_list_model_get_tree_iter_from_file (model,
+ if (nautilus_list_model_get_tree_iter_from_file (model,
unload_data->file,
unload_data->directory,
&iter)) {
path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter);
if (!gtk_tree_view_row_expanded (unload_data->view->details->tree_view,
path)) {
- fm_list_model_unload_subdirectory (model, &iter);
+ nautilus_list_model_unload_subdirectory (model, &iter);
}
gtk_tree_path_free (path);
}
@@ -914,7 +913,7 @@ unload_file_timeout (gpointer data)
static void
row_collapsed_callback (GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *path, gpointer callback_data)
{
- FMListView *view;
+ NautilusListView *view;
NautilusFile *file;
NautilusDirectory *directory;
GtkTreeIter parent;
@@ -922,17 +921,17 @@ row_collapsed_callback (GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *p
GtkTreeModel *model;
char *uri;
- view = FM_LIST_VIEW (callback_data);
+ view = NAUTILUS_LIST_VIEW (callback_data);
model = GTK_TREE_MODEL (view->details->model);
gtk_tree_model_get (model, iter,
- FM_LIST_MODEL_FILE_COLUMN, &file,
+ NAUTILUS_LIST_MODEL_FILE_COLUMN, &file,
-1);
directory = NULL;
if (gtk_tree_model_iter_parent (model, &parent, iter)) {
gtk_tree_model_get (model, &parent,
- FM_LIST_MODEL_SUBDIRECTORY_COLUMN, &directory,
+ NAUTILUS_LIST_MODEL_SUBDIRECTORY_COLUMN, &directory,
-1);
}
@@ -955,22 +954,22 @@ row_collapsed_callback (GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *p
static void
row_activated_callback (GtkTreeView *treeview, GtkTreePath *path,
- GtkTreeViewColumn *column, FMListView *view)
+ GtkTreeViewColumn *column, NautilusListView *view)
{
activate_selected_items (view);
}
static void
-subdirectory_unloaded_callback (FMListModel *model,
+subdirectory_unloaded_callback (NautilusListModel *model,
NautilusDirectory *directory,
gpointer callback_data)
{
- FMListView *view;
+ NautilusListView *view;
- g_return_if_fail (FM_IS_LIST_MODEL (model));
+ g_return_if_fail (NAUTILUS_IS_LIST_MODEL (model));
g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
- view = FM_LIST_VIEW(callback_data);
+ view = NAUTILUS_LIST_VIEW(callback_data);
g_signal_handlers_disconnect_by_func (directory,
G_CALLBACK (subdirectory_done_loading_callback),
@@ -1020,23 +1019,23 @@ key_press_callback (GtkWidget *widget, GdkEventKey *event, gpointer callback_dat
handled = FALSE;
break;
}
- if (!gtk_widget_has_focus (GTK_WIDGET (FM_LIST_VIEW (view)->details->tree_view))) {
+ if (!gtk_widget_has_focus (GTK_WIDGET (NAUTILUS_LIST_VIEW (view)->details->tree_view))) {
handled = FALSE;
break;
}
if ((event->state & GDK_SHIFT_MASK) != 0) {
- activate_selected_items_alternate (FM_LIST_VIEW (view), NULL, TRUE);
+ activate_selected_items_alternate (NAUTILUS_LIST_VIEW (view), NULL, TRUE);
} else {
- activate_selected_items (FM_LIST_VIEW (view));
+ activate_selected_items (NAUTILUS_LIST_VIEW (view));
}
handled = TRUE;
break;
case GDK_KEY_Return:
case GDK_KEY_KP_Enter:
if ((event->state & GDK_SHIFT_MASK) != 0) {
- activate_selected_items_alternate (FM_LIST_VIEW (view), NULL, TRUE);
+ activate_selected_items_alternate (NAUTILUS_LIST_VIEW (view), NULL, TRUE);
} else {
- activate_selected_items (FM_LIST_VIEW (view));
+ activate_selected_items (NAUTILUS_LIST_VIEW (view));
}
handled = TRUE;
break;
@@ -1055,24 +1054,24 @@ key_press_callback (GtkWidget *widget, GdkEventKey *event, gpointer callback_dat
}
static void
-fm_list_view_reveal_selection (NautilusView *view)
+nautilus_list_view_reveal_selection (NautilusView *view)
{
GList *selection;
- g_return_if_fail (FM_IS_LIST_VIEW (view));
+ g_return_if_fail (NAUTILUS_IS_LIST_VIEW (view));
selection = nautilus_view_get_selection (view);
/* Make sure at least one of the selected items is scrolled into view */
if (selection != NULL) {
- FMListView *list_view;
+ NautilusListView *list_view;
NautilusFile *file;
GtkTreeIter iter;
GtkTreePath *path;
- list_view = FM_LIST_VIEW (view);
+ list_view = NAUTILUS_LIST_VIEW (view);
file = selection->data;
- if (fm_list_model_get_first_iter_for_file (list_view->details->model, file, &iter)) {
+ if (nautilus_list_model_get_first_iter_for_file (list_view->details->model, file, &iter)) {
path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_view->details->model), &iter);
gtk_tree_view_scroll_to_cell (list_view->details->tree_view, path, NULL, FALSE, 0.0, 0.0);
@@ -1113,7 +1112,7 @@ sort_criterion_changes_due_to_user (GtkTreeView *tree_view)
static void
sort_column_changed_callback (GtkTreeSortable *sortable,
- FMListView *view)
+ NautilusListView *view)
{
NautilusFile *file;
gint sort_column_id, default_sort_column_id;
@@ -1125,11 +1124,11 @@ sort_column_changed_callback (GtkTreeSortable *sortable,
file = nautilus_view_get_directory_as_file (NAUTILUS_VIEW (view));
gtk_tree_sortable_get_sort_column_id (sortable, &sort_column_id, &reversed);
- sort_attr = fm_list_model_get_attribute_from_sort_column_id (view->details->model, sort_column_id);
+ sort_attr = nautilus_list_model_get_attribute_from_sort_column_id (view->details->model, sort_column_id);
- default_sort_column_id = fm_list_model_get_sort_column_id_from_attribute (view->details->model,
+ default_sort_column_id = nautilus_list_model_get_sort_column_id_from_attribute (view->details->model,
g_quark_from_string (get_default_sort_order (file, &default_sort_reversed)));
- default_sort_attr = fm_list_model_get_attribute_from_sort_column_id (view->details->model, default_sort_column_id);
+ default_sort_attr = nautilus_list_model_get_attribute_from_sort_column_id (view->details->model, default_sort_column_id);
nautilus_file_set_metadata (file, NAUTILUS_METADATA_KEY_LIST_VIEW_SORT_COLUMN,
g_quark_to_string (default_sort_attr), g_quark_to_string (sort_attr));
@@ -1163,7 +1162,7 @@ sort_column_changed_callback (GtkTreeSortable *sortable,
default_reversed_attr, reversed_attr);
/* Make sure selected item(s) is visible after sort */
- fm_list_view_reveal_selection (NAUTILUS_VIEW (view));
+ nautilus_list_view_reveal_selection (NAUTILUS_VIEW (view));
view->details->last_sort_attr = sort_attr;
}
@@ -1172,7 +1171,7 @@ static void
cell_renderer_editing_started_cb (GtkCellRenderer *renderer,
GtkCellEditable *editable,
const gchar *path_str,
- FMListView *list_view)
+ NautilusListView *list_view)
{
GtkEntry *entry;
gint start_offset, end_offset;
@@ -1196,7 +1195,7 @@ cell_renderer_editing_started_cb (GtkCellRenderer *renderer,
static void
cell_renderer_editing_canceled (GtkCellRendererText *cell,
- FMListView *view)
+ NautilusListView *view)
{
view->details->editable_widget = NULL;
@@ -1207,7 +1206,7 @@ static void
cell_renderer_edited (GtkCellRendererText *cell,
const char *path_str,
const char *new_text,
- FMListView *view)
+ NautilusListView *view)
{
GtkTreePath *path;
NautilusFile *file;
@@ -1235,14 +1234,14 @@ cell_renderer_edited (GtkCellRendererText *cell,
gtk_tree_model_get (GTK_TREE_MODEL (view->details->model),
&iter,
- FM_LIST_MODEL_FILE_COLUMN, &file,
+ NAUTILUS_LIST_MODEL_FILE_COLUMN, &file,
-1);
/* Only rename if name actually changed */
if (strcmp (new_text, view->details->original_name) != 0) {
view->details->renaming_file = nautilus_file_ref (file);
view->details->rename_done = FALSE;
- fm_rename_file (file, new_text, fm_list_view_rename_callback, g_object_ref (view));
+ fm_rename_file (file, new_text, nautilus_list_view_rename_callback, g_object_ref (view));
g_free (view->details->original_name);
view->details->original_name = g_strdup (new_text);
}
@@ -1261,9 +1260,9 @@ static char *
get_root_uri_callback (NautilusTreeViewDragDest *dest,
gpointer user_data)
{
- FMListView *view;
+ NautilusListView *view;
- view = FM_LIST_VIEW (user_data);
+ view = NAUTILUS_LIST_VIEW (user_data);
return nautilus_view_get_uri (NAUTILUS_VIEW (view));
}
@@ -1273,17 +1272,17 @@ get_file_for_path_callback (NautilusTreeViewDragDest *dest,
GtkTreePath *path,
gpointer user_data)
{
- FMListView *view;
+ NautilusListView *view;
- view = FM_LIST_VIEW (user_data);
+ view = NAUTILUS_LIST_VIEW (user_data);
- return fm_list_model_file_for_path (view->details->model, path);
+ return nautilus_list_model_file_for_path (view->details->model, path);
}
/* Handles an URL received from Mozilla */
static void
list_view_handle_netscape_url (NautilusTreeViewDragDest *dest, const char *encoded_url,
- const char *target_uri, GdkDragAction action, int x, int y, FMListView *view)
+ const char *target_uri, GdkDragAction action, int x, int y, NautilusListView *view)
{
nautilus_view_handle_netscape_url_drop (NAUTILUS_VIEW (view),
encoded_url, target_uri, action, x, y);
@@ -1292,7 +1291,7 @@ list_view_handle_netscape_url (NautilusTreeViewDragDest *dest, const char *encod
static void
list_view_handle_uri_list (NautilusTreeViewDragDest *dest, const char *item_uris,
const char *target_uri,
- GdkDragAction action, int x, int y, FMListView *view)
+ GdkDragAction action, int x, int y, NautilusListView *view)
{
nautilus_view_handle_uri_list_drop (NAUTILUS_VIEW (view),
item_uris, target_uri, action, x, y);
@@ -1301,7 +1300,7 @@ list_view_handle_uri_list (NautilusTreeViewDragDest *dest, const char *item_uris
static void
list_view_handle_text (NautilusTreeViewDragDest *dest, const char *text,
const char *target_uri,
- GdkDragAction action, int x, int y, FMListView *view)
+ GdkDragAction action, int x, int y, NautilusListView *view)
{
nautilus_view_handle_text_drop (NAUTILUS_VIEW (view),
text, target_uri, action, x, y);
@@ -1310,7 +1309,7 @@ list_view_handle_text (NautilusTreeViewDragDest *dest, const char *text,
static void
list_view_handle_raw (NautilusTreeViewDragDest *dest, const char *raw_data,
int length, const char *target_uri, const char *direct_save_uri,
- GdkDragAction action, int x, int y, FMListView *view)
+ GdkDragAction action, int x, int y, NautilusListView *view)
{
nautilus_view_handle_raw_drop (NAUTILUS_VIEW (view),
raw_data, length, target_uri, direct_save_uri,
@@ -1341,7 +1340,7 @@ move_copy_items_callback (NautilusTreeViewDragDest *dest,
}
static void
-apply_columns_settings (FMListView *list_view,
+apply_columns_settings (NautilusListView *list_view,
char **column_order,
char **visible_columns)
{
@@ -1429,7 +1428,7 @@ filename_cell_data_func (GtkTreeViewColumn *column,
GtkCellRenderer *renderer,
GtkTreeModel *model,
GtkTreeIter *iter,
- FMListView *view)
+ NautilusListView *view)
{
char *text;
GtkTreePath *path;
@@ -1462,7 +1461,7 @@ filename_cell_data_func (GtkTreeViewColumn *column,
}
static void
-setup_background (FMListView *view)
+setup_background (NautilusListView *view)
{
GtkWidget *widget;
GdkRGBA color;
@@ -1470,7 +1469,7 @@ setup_background (FMListView *view)
GdkWindow *window;
gboolean is_active = view->details->active;
- widget = GTK_WIDGET (fm_list_view_get_tree_view (FM_LIST_VIEW (view)));
+ widget = GTK_WIDGET (nautilus_list_view_get_tree_view (NAUTILUS_LIST_VIEW (view)));
if (!gtk_widget_get_realized (widget)) {
return;
@@ -1498,7 +1497,7 @@ static void
realize_event_callback (GtkWidget *tree_view,
gpointer user_data)
{
- FMListView *view = user_data;
+ NautilusListView *view = user_data;
setup_background (view);
}
@@ -1507,7 +1506,7 @@ static gboolean
focus_in_event_callback (GtkWidget *widget, GdkEventFocus *event, gpointer user_data)
{
NautilusWindowSlot *slot;
- FMListView *list_view = FM_LIST_VIEW (user_data);
+ NautilusListView *list_view = NAUTILUS_LIST_VIEW (user_data);
/* make the corresponding slot (and the pane that contains it) active */
slot = nautilus_view_get_nautilus_window_slot (NAUTILUS_VIEW (list_view));
@@ -1517,7 +1516,7 @@ focus_in_event_callback (GtkWidget *widget, GdkEventFocus *event, gpointer user_
}
static void
-create_and_set_up_tree_view (FMListView *view)
+create_and_set_up_tree_view (NautilusListView *view)
{
GtkCellRenderer *cell;
GtkTreeViewColumn *column;
@@ -1595,10 +1594,10 @@ create_and_set_up_tree_view (FMListView *view)
g_signal_connect (view->details->tree_view, "realize",
G_CALLBACK (realize_event_callback), view);
- view->details->model = g_object_new (FM_TYPE_LIST_MODEL, NULL);
+ view->details->model = g_object_new (NAUTILUS_TYPE_LIST_MODEL, NULL);
gtk_tree_view_set_model (view->details->tree_view, GTK_TREE_MODEL (view->details->model));
/* Need the model for the dnd drop icon "accept" change */
- fm_list_model_set_drag_view (FM_LIST_MODEL (view->details->model),
+ nautilus_list_model_set_drag_view (NAUTILUS_LIST_MODEL (view->details->model),
view->details->tree_view, 0, 0);
g_signal_connect_object (view->details->model, "sort_column_changed",
@@ -1626,7 +1625,7 @@ create_and_set_up_tree_view (FMListView *view)
"label", &label,
"xalign", &xalign, NULL);
- column_num = fm_list_model_add_column (view->details->model,
+ column_num = nautilus_list_model_add_column (view->details->model,
nautilus_column);
/* Created the name column specially, because it
@@ -1653,7 +1652,7 @@ create_and_set_up_tree_view (FMListView *view)
gtk_tree_view_column_pack_start (view->details->file_name_column, cell, FALSE);
gtk_tree_view_column_set_attributes (view->details->file_name_column,
cell,
- "pixbuf", FM_LIST_MODEL_SMALLEST_ICON_COLUMN,
+ "pixbuf", NAUTILUS_LIST_MODEL_SMALLEST_ICON_COLUMN,
NULL);
cell = nautilus_cell_renderer_text_ellipsized_new ();
@@ -1705,16 +1704,16 @@ create_and_set_up_tree_view (FMListView *view)
}
static void
-fm_list_view_add_file (NautilusView *view, NautilusFile *file, NautilusDirectory *directory)
+nautilus_list_view_add_file (NautilusView *view, NautilusFile *file, NautilusDirectory *directory)
{
- FMListModel *model;
+ NautilusListModel *model;
- model = FM_LIST_VIEW (view)->details->model;
- fm_list_model_add_file (model, file, directory);
+ model = NAUTILUS_LIST_VIEW (view)->details->model;
+ nautilus_list_model_add_file (model, file, directory);
}
static char **
-get_visible_columns (FMListView *list_view)
+get_visible_columns (NautilusListView *list_view)
{
NautilusFile *file;
GList *visible_columns;
@@ -1752,7 +1751,7 @@ get_visible_columns (FMListView *list_view)
}
static char **
-get_column_order (FMListView *list_view)
+get_column_order (NautilusListView *list_view)
{
NautilusFile *file;
GList *column_order;
@@ -1790,7 +1789,7 @@ get_column_order (FMListView *list_view)
}
static void
-set_columns_settings_from_metadata_and_preferences (FMListView *list_view)
+set_columns_settings_from_metadata_and_preferences (NautilusListView *list_view)
{
char **column_order;
char **visible_columns;
@@ -1805,7 +1804,7 @@ set_columns_settings_from_metadata_and_preferences (FMListView *list_view)
}
static void
-set_sort_order_from_metadata_and_preferences (FMListView *list_view)
+set_sort_order_from_metadata_and_preferences (NautilusListView *list_view)
{
char *sort_attribute;
int sort_column_id;
@@ -1817,7 +1816,7 @@ set_sort_order_from_metadata_and_preferences (FMListView *list_view)
sort_attribute = nautilus_file_get_metadata (file,
NAUTILUS_METADATA_KEY_LIST_VIEW_SORT_COLUMN,
NULL);
- sort_column_id = fm_list_model_get_sort_column_id_from_attribute (list_view->details->model,
+ sort_column_id = nautilus_list_model_get_sort_column_id_from_attribute (list_view->details->model,
g_quark_from_string (sort_attribute));
g_free (sort_attribute);
@@ -1825,7 +1824,7 @@ set_sort_order_from_metadata_and_preferences (FMListView *list_view)
if (sort_column_id == -1) {
sort_column_id =
- fm_list_model_get_sort_column_id_from_attribute (list_view->details->model,
+ nautilus_list_model_get_sort_column_id_from_attribute (list_view->details->model,
g_quark_from_string (default_sort_order));
}
@@ -1863,7 +1862,7 @@ get_default_zoom_level (void) {
}
static void
-set_zoom_level_from_metadata_and_preferences (FMListView *list_view)
+set_zoom_level_from_metadata_and_preferences (NautilusListView *list_view)
{
NautilusFile *file;
int level;
@@ -1873,7 +1872,7 @@ set_zoom_level_from_metadata_and_preferences (FMListView *list_view)
level = nautilus_file_get_integer_metadata (file,
NAUTILUS_METADATA_KEY_LIST_VIEW_ZOOM_LEVEL,
get_default_zoom_level ());
- fm_list_view_set_zoom_level (list_view, level, TRUE);
+ nautilus_list_view_set_zoom_level (list_view, level, TRUE);
/* updated the rows after updating the font size */
gtk_tree_model_foreach (GTK_TREE_MODEL (list_view->details->model),
@@ -1882,11 +1881,11 @@ set_zoom_level_from_metadata_and_preferences (FMListView *list_view)
}
static void
-fm_list_view_begin_loading (NautilusView *view)
+nautilus_list_view_begin_loading (NautilusView *view)
{
- FMListView *list_view;
+ NautilusListView *list_view;
- list_view = FM_LIST_VIEW (view);
+ list_view = NAUTILUS_LIST_VIEW (view);
set_sort_order_from_metadata_and_preferences (list_view);
set_zoom_level_from_metadata_and_preferences (list_view);
@@ -1894,7 +1893,7 @@ fm_list_view_begin_loading (NautilusView *view)
}
static void
-stop_cell_editing (FMListView *list_view)
+stop_cell_editing (NautilusListView *list_view)
{
GtkTreeViewColumn *column;
@@ -1910,27 +1909,27 @@ stop_cell_editing (FMListView *list_view)
}
static void
-fm_list_view_clear (NautilusView *view)
+nautilus_list_view_clear (NautilusView *view)
{
- FMListView *list_view;
+ NautilusListView *list_view;
- list_view = FM_LIST_VIEW (view);
+ list_view = NAUTILUS_LIST_VIEW (view);
if (list_view->details->model != NULL) {
stop_cell_editing (list_view);
- fm_list_model_clear (list_view->details->model);
+ nautilus_list_model_clear (list_view->details->model);
}
}
static void
-fm_list_view_rename_callback (NautilusFile *file,
- GFile *result_location,
- GError *error,
- gpointer callback_data)
+nautilus_list_view_rename_callback (NautilusFile *file,
+ GFile *result_location,
+ GError *error,
+ gpointer callback_data)
{
- FMListView *view;
+ NautilusListView *view;
- view = FM_LIST_VIEW (callback_data);
+ view = NAUTILUS_LIST_VIEW (callback_data);
if (view->details->renaming_file) {
view->details->rename_done = TRUE;
@@ -1950,15 +1949,15 @@ fm_list_view_rename_callback (NautilusFile *file,
static void
-fm_list_view_file_changed (NautilusView *view, NautilusFile *file, NautilusDirectory *directory)
+nautilus_list_view_file_changed (NautilusView *view, NautilusFile *file, NautilusDirectory *directory)
{
- FMListView *listview;
+ NautilusListView *listview;
GtkTreeIter iter;
GtkTreePath *file_path;
- listview = FM_LIST_VIEW (view);
+ listview = NAUTILUS_LIST_VIEW (view);
- fm_list_model_file_changed (listview->details->model, file, directory);
+ nautilus_list_model_file_changed (listview->details->model, file, directory);
if (listview->details->renaming_file != NULL &&
file == listview->details->renaming_file &&
@@ -1967,7 +1966,7 @@ fm_list_view_file_changed (NautilusView *view, NautilusFile *file, NautilusDirec
* the tree-view changes above could have resorted the list, so
* scroll to the new position
*/
- if (fm_list_model_get_tree_iter_from_file (listview->details->model, file, directory, &iter)) {
+ if (nautilus_list_model_get_tree_iter_from_file (listview->details->model, file, directory, &iter)) {
file_path = gtk_tree_model_get_path (GTK_TREE_MODEL (listview->details->model), &iter);
gtk_tree_view_scroll_to_cell (listview->details->tree_view,
file_path, NULL,
@@ -1981,7 +1980,7 @@ fm_list_view_file_changed (NautilusView *view, NautilusFile *file, NautilusDirec
}
static void
-fm_list_view_get_selection_foreach_func (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
+nautilus_list_view_get_selection_foreach_func (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
{
GList **list;
NautilusFile *file;
@@ -1989,7 +1988,7 @@ fm_list_view_get_selection_foreach_func (GtkTreeModel *model, GtkTreePath *path,
list = data;
gtk_tree_model_get (model, iter,
- FM_LIST_MODEL_FILE_COLUMN, &file,
+ NAUTILUS_LIST_MODEL_FILE_COLUMN, &file,
-1);
if (file != NULL) {
@@ -1998,20 +1997,20 @@ fm_list_view_get_selection_foreach_func (GtkTreeModel *model, GtkTreePath *path,
}
static GList *
-fm_list_view_get_selection (NautilusView *view)
+nautilus_list_view_get_selection (NautilusView *view)
{
GList *list;
list = NULL;
- gtk_tree_selection_selected_foreach (gtk_tree_view_get_selection (FM_LIST_VIEW (view)->details->tree_view),
- fm_list_view_get_selection_foreach_func, &list);
+ gtk_tree_selection_selected_foreach (gtk_tree_view_get_selection (NAUTILUS_LIST_VIEW (view)->details->tree_view),
+ nautilus_list_view_get_selection_foreach_func, &list);
return g_list_reverse (list);
}
static void
-fm_list_view_get_selection_for_file_transfer_foreach_func (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
+nautilus_list_view_get_selection_for_file_transfer_foreach_func (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
{
NautilusFile *file;
struct SelectionForeachData *selection_data;
@@ -2020,7 +2019,7 @@ fm_list_view_get_selection_for_file_transfer_foreach_func (GtkTreeModel *model,
selection_data = data;
gtk_tree_model_get (model, iter,
- FM_LIST_MODEL_FILE_COLUMN, &file,
+ NAUTILUS_LIST_MODEL_FILE_COLUMN, &file,
-1);
if (file != NULL) {
@@ -2044,15 +2043,15 @@ fm_list_view_get_selection_for_file_transfer_foreach_func (GtkTreeModel *model,
static GList *
-fm_list_view_get_selection_for_file_transfer (NautilusView *view)
+nautilus_list_view_get_selection_for_file_transfer (NautilusView *view)
{
struct SelectionForeachData selection_data;
selection_data.list = NULL;
- selection_data.selection = gtk_tree_view_get_selection (FM_LIST_VIEW (view)->details->tree_view);
+ selection_data.selection = gtk_tree_view_get_selection (NAUTILUS_LIST_VIEW (view)->details->tree_view);
gtk_tree_selection_selected_foreach (selection_data.selection,
- fm_list_view_get_selection_for_file_transfer_foreach_func, &selection_data);
+ nautilus_list_view_get_selection_for_file_transfer_foreach_func, &selection_data);
return g_list_reverse (selection_data.list);
}
@@ -2061,25 +2060,25 @@ fm_list_view_get_selection_for_file_transfer (NautilusView *view)
static guint
-fm_list_view_get_item_count (NautilusView *view)
+nautilus_list_view_get_item_count (NautilusView *view)
{
- g_return_val_if_fail (FM_IS_LIST_VIEW (view), 0);
+ g_return_val_if_fail (NAUTILUS_IS_LIST_VIEW (view), 0);
- return fm_list_model_get_length (FM_LIST_VIEW (view)->details->model);
+ return nautilus_list_model_get_length (NAUTILUS_LIST_VIEW (view)->details->model);
}
static gboolean
-fm_list_view_is_empty (NautilusView *view)
+nautilus_list_view_is_empty (NautilusView *view)
{
- return fm_list_model_is_empty (FM_LIST_VIEW (view)->details->model);
+ return nautilus_list_model_is_empty (NAUTILUS_LIST_VIEW (view)->details->model);
}
static void
-fm_list_view_end_file_changes (NautilusView *view)
+nautilus_list_view_end_file_changes (NautilusView *view)
{
- FMListView *list_view;
+ NautilusListView *list_view;
- list_view = FM_LIST_VIEW (view);
+ list_view = NAUTILUS_LIST_VIEW (view);
if (list_view->details->new_selection_path) {
gtk_tree_view_set_cursor (list_view->details->tree_view,
@@ -2091,23 +2090,23 @@ fm_list_view_end_file_changes (NautilusView *view)
}
static void
-fm_list_view_remove_file (NautilusView *view, NautilusFile *file, NautilusDirectory *directory)
+nautilus_list_view_remove_file (NautilusView *view, NautilusFile *file, NautilusDirectory *directory)
{
GtkTreePath *path;
GtkTreePath *file_path;
GtkTreeIter iter;
GtkTreeIter temp_iter;
GtkTreeRowReference* row_reference;
- FMListView *list_view;
+ NautilusListView *list_view;
GtkTreeModel* tree_model;
GtkTreeSelection *selection;
path = NULL;
row_reference = NULL;
- list_view = FM_LIST_VIEW (view);
+ list_view = NAUTILUS_LIST_VIEW (view);
tree_model = GTK_TREE_MODEL(list_view->details->model);
- if (fm_list_model_get_tree_iter_from_file (list_view->details->model, file, directory, &iter)) {
+ if (nautilus_list_model_get_tree_iter_from_file (list_view->details->model, file, directory, &iter)) {
selection = gtk_tree_view_get_selection (list_view->details->tree_view);
file_path = gtk_tree_model_get_path (tree_model, &iter);
@@ -2132,7 +2131,7 @@ fm_list_view_remove_file (NautilusView *view, NautilusFile *file, NautilusDirect
gtk_tree_path_free (file_path);
- fm_list_model_remove_file (list_view->details->model, file, directory);
+ nautilus_list_model_remove_file (list_view->details->model, file, directory);
if (gtk_tree_row_reference_valid (row_reference)) {
if (list_view->details->new_selection_path) {
@@ -2150,15 +2149,15 @@ fm_list_view_remove_file (NautilusView *view, NautilusFile *file, NautilusDirect
}
static void
-fm_list_view_set_selection (NautilusView *view, GList *selection)
+nautilus_list_view_set_selection (NautilusView *view, GList *selection)
{
- FMListView *list_view;
+ NautilusListView *list_view;
GtkTreeSelection *tree_selection;
GList *node;
GList *iters, *l;
NautilusFile *file;
- list_view = FM_LIST_VIEW (view);
+ list_view = NAUTILUS_LIST_VIEW (view);
tree_selection = gtk_tree_view_get_selection (list_view->details->tree_view);
g_signal_handlers_block_by_func (tree_selection, list_selection_changed_callback, view);
@@ -2166,7 +2165,7 @@ fm_list_view_set_selection (NautilusView *view, GList *selection)
gtk_tree_selection_unselect_all (tree_selection);
for (node = selection; node != NULL; node = node->next) {
file = node->data;
- iters = fm_list_model_get_all_iters_for_file (list_view->details->model, file);
+ iters = nautilus_list_model_get_all_iters_for_file (list_view->details->model, file);
for (l = iters; l != NULL; l = l->next) {
gtk_tree_selection_select_iter (tree_selection,
@@ -2180,28 +2179,28 @@ fm_list_view_set_selection (NautilusView *view, GList *selection)
}
static void
-fm_list_view_invert_selection (NautilusView *view)
+nautilus_list_view_invert_selection (NautilusView *view)
{
- FMListView *list_view;
+ NautilusListView *list_view;
GtkTreeSelection *tree_selection;
GList *node;
GList *iters, *l;
NautilusFile *file;
GList *selection = NULL;
- list_view = FM_LIST_VIEW (view);
+ list_view = NAUTILUS_LIST_VIEW (view);
tree_selection = gtk_tree_view_get_selection (list_view->details->tree_view);
g_signal_handlers_block_by_func (tree_selection, list_selection_changed_callback, view);
gtk_tree_selection_selected_foreach (tree_selection,
- fm_list_view_get_selection_foreach_func, &selection);
+ nautilus_list_view_get_selection_foreach_func, &selection);
gtk_tree_selection_select_all (tree_selection);
for (node = selection; node != NULL; node = node->next) {
file = node->data;
- iters = fm_list_model_get_all_iters_for_file (list_view->details->model, file);
+ iters = nautilus_list_model_get_all_iters_for_file (list_view->details->model, file);
for (l = iters; l != NULL; l = l->next) {
gtk_tree_selection_unselect_iter (tree_selection,
@@ -2217,9 +2216,9 @@ fm_list_view_invert_selection (NautilusView *view)
}
static void
-fm_list_view_select_all (NautilusView *view)
+nautilus_list_view_select_all (NautilusView *view)
{
- gtk_tree_selection_select_all (gtk_tree_view_get_selection (FM_LIST_VIEW (view)->details->tree_view));
+ gtk_tree_selection_select_all (gtk_tree_view_get_selection (NAUTILUS_LIST_VIEW (view)->details->tree_view));
}
static void
@@ -2232,7 +2231,7 @@ column_editor_response_callback (GtkWidget *dialog,
static void
column_chooser_changed_callback (NautilusColumnChooser *chooser,
- FMListView *view)
+ NautilusListView *view)
{
NautilusFile *file;
char **visible_columns;
@@ -2274,7 +2273,7 @@ column_chooser_changed_callback (NautilusColumnChooser *chooser,
static void
column_chooser_set_from_arrays (NautilusColumnChooser *chooser,
- FMListView *view,
+ NautilusListView *view,
char **visible_columns,
char **column_order)
{
@@ -2291,7 +2290,7 @@ column_chooser_set_from_arrays (NautilusColumnChooser *chooser,
static void
column_chooser_set_from_settings (NautilusColumnChooser *chooser,
- FMListView *view)
+ NautilusListView *view)
{
char **visible_columns;
char **column_order;
@@ -2308,7 +2307,7 @@ column_chooser_set_from_settings (NautilusColumnChooser *chooser,
static void
column_chooser_use_default_callback (NautilusColumnChooser *chooser,
- FMListView *view)
+ NautilusListView *view)
{
NautilusFile *file;
char **default_columns;
@@ -2340,7 +2339,7 @@ column_chooser_use_default_callback (NautilusColumnChooser *chooser,
}
static GtkWidget *
-create_column_editor (FMListView *view)
+create_column_editor (NautilusListView *view)
{
GtkWidget *window;
GtkWidget *label;
@@ -2411,9 +2410,9 @@ static void
action_visible_columns_callback (GtkAction *action,
gpointer callback_data)
{
- FMListView *list_view;
+ NautilusListView *list_view;
- list_view = FM_LIST_VIEW (callback_data);
+ list_view = NAUTILUS_LIST_VIEW (callback_data);
if (list_view->details->column_editor) {
gtk_window_present (GTK_WINDOW (list_view->details->column_editor));
@@ -2433,16 +2432,16 @@ static const GtkActionEntry list_view_entries[] = {
};
static void
-fm_list_view_merge_menus (NautilusView *view)
+nautilus_list_view_merge_menus (NautilusView *view)
{
- FMListView *list_view;
+ NautilusListView *list_view;
GtkUIManager *ui_manager;
GtkActionGroup *action_group;
const char *ui;
EEL_CALL_PARENT (NAUTILUS_VIEW_CLASS, merge_menus, (view));
- list_view = FM_LIST_VIEW (view);
+ list_view = NAUTILUS_LIST_VIEW (view);
ui_manager = nautilus_view_get_ui_manager (view);
@@ -2463,14 +2462,14 @@ fm_list_view_merge_menus (NautilusView *view)
}
static void
-fm_list_view_unmerge_menus (NautilusView *view)
+nautilus_list_view_unmerge_menus (NautilusView *view)
{
- FMListView *list_view;
+ NautilusListView *list_view;
GtkUIManager *ui_manager;
- list_view = FM_LIST_VIEW (view);
+ list_view = NAUTILUS_LIST_VIEW (view);
- NAUTILUS_VIEW_CLASS (fm_list_view_parent_class)->unmerge_menus (view);
+ NAUTILUS_VIEW_CLASS (nautilus_list_view_parent_class)->unmerge_menus (view);
ui_manager = nautilus_view_get_ui_manager (view);
if (ui_manager != NULL) {
@@ -2481,11 +2480,11 @@ fm_list_view_unmerge_menus (NautilusView *view)
}
static void
-fm_list_view_update_menus (NautilusView *view)
+nautilus_list_view_update_menus (NautilusView *view)
{
- FMListView *list_view;
+ NautilusListView *list_view;
- list_view = FM_LIST_VIEW (view);
+ list_view = NAUTILUS_LIST_VIEW (view);
/* don't update if the menus aren't ready */
if (!list_view->details->menus_ready) {
@@ -2497,7 +2496,7 @@ fm_list_view_update_menus (NautilusView *view)
/* Reset sort criteria and zoom level to match defaults */
static void
-fm_list_view_reset_to_defaults (NautilusView *view)
+nautilus_list_view_reset_to_defaults (NautilusView *view)
{
NautilusFile *file;
const gchar *default_sort_order;
@@ -2514,18 +2513,18 @@ fm_list_view_reset_to_defaults (NautilusView *view)
default_sort_order = get_default_sort_order (file, &default_sort_reversed);
gtk_tree_sortable_set_sort_column_id
- (GTK_TREE_SORTABLE (FM_LIST_VIEW (view)->details->model),
- fm_list_model_get_sort_column_id_from_attribute (FM_LIST_VIEW (view)->details->model,
+ (GTK_TREE_SORTABLE (NAUTILUS_LIST_VIEW (view)->details->model),
+ nautilus_list_model_get_sort_column_id_from_attribute (NAUTILUS_LIST_VIEW (view)->details->model,
g_quark_from_string (default_sort_order)),
default_sort_reversed ? GTK_SORT_DESCENDING : GTK_SORT_ASCENDING);
- fm_list_view_set_zoom_level (FM_LIST_VIEW (view), get_default_zoom_level (), FALSE);
- set_columns_settings_from_metadata_and_preferences (FM_LIST_VIEW (view));
+ nautilus_list_view_set_zoom_level (NAUTILUS_LIST_VIEW (view), get_default_zoom_level (), FALSE);
+ set_columns_settings_from_metadata_and_preferences (NAUTILUS_LIST_VIEW (view));
}
static void
-fm_list_view_scale_font_size (FMListView *view,
- NautilusZoomLevel new_level)
+nautilus_list_view_scale_font_size (NautilusListView *view,
+ NautilusZoomLevel new_level)
{
GList *l;
static gboolean first_time = TRUE;
@@ -2559,14 +2558,14 @@ fm_list_view_scale_font_size (FMListView *view,
}
static void
-fm_list_view_set_zoom_level (FMListView *view,
- NautilusZoomLevel new_level,
- gboolean always_emit)
+nautilus_list_view_set_zoom_level (NautilusListView *view,
+ NautilusZoomLevel new_level,
+ gboolean always_emit)
{
int icon_size;
int column;
- g_return_if_fail (FM_IS_LIST_VIEW (view));
+ g_return_if_fail (NAUTILUS_IS_LIST_VIEW (view));
g_return_if_fail (new_level >= NAUTILUS_ZOOM_LEVEL_SMALLEST &&
new_level <= NAUTILUS_ZOOM_LEVEL_LARGEST);
@@ -2587,14 +2586,14 @@ fm_list_view_set_zoom_level (FMListView *view,
new_level);
/* Select correctly scaled icons. */
- column = fm_list_model_get_column_id_from_zoom_level (new_level);
+ column = nautilus_list_model_get_column_id_from_zoom_level (new_level);
gtk_tree_view_column_set_attributes (view->details->file_name_column,
GTK_CELL_RENDERER (view->details->pixbuf_cell),
"pixbuf", column,
NULL);
/* Scale text. */
- fm_list_view_scale_font_size (view, new_level);
+ nautilus_list_view_scale_font_size (view, new_level);
/* Make all rows the same size. */
icon_size = nautilus_get_icon_size_for_zoom_level (new_level);
@@ -2605,85 +2604,85 @@ fm_list_view_set_zoom_level (FMListView *view,
}
static void
-fm_list_view_bump_zoom_level (NautilusView *view, int zoom_increment)
+nautilus_list_view_bump_zoom_level (NautilusView *view, int zoom_increment)
{
- FMListView *list_view;
+ NautilusListView *list_view;
gint new_level;
- g_return_if_fail (FM_IS_LIST_VIEW (view));
+ g_return_if_fail (NAUTILUS_IS_LIST_VIEW (view));
- list_view = FM_LIST_VIEW (view);
+ list_view = NAUTILUS_LIST_VIEW (view);
new_level = list_view->details->zoom_level + zoom_increment;
if (new_level >= NAUTILUS_ZOOM_LEVEL_SMALLEST &&
new_level <= NAUTILUS_ZOOM_LEVEL_LARGEST) {
- fm_list_view_set_zoom_level (list_view, new_level, FALSE);
+ nautilus_list_view_set_zoom_level (list_view, new_level, FALSE);
}
}
static NautilusZoomLevel
-fm_list_view_get_zoom_level (NautilusView *view)
+nautilus_list_view_get_zoom_level (NautilusView *view)
{
- FMListView *list_view;
+ NautilusListView *list_view;
- g_return_val_if_fail (FM_IS_LIST_VIEW (view), NAUTILUS_ZOOM_LEVEL_STANDARD);
+ g_return_val_if_fail (NAUTILUS_IS_LIST_VIEW (view), NAUTILUS_ZOOM_LEVEL_STANDARD);
- list_view = FM_LIST_VIEW (view);
+ list_view = NAUTILUS_LIST_VIEW (view);
return list_view->details->zoom_level;
}
static void
-fm_list_view_zoom_to_level (NautilusView *view,
- NautilusZoomLevel zoom_level)
+nautilus_list_view_zoom_to_level (NautilusView *view,
+ NautilusZoomLevel zoom_level)
{
- FMListView *list_view;
+ NautilusListView *list_view;
- g_return_if_fail (FM_IS_LIST_VIEW (view));
+ g_return_if_fail (NAUTILUS_IS_LIST_VIEW (view));
- list_view = FM_LIST_VIEW (view);
+ list_view = NAUTILUS_LIST_VIEW (view);
- fm_list_view_set_zoom_level (list_view, zoom_level, FALSE);
+ nautilus_list_view_set_zoom_level (list_view, zoom_level, FALSE);
}
static void
-fm_list_view_restore_default_zoom_level (NautilusView *view)
+nautilus_list_view_restore_default_zoom_level (NautilusView *view)
{
- FMListView *list_view;
+ NautilusListView *list_view;
- g_return_if_fail (FM_IS_LIST_VIEW (view));
+ g_return_if_fail (NAUTILUS_IS_LIST_VIEW (view));
- list_view = FM_LIST_VIEW (view);
+ list_view = NAUTILUS_LIST_VIEW (view);
- fm_list_view_set_zoom_level (list_view, get_default_zoom_level (), FALSE);
+ nautilus_list_view_set_zoom_level (list_view, get_default_zoom_level (), FALSE);
}
static gboolean
-fm_list_view_can_zoom_in (NautilusView *view)
+nautilus_list_view_can_zoom_in (NautilusView *view)
{
- g_return_val_if_fail (FM_IS_LIST_VIEW (view), FALSE);
+ g_return_val_if_fail (NAUTILUS_IS_LIST_VIEW (view), FALSE);
- return FM_LIST_VIEW (view)->details->zoom_level < NAUTILUS_ZOOM_LEVEL_LARGEST;
+ return NAUTILUS_LIST_VIEW (view)->details->zoom_level < NAUTILUS_ZOOM_LEVEL_LARGEST;
}
static gboolean
-fm_list_view_can_zoom_out (NautilusView *view)
+nautilus_list_view_can_zoom_out (NautilusView *view)
{
- g_return_val_if_fail (FM_IS_LIST_VIEW (view), FALSE);
+ g_return_val_if_fail (NAUTILUS_IS_LIST_VIEW (view), FALSE);
- return FM_LIST_VIEW (view)->details->zoom_level > NAUTILUS_ZOOM_LEVEL_SMALLEST;
+ return NAUTILUS_LIST_VIEW (view)->details->zoom_level > NAUTILUS_ZOOM_LEVEL_SMALLEST;
}
static void
-fm_list_view_start_renaming_file (NautilusView *view,
- NautilusFile *file,
- gboolean select_all)
+nautilus_list_view_start_renaming_file (NautilusView *view,
+ NautilusFile *file,
+ gboolean select_all)
{
- FMListView *list_view;
+ NautilusListView *list_view;
GtkTreeIter iter;
GtkTreePath *path;
- list_view = FM_LIST_VIEW (view);
+ list_view = NAUTILUS_LIST_VIEW (view);
/* Select all if we are in renaming mode already */
if (list_view->details->file_name_column && list_view->details->editable_widget) {
@@ -2693,7 +2692,7 @@ fm_list_view_start_renaming_file (NautilusView *view,
return;
}
- if (!fm_list_model_get_first_iter_for_file (list_view->details->model, file, &iter)) {
+ if (!nautilus_list_model_get_first_iter_for_file (list_view->details->model, file, &iter)) {
return;
}
@@ -2720,15 +2719,15 @@ fm_list_view_start_renaming_file (NautilusView *view,
}
static void
-fm_list_view_click_policy_changed (NautilusView *directory_view)
+nautilus_list_view_click_policy_changed (NautilusView *directory_view)
{
GdkWindow *win;
GdkDisplay *display;
- FMListView *view;
+ NautilusListView *view;
GtkTreeIter iter;
GtkTreeView *tree;
- view = FM_LIST_VIEW (directory_view);
+ view = NAUTILUS_LIST_VIEW (directory_view);
/* ensure that we unset the hand cursor and refresh underlined rows */
if (click_policy_auto_value == NAUTILUS_CLICK_POLICY_DOUBLE) {
@@ -2765,9 +2764,9 @@ fm_list_view_click_policy_changed (NautilusView *directory_view)
static void
default_sort_order_changed_callback (gpointer callback_data)
{
- FMListView *list_view;
+ NautilusListView *list_view;
- list_view = FM_LIST_VIEW (callback_data);
+ list_view = NAUTILUS_LIST_VIEW (callback_data);
set_sort_order_from_metadata_and_preferences (list_view);
}
@@ -2775,9 +2774,9 @@ default_sort_order_changed_callback (gpointer callback_data)
static void
default_zoom_level_changed_callback (gpointer callback_data)
{
- FMListView *list_view;
+ NautilusListView *list_view;
- list_view = FM_LIST_VIEW (callback_data);
+ list_view = NAUTILUS_LIST_VIEW (callback_data);
set_zoom_level_from_metadata_and_preferences (list_view);
}
@@ -2785,9 +2784,9 @@ default_zoom_level_changed_callback (gpointer callback_data)
static void
default_visible_columns_changed_callback (gpointer callback_data)
{
- FMListView *list_view;
+ NautilusListView *list_view;
- list_view = FM_LIST_VIEW (callback_data);
+ list_view = NAUTILUS_LIST_VIEW (callback_data);
set_columns_settings_from_metadata_and_preferences (list_view);
}
@@ -2795,47 +2794,47 @@ default_visible_columns_changed_callback (gpointer callback_data)
static void
default_column_order_changed_callback (gpointer callback_data)
{
- FMListView *list_view;
+ NautilusListView *list_view;
- list_view = FM_LIST_VIEW (callback_data);
+ list_view = NAUTILUS_LIST_VIEW (callback_data);
set_columns_settings_from_metadata_and_preferences (list_view);
}
static void
-fm_list_view_sort_directories_first_changed (NautilusView *view)
+nautilus_list_view_sort_directories_first_changed (NautilusView *view)
{
- FMListView *list_view;
+ NautilusListView *list_view;
- list_view = FM_LIST_VIEW (view);
+ list_view = NAUTILUS_LIST_VIEW (view);
- fm_list_model_set_should_sort_directories_first (list_view->details->model,
+ nautilus_list_model_set_should_sort_directories_first (list_view->details->model,
nautilus_view_should_sort_directories_first (view));
}
static int
-fm_list_view_compare_files (NautilusView *view, NautilusFile *file1, NautilusFile *file2)
+nautilus_list_view_compare_files (NautilusView *view, NautilusFile *file1, NautilusFile *file2)
{
- FMListView *list_view;
+ NautilusListView *list_view;
- list_view = FM_LIST_VIEW (view);
- return fm_list_model_compare_func (list_view->details->model, file1, file2);
+ list_view = NAUTILUS_LIST_VIEW (view);
+ return nautilus_list_model_compare_func (list_view->details->model, file1, file2);
}
static gboolean
-fm_list_view_using_manual_layout (NautilusView *view)
+nautilus_list_view_using_manual_layout (NautilusView *view)
{
- g_return_val_if_fail (FM_IS_LIST_VIEW (view), FALSE);
+ g_return_val_if_fail (NAUTILUS_IS_LIST_VIEW (view), FALSE);
return FALSE;
}
static void
-fm_list_view_dispose (GObject *object)
+nautilus_list_view_dispose (GObject *object)
{
- FMListView *list_view;
+ NautilusListView *list_view;
- list_view = FM_LIST_VIEW (object);
+ list_view = NAUTILUS_LIST_VIEW (object);
if (list_view->details->model) {
stop_cell_editing (list_view);
@@ -2863,11 +2862,11 @@ fm_list_view_dispose (GObject *object)
}
static void
-fm_list_view_finalize (GObject *object)
+nautilus_list_view_finalize (GObject *object)
{
- FMListView *list_view;
+ NautilusListView *list_view;
- list_view = FM_LIST_VIEW (object);
+ list_view = NAUTILUS_LIST_VIEW (object);
g_free (list_view->details->original_name);
list_view->details->original_name = NULL;
@@ -2912,14 +2911,14 @@ fm_list_view_finalize (GObject *object)
}
static char *
-fm_list_view_get_first_visible_file (NautilusView *view)
+nautilus_list_view_get_first_visible_file (NautilusView *view)
{
NautilusFile *file;
GtkTreePath *path;
GtkTreeIter iter;
- FMListView *list_view;
+ NautilusListView *list_view;
- list_view = FM_LIST_VIEW (view);
+ list_view = NAUTILUS_LIST_VIEW (view);
if (gtk_tree_view_get_path_at_pos (list_view->details->tree_view,
0, 0,
@@ -2931,7 +2930,7 @@ fm_list_view_get_first_visible_file (NautilusView *view)
gtk_tree_model_get (GTK_TREE_MODEL (list_view->details->model),
&iter,
- FM_LIST_MODEL_FILE_COLUMN, &file,
+ NAUTILUS_LIST_MODEL_FILE_COLUMN, &file,
-1);
if (file) {
char *uri;
@@ -2948,13 +2947,13 @@ fm_list_view_get_first_visible_file (NautilusView *view)
}
static void
-fm_list_view_scroll_to_file (FMListView *view,
- NautilusFile *file)
+nautilus_list_view_scroll_to_file (NautilusListView *view,
+ NautilusFile *file)
{
GtkTreePath *path;
GtkTreeIter iter;
- if (!fm_list_model_get_first_iter_for_file (view->details->model, file, &iter)) {
+ if (!nautilus_list_model_get_first_iter_for_file (view->details->model, file, &iter)) {
return;
}
@@ -2978,7 +2977,7 @@ list_view_scroll_to_file (NautilusView *view,
the directory if it has been removed since then */
file = nautilus_file_get_existing_by_uri (uri);
if (file != NULL) {
- fm_list_view_scroll_to_file (FM_LIST_VIEW (view), file);
+ nautilus_list_view_scroll_to_file (NAUTILUS_LIST_VIEW (view), file);
nautilus_file_unref (file);
}
}
@@ -2987,7 +2986,7 @@ list_view_scroll_to_file (NautilusView *view,
static void
list_view_notify_clipboard_info (NautilusClipboardMonitor *monitor,
NautilusClipboardInfo *info,
- FMListView *view)
+ NautilusListView *view)
{
/* this could be called as a result of _end_loading() being
* called after _dispose(), where the model is cleared.
@@ -2997,15 +2996,15 @@ list_view_notify_clipboard_info (NautilusClipboardMonitor *monitor,
}
if (info != NULL && info->cut) {
- fm_list_model_set_highlight_for_files (view->details->model, info->files);
+ nautilus_list_model_set_highlight_for_files (view->details->model, info->files);
} else {
- fm_list_model_set_highlight_for_files (view->details->model, NULL);
+ nautilus_list_model_set_highlight_for_files (view->details->model, NULL);
}
}
static void
-fm_list_view_end_loading (NautilusView *view,
- gboolean all_files_seen)
+nautilus_list_view_end_loading (NautilusView *view,
+ gboolean all_files_seen)
{
NautilusClipboardMonitor *monitor;
NautilusClipboardInfo *info;
@@ -3013,67 +3012,67 @@ fm_list_view_end_loading (NautilusView *view,
monitor = nautilus_clipboard_monitor_get ();
info = nautilus_clipboard_monitor_get_clipboard_info (monitor);
- list_view_notify_clipboard_info (monitor, info, FM_LIST_VIEW (view));
+ list_view_notify_clipboard_info (monitor, info, NAUTILUS_LIST_VIEW (view));
}
static void
real_set_is_active (NautilusView *view,
gboolean is_active)
{
- FM_LIST_VIEW (view)->details->active = is_active;
+ NAUTILUS_LIST_VIEW (view)->details->active = is_active;
- setup_background (FM_LIST_VIEW (view));
+ setup_background (NAUTILUS_LIST_VIEW (view));
}
static const char *
-fm_list_view_get_id (NautilusView *view)
+nautilus_list_view_get_id (NautilusView *view)
{
- return FM_LIST_VIEW_ID;
+ return NAUTILUS_LIST_VIEW_ID;
}
static void
-fm_list_view_class_init (FMListViewClass *class)
+nautilus_list_view_class_init (NautilusListViewClass *class)
{
NautilusViewClass *nautilus_view_class;
nautilus_view_class = NAUTILUS_VIEW_CLASS (class);
- G_OBJECT_CLASS (class)->dispose = fm_list_view_dispose;
- G_OBJECT_CLASS (class)->finalize = fm_list_view_finalize;
-
- nautilus_view_class->add_file = fm_list_view_add_file;
- nautilus_view_class->begin_loading = fm_list_view_begin_loading;
- nautilus_view_class->end_loading = fm_list_view_end_loading;
- nautilus_view_class->bump_zoom_level = fm_list_view_bump_zoom_level;
- nautilus_view_class->can_zoom_in = fm_list_view_can_zoom_in;
- nautilus_view_class->can_zoom_out = fm_list_view_can_zoom_out;
- nautilus_view_class->click_policy_changed = fm_list_view_click_policy_changed;
- nautilus_view_class->clear = fm_list_view_clear;
- nautilus_view_class->file_changed = fm_list_view_file_changed;
- nautilus_view_class->get_selection = fm_list_view_get_selection;
- nautilus_view_class->get_selection_for_file_transfer = fm_list_view_get_selection_for_file_transfer;
- nautilus_view_class->get_item_count = fm_list_view_get_item_count;
- nautilus_view_class->is_empty = fm_list_view_is_empty;
- nautilus_view_class->remove_file = fm_list_view_remove_file;
- nautilus_view_class->merge_menus = fm_list_view_merge_menus;
- nautilus_view_class->unmerge_menus = fm_list_view_unmerge_menus;
- nautilus_view_class->update_menus = fm_list_view_update_menus;
- nautilus_view_class->reset_to_defaults = fm_list_view_reset_to_defaults;
- nautilus_view_class->restore_default_zoom_level = fm_list_view_restore_default_zoom_level;
- nautilus_view_class->reveal_selection = fm_list_view_reveal_selection;
- nautilus_view_class->select_all = fm_list_view_select_all;
- nautilus_view_class->set_selection = fm_list_view_set_selection;
- nautilus_view_class->invert_selection = fm_list_view_invert_selection;
- nautilus_view_class->compare_files = fm_list_view_compare_files;
- nautilus_view_class->sort_directories_first_changed = fm_list_view_sort_directories_first_changed;
- nautilus_view_class->start_renaming_file = fm_list_view_start_renaming_file;
- nautilus_view_class->get_zoom_level = fm_list_view_get_zoom_level;
- nautilus_view_class->zoom_to_level = fm_list_view_zoom_to_level;
- nautilus_view_class->end_file_changes = fm_list_view_end_file_changes;
- nautilus_view_class->using_manual_layout = fm_list_view_using_manual_layout;
+ G_OBJECT_CLASS (class)->dispose = nautilus_list_view_dispose;
+ G_OBJECT_CLASS (class)->finalize = nautilus_list_view_finalize;
+
+ nautilus_view_class->add_file = nautilus_list_view_add_file;
+ nautilus_view_class->begin_loading = nautilus_list_view_begin_loading;
+ nautilus_view_class->end_loading = nautilus_list_view_end_loading;
+ nautilus_view_class->bump_zoom_level = nautilus_list_view_bump_zoom_level;
+ nautilus_view_class->can_zoom_in = nautilus_list_view_can_zoom_in;
+ nautilus_view_class->can_zoom_out = nautilus_list_view_can_zoom_out;
+ nautilus_view_class->click_policy_changed = nautilus_list_view_click_policy_changed;
+ nautilus_view_class->clear = nautilus_list_view_clear;
+ nautilus_view_class->file_changed = nautilus_list_view_file_changed;
+ nautilus_view_class->get_selection = nautilus_list_view_get_selection;
+ nautilus_view_class->get_selection_for_file_transfer = nautilus_list_view_get_selection_for_file_transfer;
+ nautilus_view_class->get_item_count = nautilus_list_view_get_item_count;
+ nautilus_view_class->is_empty = nautilus_list_view_is_empty;
+ nautilus_view_class->remove_file = nautilus_list_view_remove_file;
+ nautilus_view_class->merge_menus = nautilus_list_view_merge_menus;
+ nautilus_view_class->unmerge_menus = nautilus_list_view_unmerge_menus;
+ nautilus_view_class->update_menus = nautilus_list_view_update_menus;
+ nautilus_view_class->reset_to_defaults = nautilus_list_view_reset_to_defaults;
+ nautilus_view_class->restore_default_zoom_level = nautilus_list_view_restore_default_zoom_level;
+ nautilus_view_class->reveal_selection = nautilus_list_view_reveal_selection;
+ nautilus_view_class->select_all = nautilus_list_view_select_all;
+ nautilus_view_class->set_selection = nautilus_list_view_set_selection;
+ nautilus_view_class->invert_selection = nautilus_list_view_invert_selection;
+ nautilus_view_class->compare_files = nautilus_list_view_compare_files;
+ nautilus_view_class->sort_directories_first_changed = nautilus_list_view_sort_directories_first_changed;
+ nautilus_view_class->start_renaming_file = nautilus_list_view_start_renaming_file;
+ nautilus_view_class->get_zoom_level = nautilus_list_view_get_zoom_level;
+ nautilus_view_class->zoom_to_level = nautilus_list_view_zoom_to_level;
+ nautilus_view_class->end_file_changes = nautilus_list_view_end_file_changes;
+ nautilus_view_class->using_manual_layout = nautilus_list_view_using_manual_layout;
nautilus_view_class->set_is_active = real_set_is_active;
- nautilus_view_class->get_view_id = fm_list_view_get_id;
- nautilus_view_class->get_first_visible_file = fm_list_view_get_first_visible_file;
+ nautilus_view_class->get_view_id = nautilus_list_view_get_id;
+ nautilus_view_class->get_first_visible_file = nautilus_list_view_get_first_visible_file;
nautilus_view_class->scroll_to_file = list_view_scroll_to_file;
eel_g_settings_add_auto_enum (nautilus_preferences,
@@ -3097,9 +3096,9 @@ fm_list_view_class_init (FMListViewClass *class)
}
static void
-fm_list_view_init (FMListView *list_view)
+nautilus_list_view_init (NautilusListView *list_view)
{
- list_view->details = g_new0 (FMListViewDetails, 1);
+ list_view->details = g_new0 (NautilusListViewDetails, 1);
create_and_set_up_tree_view (list_view);
@@ -3124,9 +3123,9 @@ fm_list_view_init (FMListView *list_view)
G_CALLBACK (default_column_order_changed_callback),
list_view);
- fm_list_view_click_policy_changed (NAUTILUS_VIEW (list_view));
+ nautilus_list_view_click_policy_changed (NAUTILUS_VIEW (list_view));
- fm_list_view_sort_directories_first_changed (NAUTILUS_VIEW (list_view));
+ nautilus_list_view_sort_directories_first_changed (NAUTILUS_VIEW (list_view));
/* ensure that the zoom level is always set in begin_loading */
list_view->details->zoom_level = NAUTILUS_ZOOM_LEVEL_SMALLEST - 1;
@@ -3139,20 +3138,20 @@ fm_list_view_init (FMListView *list_view)
}
static NautilusView *
-fm_list_view_create (NautilusWindowSlot *slot)
+nautilus_list_view_create (NautilusWindowSlot *slot)
{
- FMListView *view;
+ NautilusListView *view;
- view = g_object_new (FM_TYPE_LIST_VIEW,
+ view = g_object_new (NAUTILUS_TYPE_LIST_VIEW,
"window-slot", slot,
NULL);
return NAUTILUS_VIEW (view);
}
static gboolean
-fm_list_view_supports_uri (const char *uri,
- GFileType file_type,
- const char *mime_type)
+nautilus_list_view_supports_uri (const char *uri,
+ GFileType file_type,
+ const char *mime_type)
{
if (file_type == G_FILE_TYPE_DIRECTORY) {
return TRUE;
@@ -3170,8 +3169,8 @@ fm_list_view_supports_uri (const char *uri,
return FALSE;
}
-static NautilusViewInfo fm_list_view = {
- FM_LIST_VIEW_ID,
+static NautilusViewInfo nautilus_list_view = {
+ NAUTILUS_LIST_VIEW_ID,
/* translators: this is used in the view selection dropdown
* of navigation windows and in the preferences dialog */
N_("List View"),
@@ -3180,24 +3179,24 @@ static NautilusViewInfo fm_list_view = {
N_("The list view encountered an error."),
N_("The list view encountered an error while starting up."),
N_("Display this location with the list view."),
- fm_list_view_create,
- fm_list_view_supports_uri
+ nautilus_list_view_create,
+ nautilus_list_view_supports_uri
};
void
-fm_list_view_register (void)
+nautilus_list_view_register (void)
{
- fm_list_view.view_combo_label = _(fm_list_view.view_combo_label);
- fm_list_view.view_menu_label_with_mnemonic = _(fm_list_view.view_menu_label_with_mnemonic);
- fm_list_view.error_label = _(fm_list_view.error_label);
- fm_list_view.startup_error_label = _(fm_list_view.startup_error_label);
- fm_list_view.display_location_label = _(fm_list_view.display_location_label);
+ nautilus_list_view.view_combo_label = _(nautilus_list_view.view_combo_label);
+ nautilus_list_view.view_menu_label_with_mnemonic = _(nautilus_list_view.view_menu_label_with_mnemonic);
+ nautilus_list_view.error_label = _(nautilus_list_view.error_label);
+ nautilus_list_view.startup_error_label = _(nautilus_list_view.startup_error_label);
+ nautilus_list_view.display_location_label = _(nautilus_list_view.display_location_label);
- nautilus_view_factory_register (&fm_list_view);
+ nautilus_view_factory_register (&nautilus_list_view);
}
GtkTreeView*
-fm_list_view_get_tree_view (FMListView *list_view)
+nautilus_list_view_get_tree_view (NautilusListView *list_view)
{
return list_view->details->tree_view;
}
diff --git a/src/file-manager/fm-list-view.h b/src/nautilus-list-view.h
similarity index 52%
rename from src/file-manager/fm-list-view.h
rename to src/nautilus-list-view.h
index ec0db46..fc5d266 100644
--- a/src/file-manager/fm-list-view.h
+++ b/src/nautilus-list-view.h
@@ -24,38 +24,38 @@
Anders Carlsson <andersca gnu org>
*/
-#ifndef FM_LIST_VIEW_H
-#define FM_LIST_VIEW_H
+#ifndef NAUTILUS_LIST_VIEW_H
+#define NAUTILUS_LIST_VIEW_H
#include "nautilus-view.h"
-#define FM_TYPE_LIST_VIEW fm_list_view_get_type()
-#define FM_LIST_VIEW(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST ((obj), FM_TYPE_LIST_VIEW, FMListView))
-#define FM_LIST_VIEW_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST ((klass), FM_TYPE_LIST_VIEW, FMListViewClass))
-#define FM_IS_LIST_VIEW(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FM_TYPE_LIST_VIEW))
-#define FM_IS_LIST_VIEW_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE ((klass), FM_TYPE_LIST_VIEW))
-#define FM_LIST_VIEW_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), FM_TYPE_LIST_VIEW, FMListViewClass))
+#define NAUTILUS_TYPE_LIST_VIEW nautilus_list_view_get_type()
+#define NAUTILUS_LIST_VIEW(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_LIST_VIEW, NautilusListView))
+#define NAUTILUS_LIST_VIEW_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_LIST_VIEW, NautilusListViewClass))
+#define NAUTILUS_IS_LIST_VIEW(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_LIST_VIEW))
+#define NAUTILUS_IS_LIST_VIEW_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_LIST_VIEW))
+#define NAUTILUS_LIST_VIEW_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), NAUTILUS_TYPE_LIST_VIEW, NautilusListViewClass))
-#define FM_LIST_VIEW_ID "OAFIID:Nautilus_File_Manager_List_View"
+#define NAUTILUS_LIST_VIEW_ID "OAFIID:Nautilus_File_Manager_List_View"
-typedef struct FMListViewDetails FMListViewDetails;
+typedef struct NautilusListViewDetails NautilusListViewDetails;
typedef struct {
NautilusView parent_instance;
- FMListViewDetails *details;
-} FMListView;
+ NautilusListViewDetails *details;
+} NautilusListView;
typedef struct {
NautilusViewClass parent_class;
-} FMListViewClass;
+} NautilusListViewClass;
-GType fm_list_view_get_type (void);
-void fm_list_view_register (void);
-GtkTreeView* fm_list_view_get_tree_view (FMListView *list_view);
+GType nautilus_list_view_get_type (void);
+void nautilus_list_view_register (void);
+GtkTreeView* nautilus_list_view_get_tree_view (NautilusListView *list_view);
-#endif /* FM_LIST_VIEW_H */
+#endif /* NAUTILUS_LIST_VIEW_H */
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index 38dea80..2562532 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -31,12 +31,12 @@
#include "nautilus-view.h"
-#include "file-manager/fm-list-view.h"
#include "file-manager/fm-properties-window.h"
#include "nautilus-actions.h"
#include "nautilus-desktop-icon-view.h"
#include "nautilus-error-reporting.h"
+#include "nautilus-list-view.h"
#include "nautilus-mime-actions.h"
#include "nautilus-src-marshal.h"
@@ -1827,7 +1827,7 @@ rename_file (NautilusView *view, NautilusFile *new_file)
to load the slow mimetype for the file, which leads to a
file_changed. So, before we delay we select the row.
*/
- if (FM_IS_LIST_VIEW (view)) {
+ if (NAUTILUS_IS_LIST_VIEW (view)) {
nautilus_view_select_file (view, new_file);
data = g_new (RenameData, 1);
@@ -3016,7 +3016,7 @@ done_loading (NautilusView *view,
nautilus_view_call_set_selection (view, selection);
view->details->selection_change_is_due_to_shell = FALSE;
- if (FM_IS_LIST_VIEW (view)) {
+ if (NAUTILUS_IS_LIST_VIEW (view)) {
/* HACK: We should be able to directly call reveal_selection here,
* but at this point the GtkTreeView hasn't allocated the new nodes
* yet, and it has a bug in the scroll calculation dealing with this
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
