Fix bug #3559 more correctly
[claws.git] / src / gtk / prefswindow.c
index e272d98965f530a261bcbb2f6ab6408f67128f52..99f6362dfef8fa1d9126cd657a3e5f6aa6605f97 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail Team
+ * Copyright (C) 1999-2013 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
@@ -19,6 +19,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include <glib.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;
-
-struct _PrefsWindow
-{
-       GtkWidget *window;
-       GtkWidget *vbox;
-       GtkWidget *paned;
-       GtkWidget *scrolledwindow1;
-       GtkWidget *scrolledwindow2;
-       GtkWidget *tree_view;
-       GtkWidget *table2;
-       GtkWidget *pagelabel;
-       GtkWidget *labelframe;
-       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;
-       GDestroyNotify func;
-};
-
-struct _PrefsTreeNode
-{
-       PrefsPage *page;
-       gfloat     treeweight; /* GTK2: not used */
-};
+#include "gtk/manage_window.h"
 
 static void prefs_size_allocate_cb(GtkWidget *widget,
                                                         GtkAllocation *allocation, gpointer *user_data);
@@ -165,10 +120,15 @@ static void apply_button_clicked(GtkButton *button, gpointer user_data)
 {
        PrefsWindow *prefswindow = (PrefsWindow *) user_data;
 
+       prefswindow->dialog_response = PREFSWINDOW_RESPONSE_APPLY;
+
        save_all_pages(prefswindow->prefs_pages);
 #ifdef GENERIC_UMPC
        prefs_show_sections(prefswindow);
 #endif
+
+       if (prefswindow->apply_cb)
+               prefswindow->apply_cb(prefswindow);
 }
 
 static void close_prefs_window(PrefsWindow *prefswindow)
@@ -178,7 +138,7 @@ static void close_prefs_window(PrefsWindow *prefswindow)
        close_all_pages(prefswindow->prefs_pages);
 
        if (prefswindow->close_cb)
-               prefswindow->close_cb(GTK_WINDOW(prefswindow->window));
+               prefswindow->close_cb(prefswindow);
 
        gtk_widget_destroy(prefswindow->window);
        g_slist_free(prefswindow->prefs_pages);
