From 844405312afa2bb2a5f9b463d658b34096ca570a Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 27 Jun 2015 17:57:02 +0200 Subject: [PATCH] Remove deprecations from help-menu.c --- src/ui/gui/help-menu.c | 68 ++++++++++-------------------- src/ui/gui/help-menu.h | 2 +- src/ui/gui/psppire-data-window.c | 4 +- src/ui/gui/psppire-output-window.c | 5 ++- src/ui/gui/psppire-syntax-window.c | 11 ++--- 5 files changed, 34 insertions(+), 56 deletions(-) diff --git a/src/ui/gui/help-menu.c b/src/ui/gui/help-menu.c index 33a9407f71..68cd104704 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, 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 @@ -35,7 +35,7 @@ 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 (); @@ -114,48 +114,26 @@ reference_manual (GtkMenuItem *menu, gpointer data) online_help (NULL); } - - -void -merge_help_menu (GtkUIManager *uim) +GtkWidget * +create_help_menu (GtkWindow *toplevel) { - GtkActionGroup *action_group = gtk_action_group_new ("help"); - - 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"), "F1", /* 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, "\ - \ - \ - \ - \ - \ - \ - ", -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); + 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")); + GtkWidget *child = gtk_bin_get_child (GTK_BIN (help_ref)); + gtk_accel_label_set_accel (GTK_ACCEL_LABEL (child), GDK_KEY_F1, 0); + + 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; } diff --git a/src/ui/gui/help-menu.h b/src/ui/gui/help-menu.h index 730c3be481..55dc4a2743 100644 --- a/src/ui/gui/help-menu.h +++ b/src/ui/gui/help-menu.h @@ -20,7 +20,7 @@ #include -void merge_help_menu (GtkUIManager *uim); +GtkWidget * create_help_menu (GtkWindow *toplevel); void online_help (const char *page); diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index 813959dd76..54cd2c35d2 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -1089,8 +1089,8 @@ psppire_data_window_finish_init (PsppireDataWindow *de, g_signal_connect_swapped (get_action_assert (de->builder, "windows_split"), "toggled", G_CALLBACK (toggle_split_window), de); - merge_help_menu (de->ui_manager); - + gtk_menu_shell_append (GTK_MENU_SHELL (menubar), create_help_menu (GTK_WINDOW (de))); + g_signal_connect (de->data_editor, "notify::ui-manager", G_CALLBACK (on_ui_manager_changed), de); on_ui_manager_changed (de->data_editor, NULL, de); diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c index 8e343d2359..75e3362da8 100644 --- a/src/ui/gui/psppire-output-window.c +++ b/src/ui/gui/psppire-output-window.c @@ -504,7 +504,10 @@ psppire_output_window_init (PsppireOutputWindow *window) { GtkWidget *w; GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER)); - merge_help_menu (uim); + + GtkWidget *menubar = get_widget_assert (xml, "menubar"); + + gtk_menu_shell_append (GTK_MENU_SHELL (menubar), create_help_menu (GTK_WINDOW (window))); w = gtk_ui_manager_get_widget (uim,"/ui/menubar/windows_menuitem/windows_minimise-all"); diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c index 8790778a06..66838dd307 100644 --- a/src/ui/gui/psppire-syntax-window.c +++ b/src/ui/gui/psppire-syntax-window.c @@ -864,16 +864,13 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) G_CALLBACK (psppire_window_minimise_all), NULL); - - - { - GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER)); - GtkWidget *w = gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all"); + GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER)); + GtkWidget *w = gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all"); - merge_help_menu (uim); + gtk_menu_shell_append (GTK_MENU_SHELL (menubar), create_help_menu (GTK_WINDOW (window))); - PSPPIRE_WINDOW (window)->menu = GTK_MENU_SHELL (gtk_widget_get_parent (w)); + PSPPIRE_WINDOW (window)->menu = GTK_MENU_SHELL (gtk_widget_get_parent (w)); } g_object_unref (xml); -- 2.30.2