2008-11-30 [paul] 3.6.1cvs54
[claws.git] / src / gtk / prefswindow.c
index 680b0207a7f3a6abfd5978c35bc024cbb317f2b4..292daedf2f6b2d9b7074f8ffe3e2a06b08350a4e 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <string.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "intl.h"
 #include "utils.h"
 #include "prefswindow.h"
 #include "gtkutils.h"
+#include "prefs_common.h"
+
+enum { 
+       PREFS_PAGE_TITLE,               /* page title */
+       PREFS_PAGE_DATA,                /* PrefsTreeNode data */        
+       PREFS_PAGE_DATA_AUTO_FREE,      /* auto free for PREFS_PAGE_DATA */
+       PREFS_PAGE_WEIGHT,              /* weight */
+       PREFS_PAGE_INDEX,               /* index in original page list */
+       N_PREFS_PAGE_COLUMNS
+};
 
 typedef struct _PrefsWindow PrefsWindow;
 typedef struct _PrefsTreeNode PrefsTreeNode;
@@ -36,84 +47,74 @@ typedef struct _PrefsTreeNode PrefsTreeNode;
 struct _PrefsWindow
 {
        GtkWidget *window;
-       GtkWidget *table1;
+       GtkWidget *vbox;
+       GtkWidget *paned;
        GtkWidget *scrolledwindow1;
-       GtkWidget *ctree;
+       GtkWidget *scrolledwindow2;
+       GtkWidget *tree_view;
        GtkWidget *table2;
        GtkWidget *pagelabel;
        GtkWidget *labelframe;
-       GtkWidget *frame;
+       GtkWidget *vbox2;
        GtkWidget *notebook;
        GtkWidget *confirm_area;
        GtkWidget *ok_btn;
        GtkWidget *cancel_btn;
        GtkWidget *apply_btn;
+       gint *save_width;
+       gint *save_height;
+       PrefsCloseCallbackFunc open_cb;
+       PrefsCloseCallbackFunc close_cb;
 
        GtkWidget *empty_page;
 
        gpointer         data;
        GSList          *prefs_pages;
-       GtkDestroyNotify func;
+       GDestroyNotify func;
 };
 
 struct _PrefsTreeNode
 {
        PrefsPage *page;
-       gfloat     treeweight;
+       gfloat     treeweight; /* GTK2: not used */
 };
 
-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, i;
+static void prefs_size_allocate_cb(GtkWidget *widget,
+                                                        GtkAllocation *allocation, gpointer *user_data);
+static GtkTreeStore *prefswindow_create_data_store     (void);
+static GtkWidget *prefswindow_tree_view_create         (PrefsWindow* prefswindow);
+static void prefs_filtering_create_tree_view_columns   (GtkWidget *tree_view);
+static gboolean prefswindow_row_selected               (GtkTreeSelection *selector,
+                                                        GtkTreeModel *model, 
+                                                        GtkTreePath *path,
+                                                        gboolean currently_selected,
+                                                        gpointer data);
 
-       prefsnode = gtk_ctree_node_get_row_data(GTK_CTREE(ctree), GTK_CTREE_NODE(node));
-       page = prefsnode->page;
-
-       debug_print("%f\n", prefsnode->treeweight);
+static void save_all_pages(GSList *prefs_pages)
+{
+       GSList *cur;
 
-       if (page == NULL) {
-               gtk_label_set_text(GTK_LABEL(prefswindow->pagelabel), "");
-               pagenum = gtk_notebook_page_num(GTK_NOTEBOOK(prefswindow->notebook),
-                                               prefswindow->empty_page);
-               gtk_notebook_set_page(GTK_NOTEBOOK(prefswindow->notebook), pagenum);
-               return FALSE;
-       }
+       for (cur = prefs_pages; cur != NULL; cur = g_slist_next(cur)) {
+               PrefsPage *page = (PrefsPage *) cur->data;
 
-       if (!page->page_open) {
-               page->create_widget(page, GTK_WINDOW(prefswindow->window), prefswindow->data);
-               gtk_container_add(GTK_CONTAINER(prefswindow->notebook), page->widget);
-               page->page_open = TRUE;
+               if (page->page_open) {
+                       page->save_page(page);
+               }
        }
-
-       i = 0;
-       while (page->path[i + 1] != 0)
-               i++;
-       labeltext = page->path[i];
-
-       gtk_label_set_text(GTK_LABEL(prefswindow->pagelabel), labeltext);
-
-       pagenum = gtk_notebook_page_num(GTK_NOTEBOOK(prefswindow->notebook),
-                                       page->widget);
-       gtk_notebook_set_page(GTK_NOTEBOOK(prefswindow->notebook), pagenum);
-
-       return FALSE;
 }
 
-static void save_all_pages(GSList *prefs_pages)
+static gboolean query_can_close_all_pages(GSList *prefs_pages)
 {
        GSList *cur;
 
        for (cur = prefs_pages; cur != NULL; cur = g_slist_next(cur)) {
                PrefsPage *page = (PrefsPage *) cur->data;
 
-               if (page->page_open) {
-                       page->save_page(page);
-               }
+               if (page->can_close)
+                       if (!page->can_close(page))
+                               return FALSE;
        }
+       return TRUE;
 }
 
 static void close_all_pages(GSList *prefs_pages)
@@ -130,11 +131,44 @@ static void close_all_pages(GSList *prefs_pages)
        }       
 }
 
