diff options
author | Jens Granseuer <jensgr@gmx.net> | 2008-10-07 16:15:00 +0000 |
---|---|---|
committer | Jens Granseuer <jensg@src.gnome.org> | 2008-10-07 16:15:00 +0000 |
commit | c32f08efb1d474eccd3ab787c26ee24325af9385 (patch) | |
tree | 00bf3660984d060ef4e3fbedd1d425cc81059608 /capplets/appearance | |
parent | ae314d20c2dd80b4dcbc056ef2f1524f5c385c89 (diff) | |
download | gnome-control-center-c32f08efb1d474eccd3ab787c26ee24325af9385.tar.gz |
Patch by: Matthias Clasen <mclasen@redhat.com>
2008-10-07 Jens Granseuer <jensgr@gmx.net>
Patch by: Matthias Clasen <mclasen@redhat.com>
* appearance-main.c: (main_window_response):
* appearance-style.c: (style_response_cb): connect the help buttons
to the most appropriate sections in the user guide (bug #554957)
svn path=/trunk/; revision=9043
Diffstat (limited to 'capplets/appearance')
-rw-r--r-- | capplets/appearance/ChangeLog | 8 | ||||
-rw-r--r-- | capplets/appearance/appearance-main.c | 32 | ||||
-rw-r--r-- | capplets/appearance/appearance-style.c | 3 |
3 files changed, 42 insertions, 1 deletions
diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog index 972c6b291..38217ca29 100644 --- a/capplets/appearance/ChangeLog +++ b/capplets/appearance/ChangeLog @@ -1,5 +1,13 @@ 2008-10-07 Jens Granseuer <jensgr@gmx.net> + Patch by: Matthias Clasen <mclasen@redhat.com> + + * appearance-main.c: (main_window_response): + * appearance-style.c: (style_response_cb): connect the help buttons + to the most appropriate sections in the user guide (bug #554957) + +2008-10-07 Jens Granseuer <jensgr@gmx.net> + * data/appearance.glade: revert r9025 and reinstate the help buttons 2008-09-29 Jens Granseuer <jensgr@gmx.net> diff --git a/capplets/appearance/appearance-main.c b/capplets/appearance/appearance-main.c index 21b28b00e..bac95a3c6 100644 --- a/capplets/appearance/appearance-main.c +++ b/capplets/appearance/appearance-main.c @@ -85,6 +85,38 @@ main_window_response (GtkWidget *widget, g_object_unref (data->client); g_object_unref (data->xml); } + else if (response_id == GTK_RESPONSE_HELP) + { + GtkNotebook *nb; + gint pindex; + + nb = GTK_NOTEBOOK (glade_xml_get_widget (data->xml, "main_notebook")); + pindex = gtk_notebook_get_current_page (nb); + + switch (pindex) + { + case 0: /* theme */ + capplet_help (GTK_WINDOW (widget), "user-guide.xml", + "goscustdesk-12"); + break; + case 1: /* background */ + capplet_help (GTK_WINDOW (widget), "user-guide.xml", + "goscustdesk-7"); + break; + case 2: /* fonts */ + capplet_help (GTK_WINDOW (widget), "user-guide.xml", + "goscustdesk-38"); + break; + case 3: /* interface */ + capplet_help (GTK_WINDOW (widget), "user-guide.xml", + "goscustuserinter-2"); + break; + default: + capplet_help (GTK_WINDOW (widget), "user-guide.xml", + "prefs-look-and-feel"); + break; + } + } } int diff --git a/capplets/appearance/appearance-style.c b/capplets/appearance/appearance-style.c index 6cd138349..8cf5c07bd 100644 --- a/capplets/appearance/appearance-style.c +++ b/capplets/appearance/appearance-style.c @@ -26,6 +26,7 @@ #include "gtkrc-utils.h" #include "gconf-property-editor.h" #include "theme-thumbnail.h" +#include "capplet-util.h" #include "gedit-message-area.h" typedef void (* ThumbnailGenFunc) (void *type, @@ -392,7 +393,7 @@ static void style_response_cb (GtkDialog *dialog, gint response_id) { if (response_id == GTK_RESPONSE_HELP) { - /* FIXME: help */ + capplet_help (GTK_WINDOW (dialog), "user-guide.xml", "goscustdesk-61"); } else { gtk_widget_hide (GTK_WIDGET (dialog)); } |