X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelp-menu.c;h=33a9407f71fc8532930b91c9db2fd1f3f407a531;hb=3e98eec9f2c774a7c695944c15de651ecd120430;hp=c24125d78aa1f995393de8b955720012b93dd4a8;hpb=f550aee00a62fe1d8baf62d83cd7efef6cc2ee92;p=pspp

diff --git a/src/ui/gui/help-menu.c b/src/ui/gui/help-menu.c
index c24125d78a..33a9407f71 100644
--- 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.
-   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
@@ -32,24 +32,18 @@
 #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 ();
 
-  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), "pspp");
 
-
-  gtk_window_set_icon_name (GTK_WINDOW (about), "psppicon");
-
-  gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (about),
-				"http://www.gnu.org/software/pspp");
+  gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (about), PACKAGE_URL);
 
   gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (about),
 				bare_version);
@@ -72,8 +66,8 @@ about_new (GtkMenuItem *m, GtkWindow *parent)
   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")
      );
 
@@ -86,25 +80,42 @@ about_new (GtkMenuItem *m, GtkWindow *parent)
   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;
-  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 "
-                 "http://www.gnu.org/software/pspp/documentation.html"),
-           err->message);
+                 "also available at %s"),
+                  err->message,
+                  PACKAGE_URL "documentation.html");
     }
 
   g_free (cmd);
   g_clear_error (&err);
 }
 
+static void
+reference_manual (GtkMenuItem *menu, gpointer data)
+{
+  online_help (NULL);
+}
+
+
+
 void
 merge_help_menu (GtkUIManager *uim)
 {
@@ -120,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)
       },
     
       {
-	"help_about", GTK_STOCK_ABOUT,
+	"help_about", "help-about",
 	NULL, NULL, NULL,
 	G_CALLBACK (about_new)
       },