-static void apply_button_released(GtkButton *button, gpointer user_data)
+#ifdef GENERIC_UMPC
+static void prefs_show_sections(PrefsWindow *prefswindow)
+{
+       gint max;
+       GtkWidget *paned = prefswindow->paned;
+       
+        g_object_get (G_OBJECT(paned),
+                        "max-position",
+                        &max, NULL);
+
+       gtk_widget_show(gtk_paned_get_child1(GTK_PANED(paned)));
+       gtk_widget_hide(gtk_paned_get_child2(GTK_PANED(paned)));
+       gtk_paned_set_position(GTK_PANED(paned), max);
+}
+
+static void prefs_show_page(PrefsWindow *prefswindow)
+{
+       gint min;
+       GtkWidget *paned = prefswindow->paned;
+       
+        g_object_get (G_OBJECT(paned),
+                        "min-position",
+                        &min, NULL);
+
+       gtk_widget_hide(gtk_paned_get_child1(GTK_PANED(paned)));
+       gtk_widget_show(gtk_paned_get_child2(GTK_PANED(paned)));
+       gtk_paned_set_position(GTK_PANED(paned), min);
+}
+#endif
+
+static void apply_button_clicked(GtkButton *button, gpointer user_data)
 {
        PrefsWindow *prefswindow = (PrefsWindow *) user_data;
 
        save_all_pages(prefswindow->prefs_pages);
+#ifdef GENERIC_UMPC
+       prefs_show_sections(prefswindow);
+#endif
 }
 
 static void close_prefs_window(PrefsWindow *prefswindow)
@@ -142,6 +176,10 @@ static void close_prefs_window(PrefsWindow *prefswindow)
        debug_print("prefs window closed\n");
 
        close_all_pages(prefswindow->prefs_pages);
+
+       if (prefswindow->close_cb)
+               prefswindow->close_cb(GTK_WINDOW(prefswindow->window));
+
        gtk_widget_destroy(prefswindow->window);
        g_slist_free(prefswindow->prefs_pages);
        if(prefswindow->func != NULL)
@@ -149,73 +187,54 @@ static void close_prefs_window(PrefsWindow *prefswindow)
        g_free(prefswindow);
 }
 
-static void ok_button_released(GtkButton *button, gpointer user_data)
+static void ok_button_clicked(GtkButton *button, gpointer user_data)
 {
        PrefsWindow *prefswindow = (PrefsWindow *) user_data;
 
-       save_all_pages(prefswindow->prefs_pages);
-       close_prefs_window(prefswindow);
+       if (query_can_close_all_pages(prefswindow->prefs_pages)) {
+               save_all_pages(prefswindow->prefs_pages);
+               close_prefs_window(prefswindow);
+       }               
 }
-
-static void cancel_button_released(GtkButton *button, gpointer user_data)
+#ifndef MAEMO
+static void cancel_button_clicked(GtkButton *button, gpointer user_data)
 {
        PrefsWindow *prefswindow = (PrefsWindow *) user_data;
 
        close_prefs_window(prefswindow);
 }
