pspp-cvs
[Top][All Lists]
Advanced

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

[Pspp-cvs] pspp/src data/ChangeLog data/dictionary.c data/...


From: John Darrington
Subject: [Pspp-cvs] pspp/src data/ChangeLog data/dictionary.c data/...
Date: Wed, 03 Jan 2007 02:03:18 +0000

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   07/01/03 02:03:18

Modified files:
        src/data       : ChangeLog dictionary.c dictionary.h 
        src/ui/gui     : data-editor.c data-editor.glade psppire-dict.c 

Log message:
        Added callback for when the weights on a dictionary change.
        Reflect the current weight status in the status bar.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/ChangeLog?cvsroot=pspp&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/dictionary.c?cvsroot=pspp&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/dictionary.h?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-editor.c?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-editor.glade?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-dict.c?cvsroot=pspp&r1=1.20&r2=1.21

Patches:
Index: data/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/data/ChangeLog,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- data/ChangeLog      1 Jan 2007 01:44:33 -0000       1.95
+++ data/ChangeLog      3 Jan 2007 02:03:18 -0000       1.96
@@ -1,3 +1,8 @@
+Wed Jan  3 11:02:11 WST 2007 John Darrington <address@hidden>
+
+       * dictionary.c dictionary.h : Added callback for when the weight 
variable
+       of a dictionary changes.
+
 Mon Jan  1 10:36:26 WST 2007 John Darrington <address@hidden>
 
        * dictionary.c dictionary.h : Added replace_source and replace_dict

Index: data/dictionary.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/dictionary.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- data/dictionary.c   1 Jan 2007 01:44:33 -0000       1.27
+++ data/dictionary.c   3 Jan 2007 02:03:18 -0000       1.28
@@ -736,6 +736,11 @@
   assert (v == NULL || var_is_numeric (v));
 
   d->weight = v;
