Trim trailing white spaces.

[geeqie.git] / src / view_file.c

diff --git a/src/view_file.c b/src/view_file.c
index 7f1f3c3..ebbdba1 100644 (file)
--- a/src/view_file.c
+++ b/src/view_file.c
@@ -1,6 +1,6 @@
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: Laurent Monin
  *
@@ -310,19 +310,29 @@ GList *vf_pop_menu_file_list(ViewFile *vf)
        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;
        const gchar *key = data;
-       GList *list;
 
        vf = submenu_item_get_data(widget);
 
        if (!vf) return;
 
-       list = vf_pop_menu_file_list(vf);
-       file_util_start_editor_from_filelist(key, list, vf->listview);
-       filelist_free(list);
+       file_util_start_editor_from_filelist(key, vf_pop_menu_file_list(vf), vf->dir_fd->path, vf->listview);
 }
 
 static void vf_pop_menu_view_cb(GtkWidget *widget, gpointer data)
@@ -470,18 +480,10 @@ static void vf_pop_menu_toggle_mark_sel_cb(GtkWidget *widget, gpointer data)
 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)
@@ -579,7 +581,7 @@ GtkWidget *vf_pop_menu(ViewFile *vf)
                g_free(str_sel_mark_minus);
                }
 
-       vf->editmenu_fd_list = vf_selection_get_list(vf);
+       vf->editmenu_fd_list = vf_pop_menu_file_list(vf);
        submenu_add_edit(menu, &item, G_CALLBACK(vf_pop_menu_edit_cb), vf, vf->editmenu_fd_list);
        gtk_widget_set_sensitive(item, active);
 
@@ -614,8 +616,11 @@ GtkWidget *vf_pop_menu(ViewFile *vf)
        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)
        {
@@ -806,7 +811,7 @@ static gdouble vf_thumb_progress(ViewFile *vf)
 }
 
 static void vf_set_thumb_fd(ViewFile *vf, FileData *fd)
-{      
+{
        switch (vf->type)
        {
        case FILEVIEW_LIST: vflist_set_thumb_fd(vf, fd); break;
@@ -873,7 +878,7 @@ static gboolean vf_thumb_next(ViewFile *vf)
 {
        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;
@@ -1013,7 +1018,16 @@ void vf_refresh_idle(ViewFile *vf)
 {
        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);
                }
 }