Mercurial > geeqie
annotate src/layout_image.c @ 1566:3d9f5c078521
separated Orientation and Grayscale functions
moved Grayscale to Color management menu
| author | nadvornik |
|---|---|
| date | Sat, 25 Apr 2009 22:08:09 +0000 |
| parents | 7302ff300a52 |
| children | 0cd2268f500b |
| rev | line source |
|---|---|
| 9 | 1 /* |
| 196 | 2 * Geeqie |
|
113
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
3 * (C) 2006 John Ellis |
| 1284 | 4 * Copyright (C) 2008 - 2009 The Geeqie Team |
| 9 | 5 * |
| 6 * Author: John Ellis | |
| 7 * | |
| 8 * This software is released under the GNU General Public License (GNU GPL). | |
| 9 * Please read the included file COPYING for more information. | |
| 10 * This software comes with no warranty of any kind, use at your own risk! | |
| 11 */ | |
| 12 | |
| 281 | 13 #include "main.h" |
| 9 | 14 #include "layout_image.h" |
| 15 | |
| 16 #include "collect.h" | |
| 1431 | 17 #include "color-man.h" |
| 9 | 18 #include "dnd.h" |
| 19 #include "editors.h" | |
| 586 | 20 #include "filedata.h" |
| 9 | 21 #include "fullscreen.h" |
| 22 #include "image.h" | |
| 23 #include "image-overlay.h" | |
| 24 #include "img-view.h" | |
| 25 #include "layout.h" | |
| 26 #include "layout_util.h" | |
| 27 #include "menu.h" | |
|
1022
9962b24b6b43
Move miscellaneous functions to their own files (new misc.[ch]).
zas_
parents:
995
diff
changeset
|
28 #include "misc.h" |
| 9 | 29 #include "pixbuf_util.h" |
|
1375
df58e511d90e
Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents:
1373
diff
changeset
|
30 #include "pixbuf-renderer.h" |
| 9 | 31 #include "slideshow.h" |
| 32 #include "ui_fileops.h" | |
| 33 #include "ui_menu.h" | |
|
904
1698baa37871
Move uri_*() functions to separate files: uri_utils.[ch]
zas_
parents:
888
diff
changeset
|
34 #include "uri_utils.h" |
|
1022
9962b24b6b43
Move miscellaneous functions to their own files (new misc.[ch]).
zas_
parents:
995
diff
changeset
|
35 #include "utilops.h" |
| 9 | 36 |
| 37 #include <gdk/gdkkeysyms.h> /* for keyboard values */ | |
| 38 | |
| 39 | |
| 40 static GtkWidget *layout_image_pop_menu(LayoutWindow *lw); | |
| 41 static void layout_image_set_buttons(LayoutWindow *lw); | |
| 42 | |
| 43 /* | |
| 44 *---------------------------------------------------------------------------- | |
| 45 * full screen overlay | |
| 46 *---------------------------------------------------------------------------- | |
| 47 */ | |
| 48 | |
|
122
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
49 void layout_image_overlay_toggle(LayoutWindow *lw) |
| 9 | 50 { |
|
481
67a612985686
Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents:
479
diff
changeset
|
51 if (!lw) return; |
|
67a612985686
Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents:
479
diff
changeset
|
52 image_osd_toggle(lw->image); |
| 9 | 53 } |
| 54 | |
| 55 /* | |
| 56 *---------------------------------------------------------------------------- | |
| 57 * full screen | |
| 58 *---------------------------------------------------------------------------- | |
| 59 */ | |
| 160 | 60 |
| 9 | 61 static void layout_image_full_screen_stop_func(FullScreenData *fs, gpointer data) |
| 62 { | |
| 63 LayoutWindow *lw = data; | |
| 64 | |
| 65 /* restore image window */ | |
| 66 lw->image = fs->normal_imd; | |
| 67 | |
| 68 if (lw->slideshow) | |
| 69 { | |
| 70 lw->slideshow->imd = lw->image; | |
| 71 } | |
| 72 | |
| 73 lw->full_screen = NULL; | |
| 74 } | |
| 75 | |
| 76 void layout_image_full_screen_start(LayoutWindow *lw) | |
| 77 { | |
| 78 if (!layout_valid(&lw)) return; | |
| 79 | |
| 80 if (lw->full_screen) return; | |
| 81 | |
| 82 lw->full_screen = fullscreen_start(lw->window, lw->image, | |
| 83 layout_image_full_screen_stop_func, lw); | |
| 84 | |
| 85 /* set to new image window */ | |
| 86 lw->image = lw->full_screen->imd; | |
| 87 | |
| 88 if (lw->slideshow) | |
| 89 { | |
| 90 lw->slideshow->imd = lw->image; | |
| 91 } | |
| 92 | |
| 93 layout_image_set_buttons(lw); | |
| 94 | |
| 95 g_signal_connect(G_OBJECT(lw->full_screen->window), "key_press_event", | |
| 160 | 96 G_CALLBACK(layout_key_press_cb), lw); |
| 9 | 97 |
| 160 | 98 layout_actions_add_window(lw, lw->full_screen->window); |
| 9 | 99 #if 0 |
| 100 gtk_widget_set_sensitive(lw->window, FALSE); | |
| 101 if (lw->tools) gtk_widget_set_sensitive(lw->tools, FALSE); | |
| 102 #endif | |
| 103 | |
| 1336 | 104 image_osd_copy_status(lw->full_screen->normal_imd, lw->image); |
| 9 | 105 } |
| 106 | |
| 107 void layout_image_full_screen_stop(LayoutWindow *lw) | |
| 108 { | |
| 109 if (!layout_valid(&lw)) return; | |
| 110 if (!lw->full_screen) return; | |
| 111 | |
| 1336 | 112 image_osd_copy_status(lw->image, lw->full_screen->normal_imd); |
| 621 | 113 |
| 9 | 114 fullscreen_stop(lw->full_screen); |
| 115 | |
| 116 #if 0 | |
| 117 gtk_widget_set_sensitive(lw->window, TRUE); | |
| 118 if (lw->tools) gtk_widget_set_sensitive(lw->tools, TRUE); | |
| 119 #endif | |
| 120 } | |
| 121 | |
| 122 void layout_image_full_screen_toggle(LayoutWindow *lw) | |
| 123 { | |
| 124 if (!layout_valid(&lw)) return; | |
| 125 if (lw->full_screen) | |
| 126 { | |
| 127 layout_image_full_screen_stop(lw); | |
| 128 } | |
| 129 else | |
| 130 { | |
| 131 layout_image_full_screen_start(lw); | |
| 132 } | |
| 133 } | |
| 134 | |
|
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1432
diff
changeset
|
135 gboolean layout_image_full_screen_active(LayoutWindow *lw) |
| 9 | 136 { |
| 137 if (!layout_valid(&lw)) return FALSE; | |
| 138 | |
| 139 return (lw->full_screen != NULL); | |
| 140 } | |
| 141 | |
| 142 /* | |
| 143 *---------------------------------------------------------------------------- | |
| 144 * slideshow | |
| 145 *---------------------------------------------------------------------------- | |
| 146 */ | |
| 147 | |
| 148 static void layout_image_slideshow_next(LayoutWindow *lw) | |
| 149 { | |
| 150 if (lw->slideshow) slideshow_next(lw->slideshow); | |
| 151 } | |
| 152 | |
| 153 static void layout_image_slideshow_prev(LayoutWindow *lw) | |
| 154 { | |
| 155 if (lw->slideshow) slideshow_prev(lw->slideshow); | |
| 156 } | |
| 157 | |
| 158 static void layout_image_slideshow_stop_func(SlideShowData *ss, gpointer data) | |
| 159 { | |
| 160 LayoutWindow *lw = data; | |
| 161 | |
| 162 lw->slideshow = NULL; | |
| 163 layout_status_update_info(lw, NULL); | |
| 164 } | |
| 165 | |
| 166 void layout_image_slideshow_start(LayoutWindow *lw) | |
| 167 { | |
| 168 CollectionData *cd; | |
| 169 CollectInfo *info; | |
| 170 | |
| 171 if (!layout_valid(&lw)) return; | |
| 172 if (lw->slideshow) return; | |
| 173 | |
| 174 cd = image_get_collection(lw->image, &info); | |
| 175 | |
| 176 if (cd && info) | |
| 177 { | |
| 178 lw->slideshow = slideshow_start_from_collection(lw->image, cd, | |
| 179 layout_image_slideshow_stop_func, lw, info); | |
| 180 } | |
| 181 else | |
| 182 { | |
| 183 lw->slideshow = slideshow_start(lw->image, lw, | |
| 783 | 184 layout_list_get_index(lw, layout_image_get_fd(lw)), |
| 9 | 185 layout_image_slideshow_stop_func, lw); |
| 186 } | |
| 187 | |
| 188 layout_status_update_info(lw, NULL); | |
| 189 } | |
| 190 | |
| 191 /* note that slideshow will take ownership of the list, do not free it */ | |
| 192 void layout_image_slideshow_start_from_list(LayoutWindow *lw, GList *list) | |
| 193 { | |
| 194 if (!layout_valid(&lw)) return; | |
| 195 | |
| 196 if (lw->slideshow || !list) | |
| 197 { | |
| 138 | 198 filelist_free(list); |
| 9 | 199 return; |
| 200 } | |
| 201 | |
| 138 | 202 lw->slideshow = slideshow_start_from_filelist(lw->image, list, |
| 9 | 203 layout_image_slideshow_stop_func, lw); |
| 204 | |
| 205 layout_status_update_info(lw, NULL); | |
| 206 } | |
| 207 | |
| 208 void layout_image_slideshow_stop(LayoutWindow *lw) | |
| 209 { | |
| 210 if (!layout_valid(&lw)) return; | |
| 211 | |
| 212 if (!lw->slideshow) return; | |
| 213 | |
| 214 slideshow_free(lw->slideshow); | |
| 215 /* the stop_func sets lw->slideshow to NULL for us */ | |
| 216 } | |
| 217 | |
| 218 void layout_image_slideshow_toggle(LayoutWindow *lw) | |
| 219 { | |
| 220 if (!layout_valid(&lw)) return; | |
| 221 | |
| 222 if (lw->slideshow) | |
| 223 { | |
| 224 layout_image_slideshow_stop(lw); | |
| 225 } | |
| 226 else | |
| 227 { | |
| 228 layout_image_slideshow_start(lw); | |
| 229 } | |
| 230 } | |
| 231 | |
|
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1432
diff
changeset
|
232 gboolean layout_image_slideshow_active(LayoutWindow *lw) |
| 9 | 233 { |
| 234 if (!layout_valid(&lw)) return FALSE; | |
| 235 | |
| 236 return (lw->slideshow != NULL); | |
| 237 } | |
| 238 | |
|
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1432
diff
changeset
|
239 gboolean layout_image_slideshow_pause_toggle(LayoutWindow *lw) |
| 9 | 240 { |
|
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1432
diff
changeset
|
241 gboolean ret; |
| 9 | 242 |
| 243 if (!layout_valid(&lw)) return FALSE; | |
| 244 | |
| 245 ret = slideshow_pause_toggle(lw->slideshow); | |
| 246 | |
| 247 layout_status_update_info(lw, NULL); | |
| 248 | |
| 249 return ret; | |
| 250 } | |
| 251 | |
|
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1432
diff
changeset
|
252 gboolean layout_image_slideshow_paused(LayoutWindow *lw) |
| 9 | 253 { |
| 254 if (!layout_valid(&lw)) return FALSE; | |
| 255 | |
| 256 return (slideshow_paused(lw->slideshow)); | |
| 257 } | |
| 258 | |
|
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1432
diff
changeset
|
259 static gboolean layout_image_slideshow_continue_check(LayoutWindow *lw) |
| 9 | 260 { |
| 261 if (!lw->slideshow) return FALSE; | |
| 262 | |
| 263 if (!slideshow_should_continue(lw->slideshow)) | |
| 264 { | |
| 265 layout_image_slideshow_stop(lw); | |
| 266 return FALSE; | |
| 267 } | |
| 268 | |
| 269 return TRUE; | |
| 270 } | |
| 271 | |
| 272 /* | |
| 273 *---------------------------------------------------------------------------- | |
| 274 * pop-up menus | |
| 275 *---------------------------------------------------------------------------- | |
| 276 */ | |
| 277 | |
| 278 static void li_pop_menu_zoom_in_cb(GtkWidget *widget, gpointer data) | |
| 279 { | |
| 280 LayoutWindow *lw = data; | |
| 281 | |
| 1047 | 282 layout_image_zoom_adjust(lw, get_zoom_increment(), FALSE); |
| 9 | 283 } |
| 284 | |
| 285 static void li_pop_menu_zoom_out_cb(GtkWidget *widget, gpointer data) | |
| 286 { | |
| 287 LayoutWindow *lw = data; | |
| 1047 | 288 layout_image_zoom_adjust(lw, -get_zoom_increment(), FALSE); |
| 9 | 289 } |
| 290 | |
| 291 static void li_pop_menu_zoom_1_1_cb(GtkWidget *widget, gpointer data) | |
| 292 { | |
| 293 LayoutWindow *lw = data; | |
| 294 | |
| 1047 | 295 layout_image_zoom_set(lw, 1.0, FALSE); |
| 9 | 296 } |
| 297 | |
| 298 static void li_pop_menu_zoom_fit_cb(GtkWidget *widget, gpointer data) | |
| 299 { | |
| 300 LayoutWindow *lw = data; | |
| 301 | |
| 1047 | 302 layout_image_zoom_set(lw, 0.0, FALSE); |
| 9 | 303 } |
| 304 | |
| 305 static void li_pop_menu_edit_cb(GtkWidget *widget, gpointer data) | |
| 306 { | |
| 307 LayoutWindow *lw; | |
| 1272 | 308 const gchar *key = data; |
| 9 | 309 |
| 310 lw = submenu_item_get_data(widget); | |
| 311 | |
| 1272 | 312 if (!editor_window_flag_set(key)) |
|
60
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
23
diff
changeset
|
313 { |
|
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
23
diff
changeset
|
314 layout_image_full_screen_stop(lw); |
|
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
23
diff
changeset
|
315 } |
| 1272 | 316 file_util_start_editor_from_file(key, layout_image_get_fd(lw), lw->window); |
| 9 | 317 } |
| 318 | |
| 319 static void li_pop_menu_wallpaper_cb(GtkWidget *widget, gpointer data) | |
| 320 { | |
| 321 LayoutWindow *lw = data; | |
| 322 | |
| 323 layout_image_to_root(lw); | |
| 324 } | |
| 325 | |
| 326 static void li_pop_menu_alter_cb(GtkWidget *widget, gpointer data) | |
| 327 { | |
| 328 LayoutWindow *lw = data; | |
| 329 AlterType type; | |
| 330 | |
| 331 lw = submenu_item_get_data(widget); | |
| 332 type = (AlterType)GPOINTER_TO_INT(data); | |
| 333 | |
| 1566 | 334 image_alter_orientation(lw->image, type); |
| 9 | 335 } |
| 336 | |
| 337 static void li_pop_menu_new_cb(GtkWidget *widget, gpointer data) | |
| 338 { | |
| 339 LayoutWindow *lw = data; | |
| 340 | |
| 138 | 341 view_window_new(layout_image_get_fd(lw)); |
| 9 | 342 } |
| 343 | |
| 344 static GtkWidget *li_pop_menu_click_parent(GtkWidget *widget, LayoutWindow *lw) | |
| 345 { | |
| 346 GtkWidget *menu; | |
| 347 GtkWidget *parent; | |
| 348 | |
| 349 menu = gtk_widget_get_toplevel(widget); | |
| 350 if (!menu) return NULL; | |
| 351 | |
| 352 parent = g_object_get_data(G_OBJECT(menu), "click_parent"); | |
| 353 | |
| 354 if (!parent && lw->full_screen) | |
| 355 { | |
| 356 parent = lw->full_screen->imd->widget; | |
| 357 } | |
| 358 | |
| 359 return parent; | |
| 360 } | |
| 361 | |
| 362 static void li_pop_menu_copy_cb(GtkWidget *widget, gpointer data) | |
| 363 { | |
| 364 LayoutWindow *lw = data; | |
| 365 | |
| 138 | 366 file_util_copy(layout_image_get_fd(lw), NULL, NULL, |
| 9 | 367 li_pop_menu_click_parent(widget, lw)); |
| 368 } | |
| 369 | |
| 497 | 370 static void li_pop_menu_copy_path_cb(GtkWidget *widget, gpointer data) |
| 371 { | |
| 372 LayoutWindow *lw = data; | |
| 373 | |
| 374 file_util_copy_path_to_clipboard(layout_image_get_fd(lw)); | |
| 375 } | |
| 376 | |
| 9 | 377 static void li_pop_menu_move_cb(GtkWidget *widget, gpointer data) |
| 378 { | |
| 379 LayoutWindow *lw = data; | |
| 380 | |
| 138 | 381 file_util_move(layout_image_get_fd(lw), NULL, NULL, |
| 9 | 382 li_pop_menu_click_parent(widget, lw)); |
| 383 } | |
| 384 | |
| 385 static void li_pop_menu_rename_cb(GtkWidget *widget, gpointer data) | |
| 386 { | |
| 387 LayoutWindow *lw = data; | |
| 388 | |
| 138 | 389 file_util_rename(layout_image_get_fd(lw), NULL, |
| 9 | 390 li_pop_menu_click_parent(widget, lw)); |
| 391 } | |
| 392 | |
| 393 static void li_pop_menu_delete_cb(GtkWidget *widget, gpointer data) | |
| 394 { | |
| 395 LayoutWindow *lw = data; | |
| 396 | |
| 138 | 397 file_util_delete(layout_image_get_fd(lw), NULL, |
| 9 | 398 li_pop_menu_click_parent(widget, lw)); |
| 399 } | |
| 400 | |
| 401 static void li_pop_menu_slide_start_cb(GtkWidget *widget, gpointer data) | |
| 402 { | |
| 403 LayoutWindow *lw = data; | |
| 404 | |
| 405 layout_image_slideshow_start(lw); | |
| 406 } | |
| 407 | |
| 408 static void li_pop_menu_slide_stop_cb(GtkWidget *widget, gpointer data) | |
| 409 { | |
| 410 LayoutWindow *lw = data; | |
| 411 | |
| 412 layout_image_slideshow_stop(lw); | |
| 413 } | |
| 414 | |
| 415 static void li_pop_menu_slide_pause_cb(GtkWidget *widget, gpointer data) | |
| 416 { | |
| 417 LayoutWindow *lw = data; | |
| 418 | |
| 419 layout_image_slideshow_pause_toggle(lw); | |
| 420 } | |
| 421 | |
| 422 static void li_pop_menu_full_screen_cb(GtkWidget *widget, gpointer data) | |
| 423 { | |
| 424 LayoutWindow *lw = data; | |
| 425 | |
| 426 layout_image_full_screen_toggle(lw); | |
| 427 } | |
| 428 | |
| 429 static void li_pop_menu_hide_cb(GtkWidget *widget, gpointer data) | |
| 430 { | |
| 431 LayoutWindow *lw = data; | |
| 432 | |
| 433 layout_tools_hide_toggle(lw); | |
| 434 } | |
| 435 | |
|
368
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
339
diff
changeset
|
436 static void li_set_layout_path_cb(GtkWidget *widget, gpointer data) |
|
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
339
diff
changeset
|
437 { |
|
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
339
diff
changeset
|
438 LayoutWindow *lw = data; |
| 783 | 439 FileData *fd; |
|
368
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
339
diff
changeset
|
440 |
|
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
339
diff
changeset
|
441 if (!layout_valid(&lw)) return; |
| 442 | 442 |
| 783 | 443 fd = layout_image_get_fd(lw); |
| 444 if (fd) layout_set_fd(lw, fd); | |
|
368
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
339
diff
changeset
|
445 } |
|
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
339
diff
changeset
|
446 |
|
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1432
diff
changeset
|
447 static gboolean li_check_if_current_path(LayoutWindow *lw, const gchar *path) |
|
368
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
339
diff
changeset
|
448 { |
|
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
339
diff
changeset
|
449 gchar *dirname; |
|
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1432
diff
changeset
|
450 gboolean ret; |
|
368
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
339
diff
changeset
|
451 |
| 783 | 452 if (!path || !layout_valid(&lw) || !lw->dir_fd) return FALSE; |
|
368
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
339
diff
changeset
|
453 |
|
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
339
diff
changeset
|
454 dirname = g_path_get_dirname(path); |
| 783 | 455 ret = (strcmp(lw->dir_fd->path, dirname) == 0); |
|
368
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
339
diff
changeset
|
456 g_free(dirname); |
|
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
339
diff
changeset
|
457 return ret; |
|
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
339
diff
changeset
|
458 } |
|
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
339
diff
changeset
|
459 |
|
1397
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
460 static void layout_image_popup_menu_destroy_cb(GtkWidget *widget, gpointer data) |
|
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
461 { |
|
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
462 LayoutWindow *lw = data; |
|
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
463 |
|
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
464 filelist_free(lw->editmenu_fd_list); |
|
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
465 lw->editmenu_fd_list = NULL; |
|
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
466 } |
|
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
467 |
|
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
468 static GList *layout_image_get_fd_list(LayoutWindow *lw) |
|
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
469 { |
|
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
470 GList *list = NULL; |
|
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
471 FileData *fd = layout_image_get_fd(lw); |
|
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
472 |
|
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
473 if (fd) |
|
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
474 list = g_list_append(NULL, file_data_ref(fd)); |
|
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
475 |
|
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
476 return list; |
|
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
477 } |
|
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
478 |
| 9 | 479 static GtkWidget *layout_image_pop_menu(LayoutWindow *lw) |
| 480 { | |
| 481 GtkWidget *menu; | |
| 482 GtkWidget *item; | |
| 483 GtkWidget *submenu; | |
| 484 const gchar *path; | |
|
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1432
diff
changeset
|
485 gboolean fullscreen; |
| 9 | 486 |
| 487 path = layout_image_get_path(lw); | |
| 488 fullscreen = layout_image_full_screen_active(lw); | |
| 489 | |
| 490 menu = popup_menu_short_lived(); | |
|
1397
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
491 g_signal_connect(G_OBJECT(menu), "destroy", |
|
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
492 G_CALLBACK(layout_image_popup_menu_destroy_cb), lw); |
| 9 | 493 |
| 494 menu_item_add_stock(menu, _("Zoom _in"), GTK_STOCK_ZOOM_IN, G_CALLBACK(li_pop_menu_zoom_in_cb), lw); | |
| 495 menu_item_add_stock(menu, _("Zoom _out"), GTK_STOCK_ZOOM_OUT, G_CALLBACK(li_pop_menu_zoom_out_cb), lw); | |
| 496 menu_item_add_stock(menu, _("Zoom _1:1"), GTK_STOCK_ZOOM_100, G_CALLBACK(li_pop_menu_zoom_1_1_cb), lw); | |
| 497 menu_item_add_stock(menu, _("Fit image to _window"), GTK_STOCK_ZOOM_FIT, G_CALLBACK(li_pop_menu_zoom_fit_cb), lw); | |
| 498 menu_item_add_divider(menu); | |
| 499 | |
|
1397
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
500 lw->editmenu_fd_list = layout_image_get_fd_list(lw); |
|
a0bd58a6535f
In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents:
1383
diff
changeset
|
501 submenu = submenu_add_edit(menu, &item, G_CALLBACK(li_pop_menu_edit_cb), lw, lw->editmenu_fd_list); |
| 9 | 502 if (!path) gtk_widget_set_sensitive(item, FALSE); |
| 503 menu_item_add_divider(submenu); | |
| 504 menu_item_add(submenu, _("Set as _wallpaper"), G_CALLBACK(li_pop_menu_wallpaper_cb), lw); | |
| 505 | |
| 506 item = submenu_add_alter(menu, G_CALLBACK(li_pop_menu_alter_cb), lw); | |
| 507 | |
| 508 item = menu_item_add_stock(menu, _("View in _new window"), GTK_STOCK_NEW, G_CALLBACK(li_pop_menu_new_cb), lw); | |
| 509 if (!path || fullscreen) gtk_widget_set_sensitive(item, FALSE); | |
| 442 | 510 |
|
368
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
339
diff
changeset
|
511 item = menu_item_add(menu, _("_Go to directory view"), G_CALLBACK(li_set_layout_path_cb), lw); |
|
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
339
diff
changeset
|
512 if (!path || li_check_if_current_path(lw, path)) gtk_widget_set_sensitive(item, FALSE); |
| 9 | 513 |
| 514 menu_item_add_divider(menu); | |
| 515 | |
| 516 item = menu_item_add_stock(menu, _("_Copy..."), GTK_STOCK_COPY, G_CALLBACK(li_pop_menu_copy_cb), lw); | |
| 517 if (!path) gtk_widget_set_sensitive(item, FALSE); | |
| 518 item = menu_item_add(menu, _("_Move..."), G_CALLBACK(li_pop_menu_move_cb), lw); | |
| 519 if (!path) gtk_widget_set_sensitive(item, FALSE); | |
| 520 item = menu_item_add(menu, _("_Rename..."), G_CALLBACK(li_pop_menu_rename_cb), lw); | |
| 521 if (!path) gtk_widget_set_sensitive(item, FALSE); | |
| 522 item = menu_item_add_stock(menu, _("_Delete..."), GTK_STOCK_DELETE, G_CALLBACK(li_pop_menu_delete_cb), lw); | |
| 523 if (!path) gtk_widget_set_sensitive(item, FALSE); | |
| 497 | 524 |
| 1513 | 525 item = menu_item_add(menu, _("_Copy path"), G_CALLBACK(li_pop_menu_copy_path_cb), lw); |
| 526 if (!path) gtk_widget_set_sensitive(item, FALSE); | |
| 9 | 527 |
| 528 menu_item_add_divider(menu); | |
| 529 | |
| 530 if (layout_image_slideshow_active(lw)) | |
| 531 { | |
| 532 menu_item_add(menu, _("_Stop slideshow"), G_CALLBACK(li_pop_menu_slide_stop_cb), lw); | |
| 533 if (layout_image_slideshow_paused(lw)) | |
| 534 { | |
| 535 item = menu_item_add(menu, _("Continue slides_how"), | |
| 536 G_CALLBACK(li_pop_menu_slide_pause_cb), lw); | |
| 537 } | |
| 538 else | |
| 539 { | |
| 540 item = menu_item_add(menu, _("Pause slides_how"), | |
| 541 G_CALLBACK(li_pop_menu_slide_pause_cb), lw); | |
| 542 } | |
| 543 } | |
| 544 else | |
| 442 | 545 { |
| 9 | 546 menu_item_add(menu, _("_Start slideshow"), G_CALLBACK(li_pop_menu_slide_start_cb), lw); |
| 547 item = menu_item_add(menu, _("Pause slides_how"), G_CALLBACK(li_pop_menu_slide_pause_cb), lw); | |
| 548 gtk_widget_set_sensitive(item, FALSE); | |
| 549 } | |
| 550 | |
| 551 if (!fullscreen) | |
| 552 { | |
| 553 menu_item_add(menu, _("_Full screen"), G_CALLBACK(li_pop_menu_full_screen_cb), lw); | |
| 554 } | |
| 555 else | |
| 556 { | |
| 557 menu_item_add(menu, _("Exit _full screen"), G_CALLBACK(li_pop_menu_full_screen_cb), lw); | |
| 558 } | |
| 559 | |
| 560 menu_item_add_divider(menu); | |
| 561 | |
| 1309 | 562 item = menu_item_add_check(menu, _("Hide file _list"), lw->options.tools_hidden, |
| 9 | 563 G_CALLBACK(li_pop_menu_hide_cb), lw); |
| 564 if (fullscreen) gtk_widget_set_sensitive(item, FALSE); | |
| 565 | |
| 566 return menu; | |
| 567 } | |
| 568 | |
| 569 static void layout_image_menu_pos_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data) | |
| 570 { | |
| 571 LayoutWindow *lw = data; | |
| 572 | |
|
23
17acca639a86
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents:
9
diff
changeset
|
573 gdk_window_get_origin(lw->image->pr->window, x, y); |
| 9 | 574 popup_menu_position_clamp(menu, x, y, 0); |
| 575 } | |
| 576 | |
| 577 void layout_image_menu_popup(LayoutWindow *lw) | |
| 578 { | |
| 579 GtkWidget *menu; | |
| 580 | |
| 581 menu = layout_image_pop_menu(lw); | |
| 582 gtk_menu_popup(GTK_MENU(menu), NULL, NULL, layout_image_menu_pos_cb, lw, 0, GDK_CURRENT_TIME); | |
| 583 } | |
| 584 | |
| 585 /* | |
| 586 *---------------------------------------------------------------------------- | |
| 587 * dnd | |
| 588 *---------------------------------------------------------------------------- | |
| 589 */ | |
| 590 | |
| 591 static void layout_image_dnd_receive(GtkWidget *widget, GdkDragContext *context, | |
| 592 gint x, gint y, | |
| 593 GtkSelectionData *selection_data, guint info, | |
| 594 guint time, gpointer data) | |
| 595 { | |
| 596 LayoutWindow *lw = data; | |
| 127 | 597 gint i; |
| 442 | 598 |
| 599 | |
| 520 | 600 for (i = 0; i < MAX_SPLIT_IMAGES; i++) |
| 127 | 601 { |
| 602 if (lw->split_images[i] && lw->split_images[i]->pr == widget) | |
| 603 break; | |
| 604 } | |
| 605 if (i < MAX_SPLIT_IMAGES) | |
| 606 { | |
|
506
fc9c8a3e1a8b
Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents:
497
diff
changeset
|
607 DEBUG_1("dnd image activate %d", i); |
| 127 | 608 layout_image_activate(lw, i); |
| 609 } | |
| 610 | |
| 9 | 611 |
| 612 if (info == TARGET_URI_LIST || info == TARGET_APP_COLLECTION_MEMBER) | |
| 613 { | |
| 614 CollectionData *source; | |
| 615 GList *list; | |
| 616 GList *info_list; | |
| 617 | |
| 618 if (info == TARGET_URI_LIST) | |
| 619 { | |
| 138 | 620 list = uri_filelist_from_text((gchar *)selection_data->data, TRUE); |
| 9 | 621 source = NULL; |
| 622 info_list = NULL; | |
| 623 } | |
| 624 else | |
| 625 { | |
| 626 source = collection_from_dnd_data((gchar *)selection_data->data, &list, &info_list); | |
| 627 } | |
| 628 | |
| 629 if (list) | |
| 630 { | |
| 138 | 631 FileData *fd = list->data; |
| 9 | 632 |
| 138 | 633 if (isfile(fd->path)) |
| 9 | 634 { |
| 635 gchar *base; | |
| 636 gint row; | |
| 783 | 637 FileData *dir_fd; |
| 9 | 638 |
| 138 | 639 base = remove_level_from_path(fd->path); |
| 783 | 640 dir_fd = file_data_new_simple(base); |
| 641 if (dir_fd != lw->dir_fd) | |
| 9 | 642 { |
| 783 | 643 layout_set_fd(lw, dir_fd); |
| 9 | 644 } |
| 783 | 645 file_data_unref(dir_fd); |
| 9 | 646 g_free(base); |
| 647 | |
| 783 | 648 row = layout_list_get_index(lw, fd); |
| 9 | 649 if (source && info_list) |
| 650 { | |
| 651 layout_image_set_collection(lw, source, info_list->data); | |
| 652 } | |
| 653 else if (row == -1) | |
| 654 { | |
| 138 | 655 layout_image_set_fd(lw, fd); |
| 9 | 656 } |
| 657 else | |
| 658 { | |
| 659 layout_image_set_index(lw, row); | |
| 660 } | |
| 661 } | |
| 138 | 662 else if (isdir(fd->path)) |
| 9 | 663 { |
| 783 | 664 layout_set_fd(lw, fd); |
| 138 | 665 layout_image_set_fd(lw, NULL); |
| 9 | 666 } |
| 667 } | |
| 668 | |
| 138 | 669 filelist_free(list); |
| 9 | 670 g_list_free(info_list); |
| 671 } | |
| 672 } | |
| 673 | |
| 674 static void layout_image_dnd_get(GtkWidget *widget, GdkDragContext *context, | |
| 675 GtkSelectionData *selection_data, guint info, | |
| 676 guint time, gpointer data) | |
| 677 { | |
| 678 LayoutWindow *lw = data; | |
| 138 | 679 FileData *fd; |
| 127 | 680 gint i; |
| 442 | 681 |
| 682 | |
| 520 | 683 for (i = 0; i < MAX_SPLIT_IMAGES; i++) |
| 127 | 684 { |
| 685 if (lw->split_images[i] && lw->split_images[i]->pr == widget) | |
| 686 break; | |
| 687 } | |
| 688 if (i < MAX_SPLIT_IMAGES) | |
| 689 { | |
|
506
fc9c8a3e1a8b
Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents:
497
diff
changeset
|
690 DEBUG_1("dnd get from %d", i); |
| 138 | 691 fd = image_get_fd(lw->split_images[i]); |
| 127 | 692 } |
| 693 else | |
| 138 | 694 fd = layout_image_get_fd(lw); |
| 9 | 695 |
| 138 | 696 if (fd) |
| 9 | 697 { |
| 698 gchar *text = NULL; | |
| 699 gint len; | |
|
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1432
diff
changeset
|
700 gboolean plain_text; |
| 9 | 701 GList *list; |
| 702 | |
| 703 switch (info) | |
| 704 { | |
| 705 case TARGET_URI_LIST: | |
| 706 plain_text = FALSE; | |
| 707 break; | |
| 708 case TARGET_TEXT_PLAIN: | |
| 709 default: | |
| 710 plain_text = TRUE; | |
| 711 break; | |
| 712 } | |
| 138 | 713 list = g_list_append(NULL, fd); |
| 714 text = uri_text_from_filelist(list, &len, plain_text); | |
| 9 | 715 g_list_free(list); |
| 716 if (text) | |
| 717 { | |
|
512
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
718 gtk_selection_data_set(selection_data, selection_data->target, |
|
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
719 8, (guchar *)text, len); |
| 9 | 720 g_free(text); |
| 721 } | |
| 722 } | |
| 723 else | |
| 724 { | |
|
512
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
725 gtk_selection_data_set(selection_data, selection_data->target, |
|
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
726 8, NULL, 0); |
| 9 | 727 } |
| 728 } | |
| 729 | |
| 730 static void layout_image_dnd_end(GtkWidget *widget, GdkDragContext *context, gpointer data) | |
| 731 { | |
| 732 LayoutWindow *lw = data; | |
| 733 if (context->action == GDK_ACTION_MOVE) | |
| 734 { | |
| 783 | 735 FileData *fd; |
| 9 | 736 gint row; |
| 737 | |
| 783 | 738 fd = layout_image_get_fd(lw); |
| 739 row = layout_list_get_index(lw, fd); | |
| 9 | 740 if (row < 0) return; |
| 741 | |
| 783 | 742 if (!isfile(fd->path)) |
| 9 | 743 { |
| 736 | 744 if ((guint) row < layout_list_count(lw, NULL) - 1) |
| 9 | 745 { |
| 746 layout_image_next(lw); | |
| 747 } | |
| 748 else | |
| 749 { | |
| 750 layout_image_prev(lw); | |
| 751 } | |
| 752 } | |
| 753 layout_refresh(lw); | |
| 754 } | |
| 755 } | |
| 756 | |
| 127 | 757 static void layout_image_dnd_init(LayoutWindow *lw, gint i) |
| 9 | 758 { |
| 127 | 759 ImageWindow *imd = lw->split_images[i]; |
| 760 | |
| 761 gtk_drag_source_set(imd->pr, GDK_BUTTON2_MASK, | |
| 9 | 762 dnd_file_drag_types, dnd_file_drag_types_count, |
| 763 GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK); | |
| 127 | 764 g_signal_connect(G_OBJECT(imd->pr), "drag_data_get", |
| 9 | 765 G_CALLBACK(layout_image_dnd_get), lw); |
| 127 | 766 g_signal_connect(G_OBJECT(imd->pr), "drag_end", |
| 9 | 767 G_CALLBACK(layout_image_dnd_end), lw); |
| 768 | |
| 127 | 769 gtk_drag_dest_set(imd->pr, |
| 9 | 770 GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, |
| 771 dnd_file_drop_types, dnd_file_drop_types_count, | |
| 442 | 772 GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK); |
| 127 | 773 g_signal_connect(G_OBJECT(imd->pr), "drag_data_received", |
| 9 | 774 G_CALLBACK(layout_image_dnd_receive), lw); |
| 775 } | |
| 776 | |
| 777 | |
| 778 /* | |
| 779 *---------------------------------------------------------------------------- | |
| 780 * misc | |
| 781 *---------------------------------------------------------------------------- | |
| 782 */ | |
| 783 | |
| 784 void layout_image_to_root(LayoutWindow *lw) | |
| 785 { | |
| 786 image_to_root_window(lw->image, (image_zoom_get(lw->image) == 0)); | |
| 787 } | |
| 788 | |
| 789 /* | |
| 790 *---------------------------------------------------------------------------- | |
| 791 * manipulation + accessors | |
| 792 *---------------------------------------------------------------------------- | |
| 793 */ | |
| 794 | |
| 1047 | 795 void layout_image_scroll(LayoutWindow *lw, gint x, gint y, gboolean connect_scroll) |
| 9 | 796 { |
|
530
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
797 gdouble dx, dy; |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
798 gint width, height, i; |
| 9 | 799 if (!layout_valid(&lw)) return; |
| 800 | |
| 801 image_scroll(lw->image, x, y); | |
|
530
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
802 |
| 1047 | 803 if (!connect_scroll) return; |
|
879
0f85435ac335
Optimize a bit when connected zoom and scrolling are unset,
zas_
parents:
869
diff
changeset
|
804 |
|
530
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
805 image_get_image_size(lw->image, &width, &height); |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
806 dx = (gdouble) x / width; |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
807 dy = (gdouble) y / height; |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
808 |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
809 for (i = 0; i < MAX_SPLIT_IMAGES; i++) |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
810 { |
|
879
0f85435ac335
Optimize a bit when connected zoom and scrolling are unset,
zas_
parents:
869
diff
changeset
|
811 if (lw->split_images[i] && lw->split_images[i] != lw->image) |
|
530
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
812 { |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
813 gdouble sx, sy; |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
814 image_get_scroll_center(lw->split_images[i], &sx, &sy); |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
815 sx += dx; |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
816 sy += dy; |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
817 image_set_scroll_center(lw->split_images[i], sx, sy); |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
818 } |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
819 } |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
820 |
| 9 | 821 } |
| 822 | |
| 1047 | 823 void layout_image_zoom_adjust(LayoutWindow *lw, gdouble increment, gboolean connect_zoom) |
| 9 | 824 { |
| 130 | 825 gint i; |
| 9 | 826 if (!layout_valid(&lw)) return; |
| 827 | |
| 828 image_zoom_adjust(lw->image, increment); | |
| 130 | 829 |
| 1047 | 830 if (!connect_zoom) return; |
|
879
0f85435ac335
Optimize a bit when connected zoom and scrolling are unset,
zas_
parents:
869
diff
changeset
|
831 |
| 520 | 832 for (i = 0; i < MAX_SPLIT_IMAGES; i++) |
| 130 | 833 { |
|
879
0f85435ac335
Optimize a bit when connected zoom and scrolling are unset,
zas_
parents:
869
diff
changeset
|
834 if (lw->split_images[i] && lw->split_images[i] != lw->image) |
| 130 | 835 image_zoom_adjust(lw->split_images[i], increment); ; |
| 836 } | |
| 9 | 837 } |
| 838 | |
| 1047 | 839 void layout_image_zoom_adjust_at_point(LayoutWindow *lw, gdouble increment, gint x, gint y, gboolean connect_zoom) |
|
530
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
840 { |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
841 gint i; |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
842 if (!layout_valid(&lw)) return; |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
843 |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
844 image_zoom_adjust_at_point(lw->image, increment, x, y); |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
845 |
| 1047 | 846 if (!connect_zoom) return; |
|
879
0f85435ac335
Optimize a bit when connected zoom and scrolling are unset,
zas_
parents:
869
diff
changeset
|
847 |
|
530
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
848 for (i = 0; i < MAX_SPLIT_IMAGES; i++) |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
849 { |
|
879
0f85435ac335
Optimize a bit when connected zoom and scrolling are unset,
zas_
parents:
869
diff
changeset
|
850 if (lw->split_images[i] && lw->split_images[i] != lw->image) |
|
530
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
851 image_zoom_adjust_at_point(lw->split_images[i], increment, x, y); |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
852 } |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
853 } |
|
1d67ef911fa8
fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents:
529
diff
changeset
|
854 |
| 1047 | 855 void layout_image_zoom_set(LayoutWindow *lw, gdouble zoom, gboolean connect_zoom) |
| 9 | 856 { |
| 130 | 857 gint i; |
| 9 | 858 if (!layout_valid(&lw)) return; |
| 859 | |
| 860 image_zoom_set(lw->image, zoom); | |
| 130 | 861 |
| 1047 | 862 if (!connect_zoom) return; |
|
879
0f85435ac335
Optimize a bit when connected zoom and scrolling are unset,
zas_
parents:
869
diff
changeset
|
863 |
|
0f85435ac335
Optimize a bit when connected zoom and scrolling are unset,
zas_
parents:
869
diff
changeset
|
864 for (i = 0; i < MAX_SPLIT_IMAGES; i++) |
| 130 | 865 { |
|
879
0f85435ac335
Optimize a bit when connected zoom and scrolling are unset,
zas_
parents:
869
diff
changeset
|
866 if (lw->split_images[i] && lw->split_images[i] != lw->image) |
| 130 | 867 image_zoom_set(lw->split_images[i], zoom); |
| 868 } | |
| 9 | 869 } |
| 870 | |
| 1269 | 871 void layout_image_zoom_set_fill_geometry(LayoutWindow *lw, gboolean vertical, gboolean connect_zoom) |
| 9 | 872 { |
| 1047 | 873 gint i; |
| 9 | 874 if (!layout_valid(&lw)) return; |
| 875 | |
| 876 image_zoom_set_fill_geometry(lw->image, vertical); | |
| 1047 | 877 |
| 878 if (!connect_zoom) return; | |
| 879 | |
| 880 for (i = 0; i < MAX_SPLIT_IMAGES; i++) | |
| 881 { | |
| 882 if (lw->split_images[i] && lw->split_images[i] != lw->image) | |
| 883 image_zoom_set_fill_geometry(lw->split_images[i], vertical); | |
| 884 } | |
| 9 | 885 } |
| 886 | |
| 1566 | 887 void layout_image_alter_orientation(LayoutWindow *lw, AlterType type) |
| 888 { | |
| 889 if (!layout_valid(&lw)) return; | |
| 890 | |
| 891 image_alter_orientation(lw->image, type); | |
| 892 } | |
| 893 | |
| 894 void layout_image_set_desaturate(LayoutWindow *lw, gboolean desaturate) | |
| 9 | 895 { |
| 896 if (!layout_valid(&lw)) return; | |
| 897 | |
| 1566 | 898 image_set_desaturate(lw->image, desaturate); |
| 9 | 899 } |
| 900 | |
| 1566 | 901 gboolean layout_image_get_desaturate(LayoutWindow *lw) |
| 902 { | |
| 903 if (!layout_valid(&lw)) return FALSE; | |
| 904 | |
| 905 return image_get_desaturate(lw->image); | |
| 906 } | |
| 907 | |
| 908 | |
| 909 | |
| 9 | 910 const gchar *layout_image_get_path(LayoutWindow *lw) |
| 911 { | |
| 912 if (!layout_valid(&lw)) return NULL; | |
| 913 | |
| 914 return image_get_path(lw->image); | |
| 915 } | |
| 916 | |
| 917 const gchar *layout_image_get_name(LayoutWindow *lw) | |
| 918 { | |
| 919 if (!layout_valid(&lw)) return NULL; | |
| 920 | |
| 921 return image_get_name(lw->image); | |
| 922 } | |
| 923 | |
| 138 | 924 FileData *layout_image_get_fd(LayoutWindow *lw) |
| 925 { | |
| 926 if (!layout_valid(&lw)) return NULL; | |
| 927 | |
| 928 return image_get_fd(lw->image); | |
| 929 } | |
| 930 | |
| 9 | 931 CollectionData *layout_image_get_collection(LayoutWindow *lw, CollectInfo **info) |
| 932 { | |
| 933 if (!layout_valid(&lw)) return NULL; | |
| 934 | |
| 935 return image_get_collection(lw->image, info); | |
| 936 } | |
| 937 | |
| 938 gint layout_image_get_index(LayoutWindow *lw) | |
| 939 { | |
| 783 | 940 return layout_list_get_index(lw, image_get_fd(lw->image)); |
| 9 | 941 } |
| 942 | |
| 943 /* | |
| 944 *---------------------------------------------------------------------------- | |
| 945 * image changers | |
| 946 *---------------------------------------------------------------------------- | |
| 947 */ | |
| 948 | |
| 138 | 949 void layout_image_set_fd(LayoutWindow *lw, FileData *fd) |
| 9 | 950 { |
| 951 if (!layout_valid(&lw)) return; | |
| 952 | |
|
885
ad420f2eb789
Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents:
879
diff
changeset
|
953 image_change_fd(lw->image, fd, image_zoom_get_default(lw->image)); |
| 9 | 954 |
| 138 | 955 layout_list_sync_fd(lw, fd); |
| 9 | 956 layout_image_slideshow_continue_check(lw); |
| 957 layout_bars_new_image(lw); | |
| 958 } | |
| 959 | |
| 138 | 960 void layout_image_set_with_ahead(LayoutWindow *lw, FileData *fd, FileData *read_ahead_fd) |
| 9 | 961 { |
| 962 if (!layout_valid(&lw)) return; | |
| 963 | |
| 144 | 964 /* |
| 965 This should be handled at the caller: in vflist_select_image | |
| 966 if (path) | |
| 9 | 967 { |
| 968 const gchar *old_path; | |
| 969 | |
| 970 old_path = layout_image_get_path(lw); | |
| 971 if (old_path && strcmp(path, old_path) == 0) return; | |
| 972 } | |
| 127 | 973 */ |
| 138 | 974 layout_image_set_fd(lw, fd); |
| 334 | 975 if (options->image.enable_read_ahead) image_prebuffer_set(lw->image, read_ahead_fd); |
| 9 | 976 } |
| 977 | |
| 978 void layout_image_set_index(LayoutWindow *lw, gint index) | |
| 979 { | |
| 138 | 980 FileData *fd; |
| 981 FileData *read_ahead_fd; | |
| 9 | 982 gint old; |
| 983 | |
| 984 if (!layout_valid(&lw)) return; | |
| 985 | |
| 783 | 986 old = layout_list_get_index(lw, layout_image_get_fd(lw)); |
| 138 | 987 fd = layout_list_get_fd(lw, index); |
| 9 | 988 |
| 989 if (old > index) | |
| 990 { | |
| 138 | 991 read_ahead_fd = layout_list_get_fd(lw, index - 1); |
| 9 | 992 } |
| 993 else | |
| 994 { | |
| 138 | 995 read_ahead_fd = layout_list_get_fd(lw, index + 1); |
| 9 | 996 } |
| 997 | |
| 995 | 998 if (layout_selection_count(lw, 0) > 1) |
| 220 | 999 { |
| 995 | 1000 GList *x = layout_selection_list_by_index(lw); |
| 1001 GList *y; | |
| 1002 GList *last; | |
| 220 | 1003 |
| 995 | 1004 for (last = y = x; y; y = y->next) |
| 1005 last = y; | |
|
529
8815fea478ee
fix warning cast from pointer to integer of different size (when an integer is
bruclik
parents:
520
diff
changeset
|
1006 for (y = x; y && (GPOINTER_TO_INT(y->data)) != index; y = y->next) |
| 220 | 1007 ; |
| 1008 | |
| 1009 if (y) | |
| 1010 { | |
| 1011 gint newindex; | |
| 1012 | |
|
529
8815fea478ee
fix warning cast from pointer to integer of different size (when an integer is
bruclik
parents:
520
diff
changeset
|
1013 if ((index > old && (index != GPOINTER_TO_INT(last->data) || old != GPOINTER_TO_INT(x->data))) |
| 995 | 1014 || (old == GPOINTER_TO_INT(last->data) && index == GPOINTER_TO_INT(x->data))) |
| 442 | 1015 { |
| 220 | 1016 if (y->next) |
|
529
8815fea478ee
fix warning cast from pointer to integer of different size (when an integer is
bruclik
parents:
520
diff
changeset
|
1017 newindex = GPOINTER_TO_INT(y->next->data); |
| 220 | 1018 else |
|
529
8815fea478ee
fix warning cast from pointer to integer of different size (when an integer is
bruclik
parents:
520
diff
changeset
|
1019 newindex = GPOINTER_TO_INT(x->data); |
| 220 | 1020 } |
| 1021 else | |
| 1022 { | |
| 1023 if (y->prev) | |
|
529
8815fea478ee
fix warning cast from pointer to integer of different size (when an integer is
bruclik
parents:
520
diff
changeset
|
1024 newindex = GPOINTER_TO_INT(y->prev->data); |
| 220 | 1025 else |
|
529
8815fea478ee
fix warning cast from pointer to integer of different size (when an integer is
bruclik
parents:
520
diff
changeset
|
1026 newindex = GPOINTER_TO_INT(last->data); |
| 995 | 1027 } |
| 220 | 1028 |
| 1029 read_ahead_fd = layout_list_get_fd(lw, newindex); | |
| 1030 } | |
| 442 | 1031 |
| 220 | 1032 while (x) |
| 1033 x = g_list_remove(x, x->data); | |
| 1034 } | |
| 1035 | |
| 138 | 1036 layout_image_set_with_ahead(lw, fd, read_ahead_fd); |
| 9 | 1037 } |
| 1038 | |
|
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1432
diff
changeset
|
1039 static void layout_image_set_collection_real(LayoutWindow *lw, CollectionData *cd, CollectInfo *info, gboolean forward) |
| 9 | 1040 { |
| 1041 if (!layout_valid(&lw)) return; | |
| 1042 | |
|
885
ad420f2eb789
Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents:
879
diff
changeset
|
1043 image_change_from_collection(lw->image, cd, info, image_zoom_get_default(lw->image)); |
| 334 | 1044 if (options->image.enable_read_ahead) |
| 9 | 1045 { |
| 1046 CollectInfo *r_info; | |
| 1047 if (forward) | |
| 1048 { | |
| 1049 r_info = collection_next_by_info(cd, info); | |
| 1050 if (!r_info) r_info = collection_prev_by_info(cd, info); | |
| 1051 } | |
| 1052 else | |
| 1053 { | |
| 1054 r_info = collection_prev_by_info(cd, info); | |
| 1055 if (!r_info) r_info = collection_next_by_info(cd, info); | |
| 1056 } | |
| 138 | 1057 if (r_info) image_prebuffer_set(lw->image, r_info->fd); |
| 9 | 1058 } |
| 1059 | |
| 1060 layout_image_slideshow_continue_check(lw); | |
| 1061 layout_bars_new_image(lw); | |
| 1062 } | |
| 1063 | |
| 1064 void layout_image_set_collection(LayoutWindow *lw, CollectionData *cd, CollectInfo *info) | |
| 1065 { | |
| 1066 layout_image_set_collection_real(lw, cd, info, TRUE); | |
| 138 | 1067 layout_list_sync_fd(lw, layout_image_get_fd(lw)); |
| 9 | 1068 } |
| 1069 | |
| 1070 void layout_image_refresh(LayoutWindow *lw) | |
| 1071 { | |
| 1072 if (!layout_valid(&lw)) return; | |
| 1073 | |
| 1074 image_reload(lw->image); | |
| 1075 } | |
| 1076 | |
|
113
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1077 void layout_image_color_profile_set(LayoutWindow *lw, |
| 1548 | 1078 gint input_type, |
| 1431 | 1079 gboolean use_image) |
|
113
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1080 { |
|
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1081 if (!layout_valid(&lw)) return; |
|
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1082 |
| 1548 | 1083 image_color_profile_set(lw->image, input_type, use_image); |
|
113
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1084 } |
|
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1085 |
| 1431 | 1086 gboolean layout_image_color_profile_get(LayoutWindow *lw, |
| 1548 | 1087 gint *input_type, |
| 1431 | 1088 gboolean *use_image) |
|
113
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1089 { |
|
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1090 if (!layout_valid(&lw)) return FALSE; |
|
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1091 |
| 1548 | 1092 return image_color_profile_get(lw->image, input_type, use_image); |
|
113
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1093 } |
|
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1094 |
| 1431 | 1095 void layout_image_color_profile_set_use(LayoutWindow *lw, gboolean enable) |
|
113
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1096 { |
|
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1097 if (!layout_valid(&lw)) return; |
|
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1098 |
|
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1099 image_color_profile_set_use(lw->image, enable); |
|
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1100 } |
|
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1101 |
| 1431 | 1102 gboolean layout_image_color_profile_get_use(LayoutWindow *lw) |
|
113
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1103 { |
|
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1104 if (!layout_valid(&lw)) return FALSE; |
|
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1105 |
|
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1106 return image_color_profile_get_use(lw->image); |
|
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1107 } |
|
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1108 |
| 1549 | 1109 gboolean layout_image_color_profile_get_status(LayoutWindow *lw, gchar **image_profile, gchar **screen_profile) |
|
426
9fe0ca1b5263
show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents:
369
diff
changeset
|
1110 { |
| 1549 | 1111 if (!layout_valid(&lw)) return FALSE; |
|
426
9fe0ca1b5263
show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents:
369
diff
changeset
|
1112 |
| 1549 | 1113 return image_color_profile_get_status(lw->image, image_profile, screen_profile); |
|
426
9fe0ca1b5263
show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents:
369
diff
changeset
|
1114 } |
|
9fe0ca1b5263
show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents:
369
diff
changeset
|
1115 |
| 9 | 1116 /* |
| 1117 *---------------------------------------------------------------------------- | |
| 1118 * list walkers | |
| 1119 *---------------------------------------------------------------------------- | |
| 1120 */ | |
| 1121 | |
| 1122 void layout_image_next(LayoutWindow *lw) | |
| 1123 { | |
| 1124 gint current; | |
| 1125 CollectionData *cd; | |
| 1126 CollectInfo *info; | |
| 1127 | |
| 1128 if (!layout_valid(&lw)) return; | |
| 1129 | |
| 1130 if (layout_image_slideshow_active(lw)) | |
| 1131 { | |
| 1132 layout_image_slideshow_next(lw); | |
| 1133 return; | |
| 1134 } | |
| 1135 | |
| 220 | 1136 if (layout_selection_count(lw, 0) > 1) |
| 1137 { | |
| 1138 GList *x = layout_selection_list_by_index(lw); | |
| 783 | 1139 gint old = layout_list_get_index(lw, layout_image_get_fd(lw)); |
| 220 | 1140 GList *y; |
| 1141 | |
|
529
8815fea478ee
fix warning cast from pointer to integer of different size (when an integer is
bruclik
parents:
520
diff
changeset
|
1142 for (y = x; y && (GPOINTER_TO_INT(y->data)) != old; y = y->next) |
| 220 | 1143 ; |
| 1144 if (y) | |
| 1145 { | |
| 442 | 1146 if (y->next) |
|
529
8815fea478ee
fix warning cast from pointer to integer of different size (when an integer is
bruclik
parents:
520
diff
changeset
|
1147 layout_image_set_index(lw, GPOINTER_TO_INT(y->next->data)); |
| 442 | 1148 else |
|
529
8815fea478ee
fix warning cast from pointer to integer of different size (when an integer is
bruclik
parents:
520
diff
changeset
|
1149 layout_image_set_index(lw, GPOINTER_TO_INT(x->data)); |
| 220 | 1150 } |
| 1151 while (x) | |
| 1152 x = g_list_remove(x, x->data); | |
| 1153 if (y) /* not dereferenced */ | |
| 1154 return; | |
| 1155 } | |
| 1156 | |
| 9 | 1157 cd = image_get_collection(lw->image, &info); |
| 1158 | |
| 1159 if (cd && info) | |
| 1160 { | |
| 1161 info = collection_next_by_info(cd, info); | |
|
122
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1162 if (info) |
|
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1163 { |
|
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1164 layout_image_set_collection_real(lw, cd, info, TRUE); |
|
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1165 } |
|
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1166 else |
|
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1167 { |
|
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1168 image_osd_icon(lw->image, IMAGE_OSD_LAST, -1); |
|
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1169 } |
| 9 | 1170 return; |
| 1171 } | |
| 1172 | |
| 1173 current = layout_image_get_index(lw); | |
| 1174 | |
| 1175 if (current >= 0) | |
| 1176 { | |
| 736 | 1177 if ((guint) current < layout_list_count(lw, NULL) - 1) |
| 9 | 1178 { |
| 1179 layout_image_set_index(lw, current + 1); | |
| 1180 } | |
|
122
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1181 else |
|
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1182 { |
|
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1183 image_osd_icon(lw->image, IMAGE_OSD_LAST, -1); |
|
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1184 } |
| 9 | 1185 } |
| 1186 else | |
| 1187 { | |
| 1188 layout_image_set_index(lw, 0); | |
| 1189 } | |
| 1190 } | |
| 1191 | |
| 1192 void layout_image_prev(LayoutWindow *lw) | |
| 1193 { | |
| 1194 gint current; | |
| 1195 CollectionData *cd; | |
| 1196 CollectInfo *info; | |
| 1197 | |
| 1198 if (!layout_valid(&lw)) return; | |
| 1199 | |
| 1200 if (layout_image_slideshow_active(lw)) | |
| 1201 { | |
| 1202 layout_image_slideshow_prev(lw); | |
| 1203 return; | |
| 1204 } | |
| 1205 | |
| 220 | 1206 if (layout_selection_count(lw, 0) > 1) |
| 1207 { | |
| 1208 GList *x = layout_selection_list_by_index(lw); | |
| 783 | 1209 gint old = layout_list_get_index(lw, layout_image_get_fd(lw)); |
| 220 | 1210 GList *y; |
| 1211 GList *last; | |
| 1212 | |
| 1213 for (last = y = x; y; y = y->next) | |
| 1214 last = y; | |
|
529
8815fea478ee
fix warning cast from pointer to integer of different size (when an integer is
bruclik
parents:
520
diff
changeset
|
1215 for (y = x; y && (GPOINTER_TO_INT(y->data)) != old; y = y->next) |
| 220 | 1216 ; |
| 1217 if (y) | |
| 1218 { | |
| 442 | 1219 if (y->prev) |
|
529
8815fea478ee
fix warning cast from pointer to integer of different size (when an integer is
bruclik
parents:
520
diff
changeset
|
1220 layout_image_set_index(lw, GPOINTER_TO_INT(y->prev->data)); |
| 220 | 1221 else |
|
529
8815fea478ee
fix warning cast from pointer to integer of different size (when an integer is
bruclik
parents:
520
diff
changeset
|
1222 layout_image_set_index(lw, GPOINTER_TO_INT(last->data)); |
| 220 | 1223 } |
| 1224 while (x) | |
| 1225 x = g_list_remove(x, x->data); | |
| 1226 if (y) /* not dereferenced */ | |
| 1227 return; | |
| 1228 } | |
| 1229 | |
| 9 | 1230 cd = image_get_collection(lw->image, &info); |
| 1231 | |
| 1232 if (cd && info) | |
| 1233 { | |
| 1234 info = collection_prev_by_info(cd, info); | |
|
122
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1235 if (info) |
|
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1236 { |
|
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1237 layout_image_set_collection_real(lw, cd, info, FALSE); |
|
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1238 } |
|
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1239 else |
|
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1240 { |
|
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1241 image_osd_icon(lw->image, IMAGE_OSD_FIRST, -1); |
|
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1242 } |
| 9 | 1243 return; |
| 1244 } | |
| 1245 | |
| 1246 current = layout_image_get_index(lw); | |
| 1247 | |
| 1248 if (current >= 0) | |
| 1249 { | |
| 1250 if (current > 0) | |
| 1251 { | |
| 1252 layout_image_set_index(lw, current - 1); | |
| 1253 } | |
|
122
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1254 else |
|
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1255 { |
|
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1256 image_osd_icon(lw->image, IMAGE_OSD_FIRST, -1); |
|
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1257 } |
| 9 | 1258 } |
| 1259 else | |
| 1260 { | |
| 1261 layout_image_set_index(lw, layout_list_count(lw, NULL) - 1); | |
| 1262 } | |
| 1263 } | |
| 1264 | |
| 1265 void layout_image_first(LayoutWindow *lw) | |
| 1266 { | |
| 1267 gint current; | |
| 1268 CollectionData *cd; | |
| 1269 CollectInfo *info; | |
| 1270 | |
| 1271 if (!layout_valid(&lw)) return; | |
| 1272 | |
| 1273 cd = image_get_collection(lw->image, &info); | |
| 1274 | |
| 1275 if (cd && info) | |
| 1276 { | |
| 1277 CollectInfo *new; | |
| 1278 new = collection_get_first(cd); | |
| 1279 if (new != info) layout_image_set_collection_real(lw, cd, new, TRUE); | |
| 1280 return; | |
| 1281 } | |
| 1282 | |
| 1283 current = layout_image_get_index(lw); | |
| 1284 if (current != 0 && layout_list_count(lw, NULL) > 0) | |
| 1285 { | |
| 1286 layout_image_set_index(lw, 0); | |
| 1287 } | |
| 1288 } | |
| 1289 | |
| 1290 void layout_image_last(LayoutWindow *lw) | |
| 1291 { | |
| 1292 gint current; | |
| 1293 gint count; | |
| 1294 CollectionData *cd; | |
| 1295 CollectInfo *info; | |
| 1296 | |
| 1297 if (!layout_valid(&lw)) return; | |
| 1298 | |
| 1299 cd = image_get_collection(lw->image, &info); | |
| 1300 | |
| 1301 if (cd && info) | |
| 1302 { | |
| 1303 CollectInfo *new; | |
| 1304 new = collection_get_last(cd); | |
| 1305 if (new != info) layout_image_set_collection_real(lw, cd, new, FALSE); | |
| 1306 return; | |
| 1307 } | |
| 1308 | |
| 1309 current = layout_image_get_index(lw); | |
| 1310 count = layout_list_count(lw, NULL); | |
| 1311 if (current != count - 1 && count > 0) | |
| 1312 { | |
| 1313 layout_image_set_index(lw, count - 1); | |
| 1314 } | |
| 1315 } | |
| 1316 | |
| 1317 /* | |
| 1318 *---------------------------------------------------------------------------- | |
| 1319 * mouse callbacks | |
| 1320 *---------------------------------------------------------------------------- | |
| 1321 */ | |
| 1322 | |
| 127 | 1323 static gint image_idx(LayoutWindow *lw, ImageWindow *imd) |
| 1324 { | |
| 1325 gint i; | |
| 442 | 1326 |
| 520 | 1327 for (i = 0; i < MAX_SPLIT_IMAGES; i++) |
| 127 | 1328 { |
| 1329 if (lw->split_images[i] == imd) | |
| 1330 break; | |
| 1331 } | |
| 1332 if (i < MAX_SPLIT_IMAGES) | |
| 1333 { | |
| 1334 return i; | |
| 1335 } | |
| 1336 return -1; | |
| 1337 } | |
| 1338 | |
| 1481 | 1339 static void layout_image_focus_in_cb(ImageWindow *imd, gpointer data) |
| 1340 { | |
| 1341 LayoutWindow *lw = data; | |
| 1342 | |
| 1343 gint i = image_idx(lw, imd); | |
| 1344 | |
| 1345 if (i != -1) | |
| 1346 { | |
| 1347 DEBUG_1("image activate focus_in %d", i); | |
| 1348 layout_image_activate(lw, i); | |
| 1349 } | |
| 1350 } | |
| 1351 | |
| 127 | 1352 |
|
868
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1353 static void layout_image_button_cb(ImageWindow *imd, GdkEventButton *event, gpointer data) |
| 9 | 1354 { |
| 1355 LayoutWindow *lw = data; | |
| 1356 GtkWidget *menu; | |
| 1357 | |
|
868
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1358 switch (event->button) |
| 9 | 1359 { |
|
448
a73cc0fa14d0
Use explicit names for mouse buttons instead of numbers.
zas_
parents:
446
diff
changeset
|
1360 case MOUSE_BUTTON_LEFT: |
|
1286
eba0b4ae413b
do not switch to the next image on mouse click in split mode
nadvornik
parents:
1284
diff
changeset
|
1361 if (lw->split_mode == SPLIT_NONE) |
|
eba0b4ae413b
do not switch to the next image on mouse click in split mode
nadvornik
parents:
1284
diff
changeset
|
1362 layout_image_next(lw); |
| 9 | 1363 break; |
|
448
a73cc0fa14d0
Use explicit names for mouse buttons instead of numbers.
zas_
parents:
446
diff
changeset
|
1364 case MOUSE_BUTTON_MIDDLE: |
|
1286
eba0b4ae413b
do not switch to the next image on mouse click in split mode
nadvornik
parents:
1284
diff
changeset
|
1365 if (lw->split_mode == SPLIT_NONE) |
|
eba0b4ae413b
do not switch to the next image on mouse click in split mode
nadvornik
parents:
1284
diff
changeset
|
1366 layout_image_prev(lw); |
| 9 | 1367 break; |
|
448
a73cc0fa14d0
Use explicit names for mouse buttons instead of numbers.
zas_
parents:
446
diff
changeset
|
1368 case MOUSE_BUTTON_RIGHT: |
| 9 | 1369 menu = layout_image_pop_menu(lw); |
| 1370 if (imd == lw->image) | |
| 1371 { | |
| 1372 g_object_set_data(G_OBJECT(menu), "click_parent", imd->widget); | |
| 1373 } | |
|
868
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1374 gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 3, event->time); |
| 9 | 1375 break; |
| 1376 default: | |
| 1377 break; | |
| 1378 } | |
| 1379 } | |
| 1380 | |
|
868
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1381 static void layout_image_scroll_cb(ImageWindow *imd, GdkEventScroll *event, gpointer data) |
| 9 | 1382 { |
| 1383 LayoutWindow *lw = data; | |
| 1384 | |
| 127 | 1385 gint i = image_idx(lw, imd); |
| 442 | 1386 |
| 127 | 1387 if (i != -1) |
| 1388 { | |
|
506
fc9c8a3e1a8b
Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents:
497
diff
changeset
|
1389 DEBUG_1("image activate scroll %d", i); |
| 127 | 1390 layout_image_activate(lw, i); |
| 1391 } | |
| 1392 | |
| 1393 | |
|
868
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1394 if (event->state & GDK_CONTROL_MASK) |
| 9 | 1395 { |
|
868
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1396 switch (event->direction) |
| 9 | 1397 { |
| 1398 case GDK_SCROLL_UP: | |
| 1047 | 1399 layout_image_zoom_adjust_at_point(lw, get_zoom_increment(), event->x, event->y, event->state & GDK_SHIFT_MASK); |
| 9 | 1400 break; |
| 1401 case GDK_SCROLL_DOWN: | |
| 1047 | 1402 layout_image_zoom_adjust_at_point(lw, -get_zoom_increment(), event->x, event->y, event->state & GDK_SHIFT_MASK); |
| 9 | 1403 break; |
| 1404 default: | |
| 1405 break; | |
| 1406 } | |
| 1407 } | |
| 1047 | 1408 else if (options->mousewheel_scrolls) |
| 9 | 1409 { |
|
868
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1410 switch (event->direction) |
| 9 | 1411 { |
| 1412 case GDK_SCROLL_UP: | |
| 1413 image_scroll(imd, 0, -MOUSEWHEEL_SCROLL_SIZE); | |
| 1414 break; | |
| 1415 case GDK_SCROLL_DOWN: | |
| 1416 image_scroll(imd, 0, MOUSEWHEEL_SCROLL_SIZE); | |
| 1417 break; | |
| 1418 case GDK_SCROLL_LEFT: | |
| 1419 image_scroll(imd, -MOUSEWHEEL_SCROLL_SIZE, 0); | |
| 1420 break; | |
| 1421 case GDK_SCROLL_RIGHT: | |
| 1422 image_scroll(imd, MOUSEWHEEL_SCROLL_SIZE, 0); | |
| 1423 break; | |
| 1424 default: | |
| 1425 break; | |
| 1426 } | |
| 1427 } | |
| 1428 else | |
| 1429 { | |
|
868
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1430 switch (event->direction) |
| 9 | 1431 { |
| 1432 case GDK_SCROLL_UP: | |
| 1433 layout_image_prev(lw); | |
| 1434 break; | |
| 1435 case GDK_SCROLL_DOWN: | |
| 1436 layout_image_next(lw); | |
| 1437 break; | |
| 1438 default: | |
| 1439 break; | |
| 1440 } | |
| 1441 } | |
| 1442 } | |
| 1443 | |
|
868
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1444 static void layout_image_drag_cb(ImageWindow *imd, GdkEventButton *event, gdouble dx, gdouble dy, gpointer data) |
| 127 | 1445 { |
| 1446 gint i; | |
| 1447 LayoutWindow *lw = data; | |
| 1448 | |
| 1047 | 1449 if (!(event->state & GDK_SHIFT_MASK)) return; |
|
869
371a1c3d4504
layout_image_drag_cb(): optimize when connected scrolling is unset.
zas_
parents:
868
diff
changeset
|
1450 |
|
868
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1451 for (i = 0; i < MAX_SPLIT_IMAGES; i++) |
| 127 | 1452 { |
|
869
371a1c3d4504
layout_image_drag_cb(): optimize when connected scrolling is unset.
zas_
parents:
868
diff
changeset
|
1453 if (lw->split_images[i] && lw->split_images[i] != imd) |
|
868
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1454 { |
|
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1455 gdouble sx, sy; |
|
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1456 |
|
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1457 if (event->state & GDK_CONTROL_MASK) |
| 129 | 1458 { |
|
868
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1459 image_get_scroll_center(imd, &sx, &sy); |
| 129 | 1460 } |
|
868
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1461 else |
|
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1462 { |
|
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1463 image_get_scroll_center(lw->split_images[i], &sx, &sy); |
|
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1464 sx += dx; |
|
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1465 sy += dy; |
|
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1466 } |
|
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1467 image_set_scroll_center(lw->split_images[i], sx, sy); |
|
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1468 } |
| 127 | 1469 } |
| 1470 } | |
| 1471 | |
|
868
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1472 static void layout_image_button_inactive_cb(ImageWindow *imd, GdkEventButton *event, gpointer data) |
| 127 | 1473 { |
| 1474 LayoutWindow *lw = data; | |
|
128
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1475 GtkWidget *menu; |
| 127 | 1476 gint i = image_idx(lw, imd); |
| 442 | 1477 |
| 127 | 1478 if (i != -1) |
| 1479 { | |
| 1480 layout_image_activate(lw, i); | |
| 1481 } | |
|
128
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1482 |
|
868
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1483 switch (event->button) |
|
128
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1484 { |
|
448
a73cc0fa14d0
Use explicit names for mouse buttons instead of numbers.
zas_
parents:
446
diff
changeset
|
1485 case MOUSE_BUTTON_RIGHT: |
|
128
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1486 menu = layout_image_pop_menu(lw); |
|
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1487 if (imd == lw->image) |
|
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1488 { |
|
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1489 g_object_set_data(G_OBJECT(menu), "click_parent", imd->widget); |
|
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1490 } |
|
868
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1491 gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 3, event->time); |
|
128
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1492 break; |
|
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1493 default: |
|
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1494 break; |
|
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1495 } |
|
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1496 |
| 127 | 1497 } |
| 1498 | |
|
868
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1499 static void layout_image_drag_inactive_cb(ImageWindow *imd, GdkEventButton *event, gdouble dx, gdouble dy, gpointer data) |
|
128
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1500 { |
|
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1501 LayoutWindow *lw = data; |
|
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1502 gint i = image_idx(lw, imd); |
| 442 | 1503 |
|
128
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1504 if (i != -1) |
|
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1505 { |
|
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1506 layout_image_activate(lw, i); |
|
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1507 } |
|
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1508 |
| 129 | 1509 /* continue as with active image */ |
|
868
db6977f8b0f1
Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents:
837
diff
changeset
|
1510 layout_image_drag_cb(imd, event, dx, dy, data); |
|
128
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1511 } |
|
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1512 |
|
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1513 |
| 9 | 1514 static void layout_image_set_buttons(LayoutWindow *lw) |
| 1515 { | |
| 1516 image_set_button_func(lw->image, layout_image_button_cb, lw); | |
| 1517 image_set_scroll_func(lw->image, layout_image_scroll_cb, lw); | |
| 1518 } | |
| 1519 | |
| 127 | 1520 static void layout_image_set_buttons_inactive(LayoutWindow *lw, gint i) |
| 1521 { | |
| 1522 image_set_button_func(lw->split_images[i], layout_image_button_inactive_cb, lw); | |
| 1523 image_set_scroll_func(lw->split_images[i], layout_image_scroll_cb, lw); | |
| 1524 } | |
| 1525 | |
|
1377
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1526 /* Returns the length of an integer */ |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1527 static gint num_length(gint num) |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1528 { |
|
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1432
diff
changeset
|
1529 gint len = 0; |
|
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1432
diff
changeset
|
1530 if (num < 0) num = -num; |
|
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1432
diff
changeset
|
1531 while (num) |
|
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1432
diff
changeset
|
1532 { |
|
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1432
diff
changeset
|
1533 num /= 10; |
|
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1432
diff
changeset
|
1534 len++; |
|
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1432
diff
changeset
|
1535 } |
|
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1432
diff
changeset
|
1536 return len; |
|
1377
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1537 } |
|
1375
df58e511d90e
Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents:
1373
diff
changeset
|
1538 |
|
df58e511d90e
Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents:
1373
diff
changeset
|
1539 void layout_status_update_pixel_cb(PixbufRenderer *pr, gpointer data) |
|
df58e511d90e
Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents:
1373
diff
changeset
|
1540 { |
|
df58e511d90e
Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents:
1373
diff
changeset
|
1541 LayoutWindow *lw = data; |
|
1377
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1542 gint x_pixel, y_pixel; |
|
1375
df58e511d90e
Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents:
1373
diff
changeset
|
1543 |
|
1377
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1544 if (!data || !layout_valid(&lw) || !lw->image |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1545 || lw->options.info_pixel_hidden || lw->image->unknown) return; |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1546 |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1547 pixbuf_renderer_get_mouse_position(pr, &x_pixel, &y_pixel); |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1548 |
|
1492
c350242b1a5d
Fixed bug where pixel/color information at x=0 coordinates werent shown:
zas_
parents:
1481
diff
changeset
|
1549 if(x_pixel >= 0 && y_pixel >= 0) |
|
1377
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1550 { |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1551 gint r_mouse, g_mouse, b_mouse; |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1552 gint width, height; |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1553 gchar *text; |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1554 PangoAttrList *attrs; |
|
1375
df58e511d90e
Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents:
1373
diff
changeset
|
1555 |
|
1377
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1556 pixbuf_renderer_get_image_size(pr, &width, &height); |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1557 if (width < 1 || height < 1) return; |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1558 |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1559 pixbuf_renderer_get_pixel_colors(pr, x_pixel, y_pixel, |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1560 &r_mouse, &g_mouse, &b_mouse); |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1561 |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1562 attrs = pango_attr_list_new(); |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1563 pango_attr_list_insert(attrs, pango_attr_family_new("Monospace")); |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1564 |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1565 text = g_strdup_printf(_("pos(%*d,%*d) rgb(%3d,%3d,%3d)"), |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1566 num_length(width - 1), x_pixel, |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1567 num_length(height - 1), y_pixel, |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1568 r_mouse, g_mouse, b_mouse); |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1569 |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1570 gtk_label_set_text(GTK_LABEL(lw->info_pixel), text); |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1571 gtk_label_set_attributes(GTK_LABEL(lw->info_pixel), attrs); |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1572 pango_attr_list_unref(attrs); |
|
1375
df58e511d90e
Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents:
1373
diff
changeset
|
1573 g_free(text); |
|
df58e511d90e
Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents:
1373
diff
changeset
|
1574 } |
|
1377
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1575 else |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1576 { |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1577 gtk_label_set_text(GTK_LABEL(lw->info_pixel), ""); |
|
dab37628f5d8
layout_status_update_pixel_cb(): cleanup and optimization, drop pango markup in i18n string, use a small function to calculate numbers length, only allocate text when needed.
zas_
parents:
1375
diff
changeset
|
1578 } |
|
1375
df58e511d90e
Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents:
1373
diff
changeset
|
1579 } |
|
df58e511d90e
Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents:
1373
diff
changeset
|
1580 |
|
df58e511d90e
Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents:
1373
diff
changeset
|
1581 |
| 9 | 1582 /* |
| 1583 *---------------------------------------------------------------------------- | |
| 1584 * setup | |
| 1585 *---------------------------------------------------------------------------- | |
| 1586 */ | |
| 1587 | |
| 1588 static void layout_image_update_cb(ImageWindow *imd, gpointer data) | |
| 1589 { | |
| 1590 LayoutWindow *lw = data; | |
| 1591 layout_status_update_image(lw); | |
| 1592 } | |
| 1593 | |
| 127 | 1594 GtkWidget *layout_image_new(LayoutWindow *lw, gint i) |
| 9 | 1595 { |
|
837
f8c22438376c
use GtkSizeGroup to control initial size of split images
nadvornik
parents:
836
diff
changeset
|
1596 if (!lw->split_image_sizegroup) lw->split_image_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_BOTH); |
|
f8c22438376c
use GtkSizeGroup to control initial size of split images
nadvornik
parents:
836
diff
changeset
|
1597 |
| 442 | 1598 if (!lw->split_images[i]) |
| 9 | 1599 { |
| 127 | 1600 lw->split_images[i] = image_new(TRUE); |
| 1601 | |
| 1043 | 1602 #if GTK_CHECK_VERSION(2,12,0) |
| 1603 g_object_ref(lw->split_images[i]->widget); | |
| 1604 #else | |
| 127 | 1605 gtk_widget_ref(lw->split_images[i]->widget); |
| 1043 | 1606 #endif |
|
1375
df58e511d90e
Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents:
1373
diff
changeset
|
1607 |
|
df58e511d90e
Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents:
1373
diff
changeset
|
1608 g_signal_connect(G_OBJECT(lw->split_images[i]->pr), "update-pixel", |
|
df58e511d90e
Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents:
1373
diff
changeset
|
1609 G_CALLBACK(layout_status_update_pixel_cb), lw); |
|
df58e511d90e
Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents:
1373
diff
changeset
|
1610 |
|
339
de1c2cd06fce
Rename user_specified_window_background and window_background_color
zas_
parents:
334
diff
changeset
|
1611 image_background_set_color(lw->split_images[i], options->image.use_custom_border_color ? &options->image.border_color : NULL); |
| 9 | 1612 |
| 888 | 1613 image_auto_refresh_enable(lw->split_images[i], TRUE); |
|
113
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
1614 |
| 127 | 1615 layout_image_dnd_init(lw, i); |
| 207 | 1616 image_color_profile_set(lw->split_images[i], |
| 327 | 1617 options->color_profile.input_type, |
| 1618 options->color_profile.use_image); | |
| 1619 image_color_profile_set_use(lw->split_images[i], options->color_profile.enabled); | |
|
837
f8c22438376c
use GtkSizeGroup to control initial size of split images
nadvornik
parents:
836
diff
changeset
|
1620 |
|
f8c22438376c
use GtkSizeGroup to control initial size of split images
nadvornik
parents:
836
diff
changeset
|
1621 gtk_size_group_add_widget(lw->split_image_sizegroup, lw->split_images[i]->widget); |
| 1383 | 1622 gtk_widget_set_size_request(lw->split_images[i]->widget, IMAGE_MIN_WIDTH, -1); |
| 1623 | |
| 1481 | 1624 image_set_focus_in_func(lw->split_images[i], layout_image_focus_in_cb, lw); |
| 1625 | |
| 9 | 1626 } |
| 1627 | |
| 127 | 1628 return lw->split_images[i]->widget; |
| 1629 } | |
| 1630 | |
| 1631 void layout_image_deactivate(LayoutWindow *lw, gint i) | |
| 1632 { | |
| 1633 if (!lw->split_images[i]) return; | |
| 1634 image_set_update_func(lw->split_images[i], NULL, NULL); | |
| 1635 layout_image_set_buttons_inactive(lw, i); | |
| 129 | 1636 image_set_drag_func(lw->split_images[i], layout_image_drag_inactive_cb, lw); |
| 127 | 1637 |
| 1638 image_attach_window(lw->split_images[i], NULL, NULL, NULL, FALSE); | |
| 1639 image_select(lw->split_images[i], FALSE); | |
| 1640 } | |
| 1641 | |
| 1642 | |
| 1643 void layout_image_activate(LayoutWindow *lw, gint i) | |
| 1644 { | |
| 138 | 1645 FileData *fd; |
| 442 | 1646 |
| 127 | 1647 if (!lw->split_images[i]) return; |
| 1648 | |
| 1649 /* deactivate currently active */ | |
| 1650 if (lw->active_split_image != i) | |
| 1651 layout_image_deactivate(lw, lw->active_split_image); | |
| 1652 | |
| 1653 lw->image = lw->split_images[i]; | |
| 1654 lw->active_split_image = i; | |
| 442 | 1655 |
| 127 | 1656 image_set_update_func(lw->image, layout_image_update_cb, lw); |
| 1657 layout_image_set_buttons(lw); | |
|
128
98e2632b5d3d
improved connected scroll and active image switching
nadvornik
parents:
127
diff
changeset
|
1658 image_set_drag_func(lw->image, layout_image_drag_cb, lw); |
| 127 | 1659 |
|
288
d1f74154463e
Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents:
281
diff
changeset
|
1660 image_attach_window(lw->image, lw->window, NULL, GQ_APPNAME, FALSE); |
| 127 | 1661 |
| 152 | 1662 /* do not hilight selected image in SPLIT_NONE */ |
| 1663 /* maybe the image should be selected always and hilight should be controled by | |
| 1664 another image option */ | |
| 1665 if (lw->split_mode != SPLIT_NONE) | |
| 1666 image_select(lw->split_images[i], TRUE); | |
| 1667 else | |
| 1668 image_select(lw->split_images[i], FALSE); | |
| 127 | 1669 |
| 138 | 1670 fd = image_get_fd(lw->image); |
| 127 | 1671 |
| 442 | 1672 if (fd) |
| 127 | 1673 { |
| 1674 // layout_list_sync_path(lw, path); | |
| 783 | 1675 layout_set_fd(lw, fd); |
| 127 | 1676 } |
| 1677 } | |
| 1678 | |
| 1679 | |
|
1168
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1680 static void layout_image_setup_split_common(LayoutWindow *lw, gint n) |
| 127 | 1681 { |
| 1309 | 1682 gboolean frame = (n == 1) ? (!lw->options.tools_float && !lw->options.tools_hidden) : 1; |
| 127 | 1683 gint i; |
| 1684 | |
| 1169 | 1685 for (i = 0; i < n; i++) |
|
1168
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1686 if (!lw->split_images[i]) |
|
153
0e54267762f6
fixed copying zoom an scroll values from the original image on splitting
nadvornik
parents:
152
diff
changeset
|
1687 { |
|
1172
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1688 FileData *img_fd = NULL; |
|
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1689 double zoom = 0.0; |
|
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1690 |
|
1168
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1691 layout_image_new(lw, i); |
|
1170
159f225985c5
Use common code for layout_image_setup_split_none() too.
zas_
parents:
1169
diff
changeset
|
1692 image_set_frame(lw->split_images[i], frame); |
|
1168
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1693 image_set_selectable(lw->split_images[i], 1); |
|
1173
52ce0263cb7c
Use the last selected images for the splitted views. Ie. when 5 images are selected, the last one is displayed, split quad while open images 5,4,3,2. It seems better to me.
zas_
parents:
1172
diff
changeset
|
1694 |
| 1373 | 1695 if (lw->image) |
| 1696 { | |
| 1697 image_osd_copy_status(lw->image, lw->split_images[i]); | |
| 1698 } | |
| 1699 | |
|
1172
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1700 if (layout_selection_count(lw, 0) > 1) |
|
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1701 { |
|
1173
52ce0263cb7c
Use the last selected images for the splitted views. Ie. when 5 images are selected, the last one is displayed, split quad while open images 5,4,3,2. It seems better to me.
zas_
parents:
1172
diff
changeset
|
1702 GList *work = g_list_last(layout_selection_list(lw)); |
|
1172
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1703 gint j = 0; |
|
1173
52ce0263cb7c
Use the last selected images for the splitted views. Ie. when 5 images are selected, the last one is displayed, split quad while open images 5,4,3,2. It seems better to me.
zas_
parents:
1172
diff
changeset
|
1704 |
|
52ce0263cb7c
Use the last selected images for the splitted views. Ie. when 5 images are selected, the last one is displayed, split quad while open images 5,4,3,2. It seems better to me.
zas_
parents:
1172
diff
changeset
|
1705 if (work) work = work->prev; |
|
1172
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1706 |
|
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1707 while (work && j < i) |
|
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1708 { |
|
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1709 FileData *fd = work->data; |
|
1173
52ce0263cb7c
Use the last selected images for the splitted views. Ie. when 5 images are selected, the last one is displayed, split quad while open images 5,4,3,2. It seems better to me.
zas_
parents:
1172
diff
changeset
|
1710 work = work->prev; |
|
1172
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1711 |
|
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1712 j++; |
|
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1713 if (!fd || !*fd->path) continue; |
|
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1714 img_fd = fd; |
|
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1715 } |
|
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1716 } |
|
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1717 |
|
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1718 if (!img_fd && lw->image) |
|
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1719 { |
|
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1720 img_fd = image_get_fd(lw->image); |
|
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1721 zoom = image_zoom_get(lw->image); |
|
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1722 } |
|
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1723 |
|
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1724 if (img_fd) |
|
1168
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1725 { |
|
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1726 gdouble sx, sy; |
|
1172
08ef8c605723
When more than one image is selected, Split Horizontal, Vertical and Quad will use selected images when initialized.
zas_
parents:
1171
diff
changeset
|
1727 image_change_fd(lw->split_images[i], img_fd, zoom); |
|
1168
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1728 image_get_scroll_center(lw->image, &sx, &sy); |
|
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1729 image_set_scroll_center(lw->split_images[i], sx, sy); |
|
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1730 } |
|
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1731 layout_image_deactivate(lw, i); |
|
153
0e54267762f6
fixed copying zoom an scroll values from the original image on splitting
nadvornik
parents:
152
diff
changeset
|
1732 } |
|
1168
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1733 else |
|
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1734 { |
|
1170
159f225985c5
Use common code for layout_image_setup_split_none() too.
zas_
parents:
1169
diff
changeset
|
1735 image_set_frame(lw->split_images[i], frame); |
|
1168
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1736 image_set_selectable(lw->split_images[i], 1); |
|
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1737 } |
| 127 | 1738 |
|
1168
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1739 for (i = n; i < MAX_SPLIT_IMAGES; i++) |
| 127 | 1740 { |
| 1741 if (lw->split_images[i]) | |
| 1742 { | |
| 1043 | 1743 #if GTK_CHECK_VERSION(2,12,0) |
| 1744 g_object_unref(lw->split_images[i]->widget); | |
| 1745 #else | |
| 127 | 1746 gtk_widget_unref(lw->split_images[i]->widget); |
| 1043 | 1747 #endif |
| 127 | 1748 lw->split_images[i] = NULL; |
| 1749 } | |
| 1750 } | |
|
1168
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1751 |
|
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1752 if (!lw->image || lw->active_split_image < 0 || lw->active_split_image >= n) |
| 127 | 1753 { |
| 1754 layout_image_activate(lw, 0); | |
| 1755 } | |
| 1273 | 1756 else |
| 1757 { | |
| 1758 /* this will draw the frame around selected image (image_select) | |
| 1759 on switch from single to split images */ | |
| 1760 layout_image_activate(lw, lw->active_split_image); | |
| 1761 } | |
|
1168
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1762 } |
|
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1763 |
|
1170
159f225985c5
Use common code for layout_image_setup_split_none() too.
zas_
parents:
1169
diff
changeset
|
1764 GtkWidget *layout_image_setup_split_none(LayoutWindow *lw) |
|
159f225985c5
Use common code for layout_image_setup_split_none() too.
zas_
parents:
1169
diff
changeset
|
1765 { |
|
159f225985c5
Use common code for layout_image_setup_split_none() too.
zas_
parents:
1169
diff
changeset
|
1766 lw->split_mode = SPLIT_NONE; |
|
159f225985c5
Use common code for layout_image_setup_split_none() too.
zas_
parents:
1169
diff
changeset
|
1767 |
|
159f225985c5
Use common code for layout_image_setup_split_none() too.
zas_
parents:
1169
diff
changeset
|
1768 layout_image_setup_split_common(lw, 1); |
|
159f225985c5
Use common code for layout_image_setup_split_none() too.
zas_
parents:
1169
diff
changeset
|
1769 |
|
159f225985c5
Use common code for layout_image_setup_split_none() too.
zas_
parents:
1169
diff
changeset
|
1770 lw->split_image_widget = lw->split_images[0]->widget; |
|
159f225985c5
Use common code for layout_image_setup_split_none() too.
zas_
parents:
1169
diff
changeset
|
1771 |
|
159f225985c5
Use common code for layout_image_setup_split_none() too.
zas_
parents:
1169
diff
changeset
|
1772 return lw->split_image_widget; |
|
159f225985c5
Use common code for layout_image_setup_split_none() too.
zas_
parents:
1169
diff
changeset
|
1773 } |
|
159f225985c5
Use common code for layout_image_setup_split_none() too.
zas_
parents:
1169
diff
changeset
|
1774 |
|
159f225985c5
Use common code for layout_image_setup_split_none() too.
zas_
parents:
1169
diff
changeset
|
1775 |
|
1168
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1776 GtkWidget *layout_image_setup_split_hv(LayoutWindow *lw, gboolean horizontal) |
|
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1777 { |
|
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1778 GtkWidget *paned; |
|
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1779 |
|
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1780 lw->split_mode = horizontal ? SPLIT_HOR : SPLIT_VERT; |
|
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1781 |
|
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1782 layout_image_setup_split_common(lw, 2); |
|
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1783 |
|
156
dd6dc0a55d3d
better integration of split image functions into menu
nadvornik
parents:
153
diff
changeset
|
1784 /* horizontal split means vpaned and vice versa */ |
| 127 | 1785 if (horizontal) |
|
512
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1786 paned = gtk_vpaned_new(); |
|
156
dd6dc0a55d3d
better integration of split image functions into menu
nadvornik
parents:
153
diff
changeset
|
1787 else |
|
512
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1788 paned = gtk_hpaned_new(); |
| 127 | 1789 |
|
512
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1790 gtk_paned_pack1(GTK_PANED(paned), lw->split_images[0]->widget, TRUE, TRUE); |
|
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1791 gtk_paned_pack2(GTK_PANED(paned), lw->split_images[1]->widget, TRUE, TRUE); |
| 442 | 1792 |
|
512
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1793 gtk_widget_show(lw->split_images[0]->widget); |
|
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1794 gtk_widget_show(lw->split_images[1]->widget); |
| 442 | 1795 |
| 127 | 1796 lw->split_image_widget = paned; |
| 442 | 1797 |
| 127 | 1798 return lw->split_image_widget; |
| 1799 | |
| 1800 } | |
| 1801 | |
| 1802 GtkWidget *layout_image_setup_split_quad(LayoutWindow *lw) | |
| 1803 { | |
| 1804 GtkWidget *hpaned; | |
| 1805 GtkWidget *vpaned1; | |
| 1806 GtkWidget *vpaned2; | |
| 1807 gint i; | |
| 442 | 1808 |
| 152 | 1809 lw->split_mode = SPLIT_QUAD; |
| 1810 | |
|
1168
0c7534002b0a
layout_image_setup_split_*(): move common code to a new function layout_image_setup_split_common().
zas_
parents:
1055
diff
changeset
|
1811 layout_image_setup_split_common(lw, 4); |
| 127 | 1812 |
|
512
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1813 hpaned = gtk_hpaned_new(); |
|
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1814 vpaned1 = gtk_vpaned_new(); |
|
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1815 vpaned2 = gtk_vpaned_new(); |
| 127 | 1816 |
|
512
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1817 gtk_paned_pack1(GTK_PANED(vpaned1), lw->split_images[0]->widget, TRUE, TRUE); |
|
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1818 gtk_paned_pack2(GTK_PANED(vpaned1), lw->split_images[2]->widget, TRUE, TRUE); |
| 127 | 1819 |
|
512
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1820 gtk_paned_pack1(GTK_PANED(vpaned2), lw->split_images[1]->widget, TRUE, TRUE); |
|
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1821 gtk_paned_pack2(GTK_PANED(vpaned2), lw->split_images[3]->widget, TRUE, TRUE); |
| 127 | 1822 |
|
512
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1823 gtk_paned_pack1(GTK_PANED(hpaned), vpaned1, TRUE, TRUE); |
|
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1824 gtk_paned_pack2(GTK_PANED(hpaned), vpaned2, TRUE, TRUE); |
| 127 | 1825 |
| 520 | 1826 for (i = 0; i < 4; i++) |
|
512
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1827 gtk_widget_show(lw->split_images[i]->widget); |
|
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1828 |
|
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1829 gtk_widget_show(vpaned1); |
|
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1830 gtk_widget_show(vpaned2); |
| 442 | 1831 |
| 127 | 1832 lw->split_image_widget = hpaned; |
| 442 | 1833 |
| 127 | 1834 return lw->split_image_widget; |
| 1835 | |
| 1836 } | |
| 1837 | |
| 1838 GtkWidget *layout_image_setup_split(LayoutWindow *lw, ImageSplitMode mode) | |
| 1839 { | |
| 1840 switch (mode) | |
| 1841 { | |
| 442 | 1842 case SPLIT_HOR: |
| 127 | 1843 return layout_image_setup_split_hv(lw, TRUE); |
| 1844 case SPLIT_VERT: | |
| 1845 return layout_image_setup_split_hv(lw, FALSE); | |
| 1846 case SPLIT_QUAD: | |
| 1847 return layout_image_setup_split_quad(lw); | |
| 1848 case SPLIT_NONE: | |
| 1849 default: | |
| 1850 return layout_image_setup_split_none(lw); | |
| 1851 } | |
| 1852 } | |
| 1853 | |
| 1854 | |
| 9 | 1855 /* |
| 1856 *----------------------------------------------------------------------------- | |
| 1857 * maintenance (for rename, move, remove) | |
| 1858 *----------------------------------------------------------------------------- | |
| 1859 */ | |
| 1860 | |
| 796 | 1861 static void layout_image_maint_renamed(LayoutWindow *lw, FileData *fd) |
| 9 | 1862 { |
| 1171 | 1863 if (fd == layout_image_get_fd(lw)) |
| 9 | 1864 { |
| 138 | 1865 image_set_fd(lw->image, fd); |
| 9 | 1866 } |
| 1867 } | |
| 1868 | |
| 796 | 1869 static void layout_image_maint_removed(LayoutWindow *lw, FileData *fd) |
| 9 | 1870 { |
| 1171 | 1871 if (fd == layout_image_get_fd(lw)) |
| 9 | 1872 { |
| 1873 CollectionData *cd; | |
| 1874 CollectInfo *info; | |
| 1875 | |
| 1876 cd = image_get_collection(lw->image, &info); | |
| 1877 if (cd && info) | |
| 1878 { | |
| 1879 CollectInfo *new; | |
| 1880 | |
| 1881 new = collection_next_by_info(cd, info); | |
| 1882 if (!new) new = collection_prev_by_info(cd, info); | |
| 1883 | |
| 1884 if (new) | |
| 1885 { | |
| 1886 layout_image_set_collection(lw, cd, new); | |
| 1887 return; | |
| 1888 } | |
| 1889 } | |
| 1890 | |
| 138 | 1891 layout_image_set_fd(lw, NULL); |
| 9 | 1892 } |
| 1893 } | |
| 1894 | |
| 796 | 1895 |
| 1896 void layout_image_notify_cb(FileData *fd, NotifyType type, gpointer data) | |
| 9 | 1897 { |
| 796 | 1898 LayoutWindow *lw = data; |
| 1899 | |
| 1432 | 1900 if (!(type & NOTIFY_CHANGE) || !fd->change) return; |
| 1498 | 1901 |
| 1902 DEBUG_1("Notify layout_image: %s %04x", fd->path, type); | |
| 796 | 1903 |
|
1347
79937bc55f3a
Add missing space between switch and first parenthesis.
zas_
parents:
1336
diff
changeset
|
1904 switch (fd->change->type) |
| 796 | 1905 { |
| 1906 case FILEDATA_CHANGE_MOVE: | |
| 1907 case FILEDATA_CHANGE_RENAME: | |
| 1908 layout_image_maint_renamed(lw, fd); | |
| 1909 break; | |
| 1910 case FILEDATA_CHANGE_DELETE: | |
| 1911 layout_image_maint_removed(lw, fd); | |
| 1912 break; | |
| 1913 case FILEDATA_CHANGE_COPY: | |
| 1914 case FILEDATA_CHANGE_UNSPECIFIED: | |
| 1211 | 1915 case FILEDATA_CHANGE_WRITE_METADATA: |
| 796 | 1916 break; |
| 1917 } | |
| 1918 | |
| 9 | 1919 } |
|
1055
1646720364cf
Adding a vim modeline to all files - patch by Klaus Ethgen
nadvornik
parents:
1047
diff
changeset
|
1920 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */ |
