diff src/layout.c @ 1320:055ed09d5a03

improved bar_sort configuration

--- a/src/layout.c	Tue Feb 24 21:08:16 2009 +0000
+++ b/src/layout.c	Tue Feb 24 22:21:28 2009 +0000
@@ -35,6 +35,7 @@
 #include "metadata.h"
 #include "rcfile.h"
 #include "bar.h"
+#include "bar_sort.h"
 
 #ifdef HAVE_LIRC
 #include "lirc.h"
@@ -2157,12 +2158,6 @@
 	WRITE_SEPARATOR();
 
 	WRITE_BOOL(*layout, toolbar_hidden);
-
-	WRITE_BOOL(*layout, panels.sort.enabled);
-	WRITE_INT(*layout, panels.sort.action_state);
-	WRITE_INT(*layout, panels.sort.mode_state);
-	WRITE_INT(*layout, panels.sort.selection_state);
-	WRITE_CHAR(*layout, panels.sort.action_filter);
 }
 
 
@@ -2173,6 +2168,7 @@
 	layout_write_attributes(&lw->options, outstr, indent + 1);
 	WRITE_STRING(">\n");
 
+	bar_sort_write_config(lw->bar_sort, outstr, indent + 1);
 	bar_write_config(lw->bar, outstr, indent + 1);
 	
 	WRITE_STRING("</layout>\n");
@@ -2224,14 +2220,6 @@
 		if (READ_BOOL(*layout, tools_restore_state)) continue;
 		if (READ_BOOL(*layout, toolbar_hidden)) continue;
 
-		/* panels */
-		if (READ_BOOL(*layout, panels.sort.enabled)) continue;
-		if (READ_INT(*layout, panels.sort.action_state)) continue;
-		if (READ_INT(*layout, panels.sort.mode_state)) continue;
-		if (READ_INT(*layout, panels.sort.selection_state)) continue;
-		if (READ_CHAR(*layout, panels.sort.action_filter)) continue;
-
-
 		DEBUG_1("unknown attribute %s = %s", option, value);
 		}