2005-05-18 [colin] 1.9.9cvs11

	* src/gtk/inputdialog.c
	* src/gtk/gtkaspell.c
		HIGuify dialogs
	* src/alertpanel.c
		Remove a double call

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 80c9753128b395b5d1a52312c09fa21a55bc112b..895451cd08e81f416d3ff24491350e7972729ca6 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,11 @@
+2005-05-18 [colin]     1.9.9cvs11
+
+       * src/gtk/inputdialog.c
+       * src/gtk/gtkaspell.c
+               HIGuify dialogs
+       * src/alertpanel.c
+               Remove a double call
+
 2005-05-17 [colin]     1.9.9cvs10
 
        * src/gtk/gtkaspell.c

diff --git a/PATCHSETS b/PATCHSETS
index ab67cfb1af3a781cc4d6aa1a6d08587e5626a5ae..97a6cce59a94934118c8b77b7daa1c5538ef8e5d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -485,3 +485,4 @@
 ( cvs diff -u -r 1.9.2.15 -r 1.9.2.16 src/gtk/gtkaspell.c; ) > 1.9.9cvs8.patchset
 ( cvs diff -u -r 1.9.2.16 -r 1.9.2.17 src/gtk/gtkaspell.c; ) > 1.9.9cvs9.patchset
 ( cvs diff -u -r 1.9.2.17 -r 1.9.2.18 src/gtk/gtkaspell.c; ) > 1.9.9cvs10.patchset
+( cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/gtk/inputdialog.c; cvs diff -u -r 1.9.2.18 -r 1.9.2.19 src/gtk/gtkaspell.c; cvs diff -u -r 1.17.2.12 -r 1.17.2.13 src/alertpanel.c; ) > 1.9.9cvs11.patchset

