/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2015 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
/* alfons - all folder item specific settings should migrate into
#include "alertpanel.h"
#include "prefs_folder_item.h"
#include "folderview.h"
-#include "folder.h"
#include "summaryview.h"
#include "menu.h"
#include "account.h"
#include "string_match.h"
#include "quote_fmt.h"
#include "combobox.h"
+#include "stock_pixmap.h"
#if USE_ENCHANT
#include "gtkaspell.h"
GtkWidget *checkbtn_enable_processing;
GtkWidget *checkbtn_enable_processing_when_opening;
GtkWidget *checkbtn_newmailcheck;
+ GtkWidget *checkbtn_skip_on_goto_unread_or_new;
GtkWidget *checkbtn_offlinesync;
GtkWidget *label_offlinesync;
GtkWidget *entry_offlinesync;
GtkWidget *enable_processing_rec_checkbtn;
GtkWidget *enable_processing_when_opening_rec_checkbtn;
GtkWidget *newmailcheck_rec_checkbtn;
+ GtkWidget *skip_on_goto_unread_or_new_rec_checkbtn;
GtkWidget *offlinesync_rec_checkbtn;
GtkWidget *promote_html_part_rec_checkbtn;
GtkWidget *no_save_warning;
GtkWidget *checkbtn_request_return_receipt;
GtkWidget *checkbtn_save_copy_to_folder;
+ GtkWidget *checkbtn_default_from;
+ GtkWidget *entry_default_from;
GtkWidget *checkbtn_default_to;
GtkWidget *entry_default_to;
GtkWidget *checkbtn_default_reply_to;
GtkWidget *combo_default_dictionary;
GtkWidget *combo_default_alt_dictionary;
#endif
+ GtkWidget *always_sign;
+ GtkWidget *always_encrypt;
/* apply to sub folders */
GtkWidget *request_return_receipt_rec_checkbtn;
GtkWidget *save_copy_to_folder_rec_checkbtn;
+ GtkWidget *default_from_rec_checkbtn;
GtkWidget *default_to_rec_checkbtn;
GtkWidget *default_reply_to_rec_checkbtn;
GtkWidget *default_cc_rec_checkbtn;
GtkWidget *default_dictionary_rec_checkbtn;
GtkWidget *default_alt_dictionary_rec_checkbtn;
#endif
+ GtkWidget *always_sign_rec_checkbtn;
+ GtkWidget *always_encrypt_rec_checkbtn;
};
struct _FolderItemTemplatesPage
#define SAFE_STRING(str) \
(str) ? (str) : ""
+static GtkWidget *prefs_folder_no_save_warning_create_widget() {
+ GtkWidget *hbox;
+ GtkWidget *icon;
+ GtkWidget *label;
+
+ hbox = gtk_hbox_new(FALSE, 0);
+
+ icon = stock_pixmap_widget(STOCK_PIXMAP_NOTICE_WARN);
+ gtk_box_pack_start(GTK_BOX(hbox), icon, FALSE, FALSE, 8);
+
+ label = gtk_label_new(g_strconcat("<i>",
+ _("These preferences will not be saved as this folder "
+ "is a top-level folder.\nHowever, you can set them for the "
+ "whole mailbox tree by using \"Apply to subfolders\"."),
+ "</i>", NULL));
+ gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+ gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+
+ return hbox;
+}
+
static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
GtkWindow * window,
gpointer data)
GtkTreeIter iter;
GtkWidget *dummy_checkbtn, *clean_cache_btn;
SpecialFolderItemType type;
-
GtkWidget *no_save_warning = NULL;
GtkWidget *checkbtn_simplify_subject;
GtkWidget *checkbtn_enable_processing;
GtkWidget *checkbtn_enable_processing_when_opening;
GtkWidget *checkbtn_newmailcheck;
+ GtkWidget *checkbtn_skip_on_goto_unread_or_new;
GtkWidget *checkbtn_offlinesync;
GtkWidget *label_offlinesync;
GtkWidget *entry_offlinesync;
GtkWidget *enable_processing_rec_checkbtn;
GtkWidget *enable_processing_when_opening_rec_checkbtn;
GtkWidget *newmailcheck_rec_checkbtn;
+ GtkWidget *skip_on_goto_unread_or_new_rec_checkbtn;
GtkWidget *offlinesync_rec_checkbtn;
GtkWidget *promote_html_part_rec_checkbtn;
rowcount = 0;
if (!can_save) {
- no_save_warning = gtk_label_new(g_strconcat("<i>",
- _("These preferences will not be saved as this folder "
- "is a top-level folder. However, you can set them for the "
- "whole mailbox tree by using \"Apply to subfolders\"."), "</i>", NULL));
- gtk_label_set_use_markup(GTK_LABEL(no_save_warning), TRUE);
- gtk_label_set_line_wrap(GTK_LABEL(no_save_warning), TRUE);
- gtk_misc_set_alignment(GTK_MISC(no_save_warning), 0.0, 0.5);
+ no_save_warning = prefs_folder_no_save_warning_create_widget();
gtk_table_attach(GTK_TABLE(table), no_save_warning, 0, 3,
- rowcount, rowcount + 1, GTK_FILL, 0, 0, 0);
+ rowcount, rowcount + 1, GTK_FILL, 0, 0, 0);
rowcount++;
}
rowcount++;
/* Test string */
- label_regexp_test = gtk_label_new(_("Test string:"));
+ label_regexp_test = gtk_label_new(_("Test string"));
gtk_misc_set_alignment(GTK_MISC(label_regexp_test), 1, 0.5);
gtk_table_attach(GTK_TABLE(table), label_regexp_test, 0, 1,
rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
rowcount++;
/* Test result */
- label_regexp_result = gtk_label_new(_("Result:"));
+ label_regexp_result = gtk_label_new(_("Result"));
gtk_misc_set_alignment(GTK_MISC(label_regexp_result), 1, 0.5);
gtk_table_attach(GTK_TABLE(table), label_regexp_result, 0, 1,
rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
gtk_table_attach(GTK_TABLE(table), hbox, 1, 2,
rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
- folder_color_btn = gtk_button_new_with_label("");
- gtk_widget_set_size_request(folder_color_btn, 36, 26);
+ folder_color_btn = GTKUT_COLOR_BUTTON();
gtk_box_pack_start (GTK_BOX(hbox), folder_color_btn, FALSE, FALSE, 0);
CLAWS_SET_TIP(folder_color_btn,
_("Pick color for folder"));
gtk_widget_show (promote_html_part_rec_checkbtn);
gtk_table_attach(GTK_TABLE(table), promote_html_part_rec_checkbtn, 2, 3,
rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+ rowcount++;
+
+ /* Skip folder on 'goto unread (or new) message' */
+ checkbtn_skip_on_goto_unread_or_new = gtk_check_button_new_with_label(_("Skip folder when searching for unread or new messages"));
+ CLAWS_SET_TIP(checkbtn_skip_on_goto_unread_or_new,
+ _("Turn this option on if you want this folder to be ignored "
+ "when searching for unread or new messages"));
+ gtk_table_attach(GTK_TABLE(table), checkbtn_skip_on_goto_unread_or_new, 0, 2,
+ rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_skip_on_goto_unread_or_new),
+ item->prefs->skip_on_goto_unread_or_new);
+ skip_on_goto_unread_or_new_rec_checkbtn = gtk_check_button_new();
+ gtk_table_attach(GTK_TABLE(table), skip_on_goto_unread_or_new_rec_checkbtn, 2, 3,
+ rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
rowcount++;
/* Synchronise folder for offline use */
gtk_widget_show (hbox);
gtk_table_attach(GTK_TABLE(table), hbox, 0, 3,
rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+
rowcount++;
hbox_spc = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox2);
gtk_table_attach(GTK_TABLE(table), hbox2, 0, 3,
rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+
rowcount++;
hbox_spc = gtk_hbox_new (FALSE, 0);
page->checkbtn_enable_processing = checkbtn_enable_processing;
page->checkbtn_enable_processing_when_opening = checkbtn_enable_processing_when_opening;
page->checkbtn_newmailcheck = checkbtn_newmailcheck;
+ page->checkbtn_skip_on_goto_unread_or_new = checkbtn_skip_on_goto_unread_or_new;
page->checkbtn_offlinesync = checkbtn_offlinesync;
page->label_offlinesync = label_offlinesync;
page->entry_offlinesync = entry_offlinesync;
page->checkbtn_remove_old_offlinesync = checkbtn_remove_old_offlinesync;
page->promote_html_part = promote_html_part;
-
page->simplify_subject_rec_checkbtn = simplify_subject_rec_checkbtn;
page->folder_chmod_rec_checkbtn = folder_chmod_rec_checkbtn;
page->enable_processing_rec_checkbtn = enable_processing_rec_checkbtn;
page->enable_processing_when_opening_rec_checkbtn = enable_processing_when_opening_rec_checkbtn;
page->newmailcheck_rec_checkbtn = newmailcheck_rec_checkbtn;
+ page->skip_on_goto_unread_or_new_rec_checkbtn = skip_on_goto_unread_or_new_rec_checkbtn;
page->offlinesync_rec_checkbtn = offlinesync_rec_checkbtn;
page->promote_html_part_rec_checkbtn = promote_html_part_rec_checkbtn;
/** \brief Save the prefs in page to folder.
*
- * If the folder is not the one specified in page->item, then only those properties
+ * If the folder is not the one specified in page->item, then only those properties
* that have the relevant 'apply to sub folders' button checked are saved
*/
static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage *page)
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->simplify_subject_rec_checkbtn))) {
gboolean old_simplify_subject = prefs->enable_simplify_subject;
- int regexp_diffs = strcmp2(prefs->simplify_subject_regexp, gtk_editable_get_chars(
+ int regexp_diffs = g_strcmp0(prefs->simplify_subject_regexp, gtk_editable_get_chars(
GTK_EDITABLE(page->entry_simplify_subject), 0, -1));
prefs->enable_simplify_subject =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_simplify_subject));
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_newmailcheck));
}
+ if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->skip_on_goto_unread_or_new_rec_checkbtn))) {
+ prefs->skip_on_goto_unread_or_new =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_skip_on_goto_unread_or_new));
+ }
+
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->offlinesync_rec_checkbtn))) {
prefs->offlinesync =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_offlinesync));
if (folder->opened && summary_update_needed) {
summary_set_prefs_from_folderitem(folderview->summaryview, folder);
- summary_show(folderview->summaryview, folder);
+ summary_show(folderview->summaryview, folder, FALSE);
}
}
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->enable_processing_when_opening_rec_checkbtn)) ||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->newmailcheck_rec_checkbtn)) ||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->offlinesync_rec_checkbtn)) ||
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->skip_on_goto_unread_or_new_rec_checkbtn)) ||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->promote_html_part_rec_checkbtn))
))
return TRUE;
FolderItem *item = (FolderItem *) data;
guint rowcount;
gchar *text = NULL;
+ gchar *tr = NULL;
GtkWidget *table;
+ GtkWidget *hbox;
GtkWidget *label;
GtkWidget *no_save_warning = NULL;
GtkWidget *checkbtn_request_return_receipt = NULL;
GtkWidget *checkbtn_save_copy_to_folder = NULL;
+ GtkWidget *checkbtn_default_from = NULL;
+ GtkWidget *entry_default_from = NULL;
GtkWidget *checkbtn_default_to = NULL;
GtkWidget *entry_default_to = NULL;
GtkWidget *checkbtn_default_reply_to = NULL;
GtkWidget *default_alt_dictionary_rec_checkbtn = NULL;
gchar *dictionary;
#endif
+ GtkWidget *always_sign;
+ GtkListStore *always_sign_menu;
+ GtkWidget *always_encrypt;
+ GtkListStore *always_encrypt_menu;
GtkWidget *request_return_receipt_rec_checkbtn = NULL;
GtkWidget *save_copy_to_folder_rec_checkbtn = NULL;
+ GtkWidget *default_from_rec_checkbtn = NULL;
GtkWidget *default_to_rec_checkbtn = NULL;
GtkWidget *default_reply_to_rec_checkbtn = NULL;
GtkWidget *default_cc_rec_checkbtn = NULL;
GtkWidget *default_bcc_rec_checkbtn = NULL;
GtkWidget *default_replyto_rec_checkbtn = NULL;
GtkWidget *default_account_rec_checkbtn = NULL;
+ GtkWidget *always_sign_rec_checkbtn = NULL;
+ GtkWidget *always_encrypt_rec_checkbtn = NULL;
GList *cur_ac;
GList *account_list;
rowcount = 0;
if (!can_save) {
- no_save_warning = gtk_label_new(g_strconcat("<i>",
- _("These preferences will not be saved as this folder "
- "is a top-level folder. However, you can set them for the "
- "whole mailbox tree by using \"Apply to subfolders\"."), "</i>", NULL));
- gtk_label_set_use_markup(GTK_LABEL(no_save_warning), TRUE);
- gtk_label_set_line_wrap(GTK_LABEL(no_save_warning), TRUE);
- gtk_misc_set_alignment(GTK_MISC(no_save_warning), 0.0, 0.5);
+ no_save_warning = prefs_folder_no_save_warning_create_widget();
gtk_table_attach(GTK_TABLE(table), no_save_warning, 0, 3,
rowcount, rowcount + 1, GTK_FILL, 0, 0, 0);
rowcount++;
rowcount++;
+
+ /* Default From */
+ tr = g_strdup(C_("folder properties: %s stands for a header name",
+ "Default %s"));
+ text = g_strdup_printf(tr, prefs_common_translated_header_name("From:"));
+ checkbtn_default_from = gtk_check_button_new_with_label(text);
+ gtk_table_attach(GTK_TABLE(table), checkbtn_default_from, 0, 1,
+ rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_from),
+ item->prefs->enable_default_from);
+ g_free(text);
+ g_free(tr);
+
+ entry_default_from = gtk_entry_new();
+ gtk_table_attach(GTK_TABLE(table), entry_default_from, 1, 2,
+ rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+ SET_TOGGLE_SENSITIVITY(checkbtn_default_from, entry_default_from);
+ gtk_entry_set_text(GTK_ENTRY(entry_default_from), SAFE_STRING(item->prefs->default_from));
+ address_completion_register_entry(GTK_ENTRY(entry_default_from),
+ TRUE);
+
+ default_from_rec_checkbtn = gtk_check_button_new();
+ gtk_table_attach(GTK_TABLE(table), default_from_rec_checkbtn, 2, 3,
+ rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+ rowcount++;
+
/* Default To */
- text = g_strconcat(_("Default "), prefs_common_translated_header_name("To:"), NULL);
+ tr = g_strdup(C_("folder properties: %s stands for a header name",
+ "Default %s"));
+ text = g_strdup_printf(tr, prefs_common_translated_header_name("To:"));
checkbtn_default_to = gtk_check_button_new_with_label(text);
gtk_table_attach(GTK_TABLE(table), checkbtn_default_to, 0, 1,
rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_to),
item->prefs->enable_default_to);
g_free(text);
+ g_free(tr);
entry_default_to = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), entry_default_to, 1, 2,
rowcount++;
/* Default address to reply to */
- text = g_strconcat(_("Default "), prefs_common_translated_header_name("To:"),
- _(" for replies"), NULL);
+ tr = g_strdup(C_("folder properties: %s stands for a header name",
+ "Default %s for replies"));
+ text = g_strdup_printf(tr, prefs_common_translated_header_name("To:"));
checkbtn_default_reply_to = gtk_check_button_new_with_label(text);
gtk_table_attach(GTK_TABLE(table), checkbtn_default_reply_to, 0, 1,
rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_reply_to),
item->prefs->enable_default_reply_to);
g_free(text);
+ g_free(tr);
entry_default_reply_to = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), entry_default_reply_to, 1, 2,
rowcount++;
/* Default Cc */
- text = g_strconcat(_("Default "), prefs_common_translated_header_name("Cc:"), NULL);
+ tr = g_strdup(C_("folder properties: %s stands for a header name",
+ "Default %s"));
+ text = g_strdup_printf(tr, prefs_common_translated_header_name("Cc:"));
checkbtn_default_cc = gtk_check_button_new_with_label(text);
gtk_table_attach(GTK_TABLE(table), checkbtn_default_cc, 0, 1,
rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_cc),
item->prefs->enable_default_cc);
g_free(text);
+ g_free(tr);
entry_default_cc = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), entry_default_cc, 1, 2,
rowcount++;
/* Default Bcc */
- text = g_strconcat(_("Default "), prefs_common_translated_header_name("Bcc:"), NULL);
+ tr = g_strdup(C_("folder properties: %s stands for a header name",
+ "Default %s"));
+ text = g_strdup_printf(tr, prefs_common_translated_header_name("Bcc:"));
checkbtn_default_bcc = gtk_check_button_new_with_label(text);
gtk_table_attach(GTK_TABLE(table), checkbtn_default_bcc, 0, 1,
rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_bcc),
item->prefs->enable_default_bcc);
g_free(text);
+ g_free(tr);
entry_default_bcc = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), entry_default_bcc, 1, 2,
rowcount++;
/* Default Reply-to */
- text = g_strconcat(_("Default "), prefs_common_translated_header_name("Reply-To:"), NULL);
+ tr = g_strdup(C_("folder properties: %s stands for a header name",
+ "Default %s"));
+ text = g_strdup_printf(tr, prefs_common_translated_header_name("Reply-To:"));
checkbtn_default_replyto = gtk_check_button_new_with_label(text);
gtk_table_attach(GTK_TABLE(table), checkbtn_default_replyto, 0, 1,
rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_replyto),
item->prefs->enable_default_replyto);
g_free(text);
+ g_free(tr);
entry_default_replyto = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), entry_default_replyto, 1, 2,
rowcount++;
- /* Default dictionary */
+ /* Default alternate dictionary */
checkbtn_enable_default_alt_dictionary = gtk_check_button_new_with_label(_("Default alternate dictionary"));
gtk_table_attach(GTK_TABLE(table), checkbtn_enable_default_alt_dictionary, 0, 1,
rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
rowcount++;
#endif
+ /* PGP sign? */
+ hbox = gtk_hbox_new (FALSE, 2);
+ gtk_widget_show (hbox);
+ gtk_table_attach (GTK_TABLE(table), hbox, 0, 2,
+ rowcount, rowcount+1, GTK_FILL, GTK_FILL, 0, 0);
+
+ label = gtk_label_new(_("Always sign messages"));
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 0);
+
+ always_sign = gtkut_sc_combobox_create (NULL, FALSE);
+ gtk_widget_show (always_sign);
+ gtk_box_pack_start (GTK_BOX(hbox), always_sign, FALSE, FALSE, 0);
+
+ always_sign_menu = GTK_LIST_STORE(gtk_combo_box_get_model(
+ GTK_COMBO_BOX(always_sign)));
+ COMBOBOX_ADD (always_sign_menu, _("Default"), SIGN_OR_ENCRYPT_DEFAULT);
+ COMBOBOX_ADD (always_sign_menu, _("No"), SIGN_OR_ENCRYPT_NEVER);
+ COMBOBOX_ADD (always_sign_menu, _("Yes"), SIGN_OR_ENCRYPT_ALWAYS);
+
+ combobox_select_by_data(GTK_COMBO_BOX(always_sign),
+ item->prefs->always_sign);
+
+ CLAWS_SET_TIP(hbox, _("\"Default\" will follow the applicable account preference"));
+
+ always_sign_rec_checkbtn = gtk_check_button_new();
+ gtk_widget_show (always_sign_rec_checkbtn);
+ gtk_table_attach(GTK_TABLE(table), always_sign_rec_checkbtn, 2, 3,
+ rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+ rowcount++;
+
+ /* PGP encrypt? */
+ hbox = gtk_hbox_new (FALSE, 2);
+ gtk_widget_show (hbox);
+ gtk_table_attach (GTK_TABLE(table), hbox, 0, 2,
+ rowcount, rowcount+1, GTK_FILL, GTK_FILL, 0, 0);
+
+ label = gtk_label_new(_("Always encrypt messages"));
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 0);
+
+ always_encrypt = gtkut_sc_combobox_create (NULL, FALSE);
+ gtk_widget_show (always_encrypt);
+ gtk_box_pack_start (GTK_BOX(hbox), always_encrypt, FALSE, FALSE, 0);
+
+ always_encrypt_menu = GTK_LIST_STORE(gtk_combo_box_get_model(
+ GTK_COMBO_BOX(always_encrypt)));
+ COMBOBOX_ADD (always_encrypt_menu, _("Default"), SIGN_OR_ENCRYPT_DEFAULT);
+ COMBOBOX_ADD (always_encrypt_menu, _("No"), SIGN_OR_ENCRYPT_NEVER);
+ COMBOBOX_ADD (always_encrypt_menu, _("Yes"), SIGN_OR_ENCRYPT_ALWAYS);
+
+ combobox_select_by_data(GTK_COMBO_BOX(always_encrypt),
+ item->prefs->always_encrypt);
+
+ CLAWS_SET_TIP(hbox, _("\"Default\" will follow the applicable account preference"));
+
+ always_encrypt_rec_checkbtn = gtk_check_button_new();
+ gtk_widget_show (always_encrypt_rec_checkbtn);
+ gtk_table_attach(GTK_TABLE(table), always_encrypt_rec_checkbtn, 2, 3,
+ rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+ rowcount++;
+
gtk_widget_show_all(table);
page->window = GTK_WIDGET(window);
page->no_save_warning = no_save_warning;
page->checkbtn_request_return_receipt = checkbtn_request_return_receipt;
page->checkbtn_save_copy_to_folder = checkbtn_save_copy_to_folder;
+ page->checkbtn_default_from = checkbtn_default_from;
+ page->entry_default_from = entry_default_from;
page->checkbtn_default_to = checkbtn_default_to;
page->entry_default_to = entry_default_to;
page->checkbtn_default_reply_to = checkbtn_default_reply_to;
page->checkbtn_enable_default_alt_dictionary = checkbtn_enable_default_alt_dictionary;
page->combo_default_alt_dictionary = combo_default_alt_dictionary;
#endif
+ page->always_sign = always_sign;
+ page->always_encrypt = always_encrypt;
page->request_return_receipt_rec_checkbtn = request_return_receipt_rec_checkbtn;
page->save_copy_to_folder_rec_checkbtn = save_copy_to_folder_rec_checkbtn;
+ page->default_from_rec_checkbtn = default_from_rec_checkbtn;
page->default_to_rec_checkbtn = default_to_rec_checkbtn;
page->default_reply_to_rec_checkbtn = default_reply_to_rec_checkbtn;
page->default_cc_rec_checkbtn = default_cc_rec_checkbtn;
page->default_dictionary_rec_checkbtn = default_dictionary_rec_checkbtn;
page->default_alt_dictionary_rec_checkbtn = default_alt_dictionary_rec_checkbtn;
#endif
+ page->always_sign_rec_checkbtn = always_sign_rec_checkbtn;
+ page->always_encrypt_rec_checkbtn = always_encrypt_rec_checkbtn;
page->page.widget = table;
}
{
FolderItemComposePage *page = (FolderItemComposePage *) page_;
+ if (page->entry_default_from)
+ address_completion_unregister_entry(GTK_ENTRY(page->entry_default_from));
if (page->entry_default_to)
address_completion_unregister_entry(GTK_ENTRY(page->entry_default_to));
if (page->entry_default_reply_to)
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_save_copy_to_folder));
}
- if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_to_rec_checkbtn))) {
+ if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_from_rec_checkbtn))) {
+ prefs->enable_default_from =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_default_from));
+ ASSIGN_STRING(prefs->default_from,
+ gtk_editable_get_chars(GTK_EDITABLE(page->entry_default_from), 0, -1));
+ }
+ if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_to_rec_checkbtn))) {
prefs->enable_default_to =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_default_to));
ASSIGN_STRING(prefs->default_to,
GTK_COMBO_BOX(page->combo_default_alt_dictionary)));
}
#endif
+ if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->always_sign_rec_checkbtn))) {
+ prefs->always_sign =
+ combobox_get_active_data(GTK_COMBO_BOX(page->always_sign));
+ }
+ if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->always_encrypt_rec_checkbtn))) {
+ prefs->always_encrypt =
+ combobox_get_active_data(GTK_COMBO_BOX(page->always_encrypt));
+ }
folder_item_prefs_save_config(folder);
}
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_dictionary_rec_checkbtn)) ||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_alt_dictionary_rec_checkbtn)) ||
#endif
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->always_sign_rec_checkbtn)) ||
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->always_encrypt_rec_checkbtn)) ||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_reply_to_rec_checkbtn))
))
return TRUE;
|| gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_dictionary_rec_checkbtn))
|| gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_alt_dictionary_rec_checkbtn))
#endif
+ || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->always_sign_rec_checkbtn))
+ || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->always_encrypt_rec_checkbtn))
))
return TRUE;
else
gtk_widget_show (page_vbox);
if (!can_save) {
- no_save_warning = gtk_label_new(g_strconcat("<i>",
- _("These preferences will not be saved as this folder "
- "is a top-level folder. However, you can set them for the "
- "whole mailbox tree by using \"Apply to subfolders\"."), "</i>", NULL));
- gtk_label_set_use_markup(GTK_LABEL(no_save_warning), TRUE);
- gtk_label_set_line_wrap(GTK_LABEL(no_save_warning), TRUE);
- gtk_misc_set_alignment(GTK_MISC(no_save_warning), 0.0, 0.5);
- gtk_box_pack_start(GTK_BOX(page_vbox), no_save_warning, FALSE, FALSE, 0);
+ no_save_warning = prefs_folder_no_save_warning_create_widget();
+ gtk_box_pack_start(GTK_BOX(page_vbox),
+ no_save_warning, FALSE, FALSE, 0);
}
/* Notebook */
if (alertpanel_full(_("Discard cache"),
_("Do you really want to discard the local cached "
"data for this folder?"),
- GTK_STOCK_CANCEL, g_strconcat("+", _("Discard"), NULL),
- NULL, FALSE, NULL, ALERT_WARNING, G_ALERTDEFAULT)
+ GTK_STOCK_CANCEL, _("Discard"), NULL, ALERTFOCUS_SECOND,
+ FALSE, NULL, ALERT_WARNING)
!= G_ALERTALTERNATE)
return;
static void folder_regexp_test_cb(GtkWidget *widget, gpointer data)
{
-#if !GTK_CHECK_VERSION(3, 0, 0)
static GdkColor red;
static gboolean colors_initialised = FALSE;
-#else
- static GdkColor red = { (guint32)0, (guint16)0xff, (guint16)0x70, (guint16)0x70 };
-#endif
static gchar buf[BUFFSIZE];
FolderItemGeneralPage *page = (FolderItemGeneralPage *)data;
gchar *test_string, *regexp;
return;
}
-#if !GTK_CHECK_VERSION(3, 0, 0)
if (!colors_initialised) {
- gdk_color_parse("#ff7070", &red);
+ if (!gdk_color_parse("#ff7070", &red)) {
+ g_warning("color parse failed: red");
+ return;
+ }
colors_initialised = gdk_colormap_alloc_color(
- gdk_colormap_get_system(), &red, FALSE, TRUE);
+ gdk_colormap_get_system(), &red, FALSE, TRUE);
}
-#endif
preg = summary_compile_simplify_regexp(regexp);
-#if !GTK_CHECK_VERSION(3, 0, 0)
if (colors_initialised)
gtk_widget_modify_base(page->entry_simplify_subject,
GTK_STATE_NORMAL, preg ? NULL : &red);
-#endif
if (preg != NULL) {
string_remove_match(buf, BUFFSIZE, test_string, preg);
projects / claws.git / blobdiff