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

major resource handling fixup and initial bits for handling custom

Browse source 
2007-06-04  Jens Granseuer  <jensgr@gmx.net>

	* appearance-desktop.c: (desktop_init), (desktop_shutdown):
	* appearance-desktop.h:
	* appearance-font.c: (font_init), (font_shutdown):
	* appearance-font.h:
	* appearance-main.c: (main_window_response), (main):
	* appearance-style.c: (style_init), (conv_to_widget_cb),
	(conv_from_widget_cb):
	* appearance-style.h:
	* appearance-themes.c:
	* appearance-themes.h:
	* appearance.h: major resource handling fixup and initial bits
	for handling custom metathemes

svn path=/trunk/; revision=7689
This commit is contained in:
Jens Granseuer 2007-06-04 20:23:47 +00:00 • committed by Jens Granseuer
parent 1660c3fd02
commit a84a68182a
11 changed files with 338 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

15
capplets/appearance/ChangeLog
View file

@ -1,3 +1,18 @@
2007-06-04 Jens Granseuer <jensgr@gmx.net>
* appearance-desktop.c: (desktop_init), (desktop_shutdown):
* appearance-desktop.h:
* appearance-font.c: (font_init), (font_shutdown):
* appearance-font.h:
* appearance-main.c: (main_window_response), (main):
* appearance-style.c: (style_init), (conv_to_widget_cb),
(conv_from_widget_cb):
* appearance-style.h:
* appearance-themes.c:
* appearance-themes.h:
* appearance.h: major resource handling fixup and initial bits
for handling custom metathemes
2007-05-30 Jens Granseuer <jensgr@gmx.net> 2007-05-30 Jens Granseuer <jensgr@gmx.net>
* appearance.glade: fix duplicate mnemonic * appearance.glade: fix duplicate mnemonic

27
capplets/appearance/appearance-desktop.c
View file

@ -679,21 +679,6 @@ wp_file_open_dialog (GtkWidget *widget,
} }
} }
static void
appearance_window_response (GtkWidget *widget,
gint response_id,
AppearanceData *data)
{
if (response_id == GTK_RESPONSE_CLOSE ||
response_id == GTK_RESPONSE_DELETE_EVENT)
{
gnome_wp_xml_save_list (data);
g_object_unref (data->wp_thumbs);
g_object_ref_sink (data->wp_filesel);
g_object_unref (data->wp_filesel);
}
}
static void static void
wp_dragged_image (GtkWidget *widget, wp_dragged_image (GtkWidget *widget,
GdkDragContext *context, GdkDragContext *context,
@ -945,9 +930,6 @@ desktop_init (AppearanceData *data)
G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING)); G_TYPE_STRING));
g_signal_connect_after (G_OBJECT (glade_xml_get_widget (data->xml, "appearance_window")), "response",
G_CALLBACK (appearance_window_response), data);
data->wp_view = GTK_ICON_VIEW (glade_xml_get_widget (data->xml, "wp_view")); data->wp_view = GTK_ICON_VIEW (glade_xml_get_widget (data->xml, "wp_view"));
gtk_icon_view_set_model (data->wp_view, GTK_TREE_MODEL (data->wp_model)); gtk_icon_view_set_model (data->wp_view, GTK_TREE_MODEL (data->wp_model));
@ -1057,3 +1039,12 @@ desktop_init (AppearanceData *data)
g_signal_connect (data->wp_filesel, "update-preview", g_signal_connect (data->wp_filesel, "update-preview",
G_CALLBACK (wp_update_preview), data); G_CALLBACK (wp_update_preview), data);
} }
void
desktop_shutdown (AppearanceData *data)
{
gnome_wp_xml_save_list (data);
g_object_unref (data->wp_thumbs);
g_object_ref_sink (data->wp_filesel);
g_object_unref (data->wp_filesel);
}

3
capplets/appearance/appearance-desktop.h
View file

@ -18,6 +18,5 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
void desktop_init (AppearanceData *data); void desktop_init (AppearanceData *data);
void desktop_shutdown (AppearanceData *data);

