diff --git a/.cvsignore b/.cvsignore index e3d53e3de..ee23010c7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -26,3 +26,4 @@ version.h intl macros INSTALL +control-center.spec diff --git a/capplets/theme-switcher/da.h b/capplets/theme-switcher/da.h index ec61ea08c..763be63f6 100644 --- a/capplets/theme-switcher/da.h +++ b/capplets/theme-switcher/da.h @@ -71,6 +71,8 @@ click_preview(GtkWidget *widget, gpointer data); void click_try(GtkWidget *widget, gpointer data); void +click_help(GtkWidget *widget, gpointer data); +void click_ok(GtkWidget *widget, gpointer data); void click_revert(GtkWidget *widget, gpointer data); diff --git a/capplets/theme-switcher/da.h-67648 b/capplets/theme-switcher/da.h-67648 index ec61ea08c..763be63f6 100644 --- a/capplets/theme-switcher/da.h-67648 +++ b/capplets/theme-switcher/da.h-67648 @@ -71,6 +71,8 @@ click_preview(GtkWidget *widget, gpointer data); void click_try(GtkWidget *widget, gpointer data); void +click_help(GtkWidget *widget, gpointer data); +void click_ok(GtkWidget *widget, gpointer data); void click_revert(GtkWidget *widget, gpointer data); diff --git a/capplets/theme-switcher/gui.c b/capplets/theme-switcher/gui.c index f83c72175..6695f1dd0 100644 --- a/capplets/theme-switcher/gui.c +++ b/capplets/theme-switcher/gui.c @@ -170,6 +170,8 @@ make_main(void) socket = gtk_socket_new(); gtk_container_add(GTK_CONTAINER(evbox), socket); update_theme_entries(l2); + gtk_signal_connect (GTK_OBJECT (w), "help", + GTK_SIGNAL_FUNC (click_help), NULL); gtk_signal_connect (GTK_OBJECT (w), "try", GTK_SIGNAL_FUNC (click_try), NULL); gtk_signal_connect (GTK_OBJECT (w), "ok", @@ -215,6 +217,18 @@ click_preview(GtkWidget *widget, gpointer data) send_reread(); } +void +click_help(GtkWidget *widget, gpointer data) +{ + gchar *tmp; + + tmp = gnome_help_file_find_file ("users-guide", "gccdesktop.html#GCCTHEME"); + if (tmp) { + gnome_help_goto(0, tmp); + g_free(tmp); + } + +} void click_try(GtkWidget *widget, gpointer data) { diff --git a/capplets/theme-switcher/gui.c-6060 b/capplets/theme-switcher/gui.c-6060 index f83c72175..6695f1dd0 100644 --- a/capplets/theme-switcher/gui.c-6060 +++ b/capplets/theme-switcher/gui.c-6060 @@ -170,6 +170,8 @@ make_main(void) socket = gtk_socket_new(); gtk_container_add(GTK_CONTAINER(evbox), socket); update_theme_entries(l2); + gtk_signal_connect (GTK_OBJECT (w), "help", + GTK_SIGNAL_FUNC (click_help), NULL); gtk_signal_connect (GTK_OBJECT (w), "try", GTK_SIGNAL_FUNC (click_try), NULL); gtk_signal_connect (GTK_OBJECT (w), "ok", @@ -215,6 +217,18 @@ click_preview(GtkWidget *widget, gpointer data) send_reread(); } +void +click_help(GtkWidget *widget, gpointer data) +{ + gchar *tmp; + + tmp = gnome_help_file_find_file ("users-guide", "gccdesktop.html#GCCTHEME"); + if (tmp) { + gnome_help_goto(0, tmp); + g_free(tmp); + } + +} void click_try(GtkWidget *widget, gpointer data) { diff --git a/capplets/wm-properties/wm-properties-capplet.c b/capplets/wm-properties/wm-properties-capplet.c index a7caeb3c3..ee7029dca 100644 --- a/capplets/wm-properties/wm-properties-capplet.c +++ b/capplets/wm-properties/wm-properties-capplet.c @@ -13,6 +13,7 @@ /* prototypes */ static void restart (gboolean force); static void try_callback (void); +static void help_callback (void); static void ok_callback (void); static void revert_callback (void); static void cancel_callback (void); @@ -516,6 +517,18 @@ try_callback (void) restart(FALSE); } +static void +help_callback (void) +{ + gchar *tmp; + + tmp = gnome_help_file_find_file ("users-guide", "gccdesktop.html#GCCWM"); + if (tmp) { + gnome_help_goto(0, tmp); + g_free(tmp); + } +} + static void ok_callback (void) { @@ -1002,6 +1015,8 @@ main (int argc, char **argv) wm_setup(); gtk_signal_connect(GTK_OBJECT(capplet), "destroy", GTK_SIGNAL_FUNC(destroy_callback), NULL); + gtk_signal_connect (GTK_OBJECT (capplet), "help", + GTK_SIGNAL_FUNC (help_callback), NULL); gtk_signal_connect (GTK_OBJECT (capplet), "try", GTK_SIGNAL_FUNC (try_callback), NULL); gtk_signal_connect (GTK_OBJECT (capplet), "revert",