pspp-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Pspp-cvs] pspp glade/dialog.c src/ui/gui/ChangeLog src/ui...


From: John Darrington
Subject: [Pspp-cvs] pspp glade/dialog.c src/ui/gui/ChangeLog src/ui...
Date: Mon, 07 May 2007 00:40:56 +0000

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   07/05/07 00:40:56

Modified files:
        glade          : dialog.c 
        src/ui/gui     : ChangeLog automake.mk data-editor.c 
                         data-editor.h psppire-dialog.c psppire-dialog.h 
                         psppire.glade 
Added files:
        src/ui/gui     : comments-dialog.h 

Log message:
        Added "comments" dialog.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/glade/dialog.c?cvsroot=pspp&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/automake.mk?cvsroot=pspp&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-editor.c?cvsroot=pspp&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-editor.h?cvsroot=pspp&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-dialog.c?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-dialog.h?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire.glade?cvsroot=pspp&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/comments-dialog.h?cvsroot=pspp&rev=1.1

Patches:
Index: glade/dialog.c
===================================================================
RCS file: /sources/pspp/pspp/glade/dialog.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- glade/dialog.c      30 Apr 2007 08:58:14 -0000      1.3
+++ glade/dialog.c      7 May 2007 00:40:55 -0000       1.4
@@ -5,6 +5,7 @@
 #include <string.h>
 #include <glade-gtk.h>
 #include <assert.h>
+#include <string.h>
 
 
 void GLADEGTK_API

Index: src/ui/gui/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- src/ui/gui/ChangeLog        30 Apr 2007 08:58:14 -0000      1.56
+++ src/ui/gui/ChangeLog        7 May 2007 00:40:56 -0000       1.57
@@ -1,3 +1,11 @@
+2007-05-07 John Darrington <address@hidden>
+
+       * psppire-dialog.c psppire-dialog.h: Added "orientation" property,
+        to allow dialogs to be either vertical or horizontal.
+
+       * comments-dialog.c comments-dialog.h: New files, invoking 
+       ADD DOCUMENT cmd.
+
 2007-04-30 John Darrington <address@hidden>
 
        * var-display.c var-display.h variable-info-dialog.c

Index: src/ui/gui/automake.mk
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/automake.mk,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- src/ui/gui/automake.mk      30 Apr 2007 08:58:14 -0000      1.28
+++ src/ui/gui/automake.mk      7 May 2007 00:40:56 -0000       1.29
@@ -73,6 +73,7 @@
        src/ui/gui/about.h \
        src/ui/gui/compute-dialog.c \
        src/ui/gui/compute-dialog.h \
+       src/ui/gui/comments-dialog.c \
        src/ui/gui/customentry.c \
        src/ui/gui/customentry.h \
        src/ui/gui/data-sheet.c \

Index: src/ui/gui/data-editor.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-editor.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- src/ui/gui/data-editor.c    30 Apr 2007 08:58:14 -0000      1.25
+++ src/ui/gui/data-editor.c    7 May 2007 00:40:56 -0000       1.26
@@ -36,6 +36,7 @@
 #include "transpose-dialog.h"
 #include "sort-cases-dialog.h"
 #include "compute-dialog.h"
+#include "comments-dialog.h"
 #include "variable-info-dialog.h"
 #include "dict-display.h"
 
@@ -56,7 +57,6 @@
 static void insert_variable (GtkCheckMenuItem *m, gpointer data);
 
 
-
 /* Switch between the VAR SHEET and the DATA SHEET */
 
 static gboolean click2column (GtkWidget *w, gint col, gpointer data);
@@ -260,6 +260,15 @@
   g_signal_connect (de->invoke_compute_dialog, "activate",
                    G_CALLBACK (compute_dialog), de);
 
+  de->invoke_comments_dialog =
+    gtk_action_new ("commments-dialog",
+                   _("Data File Comments"),
+                   _("Commentary text for the data file"),
+                   NULL);
+
+  g_signal_connect (de->invoke_comments_dialog, "activate",
+                   G_CALLBACK (comments_dialog), de);
+
   de->invoke_variable_info_dialog  =
     gtk_action_new ("variable-info-dialog",
                    _("Variables"),
@@ -375,11 +384,14 @@
                            get_widget_assert (de->xml, "transform_compute")
                            );
 
+  gtk_action_connect_proxy (de->invoke_comments_dialog,
+                           get_widget_assert (de->xml, "utilities_comments")
+                           );
+
   gtk_action_connect_proxy (de->invoke_variable_info_dialog,
                            get_widget_assert (de->xml, "utilities_variables")
                            );
 
-
   g_signal_connect (get_widget_assert (de->xml,"help_about"),
                    "activate",
                    G_CALLBACK (about_new),

Index: src/ui/gui/data-editor.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-editor.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/ui/gui/data-editor.h    30 Apr 2007 08:58:14 -0000      1.10
+++ src/ui/gui/data-editor.h    7 May 2007 00:40:56 -0000       1.11
@@ -39,6 +39,7 @@
   GtkAction *invoke_split_file_dialog;
   GtkAction *invoke_sort_cases_dialog;
   GtkAction *invoke_compute_dialog;
+  GtkAction *invoke_comments_dialog;
 
   GtkAction *invoke_variable_info_dialog;
 

Index: src/ui/gui/psppire-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-dialog.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/ui/gui/psppire-dialog.c 31 Mar 2007 11:44:45 -0000      1.4
+++ src/ui/gui/psppire-dialog.c 7 May 2007 00:40:56 -0000       1.5
@@ -81,11 +81,110 @@
 }
 
 
