comparison src/layout_image.c @ 1724:5276dabe836f

consider sidecars in layout_image popup menu
author nadvornik
date Mon, 28 Sep 2009 09:57:06 +0000
parents c029adbabb70
children
comparison
equal deleted inserted replaced
1723:25471efb11ba 1724:5276dabe836f
31 #include "slideshow.h" 31 #include "slideshow.h"
32 #include "ui_fileops.h" 32 #include "ui_fileops.h"
33 #include "ui_menu.h" 33 #include "ui_menu.h"
34 #include "uri_utils.h" 34 #include "uri_utils.h"
35 #include "utilops.h" 35 #include "utilops.h"
36 #include "view_file.h"
36 37
37 #include <gdk/gdkkeysyms.h> /* for keyboard values */ 38 #include <gdk/gdkkeysyms.h> /* for keyboard values */
38 39
39 40
40 static GtkWidget *layout_image_pop_menu(LayoutWindow *lw); 41 static GtkWidget *layout_image_pop_menu(LayoutWindow *lw);
459 { 460 {
460 GList *list = NULL; 461 GList *list = NULL;
461 FileData *fd = layout_image_get_fd(lw); 462 FileData *fd = layout_image_get_fd(lw);
462 463
463 if (fd) 464 if (fd)
464 list = g_list_append(NULL, file_data_ref(fd)); 465 {
466 if (lw->vf)
467 /* optionally include sidecars if the filelist entry is not expanded */
468 list = vf_selection_get_one(lw->vf, fd);
469 else
470 list = g_list_append(NULL, file_data_ref(fd));
471 }
465 472
466 return list; 473 return list;
467 } 474 }
468 475
469 static GtkWidget *layout_image_pop_menu(LayoutWindow *lw) 476 static GtkWidget *layout_image_pop_menu(LayoutWindow *lw)