/*
* 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-2016 Hiroyuki Yamamoto 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
*
* 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 "string_match.h"
#include "quote_fmt.h"
#include "combobox.h"
+#include "stock_pixmap.h"
#if USE_ENCHANT
#include "gtkaspell.h"
GtkWidget *table;
GtkWidget *no_save_warning;
GtkWidget *folder_type;
-#ifndef G_OS_WIN32
GtkWidget *checkbtn_simplify_subject;
GtkWidget *entry_simplify_subject;
GtkWidget *entry_regexp_test_string;
GtkWidget *entry_regexp_test_result;
-#endif
GtkWidget *checkbtn_folder_chmod;
GtkWidget *entry_folder_chmod;
GtkWidget *folder_color_btn;
GtkWidget *promote_html_part;
/* apply to sub folders */
-#ifndef G_OS_WIN32
GtkWidget *simplify_subject_rec_checkbtn;
-#endif
GtkWidget *folder_chmod_rec_checkbtn;
GtkWidget *folder_color_rec_checkbtn;
GtkWidget *enable_processing_rec_checkbtn;
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 *default_dictionary_rec_checkbtn;
GtkWidget *default_alt_dictionary_rec_checkbtn;
#endif
+ GtkWidget *always_sign_rec_checkbtn;
+ GtkWidget *always_encrypt_rec_checkbtn;
};
struct _FolderItemTemplatesPage
static void folder_color_set_dialog(GtkWidget *widget, gpointer data);
static void clean_cache_cb(GtkWidget *widget, gpointer data);
-#ifndef G_OS_WIN32
static void folder_regexp_test_cb(GtkWidget *widget, gpointer data);
static void folder_regexp_set_subject_example_cb(GtkWidget *widget, gpointer data);
-#endif
+
#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;
-#ifndef G_OS_WIN32
+
GtkWidget *checkbtn_simplify_subject;
GtkWidget *entry_simplify_subject;
GtkWidget *label_regexp_test;
GtkWidget *entry_regexp_test_string;
GtkWidget *label_regexp_result;
GtkWidget *entry_regexp_test_result;
-#endif
+
GtkWidget *checkbtn_folder_chmod;
GtkWidget *entry_folder_chmod;
GtkWidget *folder_color;
GtkWidget *promote_html_part;
GtkListStore *promote_html_part_menu;
-#ifndef G_OS_WIN32
GtkWidget *simplify_subject_rec_checkbtn;
-#endif
+
GtkWidget *folder_chmod_rec_checkbtn;
GtkWidget *folder_color_rec_checkbtn;
GtkWidget *enable_processing_rec_checkbtn;
rowcount = 0;
if (!can_save) {
- no_save_warning = gtk_label_new(
- _("<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>"));
- 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++;
-#ifndef G_OS_WIN32
/* Simplify Subject */
checkbtn_simplify_subject = gtk_check_button_new_with_label(_("Simplify Subject RegExp"));
gtk_table_attach(GTK_TABLE(table), checkbtn_simplify_subject, 0, 1,
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_editable_set_editable(GTK_EDITABLE(entry_regexp_test_result), FALSE);
rowcount++;
-#endif
+
/* Folder chmod */
checkbtn_folder_chmod = gtk_check_button_new_with_label(_("Folder chmod"));
gtk_table_attach(GTK_TABLE(table), checkbtn_folder_chmod, 0, 1,
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"));
page->table = table;
page->folder_type = folder_type;
page->no_save_warning = no_save_warning;
-#ifndef G_OS_WIN32
+
page->checkbtn_simplify_subject = checkbtn_simplify_subject;
page->entry_simplify_subject = entry_simplify_subject;
page->entry_regexp_test_string = entry_regexp_test_string;
page->entry_regexp_test_result = entry_regexp_test_result;
-#endif
+
page->checkbtn_folder_chmod = checkbtn_folder_chmod;
page->entry_folder_chmod = entry_folder_chmod;
page->folder_color_btn = folder_color_btn;
page->checkbtn_remove_old_offlinesync = checkbtn_remove_old_offlinesync;
page->promote_html_part = promote_html_part;
-#ifndef G_OS_WIN32
+
page->simplify_subject_rec_checkbtn = simplify_subject_rec_checkbtn;
-#endif
+
page->folder_chmod_rec_checkbtn = folder_chmod_rec_checkbtn;
page->folder_color_rec_checkbtn = folder_color_rec_checkbtn;
page->enable_processing_rec_checkbtn = enable_processing_rec_checkbtn;
page->page.widget = table;
-#ifndef G_OS_WIN32
folder_regexp_set_subject_example_cb(NULL, page);
-#endif
}
static void prefs_folder_item_general_destroy_widget_func(PrefsPage *page_)
/** \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->promote_html_part_rec_checkbtn)))
prefs->promote_html_part = promote_html_part;
-#ifndef G_OS_WIN32
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(
if (old_simplify_subject != prefs->enable_simplify_subject || regexp_diffs != 0)
summary_update_needed = TRUE;
}
-#endif
+
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->folder_chmod_rec_checkbtn))) {
prefs->enable_folder_chmod =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_folder_chmod));
it once */
if ((node == page->item->node) &&
!(
-#ifndef G_OS_WIN32
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->simplify_subject_rec_checkbtn)) ||
-#endif
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->folder_chmod_rec_checkbtn)) ||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->folder_color_rec_checkbtn)) ||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->enable_processing_rec_checkbtn)) ||
FolderItem *item = (FolderItem *) data;
guint rowcount;
gchar *text = NULL;
+ gchar *tr = NULL;
GtkWidget *table;
+ GtkWidget *hbox;
GtkWidget *label;
GtkWidget *no_save_warning = 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_to_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(
- _("<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>"));
- 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 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->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_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;
}
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(
- _("<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>"));
- 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, _("+Discard"), NULL, FALSE,
- NULL, ALERT_WARNING, G_ALERTDEFAULT)
+ GTK_STOCK_CANCEL, _("Discard"), NULL, ALERTFOCUS_SECOND,
+ FALSE, NULL, ALERT_WARNING)
!= G_ALERTALTERNATE)
return;
folderview = mainwindow_get_mainwindow()->folderview;
if (folderview && item->opened) {
- folderview_close_opened(folderview);
+ folderview_close_opened(folderview, FALSE);
was_open = TRUE;
}
folder_item_discard_cache(item);
folderview_select(folderview,item);
}
-#ifndef G_OS_WIN32
static regex_t *summary_compile_simplify_regexp(gchar *simplify_subject_regexp)
{
int err;
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);
}
}
}
-#endif
+
static void register_general_page()
{
static gchar *pfi_general_path[2];
projects / claws.git / blobdiff