/*
* Geeqie
* (C) 2006 John Ellis
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
#include "main.h"
#include "view_file_icon.h"
+#include "bar.h"
#include "cellrenderericon.h"
#include "collect.h"
#include "collect-io.h"
#include "dnd.h"
#include "editors.h"
#include "img-view.h"
-#include "info.h"
#include "filedata.h"
#include "layout.h"
#include "layout_image.h"
#include "menu.h"
+#include "metadata.h"
#include "thumb.h"
#include "utilops.h"
#include "ui_fileops.h"
struct _IconData
{
SelectionType selected;
- gint row;
FileData *fd;
};
return id;
}
-#if 0
-/* not used */
-static gint iconlist_read(FileData *dir_fd, GList **list)
-{
- GList *temp;
- GList *work;
-
- if (!filelist_read(dir_fd, &temp, NULL)) return FALSE;
-
- work = temp;
- while (work)
- {
- FileData *fd;
- IconData *id;
-
- fd = work->data;
- g_assert(fd->magick == 0x12345678);
- id = g_new0(IconData, 1);
-
- id->selected = SELECTION_NONE;
- id->row = -1;
- id->fd = fd;
-
- work->data = id;
- work = work->next;
- }
-
- *list = temp;
-
- return TRUE;
-}
-#endif
-
static void iconlist_free(GList *list)
{
GList *work = list;
return filelist_sort_compare_filedata(ida->fd, idb->fd);
}
-GList *iconlist_sort(GList *list, SortType method, gint ascend)
+GList *iconlist_sort(GList *list, SortType method, gboolean ascend)
{
return filelist_sort_full(list, method, ascend, (GCompareFunc) iconlist_sort_file_cb);
}
-GList *iconlist_insert_sort(GList *list, IconData *id, SortType method, gint ascend)
+GList *iconlist_insert_sort(GList *list, IconData *id, SortType method, gboolean ascend)
{
return filelist_insert_sort_full(list, id, method, ascend, (GCompareFunc) iconlist_sort_file_cb);
}
static void vficon_toggle_filenames(ViewFile *vf);
static void vficon_selection_remove(ViewFile *vf, IconData *id, SelectionType mask, GtkTreeIter *iter);
-static void vficon_move_focus(ViewFile *vf, gint row, gint col, gint relative);
+static void vficon_move_focus(ViewFile *vf, gint row, gint col, gboolean relative);
static void vficon_set_focus(ViewFile *vf, IconData *id);
-static void vficon_thumb_update(ViewFile *vf);
-static void vficon_populate_at_new_size(ViewFile *vf, gint w, gint h, gint force);
+static void vficon_populate_at_new_size(ViewFile *vf, gint w, gint h, gboolean force);
/*
*-----------------------------------------------------------------------------
*/
+GList *vficon_selection_get_one(ViewFile *vf, FileData *fd)
+{
+ return g_list_prepend(filelist_copy(fd->sidecar_files), file_data_ref(fd));
+}
+
GList *vficon_pop_menu_file_list(ViewFile *vf)
{
if (!VFICON(vf)->click_id) return NULL;
return vf_selection_get_list(vf);
}
- return g_list_append(NULL, file_data_ref(VFICON(vf)->click_id->fd));
+ return vficon_selection_get_one(vf, VFICON(vf)->click_id->fd);
}
void vficon_pop_menu_view_cb(GtkWidget *widget, gpointer data)
static void vficon_toggle_filenames(ViewFile *vf)
{
+ GtkAllocation allocation;
VFICON(vf)->show_text = !VFICON(vf)->show_text;
options->show_icon_names = VFICON(vf)->show_text;
- vficon_populate_at_new_size(vf, vf->listview->allocation.width, vf->listview->allocation.height, TRUE);
+ gtk_widget_get_allocation(vf->listview, &allocation);
+ vficon_populate_at_new_size(vf, allocation.width, allocation.height, TRUE);
}
static gint vficon_get_icon_width(ViewFile *vf)
*-------------------------------------------------------------------
*/
-static gint vficon_find_position(ViewFile *vf, IconData *id, gint *row, gint *col)
+static gboolean vficon_find_position(ViewFile *vf, IconData *id, gint *row, gint *col)
{
gint n;
return TRUE;
}
-static gint vficon_find_iter(ViewFile *vf, IconData *id, GtkTreeIter *iter, gint *column)
+static gboolean vficon_find_iter(ViewFile *vf, IconData *id, GtkTreeIter *iter, gint *column)
{
GtkTreeModel *store;
gint row, col;
gdk_window_get_pointer(NULL, &x, &y, NULL);
- if (!GTK_WIDGET_REALIZED(VFICON(vf)->tip_window)) gtk_widget_realize(VFICON(vf)->tip_window);
+ if (!gtk_widget_get_realized(VFICON(vf)->tip_window)) gtk_widget_realize(VFICON(vf)->tip_window);
gtk_window_move(GTK_WINDOW(VFICON(vf)->tip_window), x + 16, y + 16);
gtk_widget_show(VFICON(vf)->tip_window);
}
VFICON(vf)->tip_window = NULL;
}
-static gint tip_schedule_cb(gpointer data)
+static gboolean tip_schedule_cb(gpointer data)
{
ViewFile *vf = data;
GtkWidget *window;
- if (VFICON(vf)->tip_delay_id == -1) return FALSE;
+ if (!VFICON(vf)->tip_delay_id) return FALSE;
window = gtk_widget_get_toplevel(vf->listview);
- if (GTK_WIDGET_SENSITIVE(window) &&
- GTK_WINDOW(window)->has_focus)
+ if (gtk_widget_get_sensitive(window) &&
+ gtk_window_has_toplevel_focus(GTK_WINDOW(window)))
{
tip_show(vf);
}
- VFICON(vf)->tip_delay_id = -1;
+ VFICON(vf)->tip_delay_id = 0;
return FALSE;
}
{
tip_hide(vf);
- if (VFICON(vf)->tip_delay_id != -1)
+ if (VFICON(vf)->tip_delay_id)
{
g_source_remove(VFICON(vf)->tip_delay_id);
- VFICON(vf)->tip_delay_id = -1;
+ VFICON(vf)->tip_delay_id = 0;
}
if (!VFICON(vf)->show_text)
{
tip_hide(vf);
- if (VFICON(vf)->tip_delay_id != -1) g_source_remove(VFICON(vf)->tip_delay_id);
- VFICON(vf)->tip_delay_id = -1;
+ if (VFICON(vf)->tip_delay_id)
+ {
+ g_source_remove(VFICON(vf)->tip_delay_id);
+ VFICON(vf)->tip_delay_id = 0;
+ }
}
static void tip_update(ViewFile *vf, IconData *id)
{
ViewFile *vf = data;
GList *list = NULL;
- gchar *uri_text = NULL;
- gint total;
if (!VFICON(vf)->click_id) 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);
+static void vficon_drag_data_received(GtkWidget *entry_widget, GdkDragContext *context,
+ int x, int y, GtkSelectionData *selection,
+ guint info, guint time, gpointer data)
+{
+ ViewFile *vf = data;
+
+ if (info == TARGET_TEXT_PLAIN) {
+ IconData *id = vficon_find_data_by_coord(vf, x, y, NULL);
- gtk_selection_data_set(selection_data, selection_data->target,
- 8, (guchar *)uri_text, total);
- g_free(uri_text);
+ if (id && id->fd) {
+ /* Add keywords to file */
+ FileData *fd = id->fd;
+ gchar *str = (gchar *) gtk_selection_data_get_text(selection);
+ GList *kw_list = string_to_keywords_list(str);
+
+ metadata_append_list(fd, KEYWORD_KEY, kw_list);
+ string_list_free(kw_list);
+ g_free(str);
+ }
+ }
}
static void vficon_dnd_begin(GtkWidget *widget, GdkDragContext *context, gpointer data)
vficon_selection_remove(vf, VFICON(vf)->click_id, SELECTION_PRELIGHT, NULL);
- if (context->action == GDK_ACTION_MOVE)
+ if (gdk_drag_context_get_selected_action(context) == GDK_ACTION_MOVE)
{
vf_refresh(vf);
}
gtk_drag_source_set(vf->listview, GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
dnd_file_drag_types, dnd_file_drag_types_count,
GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK);
+ gtk_drag_dest_set(vf->listview, GTK_DEST_DEFAULT_ALL,
+ dnd_file_drag_types, dnd_file_drag_types_count,
+ GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK);
+
g_signal_connect(G_OBJECT(vf->listview), "drag_data_get",
G_CALLBACK(vficon_dnd_get), vf);
g_signal_connect(G_OBJECT(vf->listview), "drag_begin",
G_CALLBACK(vficon_dnd_begin), vf);
g_signal_connect(G_OBJECT(vf->listview), "drag_end",
G_CALLBACK(vficon_dnd_end), vf);
+ g_signal_connect(G_OBJECT(vf->listview), "drag_data_received",
+ G_CALLBACK(vficon_drag_data_received), vf);
}
/*
void vficon_marks_set(ViewFile *vf, gint enable)
{
- vficon_populate_at_new_size(vf, vf->listview->allocation.width, vf->listview->allocation.height, TRUE);
+ GtkAllocation allocation;
+ gtk_widget_get_allocation(vf->listview, &allocation);
+ vficon_populate_at_new_size(vf, allocation.width, allocation.height, TRUE);
}
/*
vf_send_update(vf);
}
-static void vficon_select_util(ViewFile *vf, IconData *id, gint select)
+static void vficon_select_util(ViewFile *vf, IconData *id, gboolean select)
{
if (select)
{
}
}
-static void vficon_select_region_util(ViewFile *vf, IconData *start, IconData *end, gint select)
+static void vficon_select_region_util(ViewFile *vf, IconData *start, IconData *end, gboolean select)
{
gint row1, col1;
gint row2, col2;
}
}
-gint vficon_index_is_selected(ViewFile *vf, gint row)
+gboolean vficon_index_is_selected(ViewFile *vf, gint row)
{
IconData *id = g_list_nth_data(vf->list, row);
{
IconData *id = work->data;
FileData *fd = id->fd;
- g_assert(fd->magick == 0x12345678);
+ g_assert(fd->magick == FD_MAGICK);
b += fd->size;
work = work->next;
GList *vficon_selection_get_list(ViewFile *vf)
{
GList *list = NULL;
- GList *work;
+ GList *work, *work2;
work = VFICON(vf)->selection;
while (work)
{
IconData *id = work->data;
FileData *fd = id->fd;
- g_assert(fd->magick == 0x12345678);
+ g_assert(fd->magick == FD_MAGICK);
list = g_list_prepend(list, file_data_ref(fd));
+
+ work2 = fd->sidecar_files;
+ while (work2)
+ {
+ fd = work2->data;
+ list = g_list_prepend(list, file_data_ref(fd));
+ work2 = work2->next;
+ }
work = work->next;
}
FileData *fd = id->fd;
gboolean mark_val, selected;
- g_assert(fd->magick == 0x12345678);
+ g_assert(fd->magick == FD_MAGICK);
mark_val = file_data_get_mark(fd, n);
selected = (id->selected & SELECTION_SELECTED);
{
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;
}
static void vficon_select_closest(ViewFile *vf, FileData *sel_fd)
{
GList *work;
+ IconData *id = NULL;
if (sel_fd->parent) sel_fd = sel_fd->parent;
work = vf->list;
while (work)
{
gint match;
- IconData *id = work->data;
- FileData *fd = id->fd;
- work = work->next;
+ FileData *fd;
+ id = work->data;
+ fd = id->fd;
+ work = work->next;
match = filelist_sort_compare_filedata_full(fd, sel_fd, vf->sort_method, vf->sort_ascend);
- if (match >= 0)
- {
- vficon_select(vf, id);
- vficon_send_layout_select(vf, id);
- break;
- }
+ if (match >= 0) break;
+ }
+
+ if (id)
+ {
+ vficon_select(vf, id);
+ vficon_send_layout_select(vf, id);
}
-
}
*-------------------------------------------------------------------
*/
-static void vficon_move_focus(ViewFile *vf, gint row, gint col, gint relative)
+static void vficon_move_focus(ViewFile *vf, gint row, gint col, gboolean relative)
{
gint new_row;
gint new_col;
}
}
-#if 0
-static void vficon_update_focus(ViewFile *vf)
-{
- gint new_row = 0;
- gint new_col = 0;
-
- if (VFICON(vf)->focus_id && vficon_find_position(vf, VFICON(vf)->focus_id, &new_row, &new_col))
- {
- /* first find the old focus, if it exists and is valid */
- }
- else
- {
- /* (try to) stay where we were */
- new_row = VFICON(vf)->focus_row;
- new_col = VFICON(vf)->focus_column;
- }
-
- vficon_move_focus(vf, new_row, new_col, FALSE);
-}
-#endif
-
/* used to figure the page up/down distances */
static gint page_height(ViewFile *vf)
{
gint ret;
adj = gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(vf->listview));
- page_size = (gint)adj->page_increment;
+ page_size = (gint)gtk_adjustment_get_page_increment(adj);
row_height = options->thumbnails.max_height + THUMB_BORDER_PADDING * 2;
if (VFICON(vf)->show_text) row_height += options->thumbnails.max_height / 3;
popup_menu_position_clamp(menu, x, y, 0);
}
-gint vficon_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+gboolean vficon_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
ViewFile *vf = data;
gint focus_row = 0;
gint focus_col = 0;
IconData *id;
- gint stop_signal;
+ gboolean stop_signal;
stop_signal = TRUE;
switch (event->keyval)
{
- case GDK_Left: case GDK_KP_Left:
+ case GDK_KEY_Left: case GDK_KEY_KP_Left:
focus_col = -1;
break;
- case GDK_Right: case GDK_KP_Right:
+ case GDK_KEY_Right: case GDK_KEY_KP_Right:
focus_col = 1;
break;
- case GDK_Up: case GDK_KP_Up:
+ case GDK_KEY_Up: case GDK_KEY_KP_Up:
focus_row = -1;
break;
- case GDK_Down: case GDK_KP_Down:
+ case GDK_KEY_Down: case GDK_KEY_KP_Down:
focus_row = 1;
break;
- case GDK_Page_Up: case GDK_KP_Page_Up:
+ case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up:
focus_row = -page_height(vf);
break;
- case GDK_Page_Down: case GDK_KP_Page_Down:
+ case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down:
focus_row = page_height(vf);
break;
- case GDK_Home: case GDK_KP_Home:
+ case GDK_KEY_Home: case GDK_KEY_KP_Home:
focus_row = -VFICON(vf)->focus_row;
focus_col = -VFICON(vf)->focus_column;
break;
- case GDK_End: case GDK_KP_End:
+ case GDK_KEY_End: case GDK_KEY_KP_End:
focus_row = VFICON(vf)->rows - 1 - VFICON(vf)->focus_row;
focus_col = VFICON(vf)->columns - 1 - VFICON(vf)->focus_column;
break;
- case GDK_space:
+ case GDK_KEY_space:
id = vficon_find_data(vf, VFICON(vf)->focus_row, VFICON(vf)->focus_column, NULL);
if (id)
{
}
}
break;
- case GDK_Menu:
+ case GDK_KEY_Menu:
id = vficon_find_data(vf, VFICON(vf)->focus_row, VFICON(vf)->focus_column, NULL);
VFICON(vf)->click_id = id;
if (stop_signal)
{
-#if 0
- g_signal_stop_emission_by_name(GTK_OBJECT(widget), "key_press_event");
-#endif
tip_unschedule(vf);
}
*-------------------------------------------------------------------
*/
-static gint vficon_motion_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean vficon_motion_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
ViewFile *vf = data;
IconData *id;
return FALSE;
}
-gint vficon_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+gboolean vficon_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
ViewFile *vf = data;
GtkTreeIter iter;
switch (bevent->button)
{
case MOUSE_BUTTON_LEFT:
- if (!GTK_WIDGET_HAS_FOCUS(vf->listview))
+ if (!gtk_widget_has_focus(vf->listview))
{
gtk_widget_grab_focus(vf->listview);
}
-#if 0
+
if (bevent->type == GDK_2BUTTON_PRESS &&
vf->layout)
{
vficon_selection_remove(vf, VFICON(vf)->click_id, SELECTION_PRELIGHT, &iter);
layout_image_full_screen_start(vf->layout);
}
-#endif
break;
case MOUSE_BUTTON_RIGHT:
vf->popup = vf_pop_menu(vf);
return FALSE;
}
-gint vficon_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+gboolean vficon_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
ViewFile *vf = data;
GtkTreeIter iter;
IconData *id = NULL;
- gint was_selected;
+ gboolean was_selected;
tip_schedule(vf);
if (!id || VFICON(vf)->click_id != id) return TRUE;
- was_selected = (id->selected & SELECTION_SELECTED);
+ was_selected = !!(id->selected & SELECTION_SELECTED);
switch (bevent->button)
{
if (bevent->state & GDK_CONTROL_MASK)
{
- gint select;
+ gboolean select;
select = !(id->selected & SELECTION_SELECTED);
if ((bevent->state & GDK_SHIFT_MASK) && VFICON(vf)->prev_selection)
return TRUE;
}
-static gint vficon_leave_cb(GtkWidget *widget, GdkEventCrossing *event, gpointer data)
+static gboolean vficon_leave_cb(GtkWidget *widget, GdkEventCrossing *event, gpointer data)
{
ViewFile *vf = data;
GList *list;
gtk_tree_model_get(store, iter, FILE_COLUMN_POINTER, &list, -1);
+
+ /* it seems that gtk_list_store_clear may call some callbacks
+ that use the column. Set the pointer to NULL to be safe. */
+ gtk_list_store_set(GTK_LIST_STORE(store), iter, FILE_COLUMN_POINTER, NULL, -1);
g_list_free(list);
return FALSE;
gtk_list_store_clear(GTK_LIST_STORE(store));
}
-static void vficon_set_thumb(ViewFile *vf, FileData *fd)
-{
- GtkTreeModel *store;
- GtkTreeIter iter;
- GList *list;
-
- if (!vficon_find_iter(vf, vficon_icon_data(vf, fd), &iter, NULL)) return;
-
- store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview));
-
- gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &list, -1);
- gtk_list_store_set(GTK_LIST_STORE(store), &iter, FILE_COLUMN_POINTER, list, -1);
-}
-
static GList *vficon_add_row(ViewFile *vf, GtkTreeIter *iter)
{
GtkListStore *store;
return list;
}
-static void vficon_populate(ViewFile *vf, gint resize, gint keep_position)
+static void vficon_populate(ViewFile *vf, gboolean resize, gboolean keep_position)
{
GtkTreeModel *store;
GtkTreePath *tpath;
GList *work;
IconData *visible_id = NULL;
gint r, c;
- gint valid;
+ gboolean valid;
GtkTreeIter iter;
vficon_verify_selections(vf);
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview));
- if (keep_position && GTK_WIDGET_REALIZED(vf->listview) &&
+ if (keep_position && gtk_widget_get_realized(vf->listview) &&
gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vf->listview), 0, 0, &tpath, NULL, NULL, NULL))
{
GtkTreeIter iter;
gtk_tree_view_column_set_visible(column, (i < VFICON(vf)->columns));
gtk_tree_view_column_set_fixed_width(column, thumb_width + (THUMB_BORDER_PADDING * 6));
- list = gtk_tree_view_column_get_cell_renderers(column);
+ list = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column));
cell = (list) ? list->data : NULL;
g_list_free(list);
NULL);
}
}
- if (GTK_WIDGET_REALIZED(vf->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(vf->listview));
+ if (gtk_widget_get_realized(vf->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(vf->listview));
}
r = -1;
id = work->data;
work = work->next;
c++;
-
- id->row = r;
}
else
{
vf_send_update(vf);
- vficon_thumb_update(vf);
+ vf_thumb_update(vf);
}
-static void vficon_populate_at_new_size(ViewFile *vf, gint w, gint h, gint force)
+static void vficon_populate_at_new_size(ViewFile *vf, gint w, gint h, gboolean force)
{
gint new_cols;
gint thumb_width;
DEBUG_1("col tab pop cols=%d rows=%d", VFICON(vf)->columns, VFICON(vf)->rows);
}
-#if 0
-static void vficon_sync(ViewFile *vf)
-{
- GtkTreeModel *store;
- GtkTreeIter iter;
- GList *work;
- gint r, c;
- gint valid;
-
- if (VFICON(vf)->rows == 0) return;
-
- store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview));
-
- r = -1;
- c = 0;
-
- valid = gtk_tree_model_iter_children(store, &iter, NULL);
-
- work = vf->list;
- while (work)
- {
- GList *list;
- r++;
- c = 0;
- if (valid)
- {
- gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &list, -1);
- gtk_list_store_set(GTK_LIST_STORE(store), &iter, FILE_COLUMN_POINTER, list, -1);
- }
- else
- {
- list = vficon_add_row(vf, &iter);
- }
-
- while (list)
- {
- IconData *id;
-
- if (work)
- {
- id = work->data;
- work = work->next;
- c++;
-
- id->row = r;
- }
- else
- {
- id = NULL;
- }
-
- list->data = id;
- list = list->next;
- }
- if (valid) valid = gtk_tree_model_iter_next(store, &iter);
- }
-
- r++;
- while (valid)
- {
- GList *list;
-
- gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &list, -1);
- valid = gtk_list_store_remove(GTK_LIST_STORE(store), &iter);
- g_list_free(list);
- }
-
- VFICON(vf)->rows = r;
-
- vficon_update_focus(vf);
-}
-#endif
-
-#if 0
-static void vficon_sync_idle(ViewFile *vf)
-{
- if (VFICON(vf)->sync_idle_id == -1)
- {
- /* high priority, the view needs to be resynced before a redraw
- * may contain invalid pointers at this time
- */
- VFICON(vf)->sync_idle_id = g_idle_add_full(G_PRIORITY_HIGH, vficon_sync_idle_cb, vf, NULL);
- }
-}
-#endif
-
static void vficon_sized_cb(GtkWidget *widget, GtkAllocation *allocation, gpointer data)
{
ViewFile *vf = data;
*-----------------------------------------------------------------------------
*/
-void vficon_sort_set(ViewFile *vf, SortType type, gint ascend)
+void vficon_sort_set(ViewFile *vf, SortType type, gboolean ascend)
{
if (vf->sort_method == type && vf->sort_ascend == ascend) return;
*-----------------------------------------------------------------------------
*/
-static gint vficon_thumb_next(ViewFile *vf);
-
-static gdouble vficon_thumb_progress(ViewFile *vf)
+void vficon_thumb_progress_count(GList *list, gint *count, gint *done)
{
- gint count = 0;
- gint done = 0;
-
- GList *work = vf->list;
+ GList *work = list;
while (work)
{
IconData *id = work->data;
FileData *fd = id->fd;
work = work->next;
- if (fd->thumb_pixbuf) done++;
- count++;
- }
- DEBUG_1("thumb progress: %d of %d", done, count);
- return (gdouble)done / count;
-}
-
-static void vficon_thumb_status(ViewFile *vf, gdouble val, const gchar *text)
-{
- if (vf->func_thumb_status)
- {
- vf->func_thumb_status(vf, val, text, vf->data_thumb_status);
+ if (fd->thumb_pixbuf) (*done)++;
+ (*count)++;
}
}
-static void vficon_thumb_cleanup(ViewFile *vf)
-{
- vficon_thumb_status(vf, 0.0, NULL);
-
- vf->thumbs_running = FALSE;
-
- thumb_loader_free(vf->thumbs_loader);
- vf->thumbs_loader = NULL;
-
- vf->thumbs_filedata = NULL;
-}
-
-static void vficon_thumb_stop(ViewFile *vf)
-{
- if (vf->thumbs_running) vficon_thumb_cleanup(vf);
-}
-
-static void vficon_thumb_do(ViewFile *vf, ThumbLoader *tl, FileData *fd)
+void vficon_set_thumb_fd(ViewFile *vf, FileData *fd)
{
- if (!fd) return;
-
- vficon_set_thumb(vf, fd);
-
- vficon_thumb_status(vf, vficon_thumb_progress(vf), _("Loading thumbs..."));
-}
+ GtkTreeModel *store;
+ GtkTreeIter iter;
+ GList *list;
-static void vficon_thumb_error_cb(ThumbLoader *tl, gpointer data)
-{
- ViewFile *vf = data;
+ if (!vficon_find_iter(vf, vficon_icon_data(vf, fd), &iter, NULL)) return;
- if (vf->thumbs_filedata && vf->thumbs_loader == tl)
- {
- vficon_thumb_do(vf, tl, vf->thumbs_filedata);
- }
+ store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview));
- while (vficon_thumb_next(vf));
+ gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &list, -1);
+ gtk_list_store_set(GTK_LIST_STORE(store), &iter, FILE_COLUMN_POINTER, list, -1);
}
-static void vficon_thumb_done_cb(ThumbLoader *tl, gpointer data)
-{
- ViewFile *vf = data;
-
- if (vf->thumbs_filedata && vf->thumbs_loader == tl)
- {
- vficon_thumb_do(vf, tl, vf->thumbs_filedata);
- }
- while (vficon_thumb_next(vf));
-}
-
-static gint vficon_thumb_next(ViewFile *vf)
+FileData *vficon_thumb_next_fd(ViewFile *vf)
{
GtkTreePath *tpath;
FileData *fd = NULL;
- if (!GTK_WIDGET_REALIZED(vf->listview))
- {
- vficon_thumb_status(vf, 0.0, NULL);
- return FALSE;
- }
-
if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vf->listview), 0, 0, &tpath, NULL, NULL, NULL))
{
GtkTreeModel *store;
GtkTreeIter iter;
- gint valid = TRUE;
+ gboolean valid = TRUE;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview));
gtk_tree_model_get_iter(store, &iter, tpath);
}
}
- if (!fd)
- {
- /* done */
- vficon_thumb_cleanup(vf);
- return FALSE;
- }
-
- vf->thumbs_filedata = fd;
-
- thumb_loader_free(vf->thumbs_loader);
+ return fd;
+}
- vf->thumbs_loader = thumb_loader_new(options->thumbnails.max_width, options->thumbnails.max_height);
- thumb_loader_set_callbacks(vf->thumbs_loader,
- vficon_thumb_done_cb,
- vficon_thumb_error_cb,
- NULL,
- vf);
+void vficon_thumb_reset_all(ViewFile *vf)
+{
+ GList *work = vf->list;
- if (!thumb_loader_start(vf->thumbs_loader, fd))
+ while (work)
{
- /* set icon to unknown, continue */
- DEBUG_1("thumb loader start failed %s", fd->path);
- vficon_thumb_do(vf, vf->thumbs_loader, fd);
-
- return TRUE;
+ IconData *id = work->data;
+ FileData *fd = id->fd;
+ if (fd->thumb_pixbuf)
+ {
+ g_object_unref(fd->thumb_pixbuf);
+ fd->thumb_pixbuf = NULL;
+ }
+ work = work->next;
}
-
- return FALSE;
}
-static void vficon_thumb_update(ViewFile *vf)
-{
- vficon_thumb_stop(vf);
-
- vficon_thumb_status(vf, 0.0, _("Loading thumbs..."));
- vf->thumbs_running = TRUE;
-
- while (vficon_thumb_next(vf));
-}
/*
*-----------------------------------------------------------------------------
return id ? id->fd : NULL;
}
-gint vficon_index_by_path(ViewFile *vf, const gchar *path)
-{
- gint p = 0;
- GList *work;
-
- if (!path) return -1;
-
- work = vf->list;
- while (work)
- {
- IconData *id = work->data;
- FileData *fd = id->fd;
- if (strcmp(path, fd->path) == 0) return p;
- work = work->next;
- p++;
- }
-
- return -1;
-}
gint vficon_index_by_fd(ViewFile *vf, FileData *in_fd)
{
*-----------------------------------------------------------------------------
*/
-static gint vficon_refresh_real(ViewFile *vf, gint keep_position)
+static gboolean vficon_refresh_real(ViewFile *vf, gboolean keep_position)
{
- gint ret = TRUE;
+ gboolean ret = TRUE;
GList *work, *work_fd;
IconData *focus_id;
GList *new_filelist = NULL;
/* not changed, go to next */
work = work->next;
work_fd = work_fd->next;
- if (id->selected & SELECTION_SELECTED)
+ if (id->selected & SELECTION_SELECTED)
{
VFICON(vf)->selection = g_list_prepend(VFICON(vf)->selection, id);
}
id = g_new0(IconData, 1);
id->selected = SELECTION_NONE;
- id->row = -1;
id->fd = file_data_ref(new_fd);
if (work)
vf->list = g_list_insert_before(vf->list, work, id);
return ret;
}
-gint vficon_refresh(ViewFile *vf)
+gboolean vficon_refresh(ViewFile *vf)
{
return vficon_refresh_real(vf, TRUE);
}
static void vficon_cell_data_cb(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
- ColumnData *cd = data;
- ViewFile *vf;
- GtkStyle *style;
GList *list;
- GdkColor color_fg;
- GdkColor color_bg;
IconData *id;
+ ColumnData *cd = data;
+ ViewFile *vf = cd->vf;
- vf = cd->vf;
+ if (!GQV_IS_CELL_RENDERER_ICON(cell)) return;
gtk_tree_model_get(tree_model, iter, FILE_COLUMN_POINTER, &list, -1);
id = g_list_nth_data(list, cd->number);
-
- if (id) g_assert(id->fd->magick == 0x12345678);
-
- style = gtk_widget_get_style(vf->listview);
- if (id && id->selected & SELECTION_SELECTED)
- {
- memcpy(&color_fg, &style->text[GTK_STATE_SELECTED], sizeof(color_fg));
- memcpy(&color_bg, &style->base[GTK_STATE_SELECTED], sizeof(color_bg));
- }
- else
+
+ if (id)
{
- memcpy(&color_fg, &style->text[GTK_STATE_NORMAL], sizeof(color_fg));
- memcpy(&color_bg, &style->base[GTK_STATE_NORMAL], sizeof(color_bg));
- }
+ GdkColor color_fg;
+ GdkColor color_bg;
+ GtkStyle *style;
+ gchar *name_sidecars;
+ gchar *link;
+ GtkStateType state = GTK_STATE_NORMAL;
- if (id && id->selected & SELECTION_PRELIGHT)
- {
-#if 0
- shift_color(&color_fg, -1, 0);
-#endif
- shift_color(&color_bg, -1, 0);
- }
+ g_assert(id->fd->magick == FD_MAGICK);
- if (GQV_IS_CELL_RENDERER_ICON(cell))
- {
- if (id)
+ link = islink(id->fd->path) ? GQ_LINK_STR : "";
+ if (id->fd->sidecar_files)
{
- gchar *name_sidecars = (gchar *)id->fd->name;
- gchar *sidecars = NULL;
-
- if (id->fd->sidecar_files)
- {
- sidecars = file_data_sc_list_to_string(id->fd);
- name_sidecars = g_strdup_printf("%s %s", id->fd->name, sidecars);
- }
-
- g_object_set(cell, "pixbuf", id->fd->thumb_pixbuf,
- "text", name_sidecars,
- "marks", file_data_get_marks(id->fd),
- "show_marks", vf->marks_enabled,
- "cell-background-gdk", &color_bg,
- "cell-background-set", TRUE,
- "foreground-gdk", &color_fg,
- "foreground-set", TRUE,
- "has-focus", (VFICON(vf)->focus_id == id), NULL);
- if (sidecars)
- {
- g_free(sidecars);
- g_free(name_sidecars);
- }
+ gchar *sidecars = file_data_sc_list_to_string(id->fd);
+ name_sidecars = g_strdup_printf("%s%s %s", link, id->fd->name, sidecars);
+ g_free(sidecars);
}
else
{
- g_object_set(cell, "pixbuf", NULL,
- "text", NULL,
- "show_marks", FALSE,
- "cell-background-set", FALSE,
- "foreground-set", FALSE,
- "has-focus", FALSE, NULL);
+ gchar *disabled_grouping = id->fd->disable_grouping ? _(" [NO GROUPING]") : "";
+ name_sidecars = g_strdup_printf("%s%s%s", link, id->fd->name, disabled_grouping);
+ }
+
+ style = gtk_widget_get_style(vf->listview);
+ if (id->selected & SELECTION_SELECTED)
+ {
+ state = GTK_STATE_SELECTED;
}
+
+ memcpy(&color_fg, &style->text[state], sizeof(color_fg));
+ memcpy(&color_bg, &style->base[state], sizeof(color_bg));
+
+ if (id->selected & SELECTION_PRELIGHT)
+ {
+ shift_color(&color_bg, -1, 0);
+ }
+
+ g_object_set(cell, "pixbuf", id->fd->thumb_pixbuf,
+ "text", name_sidecars,
+ "marks", file_data_get_marks(id->fd),
+ "show_marks", vf->marks_enabled,
+ "cell-background-gdk", &color_bg,
+ "cell-background-set", TRUE,
+ "foreground-gdk", &color_fg,
+ "foreground-set", TRUE,
+ "has-focus", (VFICON(vf)->focus_id == id), NULL);
+ g_free(name_sidecars);
+ }
+ else
+ {
+ g_object_set(cell, "pixbuf", NULL,
+ "text", NULL,
+ "show_marks", FALSE,
+ "cell-background-set", FALSE,
+ "foreground-set", FALSE,
+ "has-focus", FALSE, NULL);
}
}
*-----------------------------------------------------------------------------
*/
-gint vficon_set_fd(ViewFile *vf, FileData *dir_fd)
+gboolean vficon_set_fd(ViewFile *vf, FileData *dir_fd)
{
- gint ret;
+ gboolean ret;
if (!dir_fd) return FALSE;
if (vf->dir_fd == dir_fd) return TRUE;
tip_unschedule(vf);
- vficon_thumb_cleanup(vf);
+ vf_thumb_cleanup(vf);
iconlist_free(vf->list);
g_list_free(VFICON(vf)->selection);
vf->info = g_new0(ViewFileInfoIcon, 1);
- VFICON(vf)->selection = NULL;
- VFICON(vf)->prev_selection = NULL;
-
- VFICON(vf)->tip_window = NULL;
- VFICON(vf)->tip_delay_id = -1;
-
- VFICON(vf)->focus_row = 0;
- VFICON(vf)->focus_column = 0;
- VFICON(vf)->focus_id = NULL;
-
VFICON(vf)->show_text = options->show_icon_names;
store = gtk_list_store_new(1, G_TYPE_POINTER);