Mercurial > hg > forks > geeqie
annotate src/img-view.c @ 2873:6a16ed6742be
Bug fix: View in new window from files pane
When View in New Window was called from a right-click in the files pane,
the image was not shown at the correct size
author | Colin Clark <colin.clark@cclark.uk> |
---|---|
date | Tue, 11 Dec 2018 11:46:00 +0000 |
parents | 4fc59d8e53c0 |
children | 10177e8c588b |
rev | line source |
---|---|
1 | 1 /* |
2350
95507e596256
Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents:
2185
diff
changeset
|
2 * Copyright (C) 2006 John Ellis |
95507e596256
Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents:
2185
diff
changeset
|
3 * Copyright (C) 2008 - 2016 The Geeqie Team |
1 | 4 * |
5 * Author: John Ellis | |
6 * | |
2350
95507e596256
Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents:
2185
diff
changeset
|
7 * This program is free software; you can redistribute it and/or modify |
95507e596256
Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents:
2185
diff
changeset
|
8 * it under the terms of the GNU General Public License as published by |
95507e596256
Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents:
2185
diff
changeset
|
9 * the Free Software Foundation; either version 2 of the License, or |
95507e596256
Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents:
2185
diff
changeset
|
10 * (at your option) any later version. |
95507e596256
Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents:
2185
diff
changeset
|
11 * |
95507e596256
Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents:
2185
diff
changeset
|
12 * This program is distributed in the hope that it will be useful, |
95507e596256
Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents:
2185
diff
changeset
|
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
95507e596256
Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents:
2185
diff
changeset
|
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
95507e596256
Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents:
2185
diff
changeset
|
15 * GNU General Public License for more details. |
95507e596256
Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents:
2185
diff
changeset
|
16 * |
95507e596256
Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents:
2185
diff
changeset
|
17 * You should have received a copy of the GNU General Public License along |
95507e596256
Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents:
2185
diff
changeset
|
18 * with this program; if not, write to the Free Software Foundation, Inc., |
95507e596256
Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents:
2185
diff
changeset
|
19 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
1 | 20 */ |
21 | |
281 | 22 #include "main.h" |
9 | 23 #include "img-view.h" |
24 | |
25 #include "collect.h" | |
26 #include "collect-io.h" | |
27 #include "dnd.h" | |
28 #include "editors.h" | |
586
122fc2223b42
split filelist.c to filefilter.c and filedata.c
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
531
diff
changeset
|
29 #include "filedata.h" |
9 | 30 #include "fullscreen.h" |
1 | 31 #include "image.h" |
2847
53785dd2e8c9
Bug fix: View in new window wrong size
Colin Clark <colin.clark@cclark.uk>
parents:
2754
diff
changeset
|
32 #include "image-load.h" |
9 | 33 #include "image-overlay.h" |
368
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
34 #include "layout.h" |
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
35 #include "layout_image.h" |
2694 | 36 #include "layout_util.h" |
9 | 37 #include "menu.h" |
1022
d09059a8b243
Move miscellaneous functions to their own files (new misc.[ch]).
Laurent Monin <geeqie@norz.org>
parents:
995
diff
changeset
|
38 #include "misc.h" |
d09059a8b243
Move miscellaneous functions to their own files (new misc.[ch]).
Laurent Monin <geeqie@norz.org>
parents:
995
diff
changeset
|
39 #include "pixbuf_util.h" |
23
9ff428db7772
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
John Ellis <johne@verizon.net>
parents:
9
diff
changeset
|
40 #include "pixbuf-renderer.h" |
94
7bd3d907ca2b
Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
91
diff
changeset
|
41 #include "print.h" |
9 | 42 #include "slideshow.h" |
43 #include "ui_fileops.h" | |
44 #include "ui_menu.h" | |
904
ab63ec98b0f6
Move uri_*() functions to separate files: uri_utils.[ch]
Laurent Monin <geeqie@norz.org>
parents:
888
diff
changeset
|
45 #include "uri_utils.h" |
1022
d09059a8b243
Move miscellaneous functions to their own files (new misc.[ch]).
Laurent Monin <geeqie@norz.org>
parents:
995
diff
changeset
|
46 #include "utilops.h" |
648
36e8da5a771d
Move some functions from main.[ch] to new window.[ch].
Laurent Monin <geeqie@norz.org>
parents:
621
diff
changeset
|
47 #include "window.h" |
9 | 48 |
1 | 49 #include <gdk/gdkkeysyms.h> /* for keyboard values */ |
50 | |
9 | 51 |
52 typedef struct _ViewWindow ViewWindow; | |
53 struct _ViewWindow | |
54 { | |
55 GtkWidget *window; | |
56 ImageWindow *imd; | |
57 FullScreenData *fs; | |
58 SlideShowData *ss; | |
59 | |
60 GList *list; | |
61 GList *list_pointer; | |
62 }; | |
63 | |
64 | |
65 static GList *view_window_list = NULL; | |
66 | |
67 | |
68 static GtkWidget *view_popup_menu(ViewWindow *vw); | |
1433
12600de4b59a
Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents:
1432
diff
changeset
|
69 static void view_fullscreen_toggle(ViewWindow *vw, gboolean force_off); |
9 | 70 static void view_overlay_toggle(ViewWindow *vw); |
71 | |
72 static void view_slideshow_next(ViewWindow *vw); | |
73 static void view_slideshow_prev(ViewWindow *vw); | |
74 static void view_slideshow_start(ViewWindow *vw); | |
75 static void view_slideshow_stop(ViewWindow *vw); | |
76 | |
77 static void view_window_close(ViewWindow *vw); | |
78 | |
79 static void view_window_dnd_init(ViewWindow *vw); | |
80 | |
797
4f1a67d254fc
use new notification in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
783
diff
changeset
|
81 static void view_window_notify_cb(FileData *fd, NotifyType type, gpointer data); |
9 | 82 |
83 /* | |
84 *----------------------------------------------------------------------------- | |
85 * misc | |
86 *----------------------------------------------------------------------------- | |
442 | 87 */ |
9 | 88 |
89 static ImageWindow *view_window_active_image(ViewWindow *vw) | |
90 { | |
91 if (vw->fs) return vw->fs->imd; | |
92 | |
93 return vw->imd; | |
94 } | |
95 | |
96 static void view_window_set_list(ViewWindow *vw, GList *list) | |
97 { | |
98 | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
99 filelist_free(vw->list); |
9 | 100 vw->list = NULL; |
101 vw->list_pointer = NULL; | |
102 | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
103 vw->list = filelist_copy(list); |
9 | 104 } |
105 | |
1433
12600de4b59a
Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents:
1432
diff
changeset
|
106 static gboolean view_window_contains_collection(ViewWindow *vw) |
9 | 107 { |
108 CollectionData *cd; | |
109 CollectInfo *info; | |
110 | |
111 cd = image_get_collection(view_window_active_image(vw), &info); | |
112 | |
113 return (cd && info); | |
114 } | |
115 | |
1433
12600de4b59a
Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents:
1432
diff
changeset
|
116 static void view_collection_step(ViewWindow *vw, gboolean next) |
9 | 117 { |
118 ImageWindow *imd = view_window_active_image(vw); | |
119 CollectionData *cd; | |
120 CollectInfo *info; | |
121 CollectInfo *read_ahead_info = NULL; | |
122 | |
123 cd = image_get_collection(imd, &info); | |
124 | |
125 if (!cd || !info) return; | |
126 | |
127 if (next) | |
128 { | |
129 info = collection_next_by_info(cd, info); | |
334
771c179cba77
Rename image-related options.
Laurent Monin <geeqie@norz.org>
parents:
318
diff
changeset
|
130 if (options->image.enable_read_ahead) |
9 | 131 { |
132 read_ahead_info = collection_next_by_info(cd, info); | |
133 if (!read_ahead_info) read_ahead_info = collection_prev_by_info(cd, info); | |
134 } | |
135 } | |
136 else | |
137 { | |
138 info = collection_prev_by_info(cd, info); | |
334
771c179cba77
Rename image-related options.
Laurent Monin <geeqie@norz.org>
parents:
318
diff
changeset
|
139 if (options->image.enable_read_ahead) |
9 | 140 { |
141 read_ahead_info = collection_prev_by_info(cd, info); | |
142 if (!read_ahead_info) read_ahead_info = collection_next_by_info(cd, info); | |
143 } | |
144 } | |
145 | |
146 if (info) | |
147 { | |
885
b561a43f7fb0
Use a specific enum for image.zoom_mode values (ZoomMode) and
Laurent Monin <geeqie@norz.org>
parents:
868
diff
changeset
|
148 image_change_from_collection(imd, cd, info, image_zoom_get_default(imd)); |
9 | 149 |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
150 if (read_ahead_info) image_prebuffer_set(imd, read_ahead_info->fd); |
9 | 151 } |
442 | 152 |
9 | 153 } |
154 | |
1433
12600de4b59a
Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents:
1432
diff
changeset
|
155 static void view_collection_step_to_end(ViewWindow *vw, gboolean last) |
9 | 156 { |
157 ImageWindow *imd = view_window_active_image(vw); | |
158 CollectionData *cd; | |
159 CollectInfo *info; | |
160 CollectInfo *read_ahead_info = NULL; | |
161 | |
162 cd = image_get_collection(imd, &info); | |
163 | |
164 if (!cd || !info) return; | |
165 | |
166 if (last) | |
167 { | |
168 info = collection_get_last(cd); | |
334
771c179cba77
Rename image-related options.
Laurent Monin <geeqie@norz.org>
parents:
318
diff
changeset
|
169 if (options->image.enable_read_ahead) read_ahead_info = collection_prev_by_info(cd, info); |
9 | 170 } |
171 else | |
172 { | |
173 info = collection_get_first(cd); | |
334
771c179cba77
Rename image-related options.
Laurent Monin <geeqie@norz.org>
parents:
318
diff
changeset
|
174 if (options->image.enable_read_ahead) read_ahead_info = collection_next_by_info(cd, info); |
9 | 175 } |
176 | |
177 if (info) | |
178 { | |
885
b561a43f7fb0
Use a specific enum for image.zoom_mode values (ZoomMode) and
Laurent Monin <geeqie@norz.org>
parents:
868
diff
changeset
|
179 image_change_from_collection(imd, cd, info, image_zoom_get_default(imd)); |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
180 if (read_ahead_info) image_prebuffer_set(imd, read_ahead_info->fd); |
9 | 181 } |
182 } | |
183 | |
1433
12600de4b59a
Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents:
1432
diff
changeset
|
184 static void view_list_step(ViewWindow *vw, gboolean next) |
9 | 185 { |
186 ImageWindow *imd = view_window_active_image(vw); | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
187 FileData *fd; |
9 | 188 GList *work; |
189 GList *work_ahead; | |
190 | |
191 if (!vw->list) return; | |
192 | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
193 fd = image_get_fd(imd); |
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
194 if (!fd) return; |
9 | 195 |
196 if (g_list_position(vw->list, vw->list_pointer) >= 0) | |
197 { | |
198 work = vw->list_pointer; | |
199 } | |
200 else | |
201 { | |
1433
12600de4b59a
Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents:
1432
diff
changeset
|
202 gboolean found = FALSE; |
9 | 203 |
204 work = vw->list; | |
205 while (work && !found) | |
206 { | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
207 FileData *temp; |
9 | 208 |
209 temp = work->data; | |
210 | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
211 if (fd == temp) |
9 | 212 { |
213 found = TRUE; | |
214 } | |
215 else | |
216 { | |
217 work = work->next; | |
218 } | |
219 } | |
220 } | |
221 if (!work) return; | |
222 | |
223 work_ahead = NULL; | |
224 if (next) | |
225 { | |
226 work = work->next; | |
227 if (work) work_ahead = work->next; | |
228 } | |
229 else | |
230 { | |
231 work = work->prev; | |
232 if (work) work_ahead = work->prev; | |
233 } | |
118
7642cc02ee8d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
117
diff
changeset
|
234 |
9 | 235 if (!work) return; |
236 | |
237 vw->list_pointer = work; | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
238 fd = work->data; |
885
b561a43f7fb0
Use a specific enum for image.zoom_mode values (ZoomMode) and
Laurent Monin <geeqie@norz.org>
parents:
868
diff
changeset
|
239 image_change_fd(imd, fd, image_zoom_get_default(imd)); |
9 | 240 |
334
771c179cba77
Rename image-related options.
Laurent Monin <geeqie@norz.org>
parents:
318
diff
changeset
|
241 if (options->image.enable_read_ahead && work_ahead) |
9 | 242 { |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
243 FileData *next_fd = work_ahead->data; |
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
244 image_prebuffer_set(imd, next_fd); |
9 | 245 } |
246 } | |
247 | |
1433
12600de4b59a
Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents:
1432
diff
changeset
|
248 static void view_list_step_to_end(ViewWindow *vw, gboolean last) |
9 | 249 { |
250 ImageWindow *imd = view_window_active_image(vw); | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
251 FileData *fd; |
9 | 252 GList *work; |
253 GList *work_ahead; | |
254 | |
255 if (!vw->list) return; | |
256 | |
257 if (last) | |
258 { | |
259 work = g_list_last(vw->list); | |
260 work_ahead = work->prev; | |
261 } | |
262 else | |
263 { | |
264 work = vw->list; | |
265 work_ahead = work->next; | |
266 } | |
267 | |
268 vw->list_pointer = work; | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
269 fd = work->data; |
885
b561a43f7fb0
Use a specific enum for image.zoom_mode values (ZoomMode) and
Laurent Monin <geeqie@norz.org>
parents:
868
diff
changeset
|
270 image_change_fd(imd, fd, image_zoom_get_default(imd)); |
9 | 271 |
334
771c179cba77
Rename image-related options.
Laurent Monin <geeqie@norz.org>
parents:
318
diff
changeset
|
272 if (options->image.enable_read_ahead && work_ahead) |
9 | 273 { |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
274 FileData *next_fd = work_ahead->data; |
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
275 image_prebuffer_set(imd, next_fd); |
9 | 276 } |
277 } | |
278 | |
279 static void view_step_next(ViewWindow *vw) | |
280 { | |
281 if (vw->ss) | |
282 { | |
283 view_slideshow_next(vw); | |
284 } | |
285 else if (vw->list) | |
286 { | |
287 view_list_step(vw, TRUE); | |
288 } | |
289 else | |
290 { | |
291 view_collection_step(vw, TRUE); | |
292 } | |
293 } | |
294 | |
295 static void view_step_prev(ViewWindow *vw) | |
296 { | |
297 if (vw->ss) | |
298 { | |
299 view_slideshow_prev(vw); | |
300 } | |
301 else if (vw->list) | |
302 { | |
303 view_list_step(vw, FALSE); | |
304 } | |
305 else | |
306 { | |
307 view_collection_step(vw, FALSE); | |
308 } | |
309 } | |
310 | |
1433
12600de4b59a
Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents:
1432
diff
changeset
|
311 static void view_step_to_end(ViewWindow *vw, gboolean last) |
9 | 312 { |
313 if (vw->list) | |
314 { | |
315 view_list_step_to_end(vw, last); | |
316 } | |
317 else | |
318 { | |
319 view_collection_step_to_end(vw, last); | |
320 } | |
321 } | |
322 | |
1 | 323 /* |
324 *----------------------------------------------------------------------------- | |
325 * view window keyboard | |
326 *----------------------------------------------------------------------------- | |
327 */ | |
328 | |
9 | 329 static void view_window_menu_pos_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data) |
330 { | |
331 ViewWindow *vw = data; | |
332 ImageWindow *imd; | |
333 | |
334 imd = view_window_active_image(vw); | |
2034
9297985567b5
use accessor functions
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
2021
diff
changeset
|
335 gdk_window_get_origin(gtk_widget_get_window(imd->pr), x, y); |
9 | 336 popup_menu_position_clamp(menu, x, y, 0); |
337 } | |
338 | |
1433
12600de4b59a
Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents:
1432
diff
changeset
|
339 static gboolean view_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) |
1 | 340 { |
9 | 341 ViewWindow *vw = data; |
342 ImageWindow *imd; | |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
343 gint stop_signal; |
9 | 344 GtkWidget *menu; |
1 | 345 gint x = 0; |
346 gint y = 0; | |
347 | |
9 | 348 imd = view_window_active_image(vw); |
349 | |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
350 stop_signal = TRUE; |
1 | 351 switch (event->keyval) |
352 { | |
2036
472c094c0154
changed GDK_<key> to GDK_KEY_<key>
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
2034
diff
changeset
|
353 case GDK_KEY_Left: case GDK_KEY_KP_Left: |
1 | 354 x -= 1; |
355 break; | |
2036
472c094c0154
changed GDK_<key> to GDK_KEY_<key>
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
2034
diff
changeset
|
356 case GDK_KEY_Right: case GDK_KEY_KP_Right: |
1 | 357 x += 1; |
358 break; | |
2036
472c094c0154
changed GDK_<key> to GDK_KEY_<key>
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
2034
diff
changeset
|
359 case GDK_KEY_Up: case GDK_KEY_KP_Up: |
1 | 360 y -= 1; |
361 break; | |
2036
472c094c0154
changed GDK_<key> to GDK_KEY_<key>
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
2034
diff
changeset
|
362 case GDK_KEY_Down: case GDK_KEY_KP_Down: |
1 | 363 y += 1; |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
364 break; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
365 default: |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
366 stop_signal = FALSE; |
1 | 367 break; |
9 | 368 } |
369 | |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
370 if (x != 0 || y!= 0) |
9 | 371 { |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
372 if (event->state & GDK_SHIFT_MASK) |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
373 { |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
374 x *= 3; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
375 y *= 3; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
376 } |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
377 |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
378 keyboard_scroll_calc(&x, &y, event); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
379 image_scroll(imd, x, y); |
1 | 380 } |
381 | |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
382 if (stop_signal) return stop_signal; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
383 |
1 | 384 if (event->state & GDK_CONTROL_MASK) |
385 { | |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
386 stop_signal = TRUE; |
1 | 387 switch (event->keyval) |
388 { | |
389 case '1': | |
390 case '2': | |
391 case '3': | |
392 case '4': | |
393 case '5': | |
394 case '6': | |
395 case '7': | |
396 case '8': | |
9 | 397 case '9': |
398 case '0': | |
399 break; | |
400 case 'C': case 'c': | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
401 file_util_copy(image_get_fd(imd), NULL, NULL, imd->widget); |
9 | 402 break; |
403 case 'M': case 'm': | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
404 file_util_move(image_get_fd(imd), NULL, NULL, imd->widget); |
9 | 405 break; |
406 case 'R': case 'r': | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
407 file_util_rename(image_get_fd(imd), NULL, imd->widget); |
9 | 408 break; |
409 case 'D': case 'd': | |
2860
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
410 options->file_ops.safe_delete_enable = TRUE; |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
411 file_util_delete(image_get_fd(imd), NULL, imd->widget); |
9 | 412 break; |
413 case 'W': case 'w': | |
414 view_window_close(vw); | |
415 break; | |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
416 default: |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
417 stop_signal = FALSE; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
418 break; |
1 | 419 } |
420 } | |
9 | 421 else if (event->state & GDK_SHIFT_MASK) |
1 | 422 { |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
423 stop_signal = TRUE; |
9 | 424 switch (event->keyval) |
425 { | |
426 case 'R': case 'r': | |
2440
cb9f25cb54f3
Orientation commands and file selections
cclark <cclark@mcb.net>
parents:
2376
diff
changeset
|
427 image_alter_orientation(imd, imd->image_fd, ALTER_ROTATE_180); |
9 | 428 break; |
429 case 'M': case 'm': | |
2440
cb9f25cb54f3
Orientation commands and file selections
cclark <cclark@mcb.net>
parents:
2376
diff
changeset
|
430 image_alter_orientation(imd, imd->image_fd, ALTER_MIRROR); |
9 | 431 break; |
432 case 'F': case 'f': | |
2440
cb9f25cb54f3
Orientation commands and file selections
cclark <cclark@mcb.net>
parents:
2376
diff
changeset
|
433 image_alter_orientation(imd, imd->image_fd, ALTER_FLIP); |
9 | 434 break; |
82
05a6aea69f24
Thu Oct 19 15:20:51 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
64
diff
changeset
|
435 case 'G': case 'g': |
1566
df4da4647646
separated Orientation and Grayscale functions
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1513
diff
changeset
|
436 image_set_desaturate(imd, !image_get_desaturate(imd)); |
82
05a6aea69f24
Thu Oct 19 15:20:51 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
64
diff
changeset
|
437 break; |
94
7bd3d907ca2b
Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
91
diff
changeset
|
438 case 'P': case 'p': |
7bd3d907ca2b
Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
91
diff
changeset
|
439 { |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
440 FileData *fd; |
94
7bd3d907ca2b
Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
91
diff
changeset
|
441 |
7bd3d907ca2b
Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
91
diff
changeset
|
442 view_fullscreen_toggle(vw, TRUE); |
7bd3d907ca2b
Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
91
diff
changeset
|
443 imd = view_window_active_image(vw); |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
444 fd = image_get_fd(imd); |
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
445 print_window_new(fd, |
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
446 fd ? g_list_append(NULL, file_data_ref(fd)) : NULL, |
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
447 filelist_copy(vw->list), vw->window); |
94
7bd3d907ca2b
Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
91
diff
changeset
|
448 } |
7bd3d907ca2b
Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
91
diff
changeset
|
449 break; |
2860
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
450 case GDK_KEY_Delete: case GDK_KEY_KP_Delete: |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
451 if (options->file_ops.enable_delete_key) |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
452 { |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
453 options->file_ops.safe_delete_enable = FALSE; |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
454 file_util_delete(image_get_fd(imd), NULL, imd->widget); |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
455 } |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
456 break; |
9 | 457 default: |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
458 stop_signal = FALSE; |
9 | 459 break; |
460 } | |
1 | 461 } |
442 | 462 else |
1 | 463 { |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
464 stop_signal = TRUE; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
465 switch (event->keyval) |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
466 { |
2036
472c094c0154
changed GDK_<key> to GDK_KEY_<key>
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
2034
diff
changeset
|
467 case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up: |
472c094c0154
changed GDK_<key> to GDK_KEY_<key>
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
2034
diff
changeset
|
468 case GDK_KEY_BackSpace: |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
469 case 'B': case 'b': |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
470 view_step_prev(vw); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
471 break; |
2036
472c094c0154
changed GDK_<key> to GDK_KEY_<key>
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
2034
diff
changeset
|
472 case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down: |
472c094c0154
changed GDK_<key> to GDK_KEY_<key>
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
2034
diff
changeset
|
473 case GDK_KEY_space: |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
474 case 'N': case 'n': |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
475 view_step_next(vw); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
476 break; |
2036
472c094c0154
changed GDK_<key> to GDK_KEY_<key>
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
2034
diff
changeset
|
477 case GDK_KEY_Home: case GDK_KEY_KP_Home: |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
478 view_step_to_end(vw, FALSE); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
479 break; |
2036
472c094c0154
changed GDK_<key> to GDK_KEY_<key>
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
2034
diff
changeset
|
480 case GDK_KEY_End: case GDK_KEY_KP_End: |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
481 view_step_to_end(vw, TRUE); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
482 break; |
2036
472c094c0154
changed GDK_<key> to GDK_KEY_<key>
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
2034
diff
changeset
|
483 case '+': case '=': case GDK_KEY_KP_Add: |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
484 image_zoom_adjust(imd, get_zoom_increment()); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
485 break; |
2036
472c094c0154
changed GDK_<key> to GDK_KEY_<key>
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
2034
diff
changeset
|
486 case '-': case GDK_KEY_KP_Subtract: |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
487 image_zoom_adjust(imd, -get_zoom_increment()); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
488 break; |
2036
472c094c0154
changed GDK_<key> to GDK_KEY_<key>
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
2034
diff
changeset
|
489 case 'X': case 'x': case GDK_KEY_KP_Multiply: |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
490 image_zoom_set(imd, 0.0); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
491 break; |
2036
472c094c0154
changed GDK_<key> to GDK_KEY_<key>
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
2034
diff
changeset
|
492 case 'Z': case 'z': case GDK_KEY_KP_Divide: case '1': |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
493 image_zoom_set(imd, 1.0); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
494 break; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
495 case '2': |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
496 image_zoom_set(imd, 2.0); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
497 break; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
498 case '3': |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
499 image_zoom_set(imd, 3.0); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
500 break; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
501 case '4': |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
502 image_zoom_set(imd, 4.0); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
503 break; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
504 case '7': |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
505 image_zoom_set(imd, -4.0); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
506 break; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
507 case '8': |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
508 image_zoom_set(imd, -3.0); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
509 break; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
510 case '9': |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
511 image_zoom_set(imd, -2.0); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
512 break; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
513 case 'W': case 'w': |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
514 image_zoom_set_fill_geometry(imd, FALSE); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
515 break; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
516 case 'H': case 'h': |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
517 image_zoom_set_fill_geometry(imd, TRUE); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
518 break; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
519 case 'R': case 'r': |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
520 image_reload(imd); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
521 break; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
522 case 'S': case 's': |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
523 if (vw->ss) |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
524 { |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
525 view_slideshow_stop(vw); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
526 } |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
527 else |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
528 { |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
529 view_slideshow_start(vw); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
530 } |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
531 break; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
532 case 'P': case 'p': |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
533 slideshow_pause_toggle(vw->ss); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
534 break; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
535 case 'F': case 'f': |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
536 case 'V': case 'v': |
2036
472c094c0154
changed GDK_<key> to GDK_KEY_<key>
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
2034
diff
changeset
|
537 case GDK_KEY_F11: |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
538 view_fullscreen_toggle(vw, FALSE); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
539 break; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
540 case 'I': case 'i': |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
541 view_overlay_toggle(vw); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
542 break; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
543 case ']': |
2440
cb9f25cb54f3
Orientation commands and file selections
cclark <cclark@mcb.net>
parents:
2376
diff
changeset
|
544 image_alter_orientation(imd, imd->image_fd, ALTER_ROTATE_90); |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
545 break; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
546 case '[': |
2440
cb9f25cb54f3
Orientation commands and file selections
cclark <cclark@mcb.net>
parents:
2376
diff
changeset
|
547 image_alter_orientation(imd, imd->image_fd, ALTER_ROTATE_90_CC); |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
548 break; |
2036
472c094c0154
changed GDK_<key> to GDK_KEY_<key>
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
2034
diff
changeset
|
549 case GDK_KEY_Delete: case GDK_KEY_KP_Delete: |
341
3e0059a55671
Move safe_delete* and in place rename options to file_ops
Laurent Monin <geeqie@norz.org>
parents:
339
diff
changeset
|
550 if (options->file_ops.enable_delete_key) |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
551 { |
2860
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
552 options->file_ops.safe_delete_enable = TRUE; |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
553 file_util_delete(image_get_fd(imd), NULL, imd->widget); |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
554 } |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
555 break; |
2036
472c094c0154
changed GDK_<key> to GDK_KEY_<key>
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
2034
diff
changeset
|
556 case GDK_KEY_Escape: |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
557 if (vw->fs) |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
558 { |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
559 view_fullscreen_toggle(vw, TRUE); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
560 } |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
561 else |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
562 { |
89
563002fc408b
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
86
diff
changeset
|
563 view_window_close(vw); |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
564 } |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
565 break; |
2036
472c094c0154
changed GDK_<key> to GDK_KEY_<key>
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
2034
diff
changeset
|
566 case GDK_KEY_Menu: |
472c094c0154
changed GDK_<key> to GDK_KEY_<key>
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
2034
diff
changeset
|
567 case GDK_KEY_F10: |
84
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
568 menu = view_popup_menu(vw); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
569 gtk_menu_popup(GTK_MENU(menu), NULL, NULL, |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
570 view_window_menu_pos_cb, vw, 0, GDK_CURRENT_TIME); |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
571 break; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
572 default: |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
573 stop_signal = FALSE; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
574 break; |
34319746590d
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
82
diff
changeset
|
575 } |
1 | 576 } |
2694 | 577 if (!stop_signal && is_help_key(event)) |
578 { | |
579 help_window_show("GuideOtherWindowsImageWindow.html"); | |
580 stop_signal = TRUE; | |
581 } | |
1 | 582 |
583 return stop_signal; | |
584 } | |
585 | |
586 /* | |
587 *----------------------------------------------------------------------------- | |
588 * view window main routines | |
589 *----------------------------------------------------------------------------- | |
442 | 590 */ |
868
b043dc777759
Reduce number of parameters (mostly unused), just pass the event pointer.
Laurent Monin <geeqie@norz.org>
parents:
803
diff
changeset
|
591 static void button_cb(ImageWindow *imd, GdkEventButton *event, gpointer data) |
9 | 592 { |
593 ViewWindow *vw = data; | |
594 GtkWidget *menu; | |
595 | |
868
b043dc777759
Reduce number of parameters (mostly unused), just pass the event pointer.
Laurent Monin <geeqie@norz.org>
parents:
803
diff
changeset
|
596 switch (event->button) |
9 | 597 { |
448
2c1500b5c933
Use explicit names for mouse buttons instead of numbers.
Laurent Monin <geeqie@norz.org>
parents:
446
diff
changeset
|
598 case MOUSE_BUTTON_LEFT: |
2631
e493a7df8745
Addl fix #510: Rudimentary video support
Tomasz Golinski <tomaszg@math.uwb.edu.pl>
parents:
2583
diff
changeset
|
599 if (options->image_l_click_video && options->image_l_click_video_editor && imd->image_fd->format_class == FORMAT_CLASS_VIDEO) |
e493a7df8745
Addl fix #510: Rudimentary video support
Tomasz Golinski <tomaszg@math.uwb.edu.pl>
parents:
2583
diff
changeset
|
600 { |
e493a7df8745
Addl fix #510: Rudimentary video support
Tomasz Golinski <tomaszg@math.uwb.edu.pl>
parents:
2583
diff
changeset
|
601 start_editor_from_file(options->image_l_click_video_editor, imd->image_fd); |
e493a7df8745
Addl fix #510: Rudimentary video support
Tomasz Golinski <tomaszg@math.uwb.edu.pl>
parents:
2583
diff
changeset
|
602 } |
e493a7df8745
Addl fix #510: Rudimentary video support
Tomasz Golinski <tomaszg@math.uwb.edu.pl>
parents:
2583
diff
changeset
|
603 else if (options->image_lm_click_nav) |
2376
6c310168a91c
Add four new preferences
Maciej S. Szmigiero <mail@maciej.szmigiero.name>
parents:
2350
diff
changeset
|
604 view_step_next(vw); |
9 | 605 break; |
448
2c1500b5c933
Use explicit names for mouse buttons instead of numbers.
Laurent Monin <geeqie@norz.org>
parents:
446
diff
changeset
|
606 case MOUSE_BUTTON_MIDDLE: |
2376
6c310168a91c
Add four new preferences
Maciej S. Szmigiero <mail@maciej.szmigiero.name>
parents:
2350
diff
changeset
|
607 if (options->image_lm_click_nav) |
6c310168a91c
Add four new preferences
Maciej S. Szmigiero <mail@maciej.szmigiero.name>
parents:
2350
diff
changeset
|
608 view_step_prev(vw); |
9 | 609 break; |
448
2c1500b5c933
Use explicit names for mouse buttons instead of numbers.
Laurent Monin <geeqie@norz.org>
parents:
446
diff
changeset
|
610 case MOUSE_BUTTON_RIGHT: |
9 | 611 menu = view_popup_menu(vw); |
868
b043dc777759
Reduce number of parameters (mostly unused), just pass the event pointer.
Laurent Monin <geeqie@norz.org>
parents:
803
diff
changeset
|
612 gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 3, event->time); |
9 | 613 break; |
614 default: | |
615 break; | |
616 } | |
617 } | |
618 | |
868
b043dc777759
Reduce number of parameters (mostly unused), just pass the event pointer.
Laurent Monin <geeqie@norz.org>
parents:
803
diff
changeset
|
619 static void scroll_cb(ImageWindow *imd, GdkEventScroll *event, gpointer data) |
1 | 620 { |
9 | 621 ViewWindow *vw = data; |
622 | |
2466
d286a43ba3b5
Fix #290: Mouse-only image viewing
Colin Clark <cclark@mcb.net>
parents:
2440
diff
changeset
|
623 if ((event->state & GDK_CONTROL_MASK) || |
d286a43ba3b5
Fix #290: Mouse-only image viewing
Colin Clark <cclark@mcb.net>
parents:
2440
diff
changeset
|
624 (imd->mouse_wheel_mode && !options->image_lm_click_nav)) |
9 | 625 { |
868
b043dc777759
Reduce number of parameters (mostly unused), just pass the event pointer.
Laurent Monin <geeqie@norz.org>
parents:
803
diff
changeset
|
626 switch (event->direction) |
9 | 627 { |
628 case GDK_SCROLL_UP: | |
868
b043dc777759
Reduce number of parameters (mostly unused), just pass the event pointer.
Laurent Monin <geeqie@norz.org>
parents:
803
diff
changeset
|
629 image_zoom_adjust_at_point(imd, get_zoom_increment(), event->x, event->y); |
9 | 630 break; |
631 case GDK_SCROLL_DOWN: | |
868
b043dc777759
Reduce number of parameters (mostly unused), just pass the event pointer.
Laurent Monin <geeqie@norz.org>
parents:
803
diff
changeset
|
632 image_zoom_adjust_at_point(imd, -get_zoom_increment(), event->x, event->y); |
9 | 633 break; |
634 default: | |
635 break; | |
636 } | |
637 } | |
868
b043dc777759
Reduce number of parameters (mostly unused), just pass the event pointer.
Laurent Monin <geeqie@norz.org>
parents:
803
diff
changeset
|
638 else if ( (event->state & GDK_SHIFT_MASK) != (guint) (options->mousewheel_scrolls)) |
9 | 639 { |
868
b043dc777759
Reduce number of parameters (mostly unused), just pass the event pointer.
Laurent Monin <geeqie@norz.org>
parents:
803
diff
changeset
|
640 switch (event->direction) |
9 | 641 { |
642 case GDK_SCROLL_UP: | |
643 image_scroll(imd, 0, -MOUSEWHEEL_SCROLL_SIZE); | |
644 break; | |
645 case GDK_SCROLL_DOWN: | |
646 image_scroll(imd, 0, MOUSEWHEEL_SCROLL_SIZE); | |
647 break; | |
648 case GDK_SCROLL_LEFT: | |
649 image_scroll(imd, -MOUSEWHEEL_SCROLL_SIZE, 0); | |
650 break; | |
651 case GDK_SCROLL_RIGHT: | |
652 image_scroll(imd, MOUSEWHEEL_SCROLL_SIZE, 0); | |
653 break; | |
654 default: | |
655 break; | |
656 } | |
657 } | |
658 else | |
659 { | |
868
b043dc777759
Reduce number of parameters (mostly unused), just pass the event pointer.
Laurent Monin <geeqie@norz.org>
parents:
803
diff
changeset
|
660 switch (event->direction) |
9 | 661 { |
662 case GDK_SCROLL_UP: | |
663 view_step_prev(vw); | |
664 break; | |
665 case GDK_SCROLL_DOWN: | |
666 view_step_next(vw); | |
667 break; | |
668 default: | |
669 break; | |
670 } | |
671 } | |
672 } | |
673 | |
674 static void view_image_set_buttons(ViewWindow *vw, ImageWindow *imd) | |
675 { | |
676 image_set_button_func(imd, button_cb, vw); | |
677 image_set_scroll_func(imd, scroll_cb, vw); | |
678 } | |
679 | |
680 static void view_fullscreen_stop_func(FullScreenData *fs, gpointer data) | |
681 { | |
682 ViewWindow *vw = data; | |
683 | |
684 vw->fs = NULL; | |
685 | |
686 if (vw->ss) vw->ss->imd = vw->imd; | |
1 | 687 } |
688 | |
1433
12600de4b59a
Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents:
1432
diff
changeset
|
689 static void view_fullscreen_toggle(ViewWindow *vw, gboolean force_off) |
4 | 690 { |
9 | 691 if (force_off && !vw->fs) return; |
692 | |
693 if (vw->fs) | |
694 { | |
621
c5ebd4b66d41
image_osd_get() now returns OsdShowFlags.
Laurent Monin <geeqie@norz.org>
parents:
614
diff
changeset
|
695 if (image_osd_get(vw->imd) & OSD_SHOW_INFO) |
c5ebd4b66d41
image_osd_get() now returns OsdShowFlags.
Laurent Monin <geeqie@norz.org>
parents:
614
diff
changeset
|
696 image_osd_set(vw->imd, image_osd_get(vw->fs->imd)); |
2185
c14a1d8e6aa4
Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents:
2184
diff
changeset
|
697 |
117
f95079062ea0
Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
94
diff
changeset
|
698 fullscreen_stop(vw->fs); |
9 | 699 } |
700 else | |
701 { | |
702 vw->fs = fullscreen_start(vw->window, vw->imd, view_fullscreen_stop_func, vw); | |
703 | |
704 view_image_set_buttons(vw, vw->fs->imd); | |
705 g_signal_connect(G_OBJECT(vw->fs->window), "key_press_event", | |
706 G_CALLBACK(view_window_key_press_cb), vw); | |
707 | |
708 if (vw->ss) vw->ss->imd = vw->fs->imd; | |
709 | |
621
c5ebd4b66d41
image_osd_get() now returns OsdShowFlags.
Laurent Monin <geeqie@norz.org>
parents:
614
diff
changeset
|
710 if (image_osd_get(vw->imd) & OSD_SHOW_INFO) |
9 | 711 { |
621
c5ebd4b66d41
image_osd_get() now returns OsdShowFlags.
Laurent Monin <geeqie@norz.org>
parents:
614
diff
changeset
|
712 image_osd_set(vw->fs->imd, image_osd_get(vw->imd)); |
614
e477b53a6046
image_osd_get() and image_osd_set() now uses flags.
Laurent Monin <geeqie@norz.org>
parents:
586
diff
changeset
|
713 image_osd_set(vw->imd, OSD_SHOW_NOTHING); |
9 | 714 } |
715 } | |
716 } | |
717 | |
718 static void view_overlay_toggle(ViewWindow *vw) | |
719 { | |
720 ImageWindow *imd; | |
721 | |
722 imd = view_window_active_image(vw); | |
2185
c14a1d8e6aa4
Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents:
2184
diff
changeset
|
723 |
481
f55cb8ad0abc
Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
Laurent Monin <geeqie@norz.org>
parents:
479
diff
changeset
|
724 image_osd_toggle(imd); |
9 | 725 } |
726 | |
727 static void view_slideshow_next(ViewWindow *vw) | |
728 { | |
729 if (vw->ss) slideshow_next(vw->ss); | |
4 | 730 } |
731 | |
9 | 732 static void view_slideshow_prev(ViewWindow *vw) |
733 { | |
734 if (vw->ss) slideshow_prev(vw->ss); | |
735 } | |
736 | |
737 static void view_slideshow_stop_func(SlideShowData *fs, gpointer data) | |
738 { | |
739 ViewWindow *vw = data; | |
118
7642cc02ee8d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
117
diff
changeset
|
740 GList *work; |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
741 FileData *fd; |
9 | 742 |
743 vw->ss = NULL; | |
118
7642cc02ee8d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
117
diff
changeset
|
744 |
7642cc02ee8d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
117
diff
changeset
|
745 work = vw->list; |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
746 fd = image_get_fd(view_window_active_image(vw)); |
118
7642cc02ee8d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
117
diff
changeset
|
747 while (work) |
7642cc02ee8d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
117
diff
changeset
|
748 { |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
749 FileData *temp; |
118
7642cc02ee8d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
117
diff
changeset
|
750 |
7642cc02ee8d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
117
diff
changeset
|
751 temp = work->data; |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
752 if (fd == temp) |
118
7642cc02ee8d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
117
diff
changeset
|
753 { |
7642cc02ee8d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
117
diff
changeset
|
754 vw->list_pointer = work; |
7642cc02ee8d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
117
diff
changeset
|
755 work = NULL; |
7642cc02ee8d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
117
diff
changeset
|
756 } |
7642cc02ee8d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
117
diff
changeset
|
757 else |
7642cc02ee8d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
117
diff
changeset
|
758 { |
7642cc02ee8d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
117
diff
changeset
|
759 work = work->next; |
7642cc02ee8d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
117
diff
changeset
|
760 } |
7642cc02ee8d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
117
diff
changeset
|
761 } |
9 | 762 } |
763 | |
764 static void view_slideshow_start(ViewWindow *vw) | |
4 | 765 { |
9 | 766 if (!vw->ss) |
767 { | |
768 CollectionData *cd; | |
769 CollectInfo *info; | |
770 | |
771 if (vw->list) | |
772 { | |
1627
c3778530b075
use layout_set_fd() for changing images from a slideshow
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1626
diff
changeset
|
773 vw->ss = slideshow_start_from_filelist(NULL, view_window_active_image(vw), |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
774 filelist_copy(vw->list), |
9 | 775 view_slideshow_stop_func, vw); |
776 vw->list_pointer = NULL; | |
777 return; | |
778 } | |
779 | |
780 cd = image_get_collection(view_window_active_image(vw), &info); | |
781 if (cd && info) | |
782 { | |
1627
c3778530b075
use layout_set_fd() for changing images from a slideshow
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1626
diff
changeset
|
783 vw->ss = slideshow_start_from_collection(NULL, view_window_active_image(vw), cd, |
9 | 784 view_slideshow_stop_func, vw, info); |
785 } | |
786 } | |
787 } | |
788 | |
789 static void view_slideshow_stop(ViewWindow *vw) | |
790 { | |
791 if (vw->ss) slideshow_free(vw->ss); | |
792 } | |
793 | |
89
563002fc408b
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
86
diff
changeset
|
794 static void view_window_destroy_cb(GtkWidget *widget, gpointer data) |
9 | 795 { |
89
563002fc408b
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
86
diff
changeset
|
796 ViewWindow *vw = data; |
563002fc408b
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
86
diff
changeset
|
797 |
9 | 798 view_window_list = g_list_remove(view_window_list, vw); |
799 | |
800 view_slideshow_stop(vw); | |
89
563002fc408b
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
86
diff
changeset
|
801 fullscreen_stop(vw->fs); |
563002fc408b
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
86
diff
changeset
|
802 |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
803 filelist_free(vw->list); |
797
4f1a67d254fc
use new notification in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
783
diff
changeset
|
804 |
4f1a67d254fc
use new notification in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
783
diff
changeset
|
805 file_data_unregister_notify_func(view_window_notify_cb, vw); |
4f1a67d254fc
use new notification in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
783
diff
changeset
|
806 |
89
563002fc408b
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
86
diff
changeset
|
807 g_free(vw); |
563002fc408b
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
86
diff
changeset
|
808 } |
563002fc408b
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
86
diff
changeset
|
809 |
563002fc408b
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
86
diff
changeset
|
810 static void view_window_close(ViewWindow *vw) |
563002fc408b
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
86
diff
changeset
|
811 { |
563002fc408b
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
86
diff
changeset
|
812 view_slideshow_stop(vw); |
9 | 813 view_fullscreen_toggle(vw, TRUE); |
814 gtk_widget_destroy(vw->window); | |
4 | 815 } |
816 | |
1433
12600de4b59a
Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents:
1432
diff
changeset
|
817 static gboolean view_window_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data) |
1 | 818 { |
9 | 819 ViewWindow *vw = data; |
820 | |
821 view_window_close(vw); | |
1 | 822 return TRUE; |
823 } | |
824 | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
825 static ViewWindow *real_view_window_new(FileData *fd, GList *list, CollectionData *cd, CollectInfo *info) |
1 | 826 { |
9 | 827 ViewWindow *vw; |
1 | 828 GtkAllocation req_size; |
9 | 829 GdkGeometry geometry; |
1 | 830 gint w, h; |
9 | 831 |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
832 if (!fd && !list && (!cd || !info)) return NULL; |
9 | 833 |
834 vw = g_new0(ViewWindow, 1); | |
835 | |
289
d4d7e7aa0d88
Simplify and unify gtk_window creation with the help of
Laurent Monin <geeqie@norz.org>
parents:
288
diff
changeset
|
836 vw->window = window_new(GTK_WINDOW_TOPLEVEL, "view", PIXBUF_INLINE_ICON_VIEW, NULL, NULL); |
9 | 837 |
1029
b1a912dee214
Use a constant for minimal window size. Set it to 32 for all dialogs.
Laurent Monin <geeqie@norz.org>
parents:
1022
diff
changeset
|
838 geometry.min_width = DEFAULT_MINIMAL_WINDOW_SIZE; |
b1a912dee214
Use a constant for minimal window size. Set it to 32 for all dialogs.
Laurent Monin <geeqie@norz.org>
parents:
1022
diff
changeset
|
839 geometry.min_height = DEFAULT_MINIMAL_WINDOW_SIZE; |
9 | 840 gtk_window_set_geometry_hints(GTK_WINDOW(vw->window), NULL, &geometry, GDK_HINT_MIN_SIZE); |
1 | 841 |
9 | 842 gtk_window_set_resizable(GTK_WINDOW(vw->window), TRUE); |
442 | 843 gtk_container_set_border_width(GTK_CONTAINER(vw->window), 0); |
9 | 844 |
845 vw->imd = image_new(FALSE); | |
1639
3dfbbabd5138
enabled color management in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1627
diff
changeset
|
846 image_color_profile_set(vw->imd, |
3dfbbabd5138
enabled color management in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1627
diff
changeset
|
847 options->color_profile.input_type, |
3dfbbabd5138
enabled color management in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1627
diff
changeset
|
848 options->color_profile.use_image); |
3dfbbabd5138
enabled color management in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1627
diff
changeset
|
849 image_color_profile_set_use(vw->imd, options->color_profile.enabled); |
9 | 850 |
1626
63527696d61c
Add an option to Image preferences to restrict custom border to fullscreen mode only. Bug 2798062.
Laurent Monin <geeqie@norz.org>
parents:
1566
diff
changeset
|
851 image_background_set_color_from_options(vw->imd, FALSE); |
9 | 852 |
288
e675073bcca0
Replace occurences of Geeqie / geeqie by constants defined in main.h.
Laurent Monin <geeqie@norz.org>
parents:
281
diff
changeset
|
853 image_attach_window(vw->imd, vw->window, NULL, GQ_APPNAME, TRUE); |
9 | 854 |
888
626822338b41
reload changed images
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
885
diff
changeset
|
855 image_auto_refresh_enable(vw->imd, TRUE); |
9 | 856 image_top_window_set_sync(vw->imd, TRUE); |
857 | |
858 gtk_container_add(GTK_CONTAINER(vw->window), vw->imd->widget); | |
859 gtk_widget_show(vw->imd->widget); | |
860 | |
861 view_window_dnd_init(vw); | |
1 | 862 |
9 | 863 view_image_set_buttons(vw, vw->imd); |
1 | 864 |
89
563002fc408b
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
86
diff
changeset
|
865 g_signal_connect(G_OBJECT(vw->window), "destroy", |
563002fc408b
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
86
diff
changeset
|
866 G_CALLBACK(view_window_destroy_cb), vw); |
9 | 867 g_signal_connect(G_OBJECT(vw->window), "delete_event", |
868 G_CALLBACK(view_window_delete_cb), vw); | |
869 g_signal_connect(G_OBJECT(vw->window), "key_press_event", | |
870 G_CALLBACK(view_window_key_press_cb), vw); | |
871 if (cd && info) | |
872 { | |
885
b561a43f7fb0
Use a specific enum for image.zoom_mode values (ZoomMode) and
Laurent Monin <geeqie@norz.org>
parents:
868
diff
changeset
|
873 image_change_from_collection(vw->imd, cd, info, image_zoom_get_default(NULL)); |
2868
4fc59d8e53c0
Fix #648: Correctly size image windows opened from collections
Dave Lambert <>
parents:
2860
diff
changeset
|
874 /* Grab the fd so we can correctly size the window in |
4fc59d8e53c0
Fix #648: Correctly size image windows opened from collections
Dave Lambert <>
parents:
2860
diff
changeset
|
875 the call to image_load_dimensions() below. */ |
4fc59d8e53c0
Fix #648: Correctly size image windows opened from collections
Dave Lambert <>
parents:
2860
diff
changeset
|
876 fd = info->fd; |
334
771c179cba77
Rename image-related options.
Laurent Monin <geeqie@norz.org>
parents:
318
diff
changeset
|
877 if (options->image.enable_read_ahead) |
9 | 878 { |
879 CollectInfo * r_info = collection_next_by_info(cd, info); | |
880 if (!r_info) r_info = collection_prev_by_info(cd, info); | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
881 if (r_info) image_prebuffer_set(vw->imd, r_info->fd); |
9 | 882 } |
883 } | |
884 else if (list) | |
885 { | |
886 view_window_set_list(vw, list); | |
887 vw->list_pointer = vw->list; | |
885
b561a43f7fb0
Use a specific enum for image.zoom_mode values (ZoomMode) and
Laurent Monin <geeqie@norz.org>
parents:
868
diff
changeset
|
888 image_change_fd(vw->imd, (FileData *)vw->list->data, image_zoom_get_default(NULL)); |
2873
6a16ed6742be
Bug fix: View in new window from files pane
Colin Clark <colin.clark@cclark.uk>
parents:
2868
diff
changeset
|
889 /* Set fd to first in list */ |
6a16ed6742be
Bug fix: View in new window from files pane
Colin Clark <colin.clark@cclark.uk>
parents:
2868
diff
changeset
|
890 fd = vw->list->data; |
1 | 891 |
334
771c179cba77
Rename image-related options.
Laurent Monin <geeqie@norz.org>
parents:
318
diff
changeset
|
892 if (options->image.enable_read_ahead) |
9 | 893 { |
894 GList *work = vw->list->next; | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
895 if (work) image_prebuffer_set(vw->imd, (FileData *)work->data); |
9 | 896 } |
897 } | |
898 else | |
899 { | |
885
b561a43f7fb0
Use a specific enum for image.zoom_mode values (ZoomMode) and
Laurent Monin <geeqie@norz.org>
parents:
868
diff
changeset
|
900 image_change_fd(vw->imd, fd, image_zoom_get_default(NULL)); |
9 | 901 } |
1 | 902 |
1865 | 903 /* Wait until image is loaded otherwise size is not defined */ |
2847
53785dd2e8c9
Bug fix: View in new window wrong size
Colin Clark <colin.clark@cclark.uk>
parents:
2754
diff
changeset
|
904 image_load_dimensions(fd, &w, &h); |
1865 | 905 |
334
771c179cba77
Rename image-related options.
Laurent Monin <geeqie@norz.org>
parents:
318
diff
changeset
|
906 if (options->image.limit_window_size) |
1 | 907 { |
334
771c179cba77
Rename image-related options.
Laurent Monin <geeqie@norz.org>
parents:
318
diff
changeset
|
908 gint mw = gdk_screen_width() * options->image.max_window_size / 100; |
771c179cba77
Rename image-related options.
Laurent Monin <geeqie@norz.org>
parents:
318
diff
changeset
|
909 gint mh = gdk_screen_height() * options->image.max_window_size / 100; |
1 | 910 |
911 if (w > mw) w = mw; | |
912 if (h > mh) h = mh; | |
913 } | |
914 | |
9 | 915 gtk_window_set_default_size(GTK_WINDOW(vw->window), w, h); |
1 | 916 req_size.x = req_size.y = 0; |
917 req_size.width = w; | |
918 req_size.height = h; | |
9 | 919 gtk_widget_size_allocate(GTK_WIDGET(vw->window), &req_size); |
920 | |
2475
53faa92f790f
Bug fix: Re-size images in GTK3
Colin Clark <colin.clark@cclark.uk>
parents:
2466
diff
changeset
|
921 #if !GTK_CHECK_VERSION(3,0,0) |
23
9ff428db7772
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
John Ellis <johne@verizon.net>
parents:
9
diff
changeset
|
922 gtk_widget_set_size_request(vw->imd->pr, w, h); |
2475
53faa92f790f
Bug fix: Re-size images in GTK3
Colin Clark <colin.clark@cclark.uk>
parents:
2466
diff
changeset
|
923 #endif |
9 | 924 |
2854
3ccf51c15dba
Do not grab focus when --remote view:<file> is used
Colin Clark <colin.clark@cclark.uk>
parents:
2847
diff
changeset
|
925 gtk_window_set_focus_on_map(GTK_WINDOW(vw->window), FALSE); |
9 | 926 gtk_widget_show(vw->window); |
927 | |
928 view_window_list = g_list_append(view_window_list, vw); | |
929 | |
797
4f1a67d254fc
use new notification in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
783
diff
changeset
|
930 file_data_register_notify_func(view_window_notify_cb, vw, NOTIFY_PRIORITY_LOW); |
4f1a67d254fc
use new notification in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
783
diff
changeset
|
931 |
9 | 932 return vw; |
933 } | |
934 | |
935 static void view_window_collection_unref_cb(GtkWidget *widget, gpointer data) | |
936 { | |
937 CollectionData *cd = data; | |
938 | |
939 collection_unref(cd); | |
940 } | |
941 | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
942 void view_window_new(FileData *fd) |
9 | 943 { |
780
f5dc8c7d6a5a
Drop initialization to NULL since filelist_read() will take care of it.
Laurent Monin <geeqie@norz.org>
parents:
753
diff
changeset
|
944 GList *list; |
f5dc8c7d6a5a
Drop initialization to NULL since filelist_read() will take care of it.
Laurent Monin <geeqie@norz.org>
parents:
753
diff
changeset
|
945 |
2754
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
946 if (fd) |
9 | 947 { |
2754
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
948 if (file_extension_match(fd->path, GQ_COLLECTION_EXT)) |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
949 { |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
950 ViewWindow *vw; |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
951 CollectionData *cd; |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
952 CollectInfo *info; |
9 | 953 |
2754
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
954 cd = collection_new(fd->path); |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
955 if (collection_load(cd, fd->path, COLLECTION_LOAD_NONE)) |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
956 { |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
957 info = collection_get_first(cd); |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
958 } |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
959 else |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
960 { |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
961 collection_unref(cd); |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
962 cd = NULL; |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
963 info = NULL; |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
964 } |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
965 vw = real_view_window_new(NULL, NULL, cd, info); |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
966 if (vw && cd) |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
967 { |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
968 g_signal_connect(G_OBJECT(vw->window), "destroy", |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
969 G_CALLBACK(view_window_collection_unref_cb), cd); |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
970 } |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
971 } |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
972 else if (isdir(fd->path) && filelist_read(fd, &list, NULL)) |
9 | 973 { |
2754
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
974 list = filelist_sort_path(list); |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
975 list = filelist_filter(list, FALSE); |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
976 real_view_window_new(NULL, list, NULL, NULL); |
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
977 filelist_free(list); |
9 | 978 } |
979 else | |
980 { | |
2754
ce0e8d548c0a
Fix #609: Crash on "View in New Window" if no image active
Colin Clark <colin.clark@cclark.uk>
parents:
2701
diff
changeset
|
981 real_view_window_new(fd, NULL, NULL, NULL); |
9 | 982 } |
983 } | |
984 } | |
985 | |
986 void view_window_new_from_list(GList *list) | |
987 { | |
988 real_view_window_new(NULL, list, NULL, NULL); | |
989 } | |
990 | |
991 void view_window_new_from_collection(CollectionData *cd, CollectInfo *info) | |
992 { | |
993 real_view_window_new(NULL, NULL, cd, info); | |
994 } | |
995 | |
996 /* | |
997 *----------------------------------------------------------------------------- | |
998 * public | |
999 *----------------------------------------------------------------------------- | |
1000 */ | |
1001 | |
1002 void view_window_colors_update(void) | |
1003 { | |
1004 GList *work; | |
1 | 1005 |
9 | 1006 work = view_window_list; |
1007 while (work) | |
1008 { | |
1009 ViewWindow *vw = work->data; | |
1010 work = work->next; | |
2185
c14a1d8e6aa4
Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents:
2184
diff
changeset
|
1011 |
1626
63527696d61c
Add an option to Image preferences to restrict custom border to fullscreen mode only. Bug 2798062.
Laurent Monin <geeqie@norz.org>
parents:
1566
diff
changeset
|
1012 image_background_set_color_from_options(vw->imd, !!vw->fs); |
9 | 1013 } |
1014 } | |
1015 | |
1433
12600de4b59a
Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents:
1432
diff
changeset
|
1016 gboolean view_window_find_image(ImageWindow *imd, gint *index, gint *total) |
9 | 1017 { |
1018 GList *work; | |
1019 | |
1020 work = view_window_list; | |
1021 while (work) | |
1022 { | |
1023 ViewWindow *vw = work->data; | |
1024 work = work->next; | |
1025 | |
1026 if (vw->imd == imd || | |
1027 (vw->fs && vw->fs->imd == imd)) | |
1028 { | |
1029 if (vw->ss) | |
1030 { | |
1031 gint n; | |
118
7642cc02ee8d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
117
diff
changeset
|
1032 gint t; |
7642cc02ee8d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
117
diff
changeset
|
1033 |
9 | 1034 n = g_list_length(vw->ss->list_done); |
118
7642cc02ee8d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
117
diff
changeset
|
1035 t = n + g_list_length(vw->ss->list); |
7642cc02ee8d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
117
diff
changeset
|
1036 if (n == 0) n = t; |
9 | 1037 if (index) *index = n - 1; |
118
7642cc02ee8d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
117
diff
changeset
|
1038 if (total) *total = t; |
9 | 1039 } |
1040 else | |
1041 { | |
1042 if (index) *index = g_list_position(vw->list, vw->list_pointer); | |
1043 if (total) *total = g_list_length(vw->list); | |
1044 } | |
1045 return TRUE; | |
1046 } | |
1047 } | |
1048 | |
1049 return FALSE; | |
1 | 1050 } |
1051 | |
1052 /* | |
1053 *----------------------------------------------------------------------------- | |
1054 * view window menu routines and callbacks | |
1055 *----------------------------------------------------------------------------- | |
442 | 1056 */ |
1 | 1057 |
9 | 1058 static void view_new_window_cb(GtkWidget *widget, gpointer data) |
1 | 1059 { |
9 | 1060 ViewWindow *vw = data; |
1061 CollectionData *cd; | |
1062 CollectInfo *info; | |
1063 | |
1064 cd = image_get_collection(vw->imd, &info); | |
1065 | |
1066 if (cd && info) | |
1067 { | |
1068 view_window_new_from_collection(cd, info); | |
1069 } | |
1070 else | |
1071 { | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1072 view_window_new(image_get_fd(vw->imd)); |
9 | 1073 } |
1 | 1074 } |
1075 | |
9 | 1076 static void view_edit_cb(GtkWidget *widget, gpointer data) |
1 | 1077 { |
9 | 1078 ViewWindow *vw; |
60
15ab9630b61a
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
23
diff
changeset
|
1079 ImageWindow *imd; |
1272
661e170bf4f7
read external editors from .desktop files
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1211
diff
changeset
|
1080 const gchar *key = data; |
9 | 1081 |
1082 vw = submenu_item_get_data(widget); | |
1083 if (!vw) return; | |
1084 | |
1272
661e170bf4f7
read external editors from .desktop files
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1211
diff
changeset
|
1085 if (!editor_window_flag_set(key)) |
60
15ab9630b61a
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
23
diff
changeset
|
1086 { |
15ab9630b61a
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
23
diff
changeset
|
1087 view_fullscreen_toggle(vw, TRUE); |
15ab9630b61a
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
23
diff
changeset
|
1088 } |
15ab9630b61a
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
23
diff
changeset
|
1089 |
15ab9630b61a
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
23
diff
changeset
|
1090 imd = view_window_active_image(vw); |
1272
661e170bf4f7
read external editors from .desktop files
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1211
diff
changeset
|
1091 file_util_start_editor_from_file(key, image_get_fd(imd), imd->widget); |
1 | 1092 } |
1093 | |
9 | 1094 static void view_alter_cb(GtkWidget *widget, gpointer data) |
1095 { | |
1096 ViewWindow *vw; | |
1097 AlterType type; | |
1098 | |
1099 vw = submenu_item_get_data(widget); | |
1100 type = GPOINTER_TO_INT(data); | |
1101 | |
1102 if (!vw) return; | |
2440
cb9f25cb54f3
Orientation commands and file selections
cclark <cclark@mcb.net>
parents:
2376
diff
changeset
|
1103 image_alter_orientation(vw->imd, vw->imd->image_fd, type); |
9 | 1104 } |
1105 | |
1106 static void view_wallpaper_cb(GtkWidget *widget, gpointer data) | |
1107 { | |
1108 ViewWindow *vw = data; | |
1109 ImageWindow *imd; | |
1110 | |
1111 imd = view_window_active_image(vw); | |
1112 image_to_root_window(imd, (image_zoom_get(imd) == 0.0)); | |
3 | 1113 } |
1114 | |
1 | 1115 static void view_zoom_in_cb(GtkWidget *widget, gpointer data) |
1116 { | |
9 | 1117 ViewWindow *vw = data; |
1118 | |
1119 image_zoom_adjust(view_window_active_image(vw), get_zoom_increment()); | |
1 | 1120 } |
1121 | |
1122 static void view_zoom_out_cb(GtkWidget *widget, gpointer data) | |
1123 { | |
9 | 1124 ViewWindow *vw = data; |
1125 | |
1126 image_zoom_adjust(view_window_active_image(vw), -get_zoom_increment()); | |
1 | 1127 } |
1128 | |
1129 static void view_zoom_1_1_cb(GtkWidget *widget, gpointer data) | |
1130 { | |
9 | 1131 ViewWindow *vw = data; |
1132 | |
1133 image_zoom_set(view_window_active_image(vw), 1.0); | |
1 | 1134 } |
1135 | |
1136 static void view_zoom_fit_cb(GtkWidget *widget, gpointer data) | |
1137 { | |
9 | 1138 ViewWindow *vw = data; |
1139 | |
1140 image_zoom_set(view_window_active_image(vw), 0.0); | |
1 | 1141 } |
1142 | |
1143 static void view_copy_cb(GtkWidget *widget, gpointer data) | |
1144 { | |
9 | 1145 ViewWindow *vw = data; |
1146 ImageWindow *imd; | |
1147 | |
1148 imd = view_window_active_image(vw); | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1149 file_util_copy(image_get_fd(imd), NULL, NULL, imd->widget); |
1 | 1150 } |
1151 | |
1152 static void view_move_cb(GtkWidget *widget, gpointer data) | |
1153 { | |
9 | 1154 ViewWindow *vw = data; |
1155 ImageWindow *imd; | |
1156 | |
1157 imd = view_window_active_image(vw); | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1158 file_util_move(image_get_fd(imd), NULL, NULL, imd->widget); |
1 | 1159 } |
1160 | |
1161 static void view_rename_cb(GtkWidget *widget, gpointer data) | |
1162 { | |
9 | 1163 ViewWindow *vw = data; |
1164 ImageWindow *imd; | |
1165 | |
1166 imd = view_window_active_image(vw); | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1167 file_util_rename(image_get_fd(imd), NULL, imd->widget); |
1 | 1168 } |
1169 | |
1170 static void view_delete_cb(GtkWidget *widget, gpointer data) | |
1171 { | |
9 | 1172 ViewWindow *vw = data; |
1173 ImageWindow *imd; | |
1174 | |
1175 imd = view_window_active_image(vw); | |
2860
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
1176 options->file_ops.safe_delete_enable = FALSE; |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
1177 file_util_delete(image_get_fd(imd), NULL, imd->widget); |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
1178 } |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
1179 |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
1180 static void view_move_to_trash_cb(GtkWidget *widget, gpointer data) |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
1181 { |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
1182 ViewWindow *vw = data; |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
1183 ImageWindow *imd; |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
1184 |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
1185 imd = view_window_active_image(vw); |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
1186 options->file_ops.safe_delete_enable = TRUE; |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1187 file_util_delete(image_get_fd(imd), NULL, imd->widget); |
9 | 1188 } |
1189 | |
497
29dc838f7d6b
Allow the copy of file paths to clipboard.
Laurent Monin <geeqie@norz.org>
parents:
481
diff
changeset
|
1190 static void view_copy_path_cb(GtkWidget *widget, gpointer data) |
29dc838f7d6b
Allow the copy of file paths to clipboard.
Laurent Monin <geeqie@norz.org>
parents:
481
diff
changeset
|
1191 { |
29dc838f7d6b
Allow the copy of file paths to clipboard.
Laurent Monin <geeqie@norz.org>
parents:
481
diff
changeset
|
1192 ViewWindow *vw = data; |
29dc838f7d6b
Allow the copy of file paths to clipboard.
Laurent Monin <geeqie@norz.org>
parents:
481
diff
changeset
|
1193 ImageWindow *imd; |
29dc838f7d6b
Allow the copy of file paths to clipboard.
Laurent Monin <geeqie@norz.org>
parents:
481
diff
changeset
|
1194 |
29dc838f7d6b
Allow the copy of file paths to clipboard.
Laurent Monin <geeqie@norz.org>
parents:
481
diff
changeset
|
1195 imd = view_window_active_image(vw); |
2663
3e6d26094fb4
Fix #520: copy path inserts quotes around path
Colin Clark <colin.clark@cclark.uk>
parents:
2631
diff
changeset
|
1196 file_util_copy_path_to_clipboard(image_get_fd(imd), TRUE); |
3e6d26094fb4
Fix #520: copy path inserts quotes around path
Colin Clark <colin.clark@cclark.uk>
parents:
2631
diff
changeset
|
1197 } |
3e6d26094fb4
Fix #520: copy path inserts quotes around path
Colin Clark <colin.clark@cclark.uk>
parents:
2631
diff
changeset
|
1198 |
3e6d26094fb4
Fix #520: copy path inserts quotes around path
Colin Clark <colin.clark@cclark.uk>
parents:
2631
diff
changeset
|
1199 static void view_copy_path_unquoted_cb(GtkWidget *widget, gpointer data) |
3e6d26094fb4
Fix #520: copy path inserts quotes around path
Colin Clark <colin.clark@cclark.uk>
parents:
2631
diff
changeset
|
1200 { |
3e6d26094fb4
Fix #520: copy path inserts quotes around path
Colin Clark <colin.clark@cclark.uk>
parents:
2631
diff
changeset
|
1201 ViewWindow *vw = data; |
3e6d26094fb4
Fix #520: copy path inserts quotes around path
Colin Clark <colin.clark@cclark.uk>
parents:
2631
diff
changeset
|
1202 ImageWindow *imd; |
3e6d26094fb4
Fix #520: copy path inserts quotes around path
Colin Clark <colin.clark@cclark.uk>
parents:
2631
diff
changeset
|
1203 |
3e6d26094fb4
Fix #520: copy path inserts quotes around path
Colin Clark <colin.clark@cclark.uk>
parents:
2631
diff
changeset
|
1204 imd = view_window_active_image(vw); |
3e6d26094fb4
Fix #520: copy path inserts quotes around path
Colin Clark <colin.clark@cclark.uk>
parents:
2631
diff
changeset
|
1205 file_util_copy_path_to_clipboard(image_get_fd(imd), FALSE); |
497
29dc838f7d6b
Allow the copy of file paths to clipboard.
Laurent Monin <geeqie@norz.org>
parents:
481
diff
changeset
|
1206 } |
29dc838f7d6b
Allow the copy of file paths to clipboard.
Laurent Monin <geeqie@norz.org>
parents:
481
diff
changeset
|
1207 |
9 | 1208 static void view_fullscreen_cb(GtkWidget *widget, gpointer data) |
1209 { | |
1210 ViewWindow *vw = data; | |
1211 | |
1212 view_fullscreen_toggle(vw, FALSE); | |
1213 } | |
1214 | |
1215 static void view_slideshow_start_cb(GtkWidget *widget, gpointer data) | |
1216 { | |
1217 ViewWindow *vw = data; | |
1218 | |
1219 view_slideshow_start(vw); | |
1220 } | |
1221 | |
1222 static void view_slideshow_stop_cb(GtkWidget *widget, gpointer data) | |
1223 { | |
1224 ViewWindow *vw = data; | |
1225 | |
1226 view_slideshow_stop(vw); | |
1227 } | |
1228 | |
1229 static void view_slideshow_pause_cb(GtkWidget *widget, gpointer data) | |
1230 { | |
1231 ViewWindow *vw = data; | |
1232 | |
1233 slideshow_pause_toggle(vw->ss); | |
1 | 1234 } |
1235 | |
1236 static void view_close_cb(GtkWidget *widget, gpointer data) | |
1237 { | |
9 | 1238 ViewWindow *vw = data; |
1239 | |
1240 view_window_close(vw); | |
1241 } | |
1242 | |
783
0e45ed008a1c
replaced directory path with FileData* dir_fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
781
diff
changeset
|
1243 static LayoutWindow *view_new_layout_with_fd(FileData *fd) |
368
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1244 { |
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1245 LayoutWindow *nw; |
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1246 |
1309
d89f8c4d593b
config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1292
diff
changeset
|
1247 nw = layout_new(NULL, NULL); |
368
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1248 layout_sort_set(nw, options->file_sort.method, options->file_sort.ascending); |
783
0e45ed008a1c
replaced directory path with FileData* dir_fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
781
diff
changeset
|
1249 layout_set_fd(nw, fd); |
368
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1250 return nw; |
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1251 } |
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1252 |
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1253 |
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1254 static void view_set_layout_path_cb(GtkWidget *widget, gpointer data) |
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1255 { |
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1256 ViewWindow *vw = data; |
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1257 LayoutWindow *lw; |
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1258 ImageWindow *imd; |
442 | 1259 |
368
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1260 imd = view_window_active_image(vw); |
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1261 |
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1262 if (!imd || !imd->image_fd) return; |
442 | 1263 |
368
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1264 lw = layout_find_by_image_fd(imd); |
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1265 if (lw) |
783
0e45ed008a1c
replaced directory path with FileData* dir_fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
781
diff
changeset
|
1266 layout_set_fd(lw, imd->image_fd); |
368
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1267 else |
783
0e45ed008a1c
replaced directory path with FileData* dir_fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
781
diff
changeset
|
1268 view_new_layout_with_fd(imd->image_fd); |
368
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1269 view_window_close(vw); |
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1270 } |
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1271 |
1397
db1b3d950a8c
In various Edit context menus, only display editors that match the file types in the selection.
Laurent Monin <geeqie@norz.org>
parents:
1367
diff
changeset
|
1272 static void view_popup_menu_destroy_cb(GtkWidget *widget, gpointer data) |
db1b3d950a8c
In various Edit context menus, only display editors that match the file types in the selection.
Laurent Monin <geeqie@norz.org>
parents:
1367
diff
changeset
|
1273 { |
1698
dc7c36ce2b92
fixed destroying of menu data
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1678
diff
changeset
|
1274 GList *editmenu_fd_list = data; |
1397
db1b3d950a8c
In various Edit context menus, only display editors that match the file types in the selection.
Laurent Monin <geeqie@norz.org>
parents:
1367
diff
changeset
|
1275 |
1698
dc7c36ce2b92
fixed destroying of menu data
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1678
diff
changeset
|
1276 filelist_free(editmenu_fd_list); |
2184 | 1277 } |
1397
db1b3d950a8c
In various Edit context menus, only display editors that match the file types in the selection.
Laurent Monin <geeqie@norz.org>
parents:
1367
diff
changeset
|
1278 |
db1b3d950a8c
In various Edit context menus, only display editors that match the file types in the selection.
Laurent Monin <geeqie@norz.org>
parents:
1367
diff
changeset
|
1279 static GList *view_window_get_fd_list(ViewWindow *vw) |
db1b3d950a8c
In various Edit context menus, only display editors that match the file types in the selection.
Laurent Monin <geeqie@norz.org>
parents:
1367
diff
changeset
|
1280 { |
db1b3d950a8c
In various Edit context menus, only display editors that match the file types in the selection.
Laurent Monin <geeqie@norz.org>
parents:
1367
diff
changeset
|
1281 GList *list = NULL; |
db1b3d950a8c
In various Edit context menus, only display editors that match the file types in the selection.
Laurent Monin <geeqie@norz.org>
parents:
1367
diff
changeset
|
1282 ImageWindow *imd = view_window_active_image(vw); |
db1b3d950a8c
In various Edit context menus, only display editors that match the file types in the selection.
Laurent Monin <geeqie@norz.org>
parents:
1367
diff
changeset
|
1283 |
db1b3d950a8c
In various Edit context menus, only display editors that match the file types in the selection.
Laurent Monin <geeqie@norz.org>
parents:
1367
diff
changeset
|
1284 if (imd) |
db1b3d950a8c
In various Edit context menus, only display editors that match the file types in the selection.
Laurent Monin <geeqie@norz.org>
parents:
1367
diff
changeset
|
1285 { |
db1b3d950a8c
In various Edit context menus, only display editors that match the file types in the selection.
Laurent Monin <geeqie@norz.org>
parents:
1367
diff
changeset
|
1286 FileData *fd = image_get_fd(imd); |
db1b3d950a8c
In various Edit context menus, only display editors that match the file types in the selection.
Laurent Monin <geeqie@norz.org>
parents:
1367
diff
changeset
|
1287 if (fd) list = g_list_append(NULL, file_data_ref(fd)); |
db1b3d950a8c
In various Edit context menus, only display editors that match the file types in the selection.
Laurent Monin <geeqie@norz.org>
parents:
1367
diff
changeset
|
1288 } |
2185
c14a1d8e6aa4
Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents:
2184
diff
changeset
|
1289 |
1397
db1b3d950a8c
In various Edit context menus, only display editors that match the file types in the selection.
Laurent Monin <geeqie@norz.org>
parents:
1367
diff
changeset
|
1290 return list; |
db1b3d950a8c
In various Edit context menus, only display editors that match the file types in the selection.
Laurent Monin <geeqie@norz.org>
parents:
1367
diff
changeset
|
1291 } |
db1b3d950a8c
In various Edit context menus, only display editors that match the file types in the selection.
Laurent Monin <geeqie@norz.org>
parents:
1367
diff
changeset
|
1292 |
2583
6e92c0ad76f2
Change recent code comments to Doxygen style
Colin Clark <colin.clark@cclark.uk>
parents:
2582
diff
changeset
|
1293 /** |
6e92c0ad76f2
Change recent code comments to Doxygen style
Colin Clark <colin.clark@cclark.uk>
parents:
2582
diff
changeset
|
1294 * @brief Add file selection list to a collection |
6e92c0ad76f2
Change recent code comments to Doxygen style
Colin Clark <colin.clark@cclark.uk>
parents:
2582
diff
changeset
|
1295 * @param[in] widget |
6e92c0ad76f2
Change recent code comments to Doxygen style
Colin Clark <colin.clark@cclark.uk>
parents:
2582
diff
changeset
|
1296 * @param[in] data Index to the collection list menu item selected, or -1 for new collection |
6e92c0ad76f2
Change recent code comments to Doxygen style
Colin Clark <colin.clark@cclark.uk>
parents:
2582
diff
changeset
|
1297 * |
6e92c0ad76f2
Change recent code comments to Doxygen style
Colin Clark <colin.clark@cclark.uk>
parents:
2582
diff
changeset
|
1298 * |
2582
03014a1eb7e7
Right-click menus - collections
Colin Clark <colin.clark@cclark.uk>
parents:
2572
diff
changeset
|
1299 */ |
03014a1eb7e7
Right-click menus - collections
Colin Clark <colin.clark@cclark.uk>
parents:
2572
diff
changeset
|
1300 static void image_pop_menu_collections_cb(GtkWidget *widget, gpointer data) |
03014a1eb7e7
Right-click menus - collections
Colin Clark <colin.clark@cclark.uk>
parents:
2572
diff
changeset
|
1301 { |
03014a1eb7e7
Right-click menus - collections
Colin Clark <colin.clark@cclark.uk>
parents:
2572
diff
changeset
|
1302 ViewWindow *vw; |
03014a1eb7e7
Right-click menus - collections
Colin Clark <colin.clark@cclark.uk>
parents:
2572
diff
changeset
|
1303 ImageWindow *imd; |
03014a1eb7e7
Right-click menus - collections
Colin Clark <colin.clark@cclark.uk>
parents:
2572
diff
changeset
|
1304 FileData *fd; |
03014a1eb7e7
Right-click menus - collections
Colin Clark <colin.clark@cclark.uk>
parents:
2572
diff
changeset
|
1305 GList *selection_list = NULL; |
03014a1eb7e7
Right-click menus - collections
Colin Clark <colin.clark@cclark.uk>
parents:
2572
diff
changeset
|
1306 |
03014a1eb7e7
Right-click menus - collections
Colin Clark <colin.clark@cclark.uk>
parents:
2572
diff
changeset
|
1307 vw = submenu_item_get_data(widget); |
03014a1eb7e7
Right-click menus - collections
Colin Clark <colin.clark@cclark.uk>
parents:
2572
diff
changeset
|
1308 imd = view_window_active_image(vw); |
03014a1eb7e7
Right-click menus - collections
Colin Clark <colin.clark@cclark.uk>
parents:
2572
diff
changeset
|
1309 fd = image_get_fd(imd); |
03014a1eb7e7
Right-click menus - collections
Colin Clark <colin.clark@cclark.uk>
parents:
2572
diff
changeset
|
1310 selection_list = g_list_append(selection_list, fd); |
03014a1eb7e7
Right-click menus - collections
Colin Clark <colin.clark@cclark.uk>
parents:
2572
diff
changeset
|
1311 pop_menu_collections(selection_list, data); |
03014a1eb7e7
Right-click menus - collections
Colin Clark <colin.clark@cclark.uk>
parents:
2572
diff
changeset
|
1312 |
03014a1eb7e7
Right-click menus - collections
Colin Clark <colin.clark@cclark.uk>
parents:
2572
diff
changeset
|
1313 filelist_free(selection_list); |
03014a1eb7e7
Right-click menus - collections
Colin Clark <colin.clark@cclark.uk>
parents:
2572
diff
changeset
|
1314 } |
03014a1eb7e7
Right-click menus - collections
Colin Clark <colin.clark@cclark.uk>
parents:
2572
diff
changeset
|
1315 |
9 | 1316 static GtkWidget *view_popup_menu(ViewWindow *vw) |
1317 { | |
1318 GtkWidget *menu; | |
2582
03014a1eb7e7
Right-click menus - collections
Colin Clark <colin.clark@cclark.uk>
parents:
2572
diff
changeset
|
1319 GtkWidget *submenu; |
9 | 1320 GtkWidget *item; |
1698
dc7c36ce2b92
fixed destroying of menu data
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1678
diff
changeset
|
1321 GList *editmenu_fd_list; |
9 | 1322 |
1323 menu = popup_menu_short_lived(); | |
1324 | |
1397
db1b3d950a8c
In various Edit context menus, only display editors that match the file types in the selection.
Laurent Monin <geeqie@norz.org>
parents:
1367
diff
changeset
|
1325 |
9 | 1326 menu_item_add_stock(menu, _("Zoom _in"), GTK_STOCK_ZOOM_IN, G_CALLBACK(view_zoom_in_cb), vw); |
1327 menu_item_add_stock(menu, _("Zoom _out"), GTK_STOCK_ZOOM_OUT, G_CALLBACK(view_zoom_out_cb), vw); | |
1328 menu_item_add_stock(menu, _("Zoom _1:1"), GTK_STOCK_ZOOM_100, G_CALLBACK(view_zoom_1_1_cb), vw); | |
1329 menu_item_add_stock(menu, _("Fit image to _window"), GTK_STOCK_ZOOM_FIT, G_CALLBACK(view_zoom_fit_cb), vw); | |
1330 menu_item_add_divider(menu); | |
1331 | |
1698
dc7c36ce2b92
fixed destroying of menu data
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1678
diff
changeset
|
1332 editmenu_fd_list = view_window_get_fd_list(vw); |
dc7c36ce2b92
fixed destroying of menu data
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1678
diff
changeset
|
1333 g_signal_connect(G_OBJECT(menu), "destroy", |
dc7c36ce2b92
fixed destroying of menu data
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1678
diff
changeset
|
1334 G_CALLBACK(view_popup_menu_destroy_cb), editmenu_fd_list); |
dc7c36ce2b92
fixed destroying of menu data
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1678
diff
changeset
|
1335 item = submenu_add_edit(menu, NULL, G_CALLBACK(view_edit_cb), vw, editmenu_fd_list); |
9 | 1336 menu_item_add_divider(item); |
2499
92345664aa61
Ref #202: "Set as wallpaper" doesn't work with GNOME Shell
Colin Clark <colin.clark@cclark.uk>
parents:
2475
diff
changeset
|
1337 #if !GTK_CHECK_VERSION(3,0,0) |
9 | 1338 menu_item_add(item, _("Set as _wallpaper"), G_CALLBACK(view_wallpaper_cb), vw); |
2499
92345664aa61
Ref #202: "Set as wallpaper" doesn't work with GNOME Shell
Colin Clark <colin.clark@cclark.uk>
parents:
2475
diff
changeset
|
1339 #endif |
9 | 1340 submenu_add_alter(menu, G_CALLBACK(view_alter_cb), vw); |
1341 | |
1342 menu_item_add_stock(menu, _("View in _new window"), GTK_STOCK_NEW, G_CALLBACK(view_new_window_cb), vw); | |
368
515f8ef08cbe
New Go to directory view feature that permits to find and display the directory
Laurent Monin <geeqie@norz.org>
parents:
358
diff
changeset
|
1343 item = menu_item_add(menu, _("_Go to directory view"), G_CALLBACK(view_set_layout_path_cb), vw); |
9 | 1344 |
1345 menu_item_add_divider(menu); | |
1346 menu_item_add_stock(menu, _("_Copy..."), GTK_STOCK_COPY, G_CALLBACK(view_copy_cb), vw); | |
1347 menu_item_add(menu, _("_Move..."), G_CALLBACK(view_move_cb), vw); | |
1348 menu_item_add(menu, _("_Rename..."), G_CALLBACK(view_rename_cb), vw); | |
2572
31c6e3c9163e
Fix #505: ‘Copy path’ and ‘Delete’ are too close in the drop down menu
Colin Clark <colin.clark@cclark.uk>
parents:
2499
diff
changeset
|
1349 menu_item_add(menu, _("_Copy path"), G_CALLBACK(view_copy_path_cb), vw); |
2663
3e6d26094fb4
Fix #520: copy path inserts quotes around path
Colin Clark <colin.clark@cclark.uk>
parents:
2631
diff
changeset
|
1350 menu_item_add(menu, _("_Copy path unquoted"), G_CALLBACK(view_copy_path_unquoted_cb), vw); |
2860
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
1351 |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
1352 menu_item_add_divider(menu); |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
1353 menu_item_add_stock(menu, |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
1354 options->file_ops.confirm_move_to_trash ? _("Move to Trash...") : |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
1355 _("Move to Trash"), PIXBUF_INLINE_ICON_TRASH, |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
1356 G_CALLBACK(view_move_to_trash_cb), vw); |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
1357 menu_item_add_stock(menu, |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
1358 options->file_ops.confirm_delete ? _("_Delete...") : |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
1359 _("_Delete"), GTK_STOCK_DELETE, |
b20a96b979a3
Fix #437: Delete to standard Trash directory
Colin Clark <colin.clark@cclark.uk>
parents:
2854
diff
changeset
|
1360 G_CALLBACK(view_delete_cb), vw); |
9 | 1361 |
1362 menu_item_add_divider(menu); | |
1363 | |
2701
3f5967ca0a37
Fix #566: submenu items "variable set but not used" errors in 1.4
Colin Clark <colin.clark@cclark.uk>
parents:
2694
diff
changeset
|
1364 submenu_add_collections(menu, &item, |
2582
03014a1eb7e7
Right-click menus - collections
Colin Clark <colin.clark@cclark.uk>
parents:
2572
diff
changeset
|
1365 G_CALLBACK(image_pop_menu_collections_cb), vw); |
03014a1eb7e7
Right-click menus - collections
Colin Clark <colin.clark@cclark.uk>
parents:
2572
diff
changeset
|
1366 gtk_widget_set_sensitive(item, TRUE); |
03014a1eb7e7
Right-click menus - collections
Colin Clark <colin.clark@cclark.uk>
parents:
2572
diff
changeset
|
1367 menu_item_add_divider(menu); |
03014a1eb7e7
Right-click menus - collections
Colin Clark <colin.clark@cclark.uk>
parents:
2572
diff
changeset
|
1368 |
9 | 1369 if (vw->ss) |
1370 { | |
1371 menu_item_add(menu, _("_Stop slideshow"), G_CALLBACK(view_slideshow_stop_cb), vw); | |
1372 if (slideshow_paused(vw->ss)) | |
1373 { | |
1374 item = menu_item_add(menu, _("Continue slides_how"), | |
1375 G_CALLBACK(view_slideshow_pause_cb), vw); | |
1376 } | |
1377 else | |
1378 { | |
1379 item = menu_item_add(menu, _("Pause slides_how"), | |
1380 G_CALLBACK(view_slideshow_pause_cb), vw); | |
1381 } | |
1382 } | |
1383 else | |
1384 { | |
1385 item = menu_item_add(menu, _("_Start slideshow"), G_CALLBACK(view_slideshow_start_cb), vw); | |
1386 gtk_widget_set_sensitive(item, (vw->list != NULL) || view_window_contains_collection(vw)); | |
1387 item = menu_item_add(menu, _("Pause slides_how"), G_CALLBACK(view_slideshow_pause_cb), vw); | |
1388 gtk_widget_set_sensitive(item, FALSE); | |
1389 } | |
1390 | |
1391 if (vw->fs) | |
1392 { | |
1393 menu_item_add(menu, _("Exit _full screen"), G_CALLBACK(view_fullscreen_cb), vw); | |
1394 } | |
1395 else | |
1396 { | |
1397 menu_item_add(menu, _("_Full screen"), G_CALLBACK(view_fullscreen_cb), vw); | |
1398 } | |
1399 | |
1400 menu_item_add_divider(menu); | |
1401 menu_item_add_stock(menu, _("C_lose window"), GTK_STOCK_CLOSE, G_CALLBACK(view_close_cb), vw); | |
1402 | |
1403 return menu; | |
1404 } | |
1405 | |
1406 /* | |
1407 *------------------------------------------------------------------- | |
1408 * dnd confirm dir | |
1409 *------------------------------------------------------------------- | |
1410 */ | |
1411 | |
1412 typedef struct { | |
1413 ViewWindow *vw; | |
1414 GList *list; | |
1415 } CViewConfirmD; | |
1416 | |
1417 static void view_dir_list_cancel(GtkWidget *widget, gpointer data) | |
1418 { | |
1419 /* do nothing */ | |
1420 } | |
1421 | |
1433
12600de4b59a
Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents:
1432
diff
changeset
|
1422 static void view_dir_list_do(ViewWindow *vw, GList *list, gboolean skip, gboolean recurse) |
9 | 1423 { |
1424 GList *work; | |
1425 | |
1426 view_window_set_list(vw, NULL); | |
1427 | |
1428 work = list; | |
1429 while (work) | |
1430 { | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1431 FileData *fd = work->data; |
9 | 1432 work = work->next; |
1433 | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1434 if (isdir(fd->path)) |
9 | 1435 { |
1436 if (!skip) | |
1437 { | |
1438 GList *list = NULL; | |
1439 | |
1440 if (recurse) | |
1441 { | |
783
0e45ed008a1c
replaced directory path with FileData* dir_fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
781
diff
changeset
|
1442 list = filelist_recursive(fd); |
9 | 1443 } |
1444 else | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1445 { /*FIXME */ |
783
0e45ed008a1c
replaced directory path with FileData* dir_fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
781
diff
changeset
|
1446 filelist_read(fd, &list, NULL); |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1447 list = filelist_sort_path(list); |
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1448 list = filelist_filter(list, FALSE); |
9 | 1449 } |
1450 if (list) vw->list = g_list_concat(vw->list, list); | |
1451 } | |
1452 } | |
1453 else | |
1454 { | |
1455 /* FIXME: no filtering here */ | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1456 vw->list = g_list_append(vw->list, file_data_ref(fd)); |
9 | 1457 } |
1458 } | |
1459 | |
1460 if (vw->list) | |
1461 { | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1462 FileData *fd; |
9 | 1463 |
1464 vw->list_pointer = vw->list; | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1465 fd = vw->list->data; |
885
b561a43f7fb0
Use a specific enum for image.zoom_mode values (ZoomMode) and
Laurent Monin <geeqie@norz.org>
parents:
868
diff
changeset
|
1466 image_change_fd(vw->imd, fd, image_zoom_get_default(vw->imd)); |
9 | 1467 |
1468 work = vw->list->next; | |
334
771c179cba77
Rename image-related options.
Laurent Monin <geeqie@norz.org>
parents:
318
diff
changeset
|
1469 if (options->image.enable_read_ahead && work) |
9 | 1470 { |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1471 fd = work->data; |
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1472 image_prebuffer_set(vw->imd, fd); |
9 | 1473 } |
1474 } | |
1475 else | |
1476 { | |
885
b561a43f7fb0
Use a specific enum for image.zoom_mode values (ZoomMode) and
Laurent Monin <geeqie@norz.org>
parents:
868
diff
changeset
|
1477 image_change_fd(vw->imd, NULL, image_zoom_get_default(vw->imd)); |
9 | 1478 } |
1479 } | |
1480 | |
1481 static void view_dir_list_add(GtkWidget *widget, gpointer data) | |
1482 { | |
1483 CViewConfirmD *d = data; | |
1484 view_dir_list_do(d->vw, d->list, FALSE, FALSE); | |
1485 } | |
1486 | |
1487 static void view_dir_list_recurse(GtkWidget *widget, gpointer data) | |
1488 { | |
1489 CViewConfirmD *d = data; | |
1490 view_dir_list_do(d->vw, d->list, FALSE, TRUE); | |
1491 } | |
1492 | |
1493 static void view_dir_list_skip(GtkWidget *widget, gpointer data) | |
1494 { | |
1495 CViewConfirmD *d = data; | |
1496 view_dir_list_do(d->vw, d->list, TRUE, FALSE); | |
1497 } | |
1498 | |
1499 static void view_dir_list_destroy(GtkWidget *widget, gpointer data) | |
1500 { | |
1501 CViewConfirmD *d = data; | |
442 | 1502 filelist_free(d->list); |
1503 g_free(d); | |
9 | 1504 } |
1505 | |
1506 static GtkWidget *view_confirm_dir_list(ViewWindow *vw, GList *list) | |
1507 { | |
1508 GtkWidget *menu; | |
1509 CViewConfirmD *d; | |
1510 | |
1511 d = g_new(CViewConfirmD, 1); | |
1512 d->vw = vw; | |
1513 d->list = list; | |
1514 | |
1515 menu = popup_menu_short_lived(); | |
1516 g_signal_connect(G_OBJECT(menu), "destroy", | |
1517 G_CALLBACK(view_dir_list_destroy), d); | |
1518 | |
1519 menu_item_add_stock(menu, _("Dropped list includes folders."), GTK_STOCK_DND_MULTIPLE, NULL, NULL); | |
1520 menu_item_add_divider(menu); | |
1521 menu_item_add_stock(menu, _("_Add contents"), GTK_STOCK_OK, G_CALLBACK(view_dir_list_add), d); | |
1522 menu_item_add_stock(menu, _("Add contents _recursive"), GTK_STOCK_ADD, G_CALLBACK(view_dir_list_recurse), d); | |
1523 menu_item_add_stock(menu, _("_Skip folders"), GTK_STOCK_REMOVE, G_CALLBACK(view_dir_list_skip), d); | |
1524 menu_item_add_divider(menu); | |
1525 menu_item_add_stock(menu, _("Cancel"), GTK_STOCK_CANCEL, G_CALLBACK(view_dir_list_cancel), d); | |
1526 | |
1527 return menu; | |
1 | 1528 } |
1529 | |
9 | 1530 /* |
1531 *----------------------------------------------------------------------------- | |
1532 * image drag and drop routines | |
1533 *----------------------------------------------------------------------------- | |
1534 */ | |
1535 | |
1536 static void view_window_get_dnd_data(GtkWidget *widget, GdkDragContext *context, | |
1537 gint x, gint y, | |
1538 GtkSelectionData *selection_data, guint info, | |
1539 guint time, gpointer data) | |
1 | 1540 { |
9 | 1541 ViewWindow *vw = data; |
1542 ImageWindow *imd; | |
1543 | |
23
9ff428db7772
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
John Ellis <johne@verizon.net>
parents:
9
diff
changeset
|
1544 if (gtk_drag_get_source_widget(context) == vw->imd->pr) return; |
9 | 1545 |
1546 imd = vw->imd; | |
1547 | |
1548 if (info == TARGET_URI_LIST || info == TARGET_APP_COLLECTION_MEMBER) | |
1549 { | |
1550 CollectionData *source; | |
1551 GList *list; | |
1552 GList *info_list; | |
1553 | |
1554 if (info == TARGET_URI_LIST) | |
1555 { | |
1556 GList *work; | |
1557 | |
2040 | 1558 list = uri_filelist_from_gtk_selection_data(selection_data); |
9 | 1559 |
1560 work = list; | |
1561 while (work) | |
1562 { | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1563 FileData *fd = work->data; |
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1564 if (isdir(fd->path)) |
9 | 1565 { |
1566 GtkWidget *menu; | |
1567 menu = view_confirm_dir_list(vw, list); | |
1568 gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, time); | |
1569 return; | |
1570 } | |
1571 work = work->next; | |
1572 } | |
1573 | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1574 list = filelist_filter(list, FALSE); |
9 | 1575 |
1576 source = NULL; | |
1577 info_list = NULL; | |
1578 } | |
1579 else | |
1580 { | |
2034
9297985567b5
use accessor functions
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
2021
diff
changeset
|
1581 source = collection_from_dnd_data((gchar *)gtk_selection_data_get_data(selection_data), &list, &info_list); |
9 | 1582 } |
1583 | |
1584 if (list) | |
1585 { | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1586 FileData *fd; |
9 | 1587 |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1588 fd = list->data; |
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1589 if (isfile(fd->path)) |
9 | 1590 { |
1591 view_slideshow_stop(vw); | |
1592 view_window_set_list(vw, NULL); | |
1 | 1593 |
9 | 1594 if (source && info_list) |
1595 { | |
885
b561a43f7fb0
Use a specific enum for image.zoom_mode values (ZoomMode) and
Laurent Monin <geeqie@norz.org>
parents:
868
diff
changeset
|
1596 image_change_from_collection(imd, source, info_list->data, image_zoom_get_default(imd)); |
9 | 1597 } |
1598 else | |
1599 { | |
1600 if (list->next) | |
1601 { | |
1602 vw->list = list; | |
1603 list = NULL; | |
1604 | |
1605 vw->list_pointer = vw->list; | |
1606 } | |
885
b561a43f7fb0
Use a specific enum for image.zoom_mode values (ZoomMode) and
Laurent Monin <geeqie@norz.org>
parents:
868
diff
changeset
|
1607 image_change_fd(imd, fd, image_zoom_get_default(imd)); |
9 | 1608 } |
1609 } | |
1610 } | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1611 filelist_free(list); |
9 | 1612 g_list_free(info_list); |
1613 } | |
1614 } | |
1615 | |
1616 static void view_window_set_dnd_data(GtkWidget *widget, GdkDragContext *context, | |
1617 GtkSelectionData *selection_data, guint info, | |
1618 guint time, gpointer data) | |
1619 { | |
1620 ViewWindow *vw = data; | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1621 FileData *fd; |
9 | 1622 |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1623 fd = image_get_fd(vw->imd); |
1 | 1624 |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1625 if (fd) |
9 | 1626 { |
1627 GList *list; | |
1 | 1628 |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1629 list = g_list_append(NULL, fd); |
2040 | 1630 uri_selection_data_set_uris_from_filelist(selection_data, list); |
9 | 1631 g_list_free(list); |
1632 } | |
1633 else | |
1634 { | |
2034
9297985567b5
use accessor functions
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
2021
diff
changeset
|
1635 gtk_selection_data_set(selection_data, gtk_selection_data_get_target(selection_data), |
512
0896f486ec6f
Remove whitespace between function name and first parenthesis for the sake of consistency.
Laurent Monin <geeqie@norz.org>
parents:
497
diff
changeset
|
1636 8, NULL, 0); |
9 | 1637 } |
1 | 1638 } |
1639 | |
9 | 1640 static void view_window_dnd_init(ViewWindow *vw) |
1641 { | |
1642 ImageWindow *imd; | |
1 | 1643 |
9 | 1644 imd = vw->imd; |
1645 | |
23
9ff428db7772
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
John Ellis <johne@verizon.net>
parents:
9
diff
changeset
|
1646 gtk_drag_source_set(imd->pr, GDK_BUTTON2_MASK, |
9 | 1647 dnd_file_drag_types, dnd_file_drag_types_count, |
1648 GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK); | |
23
9ff428db7772
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
John Ellis <johne@verizon.net>
parents:
9
diff
changeset
|
1649 g_signal_connect(G_OBJECT(imd->pr), "drag_data_get", |
9 | 1650 G_CALLBACK(view_window_set_dnd_data), vw); |
1651 | |
23
9ff428db7772
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
John Ellis <johne@verizon.net>
parents:
9
diff
changeset
|
1652 gtk_drag_dest_set(imd->pr, |
9 | 1653 GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, |
1654 dnd_file_drop_types, dnd_file_drop_types_count, | |
442 | 1655 GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK); |
23
9ff428db7772
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
John Ellis <johne@verizon.net>
parents:
9
diff
changeset
|
1656 g_signal_connect(G_OBJECT(imd->pr), "drag_data_received", |
9 | 1657 G_CALLBACK(view_window_get_dnd_data), vw); |
1658 } | |
1659 | |
1660 /* | |
1661 *----------------------------------------------------------------------------- | |
1662 * maintenance (for rename, move, remove) | |
1663 *----------------------------------------------------------------------------- | |
1664 */ | |
1665 | |
797
4f1a67d254fc
use new notification in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
783
diff
changeset
|
1666 static void view_real_removed(ViewWindow *vw, FileData *fd) |
9 | 1667 { |
1668 ImageWindow *imd; | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1669 FileData *image_fd; |
9 | 1670 |
1671 imd = view_window_active_image(vw); | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1672 image_fd = image_get_fd(imd); |
9 | 1673 |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1674 if (image_fd && image_fd == fd) |
9 | 1675 { |
1676 if (vw->list) | |
1677 { | |
1678 view_list_step(vw, TRUE); | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1679 if (image_get_fd(imd) == image_fd) |
9 | 1680 { |
1681 view_list_step(vw, FALSE); | |
1682 } | |
1683 } | |
1684 else if (view_window_contains_collection(vw)) | |
1685 { | |
1686 view_collection_step(vw, TRUE); | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1687 if (image_get_fd(imd) == image_fd) |
9 | 1688 { |
1689 view_collection_step(vw, FALSE); | |
1690 } | |
1691 } | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1692 if (image_get_fd(imd) == image_fd) |
9 | 1693 { |
885
b561a43f7fb0
Use a specific enum for image.zoom_mode values (ZoomMode) and
Laurent Monin <geeqie@norz.org>
parents:
868
diff
changeset
|
1694 image_change_fd(imd, NULL, image_zoom_get_default(imd)); |
9 | 1695 } |
1696 } | |
1697 | |
1698 if (vw->list) | |
1699 { | |
1700 GList *work; | |
1701 GList *old; | |
1702 | |
1703 old = vw->list_pointer; | |
1704 | |
1705 work = vw->list; | |
1706 while (work) | |
1707 { | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1708 FileData *chk_fd; |
9 | 1709 GList *chk_link; |
1710 | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1711 chk_fd = work->data; |
9 | 1712 chk_link = work; |
1713 work = work->next; | |
1714 | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1715 if (chk_fd == fd) |
9 | 1716 { |
1717 if (vw->list_pointer == chk_link) | |
1718 { | |
1719 vw->list_pointer = (chk_link->next) ? chk_link->next : chk_link->prev; | |
1720 } | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1721 vw->list = g_list_remove(vw->list, chk_fd); |
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1722 file_data_unref(chk_fd); |
9 | 1723 } |
1724 } | |
1725 | |
1726 /* handles stepping correctly when same image is in the list more than once */ | |
1727 if (old && old != vw->list_pointer) | |
1728 { | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1729 FileData *fd; |
9 | 1730 |
1731 if (vw->list_pointer) | |
1732 { | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1733 fd = vw->list_pointer->data; |
9 | 1734 } |
1735 else | |
1736 { | |
138
5be5d1c53016
replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
122
diff
changeset
|
1737 fd = NULL; |
9 | 1738 } |
1739 | |
885
b561a43f7fb0
Use a specific enum for image.zoom_mode values (ZoomMode) and
Laurent Monin <geeqie@norz.org>
parents:
868
diff
changeset
|
1740 image_change_fd(imd, fd, image_zoom_get_default(imd)); |
9 | 1741 } |
1742 } | |
1743 | |
117
f95079062ea0
Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents:
94
diff
changeset
|
1744 image_osd_update(imd); |
9 | 1745 } |
1746 | |
797
4f1a67d254fc
use new notification in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
783
diff
changeset
|
1747 static void view_window_notify_cb(FileData *fd, NotifyType type, gpointer data) |
9 | 1748 { |
797
4f1a67d254fc
use new notification in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
783
diff
changeset
|
1749 ViewWindow *vw = data; |
9 | 1750 |
1432
7f454e7d07a3
improved notification system
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1397
diff
changeset
|
1751 if (!(type & NOTIFY_CHANGE) || !fd->change) return; |
2185
c14a1d8e6aa4
Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents:
2184
diff
changeset
|
1752 |
1498
2b0712dcf139
improved debug messages
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1433
diff
changeset
|
1753 DEBUG_1("Notify view_window: %s %04x", fd->path, type); |
2b0712dcf139
improved debug messages
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1433
diff
changeset
|
1754 |
1347
84d289bde1ea
Add missing space between switch and first parenthesis.
Laurent Monin <geeqie@norz.org>
parents:
1309
diff
changeset
|
1755 switch (fd->change->type) |
9 | 1756 { |
797
4f1a67d254fc
use new notification in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
783
diff
changeset
|
1757 case FILEDATA_CHANGE_MOVE: |
4f1a67d254fc
use new notification in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
783
diff
changeset
|
1758 case FILEDATA_CHANGE_RENAME: |
4f1a67d254fc
use new notification in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
783
diff
changeset
|
1759 break; |
4f1a67d254fc
use new notification in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
783
diff
changeset
|
1760 case FILEDATA_CHANGE_COPY: |
4f1a67d254fc
use new notification in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
783
diff
changeset
|
1761 break; |
4f1a67d254fc
use new notification in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
783
diff
changeset
|
1762 case FILEDATA_CHANGE_DELETE: |
4f1a67d254fc
use new notification in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
783
diff
changeset
|
1763 view_real_removed(vw, fd); |
4f1a67d254fc
use new notification in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
783
diff
changeset
|
1764 break; |
4f1a67d254fc
use new notification in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
783
diff
changeset
|
1765 case FILEDATA_CHANGE_UNSPECIFIED: |
1211
cc4d3023ced3
most of the metadata options now works
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1055
diff
changeset
|
1766 case FILEDATA_CHANGE_WRITE_METADATA: |
797
4f1a67d254fc
use new notification in img-view
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
783
diff
changeset
|
1767 break; |
9 | 1768 } |
1769 } | |
1055
4bbdfab3c89a
Adding a vim modeline to all files - patch by Klaus Ethgen
Vladimir Nadvornik <nadvornik@suse.cz>
parents:
1029
diff
changeset
|
1770 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */ |