applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Read WindowTitleFont and DocumentsFont from meta-theme and use to set the

Browse source 
2007-12-21  Luca Ferretti  <elle.uca@libero.it>

	* appearance-themes.c: (theme_message_area_response_cb),
	(theme_message_area_update), (themes_init):
	* theme-util.h:
	Read WindowTitleFont and DocumentsFont from meta-theme
	and use to set the value for /apps/metacity/general/titlebar_font
	and /desktop/gnome/interface/document_font_name GConf keys.
	This closes bug #504250


svn path=/trunk/; revision=8341
This commit is contained in:
Luca Ferretti 2007-12-21 19:42:29 +00:00 • committed by Luca Ferretti
parent bac3c4a227
commit 1cbc2bd47d
3 changed files with 36 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
capplets/appearance/ChangeLog
View file

@ -1,3 +1,13 @@
2007-12-21 Luca Ferretti <elle.uca@libero.it>
* appearance-themes.c: (theme_message_area_response_cb),
(theme_message_area_update), (themes_init):
* theme-util.h:
Read WindowTitleFont and DocumentsFont from meta-theme
and use to set the value for /apps/metacity/general/titlebar_font
and /desktop/gnome/interface/document_font_name GConf keys.
This closes bug #504250
2007-12-06 Jens Granseuer <jensgr@gmx.net> 2007-12-06 Jens Granseuer <jensgr@gmx.net>
* gnome-wp-item.c: (gnome_wp_item_update_description): slightly change * gnome-wp-item.c: (gnome_wp_item_update_description): slightly change

24
capplets/appearance/appearance-themes.c
View file

@ -439,10 +439,18 @@ theme_message_area_response_cb (GtkWidget *w,
gconf_client_set_string (data->client, APPLICATION_FONT_KEY, gconf_client_set_string (data->client, APPLICATION_FONT_KEY,
theme->application_font, NULL); theme->application_font, NULL);
if (theme->documents_font)
gconf_client_set_string (data->client, DOCUMENTS_FONT_KEY,
theme->documents_font, NULL);
if (theme->desktop_font) if (theme->desktop_font)
gconf_client_set_string (data->client, DESKTOP_FONT_KEY, gconf_client_set_string (data->client, DESKTOP_FONT_KEY,
theme->desktop_font, NULL); theme->desktop_font, NULL);
if (theme->windowtitle_font)
gconf_client_set_string (data->client, WINDOWTITLE_FONT_KEY,
theme->windowtitle_font, NULL);
if (theme->monospace_font) if (theme->monospace_font)
gconf_client_set_string (data->client, MONOSPACE_FONT_KEY, gconf_client_set_string (data->client, MONOSPACE_FONT_KEY,
theme->monospace_font, NULL); theme->monospace_font, NULL);
@ -479,6 +487,13 @@ theme_message_area_update (AppearanceData *data)
g_free (font); g_free (font);
} }
if (!show_apply_font && theme->documents_font) {
font = gconf_client_get_string (data->client, DOCUMENTS_FONT_KEY, NULL);
show_apply_font =
(!font || strcmp (theme->application_font, font) != 0);
g_free (font);
}
if (!show_apply_font && theme->desktop_font) { if (!show_apply_font && theme->desktop_font) {
font = gconf_client_get_string (data->client, DESKTOP_FONT_KEY, NULL); font = gconf_client_get_string (data->client, DESKTOP_FONT_KEY, NULL);
show_apply_font = show_apply_font =
@ -486,6 +501,13 @@ theme_message_area_update (AppearanceData *data)
g_free (font); g_free (font);
} }
if (!show_apply_font && theme->windowtitle_font) {
font = gconf_client_get_string (data->client, WINDOWTITLE_FONT_KEY, NULL);
show_apply_font =
(!font || strcmp (theme->application_font, font) != 0);
g_free (font);
}
if (!show_apply_font && theme->monospace_font) { if (!show_apply_font && theme->monospace_font) {
font = gconf_client_get_string (data->client, MONOSPACE_FONT_KEY, NULL); font = gconf_client_get_string (data->client, MONOSPACE_FONT_KEY, NULL);
show_apply_font = show_apply_font =
@ -928,7 +950,9 @@ themes_init (AppearanceData *data)
#endif #endif
gconf_client_notify_add (data->client, BACKGROUND_KEY, (GConfClientNotifyFunc) background_or_font_changed, data, NULL, NULL); gconf_client_notify_add (data->client, BACKGROUND_KEY, (GConfClientNotifyFunc) background_or_font_changed, data, NULL, NULL);
gconf_client_notify_add (data->client, APPLICATION_FONT_KEY, (GConfClientNotifyFunc) background_or_font_changed, data, NULL, NULL); gconf_client_notify_add (data->client, APPLICATION_FONT_KEY, (GConfClientNotifyFunc) background_or_font_changed, data, NULL, NULL);
gconf_client_notify_add (data->client, DOCUMENTS_FONT_KEY, (GConfClientNotifyFunc) background_or_font_changed, data, NULL, NULL);
gconf_client_notify_add (data->client, DESKTOP_FONT_KEY, (GConfClientNotifyFunc) background_or_font_changed, data, NULL, NULL); gconf_client_notify_add (data->client, DESKTOP_FONT_KEY, (GConfClientNotifyFunc) background_or_font_changed, data, NULL, NULL);
gconf_client_notify_add (data->client, WINDOWTITLE_FONT_KEY, (GConfClientNotifyFunc) background_or_font_changed, data, NULL, NULL);
gconf_client_notify_add (data->client, MONOSPACE_FONT_KEY, (GConfClientNotifyFunc) background_or_font_changed, data, NULL, NULL); gconf_client_notify_add (data->client, MONOSPACE_FONT_KEY, (GConfClientNotifyFunc) background_or_font_changed, data, NULL, NULL);
settings = gtk_settings_get_default (); settings = gtk_settings_get_default ();

2
capplets/appearance/theme-util.h
View file

@ -25,7 +25,9 @@
#define LOCKDOWN_KEY "/desktop/gnome/lockdown/disable_theme_settings" #define LOCKDOWN_KEY "/desktop/gnome/lockdown/disable_theme_settings"
#define BACKGROUND_KEY "/desktop/gnome/background/picture_filename" #define BACKGROUND_KEY "/desktop/gnome/background/picture_filename"
#define APPLICATION_FONT_KEY "/desktop/gnome/interface/font_name" #define APPLICATION_FONT_KEY "/desktop/gnome/interface/font_name"
#define DOCUMENTS_FONT_KEY "/desktop/gnome/interface/document_font_name"
#define DESKTOP_FONT_KEY "/apps/nautilus/preferences/desktop_font" #define DESKTOP_FONT_KEY "/apps/nautilus/preferences/desktop_font"
#define WINDOWTITLE_FONT_KEY "/apps/metacity/general/titlebar_font"
#define MONOSPACE_FONT_KEY "/desktop/gnome/interface/monospace_font_name" #define MONOSPACE_FONT_KEY "/desktop/gnome/interface/monospace_font_name"
#ifdef HAVE_XCURSOR #ifdef HAVE_XCURSOR