2004-12-14 [colin] 0.9.13cvs18
[claws.git] / src / gtk / prefswindow.c
index 7680fffd05c835f6bca677bf671799e0bce4c13a..42f6dcd24e55c6edd52d29d49f41d15bb84a2910 100644 (file)
@@ -23,6 +23,8 @@
 
 #include <string.h>
 #include <gtk/gtk.h>
+#include <gtk/gtktext.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "intl.h"
 #include "utils.h"
@@ -50,8 +52,9 @@ struct _PrefsWindow
 
        GtkWidget *empty_page;
 
-       gpointer   data;
-       GSList    *prefs_pages;
+       gpointer          data;
+       GSList           *prefs_pages;
+       GtkDestroyNotify  func;
 };
 
 struct _PrefsTreeNode
@@ -91,7 +94,7 @@ static gboolean ctree_select_row(GtkCTree *ctree, GList *node, gint column, gpoi
        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),
@@ -135,25 +138,24 @@ static void apply_button_released(GtkButton *button, gpointer user_data)
        save_all_pages(prefswindow->prefs_pages);
 }
 
-static void ok_button_released(GtkButton *button, gpointer user_data)
+static void close_prefs_window(PrefsWindow *prefswindow)
 {
-       PrefsWindow *prefswindow = (PrefsWindow *) user_data;
+       debug_print("prefs window closed\n");
 
-       save_all_pages(prefswindow->prefs_pages);
        close_all_pages(prefswindow->prefs_pages);
        gtk_widget_destroy(prefswindow->window);
        g_slist_free(prefswindow->prefs_pages);
+       if (prefswindow->func != NULL)
+               prefswindow->func(prefswindow->data);
        g_free(prefswindow);
 }
 
-static void close_prefs_window(PrefsWindow *prefswindow)
+static void ok_button_released(GtkButton *button, gpointer user_data)
 {
-       debug_print("prefs window closed\n");
+       PrefsWindow *prefswindow = (PrefsWindow *) user_data;
 
-       close_all_pages(prefswindow->prefs_pages);
-       gtk_widget_destroy(prefswindow->window);
-       g_slist_free(prefswindow->prefs_pages);
-       g_free(prefswindow);
+       save_all_pages(prefswindow->prefs_pages);
+       close_prefs_window(prefswindow);
 }
 
 static void cancel_button_released(GtkButton *button, gpointer user_data)
@@ -204,9 +206,36 @@ gint compare_func(GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
                                                                  0;
 }
 
-void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data)
+static gboolean prefswindow_key_pressed(GtkWidget *widget, GdkEventKey *event,
+                                       PrefsWindow *data)
+{
+       GtkWidget *focused_child;
+       
+       if (event) {
+               switch (event->keyval) {
+                       case GDK_Escape :
+                               cancel_button_released(NULL, data);
+                               break;
+                       case GDK_Return : 
+                       case GDK_KP_Enter :
+                               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(focused_child))
+                                       ok_button_released(NULL, data);
+                               break;
+                       default:
+                               break;
+               }
+       }
+       return FALSE;
+}
+
+void prefswindow_open_full(const gchar *title, GSList *prefs_pages, gpointer data, GtkDestroyNotify func)
 {
-       static gchar *titles [1];
+       static gchar *titles[1];
        GSList *cur;
        gint optsize;
        PrefsWindow *prefswindow;
@@ -216,6 +245,7 @@ void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data)
        prefswindow = g_new0(PrefsWindow, 1);
 
        prefswindow->data = data;
+       prefswindow->func = func;
        prefswindow->prefs_pages = g_slist_copy(prefs_pages);
 
        prefswindow->window = gtk_window_new(GTK_WINDOW_DIALOG);
@@ -227,38 +257,47 @@ void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data)
        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->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_ALWAYS);
        gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->scrolledwindow1, 0, 1, 0, 1, GTK_FILL, GTK_FILL | GTK_EXPAND, 2, 2);
 
        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->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->table2 = gtk_table_new(1, 2, FALSE);
+       gtk_widget_show(prefswindow->table2);
        gtk_container_add(GTK_CONTAINER(prefswindow->frame), 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);
 
        prefswindow->pagelabel = gtk_label_new("");
+       gtk_widget_show(prefswindow->pagelabel);
        gtk_label_set_justify(GTK_LABEL(prefswindow->pagelabel), GTK_JUSTIFY_LEFT);
        gtk_misc_set_alignment(GTK_MISC(prefswindow->pagelabel), 0, 0.0);
        gtk_container_add(GTK_CONTAINER(prefswindow->labelframe), prefswindow->pagelabel);
 
        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);
 
        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 */
@@ -311,11 +350,13 @@ void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data)
        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_widget_show_all(prefswindow->confirm_area);
 
        gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->confirm_area, 0, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 2);
 
@@ -323,6 +364,13 @@ void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data)
        gtk_signal_connect(GTK_OBJECT(prefswindow->cancel_btn), "released", GTK_SIGNAL_FUNC(cancel_button_released), prefswindow);
        gtk_signal_connect(GTK_OBJECT(prefswindow->apply_btn), "released", GTK_SIGNAL_FUNC(apply_button_released), prefswindow);
        gtk_signal_connect(GTK_OBJECT(prefswindow->window), "delete_event", GTK_SIGNAL_FUNC(window_closed), prefswindow);
+       gtk_signal_connect(GTK_OBJECT(prefswindow->window), "key_press_event",
+                          GTK_SIGNAL_FUNC(prefswindow_key_pressed), &(prefswindow->window));
 
-       gtk_widget_show_all(prefswindow->window);
+       gtk_widget_show(prefswindow->window);
+}
+
+void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data)
+{
+       prefswindow_open_full(title, prefs_pages, data, NULL);
 }