21
capplets/appearance/appearance-font.c
View file

@ -889,16 +889,6 @@ cb_show_details (GtkWidget *button,
} }
#endif /* HAVE_XFT2 */ #endif /* HAVE_XFT2 */
static void
cb_delete_event (GtkWidget *widget,
GdkEvent *event,
gpointer *user_data)
{
g_slist_foreach (font_pairs, (GFunc) g_free, NULL);
g_slist_free (font_pairs);
g_free (old_font);
}
void void
font_init (AppearanceData *data) font_init (AppearanceData *data)
{ {
@ -975,7 +965,12 @@ font_init (AppearanceData *data)
#else /* !HAVE_XFT2 */ #else /* !HAVE_XFT2 */
gtk_widget_hide (glade_xml_get_widget (data->xml, "font_render_frame")); gtk_widget_hide (glade_xml_get_widget (data->xml, "font_render_frame"));
#endif /* HAVE_XFT2 */ #endif /* HAVE_XFT2 */
}
g_signal_connect_after (glade_xml_get_widget (data->xml, "appearance_window"),
"delete-event", G_CALLBACK (cb_delete_event), NULL); void
font_shutdown (AppearanceData *data)
{
g_slist_foreach (font_pairs, (GFunc) g_free, NULL);
g_slist_free (font_pairs);
g_free (old_font);
} }

1
capplets/appearance/appearance-font.h
View file

@ -19,3 +19,4 @@
*/ */
void font_init (AppearanceData *data); void font_init (AppearanceData *data);
void font_shutdown (AppearanceData *data);

34
capplets/appearance/appearance-main.c
View file

@ -62,11 +62,30 @@ init_appearance_data (int argc, char **argv)
return data; return data;
} }
static void
main_window_response (GtkWidget *widget,
gint response_id,
AppearanceData *data)
{
if (response_id == GTK_RESPONSE_CLOSE ||
response_id == GTK_RESPONSE_DELETE_EVENT)
{
gtk_main_quit ();
themes_shutdown (data);
desktop_shutdown (data);
font_shutdown (data);
g_object_unref (data->client);
g_object_unref (data->xml);
}
}
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
AppearanceData *data; AppearanceData *data;
GtkWidget *w; GtkWidget *win;
GnomeProgram *program; GnomeProgram *program;
/* init */ /* init */
@ -91,20 +110,17 @@ main (int argc, char **argv)
ui_init (data); ui_init (data);
/* prepare the main window */ /* prepare the main window */
w = glade_xml_get_widget (data->xml, "appearance_window"); win = glade_xml_get_widget (data->xml, "appearance_window");
capplet_set_icon (w, "gnome-settings-theme"); capplet_set_icon (win, "gnome-settings-theme");
gtk_widget_show_all (w); gtk_widget_show_all (win);
g_signal_connect (G_OBJECT (w), "delete-event", (GCallback) gtk_main_quit, NULL);
w = glade_xml_get_widget (data->xml, "close_button"); g_signal_connect_after (G_OBJECT (win), "response",
g_signal_connect (G_OBJECT (w), "clicked", (GCallback) gtk_main_quit, NULL); G_CALLBACK (main_window_response), data);
/* start the mainloop */ /* start the mainloop */
gtk_main (); gtk_main ();
/* free stuff */ /* free stuff */
g_object_unref (data->client);
g_object_unref (data->xml);
g_free (data); g_free (data);
g_object_unref (program); g_object_unref (program);

12
capplets/appearance/appearance-style.c
View file

