debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Implement Always use my font choices preference

Browse source 
Patch based on input from Peter Hatina.

Fixes: https://bugs.launchpad.net/midori/+bug/826441
This commit is contained in:
Christian Dywan 2011-10-26 21:11:50 +02:00
parent 0388f2fa39
commit 968c967592
2 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
midori/midori-preferences.c
View file

@ -351,6 +351,8 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
entry = katze_property_proxy (settings, "minimum-font-size", NULL); entry = katze_property_proxy (settings, "minimum-font-size", NULL);
gtk_widget_set_tooltip_text (entry, _("The minimum font size used to display text")); gtk_widget_set_tooltip_text (entry, _("The minimum font size used to display text"));
SPANNED_ADD (entry); SPANNED_ADD (entry);
button = katze_property_proxy (settings, "enforce-font-family", NULL);
INDENTED_ADD (button);
#endif #endif
label = katze_property_label (settings, "preferred-encoding"); label = katze_property_label (settings, "preferred-encoding");
INDENTED_ADD (label); INDENTED_ADD (label);

35
midori/midori-websettings.c
View file

@ -92,6 +92,7 @@ struct _MidoriWebSettings
gboolean enable_dns_prefetching; gboolean enable_dns_prefetching;
#endif #endif
gboolean strip_referer; gboolean strip_referer;
gboolean enforce_font_family;
gboolean flash_window_on_bg_tabs; gboolean flash_window_on_bg_tabs;
GHashTable* user_stylesheets; GHashTable* user_stylesheets;
}; };
@ -175,6 +176,7 @@ enum
PROP_CLEAR_DATA, PROP_CLEAR_DATA,
PROP_ENABLE_DNS_PREFETCHING, PROP_ENABLE_DNS_PREFETCHING,
PROP_STRIP_REFERER, PROP_STRIP_REFERER,
PROP_ENFORCE_FONT_FAMILY,
}; };
GType GType
@ -1052,7 +1054,21 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
_("Whether the \"Referer\" header should be shortened to the hostname"), _("Whether the \"Referer\" header should be shortened to the hostname"),
FALSE, FALSE,
flags)); flags));
/**
* MidoriWebSettings:enforc-font-family:
*
* Whether to enforce user font preferences with an internal stylesheet.
*
* Since: 0.4.2
*/
g_object_class_install_property (gobject_class,
PROP_ENFORCE_FONT_FAMILY,
g_param_spec_boolean (
"enforce-font-family",
_("Always use my font choices"),
_("Override fonts picked by websites with user preferences"),
FALSE,
flags));
} }
static void static void
@ -1453,6 +1469,20 @@ midori_web_settings_set_property (GObject* object,
case PROP_STRIP_REFERER: case PROP_STRIP_REFERER:
web_settings->strip_referer = g_value_get_boolean (value); web_settings->strip_referer = g_value_get_boolean (value);
break; break;
case PROP_ENFORCE_FONT_FAMILY:
if ((web_settings->enforce_font_family = g_value_get_boolean (value)))
{
gchar* font_family = katze_object_get_string (web_settings,
"default-font-family");
gchar* css = g_strdup_printf ("* { font-family: %s !important; }",
font_family);
midori_web_settings_add_style (web_settings, "enforce-font-family", css);
g_free (font_family);
g_free (css);
}
else
midori_web_settings_remove_style (web_settings, "enforce-font-family");
break;
case PROP_FLASH_WINDOW_ON_BG_TABS: case PROP_FLASH_WINDOW_ON_BG_TABS:
web_settings->flash_window_on_bg_tabs = g_value_get_boolean (value); web_settings->flash_window_on_bg_tabs = g_value_get_boolean (value);
break; break;
@ -1711,6 +1741,9 @@ midori_web_settings_get_property (GObject* object,
case PROP_STRIP_REFERER: case PROP_STRIP_REFERER:
g_value_set_boolean (value, web_settings->strip_referer); g_value_set_boolean (value, web_settings->strip_referer);
break; break;
case PROP_ENFORCE_FONT_FAMILY:
g_value_set_boolean (value, web_settings->enforce_font_family);
break;
case PROP_FLASH_WINDOW_ON_BG_TABS: case PROP_FLASH_WINDOW_ON_BG_TABS:
g_value_set_boolean (value, web_settings->flash_window_on_bg_tabs); g_value_set_boolean (value, web_settings->flash_window_on_bg_tabs);
break; break;