aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-03-30 20:27:49 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-03-30 21:25:30 +0800
commitc516014a5afb2338d1b2e6d7b0438a1835bf9fa8 (patch)
tree6f426c92f76dd7fedaf9c907f199610e01677dd5 /modules
parentca79c7993fc6ed146c62d3ce984878350be7c110 (diff)
downloadgsoc2013-evolution-c516014a5afb2338d1b2e6d7b0438a1835bf9fa8.tar
gsoc2013-evolution-c516014a5afb2338d1b2e6d7b0438a1835bf9fa8.tar.gz
gsoc2013-evolution-c516014a5afb2338d1b2e6d7b0438a1835bf9fa8.tar.bz2
gsoc2013-evolution-c516014a5afb2338d1b2e6d7b0438a1835bf9fa8.tar.lz
gsoc2013-evolution-c516014a5afb2338d1b2e6d7b0438a1835bf9fa8.tar.xz
gsoc2013-evolution-c516014a5afb2338d1b2e6d7b0438a1835bf9fa8.tar.zst
gsoc2013-evolution-c516014a5afb2338d1b2e6d7b0438a1835bf9fa8.zip
Express: Composer always defaults to HTML mode
Composer and signature editor always default to HTML in Express mode. Hide the corresponding composer preference. This will not affect the user preference in normal mode.
Diffstat (limited to 'modules')
-rw-r--r--modules/mail/e-mail-shell-backend.c11
-rw-r--r--modules/mail/em-composer-prefs.c19
2 files changed, 24 insertions, 6 deletions
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index 00b4a78dc6..b3eb0a97c1 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -413,12 +413,23 @@ mail_shell_backend_window_created_cb (EShell *shell,
/* This applies to both the composer and signature editor. */
if (GTKHTML_IS_EDITOR (window)) {
+ EShellSettings *shell_settings;
GList *spell_languages;
+ gboolean active = TRUE;
spell_languages = e_load_spell_languages ();
gtkhtml_editor_set_spell_languages (
GTKHTML_EDITOR (window), spell_languages);
g_list_free (spell_languages);
+
+ shell_settings = e_shell_get_shell_settings (shell);
+
+ /* Express mode does not honor this setting. */
+ if (!e_shell_get_express_mode (shell))
+ active = e_shell_settings_get_boolean (
+ shell_settings, "composer-format-html");
+
+ gtkhtml_editor_set_html_mode (GTKHTML_EDITOR (window), active);
}
if (E_IS_MSG_COMPOSER (window)) {
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 574657806e..53a9888a47 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -398,10 +398,15 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
/* General tab */
/* Default Behavior */
+
+ /* Express mode does not honor this setting. */
widget = e_builder_get_widget (prefs->builder, "chkSendHTML");
- e_mutual_binding_new (
- shell_settings, "composer-format-html",
- widget, "active");
+ if (e_shell_get_express_mode (shell))
+ gtk_widget_hide (widget);
+ else
+ e_mutual_binding_new (
+ shell_settings, "composer-format-html",
+ widget, "active");
widget = e_builder_get_widget (prefs->builder, "chkPromptEmptySubject");
e_mutual_binding_new (
@@ -517,9 +522,11 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
widget, "editor-created",
G_CALLBACK (e_shell_watch_window), shell);
- e_binding_new (
- shell_settings, "composer-format-html",
- widget, "prefer-html");
+ /* Express mode does not honor this setting. */
+ if (!e_shell_get_express_mode (shell))
+ e_binding_new (
+ shell_settings, "composer-format-html",
+ widget, "prefer-html");
#ifndef G_OS_WIN32
e_binding_new_with_negation (