Added.

2001-07-03  Richard Hestilow  <hestilow@ximian.com>

	* screensaver-properties.glade[.h]: Added.

	* prefs-widget.[ch]: Complete rewrite.

	* Makefile.am: Add glade stuff.

	* main.c: Call glade_gnome_init.

	* pref-file.c: Restart xscreensaver on save.

	* screensaver-prefs-dialog.c (screensaver_prefs_dialog_new):
	Change g_strconcat to g_strdup_printf for i18n purposes.

capplets/screensaver/ChangeLog

@@ -1,3 +1,18 @@
+2001-07-03  Richard Hestilow  <hestilow@ximian.com>
+	
+	* screensaver-properties.glade[.h]: Added.
+	
+	* prefs-widget.[ch]: Complete rewrite.
+
+	* Makefile.am: Add glade stuff.
+
+	* main.c: Call glade_gnome_init.
+
+	* pref-file.c: Restart xscreensaver on save.
+
+	* screensaver-prefs-dialog.c (screensaver_prefs_dialog_new):
+	Change g_strconcat to g_strdup_printf for i18n purposes.
+
 2001-06-21  Bradford Hovinen  <hovinen@ximian.com>
 
 	* preferences.c (clone_cb): Remove debugging code

capplets/screensaver/Makefile.am

@@ -10,17 +10,25 @@ pApplicationsdir = $(datadir)/gnome/apps/Settings/Desktop
 pApplications_DATA = \
 	screensaver-properties.desktop
 
+Gladedir = $(datadir)/control-center-data
+Glade_DATA = \
+	screensaver-properties.glade
+
+glade_msgs = \
+	screensaver-properties.glade.h
+
 SUBDIRS = screensavers
 
 EXTRA_DIST = ChangeLog $(Applications_DATA) $(pixmap_DATA) \
-	checked.xpm unchecked.xpm checked-disabled.xpm unchecked-disabled.xpm
+	$(Glade_DATA) $(glade_msgs)
 
 INCLUDES = \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
 	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
 	-DSSPROP_DATADIR=\""${prefix}/share"\" \
 	-DG_LOG_DOMAIN=\"screensaver-properties\" \
-	@CAPPLET_CFLAGS@ \
+	-DGLADE_DATADIR=\""$(Gladedir)"\"	\
+	@SCREENSAVER_CAPPLET_CFLAGS@ \
 	-I$(top_srcdir)/ \
 	-I$(top_srcdir)/intl
 
@@ -40,4 +48,4 @@ screensaver_properties_capplet_SOURCES = \
 	XScreenSaver_ad.h \
 	main.c
 
-screensaver_properties_capplet_LDADD = @CAPPLET_LIBS@ -lXt
+screensaver_properties_capplet_LDADD = @SCREENSAVER_CAPPLET_LIBS@ -lXt

capplets/screensaver/main.c

@@ -226,7 +226,7 @@ setup_capplet_widget (void)
 
 	prefs->frozen++;
 
-	prefs_widget = PREFS_WIDGET (prefs_widget_new ());
+	prefs_widget = PREFS_WIDGET (prefs_widget_new (GTK_WINDOW (capplet)));
 
 	gtk_container_add (GTK_CONTAINER (capplet), GTK_WIDGET (prefs_widget));
 
@@ -346,6 +346,8 @@ main (int argc, char **argv)
 		return 0;
 	}
 
+	glade_gnome_init ();
+
 	client = gnome_master_client ();
 	flags = gnome_client_get_flags (client);
 

capplets/screensaver/pref-file.c

@@ -46,6 +46,7 @@
 
 #include "pref-file.h"
 #include "rc-parse.h"
+#include "daemon.h"
 
 #define START_BUF_SIZE 1024
 #define MIN_FREE_BUF 128
@@ -520,6 +521,8 @@ preferences_save_to_file (Preferences *prefs)
 			 */
 			sync ();
 
+			restart_xscreensaver ();
+
 			status = 0;    /* wrote and renamed successfully! */
 		}
 	}

capplets/screensaver/prefs-widget.h

@@ -33,81 +33,28 @@
 #define IS_PREFS_WIDGET(obj)       GTK_CHECK_TYPE (obj, prefs_widget_get_type ())
 
 typedef struct _PrefsWidget PrefsWidget;
