X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-editor.glade;h=9e9bb6baba30d7129df09a25e64ab9e81acba520;hb=0f8c9c6c05632de5cadc70ca5381c1d9cb46960e;hp=06776248738df3cbea663edeca39e2934b910037;hpb=bd17d2af982332ee1791998361b1ac6731fe14fa;p=pspp-builds.git

diff --git a/src/ui/gui/data-editor.glade b/src/ui/gui/data-editor.glade
index 06776248..9e9bb6ba 100644
--- a/src/ui/gui/data-editor.glade
+++ b/src/ui/gui/data-editor.glade
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0"?>
 <glade-interface>
+  <!-- interface-requires gtk+ 2.6 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkMenuBar" id="menubar">
     <property name="visible">True</property>
     <child>
@@ -13,8 +13,8 @@
           <widget class="GtkMenu" id="menuitem1_menu">
             <child>
               <widget class="GtkImageMenuItem" id="new1">
-                <property name="visible">True</property>
                 <property name="label">gtk-new</property>
+                <property name="visible">True</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">True</property>
                 <child>
@@ -38,29 +38,11 @@
               </widget>
             </child>
             <child>
-              <widget class="GtkImageMenuItem" id="open1">
-                <property name="visible">True</property>
+              <widget class="GtkImageMenuItem" id="file_open">
                 <property name="label">gtk-open</property>
+                <property name="visible">True</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">True</property>
-                <child>
-                  <widget class="GtkMenu" id="open1_menu">
-                    <child>
-                      <widget class="GtkMenuItem" id="file_open_syntax">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Syntax</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="file_open_data">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Data</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
               </widget>
             </child>
             <child>
@@ -78,16 +60,16 @@
             </child>
             <child>
               <widget class="GtkImageMenuItem" id="file_save">
-                <property name="visible">True</property>
                 <property name="label">gtk-save</property>
+                <property name="visible">True</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">True</property>
               </widget>
             </child>
             <child>
               <widget class="GtkImageMenuItem" id="file_save_as">
-                <property name="visible">True</property>
                 <property name="label">gtk-save-as</property>
+                <property name="visible">True</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">True</property>
               </widget>
@@ -150,8 +132,8 @@
             </child>
             <child>
               <widget class="GtkImageMenuItem" id="file_quit">
-                <property name="visible">True</property>
                 <property name="label">gtk-quit</property>
+                <property name="visible">True</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">True</property>
               </widget>
@@ -185,10 +167,11 @@
             </child>
             <child>
               <widget class="GtkImageMenuItem" id="edit_goto-case">
+                <property name="label">Go To Case</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
-                <property name="label" translatable="yes">Go To Case</property>
                 <property name="use_underline">True</property>
+                <property name="use_stock">True</property>
               </widget>
             </child>
             <child>
@@ -199,27 +182,27 @@
             </child>
             <child>
               <widget class="GtkImageMenuItem" id="edit_cut">
+                <property name="label">gtk-cut</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
-                <property name="label">gtk-cut</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">True</property>
               </widget>
             </child>
             <child>
               <widget class="GtkImageMenuItem" id="edit_copy">
+                <property name="label">gtk-copy</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
-                <property name="label">gtk-copy</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">True</property>
               </widget>
             </child>
             <child>
               <widget class="GtkImageMenuItem" id="edit_paste">
+                <property name="label">gtk-paste</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
-                <property name="label">gtk-paste</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">True</property>
               </widget>
@@ -247,9 +230,9 @@
             </child>
             <child>
               <widget class="GtkImageMenuItem" id="edit_find">
+                <property name="label">gtk-find</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
-                <property name="label" translatable="yes">gtk-find</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">True</property>
               </widget>
@@ -332,15 +315,10 @@
           <widget class="GtkMenu" id="data_menu">
             <child>
               <widget class="GtkImageMenuItem" id="data_sort-cases">
+                <property name="label">_Sort Cases</property>
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">_Sort Cases</property>
                 <property name="use_underline">True</property>