@ -59,8 +59,8 @@ static void color_scheme_changed (GObject *settings, GParamSpec *pspec, Appearan
/* GUI Callbacks */ /* GUI Callbacks */
static void color_button_clicked_cb (GtkWidget *colorbutton, AppearanceData *data); static void color_button_clicked_cb (GtkWidget *colorbutton, AppearanceData *data);
static GConfValue *conv_to_widget_cb (GConfPropertyEditor *peditor, GConfValue *value); static GConfValue *conv_to_widget_cb (GConfPropertyEditor *peditor, const GConfValue *value);
static GConfValue *conv_from_widget_cb (GConfPropertyEditor *peditor, GConfValue *value); static GConfValue *conv_from_widget_cb (GConfPropertyEditor *peditor, const GConfValue *value);
void void
@ -90,8 +90,6 @@ style_init (AppearanceData *data)
g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "bg_colorbutton")), "color-set", (GCallback) color_button_clicked_cb, data); g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "bg_colorbutton")), "color-set", (GCallback) color_button_clicked_cb, data);
g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "base_colorbutton")), "color-set", (GCallback) color_button_clicked_cb, data); g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "base_colorbutton")), "color-set", (GCallback) color_button_clicked_cb, data);
g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "selected_bg_colorbutton")), "color-set", (GCallback) color_button_clicked_cb, data); g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "selected_bg_colorbutton")), "color-set", (GCallback) color_button_clicked_cb, data);
} }
static void static void
@ -159,7 +157,7 @@ prepare_list (AppearanceData *data, GtkWidget *list, enum ThemeType type)
case METACITY_THEMES: case METACITY_THEMES:
thumbnail = generate_metacity_theme_thumbnail ((GnomeThemeInfo *) l->data); thumbnail = generate_metacity_theme_thumbnail ((GnomeThemeInfo *) l->data);
break; break;
default: default:
thumbnail = NULL; thumbnail = NULL;
} }
@ -240,7 +238,7 @@ find_string_in_model (GtkTreeModel *model, const gchar *value, gint column)
} }
static GConfValue * static GConfValue *
conv_to_widget_cb (GConfPropertyEditor *peditor, GConfValue *value) conv_to_widget_cb (GConfPropertyEditor *peditor, const GConfValue *value)
{ {
GtkTreeModel *store; GtkTreeModel *store;
GtkTreeView *list; GtkTreeView *list;
@ -282,7 +280,7 @@ conv_to_widget_cb (GConfPropertyEditor *peditor, GConfValue *value)
} }
static GConfValue * static GConfValue *
conv_from_widget_cb (GConfPropertyEditor *peditor, GConfValue *value) conv_from_widget_cb (GConfPropertyEditor *peditor, const GConfValue *value)
{ {
GConfValue *new_value; GConfValue *new_value;
gchar *list_value = NULL; gchar *list_value = NULL;

2
capplets/appearance/appearance-style.h
View file

@ -18,6 +18,4 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
void style_init (AppearanceData *data); void style_init (AppearanceData *data);

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

@ -19,101 +19,72 @@
*/ */
#include "appearance.h" #include "appearance.h"
#include "gnome-theme-info.h"
#include "theme-thumbnail.h" #include "theme-thumbnail.h"
#include "gnome-theme-apply.h" #include "gnome-theme-apply.h"
#include <libwindow-settings/gnome-wm-manager.h> #include <libwindow-settings/gnome-wm-manager.h>
#include <string.h> #include <string.h>
#define GTK_THEME_KEY "/desktop/gnome/interface/gtk_theme"
#define METACITY_THEME_KEY "/apps/metacity/general/theme"
#define ICON_THEME_KEY "/desktop/gnome/interface/icon_theme"
#define COLOR_SCHEME_KEY "/desktop/gnome/interface/gtk_color_scheme"
#define CUSTOM_THEME_NAME "__custom__"
enum { enum {
THEME_DISPLAY_NAME_COLUMN, COL_LABEL,
THEME_PIXBUF_COLUMN, COL_THUMBNAIL,
THEME_NAME_COLUMN, COL_NAME,
NUM_COLS
}; };
struct theme_thumbnail_func_data { static gboolean theme_thumbnail_generate (AppearanceData *data);
GList *list;
GtkListStore *store;
};
/* Theme functions */ static gchar *
static void theme_changed_func (gpointer uri, AppearanceData *data); get_default_string_from_key (GConfClient *client, const char *key)
static void theme_thumbnail_func (GdkPixbuf *pixbuf, struct theme_thumbnail_func_data *data);
static gboolean theme_thumbnail_generate (struct theme_thumbnail_func_data *data);
/* GUI Callbacks */
static void theme_custom_cb (GtkWidget *button, AppearanceData *data);
static void theme_install_cb (GtkWidget *button, AppearanceData *data);
static void theme_delete_cb (GtkWidget *button, AppearanceData *data);
static void theme_selection_changed_cb (GtkWidget *icon_view, AppearanceData *data);
void
themes_init (AppearanceData *data)
{ {
GtkWidget *w; GConfValue *value;
GList *theme_list; gchar *str = NULL;
GtkListStore *theme_store;
GtkTreeModel *sort_model;
/* initialise some stuff */ value = gconf_client_get_default_from_schema (client, key, NULL);
gnome_theme_init (NULL);
gnome_wm_manager_init ();
/* connect button signals */ if (value) {
g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "theme_custom")), "clicked", (GCallback) theme_custom_cb, data); if (value->type == GCONF_VALUE_STRING)
g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "theme_install")), "clicked", (GCallback) theme_install_cb, data); str = gconf_value_to_string (value);
g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "theme_delete")), "clicked", (GCallback) theme_delete_cb, data); gconf_value_free (value);
/* connect theme list signals */
g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "theme_list")), "selection-changed", (GCallback) theme_selection_changed_cb, data);
/* set up theme list */
theme_store = gtk_list_store_new (3, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_STRING);
theme_list = gnome_theme_meta_info_find_all ();
gnome_theme_info_register_theme_change ((GFunc) theme_changed_func, data);
if (theme_list) {
struct theme_thumbnail_func_data *tdata;
GdkPixbuf *temp;
GList *l;
tdata = g_new (struct theme_thumbnail_func_data, 1);
tdata->list = theme_list;
tdata->store = theme_store;
temp = gdk_pixbuf_new_from_file (GNOMECC_PIXMAP_DIR "/theme-thumbnailing.png", NULL);
for (l = theme_list; l; l = l->next) {
GnomeThemeMetaInfo *info = l->data;
gtk_list_store_insert_with_values (theme_store, NULL, 0,
THEME_DISPLAY_NAME_COLUMN, info->readable_name,
THEME_NAME_COLUMN, info->name,
THEME_PIXBUF_COLUMN, temp,
-1);
}
if (temp)
g_object_unref (temp);
theme_thumbnail_generate (tdata);
} }
w = glade_xml_get_widget (data->xml, "theme_list"); return str;
sort_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (theme_store));
gtk_icon_view_set_model (GTK_ICON_VIEW (w), GTK_TREE_MODEL (sort_model));
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model), THEME_DISPLAY_NAME_COLUMN, GTK_SORT_ASCENDING);
w = glade_xml_get_widget (data->xml, "theme_install");
gtk_button_set_image (GTK_BUTTON (w),
gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_BUTTON));
} }
static gboolean static gboolean
theme_thumbnail_generate (struct theme_thumbnail_func_data *data) find_in_model (GtkTreeModel *model, const gchar *value, gint column, GtkTreeIter *hit)
{ {
generate_theme_thumbnail_async (data->list->data, (ThemeThumbnailFunc) theme_thumbnail_func, data, NULL); GtkTreeIter iter;
gboolean valid;
gchar *test;
if (!value)
return FALSE; return FALSE;
for (valid = gtk_tree_model_get_iter_first (model, &iter); valid;
valid = gtk_tree_model_iter_next (model, &iter))
{
gtk_tree_model_get (model, &iter, column, &test, -1);
if (test) {
gint cmp = strcmp (test, value);
g_free (test);
if (!cmp) {
*hit = iter;
return TRUE;
}
}
}
return FALSE;
} }
/** Theme Callbacks **/ /** Theme Callbacks **/
@ -124,48 +95,28 @@ theme_changed_func (gpointer uri, AppearanceData *data)
/* TODO: add/change/remove themes from the model as appropriate */ /* TODO: add/change/remove themes from the model as appropriate */
} }
static void static void
theme_thumbnail_func (GdkPixbuf *pixbuf, struct theme_thumbnail_func_data *data) theme_thumbnail_func (GdkPixbuf *pixbuf, AppearanceData *data)
{ {
GtkTreeIter iter; GnomeThemeMetaInfo *info = data->theme_queue->data;
GnomeThemeMetaInfo *info = data->list->data;
GtkTreeModel *model = GTK_TREE_MODEL (data->store);
/* find item in model and update thumbnail */ /* find item in model and update thumbnail */
if (pixbuf && gtk_tree_model_get_iter_first (model, &iter)) { if (pixbuf) {
GtkTreeIter iter;
GtkTreeModel *model = GTK_TREE_MODEL (data->theme_store);
do { if (find_in_model (model, info->name, COL_NAME, &iter))
gchar *name; gtk_list_store_set (data->theme_store, &iter, COL_THUMBNAIL, pixbuf, -1);
gint cmp;
gtk_tree_model_get (model, &iter, g_object_unref (pixbuf);
THEME_NAME_COLUMN, &name,
-1);
cmp = strcmp (name, info->name);
g_free (name);
if (!cmp) {
gtk_list_store_set (data->store, &iter,
THEME_PIXBUF_COLUMN, pixbuf, -1);
break;
}
} while (gtk_tree_model_iter_next (model, &iter));
} }
if (pixbuf) data->theme_queue = g_slist_remove (data->theme_queue, info);
g_object_unref (pixbuf);
data->list = g_list_remove (data->list, info); if (data->theme_queue)
if (data->list)
/* we can't call theme_thumbnail_generate directly since the thumbnail /* we can't call theme_thumbnail_generate directly since the thumbnail
* factory hasn't yet cleaned up at this point */ * factory hasn't yet cleaned up at this point */
g_idle_add ((GSourceFunc) theme_thumbnail_generate, data); g_idle_add ((GSourceFunc) theme_thumbnail_generate, data);
else
g_free (data);
} }
/** GUI Callbacks **/ /** GUI Callbacks **/
@ -183,13 +134,16 @@ theme_selection_changed_cb (GtkWidget *icon_view, AppearanceData *data)
model = gtk_icon_view_get_model (GTK_ICON_VIEW (icon_view)); model = gtk_icon_view_get_model (GTK_ICON_VIEW (icon_view));
gtk_tree_model_get_iter (model, &iter, selection->data); gtk_tree_model_get_iter (model, &iter, selection->data);
gtk_tree_model_get (model, &iter, THEME_NAME_COLUMN, &name, -1); gtk_tree_model_get (model, &iter, COL_NAME, &name, -1);
if (!strcmp (name, CUSTOM_THEME_NAME))
theme = data->theme_custom;
else
theme = gnome_theme_meta_info_find (name);
theme = gnome_theme_meta_info_find (name);
if (theme) if (theme)
gnome_meta_theme_set (theme); gnome_meta_theme_set (theme);
g_free (theme);
g_free (name); g_free (name);
g_list_foreach (selection, (GFunc) gtk_tree_path_free, NULL); g_list_foreach (selection, (GFunc) gtk_tree_path_free, NULL);
g_list_free (selection); g_list_free (selection);
@ -217,3 +171,207 @@ theme_delete_cb (GtkWidget *button, AppearanceData *data)
{ {
/* TODO: Delete the selected theme */ /* TODO: Delete the selected theme */
} }
static void
theme_select_after_realize (GtkIconView *icon_view,
const gchar *theme)
{
GtkTreeIter iter;
GtkTreeModel *model = gtk_icon_view_get_model (icon_view);
if (find_in_model (model, theme, COL_NAME, &iter)) {
GtkTreePath *path = gtk_tree_model_get_path (model, &iter);
gtk_icon_view_select_path (icon_view, path);
gtk_icon_view_scroll_to_path (icon_view, path, FALSE, 0.5, 0.0);
gtk_tree_path_free (path);
}
}
static gboolean
theme_thumbnail_generate (AppearanceData *data)
{
generate_theme_thumbnail_async (data->theme_queue->data, (ThemeThumbnailFunc) theme_thumbnail_func, data, NULL);
return FALSE;
}
static void
theme_queue_for_thumbnail (GnomeThemeMetaInfo *theme, AppearanceData *data)
{
if (data->theme_queue == NULL)
g_idle_add ((GSourceFunc) theme_thumbnail_generate, data);
data->theme_queue = g_slist_append (data->theme_queue, theme);
}
static void
theme_add_custom (GtkIconView *icon_view, GnomeThemeMetaInfo *info, AppearanceData *data)
{
GnomeThemeMetaInfo *custom = data->theme_custom;
/* if info is not NULL, we'll copy those theme settings over */
if (info != NULL) {
g_free (custom->gtk_theme_name);
g_free (custom->icon_theme_name);
g_free (custom->metacity_theme_name);
g_free (custom->gtk_color_scheme);
custom->gtk_theme_name = NULL;
custom->icon_theme_name = NULL;
custom->metacity_theme_name = NULL;
custom->gtk_color_scheme = NULL;
if (info->gtk_theme_name)
custom->gtk_theme_name = g_strdup (info->gtk_theme_name);
else
custom->gtk_theme_name = get_default_string_from_key (data->client, GTK_THEME_KEY);
if (info->icon_theme_name)
custom->icon_theme_name = g_strdup (info->icon_theme_name);
else
custom->icon_theme_name = get_default_string_from_key (data->client, ICON_THEME_KEY);
if (info->metacity_theme_name)
custom->metacity_theme_name = g_strdup (info->metacity_theme_name);
else
custom->metacity_theme_name = get_default_string_from_key (data->client, METACITY_THEME_KEY);
if (info->gtk_color_scheme)
custom->gtk_color_scheme = g_strdup (info->gtk_color_scheme);
else
custom->gtk_color_scheme = get_default_string_from_key (data->client, COLOR_SCHEME_KEY);
}
gtk_list_store_insert_with_values (data->theme_store, NULL, 0,
COL_LABEL, custom->readable_name,
COL_NAME, custom->name,
-1);
theme_queue_for_thumbnail (custom, data);
}
static void
theme_remove_custom (GtkIconView *icon_view, AppearanceData *data)
{
GtkTreeIter iter;
if (find_in_model (data->theme_store, CUSTOM_THEME_NAME, COL_NAME, &iter))
gtk_list_store_remove (data->theme_store, &iter);
}
static gboolean
theme_is_equal (const GnomeThemeMetaInfo *a, const GnomeThemeMetaInfo *b)
{
if (!(a->gtk_theme_name && b->gtk_theme_name) ||
strcmp (a->gtk_theme_name, b->gtk_theme_name))
return FALSE;
if (!(a->gtk_color_scheme && b->gtk_color_scheme) ||
strcmp (a->gtk_color_scheme, b->gtk_color_scheme))
return FALSE;
if (!(a->icon_theme_name && b->icon_theme_name) ||
strcmp (a->icon_theme_name, b->icon_theme_name))
return FALSE;
if (!(a->metacity_theme_name && b->metacity_theme_name) ||
strcmp (a->metacity_theme_name, b->metacity_theme_name))
return FALSE;
return TRUE;
}
void
themes_init (AppearanceData *data)
{
GtkWidget *w;
GList *theme_list, *l;
GtkListStore *theme_store;
GtkTreeModel *sort_model;
gchar *meta_theme = NULL;
GdkPixbuf *temp;
/* initialise some stuff */
gnome_theme_init (NULL);
gnome_wm_manager_init ();
data->theme_queue = NULL;
data->theme_custom = gnome_theme_meta_info_new ();
/* connect button signals */
g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "theme_custom")), "clicked", (GCallback) theme_custom_cb, data);
g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "theme_install")), "clicked", (GCallback) theme_install_cb, data);
g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "theme_delete")), "clicked", (GCallback) theme_delete_cb, data);
/* connect theme list signals */
g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "theme_list")), "selection-changed", (GCallback) theme_selection_changed_cb, data);
/* set up theme list */
data->theme_store = theme_store =
gtk_list_store_new (NUM_COLS, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_STRING);
theme_list = gnome_theme_meta_info_find_all ();
gnome_theme_info_register_theme_change ((GFunc) theme_changed_func, data);
data->theme_custom->name = g_strdup (CUSTOM_THEME_NAME);
data->theme_custom->readable_name = g_strdup ("Custom"); /* FIXME: translate */
data->theme_custom->gtk_theme_name =
gconf_client_get_string (data->client, GTK_THEME_KEY, NULL);
data->theme_custom->gtk_color_scheme =
gconf_client_get_string (data->client, COLOR_SCHEME_KEY, NULL);
data->theme_custom->metacity_theme_name =
gconf_client_get_string (data->client, METACITY_THEME_KEY, NULL);
data->theme_custom->icon_theme_name =
gconf_client_get_string (data->client, ICON_THEME_KEY, NULL);
temp = gdk_pixbuf_new_from_file (GNOMECC_PIXMAP_DIR "/theme-thumbnailing.png", NULL);
for (l = theme_list; l; l = l->next) {
GnomeThemeMetaInfo *info = l->data;
data->theme_queue = g_slist_prepend (data->theme_queue, info);
gtk_list_store_insert_with_values (theme_store, NULL, 0,
COL_LABEL, info->readable_name,
COL_NAME, info->name,
COL_THUMBNAIL, temp,
-1);
if (!meta_theme && theme_is_equal (data->theme_custom, info))
meta_theme = info->name;
}
if (!meta_theme) {
/* add custom theme */
meta_theme = data->theme_custom->name;
data->theme_queue = g_slist_prepend (data->theme_queue, data->theme_custom);
gtk_list_store_insert_with_values (theme_store, NULL, 0,
COL_LABEL, data->theme_custom->readable_name,
COL_NAME, meta_theme,
COL_THUMBNAIL, temp,
-1);
}
if (temp)
g_object_unref (temp);
w = glade_xml_get_widget (data->xml, "theme_list");
sort_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (theme_store));
gtk_icon_view_set_model (GTK_ICON_VIEW (w), GTK_TREE_MODEL (sort_model));
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model), COL_LABEL, GTK_SORT_ASCENDING);
g_signal_connect_after (G_OBJECT (w), "realize",
G_CALLBACK (theme_select_after_realize), meta_theme);
w = glade_xml_get_widget (data->xml, "theme_install");
gtk_button_set_image (GTK_BUTTON (w),
gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON));
theme_thumbnail_generate (data);
}
void
themes_shutdown (AppearanceData *data)
{
gnome_theme_meta_info_free (data->theme_custom);
g_slist_free (data->theme_queue);
}

3
capplets/appearance/appearance-themes.h
View file

@ -18,6 +18,5 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
void themes_init (AppearanceData *data); void themes_init (AppearanceData *data);
void themes_shutdown (AppearanceData *data);

7
capplets/appearance/appearance.h
View file

@ -27,6 +27,8 @@
#include <gconf/gconf-client.h> #include <gconf/gconf-client.h>
#include <libgnomeui/gnome-thumbnail.h> #include <libgnomeui/gnome-thumbnail.h>
#include "gnome-theme-info.h"
typedef struct { typedef struct {
GConfClient *client; GConfClient *client;
int argc; int argc;
@ -50,4 +52,9 @@ typedef struct {
/* font */ /* font */
GtkWidget *font_details; GtkWidget *font_details;
/* themes */
GtkListStore *theme_store;
GSList *theme_queue;
GnomeThemeMetaInfo *theme_custom;
} AppearanceData; } AppearanceData;