X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fplugins%2Faddress_keeper%2Faddress_keeper_prefs.c;h=c9832465e07c140aac73a9db8a44b6740fb6e052;hp=1b7a77c00d14b5a7cc128cdd03d9693210b7999c;hb=HEAD;hpb=20f7a3d674ea54dca8c1d5d053ae25812097090a diff --git a/src/plugins/address_keeper/address_keeper_prefs.c b/src/plugins/address_keeper/address_keeper_prefs.c index 1b7a77c00..6d63d462c 100644 --- a/src/plugins/address_keeper/address_keeper_prefs.c +++ b/src/plugins/address_keeper/address_keeper_prefs.c @@ -1,11 +1,10 @@ /* - * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2015 Hiroyuki Yamamoto and the Claws Mail Team - * Copyright (C) 2009-2015 Ricardo Mones + * Claws Mail -- a GTK based, lightweight, and fast e-mail client + * Copyright (C) 2009-2018 Ricardo Mones and the Claws Mail Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -14,8 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program. If not, see . */ #ifdef HAVE_CONFIG_H @@ -66,7 +64,7 @@ static PrefParam param[] = { {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL} }; -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK static void select_addressbook_clicked_cb(GtkWidget *widget, gpointer data) { const gchar *folderpath = NULL; gchar *new_path = NULL; @@ -80,6 +78,9 @@ static void select_addressbook_clicked_cb(GtkWidget *widget, gpointer data) { } #endif +#define SPACING 10 +#define SWIN_HEIGHT 100 + static void addkeeper_prefs_create_widget_func(PrefsPage * _page, GtkWindow * window, gpointer data) @@ -101,13 +102,15 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page, GtkWidget *blocked_scrolledwin; GtkWidget *vbox; GtkTextBuffer *buffer; + gchar *text; + gchar *tr; - vbox = gtk_vbox_new(FALSE, 6); + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, SPACING); path_vbox = gtkut_get_options_frame(vbox, &path_frame, _("Address book location")); - gtk_container_set_border_width(GTK_CONTAINER(path_frame), 6); - path_hbox = gtk_hbox_new(FALSE, 6); + gtk_container_set_border_width(GTK_CONTAINER(path_frame), SPACING); + path_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, SPACING); gtk_box_pack_start(GTK_BOX(path_vbox), path_hbox, FALSE, FALSE, 0); path_label = gtk_label_new(_("Keep to folder")); @@ -122,7 +125,7 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page, path_button = gtk_button_new_with_label(_("Select...")); gtk_box_pack_start(GTK_BOX(path_hbox), path_button, FALSE, FALSE, 0); -#ifndef USE_NEW_ADDRBOOK +#ifndef USE_ALT_ADDRBOOK g_signal_connect(G_OBJECT (path_button), "clicked", G_CALLBACK (select_addressbook_clicked_cb), path_entry); @@ -137,52 +140,68 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page, keep_hbox = gtkut_get_options_frame(vbox, &keep_frame, _("Fields to keep addresses from")); - gtk_container_set_border_width(GTK_CONTAINER(keep_frame), 6); + gtk_container_set_border_width(GTK_CONTAINER(keep_frame), SPACING); - keep_to_checkbox = gtk_check_button_new_with_label(_("To")); + keep_to_checkbox = gtk_check_button_new_with_label(prefs_common_translated_header_name("To")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_to_checkbox), addkeeperprefs.keep_to_addrs); gtk_box_pack_start(GTK_BOX(keep_hbox), keep_to_checkbox, FALSE, FALSE, 0); gtk_widget_show(keep_to_checkbox); - CLAWS_SET_TIP(keep_to_checkbox, _("Keep addresses which appear in 'To' headers")); + tr = g_strdup(C_("address keeper: %s stands for a header name", + "Keep addresses which appear in '%s' headers")); + text = g_strdup_printf(tr, prefs_common_translated_header_name("To")); + CLAWS_SET_TIP(keep_to_checkbox, text); + g_free(tr); + g_free(text); gtk_widget_show(keep_to_checkbox); page->keep_to_addrs_check = keep_to_checkbox; - keep_cc_checkbox = gtk_check_button_new_with_label(_("Cc")); + keep_cc_checkbox = gtk_check_button_new_with_label(prefs_common_translated_header_name("Cc")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_cc_checkbox), addkeeperprefs.keep_cc_addrs); gtk_box_pack_start(GTK_BOX(keep_hbox), keep_cc_checkbox, FALSE, FALSE, 0); gtk_widget_show(keep_cc_checkbox); - CLAWS_SET_TIP(keep_cc_checkbox, _("Keep addresses which appear in 'Cc' headers")); + tr = g_strdup(C_("address keeper: %s stands for a header name", + "Keep addresses which appear in '%s' headers")); + text = g_strdup_printf(tr, prefs_common_translated_header_name("Cc")); + CLAWS_SET_TIP(keep_cc_checkbox, text); + g_free(text); + g_free(tr); gtk_widget_show(keep_cc_checkbox); page->keep_cc_addrs_check = keep_cc_checkbox; - keep_bcc_checkbox = gtk_check_button_new_with_label(_("Bcc")); + keep_bcc_checkbox = gtk_check_button_new_with_label(prefs_common_translated_header_name("Bcc")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_bcc_checkbox), addkeeperprefs.keep_bcc_addrs); gtk_box_pack_start(GTK_BOX(keep_hbox), keep_bcc_checkbox, FALSE, FALSE, 0); gtk_widget_show(keep_bcc_checkbox); - CLAWS_SET_TIP(keep_bcc_checkbox, _("Keep addresses which appear in 'Bcc' headers")); + tr = g_strdup(C_("address keeper: %s stands for a header name", + "Keep addresses which appear in '%s' headers")); + text = g_strdup_printf(tr, prefs_common_translated_header_name("Bcc")); + CLAWS_SET_TIP(keep_bcc_checkbox, text); + g_free(text); + g_free(tr); gtk_widget_show(keep_bcc_checkbox); page->keep_bcc_addrs_check = keep_bcc_checkbox; blocked_vbox = gtkut_get_options_frame(vbox, &blocked_frame, _("Exclude addresses matching the following regular expressions (one per line)")); - gtk_container_set_border_width(GTK_CONTAINER(blocked_frame), 6); + gtk_container_set_border_width(GTK_CONTAINER(blocked_frame), SPACING); page->block_matching_addrs = gtk_text_view_new(); buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(page->block_matching_addrs)); gtk_text_buffer_set_text(buffer, addkeeperprefs.block_matching_addrs, -1); blocked_scrolledwin = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy - (GTK_SCROLLED_WINDOW (blocked_scrolledwin), - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type - (GTK_SCROLLED_WINDOW (blocked_scrolledwin), GTK_SHADOW_IN); + gtk_scrolled_window_set_policy( + GTK_SCROLLED_WINDOW (blocked_scrolledwin), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type( + GTK_SCROLLED_WINDOW (blocked_scrolledwin), GTK_SHADOW_IN); + gtk_scrolled_window_set_min_content_height( + GTK_SCROLLED_WINDOW (blocked_scrolledwin), SWIN_HEIGHT); gtk_container_add(GTK_CONTAINER(blocked_scrolledwin), page->block_matching_addrs); - gtk_widget_set_size_request(page->block_matching_addrs, -1, 72); gtk_box_pack_start(GTK_BOX(blocked_vbox), blocked_scrolledwin, FALSE, FALSE, 0); gtk_widget_show_all(vbox); @@ -190,6 +209,9 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page, page->page.widget = vbox; } +#undef SPACING +#undef SWIN_HEIGHT + static void addkeeper_prefs_destroy_widget_func(PrefsPage *_page) { } @@ -208,7 +230,7 @@ static void addkeeper_save_config(void) return; if (prefs_write_param(param, pfile->fp) < 0) { - g_warning("Failed to write AddressKeeper configuration to file\n"); + g_warning("failed to write Address Keeper configuration to file"); prefs_file_close_revert(pfile); return; }