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

Port to GConf.

Browse source 
2001-12-08  Richard Hestilow  <hestilow@ximian.com>

	* Port to GConf.
This commit is contained in:
Richard Hestilow 2001-12-09 04:23:35 +00:00 • committed by Rachel Hestilow
parent bf1d38501d
commit f8cc94520d
5 changed files with 69 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

4
capplets/theme-switcher/ChangeLog
View file

@ -1,3 +1,7 @@
2001-12-08 Richard Hestilow <hestilow@ximian.com>
* Port to GConf.
2001-12-08 Richard Hestilow <hestilow@ximian.com> 2001-12-08 Richard Hestilow <hestilow@ximian.com>
* Partial revamp to use bonobo control instead of bug-prone * Partial revamp to use bonobo control instead of bug-prone

14
capplets/theme-switcher/Makefile.am
View file

@ -17,11 +17,23 @@ gtk_theme_selector_capplet_SOURCES = \
pixmap_DATA = pixmap_DATA =
schema_DATA = gtk-theme-switcher.schemas
schemadir = $(sysconfdir)/gconf/schemas
## ##
## You should not need to modify anything below this line ## You should not need to modify anything below this line
## ##
@INTLTOOL_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ ## @GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
$(desktop).in: %.desktop.in: %.desktop.in.in
sed s#Icon=.\*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png# < $< \> ${cappletname}.desktop.in
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup)
$(INSTALL_DATA) $(desktop) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup)$(desktop)
GCONF_CONFIG_SOURCE=$(GCONF_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
install-data-am: install-data-local
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)

4
capplets/theme-switcher/control/GNOME_Theme_Preview.server.in
View file

@ -9,8 +9,8 @@
<oaf_attribute name="description" type="string" value="Factory for gnome theme preview controls"/> <oaf_attribute name="description" type="string" value="Factory for gnome theme preview controls"/>
</oaf_server> </oaf_server>
<oaf_server iid="OAFIID:Bonobo_Sample_Entry" type="factory" <oaf_server iid="OAFIID:GNOME_Theme_Preview" type="factory"
location="OAFIID:Bonobo_Sample_ControlFactory"> location="OAFIID:GNOME_Theme_PreviewFactory">
<oaf_attribute name="repo_ids" type="stringv"> <oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Unknown:1.0"/> <item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Bonobo/Control:1.0"/> <item value="IDL:Bonobo/Control:1.0"/>

38
capplets/theme-switcher/gui.c
View file

