From: Paweł Pękala Date: Mon, 9 May 2011 18:59:15 +0000 (+0000) Subject: 2011-05-09 [pawel] 3.7.9cvs20 X-Git-Tag: rel_3_7_10~35 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=5efc6e385690ee4729fc6859a50813d1cdd7845a 2011-05-09 [pawel] 3.7.9cvs20 * src/mainwindow.c * src/prefs_folder_item.c Small UI fixes --- diff --git a/ChangeLog b/ChangeLog index 74b5e8f35..a12d74fd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-05-09 [pawel] 3.7.9cvs20 + + * src/mainwindow.c + * src/prefs_folder_item.c + Small UI fixes + 2011-05-05 [colin] 3.7.9cvs19 * src/imap.c diff --git a/PATCHSETS b/PATCHSETS index 7a7b7ecfe..7ea998387 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4171,3 +4171,4 @@ ( cvs diff -u -r 1.65.2.72 -r 1.65.2.73 src/codeconv.c; ) > 3.7.9cvs17.patchset ( cvs diff -u -r 1.115.2.237 -r 1.115.2.238 src/main.c; ) > 3.7.9cvs18.patchset ( cvs diff -u -r 1.179.2.254 -r 1.179.2.255 src/imap.c; cvs diff -u -r 1.149.2.103 -r 1.149.2.104 src/inc.c; cvs diff -u -r 1.101.2.64 -r 1.101.2.65 src/news.c; cvs diff -u -r 1.17.2.59 -r 1.17.2.60 src/send_message.c; ) > 3.7.9cvs19.patchset +( cvs diff -u -r 1.274.2.323 -r 1.274.2.324 src/mainwindow.c; cvs diff -u -r 1.52.2.82 -r 1.52.2.83 src/prefs_folder_item.c; ) > 3.7.9cvs20.patchset diff --git a/configure.ac b/configure.ac index d76d27552..555486a0c 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=7 MICRO_VERSION=9 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=19 +EXTRA_VERSION=20 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/mainwindow.c b/src/mainwindow.c index f6d37df52..72cf62929 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -2067,6 +2067,7 @@ MainWindow *main_window_create() gtk_widget_show_all(hbox_stat); gtk_widget_hide(offline_switch); + gtk_widget_hide(progressbar); gtk_widget_hide(warning_btn); #else online_switch = gtk_button_new (); diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c index 6b0fa2ded..6e480878e 100644 --- a/src/prefs_folder_item.c +++ b/src/prefs_folder_item.c @@ -1332,7 +1332,8 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_, GtkWidget *reply_format_rec_checkbtn; GtkWidget *forward_format_rec_checkbtn; GtkWidget *hbox; - + GtkWidget *vbox_format; + page->item = item; page_vbox = gtk_vbox_new (FALSE, 0); @@ -1369,9 +1370,12 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_, FALSE, FALSE); address_completion_register_entry(GTK_ENTRY(page->compose_override_from_format), TRUE); + + vbox_format = gtk_widget_get_parent( + gtk_widget_get_parent(page->compose_body_format)); hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_end (GTK_BOX(vbox), hbox, FALSE, FALSE, 0); + gtk_box_pack_end (GTK_BOX(vbox_format), hbox, FALSE, FALSE, 0); quotefmt_add_info_button(window, hbox); new_msg_format_rec_checkbtn = gtk_check_button_new_with_label( @@ -1395,8 +1399,11 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_, address_completion_register_entry(GTK_ENTRY(page->reply_override_from_format), TRUE); + vbox_format = gtk_widget_get_parent( + gtk_widget_get_parent(page->reply_body_format)); + hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_end (GTK_BOX(vbox), hbox, FALSE, FALSE, 0); + gtk_box_pack_end (GTK_BOX(vbox_format), hbox, FALSE, FALSE, 0); quotefmt_add_info_button(window, hbox); reply_format_rec_checkbtn = gtk_check_button_new_with_label( @@ -1420,8 +1427,11 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_, address_completion_register_entry(GTK_ENTRY(page->forward_override_from_format), TRUE); + vbox_format = gtk_widget_get_parent( + gtk_widget_get_parent(page->forward_body_format)); + hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_end (GTK_BOX(vbox), hbox, FALSE, FALSE, 0); + gtk_box_pack_end (GTK_BOX(vbox_format), hbox, FALSE, FALSE, 0); quotefmt_add_info_button(window, hbox); forward_format_rec_checkbtn = gtk_check_button_new_with_label(