/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * 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
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
#include "string_match.h"
#include "quote_fmt.h"
#include "combobox.h"
+#include "stock_pixmap.h"
#if USE_ENCHANT
#include "gtkaspell.h"
string = (value); \
}
-static void prefs_folder_item_register_page (PrefsPage *page);
-
typedef struct _FolderItemGeneralPage FolderItemGeneralPage;
typedef struct _FolderItemComposePage FolderItemComposePage;
typedef struct _FolderItemTemplatesPage FolderItemTemplatesPage;
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 *entry_offlinesync;
GtkWidget *label_end_offlinesync;
GtkWidget *checkbtn_remove_old_offlinesync;
+ 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 *enable_processing_when_opening_rec_checkbtn;
GtkWidget *newmailcheck_rec_checkbtn;
GtkWidget *offlinesync_rec_checkbtn;
+ GtkWidget *promote_html_part_rec_checkbtn;
gint folder_color;
};
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 *entry_offlinesync;
GtkWidget *label_end_offlinesync;
GtkWidget *checkbtn_remove_old_offlinesync;
+ 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;
GtkWidget *enable_processing_when_opening_rec_checkbtn;
GtkWidget *newmailcheck_rec_checkbtn;
GtkWidget *offlinesync_rec_checkbtn;
- CLAWS_TIP_DECL();
+ GtkWidget *promote_html_part_rec_checkbtn;
page->item = item;
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,
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,
rowcount++;
+ /* Select HTML part by default? */
+ 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(_("Select the HTML part of multipart messages"));
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 0);
+
+ promote_html_part = gtkut_sc_combobox_create (NULL, FALSE);
+ gtk_widget_show (promote_html_part);
+ gtk_box_pack_start (GTK_BOX(hbox), promote_html_part, FALSE, FALSE, 0);
+
+ promote_html_part_menu = GTK_LIST_STORE(gtk_combo_box_get_model(
+ GTK_COMBO_BOX(promote_html_part)));
+ COMBOBOX_ADD (promote_html_part_menu, _("Default"), HTML_PROMOTE_DEFAULT);
+ COMBOBOX_ADD (promote_html_part_menu, _("No"), HTML_PROMOTE_NEVER);
+ COMBOBOX_ADD (promote_html_part_menu, _("Yes"), HTML_PROMOTE_ALWAYS);
+
+ combobox_select_by_data(GTK_COMBO_BOX(promote_html_part),
+ item->prefs->promote_html_part);
+
+ CLAWS_SET_TIP(hbox, _("\"Default\" will follow global preference (found in /Preferences/"
+ "Message View/Text Options)"));
+
+ promote_html_part_rec_checkbtn = gtk_check_button_new();
+ 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++;
+
/* Synchronise folder for offline use */
checkbtn_offlinesync = gtk_check_button_new_with_label(_("Synchronise for offline use"));
gtk_table_attach(GTK_TABLE(table), checkbtn_offlinesync, 0, 2,
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->entry_offlinesync = entry_offlinesync;
page->label_end_offlinesync = label_end_offlinesync;
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->enable_processing_when_opening_rec_checkbtn = enable_processing_when_opening_rec_checkbtn;
page->newmailcheck_rec_checkbtn = newmailcheck_rec_checkbtn;
page->offlinesync_rec_checkbtn = offlinesync_rec_checkbtn;
+ page->promote_html_part_rec_checkbtn = promote_html_part_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;
+ HTMLPromoteType promote_html_part = HTML_PROMOTE_DEFAULT;
if (folder->path == NULL)
return;
type = combobox_get_active_data(GTK_COMBO_BOX(page->folder_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
+ promote_html_part =
+ combobox_get_active_data(GTK_COMBO_BOX(page->promote_html_part));
+ if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->promote_html_part_rec_checkbtn)))
+ prefs->promote_html_part = promote_html_part;
+
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)
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)) ||
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->offlinesync_rec_checkbtn)) ||
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->promote_html_part_rec_checkbtn))
+ ))
return TRUE;
else
return FALSE;
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);
+ text = g_strdup_printf(_("Default %s"), 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);
rowcount++;
/* Default address to reply to */
- text = g_strconcat(_("Default "), prefs_common_translated_header_name("To:"),
+ text = g_strdup_printf(_("Default %s"), 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++;
/* Default Cc */
- text = g_strconcat(_("Default "), prefs_common_translated_header_name("Cc:"), NULL);
+ text = g_strdup_printf(_("Default %s"), 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);
rowcount++;
/* Default Bcc */
- text = g_strconcat(_("Default "), prefs_common_translated_header_name("Bcc:"), NULL);
+ text = g_strdup_printf(_("Default %s"), 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);
rowcount++;
/* Default Reply-to */
- text = g_strconcat(_("Default "), prefs_common_translated_header_name("Reply-To:"), NULL);
+ text = g_strdup_printf(_("Default %s"), 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);
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_container_set_border_width (GTK_CONTAINER (page_vbox), VBOX_BORDER);
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);
+ 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 */
notebook = gtk_notebook_new();
gtk_widget_show(notebook);
- gtk_box_pack_start(GTK_BOX(page_vbox), notebook, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(page_vbox), notebook, TRUE, TRUE, 4);
/* compose format */
vbox = gtk_vbox_new (FALSE, VSPACING);
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), hbox, FALSE, 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(
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), hbox, FALSE, 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(
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), hbox, FALSE, 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(
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, g_strconcat("+", _("Discard"), NULL),
+ NULL, FALSE, NULL, ALERT_WARNING, G_ALERTDEFAULT)
!= 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);
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 gchar *pfi_general_path[2];
static FolderItemGeneralPage folder_item_general_page;
- pfi_general_path[0] = _("Folder");
- pfi_general_path[1] = _("General");
- pfi_general_path[2] = NULL;
+ pfi_general_path[0] = _("General");
+ pfi_general_path[1] = NULL;
folder_item_general_page.page.path = pfi_general_path;
folder_item_general_page.page.create_widget = prefs_folder_item_general_create_widget_func;
folder_item_general_page.page.destroy_widget = prefs_folder_item_general_destroy_widget_func;
folder_item_general_page.page.save_page = prefs_folder_item_general_save_func;
- prefs_folder_item_register_page((PrefsPage *) &folder_item_general_page);
+ prefs_folder_item_register_page((PrefsPage *) &folder_item_general_page, NULL);
}
static void register_compose_page(void)
{
- static gchar *pfi_compose_path[3];
+ static gchar *pfi_compose_path[2];
static FolderItemComposePage folder_item_compose_page;
- pfi_compose_path[0] = _("Folder");
- pfi_compose_path[1] = _("Compose");
- pfi_compose_path[2] = NULL;
+ pfi_compose_path[0] = _("Compose");
+ pfi_compose_path[1] = NULL;
folder_item_compose_page.page.path = pfi_compose_path;
folder_item_compose_page.page.create_widget = prefs_folder_item_compose_create_widget_func;
folder_item_compose_page.page.destroy_widget = prefs_folder_item_compose_destroy_widget_func;
folder_item_compose_page.page.save_page = prefs_folder_item_compose_save_func;
- prefs_folder_item_register_page((PrefsPage *) &folder_item_compose_page);
+ prefs_folder_item_register_page((PrefsPage *) &folder_item_compose_page, NULL);
}
static void register_templates_page(void)
{
- static gchar *pfi_templates_path[3];
+ static gchar *pfi_templates_path[2];
static FolderItemTemplatesPage folder_item_templates_page;
- pfi_templates_path[0] = _("Folder");
- pfi_templates_path[1] = _("Templates");
- pfi_templates_path[2] = NULL;
+ pfi_templates_path[0] = _("Templates");
+ pfi_templates_path[1] = NULL;
folder_item_templates_page.page.path = pfi_templates_path;
folder_item_templates_page.page.create_widget = prefs_folder_item_templates_create_widget_func;
folder_item_templates_page.page.destroy_widget = prefs_folder_item_templates_destroy_widget_func;
folder_item_templates_page.page.save_page = prefs_folder_item_templates_save_func;
- prefs_folder_item_register_page((PrefsPage *) &folder_item_templates_page);
+ prefs_folder_item_register_page((PrefsPage *) &folder_item_templates_page, NULL);
}
static GSList *prefs_pages = NULL;
-static void prefs_folder_item_address_completion_start(GtkWindow * window)
+static void prefs_folder_item_address_completion_start(PrefsWindow *window)
{
- address_completion_start(GTK_WIDGET(window));
+ address_completion_start(window->window);
}
-static void prefs_folder_item_address_completion_end(GtkWindow * window)
+static void prefs_folder_item_address_completion_end(PrefsWindow *window)
{
- address_completion_end(GTK_WIDGET(window));
+ address_completion_end(window->window);
}
void prefs_folder_item_open(FolderItem *item)
{
gchar *id, *title;
+ GSList *pages;
+
if (prefs_pages == NULL) {
register_general_page();
register_compose_page();
id = g_strdup(item->name);
can_save = FALSE;
}
+
+ pages = g_slist_concat(
+ g_slist_copy(prefs_pages),
+ g_slist_copy(item->folder->klass->prefs_pages));
+
title = g_strdup_printf (_("Properties for folder %s"), id);
g_free (id);
- prefswindow_open(title, prefs_pages, item,
+ prefswindow_open(title, pages, item,
&prefs_common.folderitemwin_width, &prefs_common.folderitemwin_height,
prefs_folder_item_address_completion_start,
+ NULL,
prefs_folder_item_address_completion_end);
+ g_slist_free(pages);
g_free (title);
}
-static void prefs_folder_item_register_page(PrefsPage *page)
+void prefs_folder_item_register_page(PrefsPage *page, FolderClass *klass)
+{
+ if (klass != NULL)
+ klass->prefs_pages = g_slist_append(klass->prefs_pages, page);
+ else
+ prefs_pages = g_slist_append(prefs_pages, page);
+}
+
+void prefs_folder_item_unregister_page(PrefsPage *page, FolderClass *klass)
{
- prefs_pages = g_slist_append(prefs_pages, page);
+ if (klass != NULL)
+ klass->prefs_pages = g_slist_remove(klass->prefs_pages, page);
+ else
+ prefs_pages = g_slist_remove(prefs_pages, page);
}
projects / claws.git / blobdiff