@@ -191,19 +151,21 @@ static void ok_button_clicked(GtkButton *button, gpointer user_data)
 {
        PrefsWindow *prefswindow = (PrefsWindow *) user_data;
 
+       prefswindow->dialog_response = PREFSWINDOW_RESPONSE_OK;
+
        if (query_can_close_all_pages(prefswindow->prefs_pages)) {
                save_all_pages(prefswindow->prefs_pages);
                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;
@@ -215,7 +177,7 @@ static gboolean window_closed(GtkWidget *widget, GdkEvent *event, gpointer user_
 
        return FALSE;
 }
-#ifndef MAEMO
+
 static gboolean prefswindow_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                    PrefsWindow *data)
 {
@@ -223,11 +185,11 @@ static gboolean prefswindow_key_pressed(GtkWidget *widget, GdkEventKey *event,
 
        if (event) {
                switch (event->keyval) {
-                       case GDK_Escape :
+                       case GDK_KEY_Escape :
                                cancel_button_clicked(NULL, data);
                                break;
-                       case GDK_Return : 
-                       case GDK_KP_Enter :
+                       case GDK_KEY_Return : 
+                       case GDK_KEY_KP_Enter :
                                focused_child = gtkut_get_focused_child
                                        (GTK_CONTAINER(data->notebook));
                                /* Press ok, if the focused child is not a text view
@@ -242,7 +204,7 @@ static gboolean prefswindow_key_pressed(GtkWidget *widget, GdkEventKey *event,
        }
        return FALSE;
 }
-#endif
+
 typedef struct FindNodeByName {
        const gchar *name;
        gboolean     found;
@@ -289,8 +251,33 @@ 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_all_pages(PrefsWindow *prefswindow, 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 GSList *prefswindow_build_all_pages(PrefsWindow *prefswindow, GSList *prefs_pages)
 {
        GSList *cur;
 
@@ -298,13 +285,9 @@ static void prefswindow_build_all_pages(PrefsWindow *prefswindow, GSList *prefs_
        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;
-               }
+               prefswindow_build_page(prefswindow, page);
        }
-       prefs_pages = g_slist_reverse(prefs_pages);
+       return g_slist_reverse(prefs_pages);
 }
 
 static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
@@ -324,7 +307,7 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
                PrefsPage *page = (PrefsPage *)cur->data;
                FindNodeByName find_name;
                GtkTreeIter node, child;
-               PrefsTreeNode *prefs_node;
+               PrefsTreeNode *prefs_node = NULL;
                int i;
 
                /* each page tree component string */
@@ -337,7 +320,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 && (i == 0 || 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,
@@ -362,7 +345,10 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
                }
 
                /* right now we have a node and its prefs_node */
-               prefs_node->page = page;
+               if (!prefs_node)
+                       g_warning("no prefs_node :/");
+               else
+                       prefs_node->page = page;
 
                /* parents "inherit" the max weight of the children */
                do {
@@ -394,7 +380,7 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
                                             GTK_SORT_DESCENDING);
 
        if (preload_pages)
-               prefswindow_build_all_pages(prefswindow, prefs_pages);
+               prefs_pages = prefswindow_build_all_pages(prefswindow, prefs_pages);
 
        /* select first one or its first child if necessary */
 #ifndef GENERIC_UMPC
@@ -415,6 +401,7 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
                                                         gint *save_width, gint *save_height,
                                                         gboolean preload_pages,
                                                         PrefsOpenCallbackFunc open_cb,
+                                                        PrefsApplyCallbackFunc apply_cb,
                                                         PrefsCloseCallbackFunc close_cb)
 {
        PrefsWindow *prefswindow;
@@ -422,7 +409,6 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
        gint y = gdk_screen_height();
        static GdkGeometry geometry;
        GtkAdjustment *adj;
-       GtkWidget *tmp;
 
        prefswindow = g_new0(PrefsWindow, 1);
 
@@ -432,7 +418,9 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
        prefswindow->save_width = save_width;
        prefswindow->save_height = save_height;
        prefswindow->open_cb = open_cb;
+       prefswindow->apply_cb = apply_cb;
        prefswindow->close_cb = close_cb;
+       prefswindow->dialog_response = PREFSWINDOW_RESPONSE_CANCEL;
 
        prefswindow->window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefswindow");
        gtk_window_set_title(GTK_WINDOW(prefswindow->window), title);
@@ -440,6 +428,8 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
        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_window_set_transient_for (GTK_WINDOW(prefswindow->window),
+                       GTK_WINDOW(mainwindow_get_mainwindow()->window));
        gtk_container_set_border_width(GTK_CONTAINER(prefswindow->window), 4);
 
        prefswindow->vbox = gtk_vbox_new(FALSE, 6);
@@ -487,21 +477,13 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
        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);
-       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,
+
+       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("");
@@ -512,7 +494,7 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
                                                        preload_pages);
 
        if (open_cb)
-               open_cb(GTK_WINDOW(prefswindow->window));
+               open_cb(prefswindow);
 
        gtk_widget_grab_focus(prefswindow->tree_view);
 
@@ -530,7 +512,6 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
        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);
 
@@ -550,20 +531,17 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
 
        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 */
+       /* connect to callback only if we have 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);
        }
 
+       MANAGE_WINDOW_SIGNALS_CONNECT(prefswindow->window);
+
        if (!geometry.min_height) {
                
                if (x < 800 && y < 600) {
@@ -585,30 +563,20 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
        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_set_value(adj, gtk_adjustment_get_lower(adj));
        gtk_adjustment_changed(adj);
 }
 
 void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data,
                                         gint *save_width, gint *save_height,
                                         PrefsOpenCallbackFunc open_cb,
+                                        PrefsApplyCallbackFunc apply_cb,
                                         PrefsCloseCallbackFunc close_cb)
 {
        prefswindow_open_full(title, prefs_pages, data, NULL, save_width, save_height,
-                                                 FALSE, open_cb, close_cb);
+                                                 FALSE, open_cb, apply_cb, close_cb);
 }
 
 /*!
@@ -619,7 +587,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) {
@@ -684,13 +652,12 @@ static gboolean prefswindow_row_selected(GtkTreeSelection *selector,
        PrefsTreeNode *prefsnode;
        PrefsPage *page;
        PrefsWindow *prefswindow = (PrefsWindow *) data;
+       gfloat lower;
        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;
@@ -712,11 +679,7 @@ static gboolean prefswindow_row_selected(GtkTreeSelection *selector,
                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)
@@ -731,12 +694,13 @@ static gboolean prefswindow_row_selected(GtkTreeSelection *selector,
                                      pagenum);
 
        adj = gtk_scrolled_window_get_vadjustment(
-                       GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
-       gtk_adjustment_set_value(adj, adj->lower);
+                       GTK_SCROLLED_WINDOW(page->widget));
+       lower = gtk_adjustment_get_lower(adj);
+       gtk_adjustment_set_value(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_SCROLLED_WINDOW(page->widget));
+       gtk_adjustment_set_value(adj, lower);
        gtk_adjustment_changed(adj);
 
 #ifdef GENERIC_UMPC