diff --git a/configure.ac b/configure.ac
index 3235345254a8887a7b03daabb47f9a65fb46e9c1..0f1a934ba51771ae27c3ad4b73da600a1e682ead 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=10
+EXTRA_VERSION=11
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/alertpanel.c b/src/alertpanel.c
index a70861543589f792da3b7524f021f36a1cf3588d..1b3eac0a529cea6b9b05bc88e7ffdb4de0231bb8 100644 (file)
--- a/src/alertpanel.c
+++ b/src/alertpanel.c
@@ -261,7 +261,6 @@ static void alertpanel_create(const gchar *title,
        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
        
        gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
-       gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
        g_signal_connect(G_OBJECT(dialog), "delete_event",
                         G_CALLBACK(alertpanel_deleted),
                         (gpointer)G_ALERTOTHER);

diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
index 16dc8b907dd80f9b99585cc6b405383e3ba95478..4b88dea8e5d0581cddc89b11e6b3b461c60d8e05 100644 (file)
--- a/src/gtk/gtkaspell.c
+++ b/src/gtk/gtkaspell.c
@@ -1226,7 +1226,7 @@ static void replace_with_supplied_word_cb(GtkWidget *w, GtkAspell *gtkaspell)
 {
        unsigned char *newword;
        GdkEvent *e= (GdkEvent *) gtk_get_current_event();
-       
+
        newword = gtk_editable_get_chars(GTK_EDITABLE(gtkaspell->replace_entry),
                                         0, -1);
 
@@ -1245,6 +1245,10 @@ static void replace_with_supplied_word_cb(GtkWidget *w, GtkAspell *gtkaspell)
 
        g_free(newword);
 
+       if (w && GTK_IS_DIALOG(w)) {
+               gtk_widget_destroy(w);
+       }
+
        set_point_continue(gtkaspell);
 }
 
@@ -1430,8 +1434,7 @@ static gboolean replace_key_pressed(GtkWidget *widget,
                gtk_widget_destroy(widget);
                return TRUE;
        } else if (event && event->keyval == GDK_Return) {
-               replace_with_supplied_word_cb(NULL, gtkaspell);
-               gtk_widget_destroy(widget);
+               replace_with_supplied_word_cb(widget, gtkaspell);
                return TRUE;
        }
        return FALSE;
@@ -1439,12 +1442,17 @@ static gboolean replace_key_pressed(GtkWidget *widget,
        
 static void replace_with_create_dialog_cb(GtkWidget *w, gpointer data)
 {
+       static PangoFontDescription *font_desc;
        GtkWidget *dialog;
        GtkWidget *label;
+       GtkWidget *w_hbox;
        GtkWidget *hbox;
+       GtkWidget *vbox;
        GtkWidget *entry;
        GtkWidget *ok_button;
        GtkWidget *cancel_button;
+       GtkWidget *confirm_area;
+       GtkWidget *icon;
        gchar *thelabel;
        gint xx, yy;
        GtkAspell *gtkaspell = (GtkAspell *) data;
@@ -1457,21 +1465,56 @@ static void replace_with_create_dialog_cb(GtkWidget *w, gpointer data)
 
        gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
        gtk_window_set_title(GTK_WINDOW(dialog),_("Replace unknown word"));
+       gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
        gtk_widget_set_uposition(dialog, xx, yy);
 
        g_signal_connect_swapped(G_OBJECT(dialog), "destroy",
                                 G_CALLBACK(gtk_widget_destroy), 
                                 G_OBJECT(dialog));
 
-       hbox = gtk_hbox_new(FALSE, 0);
-       gtk_container_set_border_width(GTK_CONTAINER(hbox), 8);
+       gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14);
+       hbox = gtk_hbox_new (FALSE, 12);
+       gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
+       gtk_widget_show (hbox);
+       gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox,
+                           FALSE, FALSE, 0);
 
-       thelabel = g_strdup_printf(_("Replace \"%s\" with: "), 
+       thelabel = g_strdup_printf(_("<span weight=\"bold\" "
+                                       "size=\"larger\">Replace \"%s\" with: </span>"), 
                                   gtkaspell->theword);
+       /* for title label */
+       w_hbox = gtk_hbox_new(FALSE, 0);
+       
+       icon = gtk_image_new_from_stock(GTK_STOCK_DIALOG_QUESTION,
+                                       GTK_ICON_SIZE_DIALOG); 
+       gtk_misc_set_alignment (GTK_MISC (icon), 0.5, 0.0);
+       gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
+       
+       vbox = gtk_vbox_new (FALSE, 12);
+       gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
+       gtk_widget_show (vbox);
+       
        label = gtk_label_new(thelabel);
+       gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+       gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
+       gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+       gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+       gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+       if (!font_desc) {
+               gint size;
+
+               size = pango_font_description_get_size
+                       (label->style->font_desc);
+               font_desc = pango_font_description_new();
+               pango_font_description_set_weight
+                       (font_desc, PANGO_WEIGHT_BOLD);
+               pango_font_description_set_size
+                       (font_desc, size * PANGO_SCALE_LARGE);
+       }
+       if (font_desc)
+               gtk_widget_modify_font(label, font_desc);
        g_free(thelabel);
-       gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-
+       
        entry = gtk_entry_new();
        gtkaspell->replace_entry = entry;
        gtk_entry_set_text(GTK_ENTRY(entry), gtkaspell->theword);
@@ -1479,22 +1522,26 @@ static void replace_with_create_dialog_cb(GtkWidget *w, gpointer data)
        g_signal_connect(G_OBJECT(dialog),
                        "key_press_event",
                        G_CALLBACK(replace_key_pressed), gtkaspell);
-       gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+       gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
 
-       gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, TRUE, 
-                          TRUE, 0);
        label = gtk_label_new(_("Holding down Control key while pressing "
                                "Enter\nwill learn from mistake.\n"));
+       gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
        gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
-       gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
-       gtk_misc_set_padding(GTK_MISC(label), 8, 0);
-       gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), label, 
-                       TRUE, TRUE, 0);
+       gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+       gtk_widget_show(label);
 
        hbox = gtk_hbox_new(TRUE, 0);
 
