annotate src/img-view.c @ 1329:1fc356f629fe

Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
author zas_
date Thu, 26 Feb 2009 20:50:36 +0000
parents 55ea4962887a
children 79937bc55f3a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1 /*
196
f6e307c7bad6 rename GQview -> Geeqie over the code
nadvornik
parents: 138
diff changeset
2 * Geeqie
94
50dc5a14d37b Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
3 * (C) 2006 John Ellis
1284
8b89e3ff286b Add year 2009 to copyright info everywhere.
zas_
parents: 1272
diff changeset
4 * Copyright (C) 2008 - 2009 The Geeqie Team
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
5 *
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
6 * Author: John Ellis
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
7 *
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
8 * This software is released under the GNU General Public License (GNU GPL).
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
9 * Please read the included file COPYING for more information.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
10 * This software comes with no warranty of any kind, use at your own risk!
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
11 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
12
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
13
281
9995c5fb202a gqview.h -> main.h
zas_
parents: 254
diff changeset
14 #include "main.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
15 #include "img-view.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
16
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
17 #include "collect.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
18 #include "collect-io.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
19 #include "dnd.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
20 #include "editors.h"
586
905688aa2317 split filelist.c to filefilter.c and filedata.c
nadvornik
parents: 531
diff changeset
21 #include "filedata.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
22 #include "fullscreen.h"
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
23 #include "image.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
24 #include "image-overlay.h"
368
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
25 #include "layout.h"
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
26 #include "layout_image.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
27 #include "menu.h"
1022
9962b24b6b43 Move miscellaneous functions to their own files (new misc.[ch]).
zas_
parents: 995
diff changeset
28 #include "misc.h"
9962b24b6b43 Move miscellaneous functions to their own files (new misc.[ch]).
zas_
parents: 995
diff changeset
29 #include "pixbuf_util.h"
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
30 #include "pixbuf-renderer.h"
94
50dc5a14d37b Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
31 #include "print.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
32 #include "slideshow.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
33 #include "ui_fileops.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
34 #include "ui_menu.h"
904
1698baa37871 Move uri_*() functions to separate files: uri_utils.[ch]
zas_
parents: 888
diff changeset
35 #include "uri_utils.h"
1022
9962b24b6b43 Move miscellaneous functions to their own files (new misc.[ch]).
zas_
parents: 995
diff changeset
36 #include "utilops.h"
648
e34c1002e553 Move some functions from main.[ch] to new window.[ch].
zas_
parents: 621
diff changeset
37 #include "window.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
38
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
39 #include <gdk/gdkkeysyms.h> /* for keyboard values */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
40
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
41
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
42 typedef struct _ViewWindow ViewWindow;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
43 struct _ViewWindow
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
44 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
45 GtkWidget *window;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
46 ImageWindow *imd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
47 FullScreenData *fs;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
48 SlideShowData *ss;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
49
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
50 GList *list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
51 GList *list_pointer;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
52 };
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
53
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
54
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
55 static GList *view_window_list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
56
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
57
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
58 static GtkWidget *view_popup_menu(ViewWindow *vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
59 static void view_fullscreen_toggle(ViewWindow *vw, gint force_off);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
60 static void view_overlay_toggle(ViewWindow *vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
61
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
62 static void view_slideshow_next(ViewWindow *vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
63 static void view_slideshow_prev(ViewWindow *vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
64 static void view_slideshow_start(ViewWindow *vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
65 static void view_slideshow_stop(ViewWindow *vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
66
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
67 static void view_window_close(ViewWindow *vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
68
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
69 static void view_window_dnd_init(ViewWindow *vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
70
797
799d035b9994 use new notification in img-view
nadvornik
parents: 783
diff changeset
71 static void view_window_notify_cb(FileData *fd, NotifyType type, gpointer data);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
72
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
73 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
74 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
75 * misc
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
76 *-----------------------------------------------------------------------------
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 369
diff changeset
77 */
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
78
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
79 static ImageWindow *view_window_active_image(ViewWindow *vw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
80 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
81 if (vw->fs) return vw->fs->imd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
82
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
83 return vw->imd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
84 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
85
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
86 static void view_window_set_list(ViewWindow *vw, GList *list)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
87 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
88
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
89 filelist_free(vw->list);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
90 vw->list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
91 vw->list_pointer = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
92
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
93 vw->list = filelist_copy(list);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
94 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
95
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
96 static gint view_window_contains_collection(ViewWindow *vw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
97 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
98 CollectionData *cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
99 CollectInfo *info;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
100
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
101 cd = image_get_collection(view_window_active_image(vw), &info);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
102
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
103 return (cd && info);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
104 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
105
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
106 static void view_collection_step(ViewWindow *vw, gint next)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
107 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
108 ImageWindow *imd = view_window_active_image(vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
109 CollectionData *cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
110 CollectInfo *info;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
111 CollectInfo *read_ahead_info = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
112
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
113 cd = image_get_collection(imd, &info);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
114
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
115 if (!cd || !info) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
116
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
117 if (next)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
118 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
119 info = collection_next_by_info(cd, info);
334
df868b947aa0 Rename image-related options.
zas_
parents: 318
diff changeset
120 if (options->image.enable_read_ahead)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
121 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
122 read_ahead_info = collection_next_by_info(cd, info);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
123 if (!read_ahead_info) read_ahead_info = collection_prev_by_info(cd, info);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
124 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
125 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
126 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
127 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
128 info = collection_prev_by_info(cd, info);
334
df868b947aa0 Rename image-related options.
zas_
parents: 318
diff changeset
129 if (options->image.enable_read_ahead)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
130 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
131 read_ahead_info = collection_prev_by_info(cd, info);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
132 if (!read_ahead_info) read_ahead_info = collection_next_by_info(cd, info);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
133 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
134 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
135
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
136 if (info)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
137 {
885
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
138 image_change_from_collection(imd, cd, info, image_zoom_get_default(imd));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
139
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
140 if (read_ahead_info) image_prebuffer_set(imd, read_ahead_info->fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
141 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 369
diff changeset
142
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
143 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
144
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
145 static void view_collection_step_to_end(ViewWindow *vw, gint last)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
146 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
147 ImageWindow *imd = view_window_active_image(vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
148 CollectionData *cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
149 CollectInfo *info;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
150 CollectInfo *read_ahead_info = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
151
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
152 cd = image_get_collection(imd, &info);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
153
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
154 if (!cd || !info) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
155
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
156 if (last)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
157 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
158 info = collection_get_last(cd);
334
df868b947aa0 Rename image-related options.
zas_
parents: 318
diff changeset
159 if (options->image.enable_read_ahead) read_ahead_info = collection_prev_by_info(cd, info);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
160 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
161 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
162 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
163 info = collection_get_first(cd);
334
df868b947aa0 Rename image-related options.
zas_
parents: 318
diff changeset
164 if (options->image.enable_read_ahead) read_ahead_info = collection_next_by_info(cd, info);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
165 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
166
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
167 if (info)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
168 {
885
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
169 image_change_from_collection(imd, cd, info, image_zoom_get_default(imd));
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
170 if (read_ahead_info) image_prebuffer_set(imd, read_ahead_info->fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
171 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
172 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
173
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
174 static void view_list_step(ViewWindow *vw, gint next)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
175 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
176 ImageWindow *imd = view_window_active_image(vw);
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
177 FileData *fd;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
178 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
179 GList *work_ahead;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
180
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
181 if (!vw->list) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
182
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
183 fd = image_get_fd(imd);
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
184 if (!fd) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
185
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
186 if (g_list_position(vw->list, vw->list_pointer) >= 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
187 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
188 work = vw->list_pointer;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
189 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
190 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
191 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
192 gint found = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
193
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
194 work = vw->list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
195 while (work && !found)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
196 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
197 FileData *temp;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
198
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
199 temp = work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
200
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
201 if (fd == temp)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
202 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
203 found = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
204 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
205 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
206 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
207 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
208 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
209 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
210 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
211 if (!work) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
212
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
213 work_ahead = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
214 if (next)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
215 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
216 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
217 if (work) work_ahead = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
218 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
219 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
220 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
221 work = work->prev;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
222 if (work) work_ahead = work->prev;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
223 }
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
224
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
225 if (!work) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
226
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
227 vw->list_pointer = work;
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
228 fd = work->data;
885
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
229 image_change_fd(imd, fd, image_zoom_get_default(imd));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
230
334
df868b947aa0 Rename image-related options.
zas_
parents: 318
diff changeset
231 if (options->image.enable_read_ahead && work_ahead)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
232 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
233 FileData *next_fd = work_ahead->data;
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
234 image_prebuffer_set(imd, next_fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
235 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
236 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
237
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
238 static void view_list_step_to_end(ViewWindow *vw, gint last)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
239 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
240 ImageWindow *imd = view_window_active_image(vw);
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
241 FileData *fd;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
242 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
243 GList *work_ahead;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
244
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
245 if (!vw->list) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
246
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
247 if (last)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
248 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
249 work = g_list_last(vw->list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
250 work_ahead = work->prev;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
251 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
252 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
253 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
254 work = vw->list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
255 work_ahead = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
256 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
257
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
258 vw->list_pointer = work;
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
259 fd = work->data;
885
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
260 image_change_fd(imd, fd, image_zoom_get_default(imd));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
261
334
df868b947aa0 Rename image-related options.
zas_
parents: 318
diff changeset
262 if (options->image.enable_read_ahead && work_ahead)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
263 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
264 FileData *next_fd = work_ahead->data;
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
265 image_prebuffer_set(imd, next_fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
266 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
267 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
268
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
269 static void view_step_next(ViewWindow *vw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
270 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
271 if (vw->ss)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
272 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
273 view_slideshow_next(vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
274 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
275 else if (vw->list)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
276 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
277 view_list_step(vw, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
278 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
279 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
280 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
281 view_collection_step(vw, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
282 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
283 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
284
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
285 static void view_step_prev(ViewWindow *vw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
286 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
287 if (vw->ss)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
288 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
289 view_slideshow_prev(vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
290 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
291 else if (vw->list)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
292 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
293 view_list_step(vw, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
294 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
295 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
296 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
297 view_collection_step(vw, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
298 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
299 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
300
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
301 static void view_step_to_end(ViewWindow *vw, gint last)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
302 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
303 if (vw->list)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
304 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
305 view_list_step_to_end(vw, last);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
306 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
307 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
308 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
309 view_collection_step_to_end(vw, last);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
310 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
311 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
312
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
313 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
314 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
315 * view window keyboard
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
316 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
317 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
318
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
319 static void view_window_menu_pos_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
320 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
321 ViewWindow *vw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
322 ImageWindow *imd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
323
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
324 imd = view_window_active_image(vw);
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
325 gdk_window_get_origin(imd->pr->window, x, y);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
326 popup_menu_position_clamp(menu, x, y, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
327 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
328
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
329 static gint view_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
330 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
331 ViewWindow *vw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
332 ImageWindow *imd;
84
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
333 gint stop_signal;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
334 GtkWidget *menu;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
335 gint x = 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
336 gint y = 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
337
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
338 imd = view_window_active_image(vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
339
84
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
340 stop_signal = TRUE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
341 switch (event->keyval)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
342 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
343 case GDK_Left: case GDK_KP_Left:
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
344 x -= 1;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
345 break;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
346 case GDK_Right: case GDK_KP_Right:
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
347 x += 1;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
348 break;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
349 case GDK_Up: case GDK_KP_Up:
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
350 y -= 1;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
351 break;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
352 case GDK_Down: case GDK_KP_Down:
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
353 y += 1;
84
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
354 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
355 default:
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
356 stop_signal = FALSE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
357 break;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
358 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
359
84
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
360 if (x != 0 || y!= 0)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
361 {
84
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
362 if (event->state & GDK_SHIFT_MASK)
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
363 {
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
364 x *= 3;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
365 y *= 3;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
366 }
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
367
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
368 keyboard_scroll_calc(&x, &y, event);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
369 image_scroll(imd, x, y);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
370 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
371
84
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
372 if (stop_signal) return stop_signal;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
373
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
374 if (event->state & GDK_CONTROL_MASK)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
375 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
376 gint n = -1;
84
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
377
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
378 stop_signal = TRUE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
379 switch (event->keyval)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
380 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
381 case '1':
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
382 n = 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
383 break;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
384 case '2':
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
385 n = 1;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
386 break;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
387 case '3':
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
388 n = 2;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
389 break;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
390 case '4':
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
391 n = 3;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
392 break;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
393 case '5':
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
394 n = 4;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
395 break;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
396 case '6':
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
397 n = 5;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
398 break;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
399 case '7':
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
400 n = 6;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
401 break;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
402 case '8':
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
403 n = 7;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
404 break;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
405 case '9':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
406 n = 8;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
407 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
408 case '0':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
409 n = 9;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
410 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
411 case 'C': case 'c':
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
412 file_util_copy(image_get_fd(imd), NULL, NULL, imd->widget);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
413 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
414 case 'M': case 'm':
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
415 file_util_move(image_get_fd(imd), NULL, NULL, imd->widget);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
416 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
417 case 'R': case 'r':
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
418 file_util_rename(image_get_fd(imd), NULL, imd->widget);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
419 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
420 case 'D': case 'd':
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
421 file_util_delete(image_get_fd(imd), NULL, imd->widget);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
422 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
423 case 'W': case 'w':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
424 view_window_close(vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
425 break;
84
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
426 default:
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
427 stop_signal = FALSE;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
428 break;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
429 }
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1211
diff changeset
430 #if 0
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
431 if (n != -1)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
432 {
60
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
433 if (!editor_window_flag_set(n))
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
434 {
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
435 view_fullscreen_toggle(vw, TRUE);
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
436 }
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
437 imd = view_window_active_image(vw);
753
477f48ba28d8 rewritten utilops.h:
nadvornik
parents: 736
diff changeset
438 file_util_start_editor_from_file(n, image_get_fd(imd), imd->widget);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
439 }
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1211
diff changeset
440 #endif
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
441 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
442 else if (event->state & GDK_SHIFT_MASK)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
443 {
84
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
444 stop_signal = TRUE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
445 switch (event->keyval)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
446 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
447 case 'R': case 'r':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
448 image_alter(imd, ALTER_ROTATE_180);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
449 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
450 case 'M': case 'm':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
451 image_alter(imd, ALTER_MIRROR);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
452 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
453 case 'F': case 'f':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
454 image_alter(imd, ALTER_FLIP);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
455 break;
82
a4c1b7014e6e Thu Oct 19 15:20:51 2006 John Ellis <johne@verizon.net>
gqview
parents: 64
diff changeset
456 case 'G': case 'g':
a4c1b7014e6e Thu Oct 19 15:20:51 2006 John Ellis <johne@verizon.net>
gqview
parents: 64
diff changeset
457 image_alter(imd, ALTER_DESATURATE);
a4c1b7014e6e Thu Oct 19 15:20:51 2006 John Ellis <johne@verizon.net>
gqview
parents: 64
diff changeset
458 break;
94
50dc5a14d37b Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
459 case 'P': case 'p':
50dc5a14d37b Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
460 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
461 FileData *fd;
94
50dc5a14d37b Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
462
50dc5a14d37b Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
463 view_fullscreen_toggle(vw, TRUE);
50dc5a14d37b Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
464 imd = view_window_active_image(vw);
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
465 fd = image_get_fd(imd);
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
466 print_window_new(fd,
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
467 fd ? g_list_append(NULL, file_data_ref(fd)) : NULL,
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
468 filelist_copy(vw->list), vw->window);
94
50dc5a14d37b Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
469 }
50dc5a14d37b Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
470 break;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
471 default:
84
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
472 stop_signal = FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
473 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
474 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
475 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 369
diff changeset
476 else
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
477 {
84
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
478 stop_signal = TRUE;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
479 switch (event->keyval)
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
480 {
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
481 case GDK_Page_Up: case GDK_KP_Page_Up:
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
482 case GDK_BackSpace:
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
483 case 'B': case 'b':
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
484 view_step_prev(vw);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
485 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
486 case GDK_Page_Down: case GDK_KP_Page_Down:
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
487 case GDK_space:
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
488 case 'N': case 'n':
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
489 view_step_next(vw);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
490 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
491 case GDK_Home: case GDK_KP_Home:
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
492 view_step_to_end(vw, FALSE);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
493 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
494 case GDK_End: case GDK_KP_End:
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
495 view_step_to_end(vw, TRUE);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
496 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
497 case '+': case '=': case GDK_KP_Add:
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
498 image_zoom_adjust(imd, get_zoom_increment());
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
499 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
500 case '-': case GDK_KP_Subtract:
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
501 image_zoom_adjust(imd, -get_zoom_increment());
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
502 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
503 case 'X': case 'x': case GDK_KP_Multiply:
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
504 image_zoom_set(imd, 0.0);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
505 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
506 case 'Z': case 'z': case GDK_KP_Divide: case '1':
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
507 image_zoom_set(imd, 1.0);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
508 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
509 case '2':
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
510 image_zoom_set(imd, 2.0);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
511 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
512 case '3':
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
513 image_zoom_set(imd, 3.0);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
514 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
515 case '4':
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
516 image_zoom_set(imd, 4.0);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
517 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
518 case '7':
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
519 image_zoom_set(imd, -4.0);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
520 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
521 case '8':
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
522 image_zoom_set(imd, -3.0);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
523 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
524 case '9':
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
525 image_zoom_set(imd, -2.0);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
526 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
527 case 'W': case 'w':
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
528 image_zoom_set_fill_geometry(imd, FALSE);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
529 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
530 case 'H': case 'h':
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
531 image_zoom_set_fill_geometry(imd, TRUE);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
532 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
533 case 'R': case 'r':
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
534 image_reload(imd);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
535 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
536 case 'S': case 's':
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
537 if (vw->ss)
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
538 {
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
539 view_slideshow_stop(vw);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
540 }
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
541 else
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
542 {
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
543 view_slideshow_start(vw);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
544 }
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
545 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
546 case 'P': case 'p':
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
547 slideshow_pause_toggle(vw->ss);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
548 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
549 case 'F': case 'f':
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
550 case 'V': case 'v':
86
cade6a52a165 Mon Oct 23 05:34:29 2006 John Ellis <johne@verizon.net>
gqview
parents: 84
diff changeset
551 case GDK_F11:
84
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
552 view_fullscreen_toggle(vw, FALSE);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
553 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
554 case 'I': case 'i':
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
555 view_overlay_toggle(vw);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
556 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
557 case ']':
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
558 image_alter(imd, ALTER_ROTATE_90);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
559 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
560 case '[':
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
561 image_alter(imd, ALTER_ROTATE_90_CC);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
562 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
563 case GDK_Delete: case GDK_KP_Delete:
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 339
diff changeset
564 if (options->file_ops.enable_delete_key)
84
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
565 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
566 file_util_delete(image_get_fd(imd), NULL, imd->widget);
84
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
567 }
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
568 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
569 case GDK_Escape:
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
570 if (vw->fs)
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
571 {
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
572 view_fullscreen_toggle(vw, TRUE);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
573 }
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
574 else
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
575 {
89
b3149a34d0dd Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 86
diff changeset
576 view_window_close(vw);
84
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
577 }
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
578 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
579 case GDK_Menu:
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
580 case GDK_F10:
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
581 menu = view_popup_menu(vw);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
582 gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
583 view_window_menu_pos_cb, vw, 0, GDK_CURRENT_TIME);
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
584 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
585 default:
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
586 stop_signal = FALSE;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
587 break;
ba3c39002a24 Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
588 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
589 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
590
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
591 return stop_signal;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
592 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
593
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
594 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
595 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
596 * view window main routines
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
597 *-----------------------------------------------------------------------------
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 369
diff changeset
598 */
868
db6977f8b0f1 Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents: 803
diff changeset
599 static void button_cb(ImageWindow *imd, GdkEventButton *event, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
600 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
601 ViewWindow *vw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
602 GtkWidget *menu;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
603
868
db6977f8b0f1 Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents: 803
diff changeset
604 switch (event->button)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
605 {
448
a73cc0fa14d0 Use explicit names for mouse buttons instead of numbers.
zas_
parents: 446
diff changeset
606 case MOUSE_BUTTON_LEFT:
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
607 view_step_next(vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
608 break;
448
a73cc0fa14d0 Use explicit names for mouse buttons instead of numbers.
zas_
parents: 446
diff changeset
609 case MOUSE_BUTTON_MIDDLE:
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
610 view_step_prev(vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
611 break;
448
a73cc0fa14d0 Use explicit names for mouse buttons instead of numbers.
zas_
parents: 446
diff changeset
612 case MOUSE_BUTTON_RIGHT:
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
613 menu = view_popup_menu(vw);
868
db6977f8b0f1 Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents: 803
diff changeset
614 gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 3, event->time);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
615 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
616 default:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
617 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
618 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
619 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
620
868
db6977f8b0f1 Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents: 803
diff changeset
621 static void scroll_cb(ImageWindow *imd, GdkEventScroll *event, gpointer data)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
622 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
623 ViewWindow *vw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
624
868
db6977f8b0f1 Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents: 803
diff changeset
625 if (event->state & GDK_CONTROL_MASK)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
626 {
868
db6977f8b0f1 Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents: 803
diff changeset
627 switch (event->direction)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
628 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
629 case GDK_SCROLL_UP:
868
db6977f8b0f1 Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents: 803
diff changeset
630 image_zoom_adjust_at_point(imd, get_zoom_increment(), event->x, event->y);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
631 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
632 case GDK_SCROLL_DOWN:
868
db6977f8b0f1 Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents: 803
diff changeset
633 image_zoom_adjust_at_point(imd, -get_zoom_increment(), event->x, event->y);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
634 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
635 default:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
636 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
637 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
638 }
868
db6977f8b0f1 Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents: 803
diff changeset
639 else if ( (event->state & GDK_SHIFT_MASK) != (guint) (options->mousewheel_scrolls))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
640 {
868
db6977f8b0f1 Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents: 803
diff changeset
641 switch (event->direction)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
642 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
643 case GDK_SCROLL_UP:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
644 image_scroll(imd, 0, -MOUSEWHEEL_SCROLL_SIZE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
645 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
646 case GDK_SCROLL_DOWN:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
647 image_scroll(imd, 0, MOUSEWHEEL_SCROLL_SIZE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
648 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
649 case GDK_SCROLL_LEFT:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
650 image_scroll(imd, -MOUSEWHEEL_SCROLL_SIZE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
651 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
652 case GDK_SCROLL_RIGHT:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
653 image_scroll(imd, MOUSEWHEEL_SCROLL_SIZE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
654 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
655 default:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
656 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
657 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
658 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
659 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
660 {
868
db6977f8b0f1 Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents: 803
diff changeset
661 switch (event->direction)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
662 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
663 case GDK_SCROLL_UP:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
664 view_step_prev(vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
665 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
666 case GDK_SCROLL_DOWN:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
667 view_step_next(vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
668 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
669 default:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
670 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
671 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
672 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
673 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
674
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
675 static void view_image_set_buttons(ViewWindow *vw, ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
676 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
677 image_set_button_func(imd, button_cb, vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
678 image_set_scroll_func(imd, scroll_cb, vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
679 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
680
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
681 static void view_fullscreen_stop_func(FullScreenData *fs, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
682 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
683 ViewWindow *vw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
684
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
685 vw->fs = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
686
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
687 if (vw->ss) vw->ss->imd = vw->imd;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
688 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
689
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
690 static void view_fullscreen_toggle(ViewWindow *vw, gint force_off)
4
e149abcda4eb Syncing to 0.8.1
gqview
parents: 3
diff changeset
691 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
692 if (force_off && !vw->fs) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
693
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
694 if (vw->fs)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
695 {
621
734b6b0a3356 image_osd_get() now returns OsdShowFlags.
zas_
parents: 614
diff changeset
696 if (image_osd_get(vw->imd) & OSD_SHOW_INFO)
734b6b0a3356 image_osd_get() now returns OsdShowFlags.
zas_
parents: 614
diff changeset
697 image_osd_set(vw->imd, image_osd_get(vw->fs->imd));
734b6b0a3356 image_osd_get() now returns OsdShowFlags.
zas_
parents: 614
diff changeset
698
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 94
diff changeset
699 fullscreen_stop(vw->fs);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
700 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
701 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
702 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
703 vw->fs = fullscreen_start(vw->window, vw->imd, view_fullscreen_stop_func, vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
704
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
705 view_image_set_buttons(vw, vw->fs->imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
706 g_signal_connect(G_OBJECT(vw->fs->window), "key_press_event",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
707 G_CALLBACK(view_window_key_press_cb), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
708
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
709 if (vw->ss) vw->ss->imd = vw->fs->imd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
710
621
734b6b0a3356 image_osd_get() now returns OsdShowFlags.
zas_
parents: 614
diff changeset
711 if (image_osd_get(vw->imd) & OSD_SHOW_INFO)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
712 {
621
734b6b0a3356 image_osd_get() now returns OsdShowFlags.
zas_
parents: 614
diff changeset
713 image_osd_set(vw->fs->imd, image_osd_get(vw->imd));
614
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 586
diff changeset
714 image_osd_set(vw->imd, OSD_SHOW_NOTHING);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
715 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
716 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
717 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
718
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
719 static void view_overlay_toggle(ViewWindow *vw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
720 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
721 ImageWindow *imd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
722
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
723 imd = view_window_active_image(vw);
481
67a612985686 Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents: 479
diff changeset
724
67a612985686 Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents: 479
diff changeset
725 image_osd_toggle(imd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
726 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
727
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
728 static void view_slideshow_next(ViewWindow *vw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
729 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
730 if (vw->ss) slideshow_next(vw->ss);
4
e149abcda4eb Syncing to 0.8.1
gqview
parents: 3
diff changeset
731 }
e149abcda4eb Syncing to 0.8.1
gqview
parents: 3
diff changeset
732
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
733 static void view_slideshow_prev(ViewWindow *vw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
734 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
735 if (vw->ss) slideshow_prev(vw->ss);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
736 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
737
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
738 static void view_slideshow_stop_func(SlideShowData *fs, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
739 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
740 ViewWindow *vw = data;
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
741 GList *work;
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
742 FileData *fd;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
743
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
744 vw->ss = NULL;
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
745
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
746 work = vw->list;
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
747 fd = image_get_fd(view_window_active_image(vw));
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
748 while (work)
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
749 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
750 FileData *temp;
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
751
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
752 temp = work->data;
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
753 if (fd == temp)
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
754 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
755 vw->list_pointer = work;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
756 work = NULL;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
757 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
758 else
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
759 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
760 work = work->next;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
761 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
762 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
763 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
764
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
765 static void view_slideshow_start(ViewWindow *vw)
4
e149abcda4eb Syncing to 0.8.1
gqview
parents: 3
diff changeset
766 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
767 if (!vw->ss)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
768 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
769 CollectionData *cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
770 CollectInfo *info;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
771
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
772 if (vw->list)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
773 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
774 vw->ss = slideshow_start_from_filelist(view_window_active_image(vw),
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
775 filelist_copy(vw->list),
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
776 view_slideshow_stop_func, vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
777 vw->list_pointer = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
778 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
779 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
780
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
781 cd = image_get_collection(view_window_active_image(vw), &info);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
782 if (cd && info)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
783 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
784 vw->ss = slideshow_start_from_collection(view_window_active_image(vw), cd,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
785 view_slideshow_stop_func, vw, info);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
786 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
787 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
788 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
789
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
790 static void view_slideshow_stop(ViewWindow *vw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
791 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
792 if (vw->ss) slideshow_free(vw->ss);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
793 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
794
89
b3149a34d0dd Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 86
diff changeset
795 static void view_window_destroy_cb(GtkWidget *widget, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
796 {
89
b3149a34d0dd Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 86
diff changeset
797 ViewWindow *vw = data;
b3149a34d0dd Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 86
diff changeset
798
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
799 view_window_list = g_list_remove(view_window_list, vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
800
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
801 view_slideshow_stop(vw);
89
b3149a34d0dd Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 86
diff changeset
802 fullscreen_stop(vw->fs);
b3149a34d0dd Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 86
diff changeset
803
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
804 filelist_free(vw->list);
797
799d035b9994 use new notification in img-view
nadvornik
parents: 783
diff changeset
805
799d035b9994 use new notification in img-view
nadvornik
parents: 783
diff changeset
806 file_data_unregister_notify_func(view_window_notify_cb, vw);
799d035b9994 use new notification in img-view
nadvornik
parents: 783
diff changeset
807
89
b3149a34d0dd Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 86
diff changeset
808 g_free(vw);
b3149a34d0dd Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 86
diff changeset
809 }
b3149a34d0dd Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 86
diff changeset
810
b3149a34d0dd Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 86
diff changeset
811 static void view_window_close(ViewWindow *vw)
b3149a34d0dd Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 86
diff changeset
812 {
b3149a34d0dd Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 86
diff changeset
813 view_slideshow_stop(vw);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
814 view_fullscreen_toggle(vw, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
815 gtk_widget_destroy(vw->window);
4
e149abcda4eb Syncing to 0.8.1
gqview
parents: 3
diff changeset
816 }
e149abcda4eb Syncing to 0.8.1
gqview
parents: 3
diff changeset
817
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
818 static gint view_window_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
819 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
820 ViewWindow *vw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
821
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
822 view_window_close(vw);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
823 return TRUE;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
824 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
825
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
826 static ViewWindow *real_view_window_new(FileData *fd, GList *list, CollectionData *cd, CollectInfo *info)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
827 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
828 ViewWindow *vw;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
829 GtkAllocation req_size;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
830 GdkGeometry geometry;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
831 gint w, h;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
832
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
833 if (!fd && !list && (!cd || !info)) return NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
834
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
835 vw = g_new0(ViewWindow, 1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
836 vw->fs = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
837 vw->ss = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
838 vw->list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
839 vw->list_pointer = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
840
289
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
841 vw->window = window_new(GTK_WINDOW_TOPLEVEL, "view", PIXBUF_INLINE_ICON_VIEW, NULL, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
842
1029
1a4b18c58556 Use a constant for minimal window size. Set it to 32 for all dialogs.
zas_
parents: 1022
diff changeset
843 geometry.min_width = DEFAULT_MINIMAL_WINDOW_SIZE;
1a4b18c58556 Use a constant for minimal window size. Set it to 32 for all dialogs.
zas_
parents: 1022
diff changeset
844 geometry.min_height = DEFAULT_MINIMAL_WINDOW_SIZE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
845 gtk_window_set_geometry_hints(GTK_WINDOW(vw->window), NULL, &geometry, GDK_HINT_MIN_SIZE);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
846
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
847 gtk_window_set_resizable(GTK_WINDOW(vw->window), TRUE);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 369
diff changeset
848 gtk_container_set_border_width(GTK_CONTAINER(vw->window), 0);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
849
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
850 vw->imd = image_new(FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
851
339
de1c2cd06fce Rename user_specified_window_background and window_background_color
zas_
parents: 334
diff changeset
852 image_background_set_color(vw->imd, options->image.use_custom_border_color ? &options->image.border_color : NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
853
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 281
diff changeset
854 image_attach_window(vw->imd, vw->window, NULL, GQ_APPNAME, TRUE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
855
888
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
856 image_auto_refresh_enable(vw->imd, TRUE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
857 image_top_window_set_sync(vw->imd, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
858
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
859 gtk_container_add(GTK_CONTAINER(vw->window), vw->imd->widget);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
860 gtk_widget_show(vw->imd->widget);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
861
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
862 view_window_dnd_init(vw);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
863
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
864 view_image_set_buttons(vw, vw->imd);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
865
89
b3149a34d0dd Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 86
diff changeset
866 g_signal_connect(G_OBJECT(vw->window), "destroy",
b3149a34d0dd Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 86
diff changeset
867 G_CALLBACK(view_window_destroy_cb), vw);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
868 g_signal_connect(G_OBJECT(vw->window), "delete_event",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
869 G_CALLBACK(view_window_delete_cb), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
870 g_signal_connect(G_OBJECT(vw->window), "key_press_event",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
871 G_CALLBACK(view_window_key_press_cb), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
872 if (cd && info)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
873 {
885
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
874 image_change_from_collection(vw->imd, cd, info, image_zoom_get_default(NULL));
334
df868b947aa0 Rename image-related options.
zas_
parents: 318
diff changeset
875 if (options->image.enable_read_ahead)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
876 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
877 CollectInfo * r_info = collection_next_by_info(cd, info);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
878 if (!r_info) r_info = collection_prev_by_info(cd, info);
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
879 if (r_info) image_prebuffer_set(vw->imd, r_info->fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
880 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
881 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
882 else if (list)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
883 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
884 view_window_set_list(vw, list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
885 vw->list_pointer = vw->list;
885
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
886 image_change_fd(vw->imd, (FileData *)vw->list->data, image_zoom_get_default(NULL));
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
887
334
df868b947aa0 Rename image-related options.
zas_
parents: 318
diff changeset
888 if (options->image.enable_read_ahead)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
889 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
890 GList *work = vw->list->next;
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
891 if (work) image_prebuffer_set(vw->imd, (FileData *)work->data);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
892 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
893 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
894 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
895 {
885
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
896 image_change_fd(vw->imd, fd, image_zoom_get_default(NULL));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
897 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
898
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
899 if (image_zoom_get(vw->imd) == 0.0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
900 {
531
1149a7b0a3d7 cleanup: use image_get_image_size
nadvornik
parents: 512
diff changeset
901 image_get_image_size(vw->imd, &w, &h);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
902 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
903 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
904 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
905 pixbuf_renderer_get_scaled_size(PIXBUF_RENDERER(vw->imd->pr), &w, &h);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
906 }
334
df868b947aa0 Rename image-related options.
zas_
parents: 318
diff changeset
907 if (options->image.limit_window_size)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
908 {
334
df868b947aa0 Rename image-related options.
zas_
parents: 318
diff changeset
909 gint mw = gdk_screen_width() * options->image.max_window_size / 100;
df868b947aa0 Rename image-related options.
zas_
parents: 318
diff changeset
910 gint mh = gdk_screen_height() * options->image.max_window_size / 100;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
911
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
912 if (w > mw) w = mw;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
913 if (h > mh) h = mh;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
914 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
915
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
916 gtk_window_set_default_size(GTK_WINDOW(vw->window), w, h);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
917 req_size.x = req_size.y = 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
918 req_size.width = w;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
919 req_size.height = h;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
920 gtk_widget_size_allocate(GTK_WIDGET(vw->window), &req_size);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
921
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
922 gtk_widget_set_size_request(vw->imd->pr, w, h);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
923
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
924 gtk_widget_show(vw->window);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
925
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
926 view_window_list = g_list_append(view_window_list, vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
927
797
799d035b9994 use new notification in img-view
nadvornik
parents: 783
diff changeset
928 file_data_register_notify_func(view_window_notify_cb, vw, NOTIFY_PRIORITY_LOW);
799d035b9994 use new notification in img-view
nadvornik
parents: 783
diff changeset
929
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
930 return vw;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
931 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
932
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
933 static void view_window_collection_unref_cb(GtkWidget *widget, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
934 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
935 CollectionData *cd = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
936
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
937 collection_unref(cd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
938 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
939
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
940 void view_window_new(FileData *fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
941 {
780
44128da39e13 Drop initialization to NULL since filelist_read() will take care of it.
zas_
parents: 753
diff changeset
942 GList *list;
44128da39e13 Drop initialization to NULL since filelist_read() will take care of it.
zas_
parents: 753
diff changeset
943
781
2d2cca2bceb0 Replace hardcoded collection filename extension by a macro (GQ_COLLECTION_EXT).
zas_
parents: 780
diff changeset
944 if (file_extension_match(fd->path, GQ_COLLECTION_EXT))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
945 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
946 ViewWindow *vw;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
947 CollectionData *cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
948 CollectInfo *info;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
949
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
950 cd = collection_new(fd->path);
358
384eed18df04 Use flags for collection_load*().
zas_
parents: 341
diff changeset
951 if (collection_load(cd, fd->path, COLLECTION_LOAD_NONE))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
952 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
953 info = collection_get_first(cd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
954 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
955 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
956 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
957 collection_unref(cd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
958 cd = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
959 info = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
960 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
961 vw = real_view_window_new(NULL, NULL, cd, info);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
962 if (vw && cd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
963 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
964 g_signal_connect(G_OBJECT(vw->window), "destroy",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
965 G_CALLBACK(view_window_collection_unref_cb), cd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
966 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
967 }
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 781
diff changeset
968 else if (isdir(fd->path) && filelist_read(fd, &list, NULL))
995
6ca2c5fd7b13 Whitespaces cleanup.
zas_
parents: 904
diff changeset
969 {
780
44128da39e13 Drop initialization to NULL since filelist_read() will take care of it.
zas_
parents: 753
diff changeset
970 list = filelist_sort_path(list);
44128da39e13 Drop initialization to NULL since filelist_read() will take care of it.
zas_
parents: 753
diff changeset
971 list = filelist_filter(list, FALSE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
972 real_view_window_new(NULL, list, NULL, NULL);
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
973 filelist_free(list);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
974 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
975 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
976 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
977 real_view_window_new(fd, NULL, NULL, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
978 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
979 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
980
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
981 void view_window_new_from_list(GList *list)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
982 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
983 real_view_window_new(NULL, list, NULL, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
984 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
985
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
986 void view_window_new_from_collection(CollectionData *cd, CollectInfo *info)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
987 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
988 real_view_window_new(NULL, NULL, cd, info);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
989 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
990
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
991 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
992 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
993 * public
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
994 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
995 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
996
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
997 void view_window_colors_update(void)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
998 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
999 GList *work;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1000
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1001 work = view_window_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1002 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1003 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1004 ViewWindow *vw = work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1005 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1006
339
de1c2cd06fce Rename user_specified_window_background and window_background_color
zas_
parents: 334
diff changeset
1007 image_background_set_color(vw->imd, options->image.use_custom_border_color ? &options->image.border_color : NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1008 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1009 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1010
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1011 gint view_window_find_image(ImageWindow *imd, gint *index, gint *total)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1012 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1013 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1014
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1015 work = view_window_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1016 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1017 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1018 ViewWindow *vw = work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1019 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1020
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1021 if (vw->imd == imd ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1022 (vw->fs && vw->fs->imd == imd))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1023 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1024 if (vw->ss)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1025 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1026 gint n;
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1027 gint t;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1028
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1029 n = g_list_length(vw->ss->list_done);
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1030 t = n + g_list_length(vw->ss->list);
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1031 if (n == 0) n = t;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1032 if (index) *index = n - 1;
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1033 if (total) *total = t;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1034 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1035 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1036 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1037 if (index) *index = g_list_position(vw->list, vw->list_pointer);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1038 if (total) *total = g_list_length(vw->list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1039 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1040 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1041 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1042 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1043
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1044 return FALSE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1045 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1046
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1047 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1048 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1049 * view window menu routines and callbacks
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1050 *-----------------------------------------------------------------------------
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 369
diff changeset
1051 */
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1052
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1053 static void view_new_window_cb(GtkWidget *widget, gpointer data)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1054 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1055 ViewWindow *vw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1056 CollectionData *cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1057 CollectInfo *info;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1058
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1059 cd = image_get_collection(vw->imd, &info);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1060
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1061 if (cd && info)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1062 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1063 view_window_new_from_collection(cd, info);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1064 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1065 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1066 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1067 view_window_new(image_get_fd(vw->imd));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1068 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1069 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1070
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1071 static void view_edit_cb(GtkWidget *widget, gpointer data)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1072 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1073 ViewWindow *vw;
60
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1074 ImageWindow *imd;
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1211
diff changeset
1075 const gchar *key = data;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1076
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1077 vw = submenu_item_get_data(widget);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1078 if (!vw) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1079
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1211
diff changeset
1080 if (!editor_window_flag_set(key))
60
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1081 {
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1082 view_fullscreen_toggle(vw, TRUE);
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1083 }
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1084
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1085 imd = view_window_active_image(vw);
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1211
diff changeset
1086 file_util_start_editor_from_file(key, image_get_fd(imd), imd->widget);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1087 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1088
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1089 static void view_alter_cb(GtkWidget *widget, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1090 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1091 ViewWindow *vw;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1092 AlterType type;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1093
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1094 vw = submenu_item_get_data(widget);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1095 type = GPOINTER_TO_INT(data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1096
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1097 if (!vw) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1098 image_alter(vw->imd, type);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1099 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1100
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1101 static void view_wallpaper_cb(GtkWidget *widget, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1102 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1103 ViewWindow *vw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1104 ImageWindow *imd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1105
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1106 imd = view_window_active_image(vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1107 image_to_root_window(imd, (image_zoom_get(imd) == 0.0));
3
gqview
parents: 1
diff changeset
1108 }
gqview
parents: 1
diff changeset
1109
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1110 static void view_zoom_in_cb(GtkWidget *widget, gpointer data)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1111 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1112 ViewWindow *vw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1113
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1114 image_zoom_adjust(view_window_active_image(vw), get_zoom_increment());
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1115 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1116
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1117 static void view_zoom_out_cb(GtkWidget *widget, gpointer data)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1118 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1119 ViewWindow *vw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1120
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1121 image_zoom_adjust(view_window_active_image(vw), -get_zoom_increment());
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1122 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1123
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1124 static void view_zoom_1_1_cb(GtkWidget *widget, gpointer data)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1125 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1126 ViewWindow *vw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1127
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1128 image_zoom_set(view_window_active_image(vw), 1.0);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1129 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1130
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1131 static void view_zoom_fit_cb(GtkWidget *widget, gpointer data)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1132 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1133 ViewWindow *vw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1134
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1135 image_zoom_set(view_window_active_image(vw), 0.0);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1136 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1137
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1138 static void view_copy_cb(GtkWidget *widget, gpointer data)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1139 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1140 ViewWindow *vw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1141 ImageWindow *imd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1142
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1143 imd = view_window_active_image(vw);
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1144 file_util_copy(image_get_fd(imd), NULL, NULL, imd->widget);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1145 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1146
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1147 static void view_move_cb(GtkWidget *widget, gpointer data)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1148 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1149 ViewWindow *vw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1150 ImageWindow *imd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1151
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1152 imd = view_window_active_image(vw);
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1153 file_util_move(image_get_fd(imd), NULL, NULL, imd->widget);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1154 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1155
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1156 static void view_rename_cb(GtkWidget *widget, gpointer data)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1157 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1158 ViewWindow *vw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1159 ImageWindow *imd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1160
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1161 imd = view_window_active_image(vw);
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1162 file_util_rename(image_get_fd(imd), NULL, imd->widget);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1163 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1164
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1165 static void view_delete_cb(GtkWidget *widget, gpointer data)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1166 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1167 ViewWindow *vw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1168 ImageWindow *imd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1169
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1170 imd = view_window_active_image(vw);
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1171 file_util_delete(image_get_fd(imd), NULL, imd->widget);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1172 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1173
497
a33badd85f16 Allow the copy of file paths to clipboard.
zas_
parents: 481
diff changeset
1174 static void view_copy_path_cb(GtkWidget *widget, gpointer data)
a33badd85f16 Allow the copy of file paths to clipboard.
zas_
parents: 481
diff changeset
1175 {
a33badd85f16 Allow the copy of file paths to clipboard.
zas_
parents: 481
diff changeset
1176 ViewWindow *vw = data;
a33badd85f16 Allow the copy of file paths to clipboard.
zas_
parents: 481
diff changeset
1177 ImageWindow *imd;
a33badd85f16 Allow the copy of file paths to clipboard.
zas_
parents: 481
diff changeset
1178
a33badd85f16 Allow the copy of file paths to clipboard.
zas_
parents: 481
diff changeset
1179 imd = view_window_active_image(vw);
a33badd85f16 Allow the copy of file paths to clipboard.
zas_
parents: 481
diff changeset
1180 file_util_copy_path_to_clipboard(image_get_fd(imd));
a33badd85f16 Allow the copy of file paths to clipboard.
zas_
parents: 481
diff changeset
1181 }
a33badd85f16 Allow the copy of file paths to clipboard.
zas_
parents: 481
diff changeset
1182
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1183 static void view_fullscreen_cb(GtkWidget *widget, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1184 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1185 ViewWindow *vw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1186
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1187 view_fullscreen_toggle(vw, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1188 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1189
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1190 static void view_slideshow_start_cb(GtkWidget *widget, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1191 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1192 ViewWindow *vw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1193
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1194 view_slideshow_start(vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1195 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1196
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1197 static void view_slideshow_stop_cb(GtkWidget *widget, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1198 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1199 ViewWindow *vw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1200
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1201 view_slideshow_stop(vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1202 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1203
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1204 static void view_slideshow_pause_cb(GtkWidget *widget, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1205 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1206 ViewWindow *vw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1207
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1208 slideshow_pause_toggle(vw->ss);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1209 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1210
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1211 static void view_close_cb(GtkWidget *widget, gpointer data)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1212 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1213 ViewWindow *vw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1214
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1215 view_window_close(vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1216 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1217
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 781
diff changeset
1218 static LayoutWindow *view_new_layout_with_fd(FileData *fd)
368
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1219 {
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1220 LayoutWindow *nw;
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1221
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1292
diff changeset
1222 nw = layout_new(NULL, NULL);
368
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1223 layout_sort_set(nw, options->file_sort.method, options->file_sort.ascending);
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 781
diff changeset
1224 layout_set_fd(nw, fd);
368
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1225 return nw;
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1226 }
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1227
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1228
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1229 static void view_set_layout_path_cb(GtkWidget *widget, gpointer data)
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1230 {
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1231 ViewWindow *vw = data;
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1232 LayoutWindow *lw;
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1233 ImageWindow *imd;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 369
diff changeset
1234
368
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1235 imd = view_window_active_image(vw);
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1236
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1237 if (!imd || !imd->image_fd) return;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 369
diff changeset
1238
368
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1239 lw = layout_find_by_image_fd(imd);
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1240 if (lw)
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 781
diff changeset
1241 layout_set_fd(lw, imd->image_fd);
368
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1242 else
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 781
diff changeset
1243 view_new_layout_with_fd(imd->image_fd);
368
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1244 view_window_close(vw);
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1245 }
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1246
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1247 static GtkWidget *view_popup_menu(ViewWindow *vw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1248 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1249 GtkWidget *menu;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1250 GtkWidget *item;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1251
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1252 menu = popup_menu_short_lived();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1253
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1254 menu_item_add_stock(menu, _("Zoom _in"), GTK_STOCK_ZOOM_IN, G_CALLBACK(view_zoom_in_cb), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1255 menu_item_add_stock(menu, _("Zoom _out"), GTK_STOCK_ZOOM_OUT, G_CALLBACK(view_zoom_out_cb), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1256 menu_item_add_stock(menu, _("Zoom _1:1"), GTK_STOCK_ZOOM_100, G_CALLBACK(view_zoom_1_1_cb), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1257 menu_item_add_stock(menu, _("Fit image to _window"), GTK_STOCK_ZOOM_FIT, G_CALLBACK(view_zoom_fit_cb), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1258 menu_item_add_divider(menu);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1259
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1260 item = submenu_add_edit(menu, NULL, G_CALLBACK(view_edit_cb), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1261 menu_item_add_divider(item);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1262 menu_item_add(item, _("Set as _wallpaper"), G_CALLBACK(view_wallpaper_cb), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1263
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1264 submenu_add_alter(menu, G_CALLBACK(view_alter_cb), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1265
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1266 menu_item_add_stock(menu, _("View in _new window"), GTK_STOCK_NEW, G_CALLBACK(view_new_window_cb), vw);
368
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 358
diff changeset
1267 item = menu_item_add(menu, _("_Go to directory view"), G_CALLBACK(view_set_layout_path_cb), vw);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1268
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1269 menu_item_add_divider(menu);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1270 menu_item_add_stock(menu, _("_Copy..."), GTK_STOCK_COPY, G_CALLBACK(view_copy_cb), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1271 menu_item_add(menu, _("_Move..."), G_CALLBACK(view_move_cb), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1272 menu_item_add(menu, _("_Rename..."), G_CALLBACK(view_rename_cb), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1273 menu_item_add_stock(menu, _("_Delete..."), GTK_STOCK_DELETE, G_CALLBACK(view_delete_cb), vw);
497
a33badd85f16 Allow the copy of file paths to clipboard.
zas_
parents: 481
diff changeset
1274 if (options->show_copy_path)
a33badd85f16 Allow the copy of file paths to clipboard.
zas_
parents: 481
diff changeset
1275 menu_item_add(menu, _("_Copy path"), G_CALLBACK(view_copy_path_cb), vw);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1276
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1277 menu_item_add_divider(menu);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1278
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1279 if (vw->ss)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1280 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1281 menu_item_add(menu, _("_Stop slideshow"), G_CALLBACK(view_slideshow_stop_cb), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1282 if (slideshow_paused(vw->ss))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1283 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1284 item = menu_item_add(menu, _("Continue slides_how"),
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1285 G_CALLBACK(view_slideshow_pause_cb), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1286 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1287 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1288 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1289 item = menu_item_add(menu, _("Pause slides_how"),
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1290 G_CALLBACK(view_slideshow_pause_cb), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1291 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1292 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1293 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1294 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1295 item = menu_item_add(menu, _("_Start slideshow"), G_CALLBACK(view_slideshow_start_cb), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1296 gtk_widget_set_sensitive(item, (vw->list != NULL) || view_window_contains_collection(vw));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1297 item = menu_item_add(menu, _("Pause slides_how"), G_CALLBACK(view_slideshow_pause_cb), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1298 gtk_widget_set_sensitive(item, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1299 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1300
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1301 if (vw->fs)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1302 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1303 menu_item_add(menu, _("Exit _full screen"), G_CALLBACK(view_fullscreen_cb), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1304 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1305 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1306 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1307 menu_item_add(menu, _("_Full screen"), G_CALLBACK(view_fullscreen_cb), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1308 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1309
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1310 menu_item_add_divider(menu);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1311 menu_item_add_stock(menu, _("C_lose window"), GTK_STOCK_CLOSE, G_CALLBACK(view_close_cb), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1312
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1313 return menu;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1314 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1315
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1316 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1317 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1318 * dnd confirm dir
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1319 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1320 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1321
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1322 typedef struct {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1323 ViewWindow *vw;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1324 GList *list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1325 } CViewConfirmD;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1326
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1327 static void view_dir_list_cancel(GtkWidget *widget, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1328 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1329 /* do nothing */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1330 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1331
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1332 static void view_dir_list_do(ViewWindow *vw, GList *list, gint skip, gint recurse)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1333 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1334 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1335
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1336 view_window_set_list(vw, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1337
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1338 work = list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1339 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1340 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1341 FileData *fd = work->data;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1342 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1343
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1344 if (isdir(fd->path))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1345 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1346 if (!skip)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1347 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1348 GList *list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1349
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1350 if (recurse)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1351 {
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 781
diff changeset
1352 list = filelist_recursive(fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1353 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1354 else
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1355 { /*FIXME */
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 781
diff changeset
1356 filelist_read(fd, &list, NULL);
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1357 list = filelist_sort_path(list);
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1358 list = filelist_filter(list, FALSE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1359 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1360 if (list) vw->list = g_list_concat(vw->list, list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1361 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1362 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1363 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1364 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1365 /* FIXME: no filtering here */
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1366 vw->list = g_list_append(vw->list, file_data_ref(fd));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1367 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1368 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1369
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1370 if (vw->list)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1371 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1372 FileData *fd;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1373
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1374 vw->list_pointer = vw->list;
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1375 fd = vw->list->data;
885
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
1376 image_change_fd(vw->imd, fd, image_zoom_get_default(vw->imd));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1377
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1378 work = vw->list->next;
334
df868b947aa0 Rename image-related options.
zas_
parents: 318
diff changeset
1379 if (options->image.enable_read_ahead && work)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1380 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1381 fd = work->data;
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1382 image_prebuffer_set(vw->imd, fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1383 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1384 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1385 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1386 {
885
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
1387 image_change_fd(vw->imd, NULL, image_zoom_get_default(vw->imd));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1388 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1389 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1390
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1391 static void view_dir_list_add(GtkWidget *widget, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1392 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1393 CViewConfirmD *d = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1394 view_dir_list_do(d->vw, d->list, FALSE, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1395 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1396
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1397 static void view_dir_list_recurse(GtkWidget *widget, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1398 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1399 CViewConfirmD *d = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1400 view_dir_list_do(d->vw, d->list, FALSE, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1401 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1402
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1403 static void view_dir_list_skip(GtkWidget *widget, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1404 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1405 CViewConfirmD *d = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1406 view_dir_list_do(d->vw, d->list, TRUE, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1407 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1408
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1409 static void view_dir_list_destroy(GtkWidget *widget, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1410 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1411 CViewConfirmD *d = data;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 369
diff changeset
1412 filelist_free(d->list);
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 369
diff changeset
1413 g_free(d);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1414 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1415
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1416 static GtkWidget *view_confirm_dir_list(ViewWindow *vw, GList *list)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1417 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1418 GtkWidget *menu;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1419 CViewConfirmD *d;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1420
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1421 d = g_new(CViewConfirmD, 1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1422 d->vw = vw;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1423 d->list = list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1424
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1425 menu = popup_menu_short_lived();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1426 g_signal_connect(G_OBJECT(menu), "destroy",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1427 G_CALLBACK(view_dir_list_destroy), d);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1428
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1429 menu_item_add_stock(menu, _("Dropped list includes folders."), GTK_STOCK_DND_MULTIPLE, NULL, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1430 menu_item_add_divider(menu);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1431 menu_item_add_stock(menu, _("_Add contents"), GTK_STOCK_OK, G_CALLBACK(view_dir_list_add), d);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1432 menu_item_add_stock(menu, _("Add contents _recursive"), GTK_STOCK_ADD, G_CALLBACK(view_dir_list_recurse), d);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1433 menu_item_add_stock(menu, _("_Skip folders"), GTK_STOCK_REMOVE, G_CALLBACK(view_dir_list_skip), d);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1434 menu_item_add_divider(menu);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1435 menu_item_add_stock(menu, _("Cancel"), GTK_STOCK_CANCEL, G_CALLBACK(view_dir_list_cancel), d);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1436
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1437 return menu;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1438 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1439
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1440 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1441 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1442 * image drag and drop routines
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1443 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1444 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1445
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1446 static void view_window_get_dnd_data(GtkWidget *widget, GdkDragContext *context,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1447 gint x, gint y,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1448 GtkSelectionData *selection_data, guint info,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1449 guint time, gpointer data)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1450 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1451 ViewWindow *vw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1452 ImageWindow *imd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1453
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1454 if (gtk_drag_get_source_widget(context) == vw->imd->pr) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1455
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1456 imd = vw->imd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1457
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1458 if (info == TARGET_URI_LIST || info == TARGET_APP_COLLECTION_MEMBER)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1459 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1460 CollectionData *source;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1461 GList *list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1462 GList *info_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1463
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1464 if (info == TARGET_URI_LIST)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1465 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1466 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1467
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1468 list = uri_filelist_from_text((gchar *)selection_data->data, TRUE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1469
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1470 work = list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1471 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1472 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1473 FileData *fd = work->data;
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1474 if (isdir(fd->path))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1475 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1476 GtkWidget *menu;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1477 menu = view_confirm_dir_list(vw, list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1478 gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, time);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1479 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1480 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1481 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1482 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1483
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1484 list = filelist_filter(list, FALSE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1485
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1486 source = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1487 info_list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1488 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1489 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1490 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1491 source = collection_from_dnd_data((gchar *)selection_data->data, &list, &info_list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1492 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1493
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1494 if (list)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1495 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1496 FileData *fd;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1497
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1498 fd = list->data;
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1499 if (isfile(fd->path))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1500 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1501 view_slideshow_stop(vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1502 view_window_set_list(vw, NULL);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1503
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1504 if (source && info_list)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1505 {
885
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
1506 image_change_from_collection(imd, source, info_list->data, image_zoom_get_default(imd));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1507 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1508 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1509 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1510 if (list->next)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1511 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1512 vw->list = list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1513 list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1514
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1515 vw->list_pointer = vw->list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1516 }
885
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
1517 image_change_fd(imd, fd, image_zoom_get_default(imd));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1518 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1519 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1520 }
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1521 filelist_free(list);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1522 g_list_free(info_list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1523 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1524 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1525
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1526 static void view_window_set_dnd_data(GtkWidget *widget, GdkDragContext *context,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1527 GtkSelectionData *selection_data, guint info,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1528 guint time, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1529 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1530 ViewWindow *vw = data;
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1531 FileData *fd;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1532
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1533 fd = image_get_fd(vw->imd);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1534
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1535 if (fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1536 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1537 gchar *text = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1538 gint len;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1539 gint plain_text;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1540 GList *list;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1541
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1542 switch (info)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1543 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1544 case TARGET_URI_LIST:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1545 plain_text = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1546 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1547 case TARGET_TEXT_PLAIN:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1548 default:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1549 plain_text = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1550 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1551 }
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1552 list = g_list_append(NULL, fd);
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1553 text = uri_text_from_filelist(list, &len, plain_text);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1554 g_list_free(list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1555 if (text)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1556 {
512
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 497
diff changeset
1557 gtk_selection_data_set(selection_data, selection_data->target,
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 497
diff changeset
1558 8, (guchar *)text, len);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1559 g_free(text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1560 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1561 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1562 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1563 {
512
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 497
diff changeset
1564 gtk_selection_data_set(selection_data, selection_data->target,
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 497
diff changeset
1565 8, NULL, 0);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1566 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1567 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1568
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1569 static void view_window_dnd_init(ViewWindow *vw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1570 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1571 ImageWindow *imd;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1572
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1573 imd = vw->imd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1574
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1575 gtk_drag_source_set(imd->pr, GDK_BUTTON2_MASK,
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1576 dnd_file_drag_types, dnd_file_drag_types_count,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1577 GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK);
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1578 g_signal_connect(G_OBJECT(imd->pr), "drag_data_get",
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1579 G_CALLBACK(view_window_set_dnd_data), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1580
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1581 gtk_drag_dest_set(imd->pr,
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1582 GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1583 dnd_file_drop_types, dnd_file_drop_types_count,
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 369
diff changeset
1584 GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK);
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1585 g_signal_connect(G_OBJECT(imd->pr), "drag_data_received",
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1586 G_CALLBACK(view_window_get_dnd_data), vw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1587 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1588
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1589 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1590 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1591 * maintenance (for rename, move, remove)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1592 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1593 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1594
797
799d035b9994 use new notification in img-view
nadvornik
parents: 783
diff changeset
1595 static void view_real_removed(ViewWindow *vw, FileData *fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1596 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1597 ImageWindow *imd;
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1598 FileData *image_fd;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1599
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1600 imd = view_window_active_image(vw);
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1601 image_fd = image_get_fd(imd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1602
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1603 if (image_fd && image_fd == fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1604 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1605 if (vw->list)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1606 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1607 view_list_step(vw, TRUE);
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1608 if (image_get_fd(imd) == image_fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1609 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1610 view_list_step(vw, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1611 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1612 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1613 else if (view_window_contains_collection(vw))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1614 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1615 view_collection_step(vw, TRUE);
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1616 if (image_get_fd(imd) == image_fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1617 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1618 view_collection_step(vw, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1619 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1620 }
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1621 if (image_get_fd(imd) == image_fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1622 {
885
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
1623 image_change_fd(imd, NULL, image_zoom_get_default(imd));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1624 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1625 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1626
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1627 if (vw->list)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1628 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1629 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1630 GList *old;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1631
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1632 old = vw->list_pointer;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1633
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1634 work = vw->list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1635 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1636 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1637 FileData *chk_fd;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1638 GList *chk_link;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1639
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1640 chk_fd = work->data;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1641 chk_link = work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1642 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1643
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1644 if (chk_fd == fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1645 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1646 if (vw->list_pointer == chk_link)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1647 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1648 vw->list_pointer = (chk_link->next) ? chk_link->next : chk_link->prev;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1649 }
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1650 vw->list = g_list_remove(vw->list, chk_fd);
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1651 file_data_unref(chk_fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1652 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1653 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1654
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1655 /* handles stepping correctly when same image is in the list more than once */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1656 if (old && old != vw->list_pointer)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1657 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1658 FileData *fd;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1659
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1660 if (vw->list_pointer)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1661 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1662 fd = vw->list_pointer->data;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1663 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1664 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1665 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 122
diff changeset
1666 fd = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1667 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1668
885
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
1669 image_change_fd(imd, fd, image_zoom_get_default(imd));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1670 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1671 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1672
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 94
diff changeset
1673 image_osd_update(imd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1674 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1675
797
799d035b9994 use new notification in img-view
nadvornik
parents: 783
diff changeset
1676 static void view_window_notify_cb(FileData *fd, NotifyType type, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1677 {
797
799d035b9994 use new notification in img-view
nadvornik
parents: 783
diff changeset
1678 ViewWindow *vw = data;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1679
803
764fd82dd099 better check for notify type
nadvornik
parents: 797
diff changeset
1680 if (type != NOTIFY_TYPE_CHANGE || !fd->change) return;
797
799d035b9994 use new notification in img-view
nadvornik
parents: 783
diff changeset
1681
799d035b9994 use new notification in img-view
nadvornik
parents: 783
diff changeset
1682 switch(fd->change->type)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1683 {
797
799d035b9994 use new notification in img-view
nadvornik
parents: 783
diff changeset
1684 case FILEDATA_CHANGE_MOVE:
799d035b9994 use new notification in img-view
nadvornik
parents: 783
diff changeset
1685 case FILEDATA_CHANGE_RENAME:
799d035b9994 use new notification in img-view
nadvornik
parents: 783
diff changeset
1686 break;
799d035b9994 use new notification in img-view
nadvornik
parents: 783
diff changeset
1687 case FILEDATA_CHANGE_COPY:
799d035b9994 use new notification in img-view
nadvornik
parents: 783
diff changeset
1688 break;
799d035b9994 use new notification in img-view
nadvornik
parents: 783
diff changeset
1689 case FILEDATA_CHANGE_DELETE:
799d035b9994 use new notification in img-view
nadvornik
parents: 783
diff changeset
1690 view_real_removed(vw, fd);
799d035b9994 use new notification in img-view
nadvornik
parents: 783
diff changeset
1691 break;
799d035b9994 use new notification in img-view
nadvornik
parents: 783
diff changeset
1692 case FILEDATA_CHANGE_UNSPECIFIED:
1211
e2bbe90b0dcd most of the metadata options now works
nadvornik
parents: 1055
diff changeset
1693 case FILEDATA_CHANGE_WRITE_METADATA:
797
799d035b9994 use new notification in img-view
nadvornik
parents: 783
diff changeset
1694 break;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1695 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1696 }
1055
1646720364cf Adding a vim modeline to all files - patch by Klaus Ethgen
nadvornik
parents: 1029
diff changeset
1697 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */