/*
* Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: Laurent Monin
*
return ret;
}
+GList *vf_selection_get_one(ViewFile *vf, FileData *fd)
+{
+ GList *ret = NULL;
+
+ switch (vf->type)
+ {
+ case FILEVIEW_LIST: ret = vflist_selection_get_one(vf, fd); break;
+ case FILEVIEW_ICON: ret = vficon_selection_get_one(vf, fd); break;
+ }
+
+ return ret;
+}
+
static void vf_pop_menu_edit_cb(GtkWidget *widget, gpointer data)
{
ViewFile *vf;
static void vf_pop_menu_toggle_view_type_cb(GtkWidget *widget, gpointer data)
{
ViewFile *vf = data;
-
+ FileViewType new_type = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "menu_item_radio_data"));
if (!vf->layout) return;
- switch (vf->type)
- {
- case FILEVIEW_LIST:
- layout_views_set(vf->layout, vf->layout->options.dir_view_type, FILEVIEW_ICON);
- break;
- case FILEVIEW_ICON:
- layout_views_set(vf->layout, vf->layout->options.dir_view_type, FILEVIEW_LIST);
- break;
- }
+ layout_views_set(vf->layout, vf->layout->options.dir_view_type, new_type);
}
static void vf_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
item = menu_item_add(menu, _("_Sort"), NULL, NULL);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
- menu_item_add_check(menu, _("View as _icons"), (vf->type == FILEVIEW_ICON),
- G_CALLBACK(vf_pop_menu_toggle_view_type_cb), vf);
+ item = menu_item_add_radio(menu, _("View as _List"), GINT_TO_POINTER(FILEVIEW_LIST), vf->type == FILEVIEW_LIST,
+ G_CALLBACK(vf_pop_menu_toggle_view_type_cb), vf);
+
+ item = menu_item_add_radio(menu, _("View as _Icons"), GINT_TO_POINTER(FILEVIEW_ICON), vf->type == FILEVIEW_ICON,
+ G_CALLBACK(vf_pop_menu_toggle_view_type_cb), vf);
switch (vf->type)
{
}
static void vf_set_thumb_fd(ViewFile *vf, FileData *fd)
-{
+{
switch (vf->type)
{
case FILEVIEW_LIST: vflist_set_thumb_fd(vf, fd); break;
{
FileData *fd = NULL;
- if (!GTK_WIDGET_REALIZED(vf->listview))
+ if (!gtk_widget_get_realized(vf->listview))
{
vf_thumb_status(vf, 0.0, NULL);
return FALSE;
{
if (!vf->refresh_idle_id)
{
- vf->refresh_idle_id = g_idle_add(vf_refresh_idle_cb, vf);
+ vf->time_refresh_set = time(NULL);
+ /* file operations run with G_PRIORITY_DEFAULT_IDLE */
+ vf->refresh_idle_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE + 50, vf_refresh_idle_cb, vf, NULL);
+ }
+ else if (time(NULL) - vf->time_refresh_set > 1)
+ {
+ /* more than 1 sec since last update - increase priority */
+ vf_refresh_idle_cancel(vf);
+ vf->time_refresh_set = time(NULL);
+ vf->refresh_idle_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE - 50, vf_refresh_idle_cb, vf, NULL);
}
}