-
+#endif
 static gboolean window_closed(GtkWidget *widget, GdkEvent *event, gpointer user_data)
 {
        PrefsWindow *prefswindow = (PrefsWindow *) user_data;
 
+#ifdef GENERIC_UMPC
+       save_all_pages(prefswindow->prefs_pages);
+#endif
        close_prefs_window(prefswindow);
-       return FALSE;
-}
-
-struct name_search
-{
-       gchar *text;
-       GtkCTreeNode *node;
-};
-
-static gboolean find_child_by_name(GtkCTree *ctree, GtkCTreeNode *node, struct name_search *name_search)
-{
-       gchar *text = NULL;
-
-       text = GTK_CELL_TEXT(GTK_CTREE_ROW(node)->row.cell[0])->text;
-       if (text == NULL)
-               return FALSE;
-
-       if (strcmp(text, name_search->text) == 0)
-               name_search->node = node;
 
        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;
-}
-
+#ifndef MAEMO
 static gboolean prefswindow_key_pressed(GtkWidget *widget, GdkEventKey *event,
-                                   gpointer data)
+                                   PrefsWindow *data)
 {
+       GtkWidget *focused_child;
+
        if (event) {
                switch (event->keyval) {
                        case GDK_Escape :
-                               cancel_button_released(NULL, data);
+                               cancel_button_clicked(NULL, data);
                                break;
                        case GDK_Return : 
                        case GDK_KP_Enter :
-                               ok_button_released(NULL, data);
+                               focused_child = gtkut_get_focused_child
+                                       (GTK_CONTAINER(data->notebook));
+                               /* Press ok, if the focused child is not a text view
+                                * and text (anything that accepts return) (can pass
+                                * NULL to any of the GTK_xxx() casts) */
+                               if (!GTK_IS_TEXT_VIEW(focused_child))
+                                       ok_button_clicked(NULL, data);
                                break;
                        default:
                                break;
@@ -223,56 +242,245 @@ static gboolean prefswindow_key_pressed(GtkWidget *widget, GdkEventKey *event,
        }
        return FALSE;
 }
+#endif
+typedef struct FindNodeByName {
+       const gchar *name;
+       gboolean     found;
+       GtkTreeIter  node;
+} FindNodeByName;
+
+static gboolean find_node_by_name(GtkTreeModel *model, GtkTreePath *path,
+                                 GtkTreeIter *iter, FindNodeByName *data)
+{
+       gchar *name;
+       gboolean result = FALSE;
+
+       gtk_tree_model_get(model, iter, PREFS_PAGE_TITLE, &name, -1);
+       if (name) {
+               result = strcmp(name, data->name) == 0;
+               if (result) {
+                       data->found = TRUE;
+                       data->node  = *iter;
+               }                       
+               g_free(name);
+       }
+       
+       return result;
+}
 
-void prefswindow_open_full(const gchar *title, GSList *prefs_pages, gpointer data, GtkDestroyNotify func)
+static gint prefswindow_tree_sort_by_weight(GtkTreeModel *model, 
+                                           GtkTreeIter  *a,
+                                           GtkTreeIter  *b,
+                                           gpointer      context)
+{
+       gfloat f1, f2;
+       gint i1, i2;
+
+       /* From observation sorting should keep in account the original
+        * order in the prefs_pages list. I.e. if equal weight, prefer 
+        * the index in the pages list */ 
+       gtk_tree_model_get(model, a, 
+                          PREFS_PAGE_INDEX,  &i1,
+                          PREFS_PAGE_WEIGHT, &f1, -1);
+       gtk_tree_model_get(model, b, 
+                          PREFS_PAGE_INDEX,  &i2,
+                          PREFS_PAGE_WEIGHT, &f2, -1);
+
+       return f1 < f2 ? -1 : (f1 > f2 ?  1 : 
+             (i1 < i2 ?  1 : (i1 > i2 ? -1 : 0)));
+}
+                                 
+static void prefswindow_build_all_pages(PrefsWindow *prefswindow, GSList *prefs_pages)
 {
-       static gchar *titles[1];
        GSList *cur;
-       gint optsize;
-       PrefsWindow *prefswindow;
 
-       titles[0] = _("Page Index");
+       prefs_pages = g_slist_reverse(prefs_pages);
+       for (cur = prefs_pages; cur != NULL; cur = g_slist_next(cur)) {
+               PrefsPage *page = (PrefsPage *) cur->data;
+
+               if (!page->page_open) {
+                       page->create_widget(page, GTK_WINDOW(prefswindow->window), prefswindow->data);
+                       gtk_container_add(GTK_CONTAINER(prefswindow->notebook), page->widget);
+                       page->page_open = TRUE;
+               }
+       }
+       prefs_pages = g_slist_reverse(prefs_pages);
+}
+
+static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
+                                                                       PrefsWindow *prefswindow,
+                                                                       gboolean preload_pages,
+                                                                       gboolean activate_child)
+{
+       GtkTreeStore *store = GTK_TREE_STORE(gtk_tree_view_get_model
+                       (GTK_TREE_VIEW(tree_view)));
+       GSList *cur;
+       gint index; /* index in pages list */
+#ifndef GENERIC_UMPC
+       GtkTreeSelection *selection;
+       GtkTreeIter iter;
+#endif
+
+       for (cur = prefs_pages, index = 0; cur != NULL; cur = g_slist_next(cur), index++) {
+               PrefsPage *page = (PrefsPage *)cur->data;
+               FindNodeByName find_name;
+               GtkTreeIter node, child;
+               PrefsTreeNode *prefs_node;
+               int i;
+
+               /* each page tree component string */
+               for (i = 0; page->path[i] != NULL; i++) {
+                       find_name.found = FALSE;
+                       find_name.name  = page->path[i];
+                       
+                       /* find node to attach to 
+                        * FIXME: we search the entire tree, so this is suboptimal... */
+                       gtk_tree_model_foreach(GTK_TREE_MODEL(store), 
+                                              (GtkTreeModelForeachFunc) find_node_by_name,
+                                              &find_name);
+                       if (find_name.found) {
+                               node = find_name.node;
+                               gtk_tree_model_get(GTK_TREE_MODEL(store), &node,
+                                                  PREFS_PAGE_DATA, &prefs_node,
+                                                  -1);
+                       } else {
+                               GAuto *autoptr; 
+                       
+                               /* create a new top level */
+                               gtk_tree_store_append(store, &child, i == 0 ? NULL : &node);
+                               prefs_node = g_new0(PrefsTreeNode, 1);
+                               autoptr = g_auto_pointer_new(prefs_node);
+                               gtk_tree_store_set(store, &child,
+                                                  PREFS_PAGE_TITLE, page->path[i],
+                                                  PREFS_PAGE_DATA,  prefs_node,
+                                                  PREFS_PAGE_DATA_AUTO_FREE, autoptr,
+                                                  PREFS_PAGE_INDEX, index,
+                                                  PREFS_PAGE_WEIGHT, 0.0f,
+                                                  -1);
+                               g_auto_pointer_free(autoptr);
+                               node = child;
+                       }
+               }
+
+               /* right now we have a node and its prefs_node */
+               prefs_node->page = page;
+
+               /* parents "inherit" the max weight of the children */
+               do {
+                       gfloat f;
+                       
+                       gtk_tree_model_get(GTK_TREE_MODEL(store), &node, 
+                                          PREFS_PAGE_WEIGHT, &f,
+                                          -1);
+                       if (page->weight > f) {
+                               f = page->weight;
+                               gtk_tree_store_set(store, &node,
+                                                  PREFS_PAGE_WEIGHT, f,
+                                                  -1);
+                       }       
+                       child = node;   
+               } while (gtk_tree_model_iter_parent(GTK_TREE_MODEL(store),      
+                                                   &node, &child));
+       }
+
+       gtk_tree_view_expand_all(GTK_TREE_VIEW(tree_view));
+
+       /* set sort func & sort */
+       gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(store),
+                                       PREFS_PAGE_WEIGHT,
+                                       prefswindow_tree_sort_by_weight,
+                                       NULL, NULL);
+       gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(store),
+                                            PREFS_PAGE_WEIGHT,
+                                            GTK_SORT_DESCENDING);
+
+       if (preload_pages)
+               prefswindow_build_all_pages(prefswindow, prefs_pages);
+
+       /* select first one or its first child if necessary */
+#ifndef GENERIC_UMPC
+       selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
+       if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter)) {
+               if (activate_child && gtk_tree_model_iter_has_child(GTK_TREE_MODEL(store), &iter)) {
+                       GtkTreeIter parent = iter;
+                       if (!gtk_tree_model_iter_children(GTK_TREE_MODEL(store), &iter, &parent))
+                               iter = parent;
+               }
+               gtk_tree_selection_select_iter(selection, &iter);
+       }
+#endif
+}
+
+void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
+                                                        gpointer data, GDestroyNotify func,
+                                                        gint *save_width, gint *save_height,
+                                                        gboolean preload_pages, gboolean activate_child,
+                                                        PrefsOpenCallbackFunc open_cb,
+                                                        PrefsCloseCallbackFunc close_cb)
+{
+       PrefsWindow *prefswindow;
+       gint x = gdk_screen_width();
+       gint y = gdk_screen_height();
+       static GdkGeometry geometry;
+       GtkAdjustment *adj;
+       GtkWidget *tmp;
 
        prefswindow = g_new0(PrefsWindow, 1);
 
        prefswindow->data = data;
        prefswindow->func = func;
        prefswindow->prefs_pages = g_slist_copy(prefs_pages);
+       prefswindow->save_width = save_width;
+       prefswindow->save_height = save_height;
+       prefswindow->open_cb = open_cb;
+       prefswindow->close_cb = close_cb;
 
-       prefswindow->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       prefswindow->window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefswindow");
        gtk_window_set_title(GTK_WINDOW(prefswindow->window), title);
-       gtk_window_set_default_size(GTK_WINDOW(prefswindow->window), 600, 340);
+
        gtk_window_set_position (GTK_WINDOW(prefswindow->window), GTK_WIN_POS_CENTER);
        gtk_window_set_modal (GTK_WINDOW (prefswindow->window), TRUE);
        gtk_window_set_resizable (GTK_WINDOW(prefswindow->window), TRUE);
        gtk_container_set_border_width(GTK_CONTAINER(prefswindow->window), 4);
 
-       prefswindow->table1 = gtk_table_new(2, 2, FALSE);
-       gtk_widget_show(prefswindow->table1);
-       gtk_container_add(GTK_CONTAINER(prefswindow->window), prefswindow->table1);
+       prefswindow->vbox = gtk_vbox_new(FALSE, 6);
+       gtk_widget_show(prefswindow->vbox);
+       
+       prefswindow->paned = gtk_hpaned_new();
+       gtk_widget_show(prefswindow->paned);
+
+       gtk_container_add(GTK_CONTAINER(prefswindow->window), prefswindow->vbox);
+
+       gtk_box_pack_start(GTK_BOX(prefswindow->vbox), prefswindow->paned, TRUE, TRUE, 0);
 
        prefswindow->scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL);
        gtk_widget_show(prefswindow->scrolledwindow1);
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-       gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->scrolledwindow1, 0, 1, 0, 1, GTK_FILL, GTK_FILL | GTK_EXPAND, 2, 2);
+       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1),
+                       GTK_SHADOW_IN);
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1),
+                       GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+                       
+       gtk_paned_add1(GTK_PANED(prefswindow->paned), prefswindow->scrolledwindow1);
+
+       prefswindow->tree_view = prefswindow_tree_view_create(prefswindow);
+       gtk_widget_show(prefswindow->tree_view);
+       gtk_container_add(GTK_CONTAINER(prefswindow->scrolledwindow1), 
+                         prefswindow->tree_view);
 
