/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2006, 2007, 2010, 2011, 2012, 2013 Free Software Foundation
+ Copyright (C) 2006, 2007, 2010, 2011, 2012, 2013, 2015 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
#define N_(msgid) msgid
-static const gchar *artists[] = { "Bastián Díaz", "Hugo Alejandro", "Patrick Brunier", "Dondi Bogusky", NULL};
+static const gchar *artists[] = { "Bastián Díaz", "Hugo Alejandro", NULL};
static void
-about_new (GtkMenuItem *m, GtkWindow *parent)
+about_new (GtkMenuItem *mmm, GtkWindow *parent)
{
GtkWidget *about = gtk_about_dialog_new ();
- GdkPixbuf *pb =
- gdk_pixbuf_new_from_file_at_size (relocate (PKGDATADIR "/about-logo.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");
online_help (NULL);
}
+GtkWidget *
+create_help_menu (GtkWindow *toplevel)
+{
+ GtkWidget *menuitem = gtk_menu_item_new_with_mnemonic (_("_Help"));
+ GtkWidget *menu = gtk_menu_new ();
+ GtkWidget *help_about = gtk_menu_item_new_with_mnemonic (_("_About"));
+ GtkWidget *help_ref = gtk_menu_item_new_with_mnemonic (_("_Reference Manual"));
-void
-merge_help_menu (GtkUIManager *uim)
-{
- GtkActionGroup *action_group = gtk_action_group_new ("help");
+ GtkAccelGroup *accel_group = gtk_accel_group_new ();
+
+ gtk_window_add_accel_group (toplevel, accel_group);
- static const GtkActionEntry entries[] =
- {
- {
- "help", NULL, /* name, stock id */
- N_("_Help"), NULL, /* label, accelerator */
- NULL,
- NULL,
- },
-
- {
- "help_reference", "help-reference-manual", /* name, stock id */
- N_("_Reference Manual"), NULL, /* label, accelerator */
- NULL, /* tooltip */
- G_CALLBACK (reference_manual)
- },
-
- {
- "help_about", "help-about",
- NULL, NULL, NULL,
- G_CALLBACK (about_new)
- },
- };
-
- gtk_action_group_set_translation_domain (action_group, PACKAGE);
-
- gtk_ui_manager_add_ui_from_string (uim, "\
- <menubar name=\"menubar\">\
- <menu action=\"help\">\
- <menuitem action=\"help_reference\"/>\
- <menuitem action=\"help_about\"/>\
- </menu>\
- </menubar>\
- ", -1, 0);
-
- gtk_action_group_add_actions (action_group, entries, G_N_ELEMENTS (entries), NULL);
-
- gtk_ui_manager_insert_action_group (uim, action_group, 0);
+ gtk_widget_add_accelerator (help_ref,
+ "activate", accel_group,
+ GDK_KEY_F1, 0,
+ GTK_ACCEL_VISIBLE);
+
+ gtk_menu_attach (GTK_MENU (menu), help_ref, 0, 1, 0, 1);
+ gtk_menu_attach (GTK_MENU (menu), help_about, 0, 1, 1, 2);
+
+ 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);
+
+ return menuitem;
}