-                <child internal-child="image">
-                  <widget class="GtkImage" id="menu-item-image1">
-                    <property name="visible">True</property>
-                    <property name="stock">gtk-sort-ascending</property>
-                  </widget>
-                </child>
+                <property name="use_stock">True</property>
               </widget>
             </child>
             <child>
@@ -439,7 +417,7 @@
                 <property name="sensitive">False</property>
                 <property name="label" translatable="yes">_Run Pending Transforms</property>
                 <property name="use_underline">True</property>
-                <accelerator key="G" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                <accelerator key="G" signal="activate" modifiers="GDK_CONTROL_MASK"/>
               </widget>
             </child>
           </widget>
@@ -548,6 +526,20 @@
                 </child>
               </widget>
             </child>
+            <child>
+              <widget class="GtkMenuItem" id="correlation">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Bivariate _Correlation...</property>
+                <property name="use_underline">True</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkMenuItem" id="factor-analysis">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Factor _Analysis</property>
+                <property name="use_underline">True</property>
+              </widget>
+            </child>
             <child>
               <widget class="GtkMenuItem" id="reliability">
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -592,6 +584,13 @@
                 </child>
               </widget>
             </child>
+            <child>
+              <widget class="GtkMenuItem" id="roc-curve">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">ROC Cur_ve...</property>
+                <property name="use_underline">True</property>
+              </widget>
+            </child>
           </widget>
         </child>
       </widget>
@@ -661,28 +660,17 @@
           <widget class="GtkMenu" id="menuitem5_menu">
             <child>
               <widget class="GtkImageMenuItem" id="help_reference">
+                <property name="label">_Reference Manual</property>
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">_Reference Manual</property>
                 <property name="use_underline">True</property>
-                <child internal-child="image">
-                  <widget class="GtkImage" id="menu-item-image2">
-                    <property name="visible">True</property>
-                    <property name="stock">gtk-help</property>
-                  </widget>
-                </child>
               </widget>
             </child>
             <child>
               <widget class="GtkImageMenuItem" id="help_about">
+                <property name="label">_About</property>
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">_About</property>
                 <property name="use_underline">True</property>
-                <child internal-child="image">
-                  <widget class="GtkImage" id="menu-item-image3">
-                    <property name="visible">True</property>
-                    <property name="stock">gtk-about</property>
-                  </widget>
-                </child>
+                <property name="use_stock">True</property>
               </widget>
             </child>
           </widget>
@@ -692,7 +680,6 @@
   </widget>
   <widget class="GtkHandleBox" id="handlebox1">
     <property name="visible">True</property>
-    <property name="shadow_type">GTK_SHADOW_OUT</property>
     <child>
       <widget class="GtkToolbar" id="toolbar1">
         <property name="visible">True</property>
@@ -704,6 +691,7 @@
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
@@ -714,6 +702,7 @@
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
@@ -724,6 +713,7 @@
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
@@ -734,14 +724,13 @@
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkSeparatorToolItem" id="separatortoolitem1">
-          </widget>
+          <widget class="GtkSeparatorToolItem" id="separatortoolitem1"/>
           <packing>
             <property name="expand">False</property>
-            <property name="homogeneous">False</property>
           </packing>
         </child>
         <child>
@@ -752,6 +741,7 @@
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
@@ -762,6 +752,7 @@
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
@@ -770,7 +761,6 @@
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="homogeneous">False</property>
           </packing>
         </child>
         <child>
@@ -782,6 +772,7 @@
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
@@ -793,6 +784,7 @@
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
@@ -801,7 +793,6 @@
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="homogeneous">False</property>
           </packing>
         </child>
         <child>
@@ -813,6 +804,7 @@
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
@@ -821,7 +813,6 @@
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="homogeneous">False</property>
           </packing>
         </child>
         <child>
@@ -834,6 +825,7 @@
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
@@ -846,6 +838,7 @@
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
@@ -854,7 +847,6 @@
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="homogeneous">False</property>
           </packing>
         </child>
         <child>
