GNOME.org
 

[evolution/webkit-composer: 86/147] Remove option to set spell-checking color

commit e6ee4e6b1f229cbc6f877d08464848c6e8baf1e6
Author: Dan VrÃtil <dvratil redhat com>
Date:   Mon Nov 5 20:30:20 2012 +0100

    Remove option to set spell-checking color
    
    This was a special feature supported by GtkHTML, however
    WebKit does not seem to support it. It should use whatever
    is set as sytem default.

 composer/e-msg-composer.c                    |   10 --
 data/org.gnome.evolution.mail.gschema.xml.in |    5 -
 mail/mail-config.ui                          |   42 -----
 modules/mail/e-mail-shell-settings.c         |    5 -
 modules/mail/em-composer-prefs.c             |   10 --
 modules/settings/e-settings-web-view.c       |  212 ++++++++++++++++++++++++--
 6 files changed, 198 insertions(+), 86 deletions(-)
---
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 6579a39..7e5358f 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -3245,13 +3245,8 @@ e_msg_composer_new_with_message (EShell *shell,
 				e_destination_set_name (dest, name);
 				e_destination_set_email (dest, addr);
 
-<<<<<<< HEAD
 				if (g_hash_table_contains (auto_cc, addr))
-=======
-				if (g_hash_table_lookup (auto_cc, addr)) {
->>>>>>> Convert EEditorWidget::Mode property to boolean
 					e_destination_set_auto_recipient (dest, TRUE);
-				}
 
 				Cc = g_list_append (Cc, dest);
 			}
@@ -3270,13 +3265,8 @@ e_msg_composer_new_with_message (EShell *shell,
 				e_destination_set_name (dest, name);
 				e_destination_set_email (dest, addr);
 
-<<<<<<< HEAD
 				if (g_hash_table_contains (auto_bcc, addr))
-=======
-				if (g_hash_table_lookup (auto_bcc, addr)) {
->>>>>>> Convert EEditorWidget::Mode property to boolean
 					e_destination_set_auto_recipient (dest, TRUE);
-				}
 
 				Bcc = g_list_append (Bcc, dest);
 			}
diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in
index 0e83413..bb6725c 100644
--- a/data/org.gnome.evolution.mail.gschema.xml.in
+++ b/data/org.gnome.evolution.mail.gschema.xml.in
@@ -65,11 +65,6 @@
       <_summary>Send HTML mail by default</_summary>
       <_description>Send HTML mail by default.</_description>
     </key>
-    <key name="composer-spell-color" type="s">
-      <default>'#FFFF00000000'</default>
-      <_summary>Spell checking color</_summary>
-      <_description>Underline color for misspelled words when using inline spelling.</_description>
-    </key>
     <key name="composer-spell-languages" type="as">
       <default>[]</default>
       <_summary>Spell checking languages</_summary>
diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index 162cdd4..703df2f 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -786,48 +786,6 @@
                         <property name="position">0</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkHBox" id="hboxSpellCheckColor">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkLabel" id="lblSpellCheckColor">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Color for _misspelled words:</property>
-                            <property name="use_underline">True</property>
-                            <property name="justify">center</property>
-                            <property name="mnemonic_widget">colorButtonSpellCheckColor</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkColorButton" id="colorButtonSpellCheckColor">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="title" translatable="yes">Pick a color</property>
-                            <property name="color">#000000000000</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
                   </object>
                 </child>
               </object>
diff --git a/modules/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c
index 3b0c6b5..167afc9 100644
--- a/modules/mail/e-mail-shell-settings.c
+++ b/modules/mail/e-mail-shell-settings.c
@@ -342,11 +342,6 @@ e_mail_shell_settings_init (EShellBackend *shell_backend)
 		"composer-request-receipt");
 
 	e_shell_settings_install_property_for_key (
-		"composer-spell-color",
-		MAIL_SCHEMA,
-		"composer-spell-color");
-
-	e_shell_settings_install_property_for_key (
 		"composer-top-signature",
 		MAIL_SCHEMA,
 		"composer-top-signature");
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 554f20c..e9cea49 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -509,16 +509,6 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
 		GTK_IMAGE (info_pixmap),
 		GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_BUTTON);
 
