From 4c1d17a798553d4d0ce2c6bb29a8baeff25dbe8a Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 14 Nov 2018 06:20:21 +0000 Subject: [PATCH] move 'msg selection when entering a folder" button to Message List page ... and some English modifications --- src/prefs_summaries.c | 24 ++++++++++++------------ src/prefs_summary_open.c | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c index c6e415ee0..62967f5db 100644 --- a/src/prefs_summaries.c +++ b/src/prefs_summaries.c @@ -479,6 +479,18 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, CLAWS_SET_TIP(button_datefmt, _("Date format help")); + hbox1 = gtk_hbox_new (FALSE, 10); + gtk_widget_show (hbox1); + gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, TRUE, 0); + + button_edit_actions = gtk_button_new_with_label(_("Set message selection when entering a folder")); + gtk_widget_show (button_edit_actions); + gtk_box_pack_start (GTK_BOX (hbox1), button_edit_actions, + FALSE, TRUE, 0); + g_signal_connect (G_OBJECT (button_edit_actions), "clicked", + G_CALLBACK (prefs_summary_open_open), + NULL); + /* Open message on select policy */ vbox4 = gtkut_get_options_frame(vbox1, NULL, _("Open message when selected")); @@ -578,18 +590,6 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox1, gtk_label_new(_("Defaults"))); - hbox1 = gtk_hbox_new (FALSE, 10); - gtk_widget_show (hbox1); - gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, TRUE, 0); - - button_edit_actions = gtk_button_new_with_label(_("Set selection when entering a folder")); - gtk_widget_show (button_edit_actions); - gtk_box_pack_start (GTK_BOX (hbox1), button_edit_actions, - FALSE, TRUE, 0); - g_signal_connect (G_OBJECT (button_edit_actions), "clicked", - G_CALLBACK (prefs_summary_open_open), - NULL); - vbox2 = gtkut_get_options_frame(vbox1, &frame_new_folders, _("New folders")); hbox1 = gtk_hbox_new(FALSE, 10); diff --git a/src/prefs_summary_open.c b/src/prefs_summary_open.c index 9331e456a..b9e6b824d 100644 --- a/src/prefs_summary_open.c +++ b/src/prefs_summary_open.c @@ -185,7 +185,7 @@ static void prefs_summary_open_create(void) gtk_widget_grab_default (ok_btn); gtk_window_set_title (GTK_WINDOW(window), - _(" Selection when entering a folder")); + _("Message selection when entering a folder")); MANAGE_WINDOW_SIGNALS_CONNECT(window); g_signal_connect (G_OBJECT(window), "delete_event", G_CALLBACK(prefs_summary_open_deleted), @@ -230,7 +230,7 @@ static void prefs_summary_open_create(void) GTK_SHADOW_IN); possible_actions_list_view = prefs_summary_open_list_view_create - (_("Possible selections")); + (_("Available selections")); gtk_widget_show (possible_actions_list_view); gtk_container_add(GTK_CONTAINER(list_view_scrolledwin), possible_actions_list_view); @@ -265,7 +265,7 @@ static void prefs_summary_open_create(void) GTK_SHADOW_IN); actions_list_view = prefs_summary_open_list_view_create - (_("Selection on folder opening")); + (_("Current selections")); g_signal_connect (G_OBJECT (del_btn), "clicked", G_CALLBACK (prefs_summary_open_delete_cb), actions_list_view); -- 2.25.1