2011-08-30 [colin] 3.7.10cvs12
[claws.git] / src / gtk / prefswindow.c
index 71419d40097376629ace6929c3c0b807860b363b..e7396950f834bdac991fb931351a34f785b9cbc8 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2011 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,
@@ -13,8 +13,8 @@
  * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -25,7 +25,6 @@
 #include <glib/gi18n.h>
 #include <string.h>
 #include <gtk/gtk.h>
-#include <gtk/gtktext.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "utils.h"
@@ -48,14 +47,14 @@ typedef struct _PrefsTreeNode PrefsTreeNode;
 struct _PrefsWindow
 {
        GtkWidget *window;
-       GtkWidget *table1;
+       GtkWidget *vbox;
+       GtkWidget *paned;
        GtkWidget *scrolledwindow1;
-       GtkWidget *scrolledwindow2;
        GtkWidget *tree_view;
        GtkWidget *table2;
        GtkWidget *pagelabel;
        GtkWidget *labelframe;
-       GtkWidget *frame;
+       GtkWidget *vbox2;
        GtkWidget *notebook;
        GtkWidget *confirm_area;
        GtkWidget *ok_btn;
@@ -63,12 +62,14 @@ struct _PrefsWindow
        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
@@ -129,11 +130,44 @@ static void close_all_pages(GSList *prefs_pages)
        }       
 }
 
+#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,9 @@ static void close_prefs_window(PrefsWindow *prefswindow)
 
        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)
@@ -158,22 +195,26 @@ static void ok_button_clicked(GtkButton *button, gpointer user_data)
                close_prefs_window(prefswindow);
        }               
 }
-
+#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;
 }
-
+#ifndef MAEMO
 static gboolean prefswindow_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                    PrefsWindow *data)
 {
@@ -200,7 +241,7 @@ static gboolean prefswindow_key_pressed(GtkWidget *widget, GdkEventKey *event,
        }
        return FALSE;
 }
-
+#endif
 typedef struct FindNodeByName {
        const gchar *name;
        gboolean     found;
@@ -247,16 +288,58 @@ static gint prefswindow_tree_sort_by_weight(GtkTreeModel *model,
        return f1 < f2 ? -1 : (f1 > f2 ?  1 : 
              (i1 < i2 ?  1 : (i1 > i2 ? -1 : 0)));
 }
-                                 
-static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages)
+
+static void prefswindow_build_page(PrefsWindow *prefswindow, PrefsPage *page)
+{
+       GtkWidget *scrolledwin, *tmp;
+
+       if (!page->page_open) {
+               scrolledwin = gtk_scrolled_window_new(NULL, NULL);
+               gtk_widget_show(scrolledwin);
+               gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
+                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+               
+               page->create_widget(page, GTK_WINDOW(prefswindow->window), prefswindow->data);
+               gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolledwin),
+                                       page->widget);
+
+               gtk_container_add(GTK_CONTAINER(prefswindow->notebook), scrolledwin);
+               tmp = gtk_bin_get_child(GTK_BIN(scrolledwin));
+
+               gtk_widget_realize(tmp);
+               gtk_widget_realize(page->widget);
+               
+               page->widget    = scrolledwin;
+               page->page_open = TRUE;
+       }
+}
+
+static void prefswindow_build_all_pages(PrefsWindow *prefswindow, GSList *prefs_pages)
+{
+       GSList *cur;
+
+       prefs_pages = g_slist_reverse(prefs_pages);
+       for (cur = prefs_pages; cur != NULL; cur = g_slist_next(cur)) {
+               PrefsPage *page = (PrefsPage *) cur->data;
+
+               prefswindow_build_page(prefswindow, page);
+       }
+       prefs_pages = g_slist_reverse(prefs_pages);
+}
+
+static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
+                                                                       PrefsWindow *prefswindow,
+                                                                       gboolean preload_pages)
 {
        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;
@@ -274,7 +357,7 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages)
                        gtk_tree_model_foreach(GTK_TREE_MODEL(store), 
                                               (GtkTreeModelForeachFunc) find_node_by_name,
                                               &find_name);
