Refactor the Help menu.

[pspp-builds.git] / src / ui / gui / psppire-data-window.c

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index d11dc3fa867777d056e04305fb213fea857eab56..2968892d80d54abd0d0d00e2bf1de70fd973a14c 100644 (file)
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -24,7 +24,7 @@
 #include "data/procedure.h"
 #include "language/syntax-string-source.h"
 #include "libpspp/message.h"
-#include "ui/gui/about.h"
+#include "ui/gui/help-menu.h"
 #include "ui/gui/comments-dialog.h"
 #include "ui/gui/compute-dialog.h"
 #include "ui/gui/correlation-dialog.h"
@@ -843,78 +843,6 @@ file_quit (GtkCheckMenuItem *menuitem, gpointer data)
 }
 
 
-static GtkWidget *
-create_data_sheet_cases_popup_menu (PsppireDataWindow *de)
-{
-  GtkWidget *menu = gtk_menu_new ();
-
-  GtkWidget *insert_case =
-    gtk_menu_item_new_with_label (_("Insert Case"));
-
-  GtkWidget *delete_case =
-    gtk_menu_item_new_with_label (_("Clear"));
-
-
-  gtk_action_connect_proxy (de->delete_cases,
-                           delete_case);
-
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), insert_case);
-
-  g_signal_connect_swapped (insert_case, "activate",
-                           G_CALLBACK (gtk_action_activate),
-                           de->insert_case);
-
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu),
-                        gtk_separator_menu_item_new ());
-
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), delete_case);
-
-
-  gtk_widget_show_all (menu);
-
-  return menu;
-}
-
-
-static GtkWidget *
-create_var_sheet_variable_popup_menu (PsppireDataWindow *de)
-{
-  GtkWidget *menu = gtk_menu_new ();
-
-  GtkWidget *insert_variable =
-    gtk_menu_item_new_with_label (_("Insert Variable"));
-
-  GtkWidget *delete_variable =
-    gtk_menu_item_new_with_label (_("Clear"));
-
-
-  gtk_action_connect_proxy (de->delete_variables,
-                           delete_variable);
-
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), insert_variable);
-
-  g_signal_connect_swapped (insert_variable, "activate",
-                           G_CALLBACK (gtk_action_activate),
-                           de->insert_variable);
-
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu),
-                        gtk_separator_menu_item_new ());
-
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), delete_variable);
-
-
-  gtk_widget_show_all (menu);
-
-  return menu;
-}
-
-
 static void
 on_recent_data_select (GtkMenuShell *menushell,
                       PsppireWindow *window)
@@ -1515,27 +1443,12 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   }
 
-  g_signal_connect (get_action_assert (de->builder,"file_new_syntax"),
-                   "activate",
-                   G_CALLBACK (create_syntax_window),
-                   NULL);
-
-
-  {
-    GtkAction *abt = get_action_assert (de->builder, "help_about");
-
-    g_signal_connect (abt,
+    g_signal_connect (get_action_assert (de->builder,"file_new_syntax"),
                      "activate",
-                     G_CALLBACK (about_new),
-                     de);
-  }
+                     G_CALLBACK (create_syntax_window),
+                     NULL);
 
 
-  g_signal_connect (get_action_assert (de->builder,"help_reference"),
-                   "activate",
-                   G_CALLBACK (reference_manual),
-                   de);
-
 
   g_signal_connect (de->data_editor,
                    "cases-selected",
@@ -1612,12 +1525,20 @@ psppire_data_window_init (PsppireDataWindow *de)
   {
     GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));
 
+    merge_help_menu (uim);
+    
     PSPPIRE_WINDOW (de)->menu =
       GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent);
   }
 
   {
-    GtkMenu *data_sheet_variable_popup_menu = get_widget_assert (de->builder,
+    GtkWidget *data_sheet_cases_popup_menu = get_widget_assert (de->builder,
+                                                             "datasheet-cases-popup");
+
+    GtkWidget *var_sheet_variable_popup_menu = get_widget_assert (de->builder,
+                                                               "varsheet-variable-popup");
+
+    GtkWidget *data_sheet_variable_popup_menu = get_widget_assert (de->builder,
                                                                 "datasheet-variable-popup");
 
     g_signal_connect_swapped (get_action_assert (de->builder, "sort-up"), "activate",
@@ -1628,12 +1549,6 @@ psppire_data_window_init (PsppireDataWindow *de)
                            G_CALLBACK (psppire_data_editor_sort_descending),
                            de->data_editor);
 
-    GtkMenu *var_sheet_variable_popup_menu =
-      GTK_MENU (create_var_sheet_variable_popup_menu (de));
-
-    GtkMenu *data_sheet_cases_popup_menu =
-      GTK_MENU (create_data_sheet_cases_popup_menu (de));
-
     g_object_set (de->data_editor,
                  "datasheet-column-menu", data_sheet_variable_popup_menu,
                  "datasheet-row-menu", data_sheet_cases_popup_menu,