summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Wehner <martin.wehner@gmail.com>2006-03-22 02:59:21 +0000
committerMartin Wehner <mwehner@src.gnome.org>2006-03-22 02:59:21 +0000
commitfa1dd162316e52b758553993444d9bb6889a2a87 (patch)
tree3609e272e902175448ae8fd851069e21411ab2e9 /src
parent904c1b95c67ab1f122598e4b5cb25c840d24619f (diff)
downloadnautilus-fa1dd162316e52b758553993444d9bb6889a2a87.tar.gz
Add help button to the Select Pattern dialog. (#331443)
2006-03-22 Martin Wehner <martin.wehner@gmail.com> * src/file-manager/fm-directory-view.c: (pattern_select_response_cb), (select_pattern): Add help button to the Select Pattern dialog. (#331443) * src/nautilus-connect-server-dialog.c: (response_callback), (nautilus_connect_server_dialog_init): Add help button to the Connect to Server dialog. (#334330) * src/nautilus-location-dialog.c: (response_callback), (nautilus_location_dialog_init): Add help button to the Open Location dialog (#334293)
Diffstat (limited to 'src')
-rw-r--r--src/file-manager/fm-directory-view.c34
-rw-r--r--src/nautilus-connect-server-dialog.c18
-rw-r--r--src/nautilus-location-dialog.c19
3 files changed, 65 insertions, 6 deletions
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 5c0f16a57..30a8ea5e4 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -68,6 +68,7 @@
#include <glib/gi18n.h>
#include <libgnome/gnome-util.h>
#include <libgnomeui/gnome-uidefs.h>
+#include <libgnomeui/gnome-help.h>
#include <libgnomevfs/gnome-vfs-async-ops.h>
#include <libgnomevfs/gnome-vfs-file-info.h>
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
@@ -1127,14 +1128,15 @@ static void
pattern_select_response_cb (GtkWidget *dialog, int response, gpointer user_data)
{
FMDirectoryView *view;
+ NautilusDirectory *directory;
GtkWidget *entry;
+ GList *selection;
+ GError *error;
view = FM_DIRECTORY_VIEW (user_data);
-
- if (response == GTK_RESPONSE_OK) {
- NautilusDirectory *directory;
- GList *selection;
+ switch (response) {
+ case GTK_RESPONSE_OK :
entry = g_object_get_data (G_OBJECT (dialog), "entry");
directory = fm_directory_view_get_model (view);
selection = nautilus_directory_match_pattern (directory,
@@ -1146,9 +1148,27 @@ pattern_select_response_cb (GtkWidget *dialog, int response, gpointer user_data)
fm_directory_view_reveal_selection(view);
}
+ /* fall through */
+ case GTK_RESPONSE_NONE :
+ case GTK_RESPONSE_DELETE_EVENT :
+ case GTK_RESPONSE_CANCEL :
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+ break;
+ case GTK_RESPONSE_HELP :
+ error = NULL;
+ gnome_help_display_desktop_on_screen (NULL, "user-guide", "user-guide.xml",
+ "nautilus-select-pattern",
+ gtk_window_get_screen (GTK_WINDOW (dialog)),
+ &error);
+ if (error) {
+ eel_show_error_dialog (_("There was an error displaying help."), error->message,
+ GTK_WINDOW (dialog));
+ g_error_free (error);
+ }
+ break;
+ default :
+ g_assert_not_reached ();
}
-
- gtk_widget_destroy (dialog);
}
static void
@@ -1164,6 +1184,8 @@ select_pattern (FMDirectoryView *view)
dialog = gtk_dialog_new_with_buttons (_("Select Pattern"),
fm_directory_view_get_containing_window (view),
GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_HELP,
+ GTK_RESPONSE_HELP,
GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL,
GTK_STOCK_OK,
diff --git a/src/nautilus-connect-server-dialog.c b/src/nautilus-connect-server-dialog.c
index b22d8ea8c..183155102 100644
--- a/src/nautilus-connect-server-dialog.c
+++ b/src/nautilus-connect-server-dialog.c
@@ -28,6 +28,7 @@
#include <eel/eel-gtk-macros.h>
#include <eel/eel-stock-dialogs.h>
#include <eel/eel-vfs-extensions.h>
+#include <libgnomeui/gnome-help.h>
#include <libgnomevfs/gnome-vfs-utils.h>
#include <libgnomevfs/gnome-vfs-volume.h>
#include <glib/gi18n.h>
@@ -330,6 +331,8 @@ response_callback (NautilusConnectServerDialog *dialog,
int response_id,
gpointer data)
{
+ GError *error;
+
switch (response_id) {
case RESPONSE_BROWSE:
nautilus_connect_server_dialog_present_uri (dialog->details->application,
@@ -345,6 +348,18 @@ response_callback (NautilusConnectServerDialog *dialog,
case GTK_RESPONSE_CANCEL:
gtk_widget_destroy (GTK_WIDGET (dialog));
break;
+ case GTK_RESPONSE_HELP :
+ error = NULL;
+ gnome_help_display_desktop_on_screen (NULL, "user-guide", "user-guide.xml",
+ "nautilus-server-connect",
+ gtk_window_get_screen (GTK_WINDOW (dialog)),
+ &error);
+ if (error) {
+ eel_show_error_dialog (_("There was an error displaying help."), error->message,
+ GTK_WINDOW (dialog));
+ g_error_free (error);
+ }
+ break;
default :
g_assert_not_reached ();
}
@@ -744,6 +759,9 @@ nautilus_connect_server_dialog_init (NautilusConnectServerDialog *dialog)
setup_for_type (dialog);
+ gtk_dialog_add_button (GTK_DIALOG (dialog),
+ GTK_STOCK_HELP,
+ GTK_RESPONSE_HELP);
gtk_dialog_add_button (GTK_DIALOG (dialog),
_("Browse _Network"),
RESPONSE_BROWSE);
diff --git a/src/nautilus-location-dialog.c b/src/nautilus-location-dialog.c
index 2a7d25497..44a4f78cb 100644
--- a/src/nautilus-location-dialog.c
+++ b/src/nautilus-location-dialog.c
@@ -26,9 +26,11 @@
#include <eel/eel-gtk-macros.h>
#include <eel/eel-vfs-extensions.h>
+#include <eel/eel-stock-dialogs.h>
#include <gtk/gtkhbox.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkstock.h>
+#include <libgnomeui/gnome-help.h>
#include <libgnomevfs/gnome-vfs-utils.h>
#include <libnautilus-private/nautilus-file-utilities.h>
#include "nautilus-location-entry.h"
@@ -91,6 +93,8 @@ response_callback (NautilusLocationDialog *dialog,
int response_id,
gpointer data)
{
+ GError *error;
+
switch (response_id) {
case RESPONSE_OPEN :
open_current_location (dialog);
@@ -101,6 +105,18 @@ response_callback (NautilusLocationDialog *dialog,
case GTK_RESPONSE_CANCEL :
gtk_widget_destroy (GTK_WIDGET (dialog));
break;
+ case GTK_RESPONSE_HELP :
+ error = NULL;
+ gnome_help_display_desktop_on_screen (NULL, "user-guide", "user-guide.xml",
+ "nautilus-open-location",
+ gtk_window_get_screen (GTK_WINDOW (dialog)),
+ &error);
+ if (error) {
+ eel_show_error_dialog (_("There was an error displaying help."), error->message,
+ GTK_WINDOW (dialog));
+ g_error_free (error);
+ }
+ break;
default :
g_assert_not_reached ();
}
@@ -170,6 +186,9 @@ nautilus_location_dialog_init (NautilusLocationDialog *dialog)
box, TRUE, TRUE, 0);
gtk_dialog_add_button (GTK_DIALOG (dialog),
+ GTK_STOCK_HELP,
+ GTK_RESPONSE_HELP);
+ gtk_dialog_add_button (GTK_DIALOG (dialog),
GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL);
gtk_dialog_add_button (GTK_DIALOG (dialog),