-       prefswindow->ctree = gtk_ctree_new_with_titles(1, 0, titles);
-       gtk_widget_show(prefswindow->ctree);
-       gtk_container_add(GTK_CONTAINER(prefswindow->scrolledwindow1), prefswindow->ctree);
+       prefswindow->vbox2 = gtk_vbox_new(FALSE, 2);
+       gtk_widget_show(prefswindow->vbox2);
 
-       prefswindow->frame = gtk_frame_new(NULL);
-       gtk_widget_show(prefswindow->frame);
-       gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->frame), GTK_SHADOW_IN);
-       gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->frame, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 2, 2);
+       gtk_paned_add2(GTK_PANED(prefswindow->paned), prefswindow->vbox2);
 
        prefswindow->table2 = gtk_table_new(1, 2, FALSE);
        gtk_widget_show(prefswindow->table2);
-       gtk_container_add(GTK_CONTAINER(prefswindow->frame), prefswindow->table2);
+       gtk_container_add(GTK_CONTAINER(prefswindow->vbox2), prefswindow->table2);
 
        prefswindow->labelframe = gtk_frame_new(NULL);
        gtk_widget_show(prefswindow->labelframe);
        gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->labelframe), GTK_SHADOW_OUT);
-       gtk_table_attach(GTK_TABLE(prefswindow->table2), prefswindow->labelframe, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 1, 1);
+       gtk_table_attach(GTK_TABLE(prefswindow->table2), prefswindow->labelframe,
+                       0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 1, 1);
 
        prefswindow->pagelabel = gtk_label_new("");
        gtk_widget_show(prefswindow->pagelabel);
