From 29cc929d0cac2e7e47c8ded0eb5d8e63d8d9c11c Mon Sep 17 00:00:00 2001 From: Dennis Cranston Date: Wed, 8 May 2002 21:07:17 +0000 Subject: [PATCH] add a stock information image to the "You can drag image files..." text. 2002-05-02 Dennis Cranston * background-properties.glade: add a stock information image to the "You can drag image files..." text. 2002-05-08 Jody Goldberg * background-properties-capplet.c (cb_dialog_response) : new. (main) : support help. --- capplets/background/ChangeLog | 10 +++ .../background-properties-capplet.c | 28 ++++--- .../background/background-properties.glade | 75 +++++++++++++++---- 3 files changed, 90 insertions(+), 23 deletions(-) diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog index 9ca2a04ad..194e6ffed 100644 --- a/capplets/background/ChangeLog +++ b/capplets/background/ChangeLog @@ -1,3 +1,13 @@ +2002-05-02 Dennis Cranston + + * background-properties.glade: add a stock information image + to the "You can drag image files..." text. + +2002-05-08 Jody Goldberg + + * background-properties-capplet.c (cb_dialog_response) : new. + (main) : support help. + 2002-04-27 Seth Nickell * background.desktop.in: diff --git a/capplets/background/background-properties-capplet.c b/capplets/background/background-properties-capplet.c index a43f92ab9..de10a6fe3 100644 --- a/capplets/background/background-properties-capplet.c +++ b/capplets/background/background-properties-capplet.c @@ -441,19 +441,25 @@ create_dialog (ApplierSet *set) return dialog; } -/* Callback issued when a button is clicked on the dialog */ static void -dialog_button_clicked_cb (GtkDialog *dialog, gint response_id, GConfChangeSet *changeset) +cb_dialog_response (GtkDialog *dialog, gint response_id) { - switch (response_id) { - case GTK_RESPONSE_CLOSE: - case GTK_RESPONSE_DELETE_EVENT: - gtk_main_quit (); - break; - } -} + if (response_id == GTK_RESPONSE_HELP) { + GError *error = NULL; + /* TODO : get this written */ + gnome_help_display_desktop (NULL, + "control-center-manual", + "config-background.xml", + "CONFIGURATION", &error); + if (error) { + g_warning ("help error: %s\n", error->message); + g_error_free (error); + } + } else + gtk_main_quit (); +} /* Callback issued during drag movements */ static gboolean @@ -561,7 +567,9 @@ main (int argc, char **argv) gtk_window_set_icon (GTK_WINDOW(dialog_win), pixbuf); gdk_pixbuf_unref (pixbuf); - g_signal_connect (G_OBJECT (dialog_win), "response", (GCallback) dialog_button_clicked_cb, NULL); + g_signal_connect (G_OBJECT (dialog_win), + "response", + G_CALLBACK (cb_dialog_response), NULL); gtk_drag_dest_set (dialog_win, GTK_DEST_DEFAULT_ALL, drop_types, n_drop_types, diff --git a/capplets/background/background-properties.glade b/capplets/background/background-properties.glade index f5c043784..2dce4e03a 100644 --- a/capplets/background/background-properties.glade +++ b/capplets/background/background-properties.glade @@ -136,20 +136,50 @@ - + True - You can drag image files + False + 0 + + + + True + gtk-dialog-info + 6 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + You can drag image files into the window to set the background picture. - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + 0 @@ -211,7 +241,7 @@ background picture. True Bor_der the picture with a: - yes + True False GTK_JUSTIFY_LEFT False @@ -441,8 +471,8 @@ background picture. 10 True - Picture Options: 0 + 0.5 GTK_SHADOW_NONE @@ -559,6 +589,25 @@ background picture. + + + + True + Picture Options: + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + 0