-                       if (find_name.found) {
+                       if (find_name.found && page->path[i] != page->path[i-1]) {
                                node = find_name.node;
                                gtk_tree_model_get(GTK_TREE_MODEL(store), &node,
                                                   PREFS_PAGE_DATA, &prefs_node,
@@ -330,19 +413,35 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages)
                                             PREFS_PAGE_WEIGHT,
                                             GTK_SORT_DESCENDING);
 
-       /* select first one */                                       
+       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 (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter)) {
+               if (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, GtkDestroyNotify func,
-                                                        gint *save_width, gint *save_height)
+void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
+                                                        gpointer data, GDestroyNotify func,
+                                                        gint *save_width, gint *save_height,
+                                                        gboolean preload_pages,
+                                                        PrefsOpenCallbackFunc open_cb,
+                                                        PrefsCloseCallbackFunc close_cb)
 {
        PrefsWindow *prefswindow;
        gint x = gdk_screen_width();
        gint y = gdk_screen_height();
        static GdkGeometry geometry;
+       GtkAdjustment *adj;
 
        prefswindow = g_new0(PrefsWindow, 1);
 
@@ -351,8 +450,10 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages, gpointer dat
        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_position (GTK_WINDOW(prefswindow->window), GTK_WIN_POS_CENTER);
@@ -360,33 +461,44 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages, gpointer dat
        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->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);
+       prefswindow->vbox2 = gtk_vbox_new(FALSE, 2);
+       gtk_widget_show(prefswindow->vbox2);
+
+       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);
@@ -394,46 +506,68 @@ 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_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2),
-                                       prefswindow->notebook);
-       gtk_table_attach(GTK_TABLE(prefswindow->table2), prefswindow->scrolledwindow2, 0, 1, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 8, 8);
+
+       gtk_table_attach(GTK_TABLE(prefswindow->table2), prefswindow->notebook,
+                       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);
 
-       prefswindow_build_tree(prefswindow->tree_view, prefs_pages);            
+       prefswindow_build_tree(prefswindow->tree_view, prefs_pages, prefswindow,
+                                                       preload_pages);
+
+       if (open_cb)
+               open_cb(GTK_WINDOW(prefswindow->window));
 
        gtk_widget_grab_focus(prefswindow->tree_view);
 
+#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_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->confirm_area, 0, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 2);
+       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
+
        g_signal_connect(G_OBJECT(prefswindow->window), "delete_event", 
                         G_CALLBACK(window_closed), prefswindow);
+
+#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
+
        /* 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",
@@ -450,7 +584,6 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages, gpointer dat
                        geometry.min_height = 550;
                }
        }
-
        gtk_window_set_geometry_hints(GTK_WINDOW(prefswindow->window), NULL, &geometry,
                                      GDK_HINT_MIN_SIZE);
        if (prefswindow->save_width && prefswindow->save_height) {
@@ -458,13 +591,26 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages, gpointer dat
                                            *(prefswindow->save_height));
        }
 
+#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);
 }
 
 void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data,
-                                        gint *save_width, gint *save_height)
+                                        gint *save_width, gint *save_height,
+                                        PrefsOpenCallbackFunc open_cb,
+                                        PrefsCloseCallbackFunc close_cb)
 {
-       prefswindow_open_full(title, prefs_pages, data, NULL, save_width, save_height);
+       prefswindow_open_full(title, prefs_pages, data, NULL, save_width, save_height,
+                                                 FALSE, open_cb, close_cb);
 }
 
 /*!
@@ -475,7 +621,7 @@ static void prefs_size_allocate_cb(GtkWidget *widget,
 {
        PrefsWindow *prefswindow = (PrefsWindow *) user_data;
 
-       g_return_if_fail(allocation != NULL);
+       cm_return_if_fail(allocation != NULL);
 
        /* don't try to save size to NULL pointers */
        if (prefswindow && prefswindow->save_width && prefswindow->save_height) {
@@ -504,7 +650,7 @@ static GtkWidget *prefswindow_tree_view_create(PrefsWindow *prefswindow)
        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.enable_rules_hint);
+       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);
@@ -545,9 +691,12 @@ static gboolean prefswindow_row_selected(GtkTreeSelection *selector,
        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;
 
@@ -560,15 +709,12 @@ static gboolean prefswindow_row_selected(GtkTreeSelection *selector,
                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);
+               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;
-       }
+       prefswindow_build_page(prefswindow, page);
 
        i = 0;
        while (page->path[i + 1] != 0)
@@ -579,12 +725,21 @@ static gboolean prefswindow_row_selected(GtkTreeSelection *selector,
 
        pagenum = gtk_notebook_page_num(GTK_NOTEBOOK(prefswindow->notebook),
                                        page->widget);
-       gtk_notebook_set_page(GTK_NOTEBOOK(prefswindow->notebook), pagenum);
+       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, 0);
-
+                       GTK_SCROLLED_WINDOW(page->widget));
+       gtk_adjustment_set_value(adj, adj->lower);
+       gtk_adjustment_changed(adj);
+       adj = gtk_scrolled_window_get_hadjustment(
+                       GTK_SCROLLED_WINDOW(page->widget));
+       gtk_adjustment_set_value(adj, adj->lower);
+       gtk_adjustment_changed(adj);
+
+#ifdef GENERIC_UMPC
+       prefs_show_page(prefswindow);
+#endif
        return TRUE;
 }