0.9.4claws13

* src/prefs_spelling.c
* src/gtk/prefswindow.[ch]
* src/plugins/clamav/clamav_plugin_gtk.c
* src/plugins/spamassassin/spamassassin_gtk.c
        sort prefs pages by heighest weight in tree

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 424f356fff94a7b6af9e9f9952fd319263b78c5f..7d70069edc052711b05c03a9a5b609517e31fb5a 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2003-08-09 [christoph] 0.9.4claws13
+
+       * src/prefs_spelling.c
+       * src/gtk/prefswindow.[ch]
+       * src/plugins/clamav/clamav_plugin_gtk.c
+       * src/plugins/spamassassin/spamassassin_gtk.c
+               sort prefs pages by heighest weight in tree
+
 2003-08-09 [paul]      0.9.4claws12
 
        * sync with 0.9.4cvs6

diff --git a/configure.ac b/configure.ac
index bd3badaaa5bdb033c43d1dd7b6a555aadad9b4f7..b87895cd684523850578ee1394b6f1577d44acdc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=12
+EXTRA_VERSION=13
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
index 4fb459a0b25105ff3214ca0f17582a0124950c30..8dd8f9a379d032064d6eb1ece119fb1dc6bcd3cb 100644 (file)
--- a/src/gtk/prefswindow.c
+++ b/src/gtk/prefswindow.c
@@ -30,6 +30,7 @@
 #include "gtkutils.h"
 
 typedef struct _PrefsWindow PrefsWindow;
+typedef struct _PrefsTreeNode PrefsTreeNode;
 
 struct _PrefsWindow
 {
@@ -53,14 +54,24 @@ struct _PrefsWindow
        GSList    *prefs_pages;
 };
 
+struct _PrefsTreeNode
+{
+       PrefsPage *page;
+       gfloat     treeweight;
+};
+
 static gboolean ctree_select_row(GtkCTree *ctree, GList *node, gint column, gpointer user_data)
 {
+       PrefsTreeNode *prefsnode;
        PrefsPage *page;
        PrefsWindow *prefswindow = (PrefsWindow *) user_data;
        gchar *labeltext;
        gint pagenum;
 
-       page = (PrefsPage *) gtk_ctree_node_get_row_data(GTK_CTREE(ctree), GTK_CTREE_NODE(node));
+       prefsnode = gtk_ctree_node_get_row_data(GTK_CTREE(ctree), GTK_CTREE_NODE(node));
+       page = prefsnode->page;
+
+       debug_print("%f\n", prefsnode->treeweight);
 
        if (page == NULL) {
                gtk_label_set_text(GTK_LABEL(prefswindow->pagelabel), "");
@@ -181,6 +192,19 @@ static gboolean find_child_by_name(GtkCTree *ctree, GtkCTreeNode *node, struct n
        return FALSE;
 }
 
+gint compare_func(GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
+{
+       PrefsTreeNode *prefsnode1 = ((GtkCListRow *)ptr1)->data;;
+       PrefsTreeNode *prefsnode2 = ((GtkCListRow *)ptr2)->data;;
+
+       if (prefsnode1 == NULL || prefsnode2 == NULL)
+               return 0;
+
+       return prefsnode1->treeweight > prefsnode2->treeweight ? -1 : 
+              prefsnode1->treeweight < prefsnode2->treeweight ?  1 : 
+                                                                 0;
+}
+
 void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data)
 {
        static gchar *titles [1];
@@ -245,6 +269,7 @@ void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data)
                gchar *text[2], **split, *part;
                int i;
                struct name_search name_search;
+               PrefsTreeNode *prefsnode;
 
                split = g_strsplit(page->path, "/", 0);
                for (i = 0; split[i] != NULL; i++) {
@@ -259,10 +284,23 @@ void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data)
                        } else {
                                text[0] = part;
                                node = gtk_ctree_insert_node(GTK_CTREE(prefswindow->ctree), node, NULL, text, 0, NULL, NULL, NULL, NULL, FALSE, TRUE);
+
+                               prefsnode = g_new0(PrefsTreeNode, 1);
+                               prefsnode->treeweight = 0.0;
+                               gtk_ctree_node_set_row_data_full(GTK_CTREE(prefswindow->ctree), node, prefsnode, g_free);
                        }
                }
                g_strfreev(split);
