/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2015 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
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.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 *entry_offlinesync;
GtkWidget *label_end_offlinesync;
GtkWidget *checkbtn_remove_old_offlinesync;
+ GtkWidget *promote_html_part;
/* apply to sub folders */
#ifndef G_OS_WIN32
GtkWidget *enable_processing_when_opening_rec_checkbtn;
GtkWidget *newmailcheck_rec_checkbtn;
GtkWidget *offlinesync_rec_checkbtn;
+ GtkWidget *promote_html_part_rec_checkbtn;
gint 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;
GtkWidget *enable_processing_when_opening_rec_checkbtn;
GtkWidget *newmailcheck_rec_checkbtn;
GtkWidget *offlinesync_rec_checkbtn;
+ GtkWidget *promote_html_part_rec_checkbtn;
page->item = item;
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->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;
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;
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;
summary_update_needed = TRUE;
}
+ 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;
+
#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;
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;
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) {
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);
+ 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);
#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,
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)
{
- prefs_pages = g_slist_append(prefs_pages, page);
+ 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)
+{
+ 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