Remember keywords layout

Save and restore expanded keywords rows

diff --git a/src/bar_keywords.c b/src/bar_keywords.c
index ffe486a..febed42 100644 (file)
--- a/src/bar_keywords.c
+++ b/src/bar_keywords.c
@@ -247,9 +247,39 @@ void bar_pane_keywords_set_fd(GtkWidget *pane, FileData *fd)
        bar_pane_keywords_update(pkd);
 }
 
+void bar_keyword_tree_get_expanded_cb(GtkTreeView *keyword_treeview, GtkTreePath *path,  gpointer data)
+{
+       GList **expanded = data;
+       GtkTreeModel *model;
+       GtkTreeIter iter;
+       gchar *path_string;
+
+       model = gtk_tree_view_get_model(GTK_TREE_VIEW(keyword_treeview));
+       gtk_tree_model_get_iter(model, &iter, path);
+
+       path_string = gtk_tree_model_get_string_from_iter(model, &iter);
+
+       *expanded = g_list_append(*expanded, g_strdup(path_string));
+       g_free(path_string);
+}
+
+static void bar_pane_keywords_entry_write_config(gchar *entry, GString *outstr, gint indent)
+{
+       struct {
+               gchar *path;
+       } expand;
+
+       expand.path = entry;
+
+       WRITE_NL(); WRITE_STRING("<expanded ");
+       WRITE_CHAR(expand, path);
+       WRITE_STRING("/>");
+}
+
 static void bar_pane_keywords_write_config(GtkWidget *pane, GString *outstr, gint indent)
 {
        PaneKeywordsData *pkd;
+       GList *path_expanded = NULL;
 
        pkd = g_object_get_data(G_OBJECT(pane), "pane_data");
        if (!pkd) return;
@@ -262,7 +292,24 @@ static void bar_pane_keywords_write_config(GtkWidget *pane, GString *outstr, gin
        WRITE_BOOL(pkd->pane, expanded);
        WRITE_CHAR(*pkd, key);
        WRITE_INT(*pkd, height);
-       WRITE_STRING("/>");
+       WRITE_STRING(">");
+       indent++;
+
+       gtk_tree_view_map_expanded_rows(GTK_TREE_VIEW(pkd->keyword_treeview),
+                                                               (bar_keyword_tree_get_expanded_cb), &path_expanded);
+
+       g_list_first(path_expanded);
+       while (path_expanded)
+               {
+               bar_pane_keywords_entry_write_config(path_expanded->data, outstr, indent);
+               g_free(path_expanded->data);
+               path_expanded = path_expanded->next;
+               }
+       g_list_free(path_expanded);
+
+       indent--;
+       WRITE_NL();
+       WRITE_STRING("</pane_keywords>");
 }
 
 gint bar_pane_keywords_event(GtkWidget *bar, GdkEvent *event)
@@ -1494,4 +1541,27 @@ void bar_pane_keywords_update_from_config(GtkWidget *pane, const gchar **attribu
 }
 
 
+void bar_pane_keywords_entry_add_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values)
+{
+       PaneKeywordsData *pkd;
+       gchar *path = NULL;
+       GtkTreePath *tree_path;
+
+       pkd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       if (!pkd) return;
+
+       while (*attribute_names)
+               {
+               const gchar *option = *attribute_names++;
+               const gchar *value = *attribute_values++;
+
+               if (READ_CHAR_FULL("path", path))
+                       {
+                       tree_path = gtk_tree_path_new_from_string(path);
+                       gtk_tree_view_expand_to_path(GTK_TREE_VIEW(pkd->keyword_treeview), tree_path);
+                       continue;
+                       }
+               log_printf("unknown attribute %s = %s\n", option, value);
+               }
+}
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */

diff --git a/src/bar_keywords.h b/src/bar_keywords.h
index 149ddbc..1c2583f 100644 (file)
--- a/src/bar_keywords.h
+++ b/src/bar_keywords.h
@@ -24,7 +24,7 @@
 
 GtkWidget *bar_pane_keywords_new_from_config(const gchar **attribute_names, const gchar **attribute_values);
 void bar_pane_keywords_update_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values);
-
+void bar_pane_keywords_entry_add_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values);
 /* used in search.c */
 GList *keyword_list_pull(GtkWidget *text_widget);
 

diff --git a/src/rcfile.c b/src/rcfile.c
index 3fc9c59..52aa2b9 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -948,6 +948,22 @@ static void options_parse_pane_exif(GQParserData *parser_data, GMarkupParseConte
                }
 }
 
+static void options_parse_pane_keywords(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
+{
+       GtkWidget *pane = data;
+
+       if (g_ascii_strcasecmp(element_name, "expanded") == 0)
+               {
+               bar_pane_keywords_entry_add_from_config(pane, attribute_names, attribute_values);
+               options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+               }
+       else
+               {
+               log_printf("unexpected in <pane_keywords>: <%s>\n", element_name);
+               options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+               }
+}
+
 static void options_parse_bar(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
 {
        GtkWidget *bar = data;
@@ -1023,7 +1039,7 @@ static void options_parse_bar(GQParserData *parser_data, GMarkupParseContext *co
                        pane = bar_pane_keywords_new_from_config(attribute_names, attribute_values);
                        bar_add(bar, pane);
                        }
-               options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+               options_parse_func_push(parser_data, options_parse_pane_keywords, NULL, pane);
                }
        else if (g_ascii_strcasecmp(element_name, "clear") == 0)
                {