@@ -280,93 +488,261 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages, gpointer dat
        gtk_misc_set_alignment(GTK_MISC(prefswindow->pagelabel), 0, 0.0);
        gtk_container_add(GTK_CONTAINER(prefswindow->labelframe), prefswindow->pagelabel);
 
+       prefswindow->scrolledwindow2 = gtk_scrolled_window_new(NULL, NULL);
+       gtk_widget_show(prefswindow->scrolledwindow2);
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2),
+                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
        prefswindow->notebook = gtk_notebook_new();
        gtk_widget_show(prefswindow->notebook);
        gtk_notebook_set_scrollable(GTK_NOTEBOOK(prefswindow->notebook), TRUE);
        gtk_notebook_set_show_tabs(GTK_NOTEBOOK(prefswindow->notebook), FALSE);
        gtk_notebook_set_show_border(GTK_NOTEBOOK(prefswindow->notebook), FALSE);
-       gtk_table_attach(GTK_TABLE(prefswindow->table2), prefswindow->notebook, 0, 1, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 8, 8);
+       gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2),
+                                       prefswindow->notebook);
+       tmp = gtk_bin_get_child(GTK_BIN(prefswindow->scrolledwindow2));
+       gtk_viewport_set_shadow_type(GTK_VIEWPORT(tmp), GTK_SHADOW_NONE);
+       gtk_table_attach(GTK_TABLE(prefswindow->table2), prefswindow->scrolledwindow2,
+                       0, 1, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 0, 4);
 
        prefswindow->empty_page = gtk_label_new("");
        gtk_widget_show(prefswindow->empty_page);
        gtk_container_add(GTK_CONTAINER(prefswindow->notebook), prefswindow->empty_page);
 
