[gthumb] save and restore the filterbar status

[Paolo Bacchilega <paobac src gnome org>]

commit bf2367e3cf2345a901b8a0a67f672a96c599b0f1
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Wed May 9 17:19:00 2012 +0200

    save and restore the filterbar status
    
    [new feature]

 gthumb/gth-browser.c   |    9 +++-
 gthumb/gth-filterbar.c |  114 +++++++++++++++++++++++++++++++++++++++++++++++-
 gthumb/gth-filterbar.h |   10 +++-
 3 files changed, 127 insertions(+), 6 deletions(-)
---
diff --git a/gthumb/gth-browser.c b/gthumb/gth-browser.c
index 2f1597b..576334e 100644
--- a/gthumb/gth-browser.c
+++ b/gthumb/gth-browser.c
@@ -2102,13 +2102,13 @@ _gth_browser_close_final_step (gpointer user_data)
 
 	last_window = g_list_length (gtk_application_get_windows (gtk_window_get_application (GTK_WINDOW (browser)))) == 1;
 
-	/* Save visualization options only if the window is not maximized. */
-
 	if (gtk_widget_get_realized (GTK_WIDGET (browser))) {
 		GdkWindowState state;
 		gboolean       maximized;
 		GtkAllocation  allocation;
 
+		/* Save visualization options only if the window is not maximized. */
+
 		state = gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (browser)));
 		maximized = (state & GDK_WINDOW_STATE_MAXIMIZED) != 0;
 		if (! maximized && gtk_widget_get_visible (GTK_WIDGET (browser))) {
@@ -2140,6 +2140,10 @@ _gth_browser_close_final_step (gpointer user_data)
 		gtk_widget_get_allocation (browser->priv->viewer_sidebar_alignment, &allocation);
 		if (allocation.width > MIN_SIDEBAR_SIZE)
 			g_settings_set_int (browser->priv->browser_settings, PREF_BROWSER_VIEWER_SIDEBAR_WIDTH, allocation.width);
+
+		/* Save the current filter */
+
+		gth_filterbar_save_filter (GTH_FILTERBAR (browser->priv->filterbar), "active_filter.xml");
 	}
 
 	/**/
@@ -4529,6 +4533,7 @@ gth_browser_init (GthBrowser *browser)
 
 	general_filter = g_settings_get_string (browser->priv->browser_settings, PREF_BROWSER_GENERAL_FILTER);
 	browser->priv->filterbar = gth_filterbar_new (general_filter);
+	gth_filterbar_load_filter (GTH_FILTERBAR (browser->priv->filterbar), "active_filter.xml");
 	g_free (general_filter);
 
 	gth_browser_show_filterbar (browser, g_settings_get_boolean (browser->priv->browser_settings, PREF_BROWSER_FILTERBAR_VISIBLE));
diff --git a/gthumb/gth-filterbar.c b/gthumb/gth-filterbar.c
index ba88f72..e7297d9 100644
--- a/gthumb/gth-filterbar.c
+++ b/gthumb/gth-filterbar.c
@@ -25,9 +25,11 @@
 #include <time.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#include "dom.h"
 #include "glib-utils.h"
 #include "gth-filterbar.h"
 #include "gth-main.h"