-       ok_button = gtk_button_new_with_label(_("OK"));
-       gtk_box_pack_start(GTK_BOX(hbox), ok_button, TRUE, TRUE, 8);
+       gtkut_stock_button_set_create(&confirm_area,
+                                     &ok_button, GTK_STOCK_OK,
+                                     &cancel_button, GTK_STOCK_CANCEL,
+                                     NULL, NULL);
+
+       gtk_box_pack_end(GTK_BOX(GTK_DIALOG(dialog)->action_area),
+                        confirm_area, FALSE, FALSE, 0);
+       gtk_container_set_border_width(GTK_CONTAINER(confirm_area), 5);
+
        g_signal_connect(G_OBJECT(ok_button), "clicked",
                         G_CALLBACK(replace_with_supplied_word_cb), 
                         gtkaspell);
@@ -1502,14 +1549,10 @@ static void replace_with_create_dialog_cb(GtkWidget *w, gpointer data)
                                   G_CALLBACK(gtk_widget_destroy), 
                                   G_OBJECT(dialog));
 
-       cancel_button = gtk_button_new_with_label(_("Cancel"));
-       gtk_box_pack_start(GTK_BOX(hbox), cancel_button, TRUE, TRUE, 8);
        g_signal_connect_swapped(G_OBJECT(cancel_button), "clicked",
                                 G_CALLBACK(gtk_widget_destroy), 
                                 G_OBJECT(dialog));
 
-       gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), hbox);
-
        gtk_widget_grab_focus(entry);
 
        gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);

diff --git a/src/gtk/inputdialog.c b/src/gtk/inputdialog.c
index 526a2fb338ff30ecaec348e5562946bfac63f993..26bf8511ac0de4f59ef2eddedd33d2397439471e 100644 (file)
--- a/src/gtk/inputdialog.c
+++ b/src/gtk/inputdialog.c
@@ -58,6 +58,7 @@ static gboolean fin;
 static InputDialogType type;
 
 static GtkWidget *dialog;
+static GtkWidget *msg_title;
 static GtkWidget *msg_label;
 static GtkWidget *entry;
 static GtkWidget *combo;
@@ -160,35 +161,72 @@ gchar *input_dialog_query_password(const gchar *server, const gchar *user)
 
 static void input_dialog_create(void)
 {
-       GtkWidget *vbox;
+       static PangoFontDescription *font_desc;
+       GtkWidget *w_hbox;
        GtkWidget *hbox;
-       GtkWidget *confirm_area;
+       GtkWidget *vbox;
+       GtkWidget *ok_button;
        GtkWidget *cancel_button;
+       GtkWidget *confirm_area;
+       GtkWidget *icon;
 
        dialog = gtk_dialog_new();
+
        gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
-       gtk_widget_set_size_request(dialog, INPUT_DIALOG_WIDTH, -1);
-       gtk_container_set_border_width
-               (GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 5);
+       gtk_window_set_title(GTK_WINDOW(dialog),_(""));
+       gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+
        g_signal_connect(G_OBJECT(dialog), "delete_event",
                         G_CALLBACK(delete_event), NULL);
        g_signal_connect(G_OBJECT(dialog), "key_press_event",
                         G_CALLBACK(key_pressed), NULL);
        MANAGE_WINDOW_SIGNALS_CONNECT(dialog);
 
-       gtk_widget_realize(dialog);
-
-       vbox = gtk_vbox_new(FALSE, 8);
-       gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), vbox);
-       gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
-
-       hbox = gtk_hbox_new(FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-
+       gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14);
+       hbox = gtk_hbox_new (FALSE, 12);
+       gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
+       gtk_widget_show (hbox);
+       gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox,
+                           FALSE, FALSE, 0);
+
+       /* for title label */
+       w_hbox = gtk_hbox_new(FALSE, 0);
+       
+       icon = gtk_image_new_from_stock(GTK_STOCK_DIALOG_QUESTION,
+                                       GTK_ICON_SIZE_DIALOG); 
+       gtk_misc_set_alignment (GTK_MISC (icon), 0.5, 0.0);
+       gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
+       
+       vbox = gtk_vbox_new (FALSE, 12);
+       gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
+       gtk_widget_show (vbox);
+       
+       msg_title = gtk_label_new("");
+       gtk_misc_set_alignment(GTK_MISC(msg_title), 0, 0.5);
+       gtk_label_set_justify(GTK_LABEL(msg_title), GTK_JUSTIFY_LEFT);
+       gtk_label_set_use_markup (GTK_LABEL (msg_title), TRUE);
+       gtk_box_pack_start(GTK_BOX(vbox), msg_title, FALSE, FALSE, 0);
+       gtk_label_set_line_wrap(GTK_LABEL(msg_title), TRUE);
+       if (!font_desc) {
+               gint size;
+
+               size = pango_font_description_get_size
+                       (msg_title->style->font_desc);
+               font_desc = pango_font_description_new();
+               pango_font_description_set_weight
+                       (font_desc, PANGO_WEIGHT_BOLD);
+               pango_font_description_set_size
+                       (font_desc, size * PANGO_SCALE_LARGE);
+       }
+       if (font_desc)
+               gtk_widget_modify_font(msg_title, font_desc);
+       
        msg_label = gtk_label_new("");