-               gtk_ctree_node_set_row_data(GTK_CTREE(prefswindow->ctree), node, page);
+
+               prefsnode = (PrefsTreeNode *) GTK_CTREE_ROW(node)->row.data;
+               prefsnode->page = page;
+
+               for (; node != NULL; node = GTK_CTREE_ROW(node)->parent) {
+                       PrefsTreeNode *curnode = (PrefsTreeNode *) GTK_CTREE_ROW(node)->row.data;
+
+                       if (page->weight > curnode->treeweight)
+                               curnode->treeweight = page->weight;
+               }
        }
        gtk_signal_connect(GTK_OBJECT(prefswindow->ctree), "tree-select-row", GTK_SIGNAL_FUNC(ctree_select_row), prefswindow);
 
@@ -274,6 +312,8 @@ void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data)
        gtk_clist_set_column_width(GTK_CLIST(prefswindow->ctree), 0, optsize);
        gtk_clist_set_column_min_width(GTK_CLIST(prefswindow->ctree), 0, optsize);
        gtk_clist_set_column_max_width(GTK_CLIST(prefswindow->ctree), 0, optsize);
+       gtk_clist_set_compare_func(GTK_CLIST(prefswindow->ctree), compare_func);
+       gtk_ctree_sort_recursive(GTK_CTREE(prefswindow->ctree), NULL);
 
        gtkut_button_set_create(&prefswindow->confirm_area,
                                &prefswindow->ok_btn,           _("OK"),

diff --git a/src/gtk/prefswindow.h b/src/gtk/prefswindow.h
index bfe4668a9147053164540ba15052fd4edf7f1b75..f3b8133724d585e79d2dd5b3100d69534f4b14d9 100644 (file)
--- a/src/gtk/prefswindow.h
+++ b/src/gtk/prefswindow.h
@@ -34,6 +34,7 @@ struct _PrefsPage
        gchar                   *path;
        gboolean                 page_open;
        GtkWidget               *widget;
+       gfloat                   weight;
 
        PrefsCreateWidgetFunc    create_widget;
        PrefsDestroyWidgetFunc   destroy_widget;

diff --git a/src/plugins/clamav/clamav_plugin_gtk.c b/src/plugins/clamav/clamav_plugin_gtk.c
index fbe8eddfab6f5ec36aaf9064be92afd6b22784a6..3f5522dddfd2f471e6f6499d3d6e127d067ea648 100644 (file)
--- a/src/plugins/clamav/clamav_plugin_gtk.c
+++ b/src/plugins/clamav/clamav_plugin_gtk.c
@@ -243,6 +243,7 @@ gint plugin_init(gchar **error)
        clamav_page.page.create_widget = clamav_create_widget_func;
        clamav_page.page.destroy_widget = clamav_destroy_widget_func;
        clamav_page.page.save_page = clamav_save_func;
+       clamav_page.page.weight = 35.0;
        
        prefs_gtk_register_page((PrefsPage *) &clamav_page);
 

diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index 3dd5d648551f386eb5ad32e2a0403b7176fa417d..654e240ff21c3189de35cc69b964f6b70c6944ad 100644 (file)
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -295,6 +295,7 @@ gint plugin_init(gchar **error)
        spamassassin_page.page.create_widget = spamassassin_create_widget_func;
        spamassassin_page.page.destroy_widget = spamassassin_destroy_widget_func;
        spamassassin_page.page.save_page = spamassassin_save_func;
+       spamassassin_page.page.weight = 35.0;
 
        prefs_gtk_register_page((PrefsPage *) &spamassassin_page);
 

diff --git a/src/prefs_spelling.c b/src/prefs_spelling.c
index d51870563f9977b6b422ddc98754d7aa9685373a..5d43478b677288ed6b7dd2cb14dc919af6458985 100644 (file)
--- a/src/prefs_spelling.c
+++ b/src/prefs_spelling.c
@@ -380,6 +380,7 @@ void prefs_spelling_init(void)
        page->page.create_widget = prefs_spelling_create_widget;
        page->page.destroy_widget = prefs_spelling_destroy_widget;
        page->page.save_page = prefs_spelling_save;
+       page->page.weight = 50.0;
        prefs_gtk_register_page((PrefsPage *) page);
        prefs_spelling = page;
 }