[evolution] ETableConfig: Use ETableColumnSelector.



commit e9260c1b01f29dd94925446cc5604df82929de8e
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Jul 1 09:09:00 2013 -0400

    ETableConfig: Use ETableColumnSelector.
    
    The other parts of this UI still look ancient, but this is a good first
    step.  Plus we can remove a number of now-unused ETable-related classes.

 e-util/e-table-config.c  |  479 ++-------------------
 e-util/e-table-config.h  |   11 -
 e-util/e-table-config.ui | 1076 +++++++++++++++++++---------------------------
 3 files changed, 475 insertions(+), 1091 deletions(-)
---
diff --git a/e-util/e-table-config.c b/e-util/e-table-config.c
index cf6f9db..5fbb6b0 100644
--- a/e-util/e-table-config.c
+++ b/e-util/e-table-config.c
@@ -27,22 +27,12 @@
  *    Make Clear all work.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "e-table-config.h"
 
-#include <stdlib.h>
-#include <string.h>
-
-#include <gtk/gtk.h>
+#include <config.h>
 #include <glib/gi18n.h>
 
-#include "e-table-memory-store.h"
-#include "e-table-without.h"
-#include "e-unicode.h"
-#include "e-util-private.h"
+#include "e-table-column-selector.h"
 
 G_DEFINE_TYPE (ETableConfig, e_table_config, G_TYPE_OBJECT)
 
@@ -455,49 +445,6 @@ config_group_info_update (ETableConfig *config)
 }
 
 static void