+#include "gth-user-dir.h"
 
 enum {
 	ITEM_TYPE_NONE,
@@ -281,7 +283,7 @@ update_filter_list (GthFilterbar *filterbar,
 		gtk_list_store_set (filterbar->priv->model, &iter,
 				    TYPE_COLUMN, ITEM_TYPE_FILTER,
 				    FILTER_COLUMN, test,
-				    NAME_COLUMN, gth_test_get_display_name(test),
+				    NAME_COLUMN, gth_test_get_display_name (test),
 				    -1);
 
 		if (g_strcmp0 (current_filter, gth_test_get_id (test)) == 0) {
@@ -450,3 +452,113 @@ gth_filterbar_get_test (GthFilterbar *filterbar)
 	else
 		return NULL;
 }
+
+
+void
+gth_filterbar_save_filter (GthFilterbar *filterbar,
+			   const char   *filename)
+{
+	char  *filter_description;
+	gsize  len;
+	GFile *filter_file;
+
+	if (filterbar->priv->test != NULL) {
+		DomDocument *doc;
+
+		doc = dom_document_new ();
+		dom_element_append_child (DOM_ELEMENT (doc), dom_domizable_create_element (DOM_DOMIZABLE (filterbar->priv->test), doc));
+		filter_description = dom_document_dump (doc, &len);
+
+		g_object_unref (doc);
+	}
+	else {
+		filter_description = g_strdup ("");
+		len = 0;
+	}
+	filter_file = gth_user_dir_get_file_for_write (GTH_DIR_CONFIG, GTHUMB_DIR, filename, NULL);
+	_g_file_write (filter_file, FALSE, 0, filter_description, len, NULL, NULL);
+
+	g_object_unref (filter_file);
+	g_free (filter_description);
+}
+
+
+static gboolean
+find_test_by_id (GthFilterbar  *filterbar,
+		 const char    *id,
+		 GthTest      **test,
+		 GtkTreeIter   *iter)
+{
+	g_return_val_if_fail (test != NULL, FALSE);
+	g_return_val_if_fail (iter != NULL, FALSE);
+
+	if (! gtk_tree_model_get_iter_first(GTK_TREE_MODEL (filterbar->priv->model), iter))
+		return FALSE;
+
+	do {
+		int item_type = ITEM_TYPE_NONE;
+
+		gtk_tree_model_get (GTK_TREE_MODEL (filterbar->priv->model),
+				    iter,
+				    TYPE_COLUMN, &item_type,
+				    FILTER_COLUMN, test,
+				    -1);
+
+		if ((item_type == ITEM_TYPE_FILTER) && (*test != NULL) && (g_strcmp0 (gth_test_get_id (*test), id) == 0))
+			return TRUE;
+	}
+	while (gtk_tree_model_iter_next (GTK_TREE_MODEL (filterbar->priv->model), iter));
+
+	return FALSE;
+}
+
+
+void
+gth_filterbar_load_filter (GthFilterbar *filterbar,
+			   const char   *filename)
+{
+	GFile       *filter_file;
+	char        *buffer;
+	gsize        len;
+	DomDocument *doc;
+
+	filter_file = gth_user_dir_get_file_for_write (GTH_DIR_CONFIG, GTHUMB_DIR, filename, NULL);
+	if (! _g_file_load_in_buffer (filter_file, (void **) &buffer, &len, NULL, NULL)) {
+		g_object_unref (filter_file);
+		return;
+	}
+
+	doc = dom_document_new ();
+	if (dom_document_load (doc, buffer, len, NULL)) {
+		DomElement *node = DOM_ELEMENT (doc)->first_child;
+
+		if (node != NULL) {
+			GthTest     *test;
+			GtkTreeIter  iter;
+
+			if (find_test_by_id (filterbar,
+					     dom_element_get_attribute (node, "id"),
+					     &test,
+					     &iter))
+			{
+				dom_domizable_load_from_element (DOM_DOMIZABLE (test), node);
+
+				g_signal_handlers_block_by_func (filterbar->priv->test_combo_box, test_combo_box_changed_cb, filterbar);
+				gtk_combo_box_set_active_iter (GTK_COMBO_BOX (filterbar->priv->test_combo_box), &iter);
+				g_signal_handlers_unblock_by_func (filterbar->priv->test_combo_box, test_combo_box_changed_cb, filterbar);
+
+				filterbar->priv->current_iter = iter;
+				_gth_filterbar_set_test (GTH_FILTERBAR (filterbar), test);
+
+				g_signal_connect (test,
+						  "changed",
+						  G_CALLBACK (test_changed_cb),
+						  filterbar);
+			}
+		}
+	}
+
+	g_object_unref (doc);
+	g_free (buffer);
+	g_object_unref (filter_file);
+}
diff --git a/gthumb/gth-filterbar.h b/gthumb/gth-filterbar.h
index 5179f55..3b9ac3b 100644
--- a/gthumb/gth-filterbar.h
+++ b/gthumb/gth-filterbar.h
@@ -55,9 +55,13 @@ struct _GthFilterbarClass
 	void (* close_button_clicked) (GthFilterbar *filterbar);
 };
 
-GType         gth_filterbar_get_type   (void) G_GNUC_CONST;
-GtkWidget *   gth_filterbar_new        (const char   *selected_filter);
-GthTest *     gth_filterbar_get_test   (GthFilterbar *filterbar);
+GType         gth_filterbar_get_type    (void) G_GNUC_CONST;
+GtkWidget *   gth_filterbar_new         (const char   *selected_filter);
+GthTest *     gth_filterbar_get_test    (GthFilterbar *filterbar);
+void          gth_filterbar_save_filter (GthFilterbar *filterbar,
+					 const char   *filename);
+void          gth_filterbar_load_filter (GthFilterbar *filterbar,
+					 const char   *filename);
 
 G_END_DECLS