projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'gtk3'.
[pspp]
/
src
/
ui
/
gui
/
help-menu.c
diff --git
a/src/ui/gui/help-menu.c
b/src/ui/gui/help-menu.c
index 733580770bbea035a38432e35768b1665a1a18b5..e670c0b555b5b80f0ab5110dff05474d950408fb 100644
(file)
--- a/
src/ui/gui/help-menu.c
+++ b/
src/ui/gui/help-menu.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2006, 2007, 2010 Free Software Foundation
+ Copyright (C) 2006, 2007, 2010
, 2011, 2012, 2013
Free Software Foundation
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-32,19
+32,14
@@
#define N_(msgid) msgid
#define N_(msgid) msgid
-static const gchar *artists[] = { "
Patrick Brunier", "Dondi Bogusky
", NULL};
+static const gchar *artists[] = { "
Bastián Díaz", "Hugo Alejandro
", NULL};
static void
about_new (GtkMenuItem *m, GtkWindow *parent)
{
GtkWidget *about = gtk_about_dialog_new ();
static void
about_new (GtkMenuItem *m, GtkWindow *parent)
{
GtkWidget *about = gtk_about_dialog_new ();
- GdkPixbuf *pb =
- gdk_pixbuf_new_from_file_at_size (relocate (PKGDATADIR "/pspplogo.png"),
- 64, 64, 0);
-
- gtk_about_dialog_set_logo (GTK_ABOUT_DIALOG (about), pb);
-
+ gtk_about_dialog_set_logo_icon_name (GTK_ABOUT_DIALOG (about), "pspp");
gtk_window_set_icon_name (GTK_WINDOW (about), "pspp");
gtk_window_set_icon_name (GTK_WINDOW (about), "pspp");
@@
-71,8
+66,8
@@
about_new (GtkMenuItem *m, GtkWindow *parent)
gtk_about_dialog_set_translator_credits
(
GTK_ABOUT_DIALOG (about),
gtk_about_dialog_set_translator_credits
(
GTK_ABOUT_DIALOG (about),
- /* TRANSLATORS:
Use this string to list the people who have helped with
-
translation to your language
. */
+ /* TRANSLATORS:
Do not translate this string. Instead, put the names of the people
+
who have helped in the translation
. */
_("translator-credits")
);
_("translator-credits")
);
@@
-92,14
+87,16
@@
online_help (const char *page)
GError *err = NULL;
gchar *cmd = NULL;
GError *err = NULL;
gchar *cmd = NULL;
+ gchar *argv[3] = { "yelp", 0, 0};
+
if (page == NULL)
if (page == NULL)
-
cmd = g_strdup_printf ("yelp
file://%s", relocate (DOCDIR "/pspp.xml"));
+
argv[1] = g_strdup_printf ("
file://%s", relocate (DOCDIR "/pspp.xml"));
else
else
- cmd = g_strdup_printf ("yelp file://%s#%s", relocate (DOCDIR "/pspp.xml"), page);
-
- g_print ("%s\n",cmd);
+ argv[1] = g_strdup_printf ("file://%s#%s", relocate (DOCDIR "/pspp.xml"), page);
- if ( ! g_spawn_command_line_async (cmd, &err) )
+ if (! g_spawn_async (NULL, argv,
+ NULL, G_SPAWN_SEARCH_PATH,
+ NULL, NULL, NULL, &err))
{
msg (ME, _("Cannot open reference manual: %s. The PSPP user manual is "
"also available at %s"),
{
msg (ME, _("Cannot open reference manual: %s. The PSPP user manual is "
"also available at %s"),
@@
-134,14
+131,14
@@
merge_help_menu (GtkUIManager *uim)
},
{
},
{
- "help_reference",
GTK_STOCK_HELP
, /* name, stock id */
+ "help_reference",
"help-reference-manual"
, /* name, stock id */
N_("_Reference Manual"), NULL, /* label, accelerator */
NULL, /* tooltip */
G_CALLBACK (reference_manual)
},
{
N_("_Reference Manual"), NULL, /* label, accelerator */
NULL, /* tooltip */
G_CALLBACK (reference_manual)
},
{
- "help_about",
GTK_STOCK_ABOUT
,
+ "help_about",
"help-about"
,
NULL, NULL, NULL,
G_CALLBACK (about_new)
},
NULL, NULL, NULL,
G_CALLBACK (about_new)
},