projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added some accelerator keys to the menu items.
[pspp]
/
src
/
ui
/
gui
/
help-menu.c
diff --git
a/src/ui/gui/help-menu.c
b/src/ui/gui/help-menu.c
index 1015fda89811d0e826101da7765b1c26eb23c7fd..33a9407f71fc8532930b91c9db2fd1f3f407a531 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,21
+32,16
@@
#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_icon_name (GTK_ABOUT_DIALOG (about), "pspp");
- gtk_about_dialog_set_logo (GTK_ABOUT_DIALOG (about), pb);
-
-
- gtk_window_set_icon_name (GTK_WINDOW (about), "psppicon");
+ gtk_window_set_icon_name (GTK_WINDOW (about), "pspp");
gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (about), PACKAGE_URL);
gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (about), PACKAGE_URL);
@@
-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")
);
@@
-85,14
+80,23
@@
about_new (GtkMenuItem *m, GtkWindow *parent)
gtk_widget_hide (about);
}
gtk_widget_hide (about);
}
-
-
static
void
-
reference_manual (GtkMenuItem *menu, gpointer data
)
+/* Open the manual at PAGE */
+void
+
online_help (const char *page
)
{
GError *err = NULL;
{
GError *err = NULL;
- gchar *cmd = g_strdup_printf ("yelp file://%s", relocate (DOCDIR "/pspp.xml"));
+ gchar *cmd = NULL;
+
+ gchar *argv[3] = { "yelp", 0, 0};
+
+ if (page == NULL)
+ argv[1] = g_strdup_printf ("file://%s", relocate (DOCDIR "/pspp.xml"));
+ else
+ 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"),
@@
-104,6
+108,14
@@
reference_manual (GtkMenuItem *menu, gpointer data)
g_clear_error (&err);
}
g_clear_error (&err);
}
+static void
+reference_manual (GtkMenuItem *menu, gpointer data)
+{
+ online_help (NULL);
+}
+
+
+
void
merge_help_menu (GtkUIManager *uim)
{
void
merge_help_menu (GtkUIManager *uim)
{
@@
-119,14
+131,14
@@
merge_help_menu (GtkUIManager *uim)
},
{
},
{
- "help_reference",
GTK_STOCK_HELP
, /* name, stock id */
- N_("_Reference Manual"),
NULL
, /* label, accelerator */
+ "help_reference",
"help-reference-manual"
, /* name, stock id */
+ N_("_Reference Manual"),
"F1"
, /* label, accelerator */
NULL, /* tooltip */
G_CALLBACK (reference_manual)
},
{
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)
},