+
+  if ( d->callbacks && d->callbacks->weight_changed )
+    d->callbacks->weight_changed (d,
+                                 v ? var_get_dict_index (v) : -1,
+                                 d->cb_data);
 }
 
 /* Returns the filter variable in dictionary D (see cmd_filter())

Index: data/dictionary.h
===================================================================
RCS file: /sources/pspp/pspp/src/data/dictionary.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- data/dictionary.h   1 Jan 2007 01:44:33 -0000       1.9
+++ data/dictionary.h   3 Jan 2007 02:03:18 -0000       1.10
@@ -32,6 +32,7 @@
   void (*var_added) (struct dictionary *, int, void *);
   void (*var_deleted) (struct dictionary *, int, void *);
   void (*var_changed) (struct dictionary *, int, void *);
+  void (*weight_changed) (struct dictionary *, int, void *);
  };
 
 

Index: ui/gui/data-editor.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-editor.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ui/gui/data-editor.c        29 Dec 2006 04:19:36 -0000      1.8
+++ ui/gui/data-editor.c        3 Jan 2007 02:03:18 -0000       1.9
@@ -101,6 +101,37 @@
 }
 
 
+/* Callback for when the dictionary changes its weights */
+static void
+on_weight_change (GObject *o, gint weight_index, gpointer data)
+{
+  struct data_editor *de = data;
+  GtkWidget *weight_status_area =
+    get_widget_assert (de->xml, "weight-status-area");
+
+  if ( weight_index == -1 )
+    {
+      gtk_label_set_text (GTK_LABEL (weight_status_area), _("Weights off"));
+    }
+  else
+    {
+      GtkSheet *var_sheet =
+       GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
+
+      PsppireVarStore *vs = PSPPIRE_VAR_STORE
+       (gtk_sheet_get_model (var_sheet) );
+
+      struct variable *var = psppire_dict_get_variable (vs->dict,
+                                                       weight_index);
+
+      gchar *text = g_strdup_printf (_("Weight by %s"), var_get_name (var));
+
+      gtk_label_set_text (GTK_LABEL (weight_status_area), text);
+
+      g_free (text);
+    }
+}
+
 
 /*
   Create a new data editor.
@@ -110,6 +141,8 @@
 {
   struct data_editor *de ;
   struct editor_window *e;
+  GtkSheet *var_sheet ;
+  PsppireVarStore *vs;
 
   de = g_malloc (sizeof (*de));
 
@@ -117,6 +150,15 @@
 
   de->xml = glade_xml_new (PKGDATADIR "/data-editor.glade", NULL, NULL);
 
+
+  var_sheet = GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
+
+  vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
+
+  g_signal_connect (vs->dict, "weight-changed",
+                   G_CALLBACK (on_weight_change),
+                   de);
+
   connect_help (de->xml);
 
   e->window = GTK_WINDOW (get_widget_assert (de->xml, "data_editor"));
@@ -242,6 +284,8 @@
                    "activate",
                    G_CALLBACK (minimise_all_windows), NULL);
 
+
+
   select_sheet (de, PAGE_DATA_SHEET);
 
   return de;
@@ -422,8 +466,6 @@
 }
 
 
-
-
 static void
 grid_lines_activate (GtkCheckMenuItem *menuitem, gpointer data)
 {

Index: ui/gui/data-editor.glade
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-editor.glade,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ui/gui/data-editor.glade    30 Dec 2006 22:34:28 -0000      1.7
+++ ui/gui/data-editor.glade    3 Jan 2007 02:03:18 -0000       1.8
@@ -1,55 +1,32 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--*- mode: xml -*-->
 <glade-interface>
-
-<widget class="GtkWindow" id="data_editor">
+  <widget class="GtkWindow" id="data_editor">
   <property name="title">Psppire Data Editor</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
   <property name="default_width">975</property>
   <property name="default_height">480</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-
   <child>
     <widget class="GtkVBox" id="vbox1">
       <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
       <child>
        <widget class="GtkMenuBar" id="menubar">
          <property name="visible">True</property>
-         <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
-         <property 
name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
-
          <child>
            <widget class="GtkMenuItem" id="file">
              <property name="visible">True</property>
              <property name="label" translatable="yes">_File</property>
              <property name="use_underline">True</property>
-
              <child>
                <widget class="GtkMenu" id="menuitem1_menu">
-
                  <child>
                    <widget class="GtkImageMenuItem" id="new1">
                      <property name="visible">True</property>
                      <property name="label">gtk-new</property>
+                        <property name="use_underline">True</property>
                      <property name="use_stock">True</property>
-
                      <child>
                        <widget class="GtkMenu" id="new1_menu">
-
                          <child>
                            <widget class="GtkMenuItem" id="file_new_syntax">
                              <property name="visible">True</property>
@@ -57,7 +34,6 @@
                              <property name="use_underline">True</property>
                            </widget>
                          </child>
-
                          <child>
                            <widget class="GtkMenuItem" id="file_new_data">
                              <property name="visible">True</property>
@@ -69,16 +45,14 @@
                      </child>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkImageMenuItem" id="open1">
                      <property name="visible">True</property>
                      <property name="label">gtk-open</property>
+                        <property name="use_underline">True</property>
                      <property name="use_stock">True</property>
-
                      <child>
                        <widget class="GtkMenu" id="open1_menu">
-
                          <child>
                            <widget class="GtkMenuItem" id="file_open_syntax">
                              <property name="visible">True</property>
@@ -86,7 +60,6 @@
                              <property name="use_underline">True</property>
                            </widget>
                          </child>
-
                          <child>
                            <widget class="GtkMenuItem" id="file_open_data">
                              <property name="visible">True</property>
@@ -98,82 +71,78 @@
                      </child>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkImageMenuItem" id="save1">
                      <property name="visible">True</property>
                      <property name="sensitive">False</property>
                      <property name="label">gtk-save</property>
+                        <property name="use_underline">True</property>
                      <property name="use_stock">True</property>
-                     <signal name="activate" handler="on_save1_activate" 
last_modification_time="Tue, 23 Mar 2004 10:22:51 GMT"/>
+                        <signal name="activate" handler="on_save1_activate"/>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkImageMenuItem" id="save_as1">
                      <property name="visible">True</property>
                      <property name="sensitive">False</property>
                      <property name="label">gtk-save-as</property>
+                        <property name="use_underline">True</property>
                      <property name="use_stock">True</property>
-                     <signal name="activate" handler="on_save_as1_activate" 
last_modification_time="Tue, 23 Mar 2004 10:22:51 GMT"/>
+                        <signal name="activate" 
handler="on_save_as1_activate"/>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkSeparatorMenuItem" 
id="separatormenuitem1">
                      <property name="visible">True</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkImageMenuItem" id="file_quit">
                      <property name="visible">True</property>
                      <property name="label">gtk-quit</property>
+                        <property name="use_underline">True</property>
                      <property name="use_stock">True</property>
-                     <signal name="activate" handler="on_quit1_activate" 
last_modification_time="Tue, 23 Mar 2004 10:22:51 GMT"/>
+                        <signal name="activate" handler="on_quit1_activate"/>
                    </widget>
                  </child>
                </widget>
              </child>
            </widget>
          </child>
-
          <child>
            <widget class="GtkMenuItem" id="edit">
              <property name="visible">True</property>
              <property name="label" translatable="yes">_Edit</property>
              <property name="use_underline">True</property>
-
              <child>
                <widget class="GtkMenu" id="edit_menu">
-
                  <child>
                    <widget class="GtkImageMenuItem" id="cut1">
                      <property name="visible">True</property>
                      <property name="sensitive">False</property>
                      <property name="label">gtk-cut</property>
+                        <property name="use_underline">True</property>
                      <property name="use_stock">True</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkImageMenuItem" id="copy1">
                      <property name="visible">True</property>
                      <property name="sensitive">False</property>
                      <property name="label">gtk-copy</property>
+                        <property name="use_underline">True</property>
                      <property name="use_stock">True</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkImageMenuItem" id="paste1">
                      <property name="visible">True</property>
                      <property name="sensitive">False</property>
                      <property name="label">gtk-paste</property>
+                        <property name="use_underline">True</property>
                      <property name="use_stock">True</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkMenuItem" id="paste_variables1">
                      <property name="visible">True</property>
@@ -182,57 +151,38 @@
                      <property name="use_underline">True</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkMenuItem" id="edit_clear">
                      <property name="visible">True</property>
                      <property name="sensitive">False</property>
                      <property name="label" 
translatable="yes">Cl_ear</property>
                      <property name="use_underline">True</property>
-                     <accelerator key="Delete" modifiers="0" 
signal="activate"/>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkSeparatorMenuItem" id="separator6">
                      <property name="visible">True</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkImageMenuItem" id="find1">
                      <property name="visible">True</property>
                      <property name="sensitive">False</property>
                      <property name="label" translatable="yes">_Find</property>
                      <property name="use_underline">True</property>
-
-                     <child internal-child="image">
-                       <widget class="GtkImage" id="image47">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-find</property>
-                         <property name="icon_size">1</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                     </child>
                    </widget>
                  </child>
                </widget>
              </child>
            </widget>
          </child>
-
          <child>
            <widget class="GtkMenuItem" id="view">
              <property name="visible">True</property>
              <property name="label" translatable="yes">_View</property>
              <property name="use_underline">True</property>
-
              <child>
                <widget class="GtkMenu" id="menuitem3_menu">
-
                  <child>
                    <widget class="GtkCheckMenuItem" id="view_statusbar">
                      <property name="visible">True</property>
@@ -241,20 +191,17 @@
                      <property name="active">True</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkMenuItem" id="toolbars">
                      <property name="label" 
translatable="yes">Toolbars</property>
                      <property name="use_underline">True</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkSeparatorMenuItem" id="separator1">
                      <property name="visible">True</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkMenuItem" id="view_fonts">
                      <property name="visible">True</property>
@@ -262,7 +209,6 @@
                      <property name="use_underline">True</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkCheckMenuItem" id="view_gridlines">
                      <property name="visible">True</property>
@@ -271,22 +217,18 @@
                      <property name="active">True</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkCheckMenuItem" id="view_valuelabels">
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Value 
Labels</property>
                      <property name="use_underline">True</property>
-                     <property name="active">False</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkSeparatorMenuItem" id="separator3">
                      <property name="visible">True</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkMenuItem" id="view_data">
                      <property name="visible">True</property>
@@ -294,7 +236,6 @@
                      <property name="use_underline">True</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkMenuItem" id="view_variables">
                      <property name="visible">True</property>
@@ -306,16 +247,13 @@
              </child>
            </widget>
          </child>
-
          <child>
            <widget class="GtkMenuItem" id="data">
              <property name="visible">True</property>
              <property name="label" translatable="yes">_Data</property>
              <property name="use_underline">True</property>
-
              <child>
                <widget class="GtkMenu" id="data_menu">
-
                  <child>
                    <widget class="GtkMenuItem" id="data_insert-variable">
                      <property name="visible">True</property>
@@ -325,56 +263,39 @@
                      <signal name="activate" handler="on_insert_variable"/>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkMenuItem" id="insert-cases">
                      <property name="visible">True</property>
                      <property name="sensitive">False</property>
                      <property name="label" translatable="yes">Insert 
Cases</property>
                      <property name="use_underline">True</property>
-                     <signal name="activate" handler="on_insert_cases" 
last_modification_time="Sat, 01 Jul 2006 08:40:06 GMT"/>
+                        <signal name="activate" handler="on_insert_cases"/>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkImageMenuItem" id="go_to_case">
                      <property name="visible">True</property>
                      <property name="sensitive">False</property>
                      <property name="label" translatable="yes">Go To 
Case</property>
                      <property name="use_underline">True</property>
-                     <signal name="activate" handler="on_go_to_case_activate" 
last_modification_time="Mon, 19 Jun 2006 10:29:37 GMT"/>
-
-                     <child internal-child="image">
-                       <widget class="GtkImage" id="image48">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-jump-to</property>
-                         <property name="icon_size">1</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                     </child>
+                        <signal name="activate" 
handler="on_go_to_case_activate"/>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkSeparatorMenuItem" id="separator4">
                      <property name="visible">True</property>
                      <property name="sensitive">False</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkMenuItem" id="sort_cases">
                      <property name="visible">True</property>
                      <property name="sensitive">False</property>
                      <property name="label" translatable="yes">Sort 
Cases</property>
                      <property name="use_underline">True</property>
-                     <signal name="activate" handler="on_sort_cases_activate" 
last_modification_time="Tue, 20 Jun 2006 10:27:11 GMT"/>
+                        <signal name="activate" 
handler="on_sort_cases_activate"/>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkMenuItem" id="transpose1">
                      <property name="visible">True</property>
@@ -383,7 +304,6 @@
                      <property name="use_underline">True</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkMenuItem" id="restructure1">
                      <property name="visible">True</property>
@@ -392,7 +312,6 @@
                      <property name="use_underline">True</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkMenuItem" id="merge_files1">
                      <property name="visible">True</property>
@@ -401,7 +320,6 @@
                      <property name="use_underline">True</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkMenuItem" id="aggregate1">
                      <property name="visible">True</property>
@@ -410,14 +328,12 @@
                      <property name="use_underline">True</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkSeparatorMenuItem" id="separator5">
                      <property name="visible">True</property>
                      <property name="sensitive">False</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkMenuItem" id="split_file1">
                      <property name="visible">True</property>
@@ -426,7 +342,6 @@
                      <property name="use_underline">True</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkMenuItem" id="select_cases1">
                      <property name="visible">True</property>
@@ -435,7 +350,6 @@
                      <property name="use_underline">True</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkMenuItem" id="weight_cases1">
                      <property name="visible">True</property>
@@ -448,39 +362,33 @@
              </child>
            </widget>
          </child>
-
          <child>
            <widget class="GtkMenuItem" id="windows">
              <property name="visible">True</property>
              <property name="label" translatable="yes">_Windows</property>
              <property name="use_underline">True</property>
-             <signal name="activate" handler="on_Windows_activate" 
last_modification_time="Wed, 27 Dec 2006 23:16:44 GMT"/>
-
+                <signal name="activate" handler="on_Windows_activate"/>
              <child>
                <widget class="GtkMenu" id="Windows_menu">
-
                  <child>
                    <widget class="GtkMenuItem" id="windows_minimise_all">
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">_Minimise All 
Windows</property>
                      <property name="use_underline">True</property>
-                     <signal name="activate" handler="on_minimiseall_activate" 
last_modification_time="Wed, 27 Dec 2006 23:17:26 GMT"/>
+                        <signal name="activate" 
handler="on_minimiseall_activate"/>
                    </widget>
                  </child>
                </widget>
              </child>
            </widget>
          </child>
-
          <child>
            <widget class="GtkMenuItem" id="help">
              <property name="visible">True</property>
              <property name="label" translatable="yes">_Help</property>
              <property name="use_underline">True</property>
-
              <child>
                <widget class="GtkMenu" id="menuitem5_menu">
-
                  <child>
                    <widget class="GtkMenuItem" id="help_reference">
                      <property name="visible">True</property>
@@ -488,13 +396,12 @@
                      <property name="use_underline">True</property>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkMenuItem" id="help_about">
                      <property name="visible">True</property>
                      <property name="label" 
translatable="yes">_About</property>
                      <property name="use_underline">True</property>
-                     <signal name="activate" handler="on_about1_activate" 
last_modification_time="Fri, 25 Nov 2005 11:54:43 GMT"/>
+                        <signal name="activate" handler="on_about1_activate"/>
                    </widget>
                  </child>
                </widget>
@@ -503,1119 +410,721 @@
          </child>
        </widget>
        <packing>
-         <property name="padding">0</property>
          <property name="expand">False</property>
          <property name="fill">False</property>
        </packing>
       </child>
-
       <child>
        <widget class="GtkHandleBox" id="handlebox1">
          <property name="visible">True</property>
          <property name="shadow_type">GTK_SHADOW_OUT</property>
-         <property name="handle_position">GTK_POS_LEFT</property>
-         <property name="snap_edge">GTK_POS_TOP</property>
-
          <child>
            <widget class="GtkToolbar" id="toolbar1">
              <property name="visible">True</property>
-             <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-             <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
-             <property name="tooltips">True</property>
-             <property name="show_arrow">True</property>
-
              <child>
-               <widget class="GtkToolButton" id="buttonOpen">
+                  <widget class="GtkToolButton" id="button-open">
                  <property name="visible">True</property>
                  <property name="sensitive">False</property>
                  <property name="tooltip" translatable="yes">Open</property>
                  <property name="stock_id">gtk-open</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
                </widget>
                <packing>
                  <property name="expand">False</property>
-                 <property name="homogeneous">True</property>
                </packing>
              </child>
-
              <child>
-               <widget class="GtkToolButton" id="buttonSave">
+                  <widget class="GtkToolButton" id="button-save">
                  <property name="visible">True</property>
                  <property name="sensitive">False</property>
                  <property name="tooltip" translatable="yes">Save</property>
                  <property name="stock_id">gtk-save</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
-                 <signal name="clicked" handler="on_save1_activate" 
last_modification_time="Wed, 02 Nov 2005 13:05:43 GMT"/>
+                    <signal name="clicked" handler="on_save1_activate"/>
                </widget>
                <packing>
                  <property name="expand">False</property>
-                 <property name="homogeneous">True</property>
                </packing>
              </child>
-
              <child>
-               <widget class="GtkToolButton" id="buttonPrint">
+                  <widget class="GtkToolButton" id="button-print">
                  <property name="visible">True</property>
                  <property name="sensitive">False</property>
                  <property name="tooltip" translatable="yes">Print</property>
                  <property name="stock_id">gtk-print</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
                </widget>
                <packing>
                  <property name="expand">False</property>
-                 <property name="homogeneous">True</property>
                </packing>
              </child>
-
              <child>
                <widget class="GtkSeparatorToolItem" id="separatortoolitem1">
                  <property name="visible">True</property>
-                 <property name="draw">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
                </widget>
                <packing>
                  <property name="expand">False</property>
                  <property name="homogeneous">False</property>
                </packing>
              </child>
-
              <child>
-               <widget class="GtkToolButton" id="toolbutton1">
+                  <widget class="GtkToolButton" id="button-undo">
                  <property name="visible">True</property>
                  <property name="sensitive">False</property>
                  <property name="tooltip" translatable="yes">Undo</property>
                  <property name="stock_id">gtk-undo</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
                </widget>
                <packing>
                  <property name="expand">False</property>
-                 <property name="homogeneous">True</property>
                </packing>
              </child>
-
              <child>
-               <widget class="GtkToolButton" id="toolbutton2">
+                  <widget class="GtkToolButton" id="button-redo">
                  <property name="visible">True</property>
                  <property name="sensitive">False</property>
                  <property name="tooltip" translatable="yes">Redo</property>
                  <property name="stock_id">gtk-redo</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
                </widget>
                <packing>
                  <property name="expand">False</property>
-                 <property name="homogeneous">True</property>
                </packing>
              </child>
-
              <child>
                <widget class="GtkSeparatorToolItem" id="separatortoolitem2">
                  <property name="visible">True</property>
-                 <property name="draw">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
                </widget>
                <packing>
                  <property name="expand">False</property>
                  <property name="homogeneous">False</property>
                </packing>
              </child>
-
              <child>
-               <widget class="GtkToolButton" id="buttonGotoCase">
+                  <widget class="GtkToolButton" id="button-goto-case">
                  <property name="visible">True</property>
                  <property name="sensitive">False</property>
                  <property name="tooltip" translatable="yes">Go To 
Case</property>
                  <property name="stock_id">gtk-jump-to</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
-                 <signal name="clicked" handler="on_go_to_case_activate" 
last_modification_time="Mon, 19 Jun 2006 11:41:44 GMT"/>
+                    <signal name="clicked" handler="on_go_to_case_activate"/>
                </widget>
                <packing>
                  <property name="expand">False</property>
-                 <property name="homogeneous">True</property>
                </packing>
              </child>
-
              <child>
-               <widget class="GtkToolButton" id="variables">
+                  <widget class="GtkToolButton" id="button-goto-variable">
                  <property name="visible">True</property>
                  <property name="sensitive">False</property>
                  <property name="tooltip" 
translatable="yes">Variables</property>
-                  <property name="stock_id">pspp-goto-variable</property>
-                 <property name="label" translatable="yes"></property>
                  <property name="use_underline">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
+                    <property name="stock_id">pspp-goto-variable</property>
                </widget>
                <packing>
                  <property name="expand">False</property>
-                 <property name="homogeneous">True</property>
                </packing>
              </child>
-
              <child>
                <widget class="GtkSeparatorToolItem" id="separatortoolitem5">
                  <property name="visible">True</property>
-                 <property name="draw">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
                </widget>
                <packing>
                  <property name="expand">False</property>
                  <property name="homogeneous">False</property>
                </packing>
              </child>
-
              <child>
-               <widget class="GtkToolButton" id="toolbutton3">
+                  <widget class="GtkToolButton" id="button-find">
                  <property name="visible">True</property>
                  <property name="sensitive">False</property>
                  <property name="tooltip" translatable="yes">Find</property>
                  <property name="stock_id">gtk-find</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
                </widget>
                <packing>
                  <property name="expand">False</property>
-                 <property name="homogeneous">True</property>
                </packing>
              </child>
-
              <child>
                <widget class="GtkSeparatorToolItem" id="separatortoolitem4">
                  <property name="visible">True</property>
-                 <property name="draw">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
                </widget>
                <packing>
                  <property name="expand">False</property>
                  <property name="homogeneous">False</property>
                </packing>
              </child>
-
              <child>
-               <widget class="GtkToolButton" id="insert_case">
+                  <widget class="GtkToolButton" id="button-insert-case">
                  <property name="visible">True</property>
                  <property name="sensitive">False</property>
                  <property name="tooltip" translatable="yes">Insert 
Case</property>
-                  <property name="stock_id">pspp-insert-case</property>
-                 <property name="label" translatable="yes"></property>
                  <property name="use_underline">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
-                 <signal name="clicked" handler="on_insert_case_clicked" 
last_modification_time="Sat, 01 Jul 2006 08:41:07 GMT"/>
+                    <property name="stock_id">pspp-insert-case</property>
+                    <signal name="clicked" handler="on_insert_case_clicked"/>
                </widget>
                <packing>
                  <property name="expand">False</property>
-                 <property name="homogeneous">True</property>
                </packing>
              </child>
-
              <child>
-               <widget class="GtkToolButton" id="insert_variable">
+                  <widget class="GtkToolButton" id="button-insert-variable">
                  <property name="visible">True</property>
                  <property name="sensitive">False</property>
                  <property name="tooltip" translatable="yes">Insert 
Variable</property>
-                  <property name="stock_id">pspp-insert-variable</property>
-                 <property name="label" translatable="yes"></property>
                  <property name="use_underline">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
+                    <property name="stock_id">pspp-insert-variable</property>
                </widget>
                <packing>
                  <property name="expand">False</property>
-                 <property name="homogeneous">True</property>
                </packing>
              </child>
-
              <child>
                <widget class="GtkSeparatorToolItem" id="separatortoolitem6">
                  <property name="visible">True</property>
-                 <property name="draw">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
                </widget>
                <packing>
                  <property name="expand">False</property>
                  <property name="homogeneous">False</property>
                </packing>
              </child>
-
              <child>
-               <widget class="GtkToolButton" id="toolbutton8">
+                  <widget class="GtkToolButton" id="button-split-file">
                  <property name="visible">True</property>
                  <property name="sensitive">False</property>
                  <property name="tooltip" translatable="yes">Split 
File</property>
-                  <property name="stock_id">pspp-split-file</property>
-                 <property name="label" translatable="yes"></property>
                  <property name="use_underline">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
+                    <property name="stock_id">pspp-split-file</property>
                </widget>
                <packing>
                  <property name="expand">False</property>
-                 <property name="homogeneous">True</property>
                </packing>
              </child>
-
              <child>
-               <widget class="GtkToolButton" id="toolbutton9">
+                  <widget class="GtkToolButton" id="button-weight-cases">
                  <property name="visible">True</property>
                  <property name="sensitive">False</property>
                  <property name="tooltip" translatable="yes">Weight 
Cases</property>
-                  <property name="stock_id">pspp-weight-cases</property>
-                 <property name="label" translatable="yes"></property>
                  <property name="use_underline">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
+                    <property name="stock_id">pspp-weight-cases</property>
                </widget>
                <packing>
                  <property name="expand">False</property>
-                 <property name="homogeneous">True</property>
                </packing>
              </child>
-
              <child>
-               <widget class="GtkToolButton" id="toolbutton10">
+                  <widget class="GtkToolButton" id="button-select-cases">
                  <property name="visible">True</property>
                  <property name="sensitive">False</property>
                  <property name="tooltip" translatable="yes">Select 
Cases</property>
-                  <property name="stock_id">pspp-select-cases</property>
-                 <property name="label" translatable="yes"></property>
                  <property name="use_underline">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
+                    <property name="stock_id">pspp-select-cases</property>
                </widget>
                <packing>
                  <property name="expand">False</property>
-                 <property name="homogeneous">True</property>
                </packing>
              </child>
-
              <child>
                <widget class="GtkSeparatorToolItem" id="separatortoolitem7">
                  <property name="visible">True</property>
-                 <property name="draw">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
                </widget>
                <packing>
                  <property name="expand">False</property>
                  <property name="homogeneous">False</property>
                </packing>
              </child>
-
              <child>
                <widget class="GtkToggleToolButton" 
id="togglebutton-value-labels">
                  <property name="visible">True</property>
                  <property name="tooltip" translatable="yes">Value 
Labels</property>
-                  <property name="stock_id">pspp-value-labels</property>
-                 <property name="label" translatable="yes"></property>
                  <property name="use_underline">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
-                 <property name="active">False</property>
-                 <signal name="toggled" 
handler="on_togglebutton_value_labels_toggled" last_modification_time="Mon, 19 
Jun 2006 13:09:37 GMT"/>
+                    <property name="stock_id">pspp-value-labels</property>
+                    <signal name="toggled" 
handler="on_togglebutton_value_labels_toggled"/>
                </widget>
                <packing>
                  <property name="expand">False</property>
-                 <property name="homogeneous">True</property>
                </packing>
              </child>
-
              <child>
-               <widget class="GtkToolButton" id="toolbutton12">
+                  <widget class="GtkToolButton" id="button-use-sets">
                  <property name="visible">True</property>
                  <property name="sensitive">False</property>
                  <property name="tooltip" translatable="yes">Use 
Sets</property>
-                 <property name="label" translatable="yes"></property>
                  <property name="use_underline">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
                </widget>
                <packing>
                  <property name="expand">False</property>
-                 <property name="homogeneous">True</property>
                </packing>
              </child>
            </widget>
          </child>
        </widget>
        <packing>
-         <property name="padding">0</property>
          <property name="expand">False</property>
          <property name="fill">False</property>
+            <property name="position">1</property>
        </packing>
       </child>
-
       <child>
        <widget class="GtkNotebook" id="notebook">
          <property name="visible">True</property>
          <property name="can_focus">True</property>
-         <property name="show_tabs">True</property>
-         <property name="show_border">True</property>
          <property name="tab_pos">GTK_POS_BOTTOM</property>
          <property name="scrollable">True</property>
          <property name="enable_popup">True</property>
-
          <child>
            <widget class="GtkVBox" id="vbox3">
              <property name="visible">True</property>
-             <property name="homogeneous">False</property>
-             <property name="spacing">0</property>
-
              <child>
                <widget class="GtkTable" id="table2">
                  <property name="visible">True</property>
                  <property name="n_rows">1</property>
                  <property name="n_columns">2</property>
-                 <property name="homogeneous">False</property>
-                 <property name="row_spacing">0</property>
-                 <property name="column_spacing">0</property>
-
                  <child>
-                   <widget class="GtkEntry" id="entry4">
+                      <widget class="GtkEntry" id="cell_ref_entry">
                      <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="editable">True</property>
-                     <property name="visibility">True</property>
-                     <property name="max_length">0</property>
-                     <property name="text" translatable="yes"></property>
-                     <property name="has_frame">True</property>
-                     <property name="invisible_char">*</property>
-                     <property name="activates_default">False</property>
+                        <property name="sensitive">False</property>
+                        <property name="editable">False</property>
+                        <property name="width_chars">25</property>
                    </widget>
                    <packing>
-                     <property name="left_attach">1</property>
-                     <property name="right_attach">2</property>
-                     <property name="top_attach">0</property>
-                     <property name="bottom_attach">1</property>
+                        <property name="x_options">GTK_FILL</property>
                      <property name="y_options"></property>
                    </packing>
                  </child>
-
                  <child>
-                   <widget class="GtkEntry" id="cell_ref_entry">
+                      <widget class="GtkEntry" id="entry4">
                      <property name="visible">True</property>
-                     <property name="sensitive">False</property>
-                     <property name="editable">False</property>
-                     <property name="visibility">True</property>
-                     <property name="max_length">0</property>
-                     <property name="text" translatable="yes"></property>
-                     <property name="has_frame">True</property>
-                     <property name="invisible_char">*</property>
-                     <property name="activates_default">False</property>
-                     <property name="width_chars">25</property>
+                        <property name="can_focus">True</property>
                    </widget>
                    <packing>
-                     <property name="left_attach">0</property>
-                     <property name="right_attach">1</property>
-                     <property name="top_attach">0</property>
-                     <property name="bottom_attach">1</property>
-                     <property name="x_options">fill</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
                      <property name="y_options"></property>
                    </packing>
                  </child>
                </widget>
                <packing>
-                 <property name="padding">0</property>
                  <property name="expand">False</property>
                  <property name="fill">False</property>
                </packing>
              </child>
-
              <child>
                <widget class="GtkScrolledWindow" id="scrolledwindow1">
                  <property name="visible">True</property>
-                 <property 
name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                 <property 
name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                 <property name="shadow_type">GTK_SHADOW_NONE</property>
-                 <property 
name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
                  <child>
                    <widget class="Custom" id="data_sheet">
                      <property name="visible">True</property>
                      <property 
name="creation_function">psppire_data_sheet_create</property>
-                     <property name="int1">0</property>
-                     <property name="int2">0</property>
-                     <property name="last_modification_time">Sun, 30 Oct 2005 
08:53:47 GMT</property>
                    </widget>
                  </child>
                </widget>
                <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">True</property>
-                 <property name="fill">True</property>
+                    <property name="position">1</property>
                </packing>
              </child>
            </widget>
            <packing>
              <property name="tab_expand">False</property>
-             <property name="tab_fill">True</property>
            </packing>
          </child>
-
          <child>
            <widget class="GtkLabel" id="label1">
              <property name="visible">True</property>
              <property name="label" translatable="yes">Data View</property>
-             <property name="use_underline">False</property>
-             <property name="use_markup">False</property>
-             <property name="justify">GTK_JUSTIFY_LEFT</property>
-             <property name="wrap">False</property>
-             <property name="selectable">False</property>
-             <property name="xalign">0.5</property>
-             <property name="yalign">0.5</property>
-             <property name="xpad">0</property>
-             <property name="ypad">0</property>
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-             <property name="width_chars">-1</property>
-             <property name="single_line_mode">False</property>
-             <property name="angle">0</property>
            </widget>
            <packing>
              <property name="type">tab</property>
+                <property name="tab_expand">False</property>
+                <property name="tab_fill">False</property>
            </packing>
          </child>
-
          <child>
            <widget class="GtkScrolledWindow" id="scrolledwindow2">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
-             <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-             <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-             <property name="shadow_type">GTK_SHADOW_NONE</property>
-             <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
              <child>
                <widget class="Custom" id="variable_sheet">
                  <property name="visible">True</property>
                  <property 
name="creation_function">psppire_variable_sheet_create</property>
-                 <property name="int1">0</property>
-                 <property name="int2">0</property>
-                 <property name="last_modification_time">Sun, 30 Oct 2005 
08:54:45 GMT</property>
                </widget>
              </child>
            </widget>
            <packing>
+                <property name="position">1</property>
              <property name="tab_expand">False</property>
-             <property name="tab_fill">True</property>
            </packing>
          </child>
-
          <child>
            <widget class="GtkLabel" id="label2">
              <property name="visible">True</property>
              <property name="label" translatable="yes">Variable View</property>
-             <property name="use_underline">False</property>
-             <property name="use_markup">False</property>
-             <property name="justify">GTK_JUSTIFY_LEFT</property>
-             <property name="wrap">False</property>
-             <property name="selectable">False</property>
-             <property name="xalign">0.5</property>
-             <property name="yalign">0.5</property>
-             <property name="xpad">0</property>
-             <property name="ypad">0</property>
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-             <property name="width_chars">-1</property>
-             <property name="single_line_mode">False</property>
-             <property name="angle">0</property>
            </widget>
            <packing>
              <property name="type">tab</property>
+                <property name="position">1</property>
+                <property name="tab_expand">False</property>
+                <property name="tab_fill">False</property>
            </packing>
          </child>
        </widget>
        <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
+            <property name="position">2</property>
        </packing>
       </child>
-
       <child>
        <placeholder/>
       </child>
-
       <child>
        <widget class="GtkHBox" id="status-bar">
-         <property name="border_width">5</property>
          <property name="visible">True</property>
-         <property name="homogeneous">False</property>
+            <property name="border_width">5</property>
          <property name="spacing">5</property>
-
          <child>
            <widget class="GtkFrame" id="frame2">
              <property name="visible">True</property>
              <property name="label_xalign">0</property>
-             <property name="label_yalign">0.5</property>
              <property name="shadow_type">GTK_SHADOW_IN</property>
-
              <child>
                <widget class="GtkEventBox" id="eventbox1">
                  <property name="visible">True</property>
                  <property name="tooltip" translatable="yes">Information 
Area</property>
-                 <property name="visible_window">True</property>
-                 <property name="above_child">False</property>
-
                  <child>
                    <widget class="GtkLabel" id="information-area">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes"></property>
-                     <property name="use_underline">False</property>
-                     <property name="use_markup">False</property>
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap">False</property>
-                     <property name="selectable">False</property>
-                     <property name="xalign">0.5</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">0</property>
-                     <property name="ypad">0</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                     <property name="width_chars">-1</property>
                      <property name="single_line_mode">True</property>
-                     <property name="angle">0</property>
                    </widget>
                  </child>
                </widget>
              </child>
            </widget>
-           <packing>
-             <property name="padding">0</property>
-             <property name="expand">True</property>
-             <property name="fill">True</property>
-           </packing>
          </child>
-
          <child>
            <widget class="GtkFrame" id="frame3">
              <property name="visible">True</property>
              <property name="label_xalign">0</property>
-             <property name="label_yalign">0.5</property>
              <property name="shadow_type">GTK_SHADOW_IN</property>
-
              <child>
                <widget class="GtkEventBox" id="eventbox2">
                  <property name="visible">True</property>
                  <property name="tooltip" translatable="yes">Processor 
Area</property>
-                 <property name="visible_window">True</property>
-                 <property name="above_child">False</property>
-
                  <child>
                    <widget class="GtkLabel" id="processor-area">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes"></property>
-                     <property name="use_underline">False</property>
-                     <property name="use_markup">False</property>
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap">False</property>
-                     <property name="selectable">False</property>
-                     <property name="xalign">0.5</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">0</property>
-                     <property name="ypad">0</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
                      <property name="width_chars">35</property>
                      <property name="single_line_mode">True</property>
-                     <property name="angle">0</property>
                    </widget>
                  </child>
                </widget>
              </child>
            </widget>
            <packing>
-             <property name="padding">0</property>
              <property name="expand">False</property>
              <property name="fill">False</property>
+                <property name="position">1</property>
            </packing>
          </child>
-
          <child>
            <widget class="GtkFrame" id="frame4">
              <property name="visible">True</property>
              <property name="label_xalign">0</property>
-             <property name="label_yalign">0.5</property>
              <property name="shadow_type">GTK_SHADOW_IN</property>
-
              <child>
                <widget class="GtkEventBox" id="eventbox3">
                  <property name="visible">True</property>
                  <property name="tooltip" translatable="yes">OMS 
Area</property>
-                 <property name="visible_window">True</property>
-                 <property name="above_child">False</property>
-
                  <child>
                    <widget class="GtkLabel" id="oms-area">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes"></property>
-                     <property name="use_underline">False</property>
-                     <property name="use_markup">False</property>
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap">False</property>
-                     <property name="selectable">False</property>
-                     <property name="xalign">0.5</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">0</property>
-                     <property name="ypad">0</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
                      <property name="width_chars">3</property>
                      <property name="single_line_mode">True</property>
-                     <property name="angle">0</property>
                    </widget>
                  </child>
                </widget>
              </child>
            </widget>
            <packing>
-             <property name="padding">0</property>
              <property name="expand">False</property>
              <property name="fill">False</property>
+                <property name="position">2</property>
            </packing>
          </child>
-
          <child>
            <widget class="GtkFrame" id="frame5">
              <property name="visible">True</property>
              <property name="label_xalign">0</property>
-             <property name="label_yalign">0.5</property>
              <property name="shadow_type">GTK_SHADOW_IN</property>
-
              <child>
                <widget class="GtkEventBox" id="eventbox4">
                  <property name="visible">True</property>
                  <property name="tooltip" translatable="yes">Case Counter 
Area</property>
-                 <property name="visible_window">True</property>
-                 <property name="above_child">False</property>
-
                  <child>
                    <widget class="GtkLabel" id="case-counter-area">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes"></property>
-                     <property name="use_underline">False</property>
-                     <property name="use_markup">False</property>
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap">False</property>
-                     <property name="selectable">False</property>
-                     <property name="xalign">0.5</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">0</property>
-                     <property name="ypad">0</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
                      <property name="width_chars">10</property>
                      <property name="single_line_mode">True</property>
-                     <property name="angle">0</property>
                    </widget>
                  </child>
                </widget>
              </child>
            </widget>
            <packing>
-             <property name="padding">0</property>
              <property name="expand">False</property>
              <property name="fill">False</property>
+                <property name="position">3</property>
            </packing>
          </child>
-
          <child>
            <widget class="GtkFrame" id="frame6">
              <property name="visible">True</property>
              <property name="label_xalign">0</property>
-             <property name="label_yalign">0.5</property>
              <property name="shadow_type">GTK_SHADOW_IN</property>
-
              <child>
                <widget class="GtkEventBox" id="eventbox5">
                  <property name="visible">True</property>
                  <property name="tooltip" translatable="yes">Filter Use Status 
Area</property>
-                 <property name="visible_window">True</property>
-                 <property name="above_child">False</property>
-
                  <child>
                    <widget class="GtkLabel" id="filter-use-status-area">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes"></property>
-                     <property name="use_underline">False</property>
-                     <property name="use_markup">False</property>
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap">False</property>
-                     <property name="selectable">False</property>
-                     <property name="xalign">0.5</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">0</property>
-                     <property name="ypad">0</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
                      <property name="width_chars">10</property>
                      <property name="single_line_mode">True</property>
-                     <property name="angle">0</property>
                    </widget>
                  </child>
                </widget>
              </child>
            </widget>
            <packing>
-             <property name="padding">0</property>
              <property name="expand">False</property>
              <property name="fill">False</property>
+                <property name="position">4</property>
            </packing>
          </child>
-
          <child>
            <widget class="GtkFrame" id="frame7">
              <property name="visible">True</property>
              <property name="label_xalign">0</property>
-             <property name="label_yalign">0.5</property>
              <property name="shadow_type">GTK_SHADOW_IN</property>
-
              <child>
                <widget class="GtkEventBox" id="eventbox6">
                  <property name="visible">True</property>
                  <property name="tooltip" translatable="yes">Weight Status 
Area</property>
-                 <property name="visible_window">True</property>
-                 <property name="above_child">False</property>
-
                  <child>
                    <widget class="GtkLabel" id="weight-status-area">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes"></property>
-                     <property name="use_underline">False</property>
-                     <property name="use_markup">False</property>
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap">False</property>
-                     <property name="selectable">False</property>
-                     <property name="xalign">0.5</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">0</property>
-                     <property name="ypad">0</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                        <property 
name="ellipsize">PANGO_ELLIPSIZE_START</property>
                      <property name="width_chars">10</property>
                      <property name="single_line_mode">True</property>
-                     <property name="angle">0</property>
                    </widget>
                  </child>
                </widget>
              </child>
            </widget>
            <packing>
-             <property name="padding">0</property>
              <property name="expand">False</property>
              <property name="fill">False</property>
+                <property name="position">5</property>
            </packing>
          </child>
-
          <child>
            <widget class="GtkFrame" id="frame8">
              <property name="visible">True</property>
              <property name="label_xalign">0</property>
-             <property name="label_yalign">0.5</property>
              <property name="shadow_type">GTK_SHADOW_IN</property>
-
              <child>
                <widget class="GtkEventBox" id="eventbox7">
                  <property name="visible">True</property>
                  <property name="tooltip" translatable="yes">Split File Status 
Area</property>
-                 <property name="visible_window">True</property>
-                 <property name="above_child">False</property>
-
                  <child>
                    <widget class="GtkLabel" id="split-file-status-area">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes"></property>
-                     <property name="use_underline">False</property>
-                     <property name="use_markup">False</property>
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap">False</property>
-                     <property name="selectable">False</property>
-                     <property name="xalign">0.5</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">0</property>
-                     <property name="ypad">0</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
                      <property name="width_chars">10</property>
                      <property name="single_line_mode">True</property>
-                     <property name="angle">0</property>
                    </widget>
                  </child>
                </widget>
              </child>
            </widget>
            <packing>
-             <property name="padding">0</property>
              <property name="expand">False</property>
              <property name="fill">False</property>
+                <property name="position">6</property>
            </packing>
          </child>
        </widget>
        <packing>
-         <property name="padding">0</property>
          <property name="expand">False</property>
          <property name="fill">False</property>
+            <property name="position">4</property>
        </packing>
       </child>
     </widget>
   </child>
-</widget>
-
-<widget class="GtkWindow" id="var_type_dialog">
+  </widget>
+  <widget class="GtkWindow" id="var_type_dialog">
   <property name="border_width">6</property>
   <property name="title" translatable="yes">Variable Type</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
+    <property name="resizable">False</property>
   <property name="modal">True</property>
   <property name="default_width">485</property>
-  <property name="resizable">False</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="skip_taskbar_hint">True</property>
   <property name="skip_pager_hint">True</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-
   <child>
     <widget class="GtkHBox" id="hbox1">
-      <property name="border_width">5</property>
       <property name="visible">True</property>
-      <property name="homogeneous">False</property>
+        <property name="border_width">5</property>
       <property name="spacing">5</property>
-
       <child>
        <widget class="GtkVBox" id="vbox2">
-         <property name="border_width">13</property>
          <property name="visible">True</property>
+            <property name="border_width">13</property>
          <property name="homogeneous">True</property>
-         <property name="spacing">0</property>
-
          <child>
            <widget class="GtkRadioButton" id="radiobutton1">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="label" translatable="yes">Numeric</property>
              <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
              <property name="active">True</property>
-             <property name="inconsistent">False</property>
              <property name="draw_indicator">True</property>
            </widget>
            <packing>
-             <property name="padding">0</property>
              <property name="expand">False</property>
              <property name="fill">False</property>
            </packing>
          </child>
-
          <child>
            <widget class="GtkRadioButton" id="radiobutton2">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="label" translatable="yes">Comma</property>
              <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="active">False</property>
-             <property name="inconsistent">False</property>
              <property name="draw_indicator">True</property>
              <property name="group">radiobutton1</property>
            </widget>
            <packing>
-             <property name="padding">0</property>
              <property name="expand">False</property>
              <property name="fill">False</property>
+                <property name="position">1</property>
            </packing>
          </child>
-
          <child>
            <widget class="GtkRadioButton" id="radiobutton3">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="label" translatable="yes">Dot</property>
              <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="active">False</property>
-             <property name="inconsistent">False</property>
              <property name="draw_indicator">True</property>
              <property name="group">radiobutton1</property>
            </widget>
            <packing>
-             <property name="padding">0</property>
              <property name="expand">False</property>
              <property name="fill">False</property>
+                <property name="position">2</property>
            </packing>
          </child>
-
          <child>
            <widget class="GtkRadioButton" id="radiobutton4">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="label" translatable="yes">Scientific 
notation</property>
              <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="active">False</property>
-             <property name="inconsistent">False</property>
              <property name="draw_indicator">True</property>
              <property name="group">radiobutton1</property>
            </widget>
            <packing>
-             <property name="padding">0</property>
              <property name="expand">False</property>
              <property name="fill">False</property>
+                <property name="position">3</property>
            </packing>
          </child>
-
          <child>
            <widget class="GtkRadioButton" id="radiobutton5">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="label" translatable="yes">Date</property>
              <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="active">False</property>
-             <property name="inconsistent">False</property>
              <property name="draw_indicator">True</property>
              <property name="group">radiobutton1</property>
            </widget>
            <packing>
-             <property name="padding">0</property>
              <property name="expand">False</property>
              <property name="fill">False</property>
+                <property name="position">4</property>
            </packing>
          </child>
-
          <child>
            <widget class="GtkRadioButton" id="radiobutton6">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="label" translatable="yes">Dollar</property>
              <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="active">False</property>
-             <property name="inconsistent">False</property>
              <property name="draw_indicator">True</property>
              <property name="group">radiobutton1</property>
            </widget>
            <packing>
-             <property name="padding">0</property>
              <property name="expand">False</property>
              <property name="fill">False</property>
+                <property name="position">5</property>
            </packing>
          </child>
-
          <child>
            <widget class="GtkRadioButton" id="radiobutton7">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="label" translatable="yes">Custom 
currency</property>
              <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="active">False</property>
-             <property name="inconsistent">False</property>
              <property name="draw_indicator">True</property>
              <property name="group">radiobutton1</property>
            </widget>
            <packing>
-             <property name="padding">0</property>
              <property name="expand">False</property>
              <property name="fill">False</property>
+                <property name="position">6</property>
            </packing>
          </child>
-
          <child>
            <widget class="GtkRadioButton" id="radiobutton8">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="label" translatable="yes">String</property>
              <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="active">False</property>
-             <property name="inconsistent">False</property>
              <property name="draw_indicator">True</property>
              <property name="group">radiobutton1</property>
            </widget>
            <packing>
-             <property name="padding">0</property>
              <property name="expand">False</property>
              <property name="fill">False</property>
+                <property name="position">7</property>
            </packing>
          </child>
        </widget>
        <packing>
-         <property name="padding">0</property>
          <property name="expand">False</property>
          <property name="fill">False</property>
        </packing>
       </child>
-
       <child>
        <widget class="GtkVBox" id="middle_box">
          <property name="visible">True</property>
-         <property name="homogeneous">False</property>
          <property name="spacing">10</property>
-
          <child>
            <widget class="GtkScrolledWindow" id="scrolledwindow4">
              <property name="width_request">20</property>
              <property name="height_request">194</property>
              <property name="can_focus">True</property>
              <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-             <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
              <property name="shadow_type">GTK_SHADOW_IN</property>
-             <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
              <child>
                <widget class="GtkTreeView" id="date_format_list_view">
                  <property name="visible">True</property>
                  <property name="can_focus">True</property>
                  <property name="headers_visible">False</property>
-                 <property name="rules_hint">False</property>
-                 <property name="reorderable">False</property>
-                 <property name="enable_search">True</property>
-                 <property name="fixed_height_mode">False</property>
-                 <property name="hover_selection">False</property>
-                 <property name="hover_expand">False</property>
                </widget>
              </child>
            </widget>
            <packing>
-             <property name="padding">0</property>
              <property name="expand">False</property>
              <property name="fill">False</property>
            </packing>
          </child>
-
          <child>
            <widget class="GtkHBox" id="custom_currency_hbox">
-             <property name="homogeneous">False</property>
              <property name="spacing">15</property>
-
              <child>
                <widget class="GtkScrolledWindow" id="scrolledwindow5">
                  <property name="width_request">1</property>
@@ -1625,125 +1134,51 @@
                  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
                  <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
                  <property name="shadow_type">GTK_SHADOW_IN</property>
-                 <property 
name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
                  <child>
                    <widget class="GtkTreeView" id="custom_treeview">
                      <property name="visible">True</property>
                      <property name="can_focus">True</property>
                      <property name="headers_visible">False</property>
-                     <property name="rules_hint">False</property>
-                     <property name="reorderable">False</property>
-                     <property name="enable_search">True</property>
-                     <property name="fixed_height_mode">False</property>
-                     <property name="hover_selection">False</property>
-                     <property name="hover_expand">False</property>
                    </widget>
                  </child>
                </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">True</property>
-                 <property name="fill">True</property>
-               </packing>
              </child>
-
              <child>
                <widget class="GtkFrame" id="Sample">
                  <property name="visible">True</property>
                  <property name="label_xalign">0</property>
-                 <property name="label_yalign">0.5</property>
-                 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
                  <child>
                    <widget class="GtkAlignment" id="alignment2">
                      <property name="visible">True</property>
-                     <property name="xalign">0.5</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xscale">1</property>
-                     <property name="yscale">1</property>
-                     <property name="top_padding">0</property>
-                     <property name="bottom_padding">0</property>
                      <property name="left_padding">12</property>
-                     <property name="right_padding">0</property>
-
                      <child>
                        <widget class="GtkVBox" id="vbox10">
                          <property name="visible">True</property>
                          <property name="homogeneous">True</property>
-                         <property name="spacing">0</property>
-
                          <child>
                            <widget class="GtkLabel" id="psample_label">
                              <property name="visible">True</property>
                              <property name="label" 
translatable="yes">positive</property>
-                             <property name="use_underline">False</property>
-                             <property name="use_markup">False</property>
-                             <property 
name="justify">GTK_JUSTIFY_LEFT</property>
-                             <property name="wrap">False</property>
-                             <property name="selectable">False</property>
-                             <property name="xalign">0.5</property>
-                             <property name="yalign">0.5</property>
-                             <property name="xpad">0</property>
-                             <property name="ypad">0</property>
-                             <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                             <property name="width_chars">-1</property>
-                             <property name="single_line_mode">False</property>
-                             <property name="angle">0</property>
-                           </widget>
-                           <packing>
-                             <property name="padding">0</property>
-                             <property name="expand">True</property>
-                             <property name="fill">True</property>
-                           </packing>
+                              </widget>
                          </child>
-
                          <child>
                            <widget class="GtkLabel" id="nsample_label">
                              <property name="visible">True</property>
                              <property name="label" 
translatable="yes">negative</property>
-                             <property name="use_underline">False</property>
-                             <property name="use_markup">False</property>
-                             <property 
name="justify">GTK_JUSTIFY_LEFT</property>
-                             <property name="wrap">False</property>
-                             <property name="selectable">False</property>
-                             <property name="xalign">0.5</property>
-                             <property name="yalign">0.5</property>
-                             <property name="xpad">0</property>
-                             <property name="ypad">0</property>
-                             <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                             <property name="width_chars">-1</property>
-                             <property name="single_line_mode">False</property>
-                             <property name="angle">0</property>
                            </widget>
                            <packing>
-                             <property name="padding">0</property>
-                             <property name="expand">True</property>
-                             <property name="fill">True</property>
+                                <property name="position">1</property>
                            </packing>
                          </child>
                        </widget>
                      </child>
                    </widget>
                  </child>
-
                  <child>
                    <widget class="GtkLabel" id="label13">
                      <property name="visible">True</property>
                      <property name="label" 
translatable="yes">Sample</property>
-                     <property name="use_underline">False</property>
                      <property name="use_markup">True</property>
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap">False</property>
-                     <property name="selectable">False</property>
-                     <property name="xalign">0.5</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">0</property>
-                     <property name="ypad">0</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                     <property name="width_chars">-1</property>
-                     <property name="single_line_mode">False</property>
-                     <property name="angle">0</property>
                    </widget>
                    <packing>
                      <property name="type">label_item</property>
@@ -1751,49 +1186,32 @@
                  </child>
                </widget>
                <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">True</property>
-                 <property name="fill">True</property>
                  <property name="pack_type">GTK_PACK_END</property>
+                    <property name="position">1</property>
                </packing>
              </child>
            </widget>
            <packing>
-             <property name="padding">0</property>
-             <property name="expand">True</property>
-             <property name="fill">True</property>
+                <property name="position">1</property>
            </packing>
          </child>
-
          <child>
            <widget class="GtkScrolledWindow" id="dollar_window">
              <property name="can_focus">True</property>
              <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-             <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
              <property name="shadow_type">GTK_SHADOW_IN</property>
-             <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
              <child>
                <widget class="GtkTreeView" id="dollar_treeview">
                  <property name="visible">True</property>
                  <property name="can_focus">True</property>
                  <property name="headers_visible">False</property>
-                 <property name="rules_hint">False</property>
-                 <property name="reorderable">False</property>
-                 <property name="enable_search">True</property>
-                 <property name="fixed_height_mode">False</property>
-                 <property name="hover_selection">False</property>
-                 <property name="hover_expand">False</property>
                </widget>
              </child>
            </widget>
            <packing>
-             <property name="padding">0</property>
-             <property name="expand">True</property>
-             <property name="fill">True</property>
+                <property name="position">2</property>
            </packing>
          </child>
-
          <child>
            <widget class="GtkTable" id="width_decimals">
              <property name="width_request">100</property>
@@ -1801,71 +1219,34 @@
              <property name="visible">True</property>
              <property name="n_rows">2</property>
              <property name="n_columns">2</property>
-             <property name="homogeneous">False</property>
-             <property name="row_spacing">1</property>
              <property name="column_spacing">2</property>
-
+                <property name="row_spacing">1</property>
              <child>
-               <widget class="GtkLabel" id="decimals_label">
+                  <widget class="GtkHBox" id="hbox2">
                  <property name="visible">True</property>
-                 <property name="label" translatable="yes">Decimal 
Places:</property>
-                 <property name="use_underline">False</property>
-                 <property name="use_markup">False</property>
+                    <child>
+                      <widget class="GtkLabel" id="width_label">
+                        <property name="visible">True</property>
+                        <property name="label" 
translatable="yes">Width:</property>
                  <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                 <property name="wrap">False</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                 <property name="width_chars">-1</property>
-                 <property name="single_line_mode">False</property>
-                 <property name="angle">0</property>
                </widget>
                <packing>
-                 <property name="left_attach">0</property>
-                 <property name="right_attach">1</property>
-                 <property name="top_attach">1</property>
-                 <property name="bottom_attach">2</property>
-                 <property name="x_options">fill</property>
-                 <property name="y_options"></property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="pack_type">GTK_PACK_END</property>
                </packing>
              </child>
-
-             <child>
-               <widget class="GtkEntry" id="width_entry">
-                 <property name="width_request">25</property>
-                 <property name="can_focus">True</property>
-                 <property name="editable">True</property>
-                 <property name="visibility">True</property>
-                 <property name="max_length">0</property>
-                 <property name="text" translatable="yes"></property>
-                 <property name="has_frame">True</property>
-                 <property name="invisible_char">*</property>
-                 <property name="activates_default">False</property>
                </widget>
                <packing>
-                 <property name="left_attach">1</property>
-                 <property name="right_attach">2</property>
-                 <property name="top_attach">0</property>
-                 <property name="bottom_attach">1</property>
-                 <property name="y_options"></property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options">GTK_FILL</property>
                </packing>
              </child>
-
              <child>
                <widget class="GtkEntry" id="decimals_entry">
                  <property name="width_request">25</property>
                  <property name="visible">True</property>
                  <property name="can_focus">True</property>
-                 <property name="editable">True</property>
-                 <property name="visibility">True</property>
-                 <property name="max_length">0</property>
-                 <property name="text" translatable="yes"></property>
-                 <property name="has_frame">True</property>
-                 <property name="invisible_char">*</property>
-                 <property name="activates_default">False</property>
                </widget>
                <packing>
                  <property name="left_attach">1</property>
@@ -1875,299 +1256,175 @@
                  <property name="y_options"></property>
                </packing>
              </child>
-
-             <child>
-               <widget class="GtkHBox" id="hbox2">
-                 <property name="visible">True</property>
-                 <property name="homogeneous">False</property>
-                 <property name="spacing">0</property>
-
                  <child>
-                   <widget class="GtkLabel" id="width_label">
-                     <property name="visible">True</property>
-                     <property name="label" 
translatable="yes">Width:</property>
-                     <property name="use_underline">False</property>
-                     <property name="use_markup">False</property>
-                     <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                     <property name="wrap">False</property>
-                     <property name="selectable">False</property>
-                     <property name="xalign">0.5</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">0</property>
-                     <property name="ypad">0</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                     <property name="width_chars">-1</property>
-                     <property name="single_line_mode">False</property>
-                     <property name="angle">0</property>
+                  <widget class="GtkEntry" id="width_entry">
+                    <property name="width_request">25</property>
+                    <property name="can_focus">True</property>
                    </widget>
                    <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
-                     <property name="pack_type">GTK_PACK_END</property>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="y_options"></property>
                    </packing>
                  </child>
+                <child>
+                  <widget class="GtkLabel" id="decimals_label">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Decimal 
Places:</property>
+                    <property name="justify">GTK_JUSTIFY_RIGHT</property>
                </widget>
                <packing>
-                 <property name="left_attach">0</property>
-                 <property name="right_attach">1</property>
-                 <property name="top_attach">0</property>
-                 <property name="bottom_attach">1</property>
-                 <property name="x_options">fill</property>
-                 <property name="y_options">fill</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
                </packing>
              </child>
            </widget>
            <packing>
-             <property name="padding">0</property>
-             <property name="expand">True</property>
-             <property name="fill">True</property>
+                <property name="position">3</property>
            </packing>
          </child>
        </widget>
        <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
          <property name="fill">False</property>
+            <property name="position">1</property>
        </packing>
       </child>
-
       <child>
        <widget class="GtkVButtonBox" id="vbuttonbox6">
          <property name="visible">True</property>
-         <property name="layout_style">GTK_BUTTONBOX_START</property>
          <property name="spacing">5</property>
-
+            <property name="layout_style">GTK_BUTTONBOX_START</property>
          <child>
            <widget class="GtkButton" id="var_type_ok">
              <property name="visible">True</property>
-             <property name="can_default">True</property>
              <property name="can_focus">True</property>
+                <property name="can_default">True</property>
              <property name="label">gtk-ok</property>
              <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
            </widget>
          </child>
-
          <child>
            <widget class="GtkButton" id="var_type_cancel">
              <property name="visible">True</property>
-             <property name="can_default">True</property>
              <property name="can_focus">True</property>
+                <property name="can_default">True</property>
              <property name="label">gtk-cancel</property>
              <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="on_var_type_cancel_clicked" 
object="var_type_dialog" last_modification_time="Mon, 31 Oct 2005 09:49:33 
GMT"/>
+                <signal name="clicked" handler="on_var_type_cancel_clicked" 
object="var_type_dialog"/>
            </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
          </child>
-
          <child>
            <widget class="GtkButton" id="help_button_variable_type">
              <property name="visible">True</property>
-             <property name="can_default">True</property>
              <property name="can_focus">True</property>
+                <property name="can_default">True</property>
              <property name="label">gtk-help</property>
              <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
            </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
          </child>
        </widget>
        <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
+            <property name="position">2</property>
        </packing>
       </child>
     </widget>
   </child>
-</widget>
-
-<widget class="GtkWindow" id="val_labs_dialog">
+  </widget>
+  <widget class="GtkWindow" id="val_labs_dialog">
   <property name="title" translatable="yes">Value Labels</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">True</property>
   <property name="resizable">False</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
+    <property name="modal">True</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="skip_taskbar_hint">True</property>
   <property name="skip_pager_hint">True</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-
   <child>
     <widget class="GtkHBox" id="hbox3">
-      <property name="border_width">5</property>
       <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
+        <property name="border_width">5</property>
       <child>
        <widget class="GtkFrame" id="frame1">
          <property name="visible">True</property>
          <property name="label_xalign">0</property>
-         <property name="label_yalign">0.5</property>
-         <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
          <child>
            <widget class="GtkAlignment" id="alignment1">
-             <property name="border_width">8</property>
              <property name="visible">True</property>
-             <property name="xalign">0.5</property>
-             <property name="yalign">0.5</property>
-             <property name="xscale">1</property>
-             <property name="yscale">1</property>
-             <property name="top_padding">0</property>
-             <property name="bottom_padding">0</property>
+                <property name="border_width">8</property>
              <property name="left_padding">12</property>
-             <property name="right_padding">0</property>
-
              <child>
                <widget class="GtkTable" id="table3">
                  <property name="visible">True</property>
                  <property name="n_rows">2</property>
                  <property name="n_columns">2</property>
-                 <property name="homogeneous">False</property>
                  <property name="row_spacing">5</property>
-                 <property name="column_spacing">0</property>
-
                  <child>
-                   <widget class="GtkVButtonBox" id="vbuttonbox2">
-                     <property name="border_width">5</property>
-                     <property name="visible">True</property>
-                     <property 
name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
-                     <property name="spacing">0</property>
-
-                     <child>
-                       <widget class="GtkButton" id="val_labs_add">
-                         <property name="visible">True</property>
-                         <property name="sensitive">False</property>
-                         <property name="can_default">True</property>
-                         <property name="can_focus">True</property>
-                         <property name="label">gtk-add</property>
-                         <property name="use_stock">True</property>
-                         <property name="relief">GTK_RELIEF_NORMAL</property>
-                         <property name="focus_on_click">True</property>
-                       </widget>
-                     </child>
-
-                     <child>
-                       <widget class="GtkButton" id="val_labs_change">
+                      <widget class="GtkScrolledWindow" id="scrolledwindow3">
                          <property name="visible">True</property>
-                         <property name="sensitive">False</property>
-                         <property name="can_default">True</property>
                          <property name="can_focus">True</property>
-                         <property name="label">gtk-apply</property>
-                         <property name="use_stock">True</property>
-                         <property name="relief">GTK_RELIEF_NORMAL</property>
-                         <property name="focus_on_click">True</property>
-                       </widget>
-                     </child>
-
+                        <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="val_labs_remove">
+                          <widget class="GtkTreeView" id="treeview1">
                          <property name="visible">True</property>
-                         <property name="sensitive">False</property>
-                         <property name="can_default">True</property>
                          <property name="can_focus">True</property>
-                         <property name="label">gtk-remove</property>
-                         <property name="use_stock">True</property>
-                         <property name="relief">GTK_RELIEF_NORMAL</property>
-                         <property name="focus_on_click">True</property>
+                            <property name="headers_visible">False</property>
+                            <property name="enable_search">False</property>
                        </widget>
                      </child>
                    </widget>
                    <packing>
-                     <property name="left_attach">0</property>
-                     <property name="right_attach">1</property>
+                        <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="x_options">fill</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options">GTK_FILL</property>
                    </packing>
                  </child>
-
                  <child>
                    <widget class="GtkTable" id="table4">
-                     <property name="border_width">5</property>
                      <property name="visible">True</property>
+                        <property name="border_width">5</property>
                      <property name="n_rows">2</property>
                      <property name="n_columns">2</property>
-                     <property name="homogeneous">False</property>
-                     <property name="row_spacing">4</property>
                      <property name="column_spacing">5</property>
-
+                        <property name="row_spacing">4</property>
                      <child>
-                       <widget class="GtkLabel" id="label5">
+                          <widget class="GtkHBox" id="hbox4">
                          <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">Value:</property>
-                         <property name="use_underline">False</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
+                            <child>
+                              <widget class="GtkEntry" id="value_entry">
+                                <property name="width_request">85</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
                        </widget>
                        <packing>
-                         <property name="left_attach">0</property>
-                         <property name="right_attach">1</property>
-                         <property name="top_attach">0</property>
-                         <property name="bottom_attach">1</property>
-                         <property name="x_options">fill</property>
-                         <property name="y_options"></property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">1</property>
                        </packing>
                      </child>
-
-                     <child>
-                       <widget class="GtkLabel" id="label6">
-                         <property name="visible">True</property>
-                         <property name="label" translatable="yes">Value 
Label:</property>
-                         <property name="use_underline">False</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
                        </widget>
                        <packing>
-                         <property name="left_attach">0</property>
-                         <property name="right_attach">1</property>
-                         <property name="top_attach">1</property>
-                         <property name="bottom_attach">2</property>
-                         <property name="x_options">fill</property>
-                         <property name="y_options"></property>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
                        </packing>
                      </child>
-
                      <child>
                        <widget class="GtkEntry" id="label_entry">
                          <property name="visible">True</property>
                          <property name="can_focus">True</property>
-                         <property name="editable">True</property>
-                         <property name="visibility">True</property>
-                         <property name="max_length">0</property>
-                         <property name="text" translatable="yes"></property>
-                         <property name="has_frame">True</property>
-                         <property name="invisible_char">*</property>
-                         <property name="activates_default">False</property>
                        </widget>
                        <packing>
                          <property name="left_attach">1</property>
@@ -2177,106 +1434,92 @@
                          <property name="y_options"></property>
                        </packing>
                      </child>
-
-                     <child>
-                       <widget class="GtkHBox" id="hbox4">
-                         <property name="visible">True</property>
-                         <property name="homogeneous">False</property>
-                         <property name="spacing">0</property>
-
                          <child>
-                           <widget class="GtkEntry" id="value_entry">
-                             <property name="width_request">85</property>
+                          <widget class="GtkLabel" id="label6">
                              <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="editable">True</property>
-                             <property name="visibility">True</property>
-                             <property name="max_length">0</property>
-                             <property name="text" 
translatable="yes"></property>
-                             <property name="has_frame">True</property>
-                             <property name="invisible_char">*</property>
-                             <property 
name="activates_default">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Value 
Label:</property>
                            </widget>
                            <packing>
-                             <property name="padding">1</property>
-                             <property name="expand">False</property>
-                             <property name="fill">False</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
                            </packing>
                          </child>
+                        <child>
+                          <widget class="GtkLabel" id="label5">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" 
translatable="yes">Value:</property>
                        </widget>
                        <packing>
-                         <property name="left_attach">1</property>
-                         <property name="right_attach">2</property>
-                         <property name="top_attach">0</property>
-                         <property name="bottom_attach">1</property>
-                         <property name="x_options">fill</property>
-                         <property name="y_options">fill</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
                        </packing>
                      </child>
                    </widget>
                    <packing>
-                     <property name="left_attach">0</property>
                      <property name="right_attach">2</property>
-                     <property name="top_attach">0</property>
-                     <property name="bottom_attach">1</property>
-                     <property name="x_options">fill</property>
+                        <property name="x_options">GTK_FILL</property>
                    </packing>
                  </child>
-
                  <child>
-                   <widget class="GtkScrolledWindow" id="scrolledwindow3">
+                      <widget class="GtkVButtonBox" id="vbuttonbox2">
                      <property name="visible">True</property>
-                     <property name="can_focus">True</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="window_placement">GTK_CORNER_TOP_LEFT</property>
-
+                        <property name="border_width">5</property>
                      <child>
-                       <widget class="GtkTreeView" id="treeview1">
+                          <widget class="GtkButton" id="val_labs_add">
                          <property name="visible">True</property>
+                            <property name="sensitive">False</property>
                          <property name="can_focus">True</property>
-                         <property name="headers_visible">False</property>
-                         <property name="rules_hint">False</property>
-                         <property name="reorderable">False</property>
-                         <property name="enable_search">False</property>
-                         <property name="fixed_height_mode">False</property>
-                         <property name="hover_selection">False</property>
-                         <property name="hover_expand">False</property>
+                            <property name="can_default">True</property>
+                            <property name="label">gtk-add</property>
+                            <property name="use_stock">True</property>
                        </widget>
                      </child>
+                        <child>
+                          <widget class="GtkButton" id="val_labs_change">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="can_default">True</property>
+                            <property name="label">gtk-apply</property>
+                            <property name="use_stock">True</property>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkButton" id="val_labs_remove">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="can_default">True</property>
+                            <property name="label">gtk-remove</property>
+                            <property name="use_stock">True</property>
+                          </widget>
+                          <packing>
+                            <property name="position">2</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="x_options">fill</property>
-                     <property name="y_options">fill</property>
+                        <property name="x_options">GTK_FILL</property>
                    </packing>
                  </child>
                </widget>
              </child>
            </widget>
          </child>
-
          <child>
            <widget class="GtkLabel" id="label7">
              <property name="visible">True</property>
              <property name="label" translatable="yes">Value Labels</property>
-             <property name="use_underline">False</property>
              <property name="use_markup">True</property>
-             <property name="justify">GTK_JUSTIFY_LEFT</property>
-             <property name="wrap">False</property>
-             <property name="selectable">False</property>
-             <property name="xalign">0.5</property>
-             <property name="yalign">0.5</property>
-             <property name="xpad">0</property>
-             <property name="ypad">0</property>
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-             <property name="width_chars">-1</property>
-             <property name="single_line_mode">False</property>
-             <property name="angle">0</property>
            </widget>
            <packing>
              <property name="type">label_item</property>
@@ -2285,831 +1528,572 @@
        </widget>
        <packing>
          <property name="padding">10</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
        </packing>
       </child>
-
       <child>
        <widget class="GtkVButtonBox" id="vbuttonbox3">
-         <property name="border_width">5</property>
          <property name="visible">True</property>
-         <property name="layout_style">GTK_BUTTONBOX_START</property>
+            <property name="border_width">5</property>
          <property name="spacing">5</property>
-
+            <property name="layout_style">GTK_BUTTONBOX_START</property>
          <child>
            <widget class="GtkButton" id="val_labs_ok">
              <property name="visible">True</property>
-             <property name="can_default">True</property>
              <property name="can_focus">True</property>
+                <property name="can_default">True</property>
              <property name="label">gtk-ok</property>
              <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="gtk_widget_hide" 
object="val_labs_dialog" last_modification_time="Fri, 25 Nov 2005 23:15:33 
GMT"/>
+                <signal name="clicked" handler="gtk_widget_hide" 
object="val_labs_dialog"/>
            </widget>
          </child>
-
          <child>
            <widget class="GtkButton" id="val_labs_cancel">
              <property name="visible">True</property>
-             <property name="can_default">True</property>
              <property name="can_focus">True</property>
+                <property name="can_default">True</property>
              <property name="label">gtk-cancel</property>
              <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="gtk_widget_hide" 
object="val_labs_dialog" last_modification_time="Fri, 25 Nov 2005 23:15:44 
GMT"/>
+                <signal name="clicked" handler="gtk_widget_hide" 
object="val_labs_dialog"/>
            </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
          </child>
-
          <child>
            <widget class="GtkButton" id="help_button_value_labels">
              <property name="visible">True</property>
-             <property name="can_default">True</property>
              <property name="can_focus">True</property>
+                <property name="can_default">True</property>
              <property name="label">gtk-help</property>
              <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
            </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
          </child>
        </widget>
        <packing>
-         <property name="padding">0</property>
          <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="GtkWindow" id="missing_values_dialog">
+  </widget>
+  <widget class="GtkWindow" id="missing_values_dialog">
   <property name="border_width">10</property>
   <property name="title" translatable="yes">Missing Values</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">True</property>
   <property name="resizable">False</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
+    <property name="modal">True</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="skip_taskbar_hint">True</property>
   <property name="skip_pager_hint">True</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-
   <child>
     <widget class="GtkTable" id="table6">
       <property name="visible">True</property>
       <property name="n_rows">2</property>
       <property name="n_columns">2</property>
-      <property name="homogeneous">False</property>
-      <property name="row_spacing">0</property>
-      <property name="column_spacing">0</property>
-
       <child>
-       <widget class="GtkVButtonBox" id="vbuttonbox5">
-         <property name="border_width">5</property>
+          <widget class="GtkVBox" id="vbox7">
          <property name="visible">True</property>
-         <property name="layout_style">GTK_BUTTONBOX_START</property>
-         <property name="spacing">5</property>
-
          <child>
-           <widget class="GtkButton" id="missing_val_ok">
+              <widget class="GtkRadioButton" id="range_missing">
              <property name="visible">True</property>
-             <property name="can_default">True</property>
              <property name="can_focus">True</property>
-             <property name="label">gtk-ok</property>
-             <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="gtk_widget_hide" 
object="val_labs_dialog" last_modification_time="Fri, 25 Nov 2005 23:15:33 
GMT"/>
+                <property name="label" translatable="yes">_Range plus one 
optional discrete missing value</property>
+                <property name="use_underline">True</property>
+                <property name="focus_on_click">False</property>
+                <property name="draw_indicator">True</property>
+                <property name="group">no_missing</property>
            </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
          </child>
-
          <child>
-           <widget class="GtkButton" id="missing_val_cancel">
+              <widget class="GtkVBox" id="vbox8">
              <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label">gtk-cancel</property>
-             <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="gtk_widget_hide" 
object="val_labs_dialog" last_modification_time="Fri, 25 Nov 2005 23:15:44 
GMT"/>
-           </widget>
-         </child>
-
+                <property name="spacing">5</property>
          <child>
-           <widget class="GtkButton" id="help_button_missing_values">
+                  <widget class="GtkHBox" id="hbox7">
              <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label">gtk-help</property>
-             <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-           </widget>
-         </child>
-       </widget>
-       <packing>
-         <property name="left_attach">1</property>
-         <property name="right_attach">2</property>
-         <property name="top_attach">0</property>
-         <property name="bottom_attach">1</property>
-       </packing>
-      </child>
-
       <child>
-       <widget class="GtkVBox" id="vbox5">
+                      <widget class="GtkHBox" id="hbox8">
          <property name="visible">True</property>
-         <property name="homogeneous">False</property>
-         <property name="spacing">12</property>
-
          <child>
-           <widget class="GtkRadioButton" id="no_missing">
+                          <widget class="GtkLabel" id="label11">
              <property name="visible">True</property>
-             <property name="can_focus">True</property>
-             <property name="label" translatable="yes">_No missing 
values</property>
+                            <property name="label" 
translatable="yes">_Low:</property>
              <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="active">True</property>
-             <property name="inconsistent">False</property>
-             <property name="draw_indicator">True</property>
+                            <property name="mnemonic_widget">mv-low</property>
            </widget>
            <packing>
-             <property name="padding">0</property>
              <property name="expand">False</property>
              <property name="fill">False</property>
+                            <property name="padding">20</property>
            </packing>
          </child>
-
-         <child>
-           <widget class="GtkVBox" id="vbox6">
-             <property name="visible">True</property>
-             <property name="homogeneous">False</property>
-             <property name="spacing">0</property>
-
              <child>
-               <widget class="GtkRadioButton" id="discrete_missing">
+                          <widget class="GtkEntry" id="mv-low">
+                            <property name="width_request">75</property>
                  <property name="visible">True</property>
                  <property name="can_focus">True</property>
-                 <property name="label" translatable="yes">_Discrete missing 
values</property>
-                 <property name="use_underline">True</property>
-                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                 <property name="focus_on_click">False</property>
-                 <property name="active">False</property>
-                 <property name="inconsistent">False</property>
-                 <property name="draw_indicator">True</property>
-                 <property name="group">no_missing</property>
                </widget>
                <packing>
-                 <property name="padding">0</property>
                  <property name="expand">False</property>
-                 <property name="fill">False</property>
+                            <property name="position">1</property>
                </packing>
              </child>
-
+                      </widget>
+                    </child>
              <child>
-               <widget class="GtkHBox" id="hbox10">
+                      <widget class="GtkHBox" id="hbox9">
                  <property name="visible">True</property>
-                 <property name="homogeneous">False</property>
-                 <property name="spacing">0</property>
-
                  <child>
-                   <widget class="GtkHBox" id="hbox5">
-                     <property name="border_width">5</property>
-                     <property name="visible">True</property>
-                     <property name="homogeneous">True</property>
-                     <property name="spacing">5</property>
-
-                     <child>
-                       <widget class="GtkEntry" id="mv0">
-                         <property name="width_request">75</property>
+                          <widget class="GtkLabel" id="label12">
                          <property name="visible">True</property>
-                         <property name="can_focus">True</property>
-                         <property name="editable">True</property>
-                         <property name="visibility">True</property>
-                         <property name="max_length">0</property>
-                         <property name="text" translatable="yes"></property>
-                         <property name="has_frame">True</property>
-                         <property name="invisible_char">*</property>
-                         <property name="activates_default">False</property>
+                            <property name="label" 
translatable="yes">_High:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">mv-high</property>
                        </widget>
                        <packing>
-                         <property name="padding">0</property>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
                        </packing>
                      </child>
-
                      <child>
-                       <widget class="GtkEntry" id="mv1">
+                          <widget class="GtkEntry" id="mv-high">
                          <property name="width_request">75</property>
                          <property name="visible">True</property>
                          <property name="can_focus">True</property>
-                         <property name="editable">True</property>
-                         <property name="visibility">True</property>
-                         <property name="max_length">0</property>
-                         <property name="text" translatable="yes"></property>
-                         <property name="has_frame">True</property>
-                         <property name="invisible_char">*</property>
-                         <property name="activates_default">False</property>
                        </widget>
                        <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
+                            <property name="padding">5</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
                          <property name="fill">False</property>
+                        <property name="padding">20</property>
+                        <property name="position">1</property>
                        </packing>
                      </child>
-
                      <child>
-                       <widget class="GtkEntry" id="mv2">
-                         <property name="width_request">75</property>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox6">
                          <property name="visible">True</property>
-                         <property name="can_focus">True</property>
-                         <property name="editable">True</property>
-                         <property name="visibility">True</property>
-                         <property name="max_length">0</property>
-                         <property name="text" translatable="yes"></property>
-                         <property name="has_frame">True</property>
-                         <property name="invisible_char">*</property>
-                         <property name="activates_default">False</property>
+                    <child>
+                      <widget class="GtkLabel" id="label10">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Di_screte 
value:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">mv-discrete</property>
                        </widget>
                        <packing>
-                         <property name="padding">0</property>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
+                        <property name="padding">20</property>
                        </packing>
                      </child>
+                    <child>
+                      <widget class="GtkEntry" id="mv-discrete">
+                        <property name="width_request">75</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
                    </widget>
                    <packing>
-                     <property name="padding">20</property>
-                     <property name="expand">True</property>
-                     <property name="fill">True</property>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
                    </packing>
                  </child>
                </widget>
                <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">True</property>
-                 <property name="fill">True</property>
+                    <property name="position">1</property>
                </packing>
              </child>
            </widget>
            <packing>
-             <property name="padding">0</property>
-             <property name="expand">False</property>
-             <property name="fill">False</property>
+                <property name="position">1</property>
            </packing>
          </child>
        </widget>
        <packing>
-         <property name="left_attach">0</property>
-         <property name="right_attach">1</property>
-         <property name="top_attach">0</property>
-         <property name="bottom_attach">1</property>
-         <property name="y_options">fill</property>
+            <property name="right_attach">2</property>
+            <property name="top_attach">1</property>
+            <property name="bottom_attach">2</property>
+            <property name="x_options">GTK_FILL</property>
        </packing>
       </child>
-
       <child>
-       <widget class="GtkVBox" id="vbox7">
+          <widget class="GtkVBox" id="vbox5">
          <property name="visible">True</property>
-         <property name="homogeneous">False</property>
-         <property name="spacing">0</property>
-
+            <property name="spacing">12</property>
          <child>
-           <widget class="GtkRadioButton" id="range_missing">
+              <widget class="GtkRadioButton" id="no_missing">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
-             <property name="label" translatable="yes">_Range plus one 
optional discrete missing value</property>
+                <property name="label" translatable="yes">_No missing 
values</property>
              <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">False</property>
-             <property name="active">False</property>
-             <property name="inconsistent">False</property>
+                <property name="active">True</property>
              <property name="draw_indicator">True</property>
-             <property name="group">no_missing</property>
            </widget>
            <packing>
-             <property name="padding">0</property>
              <property name="expand">False</property>
              <property name="fill">False</property>
            </packing>
          </child>
-
-         <child>
-           <widget class="GtkVBox" id="vbox8">
-             <property name="visible">True</property>
-             <property name="homogeneous">False</property>
-             <property name="spacing">5</property>
-
-             <child>
-               <widget class="GtkHBox" id="hbox7">
-                 <property name="visible">True</property>
-                 <property name="homogeneous">False</property>
-                 <property name="spacing">0</property>
-
                  <child>
-                   <widget class="GtkHBox" id="hbox8">
+              <widget class="GtkVBox" id="vbox6">
                      <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">0</property>
-
                      <child>
-                       <widget class="GtkLabel" id="label11">
+                  <widget class="GtkRadioButton" id="discrete_missing">
                          <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">_Low:</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">_Discrete 
missing values</property>
                          <property name="use_underline">True</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property name="mnemonic_widget">mv-low</property>
-                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
+                    <property name="focus_on_click">False</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">no_missing</property>
                        </widget>
                        <packing>
-                         <property name="padding">20</property>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
                        </packing>
                      </child>
-
                      <child>
-                       <widget class="GtkEntry" id="mv-low">
+                  <widget class="GtkHBox" id="hbox10">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox5">
+                        <property name="visible">True</property>
+                        <property name="border_width">5</property>
+                        <property name="spacing">5</property>
+                        <property name="homogeneous">True</property>
+                        <child>
+                          <widget class="GtkEntry" id="mv0">
                          <property name="width_request">75</property>
                          <property name="visible">True</property>
                          <property name="can_focus">True</property>
-                         <property name="editable">True</property>
-                         <property name="visibility">True</property>
-                         <property name="max_length">0</property>
-                         <property name="text" translatable="yes"></property>
-                         <property name="has_frame">True</property>
-                         <property name="invisible_char">*</property>
-                         <property name="activates_default">False</property>
                        </widget>
                        <packing>
-                         <property name="padding">0</property>
                          <property name="expand">False</property>
-                         <property name="fill">True</property>
-                       </packing>
-                     </child>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">True</property>
-                     <property name="fill">True</property>
+                            <property name="fill">False</property>
                    </packing>
                  </child>
-
                  <child>
-                   <widget class="GtkHBox" id="hbox9">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">0</property>
-
-                     <child>
-                       <widget class="GtkLabel" id="label12">
+                          <widget class="GtkEntry" id="mv1">
+                            <property name="width_request">75</property>
                          <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">_High:</property>
-                         <property name="use_underline">True</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property name="mnemonic_widget">mv-high</property>
-                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
+                            <property name="can_focus">True</property>
                        </widget>
                        <packing>
-                         <property name="padding">0</property>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
+                            <property name="position">1</property>
                        </packing>
                      </child>
-
                      <child>
-                       <widget class="GtkEntry" id="mv-high">
+                          <widget class="GtkEntry" id="mv2">
                          <property name="width_request">75</property>
                          <property name="visible">True</property>
                          <property name="can_focus">True</property>
-                         <property name="editable">True</property>
-                         <property name="visibility">True</property>
-                         <property name="max_length">0</property>
-                         <property name="text" translatable="yes"></property>
-                         <property name="has_frame">True</property>
-                         <property name="invisible_char">*</property>
-                         <property name="activates_default">False</property>
                        </widget>
                        <packing>
-                         <property name="padding">5</property>
-                         <property name="expand">True</property>
-                         <property name="fill">True</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
                        </packing>
                      </child>
                    </widget>
                    <packing>
                      <property name="padding">20</property>
-                     <property name="expand">True</property>
-                     <property name="fill">False</property>
                    </packing>
                  </child>
-
-                 <child>
-                   <placeholder/>
-                 </child>
-
-                 <child>
-                   <placeholder/>
-                 </child>
                </widget>
                <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">True</property>
-                 <property name="fill">True</property>
+                    <property name="position">1</property>
                </packing>
              </child>
-
-             <child>
-               <widget class="GtkHBox" id="hbox6">
-                 <property name="visible">True</property>
-                 <property name="homogeneous">False</property>
-                 <property name="spacing">0</property>
-
-                 <child>
-                   <widget class="GtkLabel" id="label10">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">Di_screte 
value:</property>
-                     <property name="use_underline">True</property>
-                     <property name="use_markup">False</property>
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap">False</property>
-                     <property name="selectable">False</property>
-                     <property name="xalign">0.5</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">0</property>
-                     <property name="ypad">0</property>
-                     <property name="mnemonic_widget">mv-discrete</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                     <property name="width_chars">-1</property>
-                     <property name="single_line_mode">False</property>
-                     <property name="angle">0</property>
                    </widget>
                    <packing>
-                     <property name="padding">20</property>
                      <property name="expand">False</property>
                      <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="y_options">GTK_FILL</property>
                    </packing>
                  </child>
-
                  <child>
-                   <widget class="GtkEntry" id="mv-discrete">
-                     <property name="width_request">75</property>
+          <widget class="GtkVButtonBox" id="vbuttonbox5">
+            <property name="visible">True</property>
+            <property name="border_width">5</property>
+            <property name="spacing">5</property>
+            <property name="layout_style">GTK_BUTTONBOX_START</property>
+            <child>
+              <widget class="GtkButton" id="missing_val_ok">
                      <property name="visible">True</property>
                      <property name="can_focus">True</property>
-                     <property name="editable">True</property>
-                     <property name="visibility">True</property>
-                     <property name="max_length">0</property>
-                     <property name="text" translatable="yes"></property>
-                     <property name="has_frame">True</property>
-                     <property name="invisible_char">*</property>
-                     <property name="activates_default">False</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-ok</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="gtk_widget_hide" 
object="val_labs_dialog"/>
                    </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">True</property>
-                   </packing>
                  </child>
+            <child>
+              <widget class="GtkButton" id="missing_val_cancel">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="gtk_widget_hide" 
object="val_labs_dialog"/>
                </widget>
                <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">True</property>
-                 <property name="fill">True</property>
+                <property name="position">1</property>
                </packing>
              </child>
+            <child>
+              <widget class="GtkButton" id="help_button_missing_values">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-help</property>
+                <property name="use_stock">True</property>
            </widget>
            <packing>
-             <property name="padding">0</property>
-             <property name="expand">True</property>
-             <property name="fill">True</property>
+                <property name="position">2</property>
            </packing>
          </child>
        </widget>
        <packing>
-         <property name="left_attach">0</property>
+            <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="x_options">fill</property>
        </packing>
       </child>
     </widget>
   </child>
-</widget>
-
-<widget class="GtkDialog" id="go_to_case_dialog">
+  </widget>
+  <widget class="GtkDialog" id="go_to_case_dialog">
   <property name="title" translatable="yes">Go To Case</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">True</property>
   <property name="resizable">False</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
+    <property name="modal">True</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="skip_taskbar_hint">True</property>
   <property name="skip_pager_hint">True</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
   <property name="has_separator">False</property>
-
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">
       <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-       <widget class="GtkHButtonBox" id="dialog-action_area1">
-         <property name="visible">True</property>
-         <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-         <child>
-           <widget class="GtkButton" id="button_go_to_case_ok">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label">gtk-ok</property>
-             <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="response_id">-5</property>
-           </widget>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">False</property>
-         <property name="fill">True</property>
-         <property name="pack_type">GTK_PACK_END</property>
-       </packing>
-      </child>
-
       <child>
        <widget class="GtkHBox" id="hbox11">
          <property name="visible">True</property>
-         <property name="homogeneous">False</property>
          <property name="spacing">3</property>
-
          <child>
            <widget class="GtkLabel" id="label14">
              <property name="visible">True</property>
              <property name="label" translatable="yes">Case Number:</property>
-             <property name="use_underline">False</property>
-             <property name="use_markup">False</property>
-             <property name="justify">GTK_JUSTIFY_LEFT</property>
-             <property name="wrap">False</property>
-             <property name="selectable">False</property>
-             <property name="xalign">0.5</property>
-             <property name="yalign">0.5</property>
-             <property name="xpad">0</property>
-             <property name="ypad">0</property>
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-             <property name="width_chars">-1</property>
-             <property name="single_line_mode">False</property>
-             <property name="angle">0</property>
            </widget>
            <packing>
-             <property name="padding">0</property>
              <property name="expand">False</property>
              <property name="fill">False</property>
            </packing>
          </child>
-
          <child>
            <widget class="GtkEntry" id="entry_go_to_case">
              <property name="width_request">50</property>
              <property name="visible">True</property>
              <property name="can_focus">True</property>
-             <property name="editable">True</property>
-             <property name="visibility">True</property>
-             <property name="max_length">0</property>
-             <property name="text" translatable="yes"></property>
-             <property name="has_frame">True</property>
-             <property name="invisible_char">*</property>
-             <property name="activates_default">False</property>
            </widget>
            <packing>
-             <property name="padding">0</property>
-             <property name="expand">True</property>
-             <property name="fill">True</property>
+                <property name="position">1</property>
            </packing>
          </child>
        </widget>
        <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="button_go_to_case_ok">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-ok</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-5</property>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
        </packing>
       </child>
     </widget>
   </child>
-</widget>
-
-<widget class="GtkWindow" id="sort-cases-dialog">
-  <property name="border_width">10</property>
+  </widget>
+  <widget class="GtkWindow" id="sort-cases-dialog">
   <property name="can_focus">True</property>
+    <property name="border_width">10</property>
   <property name="title" translatable="yes">Sort Cases</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">True</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="skip_taskbar_hint">True</property>
   <property name="skip_pager_hint">True</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-
   <child>
     <widget class="GtkHBox" id="hbox12">
       <property name="visible">True</property>
-      <property name="homogeneous">False</property>
       <property name="spacing">9</property>
-
       <child>
        <widget class="GtkScrolledWindow" id="scrolledwindow6">
-         <property name="border_width">10</property>
          <property name="visible">True</property>
          <property name="can_focus">True</property>
+            <property name="border_width">10</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="window_placement">GTK_CORNER_TOP_LEFT</property>
-
          <child>
            <widget class="GtkTreeView" id="sort-cases-treeview-dict">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="headers_visible">False</property>
-             <property name="rules_hint">False</property>
              <property name="reorderable">True</property>
-             <property name="enable_search">True</property>
              <property name="fixed_height_mode">True</property>
-             <property name="hover_selection">False</property>
-             <property name="hover_expand">False</property>
            </widget>
          </child>
        </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
-       </packing>
       </child>
-
       <child>
        <widget class="GtkAlignment" id="alignment3">
          <property name="visible">True</property>
-         <property name="xalign">0.5</property>
          <property name="yalign">0.25</property>
-         <property name="xscale">0.460000008345</property>
-         <property name="yscale">0.0799999982119</property>
-         <property name="top_padding">0</property>
-         <property name="bottom_padding">0</property>
-         <property name="left_padding">0</property>
-         <property name="right_padding">0</property>
-
+            <property name="xscale">0.46000000834465027</property>
+            <property name="yscale">0.079999998211860657</property>
          <child>
            <widget class="GtkButton" id="sort-cases-button">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-
              <child>
                <widget class="GtkArrow" id="sort-cases-arrow">
                  <property name="visible">True</property>
-                 <property name="arrow_type">GTK_ARROW_RIGHT</property>
-                 <property name="shadow_type">GTK_SHADOW_OUT</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
                </widget>
              </child>
            </widget>
          </child>
        </widget>
        <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
+            <property name="position">1</property>
        </packing>
       </child>
-
       <child>
        <widget class="GtkVBox" id="vbox11">
          <property name="visible">True</property>
-         <property name="homogeneous">False</property>
          <property name="spacing">4</property>
-
+            <child>
+              <widget class="GtkVBox" id="vbox12">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkLabel" id="label16">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Sort 
by:</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkScrolledWindow" id="scrolledwindow7">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</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>
+                    <child>
+                      <widget class="GtkTreeView" 
id="sort-cases-treeview-criteria">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="headers_visible">False</property>
+                        <property name="fixed_height_mode">True</property>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="pack_type">GTK_PACK_END</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
          <child>
            <widget class="GtkFrame" id="Sort Order">
              <property name="height_request">75</property>
              <property name="visible">True</property>
              <property name="label_xalign">0</property>
-             <property name="label_yalign">0.5</property>
-             <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
              <child>
                <widget class="GtkVBox" id="vbox13">
-                 <property name="border_width">12</property>
                  <property name="height_request">66</property>
                  <property name="visible">True</property>
-                 <property name="homogeneous">True</property>
+                    <property name="border_width">12</property>
                  <property name="spacing">5</property>
-
+                    <property name="homogeneous">True</property>
                  <child>
                    <widget class="GtkRadioButton" 
id="sort-cases-button-ascending">
                      <property name="visible">True</property>
                      <property name="can_focus">True</property>
                      <property name="label" 
translatable="yes">Ascending</property>
                      <property name="use_underline">True</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <property name="focus_on_click">True</property>
-                     <property name="active">False</property>
-                     <property name="inconsistent">False</property>
                      <property name="draw_indicator">True</property>
                    </widget>
                    <packing>
-                     <property name="padding">0</property>
                      <property name="expand">False</property>
                      <property name="fill">False</property>
                    </packing>
                  </child>
-
                  <child>
                    <widget class="GtkRadioButton" id="radiobutton-descending">
                      <property name="visible">True</property>
                      <property name="can_focus">True</property>
                      <property name="label" 
translatable="yes">Descending</property>
                      <property name="use_underline">True</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <property name="focus_on_click">True</property>
-                     <property name="active">False</property>
-                     <property name="inconsistent">False</property>
                      <property name="draw_indicator">True</property>
                      <property 
name="group">sort-cases-button-ascending</property>
                    </widget>
                    <packing>
-                     <property name="padding">0</property>
                      <property name="expand">False</property>
                      <property name="fill">False</property>
+                        <property name="position">1</property>
                    </packing>
                  </child>
                </widget>
              </child>
-
              <child>
                <widget class="GtkLabel" id="label15">
                  <property name="visible">True</property>
                  <property name="label" translatable="yes">Sort 
Order</property>
-                 <property name="use_underline">False</property>
                  <property name="use_markup">True</property>
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                 <property name="wrap">False</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                 <property name="width_chars">-1</property>
-                 <property name="single_line_mode">False</property>
-                 <property name="angle">0</property>
                </widget>
                <packing>
                  <property name="type">label_item</property>
@@ -3117,164 +2101,84 @@
              </child>
            </widget>
            <packing>
-             <property name="padding">0</property>
-             <property name="expand">False</property>
-             <property name="fill">True</property>
-             <property name="pack_type">GTK_PACK_END</property>
-           </packing>
-         </child>
-
-         <child>
-           <widget class="GtkVBox" id="vbox12">
-             <property name="visible">True</property>
-             <property name="homogeneous">False</property>
-             <property name="spacing">0</property>
-
-             <child>
-               <widget class="GtkLabel" id="label16">
-                 <property name="visible">True</property>
-                 <property name="label" translatable="yes">Sort by:</property>
-                 <property name="use_underline">False</property>
-                 <property name="use_markup">False</property>
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                 <property name="wrap">False</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                 <property name="width_chars">-1</property>
-                 <property name="single_line_mode">False</property>
-                 <property name="angle">0</property>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
                  <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkScrolledWindow" id="scrolledwindow7">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</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="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-                 <child>
-                   <widget class="GtkTreeView" 
id="sort-cases-treeview-criteria">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="headers_visible">False</property>
-                     <property name="rules_hint">False</property>
-                     <property name="reorderable">False</property>
-                     <property name="enable_search">True</property>
-                     <property name="fixed_height_mode">True</property>
-                     <property name="hover_selection">False</property>
-                     <property name="hover_expand">False</property>
-                   </widget>
-                 </child>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">True</property>
-                 <property name="fill">True</property>
-               </packing>
-             </child>
-           </widget>
-           <packing>
-             <property name="padding">0</property>
-             <property name="expand">True</property>
-             <property name="fill">True</property>
              <property name="pack_type">GTK_PACK_END</property>
            </packing>
          </child>
        </widget>
        <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
+            <property name="position">2</property>
        </packing>
       </child>
-
       <child>
        <widget class="GtkVButtonBox" id="vbuttonbox7">
          <property name="visible">True</property>
-         <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
-         <property name="spacing">0</property>
-
          <child>
            <widget class="GtkButton" id="sort-cases-ok">
              <property name="visible">True</property>
-             <property name="can_default">True</property>
              <property name="can_focus">True</property>
+                <property name="can_default">True</property>
              <property name="label">gtk-ok</property>
              <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
            </widget>
          </child>
-
          <child>
            <widget class="GtkButton" id="sort-cases-paste">
              <property name="visible">True</property>
              <property name="sensitive">False</property>
-             <property name="can_default">True</property>
              <property name="can_focus">True</property>
+                <property name="can_default">True</property>
              <property name="label">gtk-paste</property>
              <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
            </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
          </child>
-
          <child>
            <widget class="GtkButton" id="sort-cases-reset">
              <property name="visible">True</property>
-             <property name="can_default">True</property>
              <property name="can_focus">True</property>
+                <property name="can_default">True</property>
              <property name="label">gtk-refresh</property>
              <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
            </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
          </child>
-
          <child>
            <widget class="GtkButton" id="sort-cases-cancel">
              <property name="visible">True</property>
-             <property name="can_default">True</property>
              <property name="can_focus">True</property>
+                <property name="can_default">True</property>
              <property name="label">gtk-cancel</property>
              <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
            </widget>
+              <packing>
+                <property name="position">3</property>
+              </packing>
          </child>
-
          <child>
            <widget class="GtkButton" id="help_button_sort_cases">
              <property name="visible">True</property>
-             <property name="can_default">True</property>
              <property name="can_focus">True</property>
+                <property name="can_default">True</property>
              <property name="label">gtk-help</property>
              <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
            </widget>
+              <packing>
+                <property name="position">4</property>
+              </packing>
          </child>
        </widget>
        <packing>
-         <property name="padding">6</property>
-         <property name="expand">True</property>
          <property name="fill">False</property>
+            <property name="padding">6</property>
+            <property name="position">3</property>
        </packing>
       </child>
     </widget>
   </child>
-</widget>
-
+  </widget>
 </glade-interface>

Index: ui/gui/psppire-dict.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-dict.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- ui/gui/psppire-dict.c       1 Jan 2007 01:44:33 -0000       1.20
+++ ui/gui/psppire-dict.c       3 Jan 2007 02:03:18 -0000       1.21
@@ -49,6 +49,7 @@
        VARIABLE_RESIZED,
        VARIABLE_INSERTED,
        VARIABLES_DELETED,
+       WEIGHT_CHANGED,
        n_SIGNALS};
 
 static guint signal[n_SIGNALS];
@@ -158,6 +159,17 @@
                  G_TYPE_INT,
                  G_TYPE_INT);
 
+
+  signal [WEIGHT_CHANGED] =
+    g_signal_new ("weight-changed",
+                 G_TYPE_FROM_CLASS (class),
+                 G_SIGNAL_RUN_FIRST,
+                 0,
+                 NULL, NULL,
+                 g_cclosure_marshal_VOID__INT,
+                 G_TYPE_NONE,
+                 1,
+                 G_TYPE_INT);
 }
 
 static void
@@ -190,11 +202,19 @@
   g_signal_emit (pd, signal[VARIABLE_CHANGED], 0, idx);
 }
 
+static void
+weight_changed_callback (struct dictionary *d, int idx, void *pd)
+{
+  g_signal_emit (pd, signal [WEIGHT_CHANGED], 0, idx);
+}
+
+
 static const struct dict_callbacks gui_callbacks =
   {
     addcb,
     delcb,
-    mutcb
+    mutcb,
+    weight_changed_callback
   };
 
 static void




reply via email to

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