Reimplement the Windows menu.

[pspp] / 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 118387f97e32ad2779463e06e8179457121623b8..7917274da56a619284018ef89cc5f970d06db4c9 100644 (file)
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -25,7 +25,6 @@
 #include "libpspp/message.h"
 #include "libpspp/str.h"
 #include "ui/gui/builder-wrapper.h"
-#include "ui/gui/comments-dialog.h"
 #include "ui/gui/entry-dialog.h"
 #include "ui/gui/executor.h"
 #include "ui/gui/help-menu.h"
@@ -37,10 +36,8 @@
 #include "ui/gui/psppire-encoding-selector.h"
 #include "ui/gui/psppire-syntax-window.h"
 #include "ui/gui/psppire-window.h"
+#include "ui/gui/windows-menu.h"
 #include "ui/gui/psppire.h"
-#include "ui/gui/recode-dialog.h"
-#include "ui/gui/select-cases-dialog.h"
-#include "ui/gui/split-file-dialog.h"
 #include "ui/syntax-gen.h"
 
 #include "gl/c-strcase.h"
@@ -726,13 +723,6 @@ toggle_value_labels (PsppireDataWindow  *de, GtkToggleAction *ta)
   g_object_set (de->data_editor, "value-labels", gtk_toggle_action_get_active (ta), NULL);
 }
 
-static void
-toggle_split_window (PsppireDataWindow  *de, GtkToggleAction *ta)
-{
-  psppire_data_editor_split_window (de->data_editor,
-                                   gtk_toggle_action_get_active (ta));
-}
-
 
 static void
 file_quit (PsppireDataWindow *de)
@@ -910,15 +900,10 @@ enable_save (PsppireDataWindow *dw)
 static void
 psppire_data_window_init (PsppireDataWindow *de)
 {
-  GtkWidget *w ;
   de->builder = builder_new ("data-editor.ui");
 
   de->ui_manager = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));
 
-  w = gtk_ui_manager_get_widget (de->ui_manager, "/ui/menubar/windows/windows_minimise_all");
-
-  PSPPIRE_WINDOW (de)->menu = GTK_MENU_SHELL (gtk_widget_get_parent (w));
-
   de->uim = NULL;
   de->merge_id = 0;
 }
@@ -1044,12 +1029,6 @@ psppire_data_window_finish_init (PsppireDataWindow *de,
 
   g_signal_connect_swapped (get_action_assert (de->builder, "view_value-labels"), "toggled", G_CALLBACK (toggle_value_labels), de);
 
-  connect_action (de, "data_select-cases", G_CALLBACK (select_cases_dialog));
-  connect_action (de, "data_split-file", G_CALLBACK (split_file_dialog));
-  connect_action (de, "utilities_comments", G_CALLBACK (comments_dialog));
-  connect_action (de, "transform_recode-same", G_CALLBACK (recode_same_dialog));
-  connect_action (de, "transform_recode-different", G_CALLBACK (recode_different_dialog));
-
   {
     GtkWidget *recent_data =
       gtk_ui_manager_get_widget (de->ui_manager, "/ui/menubar/file/file_recent-data");
@@ -1120,10 +1099,7 @@ psppire_data_window_finish_init (PsppireDataWindow *de,
 
   connect_action (de, "transform_run-pending", G_CALLBACK (execute));
 
-  connect_action (de, "windows_minimise_all", G_CALLBACK (psppire_window_minimise_all));
-
-  g_signal_connect_swapped (get_action_assert (de->builder, "windows_split"), "toggled", G_CALLBACK (toggle_split_window), de);
-
+  gtk_menu_shell_append (GTK_MENU_SHELL (menubar),  create_windows_menu (GTK_WINDOW (de)));
   gtk_menu_shell_append (GTK_MENU_SHELL (menubar),  create_help_menu (GTK_WINDOW (de)));
   
   g_signal_connect (de->data_editor, "notify::ui-manager",