projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PspppireKeypad: Add tooltips to buttons
[pspp]
/
src
/
ui
/
gui
/
help-menu.c
diff --git
a/src/ui/gui/help-menu.c
b/src/ui/gui/help-menu.c
index b5b38757c355ef5a6791b83605ce71b662d14dcf..da87e235edf9dcf8588baf84b4e79f502d6b786b 100644
(file)
--- a/
src/ui/gui/help-menu.c
+++ b/
src/ui/gui/help-menu.c
@@
-34,11
+34,11
@@
/* Try to open html documentation uri via the default
browser on the operating system */
#ifdef __APPLE__
/* Try to open html documentation uri via the default
browser on the operating system */
#ifdef __APPLE__
-#define HTMLOPENA
RGV {"open", 0, 0}
+#define HTMLOPENA
PP "open"
#elif _WIN32
#elif _WIN32
-#define HTMLOPENA
RGV {"wscript", 0, 0}
+#define HTMLOPENA
PP "wscript"
#else
#else
-#define HTMLOPENA
RGV {"xdg-open", 0, 0}
+#define HTMLOPENA
PP "xdg-open"
#endif
static const gchar *artists[] = { "Bastián Díaz", "Hugo Alejandro", NULL};
#endif
static const gchar *artists[] = { "Bastián Díaz", "Hugo Alejandro", NULL};
@@
-72,13
+72,13
@@
about_new (GtkMenuItem *mmm, GtkWindow *parent)
gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG (about),
"Free Software Foundation");
gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG (about),
"Free Software Foundation");
- gtk_about_dialog_set_translator_credits
+ gtk_about_dialog_set_translator_credits
(
GTK_ABOUT_DIALOG (about),
/* TRANSLATORS: Do not translate this string. Instead, put the names of the people
who have helped in the translation. */
_("translator-credits")
(
GTK_ABOUT_DIALOG (about),
/* TRANSLATORS: Do not translate this string. Instead, put the names of the people
who have helped in the translation. */
_("translator-credits")
-
);
+);
gtk_window_set_transient_for (GTK_WINDOW (about), parent);
gtk_window_set_transient_for (GTK_WINDOW (about), parent);
@@
-131,17
+131,15
@@
static gboolean open_windows_help (const gchar *helpuri,
void
online_help (const char *page)
{
void
online_help (const char *page)
{
- GError *err = NULL;
GError *htmlerr = NULL;
GError *htmlerr = NULL;
- gchar
*argv[3] = { "yelp", 0, 0}
;
- gchar *htmlargv[3] =
HTMLOPENARGV
;
+ gchar
helpapp[] = HTMLOPENAPP
;
+ gchar *htmlargv[3] =
{helpapp, 0, 0}
;
gchar *htmlfilename = NULL;
gchar *htmlfullname = NULL;
gchar *htmluri = NULL;
if (page == NULL)
{
gchar *htmlfilename = NULL;
gchar *htmlfullname = NULL;
gchar *htmluri = NULL;
if (page == NULL)
{
- argv[1] = g_strdup_printf ("file://%s", relocate (DOCDIR "/pspp.xml"));
htmlfilename = g_strdup ("index.html");
}
else
htmlfilename = g_strdup ("index.html");
}
else
@@
-149,8
+147,6
@@
online_help (const char *page)
gchar **tokens = NULL;
const int maxtokens = 5;
int idx ;
gchar **tokens = NULL;
const int maxtokens = 5;
int idx ;
- argv[1] = g_strdup_printf ("file://%s#%s",
- relocate (DOCDIR "/pspp.xml"), page);
/* The page will be translated to the htmlfilename
page htmlfilename
GRAPH#SCATTERPLOT SCATTERPLOT.html
/* The page will be translated to the htmlfilename
page htmlfilename
GRAPH#SCATTERPLOT SCATTERPLOT.html
@@
-188,9
+184,7
@@
online_help (const char *page)
osx: wine is started to launch the uri...
windows: not so bad, but the first access does not work*/
osx: wine is started to launch the uri...
windows: not so bad, but the first access does not work*/
- if (! (g_spawn_async (NULL, argv,
- NULL, G_SPAWN_SEARCH_PATH,
- NULL, NULL, NULL, &err) ||
+ if (! (
#ifdef _WIN32
open_windows_help (htmluri, &htmlerr))
#else
#ifdef _WIN32
open_windows_help (htmluri, &htmlerr))
#else
@@
-198,21
+192,17
@@
online_help (const char *page)
NULL, G_SPAWN_SEARCH_PATH,
NULL, NULL, NULL, &htmlerr))
#endif
NULL, G_SPAWN_SEARCH_PATH,
NULL, NULL, NULL, &htmlerr))
#endif
-
)
+)
{
{
- msg (ME, _("Cannot open reference manual via yelp: %s. "
- "Cannot open via html: %s "
+ msg (ME, _("Cannot open via html: %s "
"with uri: %s "
"The PSSP manual is also available at %s"),
"with uri: %s "
"The PSSP manual is also available at %s"),
- err->message,
htmlerr->message,
htmluri,
PACKAGE_URL "documentation.html");
}
htmlerr->message,
htmluri,
PACKAGE_URL "documentation.html");
}
- g_free (argv[1]);
g_free (htmluri);
g_free (htmluri);
- g_clear_error (&err);
g_clear_error (&htmlerr);
}
g_clear_error (&htmlerr);
}
@@
-232,7
+222,7
@@
create_help_menu (GtkWindow *toplevel)
GtkWidget *help_ref = gtk_menu_item_new_with_mnemonic (_("_Reference Manual"));
GtkAccelGroup *accel_group = gtk_accel_group_new ();
GtkWidget *help_ref = gtk_menu_item_new_with_mnemonic (_("_Reference Manual"));
GtkAccelGroup *accel_group = gtk_accel_group_new ();
-
+
gtk_window_add_accel_group (toplevel, accel_group);
gtk_widget_add_accelerator (help_ref,
gtk_window_add_accel_group (toplevel, accel_group);
gtk_widget_add_accelerator (help_ref,
@@
-245,10
+235,12
@@
create_help_menu (GtkWindow *toplevel)
g_signal_connect (help_about, "activate", G_CALLBACK (about_new), toplevel);
g_signal_connect (help_ref, "activate", G_CALLBACK (reference_manual), NULL);
g_signal_connect (help_about, "activate", G_CALLBACK (about_new), toplevel);
g_signal_connect (help_ref, "activate", G_CALLBACK (reference_manual), NULL);
-
+
g_object_set (menuitem, "submenu", menu, NULL);
gtk_widget_show_all (menuitem);
g_object_set (menuitem, "submenu", menu, NULL);
gtk_widget_show_all (menuitem);
-
+
+ g_object_unref (accel_group);
+
return menuitem;
}
return menuitem;
}