From b4e25754bf17ef54569367718eda57ea759108c5 Mon Sep 17 00:00:00 2001 From: Monsta Date: Wed, 17 Jun 2015 16:20:11 +0300 Subject: show main caja help page from m-u-g in all dialogs this should be corrected when m-u-g will be complete (e.g. will contain help for all these dialogs) --- src/caja-bookmarks-window.c | 3 ++- src/caja-connect-server-dialog.c | 3 ++- src/caja-file-management-properties.c | 5 ++++- src/caja-location-dialog.c | 3 ++- src/caja-property-browser.c | 3 ++- src/file-manager/fm-directory-view.c | 3 ++- src/file-manager/fm-properties-window.c | 3 ++- 7 files changed, 16 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/caja-bookmarks-window.c b/src/caja-bookmarks-window.c index 572f6275..aa8b8358 100644 --- a/src/caja-bookmarks-window.c +++ b/src/caja-bookmarks-window.c @@ -145,7 +145,8 @@ caja_bookmarks_window_response_callback (GtkDialog *dialog, GError *error = NULL; gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)), - "help:mate-user-guide/goscaja-36", + /* FIXME: show proper page instead of main when m-u-g is complete */ + "help:mate-user-guide/files", gtk_get_current_event_time (), &error); if (error) diff --git a/src/caja-connect-server-dialog.c b/src/caja-connect-server-dialog.c index 921b2597..f1ee942a 100644 --- a/src/caja-connect-server-dialog.c +++ b/src/caja-connect-server-dialog.c @@ -707,7 +707,8 @@ connect_dialog_response_cb (CajaConnectServerDialog *dialog, case GTK_RESPONSE_HELP : error = NULL; gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)), - "help:mate-user-guide/caja-server-connect", + /* FIXME: show proper page instead of main when m-u-g is complete */ + "help:mate-user-guide/files", gtk_get_current_event_time (), &error); if (error) { diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c index 24283611..8111d285 100644 --- a/src/caja-file-management-properties.c +++ b/src/caja-file-management-properties.c @@ -256,6 +256,8 @@ caja_file_management_properties_dialog_response_cb (GtkDialog *parent, if (response_id == GTK_RESPONSE_HELP) { + /* FIXME: show proper page instead of main when m-u-g is complete */ +#if 0 switch (gtk_notebook_get_current_page (GTK_NOTEBOOK (gtk_builder_get_object (builder, "notebook1")))) { default: @@ -278,7 +280,8 @@ caja_file_management_properties_dialog_response_cb (GtkDialog *parent, section = "goscaja-61"; break; } - preferences_show_help (GTK_WINDOW (parent), "mate-user-guide", section); +#endif + preferences_show_help (GTK_WINDOW (parent), "mate-user-guide", "files"); } else if (response_id == GTK_RESPONSE_CLOSE) { diff --git a/src/caja-location-dialog.c b/src/caja-location-dialog.c index b534f210..0fc2ef00 100644 --- a/src/caja-location-dialog.c +++ b/src/caja-location-dialog.c @@ -95,7 +95,8 @@ response_callback (CajaLocationDialog *dialog, case GTK_RESPONSE_HELP : error = NULL; gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)), - "help:mate-user-guide/caja-open-location", + /* FIXME: show proper page instead of main when m-u-g is complete */ + "help:mate-user-guide/files", gtk_get_current_event_time (), &error); if (error) { diff --git a/src/caja-property-browser.c b/src/caja-property-browser.c index d1d75f8d..6a522af0 100644 --- a/src/caja-property-browser.c +++ b/src/caja-property-browser.c @@ -1640,7 +1640,8 @@ help_button_callback (GtkWidget *widget, GtkWidget *property_browser) GtkWidget *dialog; gtk_show_uri (gtk_widget_get_screen (property_browser), - "help:mate-user-guide/goscaja-50", + /* FIXME: show proper page instead of main when m-u-g is complete */ + "help:mate-user-guide/files", gtk_get_current_event_time (), &error); if (error) diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index ebf80eb3..394a2ac2 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -1170,7 +1170,8 @@ pattern_select_response_cb (GtkWidget *dialog, int response, gpointer user_data) case GTK_RESPONSE_HELP : error = NULL; gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)), - "help:mate-user-guide/caja-select-pattern", + /* FIXME: show proper page instead of main when m-u-g is complete */ + "help:mate-user-guide/files", gtk_get_current_event_time (), &error); if (error) { eel_show_error_dialog (_("There was an error displaying help."), error->message, diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c index ba305015..2de1bec1 100644 --- a/src/file-manager/fm-properties-window.c +++ b/src/file-manager/fm-properties-window.c @@ -5521,7 +5521,8 @@ real_response (GtkDialog *dialog, switch (response) { case GTK_RESPONSE_HELP: gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)), - "help:mate-user-guide/goscaja-51", + /* FIXME: show proper page instead of main when m-u-g is complete */ + "help:mate-user-guide/files", gtk_get_current_event_time (), &error); if (error != NULL) { -- cgit v1.2.1