From 51a35cd8be6904a3bb477eccc544a186a66b541c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 30 Mar 2010 08:27:49 -0400 Subject: 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. --- modules/mail/em-composer-prefs.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'modules/mail/em-composer-prefs.c') diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index 3d1cf2ed08..eabde51396 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"); e_binding_new_with_negation ( shell_settings, "disable-command-line", -- cgit v1.2.3 From 3dfd9aa7c4b24f8971382dcc5278714956066ff8 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 21 Mar 2010 00:12:01 +0100 Subject: [win32] Be consistent in disabling the lockdown options. --- modules/mail/em-composer-prefs.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'modules/mail/em-composer-prefs.c') diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index 3d1cf2ed08..574657806e 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -521,9 +521,11 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, shell_settings, "composer-format-html", widget, "prefer-html"); +#ifndef G_OS_WIN32 e_binding_new_with_negation ( shell_settings, "disable-command-line", widget, "allow-scripts"); +#endif signature_tree_view = e_signature_manager_get_tree_view ( E_SIGNATURE_MANAGER (widget)); @@ -533,9 +535,11 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, gtk_container_add (GTK_CONTAINER (container), widget); gtk_widget_show (widget); +#ifndef G_OS_WIN32 e_binding_new_with_negation ( shell_settings, "disable-command-line", widget, "allow-scripts"); +#endif e_binding_new ( signature_tree_view, "selected", -- cgit v1.2.3 From 17af1857c0f8f1706d159c33d0cfcb9940fb0cb2 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Wed, 7 Apr 2010 17:31:13 -0500 Subject: Hide widgets for the composer's preferences in Express mode Signed-off-by: Federico Mena Quintero --- modules/mail/em-composer-prefs.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'modules/mail/em-composer-prefs.c') diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index eabde51396..05c4bd30c2 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -36,6 +36,7 @@ #include "em-composer-prefs.h" #include "composer/e-msg-composer.h" +#include "shell/e-shell-utils.h" #include @@ -548,6 +549,9 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, signature_tree_view, "selected", widget, "signature"); + /* Sanitize the dialog for Express mode */ + e_shell_hide_widgets_for_express_mode (shell, prefs->builder, "/apps/evolution/mail/composer/express_preferences_hidden"); + /* get our toplevel widget */ target = em_config_target_new_prefs (ec, client); e_config_set_target ((EConfig *)ec, (EConfigTarget *)target); -- cgit v1.2.3 From 0b07840e26f7c793939ec8226695ffca19aa1bfb Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Mon, 26 Apr 2010 18:13:24 -0500 Subject: Don't use gconf to store the names of widgets to hide That was just for development. Now we hardcode the lists of widgets. Signed-off-by: Federico Mena Quintero --- modules/mail/em-composer-prefs.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'modules/mail/em-composer-prefs.c') diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index 72c5d18b25..49f2fda5b6 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -554,7 +554,12 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, widget, "signature"); /* Sanitize the dialog for Express mode */ - e_shell_hide_widgets_for_express_mode (shell, prefs->builder, "/apps/evolution/mail/composer/express_preferences_hidden"); + e_shell_hide_widgets_for_express_mode (shell, prefs->builder, + "chkOutlookFilenames", + "vboxTopPosting", + "labelAlerts", + "chkPromptEmptySubject", + NULL); /* get our toplevel widget */ target = em_config_target_new_prefs (ec, client); -- cgit v1.2.3