-       /* actually we should create a tree here */
-       for (cur = prefs_pages; cur != NULL; cur = g_slist_next(cur)) {
-               PrefsPage *page = (PrefsPage *)cur->data;
-               GtkCTreeNode *node = NULL;
-               gchar *text[2], *part;
-               int i;
-               struct name_search name_search;
-               PrefsTreeNode *prefsnode;
-               for (i = 0; page->path[i] != NULL; i++) {
-                       part = page->path[i];
-                       name_search.text = part;
-                       name_search.node = NULL;
+       prefswindow_build_tree(prefswindow->tree_view, prefs_pages, prefswindow,
+                                                       preload_pages, activate_child);
 
-                       gtk_ctree_post_recursive_to_depth(GTK_CTREE(prefswindow->ctree), node, node != NULL ? GTK_CTREE_ROW(node)->level + 1 : 1, GTK_CTREE_FUNC(find_child_by_name), &name_search);
+       if (open_cb)
+               open_cb(GTK_WINDOW(prefswindow->window));
 
-                       if (name_search.node) {
-                               node = name_search.node;
-                       } else {
-                               text[0] = part;
-                               node = gtk_ctree_insert_node(GTK_CTREE(prefswindow->ctree), node, NULL, text, 0, NULL, NULL, NULL, NULL, FALSE, TRUE);
+       gtk_widget_grab_focus(prefswindow->tree_view);
 
-                               prefsnode = g_new0(PrefsTreeNode, 1);
-                               prefsnode->treeweight = 0.0;
-                               gtk_ctree_node_set_row_data_full(GTK_CTREE(prefswindow->ctree), node, prefsnode, g_free);
-                       }
-               }
+#ifndef GENERIC_UMPC
+       gtkut_stock_button_set_create(&prefswindow->confirm_area,
+                                     &prefswindow->apply_btn,  GTK_STOCK_APPLY,
+                                     &prefswindow->cancel_btn, GTK_STOCK_CANCEL,
+                                     &prefswindow->ok_btn,     GTK_STOCK_OK);
+#else
+       gtkut_stock_button_set_create(&prefswindow->confirm_area,
+                                     &prefswindow->apply_btn,  GTK_STOCK_APPLY,
+                                     &prefswindow->ok_btn,     GTK_STOCK_CLOSE,
+                                     NULL,                     NULL);
+#endif
+       gtk_widget_show_all(prefswindow->confirm_area);
+       gtk_widget_show(prefswindow->vbox);
+       gtk_widget_show(prefswindow->scrolledwindow1);
+       gtk_widget_show(prefswindow->scrolledwindow2);
+
+       gtk_box_pack_start(GTK_BOX(prefswindow->vbox), prefswindow->confirm_area, FALSE, FALSE, 0);
+
+#ifndef GENERIC_UMPC
+       g_signal_connect(G_OBJECT(prefswindow->ok_btn), "clicked", 
+                        G_CALLBACK(ok_button_clicked), prefswindow);
+       g_signal_connect(G_OBJECT(prefswindow->cancel_btn), "clicked", 
+                        G_CALLBACK(cancel_button_clicked), prefswindow);
+       g_signal_connect(G_OBJECT(prefswindow->apply_btn), "clicked", 
+                        G_CALLBACK(apply_button_clicked), prefswindow);
+#else
+       g_signal_connect(G_OBJECT(prefswindow->ok_btn), "clicked", 
+                        G_CALLBACK(ok_button_clicked), prefswindow);
+       g_signal_connect(G_OBJECT(prefswindow->apply_btn), "clicked", 
+                        G_CALLBACK(apply_button_clicked), prefswindow);
+#endif
 
-               prefsnode = (PrefsTreeNode *) GTK_CTREE_ROW(node)->row.data;
-               prefsnode->page = page;
+       g_signal_connect(G_OBJECT(prefswindow->window), "delete_event", 
+                        G_CALLBACK(window_closed), prefswindow);
 
-               for (; node != NULL; node = GTK_CTREE_ROW(node)->parent) {
-                       PrefsTreeNode *curnode = (PrefsTreeNode *) GTK_CTREE_ROW(node)->row.data;
+#ifdef MAEMO
+       maemo_connect_key_press_to_mainwindow(GTK_WINDOW(prefswindow->window));
+#else
+       g_signal_connect(G_OBJECT(prefswindow->window), "key_press_event",
+                          G_CALLBACK(prefswindow_key_pressed), &(prefswindow->window));
+#endif
 
-                       if (page->weight > curnode->treeweight)
-                               curnode->treeweight = page->weight;
+       /* connect to callback only if we hhave non-NULL pointers to store size to */
+       if (prefswindow->save_width && prefswindow->save_height) {
+               g_signal_connect(G_OBJECT(prefswindow->window), "size_allocate",
+                                G_CALLBACK(prefs_size_allocate_cb), prefswindow);
+       }
+
+       if (!geometry.min_height) {
+               
+               if (x < 800 && y < 600) {
+                       geometry.min_width = 600;
+                       geometry.min_height = 440;
+               } else {
+                       geometry.min_width = 700;
+                       geometry.min_height = 550;
                }
        }
-       g_signal_connect(G_OBJECT(prefswindow->ctree), "tree-select-row", 
-                        G_CALLBACK(ctree_select_row), prefswindow);
-
-       gtk_clist_set_selection_mode(GTK_CLIST(prefswindow->ctree), GTK_SELECTION_BROWSE);
-       gtk_clist_column_titles_passive(GTK_CLIST(prefswindow->ctree));
-       optsize = gtk_clist_optimal_column_width(GTK_CLIST(prefswindow->ctree), 0);
-       gtk_clist_set_column_resizeable(GTK_CLIST(prefswindow->ctree), 0, TRUE);
-       gtk_clist_set_column_auto_resize(GTK_CLIST(prefswindow->ctree), 0, FALSE);
-       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);
-       gtk_widget_grab_focus(GTK_WIDGET(prefswindow->ctree));
-
-       gtkut_button_set_create(&prefswindow->confirm_area,
-                               &prefswindow->ok_btn,           _("OK"),
-                               &prefswindow->cancel_btn,       _("Cancel"),
-                               &prefswindow->apply_btn,        _("Apply"));
+       gtk_window_set_geometry_hints(GTK_WINDOW(prefswindow->window), NULL, &geometry,
+                                     GDK_HINT_MIN_SIZE);
+       if (prefswindow->save_width && prefswindow->save_height) {
+               gtk_widget_set_size_request(prefswindow->window, *(prefswindow->save_width),
+                                           *(prefswindow->save_height));
+       }
 
-       gtk_widget_show_all(prefswindow->confirm_area);
+#ifdef GENERIC_UMPC
+       prefs_show_sections(prefswindow);
+#endif
+       gtk_widget_show(prefswindow->window);
+#ifdef MAEMO
+       maemo_window_full_screen_if_needed(GTK_WINDOW(prefswindow->window));
+#endif
+       adj = gtk_scrolled_window_get_vadjustment(
+                       GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1));
+       gtk_adjustment_set_value(adj, adj->lower);
+       gtk_adjustment_changed(adj);
+       adj = gtk_scrolled_window_get_vadjustment(
+                       GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
+       gtk_adjustment_set_value(adj, adj->lower);
+       gtk_adjustment_changed(adj);
+       adj = gtk_scrolled_window_get_hadjustment(
+                       GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
+       gtk_adjustment_set_value(adj, adj->lower);
+       gtk_adjustment_changed(adj);
+}
 
-       gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->confirm_area, 0, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 2);
+void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data,
+                                        gint *save_width, gint *save_height,
+                                        PrefsOpenCallbackFunc open_cb,
+                                        PrefsCloseCallbackFunc close_cb)
+{
+       prefswindow_open_full(title, prefs_pages, data, NULL, save_width, save_height,
+                                                 FALSE, FALSE, open_cb, close_cb);
+}
 