@ -5,6 +5,7 @@
#include "da.h" #include "da.h"
#include <signal.h> #include <signal.h>
#include <gconf/gconf-client.h>
GtkWidget *preview_control; GtkWidget *preview_control;
@ -193,8 +194,8 @@ make_main(void)
GtkWidget *box, *hbox, *hbox2, *vbox; GtkWidget *box, *hbox, *hbox2, *vbox;
GtkWidget *frame, *button; GtkWidget *frame, *button;
GtkWidget *button_vbox; GtkWidget *button_vbox;
gboolean default_used;
BonoboUIContainer *container; BonoboUIContainer *container;
GConfClient *client = gconf_client_get_default ();
capplet_widget = gtk_dialog_new_with_buttons (_("Gtk+ Theme Selector"), capplet_widget = gtk_dialog_new_with_buttons (_("Gtk+ Theme Selector"),
NULL, -1, NULL, -1,
@ -238,7 +239,7 @@ make_main(void)
label = gtk_label_new (_("Auto\nPreview")); label = gtk_label_new (_("Auto\nPreview"));
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
auto_preview = gtk_check_button_new (); auto_preview = gtk_check_button_new ();
initial_preview = gnome_config_get_bool ("/theme-switcher-capplet/settings/auto=TRUE"); initial_preview = gconf_client_get_bool (client, "/apps/gtk-theme-switcher/auto", NULL);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (auto_preview), gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (auto_preview),
initial_preview); initial_preview);
gtk_signal_connect (GTK_OBJECT (auto_preview), "toggled", GTK_SIGNAL_FUNC (auto_callback), NULL); gtk_signal_connect (GTK_OBJECT (auto_preview), "toggled", GTK_SIGNAL_FUNC (auto_callback), NULL);
@ -258,8 +259,7 @@ make_main(void)
font_sel = gnome_font_picker_new (); font_sel = gnome_font_picker_new ();
gnome_font_picker_set_mode (GNOME_FONT_PICKER (font_sel), gnome_font_picker_set_mode (GNOME_FONT_PICKER (font_sel),
GNOME_FONT_PICKER_MODE_FONT_INFO); GNOME_FONT_PICKER_MODE_FONT_INFO);
initial_font = gnome_config_get_string_with_default ("/theme-switcher-capplet/settings/font",&default_used); initial_font = gconf_client_get_string (client, "/apps/gtk-theme-switcher/font", NULL);
if (initial_font == NULL) { if (initial_font == NULL) {
@ -291,7 +291,7 @@ make_main(void)
gtk_container_set_border_width (GTK_CONTAINER (vbox), GNOME_PAD_SMALL); gtk_container_set_border_width (GTK_CONTAINER (vbox), GNOME_PAD_SMALL);
gtk_container_add (GTK_CONTAINER (frame), vbox); gtk_container_add (GTK_CONTAINER (frame), vbox);
font_cbox = gtk_check_button_new_with_label (_("Use custom font.")); font_cbox = gtk_check_button_new_with_label (_("Use custom font."));
initial_font_cbox = gnome_config_get_bool ("/theme-switcher-capplet/settings/use_theme_font=FALSE"); initial_font_cbox = gconf_client_get_bool (client, "/apps/gtk-theme-switcher/use_theme_font", NULL);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (font_cbox), gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (font_cbox),
initial_font_cbox); initial_font_cbox);
gtk_signal_connect (GTK_OBJECT (font_cbox), gtk_signal_connect (GTK_OBJECT (font_cbox),
@ -337,6 +337,7 @@ make_main(void)
last_theme = NULL; last_theme = NULL;
g_object_unref (G_OBJECT (client));
return capplet_widget; return capplet_widget;
} }
@ -405,14 +406,18 @@ click_try(GtkWidget *widget, gpointer data)
static void static void
click_ok(GtkWidget *widget, gpointer data) click_ok(GtkWidget *widget, gpointer data)
{ {
GConfClient *client = gconf_client_get_default ();
click_try (widget, data); click_try (widget, data);
gnome_config_set_bool ("/theme-switcher-capplet/settings/auto",GTK_TOGGLE_BUTTON (auto_preview)->active);
gnome_config_set_string ("/theme-switcher-capplet/settings/theme", current_theme->name); gconf_client_set_bool (client, "/apps/gtk-theme-switcher/auto", GTK_TOGGLE_BUTTON (auto_preview)->active, NULL);
gnome_config_set_bool ("/theme-switcher-capplet/settings/use_theme_font", gconf_client_set_string (client, "/apps/gtk-theme-switcher/theme", current_theme->name, NULL);
GTK_TOGGLE_BUTTON (font_cbox)->active); gconf_client_set_bool (client, "/apps/gtk-theme-switcher/use_theme_font",
gnome_config_set_string ("/theme-switcher-capplet/settings/font", GTK_TOGGLE_BUTTON (font_cbox)->active, NULL);
gnome_font_picker_get_font_name (GNOME_FONT_PICKER (font_sel)));
gnome_config_sync (); gconf_client_set_string (client, "/apps/gtk-theme-switcher/font",
gnome_font_picker_get_font_name (GNOME_FONT_PICKER (font_sel)), NULL);
g_object_unref (G_OBJECT (client));
} }
static void static void
click_revert(GtkWidget *widget, gpointer data) click_revert(GtkWidget *widget, gpointer data)
@ -495,10 +500,7 @@ click_entry(GtkWidget *clist, gint row, gint col, GdkEvent *event,
{ {
current_theme = gtk_clist_get_row_data (GTK_CLIST (clist), row); current_theme = gtk_clist_get_row_data (GTK_CLIST (clist), row);
if (initial_theme)
state_changed (TRUE); state_changed (TRUE);
else
state_changed (FALSE);
if (GTK_TOGGLE_BUTTON (auto_preview)->active) if (GTK_TOGGLE_BUTTON (auto_preview)->active)
click_preview (NULL,NULL); click_preview (NULL,NULL);
@ -563,9 +565,13 @@ void
update_theme_entries(GtkWidget *disp_list) update_theme_entries(GtkWidget *disp_list)
{ {
GList *themes; GList *themes;
gchar *d_theme = gnome_config_get_string ("/theme-switcher-capplet/settings/theme=Default"); GConfClient *client = gconf_client_get_default ();
gchar *d_theme = gconf_client_get_string (client, "/apps/gtk-theme-switcher/theme", NULL);
gchar *current_name = NULL; gchar *current_name = NULL;
g_object_unref (G_OBJECT (client));
if (current_theme) if (current_theme)
current_name = g_strdup (current_theme->name); current_name = g_strdup (current_theme->name);
else else

38
capplets/theme-switcher/gui.c-6060
View file

@ -5,6 +5,7 @@
#include "da.h" #include "da.h"
#include <signal.h> #include <signal.h>
#include <gconf/gconf-client.h>
GtkWidget *preview_control; GtkWidget *preview_control;
@ -193,8 +194,8 @@ make_main(void)
GtkWidget *box, *hbox, *hbox2, *vbox; GtkWidget *box, *hbox, *hbox2, *vbox;
GtkWidget *frame, *button; GtkWidget *frame, *button;
GtkWidget *button_vbox; GtkWidget *button_vbox;
gboolean default_used;
BonoboUIContainer *container; BonoboUIContainer *container;
GConfClient *client = gconf_client_get_default ();
capplet_widget = gtk_dialog_new_with_buttons (_("Gtk+ Theme Selector"), capplet_widget = gtk_dialog_new_with_buttons (_("Gtk+ Theme Selector"),
NULL, -1, NULL, -1,
@ -238,7 +239,7 @@ make_main(void)
label = gtk_label_new (_("Auto\nPreview")); label = gtk_label_new (_("Auto\nPreview"));
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
auto_preview = gtk_check_button_new (); auto_preview = gtk_check_button_new ();
initial_preview = gnome_config_get_bool ("/theme-switcher-capplet/settings/auto=TRUE"); initial_preview = gconf_client_get_bool (client, "/apps/gtk-theme-switcher/auto", NULL);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (auto_preview), gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (auto_preview),
initial_preview); initial_preview);
gtk_signal_connect (GTK_OBJECT (auto_preview), "toggled", GTK_SIGNAL_FUNC (auto_callback), NULL); gtk_signal_connect (GTK_OBJECT (auto_preview), "toggled", GTK_SIGNAL_FUNC (auto_callback), NULL);
@ -258,8 +259,7 @@ make_main(void)
font_sel = gnome_font_picker_new (); font_sel = gnome_font_picker_new ();
gnome_font_picker_set_mode (GNOME_FONT_PICKER (font_sel), gnome_font_picker_set_mode (GNOME_FONT_PICKER (font_sel),
GNOME_FONT_PICKER_MODE_FONT_INFO); GNOME_FONT_PICKER_MODE_FONT_INFO);
initial_font = gnome_config_get_string_with_default ("/theme-switcher-capplet/settings/font",&default_used); initial_font = gconf_client_get_string (client, "/apps/gtk-theme-switcher/font", NULL);
if (initial_font == NULL) { if (initial_font == NULL) {
@ -291,7 +291,7 @@ make_main(void)
gtk_container_set_border_width (GTK_CONTAINER (vbox), GNOME_PAD_SMALL); gtk_container_set_border_width (GTK_CONTAINER (vbox), GNOME_PAD_SMALL);
gtk_container_add (GTK_CONTAINER (frame), vbox); gtk_container_add (GTK_CONTAINER (frame), vbox);
font_cbox = gtk_check_button_new_with_label (_("Use custom font.")); font_cbox = gtk_check_button_new_with_label (_("Use custom font."));
initial_font_cbox = gnome_config_get_bool ("/theme-switcher-capplet/settings/use_theme_font=FALSE"); initial_font_cbox = gconf_client_get_bool (client, "/apps/gtk-theme-switcher/use_theme_font", NULL);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (font_cbox), gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (font_cbox),
initial_font_cbox); initial_font_cbox);
gtk_signal_connect (GTK_OBJECT (font_cbox), gtk_signal_connect (GTK_OBJECT (font_cbox),
@ -337,6 +337,7 @@ make_main(void)
last_theme = NULL; last_theme = NULL;
g_object_unref (G_OBJECT (client));
return capplet_widget; return capplet_widget;
} }
@ -405,14 +406,18 @@ click_try(GtkWidget *widget, gpointer data)
static void static void
click_ok(GtkWidget *widget, gpointer data) click_ok(GtkWidget *widget, gpointer data)
{ {
GConfClient *client = gconf_client_get_default ();
click_try (widget, data); click_try (widget, data);
gnome_config_set_bool ("/theme-switcher-capplet/settings/auto",GTK_TOGGLE_BUTTON (auto_preview)->active);
gnome_config_set_string ("/theme-switcher-capplet/settings/theme", current_theme->name); gconf_client_set_bool (client, "/apps/gtk-theme-switcher/auto", GTK_TOGGLE_BUTTON (auto_preview)->active, NULL);
gnome_config_set_bool ("/theme-switcher-capplet/settings/use_theme_font", gconf_client_set_string (client, "/apps/gtk-theme-switcher/theme", current_theme->name, NULL);
GTK_TOGGLE_BUTTON (font_cbox)->active); gconf_client_set_bool (client, "/apps/gtk-theme-switcher/use_theme_font",
gnome_config_set_string ("/theme-switcher-capplet/settings/font", GTK_TOGGLE_BUTTON (font_cbox)->active, NULL);
gnome_font_picker_get_font_name (GNOME_FONT_PICKER (font_sel)));
gnome_config_sync (); gconf_client_set_string (client, "/apps/gtk-theme-switcher/font",
gnome_font_picker_get_font_name (GNOME_FONT_PICKER (font_sel)), NULL);
g_object_unref (G_OBJECT (client));
} }
static void static void
click_revert(GtkWidget *widget, gpointer data) click_revert(GtkWidget *widget, gpointer data)
@ -495,10 +500,7 @@ click_entry(GtkWidget *clist, gint row, gint col, GdkEvent *event,
{ {
current_theme = gtk_clist_get_row_data (GTK_CLIST (clist), row); current_theme = gtk_clist_get_row_data (GTK_CLIST (clist), row);
if (initial_theme)
state_changed (TRUE); state_changed (TRUE);
else
state_changed (FALSE);
if (GTK_TOGGLE_BUTTON (auto_preview)->active) if (GTK_TOGGLE_BUTTON (auto_preview)->active)
click_preview (NULL,NULL); click_preview (NULL,NULL);
@ -563,9 +565,13 @@ void
update_theme_entries(GtkWidget *disp_list) update_theme_entries(GtkWidget *disp_list)
{ {
GList *themes; GList *themes;
gchar *d_theme = gnome_config_get_string ("/theme-switcher-capplet/settings/theme=Default"); GConfClient *client = gconf_client_get_default ();
gchar *d_theme = gconf_client_get_string (client, "/apps/gtk-theme-switcher/theme", NULL);
gchar *current_name = NULL; gchar *current_name = NULL;
g_object_unref (G_OBJECT (client));
if (current_theme) if (current_theme)
current_name = g_strdup (current_theme->name); current_name = g_strdup (current_theme->name);
else else