Mercurial > geeqie.yaz
changeset 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 | 8a1202efa51e |
| children | 8b95e1859fee |
| files | src/main.c src/options.c src/options.h src/rcfile.c |
| diffstat | 4 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main.c Mon May 12 00:22:38 2008 +0000 +++ b/src/main.c Mon May 12 08:11:27 2008 +0000 @@ -1206,7 +1206,7 @@ &options->layout.main_window.w, &options->layout.main_window.h); } - options->image_overlay.common.enabled = image_osd_get(lw->image); + options->image_overlay.common.state = image_osd_get(lw->image); } layout_geometry_get_dividers(NULL, &options->layout.main_window.hdivider_pos, &options->layout.main_window.vdivider_pos); @@ -1484,7 +1484,7 @@ } } - image_osd_set(lw->image, options->image_overlay.common.enabled | (options->image_overlay.common.show_at_startup ? OSD_SHOW_INFO : OSD_SHOW_NOTHING)); + image_osd_set(lw->image, options->image_overlay.common.state | (options->image_overlay.common.show_at_startup ? OSD_SHOW_INFO : OSD_SHOW_NOTHING)); g_free(geometry); g_free(cmd_path);
--- a/src/options.c Mon May 12 00:22:38 2008 +0000 +++ b/src/options.c Mon May 12 08:11:27 2008 +0000 @@ -74,7 +74,7 @@ options->image.zoom_quality = (gint)GDK_INTERP_BILINEAR; options->image.zoom_to_fit_allow_expand = TRUE; - options->image_overlay.common.enabled = (guint)OSD_SHOW_NOTHING; + options->image_overlay.common.state = (guint)OSD_SHOW_NOTHING; options->image_overlay.common.show_at_startup = FALSE; options->image_overlay.common.template_string = NULL;
--- a/src/options.h Mon May 12 00:22:38 2008 +0000 +++ b/src/options.h Mon May 12 08:11:27 2008 +0000 @@ -142,7 +142,7 @@ /* image overlay */ struct { struct { - guint enabled; + guint state; gint show_at_startup; gchar *template_string; } common;
--- a/src/rcfile.c Mon May 12 00:22:38 2008 +0000 +++ b/src/rcfile.c Mon May 12 08:11:27 2008 +0000 @@ -452,7 +452,7 @@ WRITE_SUBTITLE("Image Overlay Options"); - WRITE_UINT(image_overlay.common.enabled); + WRITE_UINT(image_overlay.common.state); WRITE_BOOL(image_overlay.common.show_at_startup); WRITE_CHAR(image_overlay.common.template_string); @@ -760,12 +760,13 @@ READ_UINT(histogram.last_log_mode); /* image overlay */ - COMPAT_READ_BOOL(fullscreen.show_info, image_overlay.common.show_at_startup); - COMPAT_READ_CHAR(fullscreen.info, image_overlay.common.template_string); - READ_UINT(image_overlay.common.enabled); + COMPAT_READ_UINT(image_overlay.common.enabled, image_overlay.common.state); /* 2008-05-12 */ + READ_UINT(image_overlay.common.state); + COMPAT_READ_BOOL(fullscreen.show_info, image_overlay.common.show_at_startup); /* 2008-04-21 */ READ_BOOL(image_overlay.common.show_at_startup); + COMPAT_READ_CHAR(fullscreen.info, image_overlay.common.template_string); /* 2008-04-21 */ READ_CHAR(image_overlay.common.template_string); - + /* slideshow options */ READ_INT_UNIT(slideshow.delay, SLIDESHOW_SUBSECOND_PRECISION); READ_BOOL(slideshow.random);