/*
* Geeqie
* (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
FILE_COLUMN_POINTER = 0,
FILE_COLUMN_VERSION,
FILE_COLUMN_THUMB,
+ FILE_COLUMN_FORMATTED,
FILE_COLUMN_NAME,
FILE_COLUMN_SIDECARS,
FILE_COLUMN_SIZE,
FILE_COLUMN_DATE,
+ FILE_COLUMN_EXPANDED,
FILE_COLUMN_COLOR,
FILE_COLUMN_MARKS,
FILE_COLUMN_MARKS_LAST = FILE_COLUMN_MARKS + FILEDATA_MARKS_SIZE - 1,
FILE_VIEW_COLUMN_MARKS = 0,
FILE_VIEW_COLUMN_MARKS_LAST = FILE_VIEW_COLUMN_MARKS + FILEDATA_MARKS_SIZE - 1,
FILE_VIEW_COLUMN_THUMB,
- FILE_VIEW_COLUMN_NAME,
+ FILE_VIEW_COLUMN_FORMATTED,
FILE_VIEW_COLUMN_SIZE,
FILE_VIEW_COLUMN_DATE,
FILE_VIEW_COLUMN_COUNT
static gboolean vflist_row_is_selected(ViewFile *vf, FileData *fd);
static gboolean vflist_row_rename_cb(TreeEditData *td, const gchar *old, const gchar *new, gpointer data);
-static void vflist_populate_view(ViewFile *vf);
+static void vflist_populate_view(ViewFile *vf, gboolean force);
static gboolean vflist_is_multiline(ViewFile *vf);
+static void vflist_set_expanded(ViewFile *vf, GtkTreeIter *iter, gboolean expanded);
/*
{
FileData *fd;
gtk_tree_model_get(model, iter, FILE_COLUMN_POINTER, &fd, -1);
+
+ /* it seems that gtk_tree_store_clear may call some callbacks
+ that use the column. Set the pointer to NULL to be safe. */
+ gtk_tree_store_set(GTK_TREE_STORE(model), iter, FILE_COLUMN_POINTER, NULL, -1);
file_data_unref(fd);
return FALSE;
}
gtk_tree_path_free(tpath);
}
-
+#if 0
static gint vflist_column_idx(ViewFile *vf, gint store_idx)
{
GList *columns, *work;
g_list_free(columns);
return i;
}
-
+#endif
/*
*-----------------------------------------------------------------------------
{
ViewFile *vf = data;
GList *list = NULL;
- gchar *uri_text = NULL;
- gint total;
if (!VFLIST(vf)->click_fd) return;
}
if (!list) return;
-
- uri_text = uri_text_from_filelist(list, &total, (info == TARGET_TEXT_PLAIN));
+ uri_selection_data_set_uris_from_filelist(selection_data, list);
filelist_free(list);
-
- DEBUG_1("%s", uri_text);
-
- gtk_selection_data_set(selection_data, selection_data->target,
- 8, (guchar *)uri_text, total);
- g_free(uri_text);
}
static void vflist_dnd_begin(GtkWidget *widget, GdkDragContext *context, gpointer data)
vflist_color_set(vf, VFLIST(vf)->click_fd, FALSE);
- if (context->action == GDK_ACTION_MOVE)
+ if (gdk_drag_context_get_selected_action(context) == GDK_ACTION_MOVE)
{
vf_refresh(vf);
}
if (fd) {
/* Add keywords to file */
- gchar *str = g_strndup((gchar *)selection->data, selection->length);
+ gchar *str = gtk_selection_data_get_text(selection);
GList *kw_list = string_to_keywords_list(str);
metadata_append_list(fd, KEYWORD_KEY, kw_list);
*-----------------------------------------------------------------------------
*/
-GList *vflist_pop_menu_file_list(ViewFile *vf)
+GList *vflist_selection_get_one(ViewFile *vf, FileData *fd)
{
- GList *list;
- if (!VFLIST(vf)->click_fd) return NULL;
+ GList *list = g_list_append(NULL, file_data_ref(fd));
- if (vflist_row_is_selected(vf, VFLIST(vf)->click_fd))
- {
- return vf_selection_get_list(vf);
- }
-
- list = g_list_append(NULL, file_data_ref(VFLIST(vf)->click_fd));
-
- if (VFLIST(vf)->click_fd->sidecar_files)
+ if (fd->sidecar_files)
{
/* check if the row is expanded */
GtkTreeModel *store;
GtkTreeIter iter;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview));
- if (vflist_find_row(vf, VFLIST(vf)->click_fd, &iter) >= 0)
+ if (vflist_find_row(vf, fd, &iter) >= 0)
{
GtkTreePath *tpath;
if (!gtk_tree_view_row_expanded(GTK_TREE_VIEW(vf->listview), tpath))
{
/* unexpanded - add whole group */
- GList *work = VFLIST(vf)->click_fd->sidecar_files;
+ GList *work = fd->sidecar_files;
while (work)
{
FileData *sfd = work->data;
return list;
}
+GList *vflist_pop_menu_file_list(ViewFile *vf)
+{
+ if (!VFLIST(vf)->click_fd) return NULL;
+
+ if (vflist_row_is_selected(vf, VFLIST(vf)->click_fd))
+ {
+ return vf_selection_get_list(vf);
+ }
+ return vflist_selection_get_one(vf, VFLIST(vf)->click_fd);
+}
+
+
void vflist_pop_menu_view_cb(GtkWidget *widget, gpointer data)
{
ViewFile *vf = data;
tpath = gtk_tree_model_get_path(store, &iter);
tree_edit_by_path(GTK_TREE_VIEW(vf->listview), tpath,
- vflist_column_idx(vf, FILE_COLUMN_NAME), VFLIST(vf)->click_fd->name,
+ FILE_VIEW_COLUMN_FORMATTED, VFLIST(vf)->click_fd->name,
vflist_row_rename_cb, vf);
gtk_tree_path_free(tpath);
}
vflist_color_set(vf, VFLIST(vf)->click_fd, FALSE);
vf_refresh(vf);
+ gtk_tree_view_columns_autosize(GTK_TREE_VIEW(vf->listview));
}
void vflist_popup_destroy_cb(GtkWidget *widget, gpointer data)
else
{
gchar *old_path = g_build_filename(vf->dir_fd->path, old, NULL);
- FileData *fd = file_data_new_simple(old_path); /* get the fd from cache */
+ FileData *fd = file_data_new_group(old_path); /* get the fd from cache */
file_util_rename_simple(fd, new_path, vf->listview);
file_data_unref(fd);
g_free(old_path);
ViewFile *vf = data;
GtkTreePath *tpath;
- if (event->keyval != GDK_Menu) return FALSE;
+ if (event->keyval != GDK_KEY_Menu) return FALSE;
gtk_tree_view_get_cursor(GTK_TREE_VIEW(vf->listview), &tpath, NULL);
if (tpath)
return TRUE;
}
+static void vflist_expand_cb(GtkTreeView *tree_view, GtkTreeIter *iter, GtkTreePath *path, gpointer data)
+{
+ ViewFile *vf = data;
+ vflist_set_expanded(vf, iter, TRUE);
+}
+
+static void vflist_collapse_cb(GtkTreeView *tree_view, GtkTreeIter *iter, GtkTreePath *path, gpointer data)
+{
+ ViewFile *vf = data;
+ vflist_set_expanded(vf, iter, FALSE);
+}
+
/*
*-----------------------------------------------------------------------------
* misc
return TRUE;
}
*/
+
+static gchar* vflist_get_formatted(ViewFile *vf, const gchar *name, const gchar *sidecars, const gchar *size, const gchar *time, gboolean expanded)
+ {
+ gboolean multiline = vflist_is_multiline(vf);
+ gchar *text;
+
+ if (multiline)
+ {
+ text = g_strdup_printf("%s %s\n%s\n%s", name, expanded ? "" : sidecars, size, time);
+ }
+ else
+ {
+ text = g_strdup_printf("%s %s", name, expanded ? "" : sidecars);
+ }
+ return text;
+}
+
+static void vflist_set_expanded(ViewFile *vf, GtkTreeIter *iter, gboolean expanded)
+{
+ GtkTreeStore *store;
+ gchar *name;
+ gchar *sidecars;
+ gchar *size;
+ gchar *time;
+ gchar *formatted;
+
+ store = GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)));
+
+ gtk_tree_model_get(GTK_TREE_MODEL(store), iter,
+ FILE_COLUMN_NAME, &name,
+ FILE_COLUMN_SIDECARS, &sidecars,
+ FILE_COLUMN_SIZE, &size,
+ FILE_COLUMN_DATE, &time,
+ -1);
+ formatted = vflist_get_formatted(vf, name, sidecars, size, time, expanded);
+
+ gtk_tree_store_set(store, iter, FILE_COLUMN_FORMATTED, formatted,
+ FILE_COLUMN_EXPANDED, expanded,
+ -1);
+ g_free(time);
+ g_free(size);
+ g_free(sidecars);
+ g_free(name);
+ g_free(formatted);
+}
+
static void vflist_setup_iter(ViewFile *vf, GtkTreeStore *store, GtkTreeIter *iter, FileData *fd)
{
gchar *size;
const gchar *time = text_from_time(fd->date);
gchar *link = islink(fd->path) ? GQ_LINK_STR : "";
const gchar *disabled_grouping;
+ gchar *formatted;
+ gboolean expanded = FALSE;
+
+ if (fd->sidecar_files) /* expanded has no effect on files without sidecars */
+ {
+ gtk_tree_model_get(GTK_TREE_MODEL(store), iter, FILE_COLUMN_EXPANDED, &expanded, -1);
+ }
sidecars = file_data_sc_list_to_string(fd);
name = g_strdup_printf("%s%s%s", link, fd->name, disabled_grouping);
size = text_from_size(fd->size);
+ formatted = vflist_get_formatted(vf, name, sidecars, size, time, expanded);
+
gtk_tree_store_set(store, iter, FILE_COLUMN_POINTER, fd,
FILE_COLUMN_VERSION, fd->version,
FILE_COLUMN_THUMB, fd->thumb_pixbuf,
+ FILE_COLUMN_FORMATTED, formatted,
FILE_COLUMN_SIDECARS, sidecars,
FILE_COLUMN_NAME, name,
FILE_COLUMN_SIZE, size,
g_free(size);
g_free(sidecars);
g_free(name);
+ g_free(formatted);
}
-static void vflist_setup_iter_recursive(ViewFile *vf, GtkTreeStore *store, GtkTreeIter *parent_iter, GList *list, GList *selected)
+static void vflist_setup_iter_recursive(ViewFile *vf, GtkTreeStore *store, GtkTreeIter *parent_iter, GList *list, GList *selected, gboolean force)
{
GList *work;
GtkTreeIter iter;
if (valid)
{
- num_ordered++;
gtk_tree_model_get(GTK_TREE_MODEL(store), &iter,
FILE_COLUMN_POINTER, &old_fd,
FILE_COLUMN_VERSION, &old_version,
if (valid)
{
+ num_ordered++;
gtk_tree_store_insert_before(store, &new, parent_iter, &iter);
}
else
}
vflist_setup_iter(vf, store, &new, file_data_ref(fd));
- vflist_setup_iter_recursive(vf, store, &new, fd->sidecar_files, selected);
+ vflist_setup_iter_recursive(vf, store, &new, fd->sidecar_files, selected, force);
if (g_list_find(selected, fd))
{
}
else
{
- if (fd->version != old_version)
+ num_ordered++;
+ if (fd->version != old_version || force)
{
vflist_setup_iter(vf, store, &iter, fd);
- vflist_setup_iter_recursive(vf, store, &iter, fd->sidecar_files, selected);
+ vflist_setup_iter_recursive(vf, store, &iter, fd->sidecar_files, selected, force);
}
if (valid) valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
{
case MTS_MODE_SET: selected = mark_val;
break;
- case MTS_MODE_OR: selected = mark_val | selected;
+ case MTS_MODE_OR: selected = mark_val || selected;
break;
- case MTS_MODE_AND: selected = mark_val & selected;
+ case MTS_MODE_AND: selected = mark_val && selected;
break;
- case MTS_MODE_MINUS: selected = !mark_val & selected;
+ case MTS_MODE_MINUS: selected = !mark_val && selected;
break;
}
gtk_tree_model_get_iter(store, &iter, tpath);
gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd, -1);
+ /* the change has a very limited range and the standard notification would trigger
+ complete re-read of the directory - try to do only minimal update instead */
file_data_unregister_notify_func(vf_notify_cb, vf); /* we don't need the notification */
switch (mode)
{
/* mark functions can have various side effects - update all columns to be sure */
vflist_setup_iter(vf, GTK_TREE_STORE(store), &iter, fd);
+ /* mark functions can change sidecars too */
+ vflist_setup_iter_recursive(vf, GTK_TREE_STORE(store), &iter, fd->sidecar_files, NULL, FALSE);
}
gtk_tree_view_column_set_fixed_width(column, options->thumbnails.max_width + 4);
- list = gtk_tree_view_column_get_cell_renderers(column);
+ list = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column));
if (!list) return;
cell = list->data;
g_list_free(list);
g_object_set(G_OBJECT(cell), "height", options->thumbnails.max_height, NULL);
gtk_tree_view_column_set_visible(column, thumb);
- column = gtk_tree_view_get_column(GTK_TREE_VIEW(listview), FILE_VIEW_COLUMN_NAME);
+ column = gtk_tree_view_get_column(GTK_TREE_VIEW(listview), FILE_VIEW_COLUMN_FORMATTED);
if (!column) return;
gtk_tree_view_set_expander_column(GTK_TREE_VIEW(listview), column);
column = gtk_tree_view_get_column(GTK_TREE_VIEW(listview), FILE_VIEW_COLUMN_DATE);
if (!column) return;
gtk_tree_view_column_set_visible(column, !multiline);
-
- gtk_tree_view_columns_autosize(GTK_TREE_VIEW(listview));
}
static gboolean vflist_is_multiline(ViewFile *vf)
}
-static void vflist_populate_view(ViewFile *vf)
+static void vflist_populate_view(ViewFile *vf, gboolean force)
{
GtkTreeStore *store;
GList *selected;
selected = vflist_selection_get_list(vf);
- vflist_setup_iter_recursive(vf, store, NULL, vf->list, selected);
+ vflist_setup_iter_recursive(vf, store, NULL, vf->list, selected, force);
if (selected && vflist_selection_count(vf, NULL) == 0)
{
DEBUG_1("%s vflist_refresh: populate view", get_exec_time());
- vflist_populate_view(vf);
+ vflist_populate_view(vf, FALSE);
filelist_free(old_list);
DEBUG_1("%s vflist_refresh: done", get_exec_time());
"cell-background-set", set, NULL);
}
-static void vflist_name_cell_data_cb(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
- GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
-{
- ViewFile *vf = data;
- gboolean multiline = vflist_is_multiline(vf);
- gchar *text;
- gboolean expanded;
- GtkTreePath *tpath;
-
- tpath = gtk_tree_model_get_path(tree_model, iter);
- expanded = gtk_tree_view_row_expanded(GTK_TREE_VIEW(vf->listview), tpath);
- gtk_tree_path_free(tpath);
-
- if (multiline)
- {
- gchar *name, *sidecars, *size, *time;
- gtk_tree_model_get(tree_model, iter, FILE_COLUMN_SIDECARS, &sidecars,
- FILE_COLUMN_NAME, &name,
- FILE_COLUMN_SIZE, &size,
- FILE_COLUMN_DATE, &time,
- -1);
- text = g_strdup_printf("%s %s\n%s\n%s", name, expanded ? "" : sidecars, size, time);
- g_free(name);
- g_free(sidecars);
- g_free(size);
- g_free(time);
- }
- else
- {
- gchar *name, *sidecars;
- gtk_tree_model_get(tree_model, iter, FILE_COLUMN_SIDECARS, &sidecars,
- FILE_COLUMN_NAME, &name,
- -1);
- text = g_strdup_printf("%s %s", name, expanded ? "" : sidecars);
- g_free(name);
- g_free(sidecars);
- }
-
- g_object_set(cell, "text", text, NULL);
- g_free(text);
-
- /* now call the common cb */
- vflist_listview_color_cb(tree_column, cell, tree_model, iter, data);
-}
-
-
-static void vflist_listview_add_column(ViewFile *vf, gint n, const gchar *title, gboolean image, gboolean right_justify,
- gboolean expand, GtkTreeCellDataFunc cell_data_func)
+static void vflist_listview_add_column(ViewFile *vf, gint n, const gchar *title, gboolean image, gboolean right_justify, gboolean expand)
{
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
gtk_tree_view_column_add_attribute(column, renderer, "pixbuf", n);
}
- if (cell_data_func)
- gtk_tree_view_column_set_cell_data_func(column, renderer, cell_data_func, vf, NULL);
- else
- gtk_tree_view_column_set_cell_data_func(column, renderer, vflist_listview_color_cb, vf, NULL);
+ gtk_tree_view_column_set_cell_data_func(column, renderer, vflist_listview_color_cb, vf, NULL);
g_object_set_data(G_OBJECT(column), "column_store_idx", GUINT_TO_POINTER(n));
g_object_set_data(G_OBJECT(renderer), "column_store_idx", GUINT_TO_POINTER(n));
gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, FILE_COLUMN_POINTER, &fd, col_idx, &marked, -1);
marked = !marked;
- file_data_unregister_notify_func(vf_notify_cb, vf); /* we don't need the notification */
+
+ /* the change has a very limited range and the standard notification would trigger
+ complete re-read of the directory - try to do only minimal update instead */
+ file_data_unregister_notify_func(vf_notify_cb, vf);
file_data_set_mark(fd, col_idx - FILE_COLUMN_MARKS, marked);
if (!file_data_filter_marks(fd, vf_marks_get_filter(vf))) /* file no longer matches the filter -> remove it */
{
{
/* mark functions can have various side effects - update all columns to be sure */
vflist_setup_iter(vf, GTK_TREE_STORE(store), &iter, fd);
+ /* mark functions can change sidecars too */
+ vflist_setup_iter_recursive(vf, GTK_TREE_STORE(store), &iter, fd->sidecar_files, NULL, FALSE);
}
file_data_register_notify_func(vf_notify_cb, vf, NOTIFY_PRIORITY_MEDIUM);
gboolean vflist_set_fd(ViewFile *vf, FileData *dir_fd)
{
+ gboolean ret;
if (!dir_fd) return FALSE;
if (vf->dir_fd == dir_fd) return TRUE;
filelist_free(vf->list);
vf->list = NULL;
- return vf_refresh(vf);
+ ret = vf_refresh(vf);
+ gtk_tree_view_columns_autosize(GTK_TREE_VIEW(vf->listview));
+ return ret;
}
void vflist_destroy_cb(GtkWidget *widget, gpointer data)
flist_types[FILE_COLUMN_POINTER] = G_TYPE_POINTER;
flist_types[FILE_COLUMN_VERSION] = G_TYPE_INT;
flist_types[FILE_COLUMN_THUMB] = GDK_TYPE_PIXBUF;
+ flist_types[FILE_COLUMN_FORMATTED] = G_TYPE_STRING;
flist_types[FILE_COLUMN_NAME] = G_TYPE_STRING;
flist_types[FILE_COLUMN_SIDECARS] = G_TYPE_STRING;
flist_types[FILE_COLUMN_SIZE] = G_TYPE_STRING;
flist_types[FILE_COLUMN_DATE] = G_TYPE_STRING;
+ flist_types[FILE_COLUMN_EXPANDED] = G_TYPE_BOOLEAN;
flist_types[FILE_COLUMN_COLOR] = G_TYPE_BOOLEAN;
for (i = FILE_COLUMN_MARKS; i < FILE_COLUMN_MARKS + FILEDATA_MARKS_SIZE; i++)
flist_types[i] = G_TYPE_BOOLEAN;
vf->listview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
g_object_unref(store);
+ g_signal_connect(G_OBJECT(vf->listview), "row-expanded",
+ G_CALLBACK(vflist_expand_cb), vf);
+
+ g_signal_connect(G_OBJECT(vf->listview), "row-collapsed",
+ G_CALLBACK(vflist_collapse_cb), vf);
+
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview));
gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_MULTIPLE);
gtk_tree_selection_set_select_function(selection, vflist_select_cb, vf, NULL);
column++;
}
- vflist_listview_add_column(vf, FILE_COLUMN_THUMB, "", TRUE, FALSE, FALSE, NULL);
+ vflist_listview_add_column(vf, FILE_COLUMN_THUMB, "", TRUE, FALSE, FALSE);
g_assert(column == FILE_VIEW_COLUMN_THUMB);
column++;
- vflist_listview_add_column(vf, FILE_COLUMN_NAME, _("Name"), FALSE, FALSE, TRUE, vflist_name_cell_data_cb);
- g_assert(column == FILE_VIEW_COLUMN_NAME);
+ vflist_listview_add_column(vf, FILE_COLUMN_FORMATTED, _("Name"), FALSE, FALSE, TRUE);
+ g_assert(column == FILE_VIEW_COLUMN_FORMATTED);
column++;
- vflist_listview_add_column(vf, FILE_COLUMN_SIZE, _("Size"), FALSE, TRUE, FALSE, NULL);
+ vflist_listview_add_column(vf, FILE_COLUMN_SIZE, _("Size"), FALSE, TRUE, FALSE);
g_assert(column == FILE_VIEW_COLUMN_SIZE);
column++;
- vflist_listview_add_column(vf, FILE_COLUMN_DATE, _("Date"), FALSE, TRUE, FALSE, NULL);
+ vflist_listview_add_column(vf, FILE_COLUMN_DATE, _("Date"), FALSE, TRUE, FALSE);
g_assert(column == FILE_VIEW_COLUMN_DATE);
column++;
if (VFLIST(vf)->thumbs_enabled == enable) return;
VFLIST(vf)->thumbs_enabled = enable;
- if (vf->layout) vf_refresh(vf);
+
+ /* vflist_populate_view is better than vf_refresh:
+ - no need to re-read the directory
+ - force update because the formatted string has changed
+ */
+ if (vf->layout)
+ {
+ vflist_populate_view(vf, TRUE);
+ gtk_tree_view_columns_autosize(GTK_TREE_VIEW(vf->listview));
+ }
}
void vflist_marks_set(ViewFile *vf, gboolean enable)
projects / geeqie.git / blobdiff