From: John Darrington <john@darrington.wattle.id.au>
Date: Sun, 9 May 2010 18:47:55 +0000 (+0200)
Subject: Move var sheet variables popup menu to GtkBuilder file
X-Git-Tag: v0.7.5~25^2~22
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=commitdiff_plain;h=960bbc47583479a79f7126969e80604f2c9577ed

Move var sheet variables popup menu to GtkBuilder file
---

diff --git a/src/ui/gui/data-editor.ui b/src/ui/gui/data-editor.ui
index 659e2fd5..93bd84cd 100644
--- a/src/ui/gui/data-editor.ui
+++ b/src/ui/gui/data-editor.ui
@@ -603,6 +603,11 @@
           <menuitem action="sort-up"/>
           <menuitem action="sort-down"/>
       </popup>
+      <popup name="varsheet-variable-popup">
+	  <menuitem action="action_insert-variable"/>
+	  <separator/>
+	  <menuitem action="edit_clear-variables"/>
+      </popup>
 </ui>
   </object>
   <!-- interface-requires gtk+ 2.6 -->
@@ -613,6 +618,9 @@
   <object class="GtkMenu" constructor="uimanager1" id="datasheet-variable-popup">
     <property name="visible">True</property>
   </object>
+  <object class="GtkMenu" constructor="uimanager1" id="varsheet-variable-popup">
+    <property name="visible">True</property>
+  </object>
   <object class="GtkHandleBox" id="handlebox1">
     <property name="visible">True</property>
     <child>
diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index d11dc3fa..757d20e9 100644
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -879,41 +879,6 @@ create_data_sheet_cases_popup_menu (PsppireDataWindow *de)
 }
 
 
-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,
@@ -1628,8 +1593,8 @@ 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 *var_sheet_variable_popup_menu = get_widget_assert (de->builder,
+								"varsheet-variable-popup");
 
     GtkMenu *data_sheet_cases_popup_menu =
       GTK_MENU (create_data_sheet_cases_popup_menu (de));