@@ -866,6 +858,7 @@
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
@@ -877,6 +870,7 @@
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
@@ -889,6 +883,7 @@
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
@@ -897,7 +892,6 @@
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="homogeneous">False</property>
           </packing>
         </child>
         <child>
@@ -909,6 +903,7 @@
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
@@ -919,6 +914,7 @@
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="homogeneous">True</property>
           </packing>
         </child>
       </widget>
@@ -931,7 +927,7 @@
       <widget class="GtkFrame" id="frame2">
         <property name="visible">True</property>
         <property name="label_xalign">0</property>
-        <property name="shadow_type">GTK_SHADOW_IN</property>
+        <property name="shadow_type">in</property>
         <child>
           <widget class="GtkEventBox" id="eventbox1">
             <property name="visible">True</property>
@@ -945,12 +941,15 @@
           </widget>
         </child>
       </widget>
+      <packing>
+        <property name="position">0</property>
+      </packing>
     </child>
     <child>
       <widget class="GtkFrame" id="frame3">
         <property name="visible">True</property>
         <property name="label_xalign">0</property>
-        <property name="shadow_type">GTK_SHADOW_IN</property>
+        <property name="shadow_type">in</property>
         <child>
           <widget class="GtkEventBox" id="eventbox2">
             <property name="visible">True</property>
@@ -975,7 +974,7 @@
       <widget class="GtkFrame" id="frame5">
         <property name="visible">True</property>
         <property name="label_xalign">0</property>
-        <property name="shadow_type">GTK_SHADOW_IN</property>
+        <property name="shadow_type">in</property>
         <child>
           <widget class="GtkEventBox" id="eventbox4">
             <property name="visible">True</property>
@@ -1000,7 +999,7 @@
       <widget class="GtkFrame" id="frame6">
         <property name="visible">True</property>
         <property name="label_xalign">0</property>
-        <property name="shadow_type">GTK_SHADOW_IN</property>
+        <property name="shadow_type">in</property>
         <child>
           <widget class="GtkEventBox" id="eventbox5">
             <property name="visible">True</property>
@@ -1008,7 +1007,7 @@
             <child>
               <widget class="GtkLabel" id="filter-use-status-area">
                 <property name="visible">True</property>
-                <property name="ellipsize">PANGO_ELLIPSIZE_START</property>
+                <property name="ellipsize">start</property>
                 <property name="width_chars">10</property>
                 <property name="single_line_mode">True</property>
               </widget>
@@ -1026,7 +1025,7 @@
       <widget class="GtkFrame" id="frame7">
         <property name="visible">True</property>
         <property name="label_xalign">0</property>
-        <property name="shadow_type">GTK_SHADOW_IN</property>
+        <property name="shadow_type">in</property>
         <child>
           <widget class="GtkEventBox" id="eventbox6">
             <property name="visible">True</property>
@@ -1034,7 +1033,7 @@
             <child>
               <widget class="GtkLabel" id="weight-status-area">
                 <property name="visible">True</property>
-                <property name="ellipsize">PANGO_ELLIPSIZE_START</property>
+                <property name="ellipsize">start</property>
                 <property name="width_chars">15</property>
                 <property name="single_line_mode">True</property>
               </widget>
@@ -1052,7 +1051,7 @@
       <widget class="GtkFrame" id="frame8">
         <property name="visible">True</property>
         <property name="label_xalign">0</property>
-        <property name="shadow_type">GTK_SHADOW_IN</property>
+        <property name="shadow_type">in</property>
         <child>
           <widget class="GtkEventBox" id="eventbox7">
             <property name="visible">True</property>
@@ -1060,7 +1059,7 @@
             <child>
               <widget class="GtkLabel" id="split-file-status-area">
                 <property name="visible">True</property>
-                <property name="ellipsize">PANGO_ELLIPSIZE_START</property>
+                <property name="ellipsize">start</property>
                 <property name="width_chars">15</property>
                 <property name="single_line_mode">True</property>
               </widget>