Reimplement the Windows menu.

[pspp] / src / ui / gui / psppire-syntax-window.c

diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c
index 74d900e89a81f52b65282bb274edfef0c42db707..f8758a0cd7e2e6a5a2b1b7dbbc6724677b9f289b 100644 (file)
--- a/src/ui/gui/psppire-syntax-window.c
+++ b/src/ui/gui/psppire-syntax-window.c
@@ -36,8 +36,8 @@
 #include "ui/gui/psppire-encoding-selector.h"
 #include "ui/gui/psppire-lex-reader.h"
 #include "ui/gui/psppire-syntax-window.h"
-#include "ui/gui/psppire-window-register.h"
 #include "ui/gui/psppire.h"
+#include "ui/gui/windows-menu.h"
 
 #include "gl/localcharset.h"
 #include "gl/xalloc.h"
@@ -565,8 +565,8 @@ syntax_pick_filename (PsppireWindow *window)
     gtk_file_chooser_dialog_new (_("Save Syntax"),
                                 GTK_WINDOW (se),
                                 GTK_FILE_CHOOSER_ACTION_SAVE,
-                                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                GTK_STOCK_SAVE,   GTK_RESPONSE_ACCEPT,
+                                _("Cancel"), GTK_RESPONSE_CANCEL,
+                                _("Save"),   GTK_RESPONSE_ACCEPT,
                                 NULL);
 
   g_object_set (dialog, "local-only", FALSE, NULL);
@@ -859,22 +859,11 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window)
                    G_CALLBACK (on_run_to_end),
                    window);
 
-  g_signal_connect (get_action_assert (xml,"windows_minimise_all"),
-                   "activate",
-                   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");
-
-  merge_help_menu (uim);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menubar),
+                        create_windows_menu (GTK_WINDOW (window)));
 
-  PSPPIRE_WINDOW (window)->menu = GTK_MENU_SHELL (gtk_widget_get_parent (w));
-  }
+  gtk_menu_shell_append (GTK_MENU_SHELL (menubar),
+                        create_help_menu (GTK_WINDOW (window)));
 
   g_object_unref (xml);
 }