-       g_signal_connect(G_OBJECT(prefswindow->ok_btn), "released", 
-                        G_CALLBACK(ok_button_released), prefswindow);
-       g_signal_connect(G_OBJECT(prefswindow->cancel_btn), "released", 
-                        G_CALLBACK(cancel_button_released), prefswindow);
-       g_signal_connect(G_OBJECT(prefswindow->apply_btn), "released", 
-                        G_CALLBACK(apply_button_released), prefswindow);
-       g_signal_connect(G_OBJECT(prefswindow->window), "delete_event", 
-                        G_CALLBACK(window_closed), prefswindow);
-       g_signal_connect(G_OBJECT(prefswindow->window), "key_press_event",
-                          G_CALLBACK(prefswindow_key_pressed), &(prefswindow->window));
+/*!
+ *\brief       Save Gtk object size to prefs dataset
+ */
+static void prefs_size_allocate_cb(GtkWidget *widget,
+                                        GtkAllocation *allocation, gpointer *user_data)
+{
+       PrefsWindow *prefswindow = (PrefsWindow *) user_data;
 
-       gtk_widget_show(prefswindow->window);
+       g_return_if_fail(allocation != NULL);
+
+       /* don't try to save size to NULL pointers */
+       if (prefswindow && prefswindow->save_width && prefswindow->save_height) {
+               *(prefswindow->save_width) = allocation->width;
+               *(prefswindow->save_height) = allocation->height;
+       }
 }
 
