/*
- * Geeqie
- * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2012 The Geeqie Team
+ * Copyright (C) 2006 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
*
* Author: John Ellis
*
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
#include "main.h"
#include "img-view.h"
#include "filedata.h"
#include "fullscreen.h"
#include "image.h"
+#include "image-load.h"
#include "image-overlay.h"
#include "layout.h"
#include "layout_image.h"
+#include "layout_util.h"
#include "menu.h"
#include "misc.h"
#include "pixbuf_util.h"
static void view_window_notify_cb(FileData *fd, NotifyType type, gpointer data);
+
+/**
+ * This array must be kept in sync with the contents of:\n
+ * @link view_popup_menu() @endlink \n
+ * @link view_window_key_press_cb() @endlink
+ *
+ * See also @link hard_coded_window_keys @endlink
+ **/
+hard_coded_window_keys image_window_keys[] = {
+ {GDK_CONTROL_MASK, 'C', N_("Copy")},
+ {GDK_CONTROL_MASK, 'M', N_("Move")},
+ {GDK_CONTROL_MASK, 'R', N_("Rename")},
+ {GDK_CONTROL_MASK, 'D', N_("Move to Trash")},
+ {0, GDK_KEY_Delete, N_("Move to Trash")},
+ {GDK_SHIFT_MASK, GDK_KEY_Delete, N_("Delete")},
+ {GDK_CONTROL_MASK, 'W', N_("Close window")},
+ {GDK_SHIFT_MASK, 'R', N_("Rotate 180°")},
+ {GDK_SHIFT_MASK, 'M', N_("Rotate mirror")},
+ {GDK_SHIFT_MASK, 'F', N_("Rotate flip")},
+ {0, ']', N_(" Rotate counterclockwise 90°")},
+ {0, '[', N_(" Rotate clockwise 90°")},
+ {0, GDK_KEY_Page_Up, N_("Previous")},
+ {0, GDK_KEY_KP_Page_Up, N_("Previous")},
+ {0, GDK_KEY_BackSpace, N_("Previous")},
+ {0, 'B', N_("Previous")},
+ {0, GDK_KEY_Page_Down, N_("Next")},
+ {0, GDK_KEY_KP_Page_Down, N_("Next")},
+ {0, GDK_KEY_space, N_("Next")},
+ {0, 'N', N_("Next")},
+ {0, GDK_KEY_equal, N_("Zoom in")},
+ {0, GDK_KEY_plus, N_("Zoom in")},
+ {0, GDK_KEY_minus, N_("Zoom out")},
+ {0, 'X', N_("Zoom to fit")},
+ {0, GDK_KEY_KP_Multiply, N_("Zoom to fit")},
+ {0, 'Z', N_("Zoom 1:1")},
+ {0, GDK_KEY_KP_Divide, N_("Zoom 1:1")},
+ {0, GDK_KEY_1, N_("Zoom 1:1")},
+ {0, '2', N_("Zoom 2:1")},
+ {0, '3', N_("Zoom 3:1")},
+ {0, '4', N_("Zoom 4:1")},
+ {0, '7', N_("Zoom 1:4")},
+ {0, '8', N_("Zoom 1:3")},
+ {0, '9', N_("Zoom 1:2")},
+ {0, 'W', N_("Zoom fit window width")},
+ {0, 'H', N_("Zoom fit window height")},
+ {0, 'S', N_("Toggle slideshow")},
+ {0, 'P', N_("Pause slideshow")},
+ {0, 'R', N_("Reload image")},
+ {0, 'F', N_("Full screen")},
+ {0, 'V', N_("Fullscreen")},
+ {0, GDK_KEY_F11, N_("Fullscreen")},
+ {0, 'I', N_("Image overlay")},
+ {0, GDK_KEY_Escape, N_("Exit fullscreen")},
+ {0, GDK_KEY_Escape, N_("Close window")},
+ {GDK_SHIFT_MASK, 'G', N_("Desaturate")},
+ {GDK_SHIFT_MASK, 'P', N_("Print")},
+ {0, 0, NULL}
+};
+
+
/*
*-----------------------------------------------------------------------------
* misc
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':
switch (event->keyval)
{
case 'R': case 'r':
- image_alter_orientation(imd, ALTER_ROTATE_180);
+ image_alter_orientation(imd, imd->image_fd, ALTER_ROTATE_180);
break;
case 'M': case 'm':
- image_alter_orientation(imd, ALTER_MIRROR);
+ image_alter_orientation(imd, imd->image_fd, ALTER_MIRROR);
break;
case 'F': case 'f':
- image_alter_orientation(imd, ALTER_FLIP);
+ image_alter_orientation(imd, imd->image_fd, ALTER_FLIP);
break;
case 'G': case 'g':
image_set_desaturate(imd, !image_get_desaturate(imd));
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;
view_overlay_toggle(vw);
break;
case ']':
- image_alter_orientation(imd, ALTER_ROTATE_90);
+ image_alter_orientation(imd, imd->image_fd, ALTER_ROTATE_90);
break;
case '[':
- image_alter_orientation(imd, ALTER_ROTATE_90_CC);
+ image_alter_orientation(imd, imd->image_fd, ALTER_ROTATE_90_CC);
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;
break;
}
}
+ if (!stop_signal && is_help_key(event))
+ {
+ help_window_show("GuideOtherWindowsImageWindow.html");
+ stop_signal = TRUE;
+ }
return stop_signal;
}
{
ViewWindow *vw = data;
GtkWidget *menu;
+ gchar *dest_dir;
+ LayoutWindow *lw_new;
switch (event->button)
{
case MOUSE_BUTTON_LEFT:
- view_step_next(vw);
+ if (options->image_l_click_archive && imd->image_fd->format_class == FORMAT_CLASS_ARCHIVE)
+ {
+ dest_dir = open_archive(imd->image_fd);
+ if (dest_dir)
+ {
+ lw_new = layout_new_from_default();
+ layout_set_path(lw_new, dest_dir);
+ g_free(dest_dir);
+ }
+ else
+ {
+ warning_dialog(_("Cannot open archive file"), _("See the Log Window"), GTK_STOCK_DIALOG_WARNING, NULL);
+ }
+ }
+ else if (options->image_l_click_video && options->image_l_click_video_editor && imd->image_fd->format_class == FORMAT_CLASS_VIDEO)
+ {
+ start_editor_from_file(options->image_l_click_video_editor, imd->image_fd);
+ }
+ else if (options->image_lm_click_nav)
+ view_step_next(vw);
break;
case MOUSE_BUTTON_MIDDLE:
- view_step_prev(vw);
+ if (options->image_lm_click_nav)
+ view_step_prev(vw);
break;
case MOUSE_BUTTON_RIGHT:
menu = view_popup_menu(vw);
{
ViewWindow *vw = data;
- if (event->state & GDK_CONTROL_MASK)
+ if ((event->state & GDK_CONTROL_MASK) ||
+ (imd->mouse_wheel_mode && !options->image_lm_click_nav))
{
switch (event->direction)
{
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;
req_size.height = h;
gtk_widget_size_allocate(GTK_WIDGET(vw->window), &req_size);
+#if !GTK_CHECK_VERSION(3,0,0)
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);
file_data_register_notify_func(view_window_notify_cb, vw, NOTIFY_PRIORITY_LOW);
+ /** @FIXME This is a hack to fix #965 View in new window - blank image
+ * The problem occurs when zoom is set to Original Size and Preload
+ * Next Image is set.
+ * An extra reload is required to force the image to be displayed.
+ * This is probably not the correct solution.
+ **/
+ image_reload(vw->imd);
+
return 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)
type = GPOINTER_TO_INT(data);
if (!vw) return;
- image_alter_orientation(vw->imd, type);
+ 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);
}
ImageWindow *imd;
imd = view_window_active_image(vw);
- file_util_copy_path_to_clipboard(image_get_fd(imd));
+ file_util_copy_path_to_clipboard(image_get_fd(imd), TRUE);
+}
+
+static void view_copy_path_unquoted_cb(GtkWidget *widget, gpointer data)
+{
+ ViewWindow *vw = data;
+ ImageWindow *imd;
+
+ imd = view_window_active_image(vw);
+ file_util_copy_path_to_clipboard(image_get_fd(imd), FALSE);
}
static void view_fullscreen_cb(GtkWidget *widget, gpointer data)
return list;
}
+/**
+ * @brief Add file selection list to a collection
+ * @param[in] widget
+ * @param[in] data Index to the collection list menu item selected, or -1 for new collection
+ *
+ *
+ */
+static void image_pop_menu_collections_cb(GtkWidget *widget, gpointer data)
+{
+ ViewWindow *vw;
+ ImageWindow *imd;
+ FileData *fd;
+ GList *selection_list = NULL;
+
+ vw = submenu_item_get_data(widget);
+ imd = view_window_active_image(vw);
+ fd = image_get_fd(imd);
+ selection_list = g_list_append(selection_list, fd);
+ pop_menu_collections(selection_list, data);
+
+ filelist_free(selection_list);
+}
+
static GtkWidget *view_popup_menu(ViewWindow *vw)
{
GtkWidget *menu;
GtkWidget *item;
GList *editmenu_fd_list;
+ GtkAccelGroup *accel_group;
menu = popup_menu_short_lived();
+ accel_group = gtk_accel_group_new();
+ gtk_menu_set_accel_group(GTK_MENU(menu), accel_group);
+
+ g_object_set_data(G_OBJECT(menu), "window_keys", image_window_keys);
+ g_object_set_data(G_OBJECT(menu), "accel_group", accel_group);
menu_item_add_stock(menu, _("Zoom _in"), GTK_STOCK_ZOOM_IN, G_CALLBACK(view_zoom_in_cb), vw);
menu_item_add_stock(menu, _("Zoom _out"), GTK_STOCK_ZOOM_OUT, G_CALLBACK(view_zoom_out_cb), vw);
menu_item_add_stock(menu, _("Zoom _1:1"), GTK_STOCK_ZOOM_100, G_CALLBACK(view_zoom_1_1_cb), vw);
- menu_item_add_stock(menu, _("Fit image to _window"), GTK_STOCK_ZOOM_FIT, G_CALLBACK(view_zoom_fit_cb), vw);
+ menu_item_add_stock(menu, _("Zoom to fit"), GTK_STOCK_ZOOM_FIT, G_CALLBACK(view_zoom_fit_cb), vw);
menu_item_add_divider(menu);
editmenu_fd_list = view_window_get_fd_list(vw);
G_CALLBACK(view_popup_menu_destroy_cb), editmenu_fd_list);
item = submenu_add_edit(menu, NULL, G_CALLBACK(view_edit_cb), vw, editmenu_fd_list);
menu_item_add_divider(item);
+#if !GTK_CHECK_VERSION(3,0,0)
menu_item_add(item, _("Set as _wallpaper"), G_CALLBACK(view_wallpaper_cb), vw);
-
+#endif
submenu_add_alter(menu, G_CALLBACK(view_alter_cb), vw);
menu_item_add_stock(menu, _("View in _new window"), GTK_STOCK_NEW, G_CALLBACK(view_new_window_cb), vw);
menu_item_add_stock(menu, _("_Copy..."), GTK_STOCK_COPY, G_CALLBACK(view_copy_cb), vw);
menu_item_add(menu, _("_Move..."), G_CALLBACK(view_move_cb), vw);
menu_item_add(menu, _("_Rename..."), G_CALLBACK(view_rename_cb), vw);
- menu_item_add_stock(menu, _("_Delete..."), GTK_STOCK_DELETE, G_CALLBACK(view_delete_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_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);
+ submenu_add_collections(menu, &item,
+ G_CALLBACK(image_pop_menu_collections_cb), vw);
+ gtk_widget_set_sensitive(item, TRUE);
menu_item_add_divider(menu);
if (vw->ss)
{
- menu_item_add(menu, _("_Stop slideshow"), G_CALLBACK(view_slideshow_stop_cb), vw);
+ menu_item_add(menu, _("Toggle _slideshow"), G_CALLBACK(view_slideshow_stop_cb), vw);
if (slideshow_paused(vw->ss))
{
item = menu_item_add(menu, _("Continue slides_how"),
}
else
{
- item = menu_item_add(menu, _("_Start slideshow"), G_CALLBACK(view_slideshow_start_cb), vw);
+ item = menu_item_add(menu, _("Toggle _slideshow"), G_CALLBACK(view_slideshow_start_cb), vw);
gtk_widget_set_sensitive(item, (vw->list != NULL) || view_window_contains_collection(vw));
item = menu_item_add(menu, _("Pause slides_how"), G_CALLBACK(view_slideshow_pause_cb), vw);
gtk_widget_set_sensitive(item, FALSE);
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));
}
}