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

Update the desktop font in addition to the application font when 'apply

Browse source 
2005-10-11  Muktha  <muktha.narayan@wipro.com>

        * gnome-theme-info.h:
	* gnome-theme-manager.h:
	* gnome-theme-manager.c (apply_font_clicked):
        * gnome-theme-info.c (gnome_theme_read_meta_theme)
        (gnome_theme_meta_info_free) (gnome_theme_meta_info_print)
        (gnome_theme_meta_info_compare): Update the desktop font in
        addition to the application font when 'apply font' in large print
        themes is selected. Fixes #123551.
This commit is contained in:
Muktha 2005-10-11 11:27:36 +00:00 • committed by Muktha Narayan
parent cf2e2fc109
commit 5201e26525
6 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
capplets/common/ChangeLog
View file

@ -1,3 +1,12 @@
2005-10-11 Muktha <muktha.narayan@wipro.com>
* gnome-theme-info.h:
* gnome-theme-info.c (gnome_theme_read_meta_theme)
(gnome_theme_meta_info_free) (gnome_theme_meta_info_print)
(gnome_theme_meta_info_compare): Update the desktop font in
addition to the application font when 'apply font' in large print
themes is selected. Fixes #123551.
2005-08-14 Rodney Dawes <dobey@novell.com>
* theme-thumbnail.c (create_image): Get the Example icon that is

20
capplets/common/gnome-theme-info.c
View file

@ -15,6 +15,8 @@
#define ICON_THEME_KEY "X-GNOME-Metatheme/IconTheme"
#define SOUND_THEME_KEY "X-GNOME-Metatheme/SoundTheme"
#define APPLICATION_FONT_KEY "X-GNOME-Metatheme/ApplicationFont"
#define DESKTOP_FONT_KEY "X-GNOME-Metatheme/DesktopFont"
#define MONOSPACE_FONT_KEY "X-GNOME-Metatheme/MonospaceFont"
#define BACKGROUND_IMAGE_KEY "X-GNOME-Metatheme/BackgroundImage"
/* Terminology used in this lib:
@ -369,6 +371,14 @@ gnome_theme_read_meta_theme (GnomeVFSURI *meta_theme_uri)
str = gnome_desktop_item_get_string (meta_theme_ditem, APPLICATION_FONT_KEY);
if (str != NULL)
meta_theme_info->application_font = g_strdup (str);
str = gnome_desktop_item_get_string (meta_theme_ditem, DESKTOP_FONT_KEY);
if (str != NULL)
meta_theme_info->desktop_font = g_strdup (str);
str = gnome_desktop_item_get_string (meta_theme_ditem, MONOSPACE_FONT_KEY);
if (str != NULL)
meta_theme_info->monospace_font = g_strdup (str);
str = gnome_desktop_item_get_string (meta_theme_ditem, BACKGROUND_IMAGE_KEY);
if (str != NULL)
@ -1469,6 +1479,8 @@ gnome_theme_meta_info_free (GnomeThemeMetaInfo *meta_theme_info)
g_free (meta_theme_info->name);
g_free (meta_theme_info->comment);
g_free (meta_theme_info->application_font);
g_free (meta_theme_info->desktop_font);
g_free (meta_theme_info->monospace_font);
g_free (meta_theme_info->background_image);
g_free (meta_theme_info->gtk_theme_name);
g_free (meta_theme_info->icon_theme_name);
@ -1491,6 +1503,8 @@ gnome_theme_meta_info_print (GnomeThemeMetaInfo *meta_theme_info)
g_print ("sawfish_theme_name: %s\n", meta_theme_info->sawfish_theme_name);
g_print ("sound_theme_name: %s\n", meta_theme_info->sound_theme_name);
g_print ("application_font: %s\n", meta_theme_info->application_font);
g_print ("desktop_font: %s\n", meta_theme_info->desktop_font);
g_print ("monospace_font: %s\n", meta_theme_info->monospace_font);
g_print ("background_image: %s\n", meta_theme_info->background_image);
}
@ -1573,6 +1587,12 @@ gnome_theme_meta_info_compare (GnomeThemeMetaInfo *a,
cmp = safe_strcmp (a->application_font, b->application_font);
if (cmp != 0) return cmp;
cmp = safe_strcmp (a->desktop_font, b->desktop_font);
if (cmp != 0) return cmp;
cmp = safe_strcmp (a->monospace_font, b->monospace_font);
if (cmp != 0) return cmp;
cmp = safe_strcmp (a->background_image, b->background_image);
return cmp;

2
capplets/common/gnome-theme-info.h
View file

@ -87,6 +87,8 @@ struct _GnomeThemeMetaInfo
gchar *sound_theme_name;
gchar *application_font;
gchar *desktop_font;
gchar *monospace_font;
gchar *background_image;
};

7
capplets/theme-switcher/ChangeLog
View file

@ -1,3 +1,10 @@
2005-10-11 Muktha <muktha.narayan@wipro.com>
* gnome-theme-manager.h:
* gnome-theme-manager.c (apply_font_clicked): Update the desktop
font in addition to the application font when 'apply font' in
large print themes is selected. Fixes #123551.
2005-02-08 Sebastien Bacher <seb128@debian.org>
* gnome-theme-installer.c: (file_theme_type), (transfer_done_cb),

3
capplets/theme-switcher/gnome-theme-manager.c
View file

@ -1130,6 +1130,9 @@ apply_font_clicked (GtkWidget *button,
g_free (meta_theme_name);
gconf_client_set_string (client, FONT_KEY, meta_theme_info->application_font, NULL);
gconf_client_set_string (client, DESKTOP_FONT_KEY, meta_theme_info->desktop_font, NULL);
gconf_client_set_string (client, MONOSPACE_FONT_KEY, meta_theme_info->monospace_font, NULL);
}
g_object_unref (client);
}

2
capplets/theme-switcher/gnome-theme-manager.h
View file

@ -8,6 +8,8 @@
#define GTK_THEME_KEY "/desktop/gnome/interface/gtk_theme"
#define ICON_THEME_KEY "/desktop/gnome/interface/icon_theme"
#define FONT_KEY "/desktop/gnome/interface/font_name"
#define DESKTOP_FONT_KEY "/apps/nautilus/preferences/desktop_font"
#define MONOSPACE_FONT_KEY "/desktop/gnome/interface/monospace_font_name"
#define METACITY_THEME_DIR "/apps/metacity/general"
#define METACITY_THEME_KEY METACITY_THEME_DIR "/theme"