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

teach the installer to recognize cursor themes and icon themes with

Browse source 
2007-10-30  Jens Granseuer  <jensgr@gmx.net>

	* theme-installer.c: (file_theme_type), (gnome_theme_install_real):
	teach the installer to recognize cursor themes and icon themes with
	cursors and how to apply them

svn path=/trunk/; revision=8232
This commit is contained in:
Jens Granseuer 2007-10-30 18:43:56 +00:00 • committed by Jens Granseuer
parent b027e0b4b5
commit 3da9bfbd0f
2 changed files with 73 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
capplets/appearance/ChangeLog
View file

@ -1,3 +1,9 @@
2007-10-30 Jens Granseuer <jensgr@gmx.net>
* theme-installer.c: (file_theme_type), (gnome_theme_install_real):
teach the installer to recognize cursor themes and icon themes with
cursors and how to apply them
2007-10-29 Jens Granseuer <jensgr@gmx.net> 2007-10-29 Jens Granseuer <jensgr@gmx.net>
* appearance-style.c: (gtk_theme_changed), (window_theme_changed), * appearance-style.c: (gtk_theme_changed), (window_theme_changed),

101
capplets/appearance/theme-installer.c
View file

@ -41,7 +41,9 @@ enum {
THEME_GNOME, THEME_GNOME,
THEME_GTK, THEME_GTK,
THEME_ENGINE, THEME_ENGINE,
THEME_METACITY THEME_METACITY,
THEME_CURSOR,
THEME_ICON_CURSOR
}; };
enum { enum {
@ -67,15 +69,13 @@ static int
file_theme_type (const gchar *dir) file_theme_type (const gchar *dir)
{ {
gchar *filename = NULL; gchar *filename = NULL;
GnomeVFSURI *src_uri = NULL;
gboolean exists; gboolean exists;
if (!dir) return THEME_INVALID; if (!dir)
return THEME_INVALID;
filename = g_build_filename (dir, "index.theme", NULL); filename = g_build_filename (dir, "index.theme", NULL);
src_uri = gnome_vfs_uri_new (filename); exists = g_file_test (filename, G_FILE_TEST_IS_REGULAR);
exists = gnome_vfs_uri_exists (src_uri);
gnome_vfs_uri_unref (src_uri);
if (exists) { if (exists) {
GPatternSpec *pattern = NULL; GPatternSpec *pattern = NULL;
@ -85,6 +85,7 @@ file_theme_type (const gchar *dir)
gboolean match; gboolean match;
uri = gnome_vfs_get_uri_from_local_path (filename); uri = gnome_vfs_get_uri_from_local_path (filename);
g_free (filename);
gnome_vfs_read_entire_file (uri, &file_size, &file_contents); gnome_vfs_read_entire_file (uri, &file_size, &file_contents);
g_free (uri); g_free (uri);
@ -92,8 +93,24 @@ file_theme_type (const gchar *dir)
match = g_pattern_match_string (pattern, file_contents); match = g_pattern_match_string (pattern, file_contents);
g_pattern_spec_free (pattern); g_pattern_spec_free (pattern);
if (match) if (match) {
return THEME_ICON; pattern = g_pattern_spec_new ("*Directories=*");
match = g_pattern_match_string (pattern, file_contents);
g_pattern_spec_free (pattern);
if (match) {
/* check if we have a cursor, too */
filename = g_build_filename (dir, "cursors", NULL);
exists = g_file_test (filename, G_FILE_TEST_IS_DIR);
g_free (filename);
if (exists)
return THEME_ICON_CURSOR;
else
return THEME_ICON;
}
return THEME_CURSOR;
}
pattern = g_pattern_spec_new ("*[X-GNOME-Metatheme]*"); pattern = g_pattern_spec_new ("*[X-GNOME-Metatheme]*");
match = g_pattern_match_string (pattern, file_contents); match = g_pattern_match_string (pattern, file_contents);
@ -101,32 +118,35 @@ file_theme_type (const gchar *dir)
if (match) if (match)
return THEME_GNOME; return THEME_GNOME;
} else {
g_free (filename);
} }
g_free (filename);
filename = g_build_filename (dir, "gtk-2.0", "gtkrc", NULL); filename = g_build_filename (dir, "gtk-2.0", "gtkrc", NULL);
src_uri = gnome_vfs_uri_new (filename); exists = g_file_test (filename, G_FILE_TEST_IS_REGULAR);
g_free (filename); g_free (filename);
exists = gnome_vfs_uri_exists (src_uri);
gnome_vfs_uri_unref (src_uri);
if (exists) if (exists)
return THEME_GTK; return THEME_GTK;
filename = g_build_filename (dir, "metacity-1", "metacity-theme-1.xml", NULL); filename = g_build_filename (dir, "metacity-1", "metacity-theme-1.xml", NULL);
src_uri = gnome_vfs_uri_new (filename); exists = g_file_test (filename, G_FILE_TEST_IS_REGULAR);
g_free (filename); g_free (filename);
exists = gnome_vfs_uri_exists (src_uri);
gnome_vfs_uri_unref (src_uri);
if (exists) if (exists)
return THEME_METACITY; return THEME_METACITY;
filename = g_build_filename (dir, "configure", NULL); /* cursor themes don't necessarily have an index.theme */
src_uri = gnome_vfs_uri_new (filename); filename = g_build_filename (dir, "cursors", NULL);
exists = g_file_test (filename, G_FILE_TEST_IS_DIR);
g_free (filename);
if (exists)
return THEME_CURSOR;
filename = g_build_filename (dir, "configure", NULL);
exists = g_file_test (filename, G_FILE_TEST_IS_EXECUTABLE);
g_free (filename); g_free (filename);
exists = gnome_vfs_uri_exists (src_uri);
gnome_vfs_uri_unref (src_uri);
if (exists) if (exists)
return THEME_ENGINE; return THEME_ENGINE;
@ -226,22 +246,28 @@ gnome_theme_install_real (gint filetype, const gchar *tmp_dir, const gchar *them
/* What type of theme is it? */ /* What type of theme is it? */
theme_type = file_theme_type (tmp_dir); theme_type = file_theme_type (tmp_dir);
if (theme_type == THEME_ICON) { switch (theme_type) {
case THEME_ICON:
case THEME_CURSOR:
case THEME_ICON_CURSOR:
target_dir = g_build_path (G_DIR_SEPARATOR_S, target_dir = g_build_path (G_DIR_SEPARATOR_S,
g_get_home_dir (), ".icons", g_get_home_dir (), ".icons",
theme_name, NULL); theme_name, NULL);
} else if (theme_type == THEME_GNOME) { break;
case THEME_GNOME:
target_dir = g_build_path (G_DIR_SEPARATOR_S, target_dir = g_build_path (G_DIR_SEPARATOR_S,
g_get_home_dir (), ".themes", g_get_home_dir (), ".themes",
theme_name, NULL); theme_name, NULL);
user_message = g_strdup_printf (_("GNOME Theme %s correctly installed"), user_message = g_strdup_printf (_("GNOME Theme %s correctly installed"),
theme_name); theme_name);
} else if (theme_type == THEME_METACITY || break;
theme_type == THEME_GTK) { case THEME_METACITY:
case THEME_GTK:
target_dir = g_build_path (G_DIR_SEPARATOR_S, target_dir = g_build_path (G_DIR_SEPARATOR_S,
g_get_home_dir (), ".themes", g_get_home_dir (), ".themes",
theme_name, NULL); theme_name, NULL);
} else if (theme_type == THEME_ENGINE) { break;
case THEME_ENGINE:
dialog = gtk_message_dialog_new (NULL, dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL, GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR, GTK_MESSAGE_ERROR,
@ -250,7 +276,7 @@ gnome_theme_install_real (gint filetype, const gchar *tmp_dir, const gchar *them
gtk_dialog_run (GTK_DIALOG (dialog)); gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
return FALSE; return FALSE;
} else { default:
dialog = gtk_message_dialog_new (NULL, dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL, GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR, GTK_MESSAGE_ERROR,
@ -322,7 +348,9 @@ gnome_theme_install_real (gint filetype, const gchar *tmp_dir, const gchar *them
g_free (update_icon_cache); g_free (update_icon_cache);
} }
/* Ask to apply theme (if we can) */ /* Ask to apply theme (if we can) */
if (theme_type == THEME_GTK || theme_type == THEME_METACITY || theme_type == THEME_ICON) if (theme_type == THEME_GTK || theme_type == THEME_METACITY ||
theme_type == THEME_ICON || theme_type == THEME_CURSOR ||
theme_type == THEME_ICON_CURSOR)
{ {
/* TODO: currently cannot apply "gnome themes" */ /* TODO: currently cannot apply "gnome themes" */
gchar *str; gchar *str;
@ -349,26 +377,31 @@ gnome_theme_install_real (gint filetype, const gchar *tmp_dir, const gchar *them
{ {
/* apply theme here! */ /* apply theme here! */
GConfClient *gconf_client; GConfClient *gconf_client;
const gchar *gconf_key;
gconf_client = gconf_client_get_default ();
switch (theme_type) switch (theme_type)
{ {
case THEME_GTK: case THEME_GTK:
gconf_key = GTK_THEME_KEY; gconf_client_set_string (gconf_client, GTK_THEME_KEY, theme_name, NULL);
break; break;
case THEME_METACITY: case THEME_METACITY:
gconf_key = METACITY_THEME_KEY; gconf_client_set_string (gconf_client, METACITY_THEME_KEY, theme_name, NULL);
break; break;
case THEME_ICON: case THEME_ICON:
gconf_key = ICON_THEME_KEY; gconf_client_set_string (gconf_client, ICON_THEME_KEY, theme_name, NULL);
break; break;
default: /* keep gcc happy */ case THEME_CURSOR:
gconf_key = NULL; gconf_client_set_string (gconf_client, CURSOR_THEME_KEY, theme_name, NULL);
break;
case THEME_ICON_CURSOR:
gconf_client_set_string (gconf_client, ICON_THEME_KEY, theme_name, NULL);
gconf_client_set_string (gconf_client, CURSOR_THEME_KEY, theme_name, NULL);
break;
default:
break; break;
} }
gconf_client = gconf_client_get_default ();
gconf_client_set_string (gconf_client, gconf_key, theme_name, NULL);
g_object_unref (gconf_client); g_object_unref (gconf_client);
} }
} else { } else {