Mercurial > geeqie

comparison src/rcfile.c @ 1336:4179d41d1149

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed overlay configuration split overlay options between global and layout window
author nadvornik
date Sat, 28 Feb 2009 14:40:22 +0000
parents 588d96cda850
children c9949c19a6d0
comparison
equal deleted inserted replaced
1335:588d96cda850 1336:4179d41d1149
368 WRITE_INT(*options, fullscreen.screen); 368 WRITE_INT(*options, fullscreen.screen);
369 WRITE_BOOL(*options, fullscreen.clean_flip); 369 WRITE_BOOL(*options, fullscreen.clean_flip);
370 WRITE_BOOL(*options, fullscreen.disable_saver); 370 WRITE_BOOL(*options, fullscreen.disable_saver);
371 WRITE_BOOL(*options, fullscreen.above); 371 WRITE_BOOL(*options, fullscreen.above);
372 372
373 WRITE_SEPARATOR();
373 374
374 // WRITE_SUBTITLE("Image Overlay Options"); 375 // WRITE_SUBTITLE("Image Overlay Options");
375 WRITE_UINT(*options, image_overlay.common.state); 376 WRITE_CHAR(*options, image_overlay.template_string);
376 WRITE_BOOL(*options, image_overlay.common.show_at_startup);
377 WRITE_CHAR(*options, image_overlay.common.template_string);
378 WRITE_INT(*options, image_overlay.common.histogram_channel);
379 WRITE_INT(*options, image_overlay.common.histogram_mode);
380 WRITE_SEPARATOR();
381 377
382 // g_string_append_printf(outstr, "# these are relative positions:\n"); 378 // g_string_append_printf(outstr, "# these are relative positions:\n");
383 // g_string_append_printf(outstr, "# x >= 0: |x| pixels from left border\n"); 379 // g_string_append_printf(outstr, "# x >= 0: |x| pixels from left border\n");
384 // g_string_append_printf(outstr, "# x < 0 : |x| pixels from right border\n"); 380 // g_string_append_printf(outstr, "# x < 0 : |x| pixels from right border\n");
385 // g_string_append_printf(outstr, "# y >= 0: |y| pixels from top border\n"); 381 // g_string_append_printf(outstr, "# y >= 0: |y| pixels from top border\n");
386 // g_string_append_printf(outstr, "# y < 0 : |y| pixels from bottom border\n"); 382 // g_string_append_printf(outstr, "# y < 0 : |y| pixels from bottom border\n");
387 WRITE_INT(*options, image_overlay.common.x); 383 WRITE_INT(*options, image_overlay.x);
388 WRITE_INT(*options, image_overlay.common.y); 384 WRITE_INT(*options, image_overlay.y);
389 385
390 386
391 // WRITE_SUBTITLE("Slideshow Options"); 387 // WRITE_SUBTITLE("Slideshow Options");
392 388
393 WRITE_INT_UNIT(*options, slideshow.delay, SLIDESHOW_SUBSECOND_PRECISION); 389 WRITE_INT_UNIT(*options, slideshow.delay, SLIDESHOW_SUBSECOND_PRECISION);
670 if (READ_BOOL(*options, fullscreen.clean_flip)) continue; 666 if (READ_BOOL(*options, fullscreen.clean_flip)) continue;
671 if (READ_BOOL(*options, fullscreen.disable_saver)) continue; 667 if (READ_BOOL(*options, fullscreen.disable_saver)) continue;
672 if (READ_BOOL(*options, fullscreen.above)) continue; 668 if (READ_BOOL(*options, fullscreen.above)) continue;
673 669
674 /* image overlay */ 670 /* image overlay */
675 if (READ_UINT(*options, image_overlay.common.state)) continue; 671 if (READ_CHAR(*options, image_overlay.template_string)) continue;
676 if (READ_BOOL(*options, image_overlay.common.show_at_startup)) continue; 672 if (READ_INT(*options, image_overlay.x)) continue;
677 if (READ_CHAR(*options, image_overlay.common.template_string)) continue; 673 if (READ_INT(*options, image_overlay.y)) continue;
678 if (READ_INT(*options, image_overlay.common.histogram_channel)) continue;
679 if (READ_INT(*options, image_overlay.common.histogram_mode)) continue;
680
681 if (READ_INT(*options, image_overlay.common.x)) continue;
682 if (READ_INT(*options, image_overlay.common.y)) continue;
683 674
684 675
685 /* slideshow options */ 676 /* slideshow options */
686 if (READ_INT_UNIT(*options, slideshow.delay, SLIDESHOW_SUBSECOND_PRECISION)) continue; 677 if (READ_INT_UNIT(*options, slideshow.delay, SLIDESHOW_SUBSECOND_PRECISION)) continue;
687 if (READ_BOOL(*options, slideshow.random)) continue; 678 if (READ_BOOL(*options, slideshow.random)) continue;