comparison src/rcfile.c @ 638:8cc9f349c670

Rename option image_overlay.common.enabled to image_overlay.common.state since it is not a boolean anymore.
author zas_
date Mon, 12 May 2008 08:11:27 +0000
parents 83d3ded39e49
children 8b95e1859fee
comparison
equal deleted inserted replaced
637:8a1202efa51e 638:8cc9f349c670
450 WRITE_UINT(histogram.last_channel_mode); 450 WRITE_UINT(histogram.last_channel_mode);
451 WRITE_UINT(histogram.last_log_mode); 451 WRITE_UINT(histogram.last_log_mode);
452 452
453 453
454 WRITE_SUBTITLE("Image Overlay Options"); 454 WRITE_SUBTITLE("Image Overlay Options");
455 WRITE_UINT(image_overlay.common.enabled); 455 WRITE_UINT(image_overlay.common.state);
456 WRITE_BOOL(image_overlay.common.show_at_startup); 456 WRITE_BOOL(image_overlay.common.show_at_startup);
457 WRITE_CHAR(image_overlay.common.template_string); 457 WRITE_CHAR(image_overlay.common.template_string);
458 458
459 459
460 WRITE_SUBTITLE("Slideshow Options"); 460 WRITE_SUBTITLE("Slideshow Options");
758 /* histogram */ 758 /* histogram */
759 READ_UINT(histogram.last_channel_mode); 759 READ_UINT(histogram.last_channel_mode);
760 READ_UINT(histogram.last_log_mode); 760 READ_UINT(histogram.last_log_mode);
761 761
762 /* image overlay */ 762 /* image overlay */
763 COMPAT_READ_BOOL(fullscreen.show_info, image_overlay.common.show_at_startup); 763 COMPAT_READ_UINT(image_overlay.common.enabled, image_overlay.common.state); /* 2008-05-12 */
764 COMPAT_READ_CHAR(fullscreen.info, image_overlay.common.template_string); 764 READ_UINT(image_overlay.common.state);
765 READ_UINT(image_overlay.common.enabled); 765 COMPAT_READ_BOOL(fullscreen.show_info, image_overlay.common.show_at_startup); /* 2008-04-21 */
766 READ_BOOL(image_overlay.common.show_at_startup); 766 READ_BOOL(image_overlay.common.show_at_startup);
767 COMPAT_READ_CHAR(fullscreen.info, image_overlay.common.template_string); /* 2008-04-21 */
767 READ_CHAR(image_overlay.common.template_string); 768 READ_CHAR(image_overlay.common.template_string);
768 769
769 /* slideshow options */ 770 /* slideshow options */
770 READ_INT_UNIT(slideshow.delay, SLIDESHOW_SUBSECOND_PRECISION); 771 READ_INT_UNIT(slideshow.delay, SLIDESHOW_SUBSECOND_PRECISION);
771 READ_BOOL(slideshow.random); 772 READ_BOOL(slideshow.random);
772 READ_BOOL(slideshow.repeat); 773 READ_BOOL(slideshow.repeat);
773 774