+
+/* Properties */
+enum
+{
+  PROP_0,
+  PROP_ORIENTATION
+};
+
+
+static void
+psppire_dialog_get_property (GObject         *object,
+                            guint            prop_id,
+                            GValue          *value,
+                            GParamSpec      *pspec)
+{
+  PsppireDialog *dialog = PSPPIRE_DIALOG (object);
+
+  switch (prop_id)
+    {
+    case PROP_ORIENTATION:
+      {
+       if ( GTK_IS_VBOX (dialog->box) )
+         g_value_set_enum (value, PSPPIRE_VERTICAL);
+       else if ( GTK_IS_HBOX (dialog->box))
+         g_value_set_enum (value, PSPPIRE_HORIZONTAL);
+      }
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    };
+}
+
+
+static void
+dialog_set_orientation (PsppireDialog *dialog, const GValue *orval)
+{
+  PsppireOrientation orientation = g_value_get_enum (orval);
+
+  if ( dialog->box != NULL)
+    {
+      gtk_container_remove (GTK_CONTAINER (dialog), dialog->box);
+    }
+
+  if ( orientation == PSPPIRE_HORIZONTAL)
+    {
+      dialog->box = gtk_hbox_new (FALSE, 5);
+    }
+  else
+    {
+      dialog->box = gtk_vbox_new (FALSE, 5);
+    }
+
+  gtk_container_add (GTK_CONTAINER (dialog), dialog->box);
+}
+
+
+static void
+psppire_dialog_set_property (GObject         *object,
+                            guint            prop_id,
+                            const GValue    *value,
+                            GParamSpec      *pspec)
+
+{
+  PsppireDialog *dialog = PSPPIRE_DIALOG (object);
+
+  switch (prop_id)
+    {
+    case PROP_ORIENTATION:
+      dialog_set_orientation (dialog, value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    };
+}
+
+
+static GParamSpec *orientation_spec ;
+
 static void
 psppire_dialog_class_init (PsppireDialogClass *class)
 {
   GObjectClass *object_class = (GObjectClass *) class;
 
+
+  orientation_spec =
+    g_param_spec_enum ("orientation",
+                      "Orientation",
+                      "Which way widgets are packed",
+                      G_TYPE_PSPPIRE_ORIENTATION,
+                      PSPPIRE_HORIZONTAL /* default value */,
+                      G_PARAM_CONSTRUCT_ONLY |G_PARAM_READWRITE);
+
+
+  object_class->set_property = psppire_dialog_set_property;
+  object_class->get_property = psppire_dialog_get_property;
+
+  g_object_class_install_property (object_class,
+                                   PROP_ORIENTATION,
+                                   orientation_spec);
+
+
+
   signals [DIALOG_REFRESH] =
     g_signal_new ("refresh",
                  G_TYPE_FROM_CLASS (class),
@@ -129,11 +228,15 @@
 static void
 psppire_dialog_init (PsppireDialog *dialog)
 {
-  dialog->box = gtk_hbox_new (FALSE, 5);
+  GValue value = {0};
+  dialog->box = NULL;
 
+  g_value_init (&value, orientation_spec->value_type);
+  g_param_value_set_default (orientation_spec, &value);
 
-  gtk_container_add (GTK_CONTAINER (dialog), dialog->box);
+  dialog_set_orientation (dialog, &value);
 
+  g_value_unset (&value);
 
   g_signal_connect (G_OBJECT (dialog), "delete-event",
                    G_CALLBACK (delete_event_callback),
@@ -173,3 +276,26 @@
 {
   g_signal_emit (dialog, signals [DIALOG_REFRESH], 0);
 }
+
+
+
+
+GType
+psppire_orientation_get_type (void)
+{
+  static GType etype = 0;
+  if (etype == 0)
+    {
+      static const GEnumValue values[] =
+       {
+         { PSPPIRE_HORIZONTAL, "PSPPIRE_HORIZONTAL", "Horizontal" },
+         { PSPPIRE_VERTICAL,   "PSPPIRE_VERTICAL",   "Vertical" },
+         { 0, NULL, NULL }
+       };
+
+      etype = g_enum_register_static
+       (g_intern_static_string ("PsppireOrientation"), values);
+
+    }
+  return etype;
+}

Index: src/ui/gui/psppire-dialog.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-dialog.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/ui/gui/psppire-dialog.h 30 Apr 2007 08:58:14 -0000      1.5
+++ src/ui/gui/psppire-dialog.h 7 May 2007 00:40:56 -0000       1.6
@@ -65,6 +65,18 @@
 gint           psppire_dialog_run             (PsppireDialog *);
 
 
+GType psppire_orientation_get_type (void);
+
+
+typedef enum
+  {
+    PSPPIRE_HORIZONTAL,
+    PSPPIRE_VERTICAL
+  } PsppireOrientation;
+
+#define G_TYPE_PSPPIRE_ORIENTATION (psppire_orientation_get_type ())
+
+
 G_END_DECLS
 
 #endif /* __PSPPIRE_DIALOG_H__ */

Index: src/ui/gui/psppire.glade
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire.glade,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- src/ui/gui/psppire.glade    30 Apr 2007 08:58:14 -0000      1.20
+++ src/ui/gui/psppire.glade    7 May 2007 00:40:56 -0000       1.21
@@ -250,36 +250,25 @@
                 <property name="column_spacing">5</property>
                 <property name="row_spacing">5</property>
                 <child>
-                  <widget class="GtkVBox" id="vbox5">
-                    <property name="visible">True</property>
-                    <child>
-                      <widget class="GtkLabel" id="label4">
+                  <widget class="PsppireSelector" id="psppire-selector2">
                         <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Name 
Variable:</property>
+                    <property name="border_width">5</property>
                       </widget>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
+                    <property name="x_options"></property>
+                    <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkEntry" id="new-name-entry">
+                  <widget class="PsppireSelector" id="psppire-selector3">
                         <property name="visible">True</property>
+                    <property name="border_width">5</property>
                       </widget>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
-                    <property name="y_options"></property>
+                    <property name="x_options"></property>
+                    <property name="y_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
@@ -332,24 +321,35 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="PsppireSelector" id="psppire-selector3">
+                  <widget class="GtkVBox" id="vbox5">
                     <property name="visible">True</property>
-                    <property name="border_width">5</property>
+                    <child>
+                      <widget class="GtkLabel" id="label4">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Name 
Variable:</property>
                   </widget>
                   <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="x_options"></property>
-                    <property name="y_options">GTK_FILL</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="PsppireSelector" id="psppire-selector2">
+                      <widget class="GtkEntry" id="new-name-entry">
                     <property name="visible">True</property>
-                    <property name="border_width">5</property>
                   </widget>
                   <packing>
-                    <property name="x_options"></property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
                     <property name="y_options"></property>
                   </packing>
                 </child>
@@ -672,215 +672,223 @@
       </widget>
     </child>
   </widget>
-  <widget class="GtkWindow" id="window1">
+  <widget class="PsppireDialog" id="sort-cases-dialog">
     <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
-    <child>
-      <widget class="GtkVBox" id="vbox9">
+    <property name="title">Sort Cases</property>
+    <property name="modal">True</property>
+    <child internal-child="hbox">
+      <widget class="GtkHBox" id="dialog-hbox4">
         <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="spacing">2</property>
         <child>
-          <widget class="GtkHBox" id="hbox8">
+          <widget class="GtkHBox" id="hbox14">
             <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="spacing">5</property>
             <child>
-              <widget class="GtkScrolledWindow" id="scrolledwindow5">
+              <widget class="GtkScrolledWindow" id="scrolledwindow6">
                 <property name="visible">True</property>
                 <property name="can_focus">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="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
                 <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                <property name="shadow_type">GTK_SHADOW_IN</property>
+                <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
                 <child>
-                  <widget class="GtkTreeView" id="treeview1">
+                  <widget class="GtkTreeView" id="sort-cases-treeview1">
                     <property name="visible">True</property>
                     <property name="can_focus">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="headers_visible">False</property>
-                    <property name="fixed_height_mode">True</property>
+                    <property name="headers_clickable">True</property>
                   </widget>
                 </child>
               </widget>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox10">
-                <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>
-                <child>
-                  <widget class="GtkFrame" id="Select">
-                    <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_xalign">0</property>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment3">
-                        <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="left_padding">12</property>
-                        <child>
-                          <widget class="GtkVButtonBox" id="vbuttonbox3">
+              <widget class="GtkAlignment" id="alignment6">
                             <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="layout_style">GTK_BUTTONBOX_SPREAD</property>
+                <property name="yalign">0.25</property>
+                <property name="xscale">0</property>
+                <property name="yscale">0</property>
                             <child>
-                              <widget class="GtkRadioButton" id="radiobutton1">
+                  <widget class="PsppireSelector" id="sort-cases-selector">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                    <property name="receives_default">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">All 
Cases</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
+                    <property name="border_width">5</property>
+                  </widget>
+                </child>
                               </widget>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkRadioButton" id="radiobutton3">
+              <widget class="GtkVBox" id="vbox12">
                                 <property name="visible">True</property>
-                                <property name="can_focus">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="active">True</property>
-                                <property name="draw_indicator">True</property>
-                                <property name="group">radiobutton1</property>
                                 <child>
-                                  <widget class="GtkVBox" id="vbox11">
+                  <widget class="GtkVBox" id="vbox16">
                                     <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>
                                     <child>
-                                      <widget class="GtkLabel" id="label9">
+                      <widget class="GtkLabel" id="label18">
                                         <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">If condition is satisfied</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Sort 
by:</property>
                                       </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                      </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkHBox" id="hbox9">
-                                        <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>
-                                        <child>
-                                          <widget class="GtkAlignment" 
id="alignment4">
+                      <widget class="GtkScrolledWindow" id="scrolledwindow7">
                                             <property 
name="visible">True</property>
+                        <property name="can_focus">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="xalign">0</property>
-                                            <property 
name="xscale">0</property>
+                        <property 
name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                        <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                        <property 
name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
                                             <child>
-                                              <widget class="GtkButton" 
id="button1">
+                          <widget class="GtkTreeView" 
id="sort-cases-treeview2">
                                                 <property 
name="visible">True</property>
                                                 <property 
name="can_focus">True</property>
-                                                <property 
name="receives_default">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">If...</property>
-                                              </widget>
-                                            </child>
+                            <property name="headers_visible">False</property>
+                            <property name="headers_clickable">True</property>
                                           </widget>
                                         </child>
                                       </widget>
                                       <packing>
-                                        <property 
name="expand">False</property>
-                                        <property name="fill">False</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
                                   </widget>
-                                </child>
-                              </widget>
                               <packing>
-                                <property name="position">1</property>
+                    <property name="padding">5</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkRadioButton" id="radiobutton4">
+                  <widget class="GtkFrame" id="frame9">
                                 <property name="visible">True</property>
-                                <property name="can_focus">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="active">True</property>
-                                <property name="draw_indicator">True</property>
-                                <property name="group">radiobutton1</property>
+                    <property name="label_xalign">0</property>
                                 <child>
-                                  <widget class="GtkVBox" id="vbox13">
+                      <widget class="GtkAlignment" id="alignment5">
                                     <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="left_padding">12</property>
                                     <child>
-                                      <widget class="GtkLabel" id="label10">
+                          <widget class="GtkVButtonBox" id="vbuttonbox4">
                                         <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="xalign">0</property>
-                                        <property name="label" 
translatable="yes">Random Sample of cases</property>
-                                      </widget>
-                                    </child>
+                            <property 
name="layout_style">GTK_BUTTONBOX_SPREAD</property>
                                     <child>
-                                      <widget class="GtkHBox" id="hbox10">
+                              <widget class="GtkRadioButton" 
id="sort-cases-radiobutton0">
                                         <property 
name="visible">True</property>
+                                <property name="can_focus">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="spacing">5</property>
+                                <property name="label" 
translatable="yes">Ascending</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                              </widget>
+                            </child>
                                         <child>
-                                          <widget class="GtkButton" 
id="button2">
+                              <widget class="GtkRadioButton" 
id="sort-cases-radiobutton1">
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
-                                            <property 
name="receives_default">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">Sample...</property>
+                                <property name="label" 
translatable="yes">Descending</property>
+                                <property name="draw_indicator">True</property>
+                                <property 
name="group">sort-cases-radiobutton0</property>
                                           </widget>
                                           <packing>
-                                            <property 
name="expand">False</property>
-                                            <property 
name="fill">False</property>
+                                <property name="position">1</property>
                                           </packing>
                                         </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
                                         <child>
-                                          <widget class="GtkLabel" 
id="label11">
+                      <widget class="GtkLabel" id="label17">
                                             <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">Approximately 23% of cases</property>
-                                            <property 
name="single_line_mode">True</property>
+                        <property name="label" translatable="yes">Sort 
Order</property>
+                        <property name="use_markup">True</property>
                                           </widget>
                                           <packing>
-                                            <property 
name="position">1</property>
+                        <property name="type">label_item</property>
                                           </packing>
                                         </child>
                                       </widget>
                                       <packing>
+                    <property name="padding">5</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
                                   </widget>
-                                </child>
-                              </widget>
                               <packing>
                                 <property name="position">2</property>
                               </packing>
                             </child>
+          </widget>
+        </child>
                             <child>
-                              <widget class="GtkRadioButton" id="radiobutton7">
+          <widget class="PsppireVButtonBox" id="psppire-buttonbox4">
                                 <property name="visible">True</property>
-                                <property name="can_focus">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="active">True</property>
-                                <property name="draw_indicator">True</property>
-                                <property name="group">radiobutton1</property>
+            <property name="border_width">5</property>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="PsppireDialog" id="compute-variable-dialog">
+    <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
+    <property name="title">Compute Variable</property>
+    <property name="modal">True</property>
+    <child internal-child="hbox">
+      <widget class="GtkHBox" id="dialog-hbox5">
+        <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="spacing">2</property>
                                 <child>
-                                  <widget class="GtkVBox" id="vbox14">
+          <widget class="GtkAlignment" id="alignment8">
                                     <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="bottom_padding">5</property>
+            <property name="left_padding">5</property>
                                     <child>
-                                      <widget class="GtkLabel" id="label12">
+              <widget class="GtkHBox" id="hbox15">
                                         <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">Based on time or case range</property>
-                                      </widget>
-                                    </child>
                                     <child>
-                                      <widget class="GtkHBox" id="hbox11">
+                  <widget class="GtkVBox" id="vbox19">
                                         <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="spacing">5</property>
                                         <child>
-                                          <widget class="GtkButton" 
id="button3">
+                      <widget class="GtkVBox" id="vbox20">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">True</property>
-                                            <property 
name="receives_default">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">Range...</property>
+                        <child>
+                          <widget class="GtkLabel" id="label20">
+                            <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="xalign">0</property>
+                            <property name="label" translatable="yes">Target 
Variable:</property>
                                           </widget>
                                           <packing>
                                             <property 
name="expand">False</property>
@@ -888,153 +896,205 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" 
id="label13">
+                          <widget class="GtkEntry" id="compute-entry1">
                                             <property 
name="visible">True</property>
+                            <property name="can_focus">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">2 thru 3</property>
                                           </widget>
                                           <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
                                             <property 
name="position">1</property>
                                           </packing>
                                         </child>
                                       </widget>
                                       <packing>
-                                        <property name="position">1</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
                                       </packing>
                                     </child>
-                                  </widget>
-                                </child>
+                    <child>
+                      <widget class="GtkButton" id="compute-button1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">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">Type &amp; 
Label</property>
                               </widget>
                               <packing>
-                                <property name="position">3</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkRadioButton" id="radiobutton8">
+                      <widget class="GtkScrolledWindow" id="scrolledwindow9">
                                 <property name="visible">True</property>
                                 <property name="can_focus">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="active">True</property>
-                                <property name="draw_indicator">True</property>
-                                <property name="group">radiobutton1</property>
-                                <child>
-                                  <widget class="GtkVBox" id="vbox15">
-                                    <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="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                        <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                        <property name="shadow_type">GTK_SHADOW_IN</property>
                                     <child>
-                                      <widget class="GtkLabel" id="label14">
+                          <widget class="GtkTreeView" id="compute-treeview1">
                                         <property 
name="visible">True</property>
+                            <property name="can_focus">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="xalign">0</property>
-                                        <property name="label" 
translatable="yes">Use filter variable</property>
+                            <property name="headers_visible">False</property>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
                                       </widget>
                                     </child>
                                     <child>
-                                      <widget class="GtkHBox" id="hbox12">
+                  <widget class="GtkVBox" id="vbox21">
                                         <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="spacing">5</property>
                                         <child>
-                                          <widget class="PsppireSelector" 
id="psppire-selector1">
+                      <widget class="GtkLabel" id="label21">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">True</property>
-                                            <property 
name="receives_default">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="border_width">5</property>
+                        <property name="label" translatable="yes">=</property>
                                           </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkEntry" id="entry1">
+                      <widget class="PsppireSelector" id="compute-selector1">
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
+                        <property name="receives_default">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="border_width">5</property>
                                           </widget>
                                           <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
                                             <property 
name="position">1</property>
                                           </packing>
                                         </child>
                                       </widget>
                                       <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
                                   </widget>
                                 </child>
                               </widget>
-                              <packing>
-                                <property name="position">4</property>
-                              </packing>
-                            </child>
-                          </widget>
                         </child>
+        <child>
+          <widget class="GtkVBox" id="vbox17">
+            <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="spacing">5</property>
+            <child>
+              <widget class="GtkVBox" id="vbox18">
+                <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>
+                <child>
+                  <widget class="GtkLabel" id="label19">
+                    <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="xalign">0</property>
+                    <property name="label" translatable="yes">Numeric 
Expressions:</property>
                       </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="Select">
+                  <widget class="GtkScrolledWindow" id="scrolledwindow8">
                         <property name="visible">True</property>
+                    <property name="can_focus">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">Select</property>
-                        <property name="use_markup">True</property>
+                    <property 
name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                    <child>
+                      <widget class="GtkTextView" id="compute-textview1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
+                      </widget>
+                    </child>
                       </widget>
                       <packing>
-                        <property name="type">label_item</property>
+                    <property name="position">1</property>
                       </packing>
                     </child>
                   </widget>
                 </child>
                 <child>
-                  <widget class="GtkFrame" id="frame6">
+              <widget class="GtkHBox" id="hbox16">
                     <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_xalign">0</property>
+                <property name="spacing">5</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment2">
+                  <widget class="PsppireKeypad" id="psppire-keypad1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 
| GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | 
GDK_FOCUS_CHANGE_MASK</property>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkVBox" id="vbox22">
                         <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="left_padding">12</property>
                         <child>
-                          <widget class="GtkHButtonBox" id="hbuttonbox1">
+                      <widget class="GtkHBox" id="hbox17">
                             <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="layout_style">GTK_BUTTONBOX_SPREAD</property>
                             <child>
-                              <widget class="GtkRadioButton" id="radiobutton5">
+                          <widget class="GtkLabel" id="label22">
                                 <property name="visible">True</property>
-                                <property name="can_focus">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">Filtered</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" 
translatable="yes">Functions:</property>
                               </widget>
                             </child>
                             <child>
-                              <widget class="GtkRadioButton" id="radiobutton6">
+                          <widget class="PsppireSelector" 
id="compute-selector2">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                            <property name="receives_default">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">Deleted</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
-                                <property name="group">radiobutton5</property>
+                            <property name="border_width">5</property>
+                            <property 
name="orientation">PSPPIRE_SELECT_SOURCE_BELOW_DEST</property>
                               </widget>
                               <packing>
+                            <property name="fill">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                           </widget>
-                        </child>
-                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label8">
+                      <widget class="GtkScrolledWindow" id="scrolledwindow10">
                         <property name="visible">True</property>
+                        <property name="can_focus">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">Unselected 
Cases Are</property>
-                        <property name="use_markup">True</property>
+                        <property 
name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                        <property name="shadow_type">GTK_SHADOW_IN</property>
+                        <child>
+                          <widget class="GtkTreeView" id="compute-treeview2">
+                            <property name="visible">True</property>
+                            <property name="can_focus">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="headers_visible">False</property>
                       </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
                     </child>
                   </widget>
                   <packing>
@@ -1047,17 +1107,22 @@
               </packing>
             </child>
           </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
         </child>
         <child>
-          <widget class="GtkHBox" id="hbox13">
+              <widget class="GtkHBox" id="hbox18">
             <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>
             <child>
-              <widget class="GtkLabel" id="label15">
+                  <widget class="GtkButton" id="button4">
                 <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">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="xalign">1</property>
-                <property name="label" translatable="yes">Curent Status : 
</property>
+                    <property name="label" translatable="yes">If...</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
@@ -1065,14 +1130,11 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label16">
+                  <widget class="GtkLabel" id="label23">
                 <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="xalign">0</property>
-                <property name="label" translatable="yes">Do not filter 
cases</property>
               </widget>
               <packing>
-                <property name="pack_type">GTK_PACK_END</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -1080,11 +1142,11 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
-            <property name="position">1</property>
+                <property name="position">2</property>
           </packing>
         </child>
         <child>
-          <widget class="PsppireHButtonBox" id="psppire-hbuttonbox1">
+              <widget class="PsppireHButtonBox" id="psppire-hbuttonbox2">
             <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="border_width">5</property>
@@ -1094,229 +1156,238 @@
             <property name="expand">False</property>
             <property name="fill">False</property>
             <property name="pack_type">GTK_PACK_END</property>
-            <property name="position">2</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="padding">5</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </widget>
     </child>
   </widget>
-  <widget class="PsppireDialog" id="sort-cases-dialog">
+  <widget class="PsppireDialog" id="select-cases-dialog">
     <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
-    <property name="title">Sort Cases</property>
+    <property name="title">Select Cases</property>
     <property name="modal">True</property>
+    <property name="orientation">PSPPIRE_VERTICAL</property>
     <child internal-child="hbox">
-      <widget class="GtkHBox" id="dialog-hbox4">
+      <widget class="GtkVBox" id="dialog-hbox6">
         <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="spacing">2</property>
         <child>
-          <widget class="GtkHBox" id="hbox14">
+          <widget class="GtkAlignment" id="alignment2">
+            <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="top_padding">5</property>
+            <property name="left_padding">5</property>
+            <property name="right_padding">5</property>
+            <child>
+              <widget class="GtkHBox" id="hbox8">
             <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="spacing">5</property>
             <child>
-              <widget class="GtkScrolledWindow" id="scrolledwindow6">
+                  <widget class="GtkScrolledWindow" id="scrolledwindow5">
                 <property name="visible">True</property>
                 <property name="can_focus">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="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                    <property 
name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                 <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+                    <property name="shadow_type">GTK_SHADOW_IN</property>
                 <child>
-                  <widget class="GtkTreeView" id="sort-cases-treeview1">
+                      <widget class="GtkTreeView" id="treeview1">
                     <property name="visible">True</property>
                     <property name="can_focus">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="headers_visible">False</property>
-                    <property name="headers_clickable">True</property>
+                        <property name="fixed_height_mode">True</property>
                   </widget>
                 </child>
               </widget>
             </child>
             <child>
-              <widget class="GtkAlignment" id="alignment6">
+                  <widget class="GtkVBox" id="vbox10">
                 <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="yalign">0.25</property>
-                <property name="xscale">0</property>
-                <property name="yscale">0</property>
                 <child>
-                  <widget class="PsppireSelector" id="sort-cases-selector">
+                      <widget class="GtkFrame" id="Select1">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">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="border_width">5</property>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
+                        <property name="label_xalign">0</property>
             <child>
-              <widget class="GtkVBox" id="vbox12">
+                          <widget class="GtkAlignment" id="alignment3">
                 <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="left_padding">12</property>
                 <child>
-                  <widget class="GtkVBox" id="vbox16">
+                              <widget class="GtkVButtonBox" id="vbuttonbox3">
                     <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="layout_style">GTK_BUTTONBOX_SPREAD</property>
                     <child>
-                      <widget class="GtkLabel" id="label18">
+                                  <widget class="GtkRadioButton" 
id="radiobutton1">
                         <property name="visible">True</property>
+                                    <property name="can_focus">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="xalign">0</property>
-                        <property name="label" translatable="yes">Sort 
by:</property>
+                                    <property name="label" 
translatable="yes">All Cases</property>
+                                    <property name="active">True</property>
+                                    <property 
name="draw_indicator">True</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                                    <property name="fill">False</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkScrolledWindow" id="scrolledwindow7">
+                                  <widget class="GtkRadioButton" 
id="radiobutton3">
                         <property name="visible">True</property>
                         <property name="can_focus">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="hscrollbar_policy">GTK_POLICY_NEVER</property>
-                        <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property 
name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+                                    <property name="active">True</property>
+                                    <property 
name="draw_indicator">True</property>
+                                    <property 
name="group">radiobutton1</property>
                         <child>
-                          <widget class="GtkTreeView" 
id="sort-cases-treeview2">
+                                      <widget class="GtkVBox" id="vbox11">
                             <property name="visible">True</property>
-                            <property name="can_focus">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="headers_visible">False</property>
-                            <property name="headers_clickable">True</property>
-                          </widget>
-                        </child>
+                                        <child>
+                                          <widget class="GtkLabel" id="label8">
+                                            <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">If condition is satisfied</property>
+                                          </widget>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkHBox" id="hbox9">
+                                            <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>
+                                            <child>
+                                              <widget class="GtkAlignment" 
id="alignment4">
+                                                <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="xalign">0</property>
+                                                <property 
name="xscale">0</property>
+                                                <child>
+                                                  <widget class="GtkButton" 
id="button1">
+                                                    <property 
name="visible">True</property>
+                                                    <property 
name="can_focus">True</property>
+                                                    <property 
name="receives_default">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">If...</property>
+                                                  </widget>
+                                                </child>
+                                              </widget>
+                                            </child>
                       </widget>
                       <packing>
+                                            <property 
name="expand">False</property>
+                                            <property 
name="fill">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </widget>
+                                    </child>
+                                  </widget>
                   <packing>
-                    <property name="padding">5</property>
+                                    <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFrame" id="frame9">
+                                  <widget class="GtkRadioButton" 
id="radiobutton4">
                     <property name="visible">True</property>
+                                    <property name="can_focus">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_xalign">0</property>
+                                    <property name="active">True</property>
+                                    <property 
name="draw_indicator">True</property>
+                                    <property 
name="group">radiobutton1</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment5">
+                                      <widget class="GtkVBox" id="vbox13">
                         <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="left_padding">12</property>
                         <child>
-                          <widget class="GtkVButtonBox" id="vbuttonbox4">
+                                          <widget class="GtkLabel" id="label9">
                             <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="layout_style">GTK_BUTTONBOX_SPREAD</property>
+                                            <property 
name="xalign">0</property>
+                                            <property name="label" 
translatable="yes">Random Sample of cases</property>
+                                          </widget>
+                                        </child>
                             <child>
-                              <widget class="GtkRadioButton" 
id="sort-cases-radiobutton0">
+                                          <widget class="GtkHBox" id="hbox10">
                                 <property name="visible">True</property>
-                                <property name="can_focus">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">Ascending</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
-                              </widget>
-                            </child>
+                                            <property 
name="spacing">5</property>
                             <child>
-                              <widget class="GtkRadioButton" 
id="sort-cases-radiobutton1">
+                                              <widget class="GtkButton" 
id="button2">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                                <property 
name="receives_default">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">Descending</property>
-                                <property name="draw_indicator">True</property>
-                                <property 
name="group">sort-cases-radiobutton0</property>
+                                                <property name="label" 
translatable="yes">Sample...</property>
                               </widget>
                               <packing>
-                                <property name="position">1</property>
+                                                <property 
name="expand">False</property>
+                                                <property 
name="fill">False</property>
                               </packing>
                             </child>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
                     <child>
-                      <widget class="GtkLabel" id="label17">
+                                              <widget class="GtkLabel" 
id="label10">
                         <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">Sort 
Order</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
-                    </child>
+                                                <property name="label" 
translatable="yes">Approximately 23% of cases</property>
+                                                <property 
name="single_line_mode">True</property>
                   </widget>
                   <packing>
-                    <property name="padding">5</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </widget>
               <packing>
-                <property name="position">2</property>
+                                            <property 
name="position">1</property>
               </packing>
             </child>
           </widget>
         </child>
-        <child>
-          <widget class="PsppireVButtonBox" id="psppire-buttonbox4">
-            <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="border_width">5</property>
           </widget>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
-            <property name="position">1</property>
+                                    <property name="position">2</property>
           </packing>
         </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="PsppireDialog" id="compute-variable-dialog">
-    <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
-    <property name="title">Compute Variable</property>
-    <property name="modal">True</property>
-    <child internal-child="hbox">
-      <widget class="GtkHBox" id="dialog-hbox5">
-        <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="spacing">2</property>
         <child>
-          <widget class="GtkAlignment" id="alignment8">
+                                  <widget class="GtkRadioButton" 
id="radiobutton5">
             <property name="visible">True</property>
+                                    <property name="can_focus">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="bottom_padding">5</property>
-            <property name="left_padding">5</property>
+                                    <property name="active">True</property>
+                                    <property 
name="draw_indicator">True</property>
+                                    <property 
name="group">radiobutton1</property>
             <child>
-              <widget class="GtkHBox" id="hbox15">
+                                      <widget class="GtkVBox" id="vbox14">
                 <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>
                 <child>
-                  <widget class="GtkVBox" id="vbox19">
+                                          <widget class="GtkLabel" 
id="label11">
                     <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="spacing">5</property>
+                                            <property name="label" 
translatable="yes">Based on time or case range</property>
+                                          </widget>
+                                        </child>
                     <child>
-                      <widget class="GtkVBox" id="vbox20">
+                                          <widget class="GtkHBox" id="hbox11">
                         <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="spacing">5</property>
                         <child>
-                          <widget class="GtkLabel" id="label20">
+                                              <widget class="GtkButton" 
id="button3">
                             <property name="visible">True</property>
+                                                <property 
name="can_focus">True</property>
+                                                <property 
name="receives_default">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="xalign">0</property>
-                            <property name="label" translatable="yes">Target 
Variable:</property>
+                                                <property name="label" 
translatable="yes">Range...</property>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
@@ -1324,136 +1395,134 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkEntry" id="compute-entry1">
+                                              <widget class="GtkLabel" 
id="label12">
                             <property name="visible">True</property>
-                            <property name="can_focus">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">2 thru 3</property>
                           </widget>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                       </widget>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
+                                            <property 
name="position">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <widget class="GtkButton" id="compute-button1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">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">Type &amp; 
Label</property>
+                                      </widget>
+                                    </child>
                       </widget>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
+                                    <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkScrolledWindow" id="scrolledwindow9">
+                                  <widget class="GtkRadioButton" 
id="radiobutton6">
                         <property name="visible">True</property>
                         <property name="can_focus">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="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="shadow_type">GTK_SHADOW_IN</property>
+                                    <property name="active">True</property>
+                                    <property 
name="draw_indicator">True</property>
+                                    <property 
name="group">radiobutton1</property>
                         <child>
-                          <widget class="GtkTreeView" id="compute-treeview1">
+                                      <widget class="GtkVBox" id="vbox15">
                             <property name="visible">True</property>
-                            <property name="can_focus">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="headers_visible">False</property>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
+                                        <child>
+                                          <widget class="GtkLabel" 
id="label13">
+                                            <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="xalign">0</property>
+                                            <property name="label" 
translatable="yes">Use filter variable</property>
                   </widget>
                 </child>
                 <child>
-                  <widget class="GtkVBox" id="vbox21">
+                                          <widget class="GtkHBox" id="hbox12">
                     <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="spacing">5</property>
                     <child>
-                      <widget class="GtkLabel" id="label21">
+                                              <widget class="PsppireSelector" 
id="psppire-selector1">
                         <property name="visible">True</property>
+                                                <property 
name="can_focus">True</property>
+                                                <property 
name="receives_default">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">=</property>
+                                                <property 
name="border_width">5</property>
                       </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                      </packing>
                     </child>
                     <child>
-                      <widget class="PsppireSelector" id="compute-selector1">
+                                              <widget class="GtkEntry" 
id="entry1">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">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="border_width">5</property>
                       </widget>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </widget>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </widget>
             </child>
           </widget>
+                                  <packing>
+                                    <property name="position">4</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
         </child>
         <child>
-          <widget class="GtkVBox" id="vbox17">
+                          <widget class="GtkLabel" id="Select2">
             <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="spacing">5</property>
+                            <property name="label" 
translatable="yes">Select</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="type">label_item</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
             <child>
-              <widget class="GtkVBox" id="vbox18">
+                      <widget class="GtkFrame" id="frame6">
                 <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_xalign">0</property>
                 <child>
-                  <widget class="GtkLabel" id="label19">
+                          <widget class="GtkAlignment" id="alignment9">
                     <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="xalign">0</property>
-                    <property name="label" translatable="yes">Numeric 
Expressions:</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                  </packing>
-                </child>
+                            <property name="left_padding">12</property>
                 <child>
-                  <widget class="GtkScrolledWindow" id="scrolledwindow8">
+                              <widget class="GtkHButtonBox" id="hbuttonbox1">
                     <property name="visible">True</property>
-                    <property name="can_focus">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="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                                <property 
name="layout_style">GTK_BUTTONBOX_SPREAD</property>
                     <child>
-                      <widget class="GtkTextView" id="compute-textview1">
+                                  <widget class="GtkRadioButton" 
id="radiobutton7">
                         <property name="visible">True</property>
                         <property name="can_focus">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">Filtered</property>
+                                    <property name="active">True</property>
+                                    <property 
name="draw_indicator">True</property>
                       </widget>
                     </child>
+                                <child>
+                                  <widget class="GtkRadioButton" 
id="radiobutton8">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">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">Deleted</property>
+                                    <property name="active">True</property>
+                                    <property 
name="draw_indicator">True</property>
+                                    <property 
name="group">radiobutton5</property>
                   </widget>
                   <packing>
                     <property name="position">1</property>
@@ -1461,48 +1530,75 @@
                 </child>
               </widget>
             </child>
+                          </widget>
+                        </child>
             <child>
-              <widget class="GtkHBox" id="hbox16">
+                          <widget class="GtkLabel" id="label14">
                 <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="spacing">5</property>
+                            <property name="label" 
translatable="yes">Unselected Cases Are</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="type">label_item</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+          </widget>
+        </child>
                 <child>
-                  <widget class="PsppireKeypad" id="psppire-keypad1">
+          <widget class="PsppireHButtonBox" id="psppire-hbuttonbox3">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 
| GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | 
GDK_FOCUS_CHANGE_MASK</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
+            <property name="border_width">5</property>
                   </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+            <property name="position">1</property>
+          </packing>
                 </child>
-                <child>
-                  <widget class="GtkVBox" id="vbox22">
+      </widget>
+    </child>
+  </widget>
+  <widget class="PsppireDialog" id="comments-dialog">
+    <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
+    <property name="title">Data File Comments</property>
+    <property name="modal">True</property>
+    <property name="orientation">PSPPIRE_VERTICAL</property>
+    <child internal-child="hbox">
+      <widget class="GtkVBox" id="dialog-hbox7">
                     <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="spacing">2</property>
                     <child>
-                      <widget class="GtkHBox" id="hbox17">
+          <widget class="GtkAlignment" id="alignment7">
                         <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="left_padding">5</property>
+            <property name="right_padding">5</property>
                         <child>
-                          <widget class="GtkLabel" id="label22">
+              <widget class="GtkVBox" id="vbox9">
                             <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="xalign">0</property>
-                            <property name="label" 
translatable="yes">Functions:</property>
-                          </widget>
-                        </child>
                         <child>
-                          <widget class="PsppireSelector" 
id="compute-selector2">
+                  <widget class="GtkLabel" id="label16">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">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="border_width">5</property>
-                            <property 
name="orientation">PSPPIRE_SELECT_SOURCE_BELOW_DEST</property>
-                          </widget>
-                          <packing>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
+                    <property name="xalign">0</property>
+                    <property name="label" 
translatable="yes">Comments:</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
@@ -1510,18 +1606,17 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkScrolledWindow" id="scrolledwindow10">
+                  <widget class="GtkScrolledWindow" id="scrolledwindow11">
                         <property name="visible">True</property>
                         <property name="can_focus">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="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                    <property 
name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                         <property name="shadow_type">GTK_SHADOW_IN</property>
                         <child>
-                          <widget class="GtkTreeView" id="compute-treeview2">
+                      <widget class="GtkTextView" id="comments-textview1">
                             <property name="visible">True</property>
                             <property name="can_focus">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="headers_visible">False</property>
                           </widget>
                         </child>
                       </widget>
@@ -1530,39 +1625,40 @@
                       </packing>
                     </child>
                   </widget>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
               </widget>
               <packing>
-                <property name="position">1</property>
+            <property name="padding">5</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkHBox" id="hbox18">
+          <widget class="GtkHBox" id="hbox13">
                 <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>
                 <child>
-                  <widget class="GtkButton" id="button4">
+              <widget class="GtkCheckButton" id="comments-checkbutton1">
                     <property name="visible">True</property>
-                    <property name="sensitive">False</property>
                     <property name="can_focus">True</property>
-                    <property name="receives_default">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">If...</property>
+                <property name="label" translatable="yes">Display comments in 
output</property>
+                <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                <property name="padding">5</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label23">
+              <widget class="GtkLabel" id="column-number-label">
                     <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="xalign">1</property>
+                <property name="label" translatable="yes">Column Number: 
0</property>
                   </widget>
                   <packing>
+                <property name="padding">5</property>
+                <property name="pack_type">GTK_PACK_END</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -1570,26 +1666,20 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
                 <property name="position">2</property>
               </packing>
             </child>
             <child>
-              <widget class="PsppireHButtonBox" id="psppire-hbuttonbox2">
+          <widget class="PsppireHButtonBox" id="psppire-hbuttonbox1">
                 <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="border_width">5</property>
-                <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="pack_type">GTK_PACK_END</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="padding">5</property>
             <property name="position">1</property>
           </packing>
         </child>

Index: src/ui/gui/comments-dialog.h
===================================================================
RCS file: src/ui/gui/comments-dialog.h
diff -N src/ui/gui/comments-dialog.h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ src/ui/gui/comments-dialog.h        7 May 2007 00:40:56 -0000       1.1
@@ -0,0 +1,26 @@
+/*
+    PSPPIRE --- A Graphical User Interface for PSPP
+    Copyright (C) 2007  Free Software Foundation
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA. */
+
+
+#ifndef COMMENTS_DIALOG_H
+#define COMMENTS_DIALOG_H
+
+void comments_dialog (GObject *o, gpointer data);
+
+#endif /*  COMMENTS_DIALOG_H */




reply via email to

[Prev in Thread] Current Thread [Next in Thread]