From faee87fc98fdf322a3f493ecf8be26c9cf287581 Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 9 Nov 2018 13:53:05 +0000 Subject: [PATCH] rearrange /Display/Summaries/Message list (some more) --- src/prefs_summaries.c | 88 +++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c index 7210a0c2d..c6e415ee0 100644 --- a/src/prefs_summaries.c +++ b/src/prefs_summaries.c @@ -454,6 +454,31 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, G_CALLBACK (prefs_summary_column_open), NULL); + hbox2 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox2); + gtk_box_pack_start (GTK_BOX (vbox1), hbox2, FALSE, TRUE, 0); + + label_datefmt = gtk_label_new (_("Date format")); + gtk_widget_show (label_datefmt); + gtk_box_pack_start (GTK_BOX (hbox2), label_datefmt, FALSE, FALSE, 0); + + entry_datefmt = gtk_entry_new (); + gtk_widget_show (entry_datefmt); + gtk_box_pack_start (GTK_BOX (hbox2), entry_datefmt, FALSE, FALSE, 0); + + button_datefmt = gtk_button_new_from_stock(GTK_STOCK_INFO); + + gtk_widget_show (button_datefmt); + gtk_box_pack_start (GTK_BOX (hbox2), button_datefmt, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (button_datefmt), "clicked", + G_CALLBACK (date_format_create), NULL); + + label_fill = gtk_label_new(" "); + gtk_box_pack_start(GTK_BOX(hbox2), label_fill, TRUE, FALSE, 0); + + CLAWS_SET_TIP(button_datefmt, + _("Date format help")); + /* Open message on select policy */ vbox4 = gtkut_get_options_frame(vbox1, NULL, _("Open message when selected")); @@ -470,17 +495,6 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, PACK_CHECK_BUTTON(vbox4, checkbtn_show_on_directional, _("When using directional keys")); - PACK_CHECK_BUTTON - (vbox1, checkbtn_threadsubj, - _("Thread using subject in addition to standard headers")); - - PACK_CHECK_BUTTON - (vbox1, checkbtn_immedexec, - _("Execute immediately when moving or deleting messages")); - CLAWS_SET_TIP(checkbtn_immedexec, - _("Defers moving, copying and deleting of messages" - " until you choose 'Tools/Execute'")); - vbox3 = gtkut_get_options_frame(vbox1, NULL, _("Mark message as read")); radio_mark_as_read_on_select = gtk_radio_button_new_with_label(NULL, @@ -508,39 +522,6 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, FALSE, FALSE, 0); gtk_widget_show_all(vbox3); - PACK_CHECK_BUTTON - (vbox1, checkbtn_useaddrbook, - _("Display sender using address book")); - - PACK_CHECK_BUTTON - (vbox1, checkbtn_show_tooltips, - _("Show tooltips")); - - hbox2 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox2); - gtk_box_pack_start (GTK_BOX (vbox1), hbox2, FALSE, TRUE, 0); - - label_datefmt = gtk_label_new (_("Date format")); - gtk_widget_show (label_datefmt); - gtk_box_pack_start (GTK_BOX (hbox2), label_datefmt, FALSE, FALSE, 0); - - entry_datefmt = gtk_entry_new (); - gtk_widget_show (entry_datefmt); - gtk_box_pack_start (GTK_BOX (hbox2), entry_datefmt, FALSE, FALSE, 0); - - button_datefmt = gtk_button_new_from_stock(GTK_STOCK_INFO); - - gtk_widget_show (button_datefmt); - gtk_box_pack_start (GTK_BOX (hbox2), button_datefmt, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (button_datefmt), "clicked", - G_CALLBACK (date_format_create), NULL); - - label_fill = gtk_label_new(" "); - gtk_box_pack_start(GTK_BOX(hbox2), label_fill, TRUE, FALSE, 0); - - CLAWS_SET_TIP(button_datefmt, - _("Date format help")); - /* Next Unread Message Dialog */ hbox1 = gtk_hbox_new (FALSE, 10); gtk_widget_show (hbox1); @@ -561,6 +542,21 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, gtk_box_pack_start(GTK_BOX(hbox1), optmenu_nextunreadmsgdialog, FALSE, FALSE, 0); + PACK_CHECK_BUTTON + (vbox1, checkbtn_useaddrbook, + _("Display sender using address book")); + + PACK_CHECK_BUTTON + (vbox1, checkbtn_threadsubj, + _("Thread using subject in addition to standard headers")); + + PACK_CHECK_BUTTON + (vbox1, checkbtn_immedexec, + _("Execute immediately when moving or deleting messages")); + CLAWS_SET_TIP(checkbtn_immedexec, + _("When unchecked moving, copying and deleting of messages" + " is deferred until you use 'Tools/Execute'")); + PACK_CHECK_BUTTON (vbox1, checkbtn_ask_mark_all_read, _("Confirm when marking all messages as read or unread")); @@ -568,6 +564,10 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, (vbox1, checkbtn_ask_override_colorlabel, _("Confirm when changing color labels")); + PACK_CHECK_BUTTON + (vbox1, checkbtn_show_tooltips, + _("Show tooltips")); + hbox2 = gtk_hbox_new (FALSE, 8); gtk_widget_show (hbox2); gtk_box_pack_start (GTK_BOX (vbox1), hbox2, FALSE, FALSE, 0); -- 2.25.1