#include "filedata.h"
#include "fullscreen.h"
#include "image.h"
+#include "image-load.h"
#include "image-overlay.h"
#include "layout.h"
#include "layout_image.h"
file_util_rename(image_get_fd(imd), NULL, imd->widget);
break;
case 'D': case 'd':
+ options->file_ops.safe_delete_enable = TRUE;
file_util_delete(image_get_fd(imd), NULL, imd->widget);
break;
case 'W': case 'w':
filelist_copy(vw->list), vw->window);
}
break;
+ case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
+ if (options->file_ops.enable_delete_key)
+ {
+ options->file_ops.safe_delete_enable = FALSE;
+ file_util_delete(image_get_fd(imd), NULL, imd->widget);
+ }
+ break;
default:
stop_signal = FALSE;
break;
case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
if (options->file_ops.enable_delete_key)
{
+ options->file_ops.safe_delete_enable = TRUE;
file_util_delete(image_get_fd(imd), NULL, imd->widget);
}
break;
vw = g_new0(ViewWindow, 1);
vw->window = window_new(GTK_WINDOW_TOPLEVEL, "view", PIXBUF_INLINE_ICON_VIEW, NULL, NULL);
+ DEBUG_NAME(vw->window);
geometry.min_width = DEFAULT_MINIMAL_WINDOW_SIZE;
geometry.min_height = DEFAULT_MINIMAL_WINDOW_SIZE;
if (cd && info)
{
image_change_from_collection(vw->imd, cd, info, image_zoom_get_default(NULL));
+ /* Grab the fd so we can correctly size the window in
+ the call to image_load_dimensions() below. */
+ fd = info->fd;
if (options->image.enable_read_ahead)
{
CollectInfo * r_info = collection_next_by_info(cd, info);
view_window_set_list(vw, list);
vw->list_pointer = vw->list;
image_change_fd(vw->imd, (FileData *)vw->list->data, image_zoom_get_default(NULL));
+ /* Set fd to first in list */
+ fd = vw->list->data;
if (options->image.enable_read_ahead)
{
}
/* Wait until image is loaded otherwise size is not defined */
- int count;
- for (count = 10; count && !w && !h; count++)
- {
- image_get_image_size(vw->imd, &w, &h);
- usleep(100000);
- }
+ image_load_dimensions(fd, &w, &h);
- if (image_zoom_get(vw->imd) == 0.0)
- {
- image_get_image_size(vw->imd, &w, &h);
- }
- else
- {
- pixbuf_renderer_get_scaled_size(PIXBUF_RENDERER(vw->imd->pr), &w, &h);
- }
if (options->image.limit_window_size)
{
gint mw = gdk_screen_width() * options->image.max_window_size / 100;
gtk_widget_set_size_request(vw->imd->pr, w, h);
#endif
+ gtk_window_set_focus_on_map(GTK_WINDOW(vw->window), FALSE);
gtk_widget_show(vw->window);
view_window_list = g_list_append(view_window_list, vw);
{
GList *list;
- if (file_extension_match(fd->path, GQ_COLLECTION_EXT))
+ if (fd)
{
- ViewWindow *vw;
- CollectionData *cd;
- CollectInfo *info;
-
- cd = collection_new(fd->path);
- if (collection_load(cd, fd->path, COLLECTION_LOAD_NONE))
+ if (file_extension_match(fd->path, GQ_COLLECTION_EXT))
{
- info = collection_get_first(cd);
+ ViewWindow *vw;
+ CollectionData *cd;
+ CollectInfo *info;
+
+ cd = collection_new(fd->path);
+ if (collection_load(cd, fd->path, COLLECTION_LOAD_NONE))
+ {
+ info = collection_get_first(cd);
+ }
+ else
+ {
+ collection_unref(cd);
+ cd = NULL;
+ info = NULL;
+ }
+ vw = real_view_window_new(NULL, NULL, cd, info);
+ if (vw && cd)
+ {
+ g_signal_connect(G_OBJECT(vw->window), "destroy",
+ G_CALLBACK(view_window_collection_unref_cb), cd);
+ }
}
- else
+ else if (isdir(fd->path) && filelist_read(fd, &list, NULL))
{
- collection_unref(cd);
- cd = NULL;
- info = NULL;
+ list = filelist_sort_path(list);
+ list = filelist_filter(list, FALSE);
+ real_view_window_new(NULL, list, NULL, NULL);
+ filelist_free(list);
}
- vw = real_view_window_new(NULL, NULL, cd, info);
- if (vw && cd)
+ else
{
- g_signal_connect(G_OBJECT(vw->window), "destroy",
- G_CALLBACK(view_window_collection_unref_cb), cd);
+ real_view_window_new(fd, NULL, NULL, NULL);
}
}
- else if (isdir(fd->path) && filelist_read(fd, &list, NULL))
- {
- list = filelist_sort_path(list);
- list = filelist_filter(list, FALSE);
- real_view_window_new(NULL, list, NULL, NULL);
- filelist_free(list);
- }
- else
- {
- real_view_window_new(fd, NULL, NULL, NULL);
- }
}
void view_window_new_from_list(GList *list)
image_alter_orientation(vw->imd, vw->imd->image_fd, type);
}
+#if !GTK_CHECK_VERSION(3,0,0)
static void view_wallpaper_cb(GtkWidget *widget, gpointer data)
{
ViewWindow *vw = data;
imd = view_window_active_image(vw);
image_to_root_window(imd, (image_zoom_get(imd) == 0.0));
}
+#endif
static void view_zoom_in_cb(GtkWidget *widget, gpointer data)
{
ImageWindow *imd;
imd = view_window_active_image(vw);
+ options->file_ops.safe_delete_enable = FALSE;
+ file_util_delete(image_get_fd(imd), NULL, imd->widget);
+}
+
+static void view_move_to_trash_cb(GtkWidget *widget, gpointer data)
+{
+ ViewWindow *vw = data;
+ ImageWindow *imd;
+
+ imd = view_window_active_image(vw);
+ options->file_ops.safe_delete_enable = TRUE;
file_util_delete(image_get_fd(imd), NULL, imd->widget);
}
static GtkWidget *view_popup_menu(ViewWindow *vw)
{
GtkWidget *menu;
- GtkWidget *submenu;
GtkWidget *item;
GList *editmenu_fd_list;
menu_item_add(menu, _("_Rename..."), G_CALLBACK(view_rename_cb), vw);
menu_item_add(menu, _("_Copy path"), G_CALLBACK(view_copy_path_cb), vw);
menu_item_add(menu, _("_Copy path unquoted"), G_CALLBACK(view_copy_path_unquoted_cb), vw);
- menu_item_add_stock(menu, _("_Delete..."), GTK_STOCK_DELETE, G_CALLBACK(view_delete_cb), vw);
+
+ menu_item_add_divider(menu);
+ menu_item_add_stock(menu,
+ options->file_ops.confirm_move_to_trash ? _("Move to Trash...") :
+ _("Move to Trash"), PIXBUF_INLINE_ICON_TRASH,
+ G_CALLBACK(view_move_to_trash_cb), vw);
+ menu_item_add_stock(menu,
+ options->file_ops.confirm_delete ? _("_Delete...") :
+ _("_Delete"), GTK_STOCK_DELETE,
+ G_CALLBACK(view_delete_cb), vw);
menu_item_add_divider(menu);
list = filelist_recursive(fd);
}
else
- { /*FIXME */
+ { /** @FIXME ?? */
filelist_read(fd, &list, NULL);
list = filelist_sort_path(list);
list = filelist_filter(list, FALSE);
}
else
{
- /* FIXME: no filtering here */
+ /** @FIXME no filtering here */
vw->list = g_list_append(vw->list, file_data_ref(fd));
}
}
projects / geeqie.git / blobdiff