+typedef struct _PrefsWidgetPrivate PrefsWidgetPrivate;
+
 typedef struct _PrefsWidgetClass PrefsWidgetClass;
 
 struct _PrefsWidget 
 {
-	GtkNotebook notebook;
-
-	GtkWidget *disable_screensaver_widget;
-	GtkWidget *blank_screen_widget;
-	GtkWidget *one_screensaver_widget;
-	GtkWidget *choose_from_list_widget;
-	GtkWidget *choose_randomly_widget;
-
-	GtkWidget *screensaver_list;
-
-	GtkWidget *demo_button;
-	GtkWidget *remove_button;
-	GtkWidget *settings_button;
-
-	GtkWidget *preview_window;
-	GtkWidget *description;
-
-	GtkObject *timeout_widget_adj;
-	GtkWidget *timeout_widget;
-	GtkObject *cycle_length_widget_adj;
-	GtkWidget *cycle_length_widget;
-
-	GtkWidget *lock_widget;
-	GtkWidget *enable_timeout_widget;
-	GtkObject *time_to_lock_widget_adj;
-	GtkWidget *time_to_lock_widget;
-	GtkWidget *lock_timeout_seconds_label;
-	GtkWidget *lock_vts_widget;
-	GtkWidget *pwr_manage_enable;
-
-	GtkWidget *standby_monitor_toggle;
-	GtkObject *standby_time_widget_adj;
-	GtkWidget *standby_time_widget;
-	GtkWidget *standby_monitor_label2;
-
-	GtkWidget *suspend_monitor_toggle;
-	GtkObject *suspend_time_widget_adj;
-	GtkWidget *suspend_time_widget;
-	GtkWidget *suspend_monitor_label2;
-
-	GtkWidget *shut_down_monitor_toggle;
-	GtkObject *shut_down_time_widget_adj;
-	GtkWidget *shut_down_time_widget;
-	GtkWidget *shut_down_monitor_label2;
-
-	GtkWidget *nice_widget;
-	GtkWidget *verbose_widget;
-
-	GtkWidget *effects_frame;
-	GtkWidget *install_cmap_widget;
-	GtkWidget *fade_widget;
-	GtkWidget *unfade_widget;
-	GtkWidget *fade_duration_label;
-	GtkWidget *fade_ticks_widget;
-	GtkWidget *fade_ticks_label;
-	GtkWidget *fade_duration_widget;
-	GtkWidget *fade_duration_high_label;
-	GtkWidget *fade_ticks_high_label;
-	GtkWidget *fade_duration_low_label;
-	GtkWidget *fade_ticks_low_label;
+	GtkVBox vbox;
 
 	GList *screensavers;
 	Screensaver *selected_saver;
 
+	GtkWidget *preview_window;
+
 	/* Cached preferences */
 	SelectionMode selection_mode;
+
+	PrefsWidgetPrivate *priv;
 };
 
 struct _PrefsWidgetClass 
 {
-	GtkNotebookClass notebook_class;
+	GtkVBoxClass vbox_class;
 
 	void (*state_changed) (PrefsWidget *widget);
 	void (*activate_demo) (PrefsWidget *widget);
@@ -115,14 +62,15 @@ struct _PrefsWidgetClass
 
 guint prefs_widget_get_type (void);
 
-GtkWidget *prefs_widget_new         (void);
+GtkWidget *prefs_widget_new         (GtkWindow *parent);
 
 void prefs_widget_get_prefs         (PrefsWidget *prefs_widget,
 				     Preferences *prefs);
 void prefs_widget_store_prefs       (PrefsWidget *prefs_widget,
 				     Preferences *prefs);
-void prefs_widget_set_screensavers  (PrefsWidget *prefs_widget,
-				     GList *screensavers, 
+void prefs_widget_set_mode          (PrefsWidget *prefs_widget,
 				     SelectionMode mode);
+void prefs_widget_set_screensavers  (PrefsWidget *prefs_widget,
+				     GList *screensavers); 
 
 #endif /* __PREFS_WIDGET_H */

capplets/screensaver/screensaver-prefs-dialog.c

@@ -271,7 +271,7 @@ screensaver_prefs_dialog_new (Screensaver *saver)
 
 	dialog->saver = saver;
 
-	title = g_strconcat (saver->label, " properties", NULL);
+	title = g_strdup_printf ("%s properties", saver->label);
 	gtk_entry_set_text (GTK_ENTRY (dialog->name_entry), 
 			    saver->label);
 

capplets/screensaver/screensaver-properties.glade.h

@@ -0,0 +1,38 @@
+/*
+ * Translatable strings file generated by Glade.
+ * Add this file to your project's POTFILES.in.
+ * DO NOT compile it as part of your application.
+ */
+
+gchar *s = N_("About \"<Screensaver name>\"");
+gchar *s = N_("Draws quasiperiodic tilings; think of the implications on modern formica technology. Written by Time Korlove. In April 1997, Sir Roger Penrose, a British math professor who has worked with Stephen Hawking on such topics as relatvity, black holes, and whether time has a beginning, files a copyright-infringement lawsuit against Kimberly-Clark Corporation, wchih Penrose said copied a pattern he created ( apattern demonstrating that \"a nonrepeating pattern could exist in nature\") for its Kleenex quilted toilet paper. ");
+gchar *s = N_("Configure Power Management");
+gchar *s = N_("Shut down monitor after");
+gchar *s = N_("minutes");
+gchar *s = N_("Go to suspend mode after");
+gchar *s = N_("minutes");
+gchar *s = N_("Go to standby mode after");
+gchar *s = N_("minutes");
+gchar *s = N_("Settings for \"<Screensaver name>\"");
+gchar *s = N_("There are no configurable settings for this\n"
+              "screensaver. ");
+gchar *s = N_("_Add");
+gchar *s = N_("_Settings");
+gchar *s = N_("_Remove");
+gchar *s = N_("_Demo");
+gchar *s = N_("_About this screensaver...");
+gchar *s = N_("window1");
+gchar *s = N_("minutes");
+gchar *s = N_("minutes");
+gchar *s = N_("S_tart screensaver after ");
+gchar *s = N_("S_witch screensavers after ");
+gchar *s = N_("R_equire password to unlock screen");
+gchar *s = N_("Enable _power management");
+gchar *s = N_(" Configure...");
+gchar *s = N_("Preview");
+gchar *s = N_("_Mode:");
+gchar *s = N_("Disable screensaver");
+gchar *s = N_("Black screen only");
+gchar *s = N_("One screensaver all the time");
+gchar *s = N_("Random (checked screensavers)");
+gchar *s = N_("Random (all screensavers)");