X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-editor.glade;h=deff3bb5f34363443429891e54afdb2946351700;hb=23a109b05ec5e76c4f629338dcaafedbf1e8954b;hp=1746d9e77d32055357450e97dc156d028ae6a571;hpb=c86f5b8a45cca158b46a4fe3b48280e88ce9aba1;p=pspp

diff --git a/src/ui/gui/data-editor.glade b/src/ui/gui/data-editor.glade
index 1746d9e77d..deff3bb5f3 100644
--- a/src/ui/gui/data-editor.glade
+++ b/src/ui/gui/data-editor.glade
@@ -71,6 +71,19 @@
                         </child>
                       </widget>
                     </child>
+                    <child>
+                      <widget class="GtkMenuItem" id="file_import-text">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">_Import Delimited Text Data</property>
+                        <property name="use_underline">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="file_separator1">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="file_save">
                         <property name="visible">True</property>
@@ -88,8 +101,8 @@
                       </widget>
                     </child>
                     <child>
-                      <widget class="GtkSeparatorMenuItem" id="file_separator1">
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                      <widget class="GtkSeparatorMenuItem" id="file_separator2">
+                        <property name="visible">True</property>
                       </widget>
                     </child>
                     <child>
@@ -107,7 +120,7 @@
                       </widget>
                     </child>
                     <child>
-                      <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
+                      <widget class="GtkSeparatorMenuItem" id="file_separator3">
                         <property name="visible">True</property>
                       </widget>
                     </child>
@@ -230,17 +243,11 @@
                     <child>
                       <widget class="GtkCheckMenuItem" id="view_statusbar">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Status Bar</property>
+                        <property name="label" translatable="yes">_Status Bar</property>
                         <property name="use_underline">True</property>
                         <property name="active">True</property>
                       </widget>
                     </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="toolbars">
-                        <property name="label" translatable="yes">Toolbars</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
                     <child>
                       <widget class="GtkSeparatorMenuItem" id="separator1">
                         <property name="visible">True</property>
@@ -249,14 +256,14 @@
                     <child>
                       <widget class="GtkMenuItem" id="view_fonts">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Fonts</property>
+                        <property name="label" translatable="yes">_Fonts</property>
                         <property name="use_underline">True</property>
                       </widget>
                     </child>
                     <child>
                       <widget class="GtkCheckMenuItem" id="view_gridlines">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Grid Lines</property>
+                        <property name="label" translatable="yes">_Grid Lines</property>
                         <property name="use_underline">True</property>
                         <property name="active">True</property>
                       </widget>
@@ -264,7 +271,7 @@
                     <child>
                       <widget class="GtkCheckMenuItem" id="view_value-labels">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Value Labels</property>
+                        <property name="label" translatable="yes">Value _Labels</property>
                         <property name="use_underline">True</property>
                       </widget>
                     </child>
@@ -276,14 +283,14 @@
                     <child>
                       <widget class="GtkMenuItem" id="view_data">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Data</property>
+                        <property name="label" translatable="yes">_Data</property>
                         <property name="use_underline">True</property>
                       </widget>
                     </child>
                     <child>
                       <widget class="GtkMenuItem" id="view_variables">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Variables</property>
+                        <property name="label" translatable="yes">_Variables</property>
                         <property name="use_underline">True</property>
                       </widget>
                     </child>
@@ -301,7 +308,7 @@
                     <child>
                       <widget class="GtkMenuItem" id="data_sort-cases">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Sort Cases</property>
+                        <property name="label" translatable="yes">_Sort Cases</property>
                         <property name="use_underline">True</property>
                       </widget>
                     </child>
@@ -309,21 +316,7 @@
                       <widget class="GtkMenuItem" id="data_transpose">
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">Transpose</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="data_merge-files">
-                        <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">Merge Files</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="data_aggregate">
-                        <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">Aggregate</property>
+                        <property name="label" translatable="yes">_Transpose</property>
                         <property name="use_underline">True</property>
                       </widget>
                     </child>
@@ -336,7 +329,7 @@
                     <child>
                       <widget class="GtkMenuItem" id="data_split-file">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Split File</property>
+                        <property name="label" translatable="yes">S_plit File</property>
                         <property name="use_underline">True</property>
                       </widget>
                     </child>
@@ -344,14 +337,14 @@
                       <widget class="GtkMenuItem" id="data_select-cases">
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">Select Cases</property>
+                        <property name="label" translatable="yes">Select _Cases</property>
                         <property name="use_underline">True</property>
                       </widget>
                     </child>
                     <child>
                       <widget class="GtkMenuItem" id="data_weight-cases">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Weight Cases</property>
+                        <property name="label" translatable="yes">_Weight Cases</property>
                         <property name="use_underline">True</property>
                       </widget>
                     </child>
@@ -459,7 +452,7 @@
                               </widget>
                             </child>
                             <child>
-                              <widget class="GtkMenuItem" id="explore">
+                              <widget class="GtkMenuItem" id="analyze_explore">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">_Explore</property>
@@ -526,7 +519,7 @@
                     </child>
                     <child>
                       <widget class="GtkMenuItem" id="bivariate-correlation">
-                        <property name="visible">True</property>
+                        <property name="visible">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">Bivariate _Correlation</property>
                         <property name="use_underline">True</property>
@@ -542,7 +535,7 @@
                     </child>
                     <child>
                       <widget class="GtkMenuItem" id="non-parametrics">
-                        <property name="visible">True</property>
+                        <property name="visible">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">_Non-Parametric Statistics</property>
                         <property name="use_underline">True</property>
@@ -619,6 +612,13 @@
                         <property name="use_underline">True</property>
                       </widget>
                     </child>
+                    <child>
+                      <widget class="GtkCheckMenuItem" id="windows_split">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Split</property>
+                        <property name="use_underline">True</property>
+                      </widget>
+                    </child>
                   </widget>
                 </child>
               </widget>
@@ -895,113 +895,6 @@
             <property name="position">1</property>
           </packing>
         </child>
-        <child>
-          <widget class="GtkNotebook" id="notebook">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="tab_pos">GTK_POS_BOTTOM</property>
-            <property name="scrollable">True</property>
-            <child>
-              <widget class="GtkVBox" id="vbox3">
-                <property name="visible">True</property>
-                <child>
-                  <widget class="GtkTable" id="table2">
-                    <property name="visible">True</property>
-                    <property name="n_rows">1</property>
-                    <property name="n_columns">2</property>
-                    <child>
-                      <widget class="GtkEntry" id="datum_entry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkEntry" id="cell_ref_entry">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="editable">False</property>
-                        <property name="width_chars">25</property>
-                      </widget>
-                      <packing>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkScrolledWindow" id="scrolledwindow1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <widget class="Custom" id="data_sheet">
-                        <property name="visible">True</property>
-                        <property name="creation_function">psppire_data_sheet_create</property>
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="tab_expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Data View</property>
-              </widget>
-              <packing>
-                <property name="type">tab</property>
-                <property name="tab_expand">False</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkScrolledWindow" id="scrolledwindow2">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <child>
-                  <widget class="Custom" id="variable_sheet">
-                    <property name="visible">True</property>
-                    <property name="creation_function">psppire_variable_sheet_create</property>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab_expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Variable View</property>
-              </widget>
-              <packing>
-                <property name="type">tab</property>
-                <property name="position">1</property>
-                <property name="tab_expand">False</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
         <child>
           <placeholder/>
         </child>