/*
- * Geeqie
- * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2010 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"
ImageWindow *imd;
imd = view_window_active_image(vw);
- gdk_window_get_origin(imd->pr->window, x, y);
+ gdk_window_get_origin(gtk_widget_get_window(imd->pr), x, y);
popup_menu_position_clamp(menu, x, y, 0);
}
stop_signal = TRUE;
switch (event->keyval)
{
- case GDK_Left: case GDK_KP_Left:
+ case GDK_KEY_Left: case GDK_KEY_KP_Left:
x -= 1;
break;
- case GDK_Right: case GDK_KP_Right:
+ case GDK_KEY_Right: case GDK_KEY_KP_Right:
x += 1;
break;
- case GDK_Up: case GDK_KP_Up:
+ case GDK_KEY_Up: case GDK_KEY_KP_Up:
y -= 1;
break;
- case GDK_Down: case GDK_KP_Down:
+ case GDK_KEY_Down: case GDK_KEY_KP_Down:
y += 1;
break;
default:
if (event->state & GDK_CONTROL_MASK)
{
- gint n = -1;
-
stop_signal = TRUE;
switch (event->keyval)
{
case '1':
- n = 0;
- break;
case '2':
- n = 1;
- break;
case '3':
- n = 2;
- break;
case '4':
- n = 3;
- break;
case '5':
- n = 4;
- break;
case '6':
- n = 5;
- break;
case '7':
- n = 6;
- break;
case '8':
- n = 7;
- break;
case '9':
- n = 8;
- break;
case '0':
- n = 9;
break;
case 'C': case 'c':
file_util_copy(image_get_fd(imd), NULL, NULL, imd->widget);
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;
stop_signal = TRUE;
switch (event->keyval)
{
- case GDK_Page_Up: case GDK_KP_Page_Up:
- case GDK_BackSpace:
+ case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up:
+ case GDK_KEY_BackSpace:
case 'B': case 'b':
view_step_prev(vw);
break;
- case GDK_Page_Down: case GDK_KP_Page_Down:
- case GDK_space:
+ case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down:
+ case GDK_KEY_space:
case 'N': case 'n':
view_step_next(vw);
break;
- case GDK_Home: case GDK_KP_Home:
+ case GDK_KEY_Home: case GDK_KEY_KP_Home:
view_step_to_end(vw, FALSE);
break;
- case GDK_End: case GDK_KP_End:
+ case GDK_KEY_End: case GDK_KEY_KP_End:
view_step_to_end(vw, TRUE);
break;
- case '+': case '=': case GDK_KP_Add:
+ case '+': case '=': case GDK_KEY_KP_Add:
image_zoom_adjust(imd, get_zoom_increment());
break;
- case '-': case GDK_KP_Subtract:
+ case '-': case GDK_KEY_KP_Subtract:
image_zoom_adjust(imd, -get_zoom_increment());
break;
- case 'X': case 'x': case GDK_KP_Multiply:
+ case 'X': case 'x': case GDK_KEY_KP_Multiply:
image_zoom_set(imd, 0.0);
break;
- case 'Z': case 'z': case GDK_KP_Divide: case '1':
+ case 'Z': case 'z': case GDK_KEY_KP_Divide: case '1':
image_zoom_set(imd, 1.0);
break;
case '2':
break;
case 'F': case 'f':
case 'V': case 'v':
- case GDK_F11:
+ case GDK_KEY_F11:
view_fullscreen_toggle(vw, FALSE);
break;
case 'I': case 'i':
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_Delete: case GDK_KP_Delete:
+ 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;
- case GDK_Escape:
+ case GDK_KEY_Escape:
if (vw->fs)
{
view_fullscreen_toggle(vw, TRUE);
view_window_close(vw);
}
break;
- case GDK_Menu:
- case GDK_F10:
+ case GDK_KEY_Menu:
+ case GDK_KEY_F10:
menu = view_popup_menu(vw);
gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
view_window_menu_pos_cb, vw, 0, GDK_CURRENT_TIME);
break;
}
}
+ if (!stop_signal && is_help_key(event))
+ {
+ help_window_show("GuideOtherWindowsImageWindow.html");
+ stop_signal = TRUE;
+ }
return stop_signal;
}
switch (event->button)
{
case MOUSE_BUTTON_LEFT:
- view_step_next(vw);
+ 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)
{
{
if (image_osd_get(vw->imd) & OSD_SHOW_INFO)
image_osd_set(vw->imd, image_osd_get(vw->fs->imd));
-
+
fullscreen_stop(vw->fs);
}
else
ImageWindow *imd;
imd = view_window_active_image(vw);
-
+
image_osd_toggle(imd);
}
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)
{
image_change_fd(vw->imd, fd, image_zoom_get_default(NULL));
}
- 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);
- }
+ /* Wait until image is loaded otherwise size is not defined */
+ image_load_dimensions(fd, &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);
{
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)
{
ViewWindow *vw = work->data;
work = work->next;
-
+
image_background_set_color_from_options(vw->imd, !!vw->fs);
}
}
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)
GList *editmenu_fd_list = data;
filelist_free(editmenu_fd_list);
-}
+}
static GList *view_window_get_fd_list(ViewWindow *vw)
{
FileData *fd = image_get_fd(imd);
if (fd) list = g_list_append(NULL, file_data_ref(fd));
}
-
+
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;
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)
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));
}
}
{
GList *work;
- list = uri_filelist_from_text((gchar *)selection_data->data, TRUE);
+ list = uri_filelist_from_gtk_selection_data(selection_data);
work = list;
while (work)
}
else
{
- source = collection_from_dnd_data((gchar *)selection_data->data, &list, &info_list);
+ source = collection_from_dnd_data((gchar *)gtk_selection_data_get_data(selection_data), &list, &info_list);
}
if (list)
if (fd)
{
- gchar *text = NULL;
- gint len;
- gboolean plain_text;
GList *list;
- switch (info)
- {
- case TARGET_URI_LIST:
- plain_text = FALSE;
- break;
- case TARGET_TEXT_PLAIN:
- default:
- plain_text = TRUE;
- break;
- }
list = g_list_append(NULL, fd);
- text = uri_text_from_filelist(list, &len, plain_text);
+ uri_selection_data_set_uris_from_filelist(selection_data, list);
g_list_free(list);
- if (text)
- {
- gtk_selection_data_set(selection_data, selection_data->target,
- 8, (guchar *)text, len);
- g_free(text);
- }
}
else
{
- gtk_selection_data_set(selection_data, selection_data->target,
+ gtk_selection_data_set(selection_data, gtk_selection_data_get_target(selection_data),
8, NULL, 0);
}
}
ViewWindow *vw = data;
if (!(type & NOTIFY_CHANGE) || !fd->change) return;
-
+
DEBUG_1("Notify view_window: %s %04x", fd->path, type);
switch (fd->change->type)
projects / geeqie.git / blobdiff