/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2011 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
#include "quote_fmt.h"
#include "combobox.h"
-#if USE_ASPELL
+#if USE_ENCHANT
#include "gtkaspell.h"
#endif
}
static void prefs_folder_item_register_page (PrefsPage *page);
-static void prefs_folder_item_unregister_page (PrefsPage *page);
typedef struct _FolderItemGeneralPage FolderItemGeneralPage;
typedef struct _FolderItemComposePage FolderItemComposePage;
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 *checkbtn_remove_old_offlinesync;
/* 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 *entry_default_to;
GtkWidget *checkbtn_default_reply_to;
GtkWidget *entry_default_reply_to;
+ GtkWidget *checkbtn_default_cc;
+ GtkWidget *entry_default_cc;
+ GtkWidget *checkbtn_default_bcc;
+ GtkWidget *entry_default_bcc;
+ GtkWidget *checkbtn_default_replyto;
+ GtkWidget *entry_default_replyto;
GtkWidget *checkbtn_enable_default_account;
GtkWidget *optmenu_default_account;
-#if USE_ASPELL
+#if USE_ENCHANT
GtkWidget *checkbtn_enable_default_dictionary;
GtkWidget *checkbtn_enable_default_alt_dictionary;
GtkWidget *combo_default_dictionary;
GtkWidget *save_copy_to_folder_rec_checkbtn;
GtkWidget *default_to_rec_checkbtn;
GtkWidget *default_reply_to_rec_checkbtn;
+ GtkWidget *default_cc_rec_checkbtn;
+ GtkWidget *default_bcc_rec_checkbtn;
+ GtkWidget *default_replyto_rec_checkbtn;
GtkWidget *default_account_rec_checkbtn;
-#if USE_ASPELL
+#if USE_ENCHANT
GtkWidget *default_dictionary_rec_checkbtn;
GtkWidget *default_alt_dictionary_rec_checkbtn;
#endif
GtkWidget *window;
GtkWidget *table;
GtkWidget *checkbtn_compose_with_format;
+ GtkWidget *compose_override_from_format;
GtkWidget *compose_subject_format;
GtkWidget *compose_body_format;
GtkWidget *checkbtn_reply_with_format;
GtkWidget *reply_quotemark;
+ GtkWidget *reply_override_from_format;
GtkWidget *reply_body_format;
GtkWidget *checkbtn_forward_with_format;
GtkWidget *forward_quotemark;
+ GtkWidget *forward_override_from_format;
GtkWidget *forward_body_format;
/* apply to sub folders */
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) : ""
SpecialFolderItemType type;
GtkWidget *no_save_warning = NULL;
+#ifndef G_OS_WIN32
GtkWidget *checkbtn_simplify_subject;
GtkWidget *entry_simplify_subject;
- GtkWidget *hbox_regexp;
GtkWidget *label_regexp_test;
GtkWidget *entry_regexp_test_string;
- GtkWidget *left_arrow;
+ GtkWidget *label_regexp_result;
GtkWidget *entry_regexp_test_result;
-
+#endif
GtkWidget *checkbtn_folder_chmod;
GtkWidget *entry_folder_chmod;
GtkWidget *folder_color;
GtkWidget *label_end_offlinesync;
GtkWidget *checkbtn_remove_old_offlinesync;
+#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 *enable_processing_when_opening_rec_checkbtn;
GtkWidget *newmailcheck_rec_checkbtn;
GtkWidget *offlinesync_rec_checkbtn;
- GtkTooltips *tooltips;
- tooltips = gtk_tooltips_new();
page->item = item;
/* Table */
- table = gtk_table_new(11, 4, FALSE);
+ table = gtk_table_new(12, 3, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), VBOX_BORDER);
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_table_set_col_spacings(GTK_TABLE(table), 4);
if (!can_save) {
no_save_warning = gtk_label_new(
_("<i>These preferences will not be saved as this folder "
- "is a top-level one. However you can use them to set them "
- "to the whole mailbox tree using \"Apply to subfolders\".</i>"));
+ "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_table_attach(GTK_TABLE(table), no_save_warning, 0, 4,
+ gtk_table_attach(GTK_TABLE(table), no_save_warning, 0, 3,
rowcount, rowcount + 1, GTK_FILL, 0, 0, 0);
rowcount++;
}
/* Apply to subfolders */
label = gtk_label_new(_("Apply to\nsubfolders"));
gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5);
- gtk_table_attach(GTK_TABLE(table), label, 3, 4,
+ gtk_table_attach(GTK_TABLE(table), label, 2, 3,
rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
rowcount++;
rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
gtk_table_attach(GTK_TABLE(table), folder_type, 1, 2,
rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
- gtk_table_attach(GTK_TABLE(table), dummy_checkbtn, 3, 4,
+ gtk_table_attach(GTK_TABLE(table), dummy_checkbtn, 2, 3,
rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
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,
G_CALLBACK(folder_regexp_set_subject_example_cb), page);
entry_simplify_subject = gtk_entry_new();
- gtk_table_attach(GTK_TABLE(table), entry_simplify_subject, 1, 3,
+ gtk_table_attach(GTK_TABLE(table), entry_simplify_subject, 1, 2,
rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
SET_TOGGLE_SENSITIVITY(checkbtn_simplify_subject, entry_simplify_subject);
gtk_entry_set_text(GTK_ENTRY(entry_simplify_subject),
G_CALLBACK(folder_regexp_test_cb), page);
simplify_subject_rec_checkbtn = gtk_check_button_new();
- gtk_table_attach(GTK_TABLE(table), simplify_subject_rec_checkbtn, 3, 4,
+ gtk_table_attach(GTK_TABLE(table), simplify_subject_rec_checkbtn, 2, 3,
rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
rowcount++;
- /* Test RegExp */
- label_regexp_test = gtk_label_new(_("Test RegExp"));
- gtk_misc_set_alignment(GTK_MISC(label_regexp_test), 0, 0.5);
+ /* 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);
SET_TOGGLE_SENSITIVITY(checkbtn_simplify_subject, label_regexp_test);
g_signal_connect(G_OBJECT(entry_regexp_test_string), "changed",
G_CALLBACK(folder_regexp_test_cb), page);
- hbox_regexp = gtk_hbox_new (FALSE, 4);
- gtk_widget_show (hbox_regexp);
- gtk_table_attach(GTK_TABLE(table), hbox_regexp, 2, 3,
- rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
-
- left_arrow = gtk_arrow_new(GTK_ARROW_RIGHT, GTK_SHADOW_OUT);
- gtk_widget_show(left_arrow);
- gtk_box_pack_start (GTK_BOX(hbox_regexp), left_arrow, FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(checkbtn_simplify_subject, left_arrow);
+ rowcount++;
+
+ /* Test 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);
+ SET_TOGGLE_SENSITIVITY(checkbtn_simplify_subject, label_regexp_result);
entry_regexp_test_result = gtk_entry_new();
- gtk_box_pack_end (GTK_BOX(hbox_regexp), entry_regexp_test_result, TRUE, TRUE, 0);
+ gtk_table_attach(GTK_TABLE(table), entry_regexp_test_result, 1, 2,
+ rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
SET_TOGGLE_SENSITIVITY(checkbtn_simplify_subject, entry_regexp_test_result);
- gtk_entry_set_editable(GTK_ENTRY(entry_regexp_test_result), FALSE);
+ 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,
}
folder_chmod_rec_checkbtn = gtk_check_button_new();
- gtk_table_attach(GTK_TABLE(table), folder_chmod_rec_checkbtn, 3, 4,
+ gtk_table_attach(GTK_TABLE(table), folder_chmod_rec_checkbtn, 2, 3,
rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
rowcount++;
folder_color_btn = gtk_button_new_with_label("");
gtk_widget_set_size_request(folder_color_btn, 36, 26);
gtk_box_pack_start (GTK_BOX(hbox), folder_color_btn, FALSE, FALSE, 0);
- gtk_tooltips_set_tip(tooltips, folder_color_btn,
- _("Pick color for folder"), NULL);
+ CLAWS_SET_TIP(folder_color_btn,
+ _("Pick color for folder"));
page->folder_color = item->prefs->color;
gtkut_set_widget_bgcolor_rgb(folder_color_btn, item->prefs->color);
folder_color_rec_checkbtn = gtk_check_button_new();
- gtk_table_attach(GTK_TABLE(table), folder_color_rec_checkbtn, 3, 4,
+ gtk_table_attach(GTK_TABLE(table), folder_color_rec_checkbtn, 2, 3,
rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
rowcount++;
/* Enable processing at startup */
- checkbtn_enable_processing = gtk_check_button_new_with_label(_("Process at start-up"));
+ checkbtn_enable_processing =
+ gtk_check_button_new_with_label(_("Run Processing rules at start-up"));
gtk_table_attach(GTK_TABLE(table), checkbtn_enable_processing, 0, 2,
rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
item->prefs->enable_processing);
enable_processing_rec_checkbtn = gtk_check_button_new();
- gtk_table_attach(GTK_TABLE(table), enable_processing_rec_checkbtn, 3, 4,
+ gtk_table_attach(GTK_TABLE(table), enable_processing_rec_checkbtn, 2, 3,
rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
rowcount++;
/* Enable processing rules when opening folder */
- checkbtn_enable_processing_when_opening = gtk_check_button_new_with_label(_("Process when opening"));
+ checkbtn_enable_processing_when_opening =
+ gtk_check_button_new_with_label(_("Run Processing rules when opening"));
gtk_table_attach(GTK_TABLE(table), checkbtn_enable_processing_when_opening, 0, 2,
rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
item->prefs->enable_processing_when_opening);
enable_processing_when_opening_rec_checkbtn = gtk_check_button_new();
- gtk_table_attach(GTK_TABLE(table), enable_processing_when_opening_rec_checkbtn, 3, 4,
+ gtk_table_attach(GTK_TABLE(table), enable_processing_when_opening_rec_checkbtn, 2, 3,
rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
rowcount++;
/* Check folder for new mail */
checkbtn_newmailcheck = gtk_check_button_new_with_label(_("Scan for new mail"));
- gtk_tooltips_set_tip(tooltips, checkbtn_newmailcheck,
+ CLAWS_SET_TIP(checkbtn_newmailcheck,
_("Turn this option on if mail is delivered directly "
"to this folder by server side filtering on IMAP or "
- "by an external application"), NULL);
+ "by an external application"));
gtk_table_attach(GTK_TABLE(table), checkbtn_newmailcheck, 0, 2,
rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_newmailcheck),
item->prefs->newmailcheck);
newmailcheck_rec_checkbtn = gtk_check_button_new();
- gtk_table_attach(GTK_TABLE(table), newmailcheck_rec_checkbtn, 3, 4,
+ gtk_table_attach(GTK_TABLE(table), newmailcheck_rec_checkbtn, 2, 3,
rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
rowcount++;
rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
offlinesync_rec_checkbtn = gtk_check_button_new();
- gtk_table_attach(GTK_TABLE(table), offlinesync_rec_checkbtn, 3, 4,
+ gtk_table_attach(GTK_TABLE(table), offlinesync_rec_checkbtn, 2, 3,
rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
rowcount++;
hbox = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox);
- gtk_table_attach(GTK_TABLE(table), hbox, 0, 4,
+ gtk_table_attach(GTK_TABLE(table), hbox, 0, 3,
rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
rowcount++;
entry_offlinesync = gtk_entry_new();
gtk_widget_set_size_request (entry_offlinesync, 64, -1);
gtk_widget_show (entry_offlinesync);
- gtk_tooltips_set_tip(tooltips, entry_offlinesync, _("0: all bodies"), NULL);
+ CLAWS_SET_TIP(entry_offlinesync, _("0: all bodies"));
gtk_box_pack_start (GTK_BOX (hbox), entry_offlinesync, FALSE, FALSE, 0);
label_end_offlinesync = gtk_label_new(_("days"));
hbox2 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox2);
- gtk_table_attach(GTK_TABLE(table), hbox2, 0, 4,
+ gtk_table_attach(GTK_TABLE(table), hbox2, 0, 3,
rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
rowcount++;
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->label_end_offlinesync = label_end_offlinesync;
page->checkbtn_remove_old_offlinesync = checkbtn_remove_old_offlinesync;
+#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_)
{
FolderItemPrefs *prefs = folder->prefs;
gchar *buf;
- gboolean all = FALSE;
+ gboolean all = FALSE, summary_update_needed = FALSE;
SpecialFolderItemType type = F_NORMAL;
+ FolderView *folderview = mainwindow_get_mainwindow()->folderview;
if (folder->path == NULL)
return;
- g_return_if_fail(prefs != NULL);
+ cm_return_if_fail(prefs != NULL);
if (page->item == folder)
all = TRUE;
type = combobox_get_active_data(GTK_COMBO_BOX(page->folder_type));
- if (all && folder->stype != type) {
+ if (all && folder->stype != type && page->item->parent_stype == F_NORMAL) {
folder_item_change_type(folder, type);
+ summary_update_needed = TRUE;
}
+#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(
+ GTK_EDITABLE(page->entry_simplify_subject), 0, -1));
prefs->enable_simplify_subject =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_simplify_subject));
ASSIGN_STRING(prefs->simplify_subject_regexp,
gtk_editable_get_chars(GTK_EDITABLE(page->entry_simplify_subject), 0, -1));
+ 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));
}
folder_item_prefs_save_config(folder);
+
+ if (folder->opened && summary_update_needed) {
+ summary_set_prefs_from_folderitem(folderview->summaryview, folder);
+ summary_show(folderview->summaryview, folder);
+ }
}
static gboolean general_save_recurse_func(GNode *node, gpointer data)
FolderItem *item = (FolderItem *) node->data;
FolderItemGeneralPage *page = (FolderItemGeneralPage *) data;
- g_return_val_if_fail(item != NULL, TRUE);
- g_return_val_if_fail(page != NULL, TRUE);
+ cm_return_val_if_fail(item != NULL, TRUE);
+ cm_return_val_if_fail(page != NULL, TRUE);
general_save_folder_prefs(item, page);
check boxes are selected - and optimise the checking by only doing
it once */
if ((node == page->item->node) &&
- !(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->simplify_subject_rec_checkbtn)) ||
+ !(
+#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)) ||
FolderItemComposePage *page = (FolderItemComposePage *) page_;
FolderItem *item = (FolderItem *) data;
guint rowcount;
+ gchar *text = NULL;
GtkWidget *table;
GtkWidget *label;
GtkWidget *entry_default_to = NULL;
GtkWidget *checkbtn_default_reply_to = NULL;
GtkWidget *entry_default_reply_to = NULL;
+ GtkWidget *checkbtn_default_cc = NULL;
+ GtkWidget *entry_default_cc = NULL;
+ GtkWidget *checkbtn_default_bcc = NULL;
+ GtkWidget *entry_default_bcc = NULL;
+ GtkWidget *checkbtn_default_replyto = NULL;
+ GtkWidget *entry_default_replyto = NULL;
GtkWidget *checkbtn_enable_default_account = NULL;
GtkWidget *optmenu_default_account = NULL;
GtkListStore *optmenu_default_account_menu = NULL;
GtkTreeIter iter;
-#if USE_ASPELL
+#if USE_ENCHANT
GtkWidget *checkbtn_enable_default_dictionary = NULL;
GtkWidget *combo_default_dictionary = NULL;
GtkWidget *checkbtn_enable_default_alt_dictionary = NULL;
GtkWidget *save_copy_to_folder_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;
GList *cur_ac;
page->item = item;
/* Table */
-#if USE_ASPELL
+#if USE_ENCHANT
# define TABLEHEIGHT 7
#else
# define TABLEHEIGHT 6
if (!can_save) {
no_save_warning = gtk_label_new(
_("<i>These preferences will not be saved as this folder "
- "is a top-level one. However you can use them to set them "
- "to the whole mailbox tree using \"Apply to subfolders\".</i>"));
+ "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);
rowcount++;
/* Default To */
- checkbtn_default_to = gtk_check_button_new_with_label(_("Default To:"));
+ text = g_strconcat(_("Default "), prefs_common_translated_header_name("To:"), NULL);
+ 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);
entry_default_to = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), entry_default_to, 1, 2,
rowcount++;
/* Default address to reply to */
- checkbtn_default_reply_to = gtk_check_button_new_with_label(_("Default To: for replies"));
+ text = g_strconcat(_("Default "), prefs_common_translated_header_name("To:"),
+ _(" for replies"), NULL);
+ 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);
entry_default_reply_to = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), entry_default_reply_to, 1, 2,
rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
rowcount++;
+
+ /* Default Cc */
+ text = g_strconcat(_("Default "), prefs_common_translated_header_name("Cc:"), NULL);
+ 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);
+
+ entry_default_cc = gtk_entry_new();
+ gtk_table_attach(GTK_TABLE(table), entry_default_cc, 1, 2,
+ rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+ SET_TOGGLE_SENSITIVITY(checkbtn_default_cc, entry_default_cc);
+ gtk_entry_set_text(GTK_ENTRY(entry_default_cc), SAFE_STRING(item->prefs->default_cc));
+ address_completion_register_entry(GTK_ENTRY(entry_default_cc),
+ TRUE);
+
+ default_cc_rec_checkbtn = gtk_check_button_new();
+ gtk_table_attach(GTK_TABLE(table), default_cc_rec_checkbtn, 2, 3,
+ rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+ rowcount++;
+
+ /* Default Bcc */
+ text = g_strconcat(_("Default "), prefs_common_translated_header_name("Bcc:"), NULL);
+ 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);
+
+ entry_default_bcc = gtk_entry_new();
+ gtk_table_attach(GTK_TABLE(table), entry_default_bcc, 1, 2,
+ rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+ SET_TOGGLE_SENSITIVITY(checkbtn_default_bcc, entry_default_bcc);
+ gtk_entry_set_text(GTK_ENTRY(entry_default_bcc), SAFE_STRING(item->prefs->default_bcc));
+ address_completion_register_entry(GTK_ENTRY(entry_default_bcc),
+ TRUE);
+
+ default_bcc_rec_checkbtn = gtk_check_button_new();
+ gtk_table_attach(GTK_TABLE(table), default_bcc_rec_checkbtn, 2, 3,
+ rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+ rowcount++;
+
+ /* Default Reply-to */
+ text = g_strconcat(_("Default "), prefs_common_translated_header_name("Reply-To:"), NULL);
+ 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);
+
+ entry_default_replyto = gtk_entry_new();
+ gtk_table_attach(GTK_TABLE(table), entry_default_replyto, 1, 2,
+ rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+ SET_TOGGLE_SENSITIVITY(checkbtn_default_replyto, entry_default_replyto);
+ gtk_entry_set_text(GTK_ENTRY(entry_default_replyto), SAFE_STRING(item->prefs->default_replyto));
+ address_completion_register_entry(GTK_ENTRY(entry_default_replyto),
+ TRUE);
+
+ default_replyto_rec_checkbtn = gtk_check_button_new();
+ gtk_table_attach(GTK_TABLE(table), default_replyto_rec_checkbtn, 2, 3,
+ rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+ rowcount++;
}
/* Default account */
checkbtn_enable_default_account = gtk_check_button_new_with_label(_("Default account"));
if (item->folder->klass->type != F_NEWS && ac_prefs->protocol == A_NNTP)
continue;
- COMBOBOX_ADD (optmenu_default_account_menu,
+ COMBOBOX_ADD_ESCAPED (optmenu_default_account_menu,
ac_prefs->account_name?ac_prefs->account_name : _("Untitled"),
ac_prefs->account_id);
rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
rowcount++;
-#if USE_ASPELL
+#if USE_ENCHANT
/* Default dictionary */
checkbtn_enable_default_dictionary = gtk_check_button_new_with_label(_("Default dictionary"));
gtk_table_attach(GTK_TABLE(table), checkbtn_enable_default_dictionary, 0, 1,
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_dictionary),
item->prefs->enable_default_dictionary);
- combo_default_dictionary = gtkaspell_dictionary_combo_new(
- prefs_common.aspell_path, TRUE);
+ combo_default_dictionary = gtkaspell_dictionary_combo_new(TRUE);
gtk_table_attach(GTK_TABLE(table), combo_default_dictionary, 1, 2,
rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
dictionary = item->prefs->default_dictionary;
+ if (dictionary && strrchr(dictionary, '/')) {
+ gchar *tmp = g_strdup(strrchr(dictionary, '/')+1);
+ g_free(item->prefs->default_dictionary);
+ item->prefs->default_dictionary = tmp;
+ dictionary = item->prefs->default_dictionary;
+ }
+ if (item->prefs->default_dictionary &&
+ strchr(item->prefs->default_dictionary, '-')) {
+ *(strchr(item->prefs->default_dictionary, '-')) = '\0';
+ }
if (dictionary)
gtkaspell_set_dictionary_menu_active_item(
GTK_COMBO_BOX(combo_default_dictionary), dictionary);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_alt_dictionary),
item->prefs->enable_default_alt_dictionary);
- combo_default_alt_dictionary = gtkaspell_dictionary_combo_new(
- prefs_common.aspell_path, FALSE);
+ combo_default_alt_dictionary = gtkaspell_dictionary_combo_new(FALSE);
gtk_table_attach(GTK_TABLE(table), combo_default_alt_dictionary, 1, 2,
rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
dictionary = item->prefs->default_alt_dictionary;
+ if (dictionary && strrchr(dictionary, '/')) {
+ gchar *tmp = g_strdup(strrchr(dictionary, '/')+1);
+ g_free(item->prefs->default_alt_dictionary);
+ item->prefs->default_alt_dictionary = tmp;
+ dictionary = item->prefs->default_alt_dictionary;
+ }
+ if (item->prefs->default_alt_dictionary &&
+ strchr(item->prefs->default_alt_dictionary, '-')) {
+ *(strchr(item->prefs->default_alt_dictionary, '-')) = '\0';
+ }
if (dictionary)
gtkaspell_set_dictionary_menu_active_item(
GTK_COMBO_BOX(combo_default_alt_dictionary), dictionary);
page->entry_default_to = entry_default_to;
page->checkbtn_default_reply_to = checkbtn_default_reply_to;
page->entry_default_reply_to = entry_default_reply_to;
+ page->checkbtn_default_cc = checkbtn_default_cc;
+ page->entry_default_cc = entry_default_cc;
+ page->checkbtn_default_bcc = checkbtn_default_bcc;
+ page->entry_default_bcc = entry_default_bcc;
+ page->checkbtn_default_replyto = checkbtn_default_replyto;
+ page->entry_default_replyto = entry_default_replyto;
page->checkbtn_enable_default_account = checkbtn_enable_default_account;
page->optmenu_default_account = optmenu_default_account;
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
page->checkbtn_enable_default_dictionary = checkbtn_enable_default_dictionary;
page->combo_default_dictionary = combo_default_dictionary;
page->checkbtn_enable_default_alt_dictionary = checkbtn_enable_default_alt_dictionary;
page->save_copy_to_folder_rec_checkbtn = save_copy_to_folder_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_bcc_rec_checkbtn = default_bcc_rec_checkbtn;
+ page->default_replyto_rec_checkbtn = default_replyto_rec_checkbtn;
page->default_account_rec_checkbtn = default_account_rec_checkbtn;
-#if USE_ASPELL
+#if USE_ENCHANT
page->default_dictionary_rec_checkbtn = default_dictionary_rec_checkbtn;
page->default_alt_dictionary_rec_checkbtn = default_alt_dictionary_rec_checkbtn;
#endif
- address_completion_start(page->window);
-
page->page.widget = table;
}
address_completion_unregister_entry(GTK_ENTRY(page->entry_default_to));
if (page->entry_default_reply_to)
address_completion_unregister_entry(GTK_ENTRY(page->entry_default_reply_to));
- address_completion_end(page->window);
+ if (page->entry_default_cc)
+ address_completion_unregister_entry(GTK_ENTRY(page->entry_default_cc));
+ if (page->entry_default_bcc)
+ address_completion_unregister_entry(GTK_ENTRY(page->entry_default_bcc));
+ if (page->entry_default_replyto)
+ address_completion_unregister_entry(GTK_ENTRY(page->entry_default_replyto));
}
/** \brief Save the prefs in page to folder.
if (page->item == folder)
all = TRUE;
- g_return_if_fail(prefs != NULL);
+ cm_return_if_fail(prefs != NULL);
if (item_protocol(folder) != A_NNTP) {
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->request_return_receipt_rec_checkbtn))) {
ASSIGN_STRING(prefs->default_reply_to,
gtk_editable_get_chars(GTK_EDITABLE(page->entry_default_reply_to), 0, -1));
}
+
+ if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_cc_rec_checkbtn))) {
+
+ prefs->enable_default_cc =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_default_cc));
+ ASSIGN_STRING(prefs->default_cc,
+ gtk_editable_get_chars(GTK_EDITABLE(page->entry_default_cc), 0, -1));
+ }
+
+ if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_bcc_rec_checkbtn))) {
+
+ prefs->enable_default_bcc =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_default_bcc));
+ ASSIGN_STRING(prefs->default_bcc,
+ gtk_editable_get_chars(GTK_EDITABLE(page->entry_default_bcc), 0, -1));
+ }
+
+ if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_replyto_rec_checkbtn))) {
+
+ prefs->enable_default_replyto =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_default_replyto));
+ ASSIGN_STRING(prefs->default_replyto,
+ gtk_editable_get_chars(GTK_EDITABLE(page->entry_default_replyto), 0, -1));
+ }
+
} else {
prefs->request_return_receipt = FALSE;
prefs->save_copy_to_folder = FALSE;
prefs->enable_default_to = FALSE;
prefs->enable_default_reply_to = FALSE;
+ prefs->enable_default_cc = FALSE;
+ prefs->enable_default_bcc = FALSE;
+ prefs->enable_default_replyto = FALSE;
}
if (all || gtk_toggle_button_get_active(
GTK_COMBO_BOX(page->optmenu_default_account));
}
-#if USE_ASPELL
+#if USE_ENCHANT
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_dictionary_rec_checkbtn))) {
prefs->enable_default_dictionary =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_enable_default_dictionary));
FolderItem *item = (FolderItem *) node->data;
FolderItemComposePage *page = (FolderItemComposePage *) data;
- g_return_val_if_fail(item != NULL, TRUE);
- g_return_val_if_fail(page != NULL, TRUE);
+ cm_return_val_if_fail(item != NULL, TRUE);
+ cm_return_val_if_fail(page != NULL, TRUE);
compose_save_folder_prefs(item, page);
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->save_copy_to_folder_rec_checkbtn)) ||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_to_rec_checkbtn)) ||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn)) ||
-#if USE_ASPELL
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_cc_rec_checkbtn)) ||
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_bcc_rec_checkbtn)) ||
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_replyto_rec_checkbtn)) ||
+#if USE_ENCHANT
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->default_reply_to_rec_checkbtn))))
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_reply_to_rec_checkbtn))
+ ))
return TRUE;
else if ((node == page->item->node) && item_protocol(item) == A_NNTP &&
!(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn))
-#if USE_ASPELL
+#if USE_ENCHANT
|| 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
GtkWidget *notebook;
GtkWidget *vbox;
GtkWidget *page_vbox;
+ GtkWidget *no_save_warning;
GtkWidget *new_msg_format_rec_checkbtn;
GtkWidget *reply_format_rec_checkbtn;
GtkWidget *forward_format_rec_checkbtn;
-
+ GtkWidget *hbox;
+ GtkWidget *vbox_format;
+
page->item = item;
page_vbox = gtk_vbox_new (FALSE, 0);
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, 4);
+ }
+
/* Notebook */
notebook = gtk_notebook_new();
gtk_widget_show(notebook);
- gtk_notebook_set_homogeneous_tabs(GTK_NOTEBOOK(notebook), TRUE);
gtk_box_pack_start(GTK_BOX(page_vbox), notebook, TRUE, TRUE, 0);
/* compose format */
window,
vbox,
&page->checkbtn_compose_with_format,
+ &page->compose_override_from_format,
&page->compose_subject_format,
&page->compose_body_format,
- FALSE);
+ FALSE, FALSE);
+ address_completion_register_entry(GTK_ENTRY(page->compose_override_from_format),
+ TRUE);
+
+ vbox_format = gtk_widget_get_parent(
+ gtk_widget_get_parent(page->compose_body_format));
+ hbox = gtk_hbox_new (FALSE, 0);
+ gtk_box_pack_end (GTK_BOX(vbox_format), hbox, FALSE, FALSE, 0);
+ quotefmt_add_info_button(window, hbox);
+
new_msg_format_rec_checkbtn = gtk_check_button_new_with_label(
_("Apply to subfolders"));
- gtk_box_pack_end (GTK_BOX(vbox), new_msg_format_rec_checkbtn, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX(hbox), new_msg_format_rec_checkbtn, FALSE, FALSE, 0);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_label_new(_("Compose")));
/* reply format */
window,
vbox,
&page->checkbtn_reply_with_format,
+ &page->reply_override_from_format,
&page->reply_quotemark,
&page->reply_body_format,
- FALSE);
+ FALSE, FALSE);
+ address_completion_register_entry(GTK_ENTRY(page->reply_override_from_format),
+ TRUE);
+
+ vbox_format = gtk_widget_get_parent(
+ gtk_widget_get_parent(page->reply_body_format));
+
+ hbox = gtk_hbox_new (FALSE, 0);
+ gtk_box_pack_end (GTK_BOX(vbox_format), hbox, FALSE, FALSE, 0);
+ quotefmt_add_info_button(window, hbox);
reply_format_rec_checkbtn = gtk_check_button_new_with_label(
_("Apply to subfolders"));
- gtk_box_pack_end (GTK_BOX(vbox), reply_format_rec_checkbtn, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX(hbox), reply_format_rec_checkbtn, FALSE, FALSE, 0);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_label_new(_("Reply")));
/* forward format */
window,
vbox,
&page->checkbtn_forward_with_format,
+ &page->forward_override_from_format,
&page->forward_quotemark,
&page->forward_body_format,
- FALSE);
+ FALSE, FALSE);
+ address_completion_register_entry(GTK_ENTRY(page->forward_override_from_format),
+ TRUE);
+
+ vbox_format = gtk_widget_get_parent(
+ gtk_widget_get_parent(page->forward_body_format));
+
+ hbox = gtk_hbox_new (FALSE, 0);
+ gtk_box_pack_end (GTK_BOX(vbox_format), hbox, FALSE, FALSE, 0);
+ quotefmt_add_info_button(window, hbox);
forward_format_rec_checkbtn = gtk_check_button_new_with_label(
_("Apply to subfolders"));
- gtk_box_pack_end (GTK_BOX(vbox), forward_format_rec_checkbtn, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX(hbox), forward_format_rec_checkbtn, FALSE, FALSE, 0);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_label_new(_("Forward")));
- /* information button */
- quotefmt_add_info_button(window, page_vbox);
-
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(page->checkbtn_compose_with_format),
item->prefs->compose_with_format);
+ pref_set_entry_from_pref(GTK_ENTRY(page->compose_override_from_format),
+ item->prefs->compose_override_from_format);
pref_set_entry_from_pref(GTK_ENTRY(page->compose_subject_format),
item->prefs->compose_subject_format);
pref_set_textview_from_pref(GTK_TEXT_VIEW(page->compose_body_format),
item->prefs->reply_with_format);
pref_set_entry_from_pref(GTK_ENTRY(page->reply_quotemark),
item->prefs->reply_quotemark);
+ pref_set_entry_from_pref(GTK_ENTRY(page->reply_override_from_format),
+ item->prefs->reply_override_from_format);
pref_set_textview_from_pref(GTK_TEXT_VIEW(page->reply_body_format),
item->prefs->reply_body_format);
item->prefs->forward_with_format);
pref_set_entry_from_pref(GTK_ENTRY(page->forward_quotemark),
item->prefs->forward_quotemark);
+ pref_set_entry_from_pref(GTK_ENTRY(page->forward_override_from_format),
+ item->prefs->forward_override_from_format);
pref_set_textview_from_pref(GTK_TEXT_VIEW(page->forward_body_format),
item->prefs->forward_body_format);
static void prefs_folder_item_templates_destroy_widget_func(PrefsPage *page_)
{
- /* FolderItemTemplatesPage *page = (FolderItemTemplatesPage *) page_; */
+ FolderItemTemplatesPage *page = (FolderItemTemplatesPage *) page_;
+
+ if (page->compose_override_from_format)
+ address_completion_unregister_entry(GTK_ENTRY(page->compose_override_from_format));
+ if (page->reply_override_from_format)
+ address_completion_unregister_entry(GTK_ENTRY(page->reply_override_from_format));
+ if (page->forward_override_from_format)
+ address_completion_unregister_entry(GTK_ENTRY(page->forward_override_from_format));
}
/** \brief Save the prefs in page to folder.
if (page->item == folder)
all = TRUE;
- g_return_if_fail(prefs != NULL);
+ cm_return_if_fail(prefs != NULL);
/* save and check formats */
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->new_msg_format_rec_checkbtn))) {
+
prefs->compose_with_format =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_compose_with_format));
+ prefs->compose_override_from_format = pref_get_pref_from_entry(
+ GTK_ENTRY(page->compose_override_from_format));
prefs->compose_subject_format = pref_get_pref_from_entry(
GTK_ENTRY(page->compose_subject_format));
prefs->compose_body_format = pref_get_pref_from_textview(
GTK_TEXT_VIEW(page->compose_body_format));
quotefmt_check_new_msg_formats(prefs->compose_with_format,
- prefs->compose_subject_format,
- prefs->compose_body_format);
+ prefs->compose_override_from_format,
+ prefs->compose_subject_format,
+ prefs->compose_body_format);
}
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->reply_format_rec_checkbtn))) {
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_reply_with_format));
prefs->reply_quotemark = gtk_editable_get_chars(
GTK_EDITABLE(page->reply_quotemark), 0, -1);
+ prefs->reply_override_from_format = pref_get_pref_from_entry(
+ GTK_ENTRY(page->reply_override_from_format));
prefs->reply_body_format = pref_get_pref_from_textview(
GTK_TEXT_VIEW(page->reply_body_format));
quotefmt_check_reply_formats(prefs->reply_with_format,
+ prefs->reply_override_from_format,
prefs->reply_quotemark,
prefs->reply_body_format);
}
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_forward_with_format));
prefs->forward_quotemark = gtk_editable_get_chars(
GTK_EDITABLE(page->forward_quotemark), 0, -1);
+ prefs->forward_override_from_format = pref_get_pref_from_entry(
+ GTK_ENTRY(page->forward_override_from_format));
prefs->forward_body_format = pref_get_pref_from_textview(
GTK_TEXT_VIEW(page->forward_body_format));
quotefmt_check_forward_formats(prefs->forward_with_format,
+ prefs->forward_override_from_format,
prefs->forward_quotemark,
prefs->forward_body_format);
}
FolderItem *item = (FolderItem *) node->data;
FolderItemTemplatesPage *page = (FolderItemTemplatesPage *) data;
- g_return_val_if_fail(item != NULL, TRUE);
- g_return_val_if_fail(page != NULL, TRUE);
+ cm_return_val_if_fail(item != NULL, TRUE);
+ cm_return_val_if_fail(page != NULL, TRUE);
templates_save_folder_prefs(item, page);
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;
if (!regexp || !regexp[0]) {
gtk_widget_modify_base(page->entry_simplify_subject,
GTK_STATE_NORMAL, NULL);
- if (test_string) {
+ if (test_string)
gtk_entry_set_text(GTK_ENTRY(page->entry_regexp_test_result), test_string);
- g_free(test_string);
- }
+
+ g_free(test_string);
+ g_free(regexp);
return;
}
if (!test_string || !test_string[0]) {
+ g_free(test_string);
g_free(regexp);
return;
}
+#if !GTK_CHECK_VERSION(3, 0, 0)
if (!colors_initialised) {
gdk_color_parse("#ff7070", &red);
colors_initialised = gdk_colormap_alloc_color(
gdk_colormap_get_system(), &red, FALSE, TRUE);
}
+#endif
preg = summary_compile_simplify_regexp(regexp);
- if (colors_initialised) {
+#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[3];
static GSList *prefs_pages = NULL;
+static void prefs_folder_item_address_completion_start(GtkWindow * window)
+{
+ address_completion_start(GTK_WIDGET(window));
+}
+
+static void prefs_folder_item_address_completion_end(GtkWindow * window)
+{
+ address_completion_end(GTK_WIDGET(window));
+}
+
void prefs_folder_item_open(FolderItem *item)
{
gchar *id, *title;
title = g_strdup_printf (_("Properties for folder %s"), id);
g_free (id);
prefswindow_open(title, prefs_pages, item,
- &prefs_common.folderitemwin_width, &prefs_common.folderitemwin_height);
-
+ &prefs_common.folderitemwin_width, &prefs_common.folderitemwin_height,
+ prefs_folder_item_address_completion_start,
+ prefs_folder_item_address_completion_end);
+
g_free (title);
}
{
prefs_pages = g_slist_append(prefs_pages, page);
}
-
-static void prefs_folder_item_unregister_page(PrefsPage *page)
-{
- prefs_pages = g_slist_remove(prefs_pages, page);
-}
projects / claws.git / blobdiff