-	widget = e_builder_get_widget (prefs->builder, "colorButtonSpellCheckColor");
-	g_object_bind_property_full (
-		shell_settings, "composer-spell-color",
-		widget, "color",
-		G_BINDING_BIDIRECTIONAL |
-		G_BINDING_SYNC_CREATE,
-		e_binding_transform_string_to_color,
-		e_binding_transform_color_to_string,
-		NULL, (GDestroyNotify) NULL);
-
 	spell_setup (prefs);
 
 	/* Forwards and Replies */
diff --git a/modules/settings/e-settings-web-view.c b/modules/settings/e-settings-web-view.c
index c8da19f..e2e1b3d 100644
--- a/modules/settings/e-settings-web-view.c
+++ b/modules/settings/e-settings-web-view.c
@@ -32,7 +32,8 @@
 	((obj), E_TYPE_SETTINGS_WEB_VIEW, ESettingsWebViewPrivate))
 
 struct _ESettingsWebViewPrivate {
-	gint placeholder;
+	GtkCssProvider *css_provider;
+	EShellSettings *shell_settings;
 };
 
 G_DEFINE_DYNAMIC_TYPE (
@@ -40,34 +41,216 @@ G_DEFINE_DYNAMIC_TYPE (
 	e_settings_web_view,
 	E_TYPE_EXTENSION)
 
+/* replaces content of color string */
 static void
-settings_web_view_constructed (GObject *object)
+fix_color_string (gchar *color_string)
 {
-	EShell *shell;
-	EShellSettings *shell_settings;
+	GdkColor color;
+
+	if (!color_string || strlen (color_string) < 13)
+		return;
+
+	if (!gdk_color_parse (color_string, &color))
+		return;
+
+	sprintf (
+		color_string, "#%02x%02x%02x",
+		(gint) color.red * 256 / 65536,
+		(gint) color.green * 256 / 65536,
+		(gint) color.blue * 256 / 65536);
+}
+
+static void
+settings_web_view_load_style (ESettingsWebView *extension)
+{
+	GString *buffer;
+	gchar *citation_color;
+	gchar *monospace_font;
+	gchar *variable_font;
+	gboolean custom_fonts;
+	gboolean mark_citations;
 	EExtensible *extensible;
+	EShellSettings *shell_settings;
+	GtkStyleContext *style_context;
+	GError *error = NULL;
 
-	shell = e_shell_get_default ();
-	shell_settings = e_shell_get_shell_settings (shell);
+	/* Some of our mail and composer preferences are passed down to
+	 * GtkHtml through style properties, unfortunately.  This builds
+	 * a style sheet for the EWebView using values from GSettings. */
+
+	shell_settings = extension->priv->shell_settings;
+
+	custom_fonts = e_shell_settings_get_boolean (
+		shell_settings, "mail-use-custom-fonts");
+
+	monospace_font = e_shell_settings_get_string (
+		shell_settings, "mail-font-monospace");
 
-	extensible = e_extension_get_extensible (E_EXTENSION (object));
+	variable_font = e_shell_settings_get_string (
+		shell_settings, "mail-font-variable");
+
+	mark_citations = e_shell_settings_get_boolean (
+		shell_settings, "mail-mark-citations");
+
+	citation_color = e_shell_settings_get_string (
+		shell_settings, "mail-citation-color");
+
+	buffer = g_string_new ("EWebView {\n");
+
+	fix_color_string (citation_color);
+
+	if (custom_fonts && variable_font != NULL)
+		g_string_append_printf (
+			buffer, "  font: %s;\n", variable_font);
+
+	if (custom_fonts && monospace_font != NULL)
+		g_string_append_printf (
+			buffer, "  -GtkHTML-fixed-font-name: '%s';\n",
+			monospace_font);
+
+	if (mark_citations && citation_color != NULL)
+		g_string_append_printf (
+			buffer, "  -GtkHTML-cite-color: %s;\n",
+			citation_color);
+
+	g_string_append (buffer, "}\n");
+
+	gtk_css_provider_load_from_data (
+		extension->priv->css_provider,
+		buffer->str, buffer->len, &error);
+
+	if (error != NULL) {
+		g_warning ("%s", error->message);
+		g_error_free (error);
+	}
+
+	g_string_free (buffer, TRUE);
+
+	g_free (monospace_font);
+	g_free (variable_font);
+	g_free (citation_color);
+
+	extensible = e_extension_get_extensible (E_EXTENSION (extension));
+	style_context = gtk_widget_get_style_context (GTK_WIDGET (extensible));
+	gtk_style_context_invalidate (style_context);
+}
+
+static void
+settings_web_view_realize (GtkWidget *widget,
+                              ESettingsWebView *extension)
+{
+	EShellSettings *shell_settings;
+
+	shell_settings = extension->priv->shell_settings;
 
 	g_object_bind_property (
-		shell_settings, "composer-inline-spelling",
-		extensible, "inline-spelling",
+		shell_settings,
+		"composer-inline-spelling",
+		widget, "inline-spelling",
 		G_BINDING_SYNC_CREATE);
 
 	g_object_bind_property (
-		shell_settings, "composer-magic-links",
-		extensible, "magic-links",
+		shell_settings,
+		"composer-magic-links",
+		widget, "magic-links",
 		G_BINDING_SYNC_CREATE);
 
 	g_object_bind_property (
-		shell_settings, "composer-magic-smileys",
-		extensible, "magic-smileys",
+		shell_settings,
+		"composer-magic-smileys",
+		widget, "magic-smileys",
 		G_BINDING_SYNC_CREATE);
 
-	/* Chain up to parent's constructed() method. */
+	gtk_style_context_add_provider (
+		gtk_widget_get_style_context (widget),
+		GTK_STYLE_PROVIDER (extension->priv->css_provider),
+		GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+
+	settings_web_view_load_style (extension);
+
+	/* Reload the style sheet when certain settings change. */
+
+	g_signal_connect_swapped (
+		shell_settings,
+		"notify::mail-use-custom-fonts",
+		G_CALLBACK (settings_web_view_load_style),
+		extension);
+
+	g_signal_connect_swapped (
+		shell_settings,
+		"notify::mail-font-monospace",
+		G_CALLBACK (settings_web_view_load_style),
+		extension);
+
+	g_signal_connect_swapped (
+		shell_settings,
+		"notify::mail-font-variable",
+		G_CALLBACK (settings_web_view_load_style),
+		extension);
+
+	g_signal_connect_swapped (
+		shell_settings,
+		"notify::mail-mark-citations",
+		G_CALLBACK (settings_web_view_load_style),
+		extension);
+
+	g_signal_connect_swapped (
+		shell_settings,
+		"notify::mail-citation-color",
+		G_CALLBACK (settings_web_view_load_style),
+		extension);
+}
+
+static void
+settings_web_view_dispose (GObject *object)
+{
+	ESettingsWebViewPrivate *priv;
+
+	priv = E_SETTINGS_WEB_VIEW_GET_PRIVATE (object);
+
+	if (priv->css_provider != NULL) {
+		g_object_unref (priv->css_provider);
+		priv->css_provider = NULL;
+	}
+
+	if (priv->shell_settings != NULL) {
+		g_signal_handlers_disconnect_by_func (
+			priv->shell_settings,
+			settings_web_view_load_style, object);
+		g_object_unref (priv->shell_settings);
+		priv->shell_settings = NULL;
+	}
+
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_settings_web_view_parent_class)->dispose (object);
+}
+
+static void
+settings_web_view_constructed (GObject *object)
+{
+	EShell *shell;
+	EShellSettings *shell_settings;
+	ESettingsWebView *extension;
+	EExtensible *extensible;
+
+	shell = e_shell_get_default ();
+	shell_settings = e_shell_get_shell_settings (shell);
+
+	extension = (ESettingsWebView *) object;
+	extensible = e_extension_get_extensible (E_EXTENSION (extension));
+
+	extension->priv->css_provider = gtk_css_provider_new ();
+	extension->priv->shell_settings = g_object_ref (shell_settings);
+
+	/* Wait to bind shell settings until the EWebView is realized
+	 * so GtkhtmlEditor has a chance to install a GtkHTMLEditorAPI.
+	 * Otherwise our settings will have no effect. */
+
+	g_signal_connect (
+		extensible, "realize",
+		G_CALLBACK (settings_web_view_realize), extension);
+
+	/* Chain up to parent's consturcted() method. */
 	G_OBJECT_CLASS (e_settings_web_view_parent_class)->
 		constructed (object);
 }
@@ -81,6 +264,7 @@ e_settings_web_view_class_init (ESettingsWebViewClass *class)
 	g_type_class_add_private (class, sizeof (ESettingsWebViewPrivate));
 
 	object_class = G_OBJECT_CLASS (class);
+	object_class->dispose = settings_web_view_dispose;
 	object_class->constructed = settings_web_view_constructed;
 
 	extension_class = E_EXTENSION_CLASS (class);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]