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

correctly merge disk updates and the current setup.

Browse source 
Thu Jan  2 08:57:54 2003  Jonathan Blandford  <jrb@gnome.org>

	* gnome-theme-manager.c: correctly merge disk updates and the
	current setup.

	* TODO: Add a TODO
This commit is contained in:
Jonathan Blandford 2003-01-02 13:58:58 +00:00 • committed by Jonathan Blandford
parent 95ff74500c
commit 8eccb7d29b
6 changed files with 368 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <dirent.h> #include <dirent.h>
#include <libgnomevfs/gnome-vfs-ops.h> #include <libgnomevfs/gnome-vfs-ops.h>
#include <libgnomevfs/gnome-vfs-utils.h>
#include <glib-object.h> #include <glib-object.h>
#include <libgnome/gnome-desktop-item.h> #include <libgnome/gnome-desktop-item.h>
#include "gnome-theme-info.h" #include "gnome-theme-info.h"
@ -32,7 +33,8 @@ static GHashTable *theme_hash = NULL;
static GHashTable *icon_theme_hash = NULL; static GHashTable *icon_theme_hash = NULL;
static GHashTable *meta_theme_hash = NULL; static GHashTable *meta_theme_hash = NULL;
static GList *callbacks = NULL; static GList *callbacks = NULL;
static gboolean initted = FALSE;
static gboolean initting = FALSE;
const gchar *gtk2_suffix = "gtk-2.0"; const gchar *gtk2_suffix = "gtk-2.0";
const gchar *key_suffix = "gtk-2.0-key"; const gchar *key_suffix = "gtk-2.0-key";
@ -142,11 +144,26 @@ update_theme_dir (const gchar *theme_dir)
tmp = g_build_filename (theme_dir, meta_theme_file_id, NULL); tmp = g_build_filename (theme_dir, meta_theme_file_id, NULL);
if (g_file_test (tmp, G_FILE_TEST_IS_REGULAR)) if (g_file_test (tmp, G_FILE_TEST_IS_REGULAR))
{ {
GnomeThemeMetaInfo *old_meta_theme_info;
GnomeThemeMetaInfo *meta_theme_info; GnomeThemeMetaInfo *meta_theme_info;
old_meta_theme_info = gnome_theme_meta_info_find_by_filename (tmp);
meta_theme_info = read_meta_theme (strrchr (theme_dir, '/')+1, tmp); meta_theme_info = read_meta_theme (strrchr (theme_dir, '/')+1, tmp);
/* this is hardly efficient. We always remove the old meta_theme and
* rereplace it, even if nothing has changed. We can add a check in the
* future. */
if (old_meta_theme_info != NULL)
{
g_hash_table_remove (meta_theme_hash, old_meta_theme_info->name);
gnome_theme_meta_info_free (old_meta_theme_info);
changed = TRUE;
}
if (meta_theme_info != NULL) if (meta_theme_info != NULL)
{
g_hash_table_insert (meta_theme_hash, meta_theme_info->name, meta_theme_info); g_hash_table_insert (meta_theme_hash, meta_theme_info->name, meta_theme_info);
changed = TRUE;
}
} }
g_free (tmp); g_free (tmp);
@ -206,11 +223,10 @@ update_theme_dir (const gchar *theme_dir)
changed = TRUE; changed = TRUE;
} }
} }
if (changed) if (changed && !initting)
{ {
GList *list; GList *list;
g_print ("changed!\n");
for (list = callbacks; list; list = list->next) for (list = callbacks; list; list = list->next)
{ {
ThemeCallbackData *callback_data = list->data; ThemeCallbackData *callback_data = list->data;
@ -218,10 +234,6 @@ update_theme_dir (const gchar *theme_dir)
(* callback_data->func) ((gpointer)theme_dir, callback_data->data); (* callback_data->func) ((gpointer)theme_dir, callback_data->data);
} }
} }
else
{
g_print ("no change!\n");
}
} }
@ -247,7 +259,7 @@ update_icon_theme_dir (const gchar *theme_dir)
changed = TRUE; changed = TRUE;
} }
if (changed) if (changed && !initting)
{ {
GList *list; GList *list;
@ -268,28 +280,26 @@ top_theme_dir_changed_callback (GnomeVFSMonitorHandle *handle,
gpointer user_data) gpointer user_data)
{ {
typedef void (*ThemeChangedFunc) (const gchar *uri); typedef void (*ThemeChangedFunc) (const gchar *uri);
char *uri;
ThemeChangedFunc func; ThemeChangedFunc func;
func = user_data; func = user_data;
uri = gnome_vfs_get_local_path_from_uri (info_uri);
if (uri == NULL)
uri = g_strdup (info_uri);
switch (event_type) switch (event_type)
{ {
case GNOME_VFS_MONITOR_EVENT_CHANGED: case GNOME_VFS_MONITOR_EVENT_CHANGED:
case GNOME_VFS_MONITOR_EVENT_CREATED: case GNOME_VFS_MONITOR_EVENT_CREATED:
case GNOME_VFS_MONITOR_EVENT_DELETED: case GNOME_VFS_MONITOR_EVENT_DELETED:
if (!strncmp (info_uri, "file://", strlen ("file://"))) func (uri);
{
func (info_uri + strlen ("file://"));
}
else
{
func (info_uri);
}
break; break;
default: default:
break; break;
} }
g_free (uri);
} }
@ -337,6 +347,7 @@ icon_themes_add_dir (const char *dirname)
g_return_if_fail (dirname != NULL); g_return_if_fail (dirname != NULL);
dir = opendir (dirname); dir = opendir (dirname);
gnome_vfs_monitor_add (&handle, gnome_vfs_monitor_add (&handle,
dirname, dirname,
GNOME_VFS_MONITOR_DIRECTORY, GNOME_VFS_MONITOR_DIRECTORY,
@ -363,14 +374,15 @@ icon_themes_add_dir (const char *dirname)
static void static void
gnome_theme_info_init (void) gnome_theme_info_init (void)
{ {
static gboolean initted = FALSE;
gchar *dir; gchar *dir;
const gchar *gtk_data_dir; const gchar *gtk_data_dir;
GnomeVFSURI *uri; GnomeVFSURI *uri;
if (initted) if (initted)
return; return;
initted = TRUE; initted = TRUE;
initting = TRUE;
theme_hash = g_hash_table_new (g_str_hash, g_str_equal); theme_hash = g_hash_table_new (g_str_hash, g_str_equal);
icon_theme_hash = g_hash_table_new (g_str_hash, g_str_equal); icon_theme_hash = g_hash_table_new (g_str_hash, g_str_equal);
@ -415,6 +427,7 @@ gnome_theme_info_init (void)
/* Finally, the weird backup for icon themes */ /* Finally, the weird backup for icon themes */
icon_themes_add_dir ("/usr/share/icons"); icon_themes_add_dir ("/usr/share/icons");
initting = FALSE;
} }
@ -561,10 +574,6 @@ gnome_theme_icon_info_find (const gchar *icon_theme_name)
} }
static void static void
gnome_theme_icon_info_find_all_helper (gpointer key, gnome_theme_icon_info_find_all_helper (gpointer key,
gpointer value, gpointer value,
@ -630,6 +639,47 @@ gnome_theme_meta_info_find (const char *meta_theme_name)
return g_hash_table_lookup (meta_theme_hash, meta_theme_name); return g_hash_table_lookup (meta_theme_hash, meta_theme_name);
} }
static void
gnome_theme_meta_info_find_by_filename_helper (gpointer key,
gpointer value,
gpointer user_data)
{
GnomeThemeMetaInfo *theme_info = value;
struct GnomeThemeInfoHashData *hash_data = user_data;
g_assert (theme_info->path);
if (!strcmp (hash_data->user_data, theme_info->path))
hash_data->list = g_list_prepend (hash_data->list, theme_info);
}
GnomeThemeMetaInfo *
gnome_theme_meta_info_find_by_filename (const char *file_name)
{
struct GnomeThemeInfoHashData hash_data;
GnomeThemeMetaInfo *retval;
g_return_val_if_fail (file_name != NULL, NULL);
gnome_theme_info_init ();
hash_data.list = NULL;
hash_data.user_data = file_name;
g_hash_table_foreach (meta_theme_hash,
gnome_theme_meta_info_find_by_filename_helper,
&hash_data);
if (hash_data.list)
{
retval = hash_data.list->data;
g_list_free (hash_data.list);
}
else
retval = NULL;
return retval;
}

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

@ -93,6 +93,7 @@ GList *gnome_theme_icon_info_find_all (void);
GnomeThemeMetaInfo *gnome_theme_meta_info_new (void); GnomeThemeMetaInfo *gnome_theme_meta_info_new (void);
void gnome_theme_meta_info_free (GnomeThemeMetaInfo *meta_theme_info); void gnome_theme_meta_info_free (GnomeThemeMetaInfo *meta_theme_info);
GnomeThemeMetaInfo *gnome_theme_meta_info_find (const char *meta_theme_name); GnomeThemeMetaInfo *gnome_theme_meta_info_find (const char *meta_theme_name);
GnomeThemeMetaInfo *gnome_theme_meta_info_find_by_filename (const char *file_name);
GList *gnome_theme_meta_info_find_all (void); GList *gnome_theme_meta_info_find_all (void);

7
capplets/theme-switcher/ChangeLog
View file

@ -1,3 +1,10 @@
Thu Jan 2 08:57:54 2003 Jonathan Blandford <jrb@gnome.org>
* gnome-theme-manager.c: correctly merge disk updates and the
current setup.
* TODO: Add a TODO
2002-12-31 Seth Nickell <snickell@stanford.edu> 2002-12-31 Seth Nickell <snickell@stanford.edu>
* theme-thumbnail.c: (create_image): * theme-thumbnail.c: (create_image):

19
capplets/theme-switcher/TODO Normal file
View file

@ -0,0 +1,19 @@
Left TODO:
* Find initial theme, and if it's not a metatheme keep it around to put
in the list when selecting a different theme.
* Change custom theme removal addition to handle above
* Change custom theme text to indicate what themes are being used.
* Create an icon for custom themes
* Create a default icon.
* Notice when a directory is removed.
* Sanity check saving.

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

@ -54,9 +54,11 @@ gint n_drop_types = sizeof (drop_types) / sizeof (GtkTargetEntry);
static gboolean setting_model = FALSE; static gboolean setting_model = FALSE;
static gboolean idle_running = FALSE; static gboolean idle_running = FALSE;
static gboolean initial_meta_theme_set = FALSE;
static GdkPixbuf *default_image = NULL; static GdkPixbuf *default_image = NULL;
static GnomeThemeMetaInfo custom_meta_theme_info = {}; static GnomeThemeMetaInfo custom_meta_theme_info = {};
static GnomeThemeMetaInfo initial_meta_theme_info = {};
/* Function Prototypes */ /* Function Prototypes */
static void idle_async_func (GdkPixbuf *pixbuf, static void idle_async_func (GdkPixbuf *pixbuf,
@ -195,8 +197,8 @@ load_theme_in_idle (gpointer data)
* dialog if it hasn't been done yet. If it has, then this call is harmless. * dialog if it hasn't been done yet. If it has, then this call is harmless.
*/ */
gnome_theme_details_init (); gnome_theme_details_init ();
idle_running = FALSE;
return FALSE; return TRUE;
} }
/* FIXME: we need a way to cancel the pixbuf loading if we get a theme updating /* FIXME: we need a way to cancel the pixbuf loading if we get a theme updating
@ -216,7 +218,31 @@ add_pixbuf_idle (GtkTreeModel *model)
g_object_unref); g_object_unref);
} }
/* Loads up a list of GnomeMetaThemeInfo. static gint
sort_meta_theme_list_func (gconstpointer a,
gconstpointer b)
{
const GnomeThemeMetaInfo *a_meta_theme_info = a;
const GnomeThemeMetaInfo *b_meta_theme_info = b;
guint a_flag = 0;
guint b_flag = 0;
g_assert (a_meta_theme_info->name);
g_assert (b_meta_theme_info->name);
if (! strcmp (META_THEME_DEFAULT_NAME, a_meta_theme_info->name))
a_flag |= THEME_FLAG_DEFAULT;
if (! strcmp (META_THEME_DEFAULT_NAME, b_meta_theme_info->name))
b_flag |= THEME_FLAG_DEFAULT;
return gnome_theme_manager_sort_func (a_meta_theme_info->readable_name,
b_meta_theme_info->readable_name,
a_flag,
b_flag);
}
/* Loads up a list of GnomeThemeMetaInfo.
*/ */
static void static void
load_meta_themes (GtkTreeView *tree_view, load_meta_themes (GtkTreeView *tree_view,
@ -226,60 +252,214 @@ load_meta_themes (GtkTreeView *tree_view,
GList *list; GList *list;
GtkTreeModel *model; GtkTreeModel *model;
GtkWidget *swindow; GtkWidget *swindow;
GtkTreeIter iter;
gchar *name;
gboolean valid;
guint flag;
gint i = 0; gint i = 0;
GConfClient *client;
gchar *current_gtk_theme;
gchar *current_window_theme;
gchar *current_icon_theme;
GnomeWindowManager *window_manager;
GnomeWMSettings wm_settings;
static gboolean first_time = TRUE;
swindow = GTK_WIDGET (tree_view)->parent; swindow = GTK_WIDGET (tree_view)->parent;
model = gtk_tree_view_get_model (tree_view); model = gtk_tree_view_get_model (tree_view);
g_assert (model); g_assert (model);
setting_model = TRUE; setting_model = TRUE;
gtk_list_store_clear (GTK_LIST_STORE (model));
client = gconf_client_get_default ();
current_gtk_theme = gconf_client_get_string (client, GTK_THEME_KEY, NULL);
current_icon_theme = gconf_client_get_string (client, ICON_THEME_KEY, NULL);
window_manager = gnome_wm_manager_get_current (gdk_display_get_default_screen (gdk_display_get_default ()));
wm_settings.flags = GNOME_WM_SETTING_THEME;
gnome_window_manager_get_settings (window_manager, &wm_settings);
current_window_theme = g_strdup (wm_settings.theme);
/* FIXME: What do we really do when there is no theme? */
if (current_icon_theme == NULL)
current_icon_theme = g_strdup ("Default");
if (current_gtk_theme == NULL)
current_gtk_theme = g_strdup ("Default");
/* handle first time */
if (first_time)
{
initial_meta_theme_info.gtk_theme_name = g_strdup (current_gtk_theme);
initial_meta_theme_info.icon_theme_name = g_strdup (current_icon_theme);
initial_meta_theme_info.metacity_theme_name = g_strdup (current_window_theme);
}
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
GTK_POLICY_NEVER, GTK_POLICY_NEVER); GTK_POLICY_NEVER, GTK_POLICY_NEVER);
gtk_widget_set_usize (swindow, -1, -1); gtk_widget_set_usize (swindow, -1, -1);
for (list = meta_theme_list; list; list = list->next) /* Sort meta_theme_list to be in the same order of the current data. This way
{ * we can walk through them together. */
GnomeThemeMetaInfo *meta_theme_info = list->data; meta_theme_list = g_list_sort (meta_theme_list, sort_meta_theme_list_func);
gchar *blurb;
GtkTreeIter iter;
gboolean is_default;
GdkPixbuf *pixbuf;
gtk_list_store_prepend (GTK_LIST_STORE (model), &iter);
if (strcmp (default_theme, meta_theme_info->name) == 0) list = meta_theme_list;
is_default = TRUE; valid = gtk_tree_model_get_iter_first (model, &iter);
while (valid || list != NULL)
{
GnomeThemeMetaInfo *list_meta_theme_info = NULL;
GnomeThemeMetaInfo *model_meta_theme_info = NULL;
gchar *blurb;
gboolean list_is_default = FALSE;
GdkPixbuf *pixbuf;
/* Check info on the list */
if (list)
{
list_meta_theme_info = list->data;
if (strcmp (default_theme, list_meta_theme_info->name) == 0)
list_is_default = TRUE;
else else
is_default = FALSE; list_is_default = FALSE;
}
if (valid)
{
gtk_tree_model_get (model, &iter,
META_THEME_ID_COLUMN, &name,
META_THEME_FLAG_COLUMN, &flag,
-1);
if (flag & THEME_FLAG_CUSTOM)
model_meta_theme_info = &custom_meta_theme_info;
else
model_meta_theme_info = gnome_theme_meta_info_find (name);
g_free (name);
}
/* start comparing values */
if (list && valid)
{
gint compare_val;
if (flag & THEME_FLAG_CUSTOM)
{
/* We can always skip the custom row, as it's never in the list */
valid = gtk_tree_model_iter_next (model, &iter);
i++;
goto end_of_loop;
}
compare_val = gnome_theme_manager_sort_func (model_meta_theme_info->readable_name, list_meta_theme_info->readable_name,
flag, list_is_default ? THEME_FLAG_DEFAULT : 0);
if (compare_val < 0)
{
GtkTreeIter iter_to_remove;
/* This item is no longer in the list
*/
iter_to_remove = iter;
valid = gtk_tree_model_iter_next (model, &iter);
gtk_list_store_remove (GTK_LIST_STORE (model), &iter_to_remove);
}
else if (compare_val == 0)
{
/* We reset the blurb in case it has changed */
blurb = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n%s",
list_meta_theme_info->readable_name, list_meta_theme_info->comment);
pixbuf = default_image;
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
META_THEME_PIXBUF_COLUMN, pixbuf,
META_THEME_NAME_COLUMN, blurb,
META_THEME_ID_COLUMN, list_meta_theme_info->name,
META_THEME_FLAG_COLUMN, flag,
-1);
g_free (blurb);
list = list->next;
valid = gtk_tree_model_iter_next (model, &iter);
i++;
}
else
{
/* we insert a new item */
GtkTreeIter iter_to_prepend;
gtk_list_store_insert_before (GTK_LIST_STORE (model), &iter_to_prepend, &iter);
blurb = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n%s",
list_meta_theme_info->readable_name, list_meta_theme_info->comment);
pixbuf = default_image;
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
META_THEME_PIXBUF_COLUMN, pixbuf,
META_THEME_NAME_COLUMN, blurb,
META_THEME_ID_COLUMN, list_meta_theme_info->name,
META_THEME_FLAG_COLUMN, list_is_default ? THEME_FLAG_DEFAULT : 0,
-1);
g_free (blurb);
i++;
list = list->next;
}
goto end_of_loop;
}
else if (list)
{
list_meta_theme_info = list->data;
gtk_list_store_append (GTK_LIST_STORE (model), &iter);
blurb = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n%s", blurb = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n%s",
meta_theme_info->readable_name, meta_theme_info->comment); list_meta_theme_info->readable_name, list_meta_theme_info->comment);
if (i <= MAX_ELEMENTS_BEFORE_SCROLLING) if (i <= MAX_ELEMENTS_BEFORE_SCROLLING)
pixbuf = generate_theme_thumbnail (meta_theme_info); pixbuf = generate_theme_thumbnail (list_meta_theme_info);
else else
pixbuf = default_image; pixbuf = default_image;
gtk_list_store_set (GTK_LIST_STORE (model), &iter, gtk_list_store_set (GTK_LIST_STORE (model), &iter,
META_THEME_PIXBUF_COLUMN, pixbuf, META_THEME_PIXBUF_COLUMN, pixbuf,
META_THEME_NAME_COLUMN, blurb, META_THEME_NAME_COLUMN, blurb,
META_THEME_ID_COLUMN, meta_theme_info->name, META_THEME_ID_COLUMN, list_meta_theme_info->name,
META_THEME_FLAG_COLUMN, is_default ? THEME_FLAG_DEFAULT : 0, META_THEME_FLAG_COLUMN, list_is_default ? THEME_FLAG_DEFAULT : 0,
-1); -1);
g_free (blurb); g_free (blurb);
list = list->next;
i++;
}
else if (valid)
{
/* It's a dead item. */
GtkTreeIter iter_to_remove;
iter_to_remove = iter;
valid = gtk_tree_model_iter_next (model, &iter);
gtk_list_store_remove (GTK_LIST_STORE (model), &iter_to_remove);
}
end_of_loop:
if (i == MAX_ELEMENTS_BEFORE_SCROLLING) if (i == MAX_ELEMENTS_BEFORE_SCROLLING)
{ {
GtkRequisition rectangle; #if 0
gtk_widget_size_request (GTK_WIDGET (tree_view), &rectangle); // GtkRequisition rectangle;
gtk_widget_set_usize (swindow, -1, rectangle.height);
// gtk_widget_size_request (GTK_WIDGET (tree_view), &rectangle);
// gtk_widget_set_usize (swindow, -1, rectangle.height);
// g_print ("calling size_request: %d\n", rectangle.height);
#endif
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
} }
i++;
} }
add_pixbuf_idle (model); add_pixbuf_idle (model);
g_free (current_gtk_theme);
g_free (current_icon_theme);
g_free (current_window_theme);
first_time = FALSE;
setting_model = FALSE; setting_model = FALSE;
} }
@ -396,51 +576,10 @@ static void
update_themes_from_disk (GladeXML *dialog) update_themes_from_disk (GladeXML *dialog)
{ {
GList *theme_list; GList *theme_list;
GList *string_list;
GList *list;
GConfClient *client;
gchar *current_gtk_theme;
gchar *current_window_theme;
gchar *current_icon_theme;
GnomeWindowManager *window_manager;
GnomeWMSettings wm_settings;
GtkWidget *notebook;
gboolean have_meta_theme; gboolean have_meta_theme;
client = gconf_client_get_default ();
current_gtk_theme = gconf_client_get_string (client, GTK_THEME_KEY, NULL);
current_icon_theme = gconf_client_get_string (client, ICON_THEME_KEY, NULL);
window_manager = gnome_wm_manager_get_current (gdk_display_get_default_screen (gdk_display_get_default ()));
wm_settings.flags = GNOME_WM_SETTING_THEME;
if (window_manager != NULL) {
gnome_window_manager_get_settings (window_manager, &wm_settings);
current_window_theme = g_strdup (wm_settings.theme);
} else {
current_window_theme = g_strdup ("");
}
/* FIXME: What do we really do when there is no theme? Ask Havoc here. */
/* BROKEN BROKEN BROKEN */
if (current_icon_theme == NULL)
current_icon_theme = g_strdup ("Default");
if (current_gtk_theme == NULL)
current_gtk_theme = g_strdup ("Default");
notebook = WID ("theme_notebook");
theme_list = gnome_theme_meta_info_find_all (); theme_list = gnome_theme_meta_info_find_all ();
string_list = NULL; if (theme_list == NULL)
for (list = theme_list; list; list = list->next)
{
GnomeThemeMetaInfo *info = list->data;
string_list = g_list_prepend (string_list, info);
}
if (string_list == NULL)
{ {
have_meta_theme = FALSE; have_meta_theme = FALSE;
} }
@ -448,14 +587,10 @@ update_themes_from_disk (GladeXML *dialog)
{ {
have_meta_theme = TRUE; have_meta_theme = TRUE;
gtk_widget_show (WID ("meta_theme_hbox")); gtk_widget_show (WID ("meta_theme_hbox"));
load_meta_themes (GTK_TREE_VIEW (WID ("meta_theme_treeview")), string_list, META_THEME_DEFAULT_NAME); load_meta_themes (GTK_TREE_VIEW (WID ("meta_theme_treeview")), theme_list, META_THEME_DEFAULT_NAME);
g_list_free (string_list);
} }
g_list_free (theme_list); g_list_free (theme_list);
g_free (current_gtk_theme);
g_free (current_icon_theme);
update_settings_from_gconf (); update_settings_from_gconf ();
if (! have_meta_theme) if (! have_meta_theme)
@ -709,8 +844,7 @@ theme_changed_func (gpointer uri,
dialog = gnome_theme_manager_get_theme_dialog (); dialog = gnome_theme_manager_get_theme_dialog ();
g_print ("theme_changed_func:\n"); update_themes_from_disk (dialog);
update_themes_from_disk ((GladeXML *)user_data);
gnome_theme_details_reread_themes_from_disk (); gnome_theme_details_reread_themes_from_disk ();
gtk_widget_grab_focus (WID ("meta_theme_treeview")); gtk_widget_grab_focus (WID ("meta_theme_treeview"));
} }
@ -774,6 +908,7 @@ gnome_theme_save_clicked (GtkWidget *button,
gnome_theme_save_show_dialog (WID ("theme_dialog"), &custom_meta_theme_info); gnome_theme_save_show_dialog (WID ("theme_dialog"), &custom_meta_theme_info);
} }
static void static void
setup_dialog (GladeXML *dialog) setup_dialog (GladeXML *dialog)
{ {
@ -859,43 +994,68 @@ gnome_theme_manager_get_theme_dialog (void)
return dialog; return dialog;
} }
gint
gnome_theme_manager_sort_func (const gchar *a_str,
const gchar *b_str,
guint a_flag,
guint b_flag)
{
gint retval;
if (a_flag & THEME_FLAG_CUSTOM)
retval = -1;
else if (b_flag & THEME_FLAG_CUSTOM)
retval = 1;
else if (a_flag & THEME_FLAG_DEFAULT)
retval = -1;
else if (b_flag & THEME_FLAG_DEFAULT)
retval = 1;
else
{
retval = g_utf8_collate (a_str?a_str:"",
b_str?b_str:"");
}
return retval;
}
gint gint
gnome_theme_manager_tree_sort_func (GtkTreeModel *model, gnome_theme_manager_tree_sort_func (GtkTreeModel *model,
GtkTreeIter *a, GtkTreeIter *a,
GtkTreeIter *b, GtkTreeIter *b,
gpointer user_data) gpointer user_data)
{ {
gchar *a_str = NULL; GnomeThemeMetaInfo *a_meta_info;
gchar *b_str = NULL; GnomeThemeMetaInfo *b_meta_info;
guint a_default = FALSE; gchar *a_id = NULL;
guint b_default = FALSE; gchar *b_id = NULL;
guint a_flag = FALSE;
guint b_flag = FALSE;
gint retval; gint retval;
gtk_tree_model_get (model, a, gtk_tree_model_get (model, a,
META_THEME_NAME_COLUMN, &a_str, META_THEME_ID_COLUMN, &a_id,
META_THEME_FLAG_COLUMN, &a_default, META_THEME_FLAG_COLUMN, &a_flag,
-1); -1);
gtk_tree_model_get (model, b, gtk_tree_model_get (model, b,
META_THEME_NAME_COLUMN, &b_str, META_THEME_ID_COLUMN, &b_id,
META_THEME_FLAG_COLUMN, &b_default, META_THEME_FLAG_COLUMN, &b_flag,
-1); -1);
if (a_str == NULL) a_str = g_strdup (""); if (a_id)
if (b_str == NULL) b_str = g_strdup (""); a_meta_info = gnome_theme_meta_info_find (a_id);
if (a_default & THEME_FLAG_CUSTOM)
retval = -1;
else if (b_default & THEME_FLAG_CUSTOM)
retval = 1;
else if (a_default & THEME_FLAG_DEFAULT)
retval = -1;
else if (b_default & THEME_FLAG_DEFAULT)
retval = 1;
else else
retval = g_utf8_collate (a_str, b_str); a_meta_info = &custom_meta_theme_info;
if (b_id)
b_meta_info = gnome_theme_meta_info_find (b_id);
else
b_meta_info = &custom_meta_theme_info;
g_free (a_str); retval = gnome_theme_manager_sort_func (a_meta_info?a_meta_info->readable_name:"",
g_free (b_str); b_meta_info?b_meta_info->readable_name:"",
a_flag, b_flag);
g_free (a_id);
g_free (b_id);
return retval; return retval;
} }

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

@ -45,6 +45,10 @@ extern gint n_drop_types;
/* Prototypes */ /* Prototypes */
GladeXML *gnome_theme_manager_get_theme_dialog (void); GladeXML *gnome_theme_manager_get_theme_dialog (void);
gint gnome_theme_manager_sort_func (const gchar *a_str,
const gchar *b_str,
guint a_flag,
guint b_flag);
gint gnome_theme_manager_tree_sort_func (GtkTreeModel *model, gint gnome_theme_manager_tree_sort_func (GtkTreeModel *model,
GtkTreeIter *a, GtkTreeIter *a,
GtkTreeIter *b, GtkTreeIter *b,