diff src/rcfile.c @ 1436:d7a6fb7a90dd

completely separated global and layout window options layout window configuration is available under separate menu entry

--- a/src/rcfile.c	Sat Mar 14 21:12:55 2009 +0000
+++ b/src/rcfile.c	Sat Mar 14 23:26:42 2009 +0000
@@ -285,6 +285,8 @@
 	WRITE_INT(*options, dnd_icon_size);
 	WRITE_BOOL(*options, place_dialogs_under_mouse);
 
+	WRITE_BOOL(*options, save_window_positions);
+	WRITE_BOOL(*options, tools_restore_state);
 
 //	WRITE_SUBTITLE("Startup Options");
 
@@ -534,10 +536,6 @@
 	filter_write_list(outstr, indent);
 
 	WRITE_SEPARATOR();
-	WRITE_SUBTITLE("Layout Options - defaults");
-	WRITE_STRING("<layout\n");
-	layout_write_attributes(&options->layout, outstr, indent + 1);
-	WRITE_STRING("/>\n");
 	keyword_tree_write_config(outstr, indent);
 	indent--;
 	WRITE_STRING("</global>\n");
@@ -602,6 +600,9 @@
 		if (READ_INT(*options, dnd_icon_size)) continue;
 		if (READ_BOOL(*options, place_dialogs_under_mouse)) continue;
 
+		if (READ_BOOL(*options, save_window_positions)) continue;
+		if (READ_BOOL(*options, tools_restore_state)) continue;
+
 		/* startup options */
 		
 		if (READ_BOOL(*options, startup.restore_path)) continue;
@@ -877,11 +878,6 @@
 		if (!keyword_tree) keyword_tree_new();
 		options_parse_func_push(parser_data, options_parse_keyword_tree, NULL, NULL);
 		}
-	else if (g_ascii_strcasecmp(element_name, "layout") == 0)
-		{
-		layout_load_attributes(&options->layout, attribute_names, attribute_values);
-		options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
-		}
 	else
 		{
 		DEBUG_1("unexpected global: %s", element_name);