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

fix "reset to defaults" sensitivity for real listen to colour scheme

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

	* appearance-style.c: (style_init), (check_color_schemes_enabled):
	fix "reset to defaults" sensitivity for real
	* appearance-themes.c: (theme_color_scheme_changed_cb),
	(themes_init): listen to colour scheme changes as well

svn path=/trunk/; revision=7715
This commit is contained in:
Jens Granseuer 2007-06-10 20:29:08 +00:00 • committed by Jens Granseuer
parent a994bfc05d
commit dcb6f5bd6f
3 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
capplets/appearance/ChangeLog
View file

@ -1,3 +1,10 @@
2007-06-10 Jens Granseuer <jensgr@gmx.net>
* appearance-style.c: (style_init), (check_color_schemes_enabled):
fix "reset to defaults" sensitivity for real
* appearance-themes.c: (theme_color_scheme_changed_cb),
(themes_init): listen to colour scheme changes as well
2007-06-10 Jens Granseuer <jensgr@gmx.net> 2007-06-10 Jens Granseuer <jensgr@gmx.net>
* appearance-style.c: (check_color_schemes_enabled): disable the "reset * appearance-style.c: (check_color_schemes_enabled): disable the "reset

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

@ -99,10 +99,10 @@ style_init (AppearanceData *data)
GTK_ICON_SIZE_BUTTON)); GTK_ICON_SIZE_BUTTON));
settings = G_OBJECT (gtk_settings_get_default ()); settings = G_OBJECT (gtk_settings_get_default ());
g_signal_connect (settings, "notify::gtk-color-scheme", (GCallback) color_scheme_changed, data);
update_color_buttons_from_settings (GTK_SETTINGS (settings), data);
g_signal_connect (settings, "notify::gtk-theme-name", (GCallback) theme_name_changed, data); g_signal_connect (settings, "notify::gtk-theme-name", (GCallback) theme_name_changed, data);
check_color_schemes_enabled (GTK_SETTINGS (settings), data); check_color_schemes_enabled (GTK_SETTINGS (settings), data);
g_signal_connect (settings, "notify::gtk-color-scheme", (GCallback) color_scheme_changed, data);
update_color_buttons_from_settings (GTK_SETTINGS (settings), data);
/* connect signals */ /* connect signals */
/* color buttons */ /* color buttons */
@ -444,13 +444,12 @@ check_color_schemes_enabled (GtkSettings *settings,
enable_colors = (fg && bg && base && text && fg_s && bg_s); enable_colors = (fg && bg && base && text && fg_s && bg_s);
gtk_widget_set_sensitive (glade_xml_get_widget (data->xml, "color_scheme_table"), enable_colors); gtk_widget_set_sensitive (glade_xml_get_widget (data->xml, "color_scheme_table"), enable_colors);
gtk_widget_set_sensitive (glade_xml_get_widget (data->xml, "color_scheme_defaults_button"), enable_colors);
if (enable_colors) { if (enable_colors)
gtk_widget_hide (glade_xml_get_widget (data->xml, "color_scheme_message_hbox")); gtk_widget_hide (glade_xml_get_widget (data->xml, "color_scheme_message_hbox"));
} else { else
gtk_widget_show (glade_xml_get_widget (data->xml, "color_scheme_message_hbox")); gtk_widget_show (glade_xml_get_widget (data->xml, "color_scheme_message_hbox"));
gtk_widget_set_sensitive (glade_xml_get_widget (data->xml, "color_scheme_defaults_button"), FALSE);
}
} }
static void static void

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

@ -382,6 +382,14 @@ theme_details_changed_cb (GtkWidget *widget, AppearanceData *data)
theme_queue_for_thumbnail (data->theme_custom, data); theme_queue_for_thumbnail (data->theme_custom, data);
} }
static void
theme_color_scheme_changed_cb (GObject *settings,
GParamSpec *pspec,
AppearanceData *data)
{
theme_details_changed_cb (NULL, data);
}
static void static void
theme_select_after_realize (GtkIconView *icon_view, theme_select_after_realize (GtkIconView *icon_view,
const gchar *theme) const gchar *theme)
@ -505,7 +513,8 @@ themes_init (AppearanceData *data)
g_signal_connect_after (glade_xml_get_widget (data->xml, "gtk_themes_list"), "cursor-changed", (GCallback) theme_details_changed_cb, data); g_signal_connect_after (glade_xml_get_widget (data->xml, "gtk_themes_list"), "cursor-changed", (GCallback) theme_details_changed_cb, data);
g_signal_connect_after (glade_xml_get_widget (data->xml, "window_themes_list"), "cursor-changed", (GCallback) theme_details_changed_cb, data); g_signal_connect_after (glade_xml_get_widget (data->xml, "window_themes_list"), "cursor-changed", (GCallback) theme_details_changed_cb, data);
g_signal_connect_after (glade_xml_get_widget (data->xml, "icon_themes_list"), "cursor-changed", (GCallback) theme_details_changed_cb, data); g_signal_connect_after (glade_xml_get_widget (data->xml, "icon_themes_list"), "cursor-changed", (GCallback) theme_details_changed_cb, data);
/* FIXME: need to connect to color scheme stuff, too... */
g_signal_connect (gtk_settings_get_default (), "notify::gtk-color-scheme", (GCallback) theme_color_scheme_changed_cb, data);
if (is_locked_down (data->client)) { if (is_locked_down (data->client)) {
/* FIXME: determine what needs disabling */ /* FIXME: determine what needs disabling */