-setup_fields (ETableConfig *config)
-{
-       GPtrArray *array;
-       gint i;
-
-       e_table_model_freeze ((ETableModel *) config->available_model);
-       e_table_model_freeze ((ETableModel *) config->shown_model);
-       e_table_without_show_all (config->available_model);
-       e_table_subset_variable_clear (config->shown_model);
-
-       array = e_table_specification_ref_columns (config->source_spec);
-
-       if (config->temp_state) {
-               for (i = 0; i < config->temp_state->col_count; i++) {
-                       ETableColumnSpecification *target_column;
-                       gint idx = 0;
-                       guint jj;
-
-                       target_column = config->temp_state->column_specs[i];
-
-                       for (jj = 0; jj < array->len; jj++) {
-                               ETableColumnSpecification *column;
-
-                               column = g_ptr_array_index (array, jj);
-                               if (column == target_column)
-                                       break;
-
-                               if (!column->disabled)
-                                       idx++;
-                       }
-
-                       e_table_subset_variable_add (config->shown_model, idx);
-                       e_table_without_hide (config->available_model, GINT_TO_POINTER (idx));
-               }
-       }
-
-       g_ptr_array_unref (array);
-
-       e_table_model_thaw ((ETableModel *) config->available_model);
-       e_table_model_thaw ((ETableModel *) config->shown_model);
-}
-
-static void
 config_fields_info_update (ETableConfig *config)
 {
        GString *res = g_string_new ("");
@@ -589,135 +536,60 @@ do_sort_and_group_config_dialog (ETableConfig *config,
 static void
 do_fields_config_dialog (ETableConfig *config)
 {
-       GtkDialog *dialog;
-       GtkWidget *widget;
+       GtkWidget *dialog;
+       GtkWidget *content_area;
+       GtkWidget *selector;
+       GtkWidget *label;
        gint response, running = 1;
 
-       dialog = GTK_DIALOG (config->dialog_show_fields);
-
-       gtk_widget_ensure_style (config->dialog_show_fields);
-
-       widget = gtk_dialog_get_content_area (dialog);
-       gtk_container_set_border_width (GTK_CONTAINER (widget), 0);
+       dialog = gtk_dialog_new_with_buttons (
+               _("Show Fields"),
+               GTK_WINDOW (config->dialog_toplevel),
+               0, /* no flags */
+               GTK_STOCK_CANCEL,
+               GTK_RESPONSE_CANCEL,
+               GTK_STOCK_OK,
+               GTK_RESPONSE_OK,
+               NULL);
 
-       widget = gtk_dialog_get_action_area (dialog);
-       gtk_container_set_border_width (GTK_CONTAINER (widget), 12);
+       gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
+       gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 400);
 
-       config->temp_state = e_table_state_duplicate (config->state);
+       content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+       gtk_box_set_spacing (GTK_BOX (content_area), 6);
 
-       setup_fields (config);
+       label = gtk_label_new (
+               _("Choose the order of information "
+               "to appear in the message list."));
+       gtk_box_pack_start (GTK_BOX (content_area), label, FALSE, FALSE, 0);
+       gtk_widget_show (label);
 
-       gtk_window_set_transient_for (
-               GTK_WINDOW (config->dialog_show_fields),
-               GTK_WINDOW (config->dialog_toplevel));
+       selector = e_table_column_selector_new (config->state);
+       gtk_container_set_border_width (GTK_CONTAINER (selector), 5);
+       gtk_box_pack_start (GTK_BOX (content_area), selector, TRUE, TRUE, 0);
+       gtk_widget_show (selector);
 
        do {
-               response = gtk_dialog_run (GTK_DIALOG (config->dialog_show_fields));
+               response = gtk_dialog_run (GTK_DIALOG (dialog));
                switch (response) {
                case GTK_RESPONSE_OK:
-                       g_object_unref (config->state);
-                       config->state = config->temp_state;
-                       config->temp_state = NULL;
+                       e_table_column_selector_apply (
+                               E_TABLE_COLUMN_SELECTOR (selector));
                        running = 0;
                        config_dialog_changed (config);
                        break;
 
                case GTK_RESPONSE_DELETE_EVENT:
                case GTK_RESPONSE_CANCEL:
-                       g_object_unref (config->temp_state);
-                       config->temp_state = NULL;
                        running = 0;
                        break;
                }
 
        } while (running);
-       gtk_widget_hide (GTK_WIDGET (config->dialog_show_fields));
 
-       config_fields_info_update (config);
-}
-
-static ETableMemoryStoreColumnInfo store_columns[] = {
-       E_TABLE_MEMORY_STORE_STRING,
-       E_TABLE_MEMORY_STORE_INTEGER,
-       E_TABLE_MEMORY_STORE_TERMINATOR
-};
+       gtk_widget_destroy (dialog);
 
-static ETableModel *
-create_store (ETableConfig *config)
-{
-       ETableModel *store;
-       GPtrArray *array;
-       guint ii;
-
-       store = e_table_memory_store_new (store_columns);
-
-       array = e_table_specification_ref_columns (config->source_spec);
-
-       for (ii = 0; ii < array->len; ii++) {
-               ETableColumnSpecification *column;
-               gchar *text;
-
-               column = g_ptr_array_index (array, ii);
-
-               if (column->disabled)
-                       continue;
-
-               text = g_strdup (dgettext (config->domain, column->title));
-               e_table_memory_store_insert_adopt (
-                       E_TABLE_MEMORY_STORE (store), -1, NULL, text, ii);
-       }
-
-       g_ptr_array_unref (array);
-
-       return store;
-}
-
-static const gchar *spec =
-"<ETableSpecification gettext-domain=\"" GETTEXT_PACKAGE "\""
-" no-headers=\"true\" cursor-mode=\"line\" draw-grid=\"false\" "
-" draw-focus=\"true\" selection-mode=\"browse\">"
-"<ETableColumn model_col= \"0\" _title=\"Name\" minimum_width=\"30\""
-" resizable=\"true\" cell=\"string\" compare=\"string\"/>"
-"<ETableState> <column source=\"0\"/>"
-"<grouping/>"
-"</ETableState>"
-"</ETableSpecification>";
-
-static GtkWidget *
-e_table_proxy_etable_shown_new (ETableModel *store)
-{
-       ETableModel *model = NULL;
-       GtkWidget *widget;
-
-       model = e_table_subset_variable_new (store);
-
-       widget = e_table_new (model, NULL, spec);
-
-       atk_object_set_name (
-               gtk_widget_get_accessible (widget),
-               _("Show Fields"));
-
-       return widget;
-}
-
-static GtkWidget *
-e_table_proxy_etable_available_new (ETableModel *store)
-{
-       ETableModel *model;
-       GtkWidget *widget;
-
-       model = e_table_without_new (
-               store, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-
-       e_table_without_show_all (E_TABLE_WITHOUT (model));
-
-       widget = e_table_new (model, NULL, spec);
-
-       atk_object_set_name (
-               gtk_widget_get_accessible (widget),
-               _("Available Fields"));
-
-       return widget;
+       config_fields_info_update (config);
 }
 
 static void
@@ -809,22 +681,6 @@ connect_button (ETableConfig *config,
                g_signal_connect (button, "clicked", cback, config);
 }
 
-static gint
-get_source_model_col_index (ETableConfig *config,
-                            gint idx)
-{
-       gint visible_index;
-       ETableModel *src_model;
-
-       src_model = e_table_subset_get_source_model (
-               E_TABLE_SUBSET (config->available_model));
-
-       visible_index = e_table_subset_view_to_model_row (
-               E_TABLE_SUBSET (config->available_model), idx);
-
-       return GPOINTER_TO_INT (e_table_model_value_at (src_model, 1, visible_index));
-}
-
 static void
 sort_combo_changed (GtkComboBox *combo_box,
                     ETableConfigSortWidgets *sort)
@@ -1096,272 +952,6 @@ configure_group_dialog (ETableConfig *config,
 }
 
 static void
-add_column (gint model_row,
-            gpointer closure)
-{
-       GList **columns = closure;
-       *columns = g_list_prepend (*columns, GINT_TO_POINTER (model_row));
-}
-
-static void
-config_button_add (GtkWidget *widget,
-                   ETableConfig *config)
-{
-       GPtrArray *array;
-       GList *list = NULL;
-       GList *link;
-       gint count;
-       gint i;
-
-       e_table_selected_row_foreach (config->available, add_column, &list);
-       list = g_list_reverse (list);
-
-       count = g_list_length (list);
-
-       array = e_table_specification_ref_columns (config->source_spec);
-
-       config->temp_state->column_specs = g_renew (
-               ETableColumnSpecification *,
-               config->temp_state->column_specs,
-               config->temp_state->col_count + count);
-       config->temp_state->expansions = g_renew (
-               gdouble,
-               config->temp_state->expansions,
-               config->temp_state->col_count + count);
-       i = config->temp_state->col_count;
-       for (link = list; link != NULL; link = g_list_next (link)) {
-               ETableColumnSpecification *col_spec;
-               gint index;
-
-               index = get_source_model_col_index (
-                       config, GPOINTER_TO_INT (link->data));
-               col_spec = g_ptr_array_index (array, index);
-
-               config->temp_state->column_specs[i] = g_object_ref (col_spec);
-               config->temp_state->expansions[i] = col_spec->expansion;
-
-               i++;
-       }
-       config->temp_state->col_count += count;
-
-       g_ptr_array_unref (array);
-
-       g_list_free (list);
-
-       setup_fields (config);
-}
-
-static void
-config_button_remove (GtkWidget *widget,
-                      ETableConfig *config)
-{
-       GList *list = NULL;
-       GList *link;
-
-       e_table_selected_row_foreach (config->shown, add_column, &list);
-
-       for (link = list; link != NULL; link = g_list_next (link)) {
-               gint row = GPOINTER_TO_INT (link->data);
-
-               memmove (
-                       config->temp_state->column_specs + row,
-                       config->temp_state->column_specs + row + 1,
-                       sizeof (gpointer) * (config->temp_state->col_count - row - 1));
-               memmove (
-                       config->temp_state->expansions + row,
-                       config->temp_state->expansions + row + 1,
-                       sizeof (gdouble) * (config->temp_state->col_count - row - 1));
-               config->temp_state->col_count--;
-       }
-       config->temp_state->column_specs = g_renew (
-               ETableColumnSpecification *,
-               config->temp_state->column_specs,
-               config->temp_state->col_count);
-       config->temp_state->expansions = g_renew (
-               gdouble,
-               config->temp_state->expansions,
-               config->temp_state->col_count);
-
-       g_list_free (list);
-
-       setup_fields (config);
-}
-
-static void
-config_button_up (GtkWidget *widget,
-                  ETableConfig *config)
-{
-       GList *columns = NULL;
-       GList *column;
-       ETableColumnSpecification **new_column_specs;
-       gdouble *new_expansions;
-       ETableColumnSpecification *next_col;
-       gdouble next_expansion;
-       gint i;
-
-       e_table_selected_row_foreach (config->shown, add_column, &columns);
-
-       /* if no columns left, just return */
-       if (columns == NULL)
-               return;
-
-       columns = g_list_reverse (columns);
-
-       new_column_specs = g_new (
-               ETableColumnSpecification *, config->temp_state->col_count);
-       new_expansions = g_new (gdouble, config->temp_state->col_count);
-
-       column = columns;
-
-       next_col = config->temp_state->column_specs[0];
-       next_expansion = config->temp_state->expansions[0];
-
-       for (i = 1; i < config->temp_state->col_count; i++) {
-               if (column && (GPOINTER_TO_INT (column->data) == i)) {
-                       new_expansions[i - 1] =
-                               config->temp_state->expansions[i];
-                       new_column_specs[i - 1] =
-                               config->temp_state->column_specs[i];
-                       column = column->next;
-               } else {
-                       new_column_specs[i - 1] = next_col;
-                       next_col = config->temp_state->column_specs[i];
-
-                       new_expansions[i - 1] = next_expansion;
-                       next_expansion = config->temp_state->expansions[i];
-               }
-       }
-
-       new_column_specs[i - 1] = next_col;
-       new_expansions[i - 1] = next_expansion;
-
-       g_free (config->temp_state->column_specs);
-       g_free (config->temp_state->expansions);
-
-       config->temp_state->column_specs = new_column_specs;
-       config->temp_state->expansions = new_expansions;
-
-       g_list_free (columns);
-
-       setup_fields (config);
-}
-
-static void
-config_button_down (GtkWidget *widget,
-                    ETableConfig *config)
-{
-       GList *columns = NULL;
-       GList *column;
-       ETableColumnSpecification **new_column_specs;
-       gdouble *new_expansions;
-       ETableColumnSpecification *next_col;
-       gdouble next_expansion;
-       gint i;
-
-       e_table_selected_row_foreach (config->shown, add_column, &columns);
-
-       /* if no columns left, just return */
-       if (columns == NULL)
-               return;
-
-       new_column_specs = g_new (
-               ETableColumnSpecification *, config->temp_state->col_count);
-       new_expansions = g_new (gdouble, config->temp_state->col_count);
-
-       column = columns;
-
-       next_col =
-               config->temp_state->column_specs[config->temp_state->col_count - 1];
-       next_expansion =
-               config->temp_state->expansions[config->temp_state->col_count - 1];
-
-       for (i = config->temp_state->col_count - 1; i > 0; i--) {
-               if (column && (GPOINTER_TO_INT (column->data) == i - 1)) {
-                       new_expansions[i] =
-                               config->temp_state->expansions[i - 1];
-                       new_column_specs[i] =
-                               config->temp_state->column_specs[i - 1];
-                       column = column->next;
-               } else {
-                       new_column_specs[i] = next_col;
-                       next_col = config->temp_state->column_specs[i - 1];
-
-                       new_expansions[i] = next_expansion;
-                       next_expansion = config->temp_state->expansions[i - 1];
-               }
-       }
-
-       new_column_specs[0] = next_col;
-       new_expansions[0] = next_expansion;
-
-       g_free (config->temp_state->column_specs);
-       g_free (config->temp_state->expansions);
-
-       config->temp_state->column_specs = new_column_specs;
-       config->temp_state->expansions = new_expansions;
-
-       g_list_free (columns);
-
-       setup_fields (config);
-}
-
-static void
-configure_fields_dialog (ETableConfig *config,
-                         GtkBuilder *builder)
-{
-       GtkWidget *scrolled;
-       GtkWidget *etable;
-       ETableModel *store = create_store (config);
-
-       /* "custom-available" widget */
-       etable = e_table_proxy_etable_available_new (store);
-       gtk_widget_show (etable);
-       scrolled = e_builder_get_widget (builder, "available-scrolled");
-       gtk_container_add (GTK_CONTAINER (scrolled), etable);
-       config->available = E_TABLE (etable);
-       g_object_get (
-               config->available,
-               "model", &config->available_model,
-               NULL);
-       gtk_widget_show_all (etable);
-       gtk_label_set_mnemonic_widget (
-               GTK_LABEL (e_builder_get_widget (
-               builder, "label-available")), etable);
-
-       /* "custom-shown" widget */
-       etable = e_table_proxy_etable_shown_new (store);
-       gtk_widget_show (etable);
-       scrolled = e_builder_get_widget (builder, "shown-scrolled");
-       gtk_container_add (GTK_CONTAINER (scrolled), etable);
-       config->shown = E_TABLE (etable);
-       g_object_get (
-               config->shown,
-               "model", &config->shown_model,
-               NULL);
-       gtk_widget_show_all (etable);
-       gtk_label_set_mnemonic_widget (
-               GTK_LABEL (e_builder_get_widget (
-               builder, "label-displayed")), etable);
-
-       connect_button (
-               config, builder, "button-add",
-               G_CALLBACK (config_button_add));
-       connect_button (
-               config, builder, "button-remove",
-               G_CALLBACK (config_button_remove));
-       connect_button (
-               config, builder, "button-up",
-               G_CALLBACK (config_button_up));
-       connect_button (
-               config, builder, "button-down",
-               G_CALLBACK (config_button_down));
-
-       setup_fields (config);
-
-       g_object_unref (store);
-}
-
-static void
 setup_gui (ETableConfig *config)
 {
        GtkBuilder *builder;
@@ -1379,8 +969,6 @@ setup_gui (ETableConfig *config)
                        GTK_WINDOW (config->dialog_toplevel),
                        config->header);
 
-       config->dialog_show_fields = e_builder_get_widget (
-               builder, "dialog-show-fields");
        config->dialog_group_by =  e_builder_get_widget (
                builder, "dialog-group-by");
        config->dialog_sort = e_builder_get_widget (
@@ -1421,7 +1009,6 @@ setup_gui (ETableConfig *config)
 
        configure_sort_dialog (config, builder);
        configure_group_dialog (config, builder);
-       configure_fields_dialog (config, builder);
 
        g_object_weak_ref (
                G_OBJECT (config->dialog_toplevel),
diff --git a/e-util/e-table-config.h b/e-util/e-table-config.h
index ffbab72..2270f14 100644
--- a/e-util/e-table-config.h
+++ b/e-util/e-table-config.h
@@ -28,13 +28,7 @@
 #ifndef _E_TABLE_CONFIG_H_
 #define _E_TABLE_CONFIG_H_
 
-#include <gtk/gtk.h>
-
-#include <e-util/e-table-sort-info.h>
 #include <e-util/e-table-specification.h>
-#include <e-util/e-table-subset-variable.h>
-#include <e-util/e-table-without.h>
-#include <e-util/e-table.h>
 
 /* Standard GObject macros */
 #define E_TYPE_TABLE_CONFIG \
@@ -81,7 +75,6 @@ struct _ETableConfig {
         * Our various dialog boxes
         */
        GtkWidget *dialog_toplevel;
-       GtkWidget *dialog_show_fields;
        GtkWidget *dialog_group_by;
        GtkWidget *dialog_sort;
 
@@ -98,10 +91,6 @@ struct _ETableConfig {
        ETableConfigSortWidgets sort[4];
        ETableConfigSortWidgets group[4];
 
-       ETable               *available;
-       ETableWithout        *available_model;
-       ETable               *shown;
-       ETableSubsetVariable *shown_model;
        gchar *domain;
 
        /*
diff --git a/e-util/e-table-config.ui b/e-util/e-table-config.ui
index cfc6cb5..79c3a30 100644
--- a/e-util/e-table-config.ui
+++ b/e-util/e-table-config.ui
@@ -1,430 +1,374 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkDialog" id="dialog-show-fields">
-    <property name="title" translatable="yes">Show Fields</property>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkDialog" id="e-table-config">
+    <property name="can_focus">False</property>
+    <property name="title">dialog1</property>
+    <property name="resizable">False</property>
     <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox3">
+      <object class="GtkBox" id="dialog-vbox6">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">8</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area6">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="cancelbutton2">
+                <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="applybutton2">
+                <property name="label">gtk-apply</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="okbutton2">
+                <property name="label">gtk-ok</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
-          <object class="GtkVBox" id="vbox2">
+          <object class="GtkFrame" id="top-frame">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
+            <property name="can_focus">False</property>
+            <property name="border_width">2</property>
+            <property name="label_xalign">0</property>
             <child>
-              <object class="GtkTable" id="table2">
+              <object class="GtkTable" id="table1">
                 <property name="visible">True</property>
-                <property name="n_columns">5</property>
-                <property name="column_spacing">6</property>
-                <property name="row_spacing">6</property>
-                <property name="homogeneous">True</property>
+                <property name="can_focus">False</property>
+                <property name="border_width">2</property>
+                <property name="n_rows">3</property>
+                <property name="n_columns">3</property>
+                <property name="column_spacing">4</property>
+                <property name="row_spacing">2</property>
                 <child>
-                  <object class="GtkLabel" id="label-available">
+                  <object class="GtkButton" id="button-sort">
+                    <property name="label" translatable="yes">_Sort...</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">A_vailable Fields:</property>
+                    <property name="can_focus">True</property>
+                    <property name="can_default">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
+                    <signal name="clicked" handler="on_sort_clicked" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="right_attach">2</property>
-                    <property name="y_options">GTK_FILL</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="label-displayed">
+                  <object class="GtkButton" id="button-group">
+                    <property name="label" translatable="yes">_Group By...</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Show these fields in order:</property>
+                    <property name="can_focus">True</property>
+                    <property name="can_default">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
+                    <signal name="clicked" handler="on_group_by_clicked" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"/>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label-sort">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="wrap">True</property>
                   </object>
                   <packing>
-                    <property name="left_attach">3</property>
-                    <property name="right_attach">5</property>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
                     <property name="y_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
-                  <placeholder/>
+                  <object class="GtkButton" id="button-fields">
+                    <property name="label" translatable="yes">_Fields Shown...</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="can_default">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_underline">True</property>
+                    <signal name="clicked" handler="on_group_by_clicked" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"/>
+                  </packing>
                 </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkTable" id="table3">
-                <property name="visible">True</property>
-                <property name="n_columns">5</property>
-                <property name="column_spacing">6</property>
-                <property name="row_spacing">6</property>
-                <property name="homogeneous">True</property>
                 <child>
-                  <object class="GtkVBox" id="vbox4">
+                  <object class="GtkLabel" id="label-fields">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkScrolledWindow" id="available-scrolled">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">automatic</property>
-                        <property name="vscrollbar_policy">automatic</property>
-                        <property name="shadow_type">in</property>
-                        <child>
-                          <placeholder/>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="wrap">True</property>
                   </object>
                   <packing>
+                    <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
+                    <property name="y_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkVBox" id="vbox5">
+                  <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkScrolledWindow" id="shown-scrolled">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">automatic</property>
-                        <property name="vscrollbar_policy">automatic</property>
-                        <property name="shadow_type">in</property>
-                        <child>
-                          <placeholder/>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="hbox4">
-                        <property name="visible">True</property>
-                        <property name="spacing">6</property>
-                        <property name="homogeneous">True</property>
-                        <child>
-                          <object class="GtkButton" id="button-up">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <child>
-                              <object class="GtkAlignment" id="alignment7">
-                                <property name="visible">True</property>
-                                <property name="xscale">0</property>
-                                <property name="yscale">0</property>
-                                <child>
-                                  <object class="GtkHBox" id="hbox19">
-                                    <property name="visible">True</property>
-                                    <property name="spacing">2</property>
-                                    <child>
-                                      <object class="GtkImage" id="image3">
-                                        <property name="visible">True</property>
-                                        <property name="stock">gtk-go-up</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label29">
-                                        <property name="visible">True</property>
-                                        <property name="label" translatable="yes">Move _Up</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="button-down">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <child>
-                              <object class="GtkAlignment" id="alignment8">
-                                <property name="visible">True</property>
-                                <property name="xscale">0</property>
-                                <property name="yscale">0</property>
-                                <child>
-                                  <object class="GtkHBox" id="hbox20">
-                                    <property name="visible">True</property>
-                                    <property name="spacing">2</property>
-                                    <child>
-                                      <object class="GtkImage" id="image4">
-                                        <property name="visible">True</property>
-                                        <property name="stock">gtk-go-down</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label30">
-                                        <property name="visible">True</property>
-                                        <property name="label" translatable="yes">Move _Down</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="justify">center</property>
                   </object>
                   <packing>
-                    <property name="left_attach">3</property>
-                    <property name="right_attach">5</property>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkVBox" id="vbox6">
+                  <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkButton" id="button-add">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment5">
-                            <property name="visible">True</property>
-                            <property name="xalign">0.69999998807907104</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox17">
-                                <property name="visible">True</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkLabel" id="label31">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">_Add</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkImage" id="image5">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-go-forward</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="button-remove">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment6">
-                            <property name="visible">True</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox18">
-                                <property name="visible">True</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkImage" id="image1">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-go-back</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label27">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">_Remove</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="justify">center</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options">GTK_FILL</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label33">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="justify">center</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="right_attach">3</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options">GTK_FILL</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label-group">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="wrap">True</property>
+                  </object>
+                  <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">GTK_FILL</property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
               </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label26">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Description</property>
+              </object>
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">cancelbutton2</action-widget>
+      <action-widget response="-10">applybutton2</action-widget>
+      <action-widget response="-5">okbutton2</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="dialog-group-by">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Group</property>
+    <property name="modal">True</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox4">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">8</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area3">
+          <object class="GtkButtonBox" id="dialog-action_area4">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button22">
+              <object class="GtkButton" id="button39">
+                <property name="label" translatable="yes">Clear _All</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button42">
                 <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button20">
+              <object class="GtkButton" id="button41">
                 <property name="label">gtk-ok</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-6">button22</action-widget>
-      <action-widget response="-5">button20</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkDialog" id="dialog-group-by">
-    <property name="title" translatable="yes">Group</property>
-    <property name="modal">True</property>
-    <property name="type_hint">dialog</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox4">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">8</property>
         <child>
           <object class="GtkVBox" id="vbox24">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
+            <property name="can_focus">False</property>
             <child>
               <object class="GtkHBox" id="hbox13">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkFrame" id="frame-group-1">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <child>
                       <object class="GtkHBox" id="hbox5">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkVBox" id="vbox7">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkCheckButton" id="checkbutton-group-1">
                                 <property name="label" translatable="yes">_Show field in View</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
@@ -435,20 +379,25 @@
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkVBox" id="vbox8">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkRadioButton" id="radiobutton-ascending-group-1">
                                 <property name="label" translatable="yes">Ascending</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
@@ -460,10 +409,13 @@
                             <child>
                               <object class="GtkRadioButton" id="radiobutton-descending-group-1">
                                 <property name="label" translatable="yes">Descending</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">radiobutton-ascending-group-1</property>
                               </object>
@@ -476,6 +428,7 @@
                           </object>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -484,17 +437,21 @@
                     <child type="label">
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Group Items By</property>
                       </object>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label8">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="justify">center</property>
                   </object>
                   <packing>
@@ -506,6 +463,7 @@
                 <child>
                   <object class="GtkLabel" id="label9">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="justify">center</property>
                   </object>
                   <packing>
@@ -517,6 +475,7 @@
                 <child>
                   <object class="GtkLabel" id="label10">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="justify">center</property>
                   </object>
                   <packing>
@@ -527,16 +486,20 @@
                 </child>
               </object>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkHBox" id="hbox14">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label11">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="justify">center</property>
                   </object>
                   <packing>
@@ -548,22 +511,27 @@
                 <child>
                   <object class="GtkFrame" id="frame-group-2">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <child>
                       <object class="GtkHBox" id="hbox6">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkVBox" id="vbox9">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkCheckButton" id="checkbutton-group-2">
                                 <property name="label" translatable="yes">Show _field in View</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
@@ -574,20 +542,25 @@
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkVBox" id="vbox10">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkRadioButton" id="radiobutton-ascending-group-2">
                                 <property name="label" translatable="yes">Ascending</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
@@ -599,10 +572,13 @@
                             <child>
                               <object class="GtkRadioButton" id="radiobutton-descending-group-2">
                                 <property name="label" translatable="yes">Descending</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">radiobutton-ascending-group-2</property>
                               </object>
@@ -615,6 +591,7 @@
                           </object>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -623,17 +600,21 @@
                     <child type="label">
                       <object class="GtkLabel" id="label12">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Then By</property>
                       </object>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label19">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="justify">center</property>
                   </object>
                   <packing>
@@ -645,6 +626,7 @@
                 <child>
                   <object class="GtkLabel" id="label18">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="justify">center</property>
                   </object>
                   <packing>
@@ -655,16 +637,20 @@
                 </child>
               </object>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkHBox" id="hbox15">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label13">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="justify">center</property>
                   </object>
                   <packing>
@@ -676,6 +662,7 @@
                 <child>
                   <object class="GtkLabel" id="label32">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="justify">center</property>
                   </object>
                   <packing>
@@ -687,22 +674,27 @@
                 <child>
                   <object class="GtkFrame" id="frame-group-3">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <child>
                       <object class="GtkHBox" id="hbox7">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkVBox" id="vbox11">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkCheckButton" id="checkbutton-group-3">
                                 <property name="label" translatable="yes">Show field i_n View</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
@@ -713,20 +705,25 @@
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkVBox" id="vbox12">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkRadioButton" id="radiobutton-ascending-group-3">
                                 <property name="label" translatable="yes">Ascending</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
@@ -738,10 +735,13 @@
                             <child>
                               <object class="GtkRadioButton" id="radiobutton-descending-group-3">
                                 <property name="label" translatable="yes">Descending</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">radiobutton-ascending-group-3</property>
                               </object>
@@ -754,6 +754,7 @@
                           </object>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -762,17 +763,21 @@
                     <child type="label">
                       <object class="GtkLabel" id="label20">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Then By</property>
                       </object>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label17">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="justify">center</property>
                   </object>
                   <packing>
@@ -783,16 +788,20 @@
                 </child>
               </object>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">2</property>
               </packing>
             </child>
             <child>
               <object class="GtkHBox" id="hbox16">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label14">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="justify">center</property>
                   </object>
                   <packing>
@@ -804,6 +813,7 @@
                 <child>
                   <object class="GtkLabel" id="label16">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="justify">center</property>
                   </object>
                   <packing>
@@ -815,6 +825,7 @@
                 <child>
                   <object class="GtkLabel" id="label15">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="justify">center</property>
                   </object>
                   <packing>
@@ -826,22 +837,27 @@
                 <child>
                   <object class="GtkFrame" id="frame-group-4">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <child>
                       <object class="GtkHBox" id="hbox8">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkVBox" id="vbox13">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkCheckButton" id="checkbutton-group-4">
                                 <property name="label" translatable="yes">Show field in _View</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
@@ -852,20 +868,25 @@
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkVBox" id="vbox14">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkRadioButton" id="radiobutton-ascending-group-4">
                                 <property name="label" translatable="yes">Ascending</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
@@ -877,10 +898,13 @@
                             <child>
                               <object class="GtkRadioButton" id="radiobutton-descending-group-4">
                                 <property name="label" translatable="yes">Descending</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">radiobutton-ascending-group-4</property>
                               </object>
@@ -893,6 +917,7 @@
                           </object>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -901,35 +926,64 @@
                     <child type="label">
                       <object class="GtkLabel" id="label21">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Then By</property>
                       </object>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
               </object>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">3</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">button39</action-widget>
+      <action-widget response="-6">button42</action-widget>
+      <action-widget response="-5">button41</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="dialog-sort">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Sort</property>
+    <property name="modal">True</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="vbox15">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">8</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area4">
+          <object class="GtkButtonBox" id="hbuttonbox1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button39">
-                <property name="label" translatable="yes">Clear _All</property>
+              <object class="GtkButton" id="button43">
+                <property name="label" translatable="yes">Clear All</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -939,12 +993,14 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button42">
+              <object class="GtkButton" id="button45">
                 <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -954,12 +1010,15 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button41">
+              <object class="GtkButton" id="button44">
                 <property name="label">gtk-ok</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
+                <property name="has_default">True</property>
                 <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -971,61 +1030,54 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="0">button39</action-widget>
-      <action-widget response="-6">button42</action-widget>
-      <action-widget response="-5">button41</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkDialog" id="dialog-sort">
-    <property name="title" translatable="yes">Sort</property>
-    <property name="modal">True</property>
-    <property name="type_hint">dialog</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="vbox15">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">8</property>
         <child>
           <object class="GtkTable" id="table5">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="n_rows">4</property>
             <property name="column_spacing">6</property>
             <property name="row_spacing">6</property>
             <child>
               <object class="GtkFrame" id="frame-sort-4">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label_xalign">0</property>
                 <child>
                   <object class="GtkHBox" id="hbox9">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkAlignment" id="alignment1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="yscale">0</property>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkVBox" id="vbox17">
                         <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
+                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkRadioButton" id="radiobutton-ascending-sort-4">
                             <property name="label" translatable="yes">Ascending</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -1037,10 +1089,13 @@
                         <child>
                           <object class="GtkRadioButton" id="radiobutton-descending-sort-4">
                             <property name="label" translatable="yes">Descending</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">radiobutton-ascending-sort-4</property>
                           </object>
@@ -1053,6 +1108,7 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -1061,6 +1117,7 @@
                 <child type="label">
                   <object class="GtkLabel" id="label22">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Then By</property>
                   </object>
                 </child>
@@ -1074,31 +1131,39 @@
             <child>
               <object class="GtkFrame" id="frame-sort-3">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label_xalign">0</property>
                 <child>
                   <object class="GtkHBox" id="hbox10">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkAlignment" id="alignment2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="yscale">0</property>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkVBox" id="vbox19">
                         <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
+                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkRadioButton" id="radiobutton-ascending-sort-3">
                             <property name="label" translatable="yes">Ascending</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -1110,10 +1175,13 @@
                         <child>
                           <object class="GtkRadioButton" id="radiobutton-descending-sort-3">
                             <property name="label" translatable="yes">Descending</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">radiobutton-ascending-sort-3</property>
                           </object>
@@ -1126,6 +1194,7 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -1134,6 +1203,7 @@
                 <child type="label">
                   <object class="GtkLabel" id="label23">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Then By</property>
                   </object>
                 </child>
@@ -1147,31 +1217,39 @@
             <child>
               <object class="GtkFrame" id="frame-sort-2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label_xalign">0</property>
                 <child>
                   <object class="GtkHBox" id="hbox11">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkAlignment" id="alignment3">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="yscale">0</property>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkVBox" id="vbox21">
                         <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
+                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkRadioButton" id="radiobutton-ascending-sort-2">
                             <property name="label" translatable="yes">Ascending</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -1183,10 +1261,13 @@
                         <child>
                           <object class="GtkRadioButton" id="radiobutton-descending-sort-2">
                             <property name="label" translatable="yes">Descending</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">radiobutton-ascending-sort-2</property>
                           </object>
@@ -1199,6 +1280,7 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -1207,6 +1289,7 @@
                 <child type="label">
                   <object class="GtkLabel" id="label24">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Then By</property>
                   </object>
                 </child>
@@ -1220,31 +1303,39 @@
             <child>
               <object class="GtkFrame" id="frame-sort-1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label_xalign">0</property>
                 <child>
                   <object class="GtkHBox" id="hbox12">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkAlignment" id="alignment4">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="yscale">0</property>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkVBox" id="vbox23">
                         <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
+                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkRadioButton" id="radiobutton-ascending-sort-1">
                             <property name="label" translatable="yes">Ascending</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -1256,10 +1347,13 @@
                         <child>
                           <object class="GtkRadioButton" id="radiobutton-descending-sort-1">
                             <property name="label" translatable="yes">Descending</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">radiobutton-ascending-sort-1</property>
                           </object>
@@ -1272,6 +1366,7 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -1280,6 +1375,7 @@
                 <child type="label">
                   <object class="GtkLabel" id="label25">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Sort Items By</property>
                   </object>
                 </child>
@@ -1290,64 +1386,9 @@
             </child>
           </object>
           <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="hbuttonbox1">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button43">
-                <property name="label" translatable="yes">Clear All</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button45">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button44">
-                <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
             <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </object>
@@ -1358,237 +1399,4 @@
       <action-widget response="-5">button44</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkDialog" id="e-table-config">
-    <property name="title">dialog1</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="type_hint">dialog</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox6">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkFrame" id="top-frame">
-            <property name="visible">True</property>
-            <property name="border_width">2</property>
-            <property name="label_xalign">0</property>
-            <child>
-              <object class="GtkTable" id="table1">
-                <property name="visible">True</property>
-                <property name="border_width">2</property>
-                <property name="n_rows">3</property>
-                <property name="n_columns">3</property>
-                <property name="column_spacing">4</property>
-                <property name="row_spacing">2</property>
-                <child>
-                  <object class="GtkButton" id="button-sort">
-                    <property name="label" translatable="yes">_Sort...</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="can_default">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <signal name="clicked" handler="on_sort_clicked"/>
-                  </object>
-                  <packing>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="button-group">
-                    <property name="label" translatable="yes">_Group By...</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="can_default">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <signal name="clicked" handler="on_group_by_clicked"/>
-                  </object>
-                  <packing>
-                    <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>
-                  <object class="GtkLabel" id="label-sort">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="wrap">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="button-fields">
-                    <property name="label" translatable="yes">_Fields Shown...</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="can_default">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <signal name="clicked" handler="on_group_by_clicked"/>
-                  </object>
-                  <packing>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label-fields">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="wrap">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="justify">center</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">2</property>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label4">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="justify">center</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">2</property>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label33">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="justify">center</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">2</property>
-                    <property name="right_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label-group">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="wrap">True</property>
-                  </object>
-                  <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">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label26">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Description</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area6">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="cancelbutton2">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="applybutton2">
-                <property name="label">gtk-apply</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="okbutton2">
-                <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-6">cancelbutton2</action-widget>
-      <action-widget response="-10">applybutton2</action-widget>
-      <action-widget response="-5">okbutton2</action-widget>
-    </action-widgets>
-  </object>
 </interface>


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