-       gtk_box_pack_start(GTK_BOX(hbox), msg_label, FALSE, FALSE, 0);
+       gtk_misc_set_alignment(GTK_MISC(msg_label), 0, 0.5);
        gtk_label_set_justify(GTK_LABEL(msg_label), GTK_JUSTIFY_LEFT);
-
+       gtk_box_pack_start(GTK_BOX(vbox), msg_label, FALSE, FALSE, 0);
+       gtk_widget_show(msg_label);
+               
        entry = gtk_entry_new();
        gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(entry), "activate",
@@ -199,21 +237,25 @@ static void input_dialog_create(void)
        g_signal_connect(G_OBJECT(GTK_COMBO(combo)->entry), "activate",
                         G_CALLBACK(combo_activated), NULL);
 
+       hbox = gtk_hbox_new(TRUE, 0);
+
        gtkut_stock_button_set_create(&confirm_area,
                                      &ok_button, GTK_STOCK_OK,
                                      &cancel_button, GTK_STOCK_CANCEL,
                                      NULL, NULL);
-       gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
-                         confirm_area);
+
+       gtk_box_pack_end(GTK_BOX(GTK_DIALOG(dialog)->action_area),
+                        confirm_area, FALSE, FALSE, 0);
+       gtk_container_set_border_width(GTK_CONTAINER(confirm_area), 5);
+
+       gtk_widget_show_all(GTK_DIALOG(dialog)->vbox);
+       
        gtk_widget_grab_default(ok_button);
 
        g_signal_connect(G_OBJECT(ok_button), "clicked",
                         G_CALLBACK(ok_clicked), NULL);
        g_signal_connect(G_OBJECT(cancel_button), "clicked",
                         G_CALLBACK(cancel_clicked), NULL);
-
-
-       gtk_widget_show_all(GTK_DIALOG(dialog)->vbox);
 }
 
 static gchar *input_dialog_open(const gchar *title, const gchar *message,
@@ -272,6 +314,7 @@ static void input_dialog_set(const gchar *title, const gchar *message,
                entry_ = entry;
 
        gtk_window_set_title(GTK_WINDOW(dialog), title);
+       gtk_label_set_text(GTK_LABEL(msg_title), title);
        gtk_label_set_text(GTK_LABEL(msg_label), message);
        if (default_string && *default_string) {
                gtk_entry_set_text(GTK_ENTRY(entry_), default_string);