Mercurial > geeqie

diff 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
line wrap: on
line diff
--- a/src/rcfile.c	Sat Feb 28 12:50:39 2009 +0000
+++ b/src/rcfile.c	Sat Feb 28 14:40:22 2009 +0000
@@ -370,22 +370,18 @@
 	WRITE_BOOL(*options, fullscreen.disable_saver);
 	WRITE_BOOL(*options, fullscreen.above);
 
+	WRITE_SEPARATOR();
 
 //	WRITE_SUBTITLE("Image Overlay Options");
-	WRITE_UINT(*options, image_overlay.common.state);
-	WRITE_BOOL(*options, image_overlay.common.show_at_startup);
-	WRITE_CHAR(*options, image_overlay.common.template_string);
-	WRITE_INT(*options, image_overlay.common.histogram_channel);
-	WRITE_INT(*options, image_overlay.common.histogram_mode);
-	WRITE_SEPARATOR();
+	WRITE_CHAR(*options, image_overlay.template_string);
 
 //	g_string_append_printf(outstr, "# these are relative positions:\n");
 //	g_string_append_printf(outstr, "# x >= 0: |x| pixels from left border\n");
 //	g_string_append_printf(outstr, "# x < 0 : |x| pixels from right border\n");
 //	g_string_append_printf(outstr, "# y >= 0: |y| pixels from top border\n");
 //	g_string_append_printf(outstr, "# y < 0 : |y| pixels from bottom border\n");
-	WRITE_INT(*options, image_overlay.common.x);
-	WRITE_INT(*options, image_overlay.common.y);
+	WRITE_INT(*options, image_overlay.x);
+	WRITE_INT(*options, image_overlay.y);
 
 
 //	WRITE_SUBTITLE("Slideshow Options");
@@ -672,14 +668,9 @@
 		if (READ_BOOL(*options, fullscreen.above)) continue;
 
 		/* image overlay */
-		if (READ_UINT(*options, image_overlay.common.state)) continue;
-		if (READ_BOOL(*options, image_overlay.common.show_at_startup)) continue;
-		if (READ_CHAR(*options, image_overlay.common.template_string)) continue;
-		if (READ_INT(*options, image_overlay.common.histogram_channel)) continue;
-		if (READ_INT(*options, image_overlay.common.histogram_mode)) continue;
-
-		if (READ_INT(*options, image_overlay.common.x)) continue;
-		if (READ_INT(*options, image_overlay.common.y)) continue;
+		if (READ_CHAR(*options, image_overlay.template_string)) continue;
+		if (READ_INT(*options, image_overlay.x)) continue;
+		if (READ_INT(*options, image_overlay.y)) continue;
 
 
 		/* slideshow options */