-void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data)
+static GtkTreeStore *prefswindow_create_data_store(void)
 {
-       prefswindow_open_full(title, prefs_pages, data, NULL);
+       return gtk_tree_store_new(N_PREFS_PAGE_COLUMNS,
+                                 G_TYPE_STRING,
+                                 G_TYPE_POINTER,
+                                 G_TYPE_AUTO_POINTER,
+                                 G_TYPE_FLOAT,
+                                 G_TYPE_INT,
+                                 -1);
 }
+
+static GtkWidget *prefswindow_tree_view_create(PrefsWindow *prefswindow)
+{
+       GtkTreeView *tree_view;
+       GtkTreeSelection *selector;
+       GtkTreeModel *model;
+
+       model = GTK_TREE_MODEL(prefswindow_create_data_store());
+       tree_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
+       g_object_unref(model);
+       gtk_tree_view_set_rules_hint(tree_view, prefs_common.use_stripes_everywhere);
+       
+       selector = gtk_tree_view_get_selection(tree_view);
+       gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
+       gtk_tree_selection_set_select_function(selector, prefswindow_row_selected,
+                                              prefswindow, NULL);
+
+       /* create the columns */
+       prefs_filtering_create_tree_view_columns(GTK_WIDGET(tree_view));
+
+       return GTK_WIDGET(tree_view);
+}
+
+static void prefs_filtering_create_tree_view_columns(GtkWidget *tree_view)
+{
+       GtkTreeViewColumn *column;
+       GtkCellRenderer *renderer;
+
+       renderer = gtk_cell_renderer_text_new();
+       column = gtk_tree_view_column_new_with_attributes
+               (_("Page Index"),
+                renderer,
+                "text", PREFS_PAGE_TITLE,
+                NULL);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), column);          
+}
+
+static gboolean prefswindow_row_selected(GtkTreeSelection *selector,
+                                        GtkTreeModel *model, 
+                                        GtkTreePath *path,
+                                        gboolean currently_selected,
+                                        gpointer data)
+{
+       PrefsTreeNode *prefsnode;
+       PrefsPage *page;
+       PrefsWindow *prefswindow = (PrefsWindow *) data;
+       gchar *labeltext;
+       gint pagenum, i;
+       GtkTreeIter iter;
+       GtkAdjustment *adj;
+
+       if (gtk_tree_path_get_depth(path) < 2)
+               return FALSE;
+#ifndef GENERIC_UMPC
+       if (currently_selected) 
+               return TRUE;
+#endif
+       if (!gtk_tree_model_get_iter(GTK_TREE_MODEL(model), &iter, path))
+               return TRUE;
+
+       gtk_tree_model_get(model, &iter, PREFS_PAGE_DATA, &prefsnode, -1);
+       page = prefsnode->page;
+
+       debug_print("%f\n", prefsnode->treeweight);
+
+       if (page == NULL) {
+               gtk_label_set_text(GTK_LABEL(prefswindow->pagelabel), "");
+               pagenum = gtk_notebook_page_num(GTK_NOTEBOOK(prefswindow->notebook),
+                                               prefswindow->empty_page);
+               gtk_notebook_set_current_page(GTK_NOTEBOOK(prefswindow->notebook),
+                                             pagenum);
+               return TRUE;
+       }
+
+       if (!page->page_open) {
+               page->create_widget(page, GTK_WINDOW(prefswindow->window), prefswindow->data);
+               gtk_container_add(GTK_CONTAINER(prefswindow->notebook), page->widget);
+               page->page_open = TRUE;
+       }
+
+       i = 0;
+       while (page->path[i + 1] != 0)
+               i++;
+       labeltext = page->path[i];
+
+       gtk_label_set_text(GTK_LABEL(prefswindow->pagelabel), labeltext);
+
+       pagenum = gtk_notebook_page_num(GTK_NOTEBOOK(prefswindow->notebook),
+                                       page->widget);
+       gtk_notebook_set_current_page(GTK_NOTEBOOK(prefswindow->notebook),
+                                     pagenum);
+
+       adj = gtk_scrolled_window_get_vadjustment(
+                       GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
+       gtk_adjustment_set_value(adj, adj->lower);
+       gtk_adjustment_changed(adj);
+       adj = gtk_scrolled_window_get_hadjustment(
+                       GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
+       gtk_adjustment_set_value(adj, adj->lower);
+       gtk_adjustment_changed(adj);
+
+#ifdef GENERIC_UMPC
+       prefs_show_page(prefswindow);
+#endif
+       return TRUE;
+}
+