Convert filter expressions preference data to a UAT.

The filter expressions data was shoved into the preference file in a
very loose, non-arrayed form.  It's much easier to manage in code
(and for users in a separate file) as a UAT.

The GTK GUI was hacked to use the existing UAT dialog rather than
rewrite the pref_filter_expressions.c to support a UAT. Should
be okay since it's deprecated.

Change-Id: I688cebb4b7b6594878c1398365e79a205f1902d9
Ping-Bug: 13814
Reviewed-on: https://code.wireshark.org/review/22354
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

19 files changed, 601 insertions, 783 deletions

diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols
index 614d9adfca..69466eb6ec 100644
--- a/debian/libwireshark0.symbols
+++ b/debian/libwireshark0.symbols
@@ -578,7 +578,6 @@ libwireshark.so.0 libwireshark0 #MINVER#
  fc_fc4_val@Base 1.9.1
  fetch_tapped_data@Base 1.9.1
  filter_expression_new@Base 1.9.1
- filter_expression_free@Base 1.99.3
  find_and_mark_frame_depended_upon@Base 1.12.0~rc1
  find_capture_dissector@Base 2.3.0
  find_circuit@Base 1.9.1
@@ -933,7 +932,6 @@ libwireshark.so.0 libwireshark0 #MINVER#
  p_get_proto_data@Base 1.9.1
  p_remove_proto_data@Base 1.12.0~rc1
  parse_key_string@Base 1.9.1
- pfilter_expression_head@Base 1.9.1
  plugin_if_apply_filter@Base 1.99.8
  plugin_if_get_ws_info@Base 2.1.0
  plugin_if_goto_frame@Base 2.0.0
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 2b361f30f8..25b1bbceed 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -31,6 +31,10 @@ since version 2.4.0:
 * Add color support for TShark with --color option (non-Windows only)
 * TCP Analysis will detect and flag more spurious retransmissions.
 * The "matches" display filter operator is now case-insensitive.
+* Display expression (button) preferences have been converted to a UAT.
+  This puts the display expressions in their own file.  Wireshark still
+  supports preference files that contain the old preferences, but new
+  preference files will be written without the old fields.
 
 //=== Removed Dissectors
 
diff --git a/epan/filter_expressions.c b/epan/filter_expressions.c
index bf5a29033a..048bad65bd 100644
--- a/epan/filter_expressions.c
+++ b/epan/filter_expressions.c
@@ -22,64 +22,106 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <string.h>
 #include <glib.h>
 
 #include <epan/prefs.h>
+#include <epan/uat.h>
+#include <epan/uat-int.h>
 
 #include "epan/filter_expressions.h"
 
-static struct filter_expression *_filter_expression_head = NULL;
-struct filter_expression **pfilter_expression_head = &_filter_expression_head;
+/* UAT variables */
+static uat_t            *display_filter_macro_uat = NULL;
+static filter_expression_t *display_filter_macros = NULL;
+static guint             num_display_filter_macros = 0;
+
+/* Field callbacks. */
+UAT_BOOL_CB_DEF(display_filter_macro_uat, enabled, filter_expression_t)
+UAT_CSTRING_CB_DEF(display_filter_macro_uat, label, filter_expression_t)
+UAT_DISPLAY_FILTER_CB_DEF(display_filter_macro_uat, expression, filter_expression_t)
 
 /*
  * Create a new filter_expression and add it to the end of the list
  * of filter_expressions.
  */
-struct filter_expression *
+filter_expression_t*
 filter_expression_new(const gchar *label, const gchar *expr,
 		      const gboolean enabled)
 {
-	struct filter_expression *expression;
-	struct filter_expression *prev;
-
-	expression = (struct filter_expression *)g_malloc0(sizeof(struct filter_expression));
-	expression->label = g_strdup(label);
-	expression->expression = g_strdup(expr);
-	expression->enabled = enabled;
-
-	/* Add it at the end so the button order is always the same*/
-	if (*pfilter_expression_head == NULL) {
-		_filter_expression_head = expression;
-	} else {
-		prev = *pfilter_expression_head;
-		while (prev->next != NULL)
-			prev = prev->next;
-		prev->next = expression;
-		expression->filter_index = prev->filter_index + 1;
-	}
+	filter_expression_t expression;
 
-	return(expression);
+	//UAT does the allocation of memory before copying structure
+	memset(&expression, 0, sizeof(expression));
+	expression.label = g_strdup(label);
+	expression.expression = g_strdup(expr);
+	expression.enabled = enabled;
+
+	/* XXX - This is just returned to make GTK GUI work. */
+	return (filter_expression_t*)uat_add_record(display_filter_macro_uat, &expression, TRUE);
 }
 
-void
-filter_expression_init(void)
+void filter_expression_iterate_expressions(wmem_foreach_func func, void* user_data)
 {
-	prefs.filter_expressions = pfilter_expression_head;
+	guint i;
+
+	for (i = 0; i < num_display_filter_macros; i++)
+	{
+		func(NULL, &display_filter_macros[i], user_data);
+	}
 }
 
-void
-filter_expression_free(struct filter_expression *list_head)
-{
-	if (list_head == NULL)
-		return;
-	filter_expression_free(list_head->next);
-	g_free(list_head->label);
-	g_free(list_head->expression);
-	g_free(list_head);
+static void display_filter_free_cb(void*r) {
+	filter_expression_t* rec = (filter_expression_t*)r;
+
+	g_free(rec->label);
+	g_free(rec->expression);
+}
+
+static void* display_filter_copy_cb(void* n, const void* o, size_t siz _U_) {
+	filter_expression_t* new_record = (filter_expression_t*)n;
+	const filter_expression_t* old_record = (const filter_expression_t*)o;
+
+	new_record->button = old_record->button;
+	new_record->label = g_strdup(old_record->label);
+	new_record->expression = g_strdup(old_record->expression);
+
+	new_record->enabled = old_record->enabled;
+
+	return new_record;
 }
 
+static uat_field_t display_filter_uat_flds[] = {
+	UAT_FLD_BOOL(display_filter_macro_uat, enabled, "Enabled",
+		"Checked to add display filter button to toolbar"),
+	UAT_FLD_CSTRING(display_filter_macro_uat, label, "Button Label",
+		"Name of the display filter button"),
+	UAT_FLD_DISPLAY_FILTER(display_filter_macro_uat, expression, "Filter Expression",
+		"Filter expression to be applied by the button"),
+	UAT_END_FIELDS
+};
+
+void filter_expression_register_uat(module_t* pref_module)
+{
+	display_filter_macro_uat = uat_new("Display expressions",
+			sizeof(filter_expression_t),   /* record size */
+			"dfilter_buttons",          /* filename */
+			TRUE,                       /* from_profile */
+			&display_filter_macros,     /* data_ptr */
+			&num_display_filter_macros, /* numitems_ptr */
+			0,                          /* Doesn't not explicitly effect dissection */
+			NULL,                       /* help */
+			display_filter_copy_cb,     /* copy callback */
+			NULL,                       /* update callback */
+			display_filter_free_cb,     /* free callback */
+			NULL,                       /* post update callback */
+			NULL,                       /* reset callback */
+			display_filter_uat_flds);   /* UAT field definitions */
+
+	prefs_register_uat_preference(pref_module, "expressions",
+			"Display filter expressions",
+			"Macros for display filters",
+			display_filter_macro_uat);
+}
 
 
 /*
diff --git a/epan/filter_expressions.h b/epan/filter_expressions.h
index a5042fff09..a9af58860a 100644
--- a/epan/filter_expressions.h
+++ b/epan/filter_expressions.h
@@ -25,6 +25,9 @@
 
 #include "ws_symbol_export.h"
 
+#include <epan/prefs.h>
+#include <epan/wmem/wmem.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -33,19 +36,15 @@ extern "C" {
  * Filter expressions.
  */
 
-struct filter_expression {
-	gpointer button;	/* Filter toolbar */
+typedef struct filter_expression {
+	gpointer button;	/* Filter toolbar (GTK only) */
 	gchar	*label;
 	gchar	*expression;
 
-	gint	 filter_index;
 	gboolean enabled;	/* Can be set to FALSE by Preferences Dialog */
-	gboolean deleted;	/* Can be set to TRUE by Preferences Dialog (GTK+ only) */
-
-	struct filter_expression *next;
-};
+} filter_expression_t;
 
-WS_DLL_PUBLIC struct filter_expression **pfilter_expression_head;
+WS_DLL_PUBLIC void filter_expression_iterate_expressions(wmem_foreach_func func, void* user_data);
 
 /** Create a filter expression
  *
@@ -55,16 +54,11 @@ WS_DLL_PUBLIC struct filter_expression **pfilter_expression_head;
  * @return A newly allocated and initialized struct filter_expression.
  */
 WS_DLL_PUBLIC
-struct filter_expression *filter_expression_new(const gchar *label,
+filter_expression_t *filter_expression_new(const gchar *label,
     const gchar *expr, const gboolean enabled);
 
-void filter_expression_init(void);
-
-/** Clear the filter expression list.
- * Frees each item in the list. Caller should set list_head to NULL afterward.
- */
-WS_DLL_PUBLIC
-void filter_expression_free(struct filter_expression *list_head);
+/* Keep the UAT structure local to the filter_expressions */
+void filter_expression_register_uat(module_t* pref_module);
 
 #ifdef __cplusplus
 }
diff --git a/epan/prefs.c b/epan/prefs.c
index 854fba53c8..a63223b221 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -3356,6 +3356,14 @@ prefs_register_modules(void)
                                    "Look for dissectors that left some bytes undecoded (debug)",
                                    &prefs.incomplete_dissectors_check_debug);
 
+    /* Display filter Expressions
+     * This used to be an array of individual fields that has now been
+     * converted to a UAT.  Just make it part of the GUI category even
+     * though the name of the preference will never be seen in preference
+     * file
+     */
+    filter_expression_register_uat(gui_module);
+
     /* Capture
      * These are preferences that can be read/written using the
      * preference module API.  These preferences still use their own
@@ -3890,8 +3898,6 @@ init_prefs(void)
 
     prefs_register_modules();
 
-    filter_expression_init();
-
     prefs_initialized = TRUE;
 }
 
@@ -4207,12 +4213,6 @@ prefs_reset(void)
     oids_cleanup();
 
     /*
-     * Free the filter expression list.
-     */
-    filter_expression_free(*pfilter_expression_head);
-    *pfilter_expression_head = NULL;
-
-    /*
      * Reset the non-dissector preferences.
      */
     init_prefs();
@@ -5299,6 +5299,8 @@ set_pref(gchar *pref_name, const gchar *value, void *private_data _U_,
     pref_t   *pref;
     int type;
 
+    //The PRS_GUI field names are here for backwards compatibility
+    //display filters have been converted to a UAT.
     if (strcmp(pref_name, PRS_GUI_FILTER_LABEL) == 0) {
         filter_label = g_strdup(value);
     } else if (strcmp(pref_name, PRS_GUI_FILTER_ENABLED) == 0) {
@@ -6370,6 +6372,35 @@ write_pref(gpointer data, gpointer user_data)
 
 }
 
+static void
+count_non_uat_pref(gpointer data, gpointer user_data)
+{
+    pref_t *pref = (pref_t *)data;
+    int *arg = (int *)user_data;
+
+    switch (pref->type)
+    {
+    case PREF_UAT:
+    case PREF_OBSOLETE:
+    case PREF_DECODE_AS_UINT:
+    case PREF_DECODE_AS_RANGE:
+        //These types are not written in preference file
+        break;
+    default:
+        (*arg)++;
+        break;
+    }
+}
+
+static int num_non_uat_prefs(module_t *module)
+{
+    int num = 0;
+
+    g_list_foreach(module->prefs, count_non_uat_pref, &num);
+
+    return num;
+}
+
 /*
  * Write out all preferences for a module.
  */
@@ -6387,7 +6418,7 @@ write_module_prefs(module_t *module, gpointer user_data)
     /* Write a header for the main modules and GUI sub-modules */
     if (((module->parent == NULL) || (module->parent == gui_module)) &&
         ((prefs_module_has_submodules(module)) ||
-         (module->numprefs > 0) ||
+         (num_non_uat_prefs(module) > 0) ||
          (module->name == NULL))) {
          if ((module->name == NULL) && (module->parent != NULL)) {
             fprintf(gui_pref_arg->pf, "\n####### %s: %s ########\n", module->parent->title, module->title);
@@ -6457,23 +6488,6 @@ write_prefs(char **pf_path_return)
 
     write_module_prefs(gui_module, &write_gui_pref_info);
 
-    {
-        struct filter_expression *fe = *(struct filter_expression **)prefs.filter_expressions;
-
-        if (fe != NULL)
-            fprintf(pf, "\n####### Filter Expressions ########\n\n");
-
-        while (fe != NULL) {
-            if (fe->deleted == FALSE) {
-                fprintf(pf, "%s: %s\n", PRS_GUI_FILTER_LABEL, fe->label);
-                fprintf(pf, "%s: %s\n", PRS_GUI_FILTER_ENABLED,
-                        fe->enabled == TRUE ? "TRUE" : "FALSE");
-                fprintf(pf, "%s: %s\n", PRS_GUI_FILTER_EXPR, fe->expression);
-            }
-            fe = fe->next;
-        }
-    }
-
     write_gui_pref_info.is_gui_module = FALSE;
     prefs_modules_foreach_submodules(NULL, write_module_prefs, &write_gui_pref_info);
 
diff --git a/epan/prefs.h b/epan/prefs.h
index 96546a188a..eba5e65fbb 100644
--- a/epan/prefs.h
+++ b/epan/prefs.h
@@ -220,7 +220,6 @@ typedef struct _e_prefs {
   gboolean     display_byte_fields_with_spaces;
   gboolean     enable_incomplete_dissectors_check;
   gboolean     incomplete_dissectors_check_debug;
-  gpointer     filter_expressions;/* Actually points to &head */
   gboolean     gui_update_enabled;
   software_update_channel_e gui_update_channel;
   gint         gui_update_interval;
diff --git a/ui/gtk/filter_expression_save_dlg.c b/ui/gtk/filter_expression_save_dlg.c
index 922fa68ec4..d60778d505 100644
--- a/ui/gtk/filter_expression_save_dlg.c
+++ b/ui/gtk/filter_expression_save_dlg.c
@@ -29,6 +29,7 @@
 #include <gtk/gtk.h>
 
 #include <epan/prefs.h>
+#include <epan/uat-int.h>
 
 
 #include "ui/preference_utils.h"
@@ -64,6 +65,18 @@ static GtkWidget *filter_save_frame_w;
 GtkWidget *_filter_tb = NULL;
 GtkWidget *_filter_te = NULL;
 
+static GList * filter_buttons = NULL;
+
+static gboolean
+add_filter_expression_button(const void *key _U_, void *value, void *user_data _U_)
+{
+	filter_expression_t* fe = (filter_expression_t*)value;
+
+	filter_button_add(NULL, NULL, fe);
+
+	return FALSE;
+}
+
 /*
  * This does do two things:
  * - Keep track of the various elements of the Filter Toolbar which will
@@ -75,76 +88,44 @@ GtkWidget *_filter_te = NULL;
 void
 filter_expression_save_dlg_init(gpointer filter_tb, gpointer filter_te)
 {
-	struct filter_expression *fe;
-
 	_filter_tb = (GtkWidget *)filter_tb;
 	_filter_te = (GtkWidget *)filter_te;
 
-	fe = *pfilter_expression_head;
-	while (fe != NULL) {
-		filter_button_add(NULL, NULL, fe);
-		fe = fe->next;
-	}
+	filter_expression_iterate_expressions(add_filter_expression_button, NULL);
+}
+
+static gboolean
+add_filter_buttons(const void *key _U_, void *value, void *user_data _U_)
+{
+	filter_expression_t* fe = (filter_expression_t*)value;
+
+	filter_button_add(NULL, NULL, fe);
+
+	return FALSE;
 }
 
 void
 filter_expression_reinit(int what)
 {
-	struct filter_expression *fe, *prevhead;
-
+	GList *button_list;
 	if ((what & FILTER_EXPRESSION_REINIT_DESTROY) != 0) {
-		fe = *pfilter_expression_head;
-		while (fe != NULL) {
-			if (fe->button != NULL) {
-				gtk_widget_destroy((GtkWidget *)fe->button);
-				fe->button = NULL;
-			}
-			fe = fe->next;
+		for(button_list = filter_buttons; button_list != NULL; button_list = g_list_next(button_list)) {
+			gtk_widget_destroy((GtkWidget *)button_list->data);
 		}
+		g_list_free(filter_buttons);
+		filter_buttons = NULL;
 	}
+
 	if (what == FILTER_EXPRESSION_REINIT_DESTROY) {
-		filter_expression_free(*pfilter_expression_head);
-		*pfilter_expression_head = NULL;
 		return;
 	}
 
 	if ((what & FILTER_EXPRESSION_REINIT_CREATE) != 0) {
-		gint maxindx = -1, indx;
-		fe = *pfilter_expression_head;
-		while (fe != NULL) {
-			maxindx = MAX(maxindx, fe->filter_index);
-			fe = fe->next;
-		}
-
-		prevhead = *pfilter_expression_head;
-		*pfilter_expression_head = NULL;
-
-		/*
-		 * The list should be in the order identified by the
-		 * index member.
-		 */
-		for (indx = 0; indx <= maxindx; indx++) {
-			if (prevhead != NULL) {
-				fe = prevhead;
-				while (fe != NULL && fe->filter_index != indx)
-					fe = fe->next;
-			}
-			if (fe == NULL)
-				continue;	/* Shouldn't happen */
-			if (fe->deleted)
-				continue;	/* Could happen */
-			filter_expression_new(fe->label, fe->expression,
-			    fe->enabled);
-		}
-		filter_expression_free(prevhead);
-
-		/* Create the buttons again */
-		fe = *pfilter_expression_head;
-		while (fe != NULL) {
-			if (fe->enabled && !fe->deleted)
-				filter_button_add(NULL, NULL, fe);
-			fe = fe->next;
-		}
+		/* XXX - Updating of the filter index was removed
+			when filter expressions were converted to a UAT.
+			This will probably cause some "reordering" bugs,
+			but they should be ignored since GTK GUI is deprecated */
+		filter_expression_iterate_expressions(add_filter_buttons, NULL);
 	}
 }
 
@@ -152,6 +133,7 @@ static int
 filter_button_add(const char *label, const char *expr, struct filter_expression *newfe)
 {
 	struct filter_expression *fe;
+	GtkWidget *button;
 
 	/* No duplicate buttons when adding a new one  */
 	if (newfe == NULL)
@@ -163,35 +145,42 @@ filter_button_add(const char *label, const char *expr, struct filter_expression
 		return(0);
 
 	/* Create the "Label" button */
-	fe->button = gtk_tool_button_new(NULL, fe->label);
-	g_signal_connect(fe->button, "clicked", G_CALLBACK(filter_button_cb),
+	button = (GtkWidget*)gtk_tool_button_new(NULL, fe->label);
+	g_signal_connect(button, "clicked", G_CALLBACK(filter_button_cb),
 	    NULL);
-	gtk_widget_set_sensitive(GTK_WIDGET(fe->button), FALSE);
-	gtk_widget_show(GTK_WIDGET(fe->button));
+	gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE);
+	gtk_widget_show(GTK_WIDGET(button));
 
-	gtk_toolbar_insert(GTK_TOOLBAR(_filter_tb), (GtkToolItem *)fe->button, -1);
-	gtk_widget_set_sensitive(GTK_WIDGET(fe->button), TRUE);
-	gtk_widget_set_tooltip_text(GTK_WIDGET(fe->button), fe->expression);
+	gtk_toolbar_insert(GTK_TOOLBAR(_filter_tb), (GtkToolItem *)button, -1);
+	gtk_widget_set_sensitive(GTK_WIDGET(button), TRUE);
+	gtk_widget_set_tooltip_text(GTK_WIDGET(button), fe->expression);
+
+	fe->button = button;
+	filter_buttons = g_list_append (filter_buttons, button);
 
 	return(0);
 }
 
+static gboolean
+find_match_filter_button(const void *key _U_, void *value, void *user_data)
+{
+	filter_expression_t* fe = (filter_expression_t*)value;
+	GtkWidget *this_button = (GtkWidget *)user_data;
+
+	if ((void *)fe->button == (void *)this_button) {
+		gtk_entry_set_text(GTK_ENTRY(_filter_te),
+			fe->expression);
+		main_filter_packets(&cfile, fe->expression, FALSE);
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
 static void
 filter_button_cb(GtkWidget *this_button, gpointer parent_w _U_)
 {
-	struct filter_expression *fe;
-
-	fe = *pfilter_expression_head;
-	while (fe != NULL) {
-		if ((void *)fe->button == (void *)this_button) {
-			gtk_entry_set_text(GTK_ENTRY(_filter_te),
-			    fe->expression);
-			main_filter_packets(&cfile, fe->expression, FALSE);
-			return;
-		}
-		fe = fe->next;
-	}
-	printf("No Callback\n");
+	filter_expression_iterate_expressions(find_match_filter_button, this_button);
 }
 
 void
@@ -317,7 +306,12 @@ filter_save_ok_cb(GtkWidget *ok_bt _U_, GtkWindow *parent_w)
 	label = gtk_entry_get_text(GTK_ENTRY(label_te));
 
 	if (filter_button_add(label, expr, NULL) == 0) {
-		prefs_main_write();
+		gchar *err = NULL;
+
+		//Filter buttons are just a UAT, so only need to save that
+		uat_save(uat_get_table_by_name("Display expressions"), &err);
+		//ignore any errors
+		g_free(err);
 		filter_save_close_cb(NULL, parent_w);
 	}
 }
diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c
index 13d29f319d..d597365837 100644
--- a/ui/gtk/prefs_dlg.c
+++ b/ui/gtk/prefs_dlg.c
@@ -40,6 +40,7 @@
 #include "ui/gtk/prefs_column.h"
 #include "ui/gtk/prefs_dlg.h"
 #include "ui/gtk/prefs_filter_expressions.h"
+#include "ui/gtk/filter_expression_save_dlg.h"
 #include "ui/gtk/prefs_font_color.h"
 #include "ui/gtk/prefs_gui.h"
 #include "ui/gtk/prefs_layout.h"
@@ -1295,8 +1296,9 @@ prefs_main_fetch_all(GtkWidget *dlg, gboolean *must_redissect)
   }
 #endif /* _WIN32 */
 #endif /* HAVE_LIBPCAP */
-  filter_expressions_prefs_fetch((GtkWidget *)g_object_get_data(G_OBJECT(dlg),
-    E_FILTER_EXPRESSIONS_PAGE_KEY));
+
+  /* Handle (re)creation of filter buttons */
+  filter_expression_reinit(FILTER_EXPRESSION_REINIT_DESTROY | FILTER_EXPRESSION_REINIT_CREATE);
   prefs_modules_foreach(module_prefs_fetch, must_redissect);
 
   return TRUE;
diff --git a/ui/gtk/prefs_filter_expressions.c b/ui/gtk/prefs_filter_expressions.c
index f3ae59c93c..d721f470f6 100644
--- a/ui/gtk/prefs_filter_expressions.c
+++ b/ui/gtk/prefs_filter_expressions.c
@@ -25,356 +25,68 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
-
+#include <epan/uat.h>
 
 
 #include "ui/gtk/gui_utils.h"
-#include "ui/gtk/filter_expression_save_dlg.h"
+#include "ui/gtk/uat_gui.h"
 #include "ui/gtk/prefs_filter_expressions.h"
 #include "ui/gtk/stock_icons.h"
 
-static void filter_expressions_list_new_cb(GtkWidget *, gpointer);
-static void filter_expressions_list_remove_cb(GtkWidget *, gpointer);
-static gboolean filter_expressions_label_changed_cb(GtkCellRendererText *, const gchar *, const gchar *, gpointer);
-static gboolean filter_expressions_expression_changed_cb(GtkCellRendererText *, const gchar *, const gchar *, gpointer);
-
-#define E_FILTER_EXPRESSION_COLUMNL     "filter_expression_columnl"
-#define E_FILTER_EXPRESSION_STORE       "filter_expression_store"
-
-enum {
-    ENABLED_COLUMN,
-    LABEL_COLUMN,
-    EXPRESSION_COLUMN,
-    DATA_COLUMN,
-    N_COLUMN /* The number of columns */
-};
-
-/* Visible toggled */
-static void
-enable_toggled(GtkCellRendererToggle *cell _U_, gchar *path_str, gpointer data)
-{
-    GtkTreeModel    *model = (GtkTreeModel *)data;
-    GtkTreeIter      iter;
-    GtkTreePath     *path = gtk_tree_path_new_from_string(path_str);
-    struct filter_expression *fe;
-
-    gtk_tree_model_get_iter(model, &iter, path);
-    gtk_tree_model_get(model, &iter, DATA_COLUMN, &fe, -1);
-
-    fe->enabled = !fe->enabled;
-
-    gtk_list_store_set(GTK_LIST_STORE(model), &iter, ENABLED_COLUMN,
-            fe->enabled, -1);
-
-    gtk_tree_path_free(path);
-} /* visible_toggled */
-
 /*
- * Create and display the column selection widgets.
+ * Create and display the expression filter UAT
  * Called as part of the creation of the Preferences notebook ( Edit ! Preferences )
  */
 GtkWidget *
 filter_expressions_prefs_show(void) {
-    GtkWidget          *main_vb, *bottom_hb, *column_l, *add_bt, *remove_bt;
-    GtkWidget          *list_vb, *list_lb, *list_sc;
-    GtkWidget          *add_remove_hb;
-    GtkListStore       *store;
-    GtkCellRenderer    *renderer;
-    GtkTreeViewColumn  *column;
-    GtkTreeSelection   *sel;
-    GtkTreeIter         iter;
-    GtkTreeIter         first_iter;
-    gint                first_row = TRUE;
-    struct filter_expression *fe;
-    static const gchar *column_titles[] = {"Enabled", "Label", "Filter Expression"};
-
-    /* Container for each row of widgets */
-    main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 5, FALSE);
-    gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
-    gtk_widget_show(main_vb);
-
-    list_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
-    gtk_container_set_border_width(GTK_CONTAINER(list_vb), 5);
-    gtk_widget_show(list_vb);
-    gtk_box_pack_start(GTK_BOX(main_vb), list_vb, TRUE, TRUE, 0);
-
-    list_lb = gtk_label_new(("[The first list entry will be displayed as the "
-                "first button right of the Save button - Drag and drop entries to "
-                "change column order]"));
-    gtk_widget_show(list_lb);
-    gtk_box_pack_start(GTK_BOX(list_vb), list_lb, FALSE, FALSE, 0);
-
-    list_sc = scrolled_window_new(NULL, NULL);
-    gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(list_sc),
-            GTK_SHADOW_IN);
-    gtk_box_pack_start(GTK_BOX(list_vb), list_sc, TRUE, TRUE, 0);
-    gtk_widget_show(list_sc);
-
-    store = gtk_list_store_new(N_COLUMN,
-            G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING,
-            G_TYPE_POINTER);
-
-    column_l = tree_view_new(GTK_TREE_MODEL(store));
-    gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(column_l), TRUE);
-    gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(column_l), FALSE);
-    gtk_tree_view_set_reorderable(GTK_TREE_VIEW(column_l), TRUE);
-    gtk_widget_set_tooltip_text(column_l, "Click on a label or expression to "
-            "change its name.\nDrag an item to change its order.\nTick 'Enable' "
-            "to enable the filter in the buttons.");
 
-    /* Enabled button */
-    renderer = gtk_cell_renderer_toggle_new();
-    g_signal_connect(renderer, "toggled", G_CALLBACK(enable_toggled), store);
-    column = gtk_tree_view_column_new_with_attributes(
-            column_titles[ENABLED_COLUMN], renderer, "active", ENABLED_COLUMN, NULL);
-    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(column_l), column);
-
-    /* Label editor */
-    renderer = gtk_cell_renderer_text_new();
-    g_object_set(G_OBJECT(renderer), "editable", TRUE, NULL);
-    g_signal_connect(renderer, "edited",
-            G_CALLBACK(filter_expressions_label_changed_cb), GTK_TREE_MODEL(store));
-    column = gtk_tree_view_column_new_with_attributes(
-            column_titles[LABEL_COLUMN], renderer, "text", LABEL_COLUMN, NULL);
-    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(column_l), column);
-
-    /* Expression editor */
-    renderer = gtk_cell_renderer_text_new();
-    g_object_set(G_OBJECT(renderer), "editable", TRUE, NULL);
-    g_signal_connect(renderer, "edited",
-            G_CALLBACK(filter_expressions_expression_changed_cb),
-            GTK_TREE_MODEL(store));
-    column = gtk_tree_view_column_new_with_attributes(
-            column_titles[EXPRESSION_COLUMN], renderer, "text", EXPRESSION_COLUMN, NULL);
-    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(column_l), column);
-
-    /* XXX - make this match the packet list prefs? */
-    sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(column_l));
-    gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
-
-    gtk_container_add(GTK_CONTAINER(list_sc), column_l);
-    gtk_widget_show(column_l);
-
-    fe = *pfilter_expression_head;
-    while (fe != NULL) {
-        fe->filter_index = -1;
-        gtk_list_store_insert_with_values(store, &iter, G_MAXINT,
-                ENABLED_COLUMN, fe->enabled,
-                LABEL_COLUMN, fe->label,
-                EXPRESSION_COLUMN, fe->expression,
-                DATA_COLUMN, fe,
-                -1);
-
-        if (first_row) {
-            first_iter = iter;
-            first_row = FALSE;
-        }
-        fe = fe->next;
-    }
-    g_object_unref(G_OBJECT(store));
-
-    /* Bottom row: Add/remove buttons */
-    bottom_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5, FALSE);
-    gtk_box_pack_start(GTK_BOX(main_vb), bottom_hb, FALSE, TRUE, 0);
-    gtk_widget_show(bottom_hb);
-
-    /* Add button */
-    add_remove_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, TRUE);
-    gtk_container_set_border_width(GTK_CONTAINER(add_remove_hb), 5);
-    gtk_box_pack_start(GTK_BOX(bottom_hb), add_remove_hb, FALSE, FALSE, 0);
-    gtk_widget_show(add_remove_hb);
-
-    add_bt = ws_gtk_button_new_from_stock(GTK_STOCK_ADD);
-    g_signal_connect(add_bt, "clicked",
-            G_CALLBACK(filter_expressions_list_new_cb), column_l);
-    gtk_box_pack_start(GTK_BOX(add_remove_hb), add_bt, FALSE, FALSE, 0);
-    gtk_widget_set_tooltip_text(add_bt,
-            "Add a new row at the end of the list.");
-    gtk_widget_show(add_bt);
-
-    /* Remove button */
-    remove_bt = ws_gtk_button_new_from_stock(GTK_STOCK_REMOVE);
-    g_signal_connect(remove_bt, "clicked",
-            G_CALLBACK(filter_expressions_list_remove_cb), column_l);
-    gtk_box_pack_start(GTK_BOX(add_remove_hb), remove_bt, FALSE, FALSE, 0);
-    gtk_widget_set_tooltip_text(remove_bt, "Remove the selected row.");
-    gtk_widget_show(remove_bt);
-
-    /* select the first menu list row.             */
-    /*  Triggers call to column_list_select_cb().  */
-    if (first_row == FALSE)
-        gtk_tree_selection_select_iter(sel, &first_iter);
-
-    g_object_set_data(G_OBJECT(main_vb), E_FILTER_EXPRESSION_COLUMNL, column_l);
-    g_object_set_data(G_OBJECT(main_vb), E_FILTER_EXPRESSION_STORE, store);
-
-    return(main_vb);
-}
-
-static void
-filter_expressions_list_remove_cb(GtkWidget *w _U_, gpointer data)
-{
-    GtkTreeView      *column_l = GTK_TREE_VIEW(data);
-    GtkTreeSelection *sel;
-    GtkTreeModel     *model;
-    GtkTreeIter       iter;
-    struct filter_expression *fe;
-
-    sel = gtk_tree_view_get_selection(column_l);
-    if (!gtk_tree_selection_get_selected(sel, &model, &iter))
-        return;
-
-    gtk_tree_model_get(model, &iter, DATA_COLUMN, &fe, -1);
-    fe->deleted = TRUE;
-
-    gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
-}
-
-static void
-filter_expressions_list_new_cb(GtkWidget *w _U_, gpointer data _U_)
-{
-    const gchar       *label = "New Label";
-    const gchar       *expression = "New Expression";
-    GtkTreeView       *fe_l = GTK_TREE_VIEW(data);
-    GtkTreeModel      *model;
-    GtkTreeIter        iter;
-    GtkTreePath       *path;
-    GtkTreeViewColumn *label_column;
-    struct filter_expression *fe;
-
-    fe = filter_expression_new(label, expression, TRUE);
-
-    model = gtk_tree_view_get_model(fe_l);
-    gtk_list_store_insert_with_values(GTK_LIST_STORE(model), &iter, G_MAXINT,
-            ENABLED_COLUMN, fe->enabled,
-            LABEL_COLUMN, fe->label,
-            EXPRESSION_COLUMN, fe->expression,
-            DATA_COLUMN, fe,
-            -1);
-
-    /* Triggers call to column_list_select_cb()   */
-    gtk_tree_selection_select_iter(gtk_tree_view_get_selection(fe_l), &iter);
-
-    /* Set the cursor to the 'Title' column of the newly added row and enable
-     * editing
-     * XXX: If displaying the new title ["New column"] widens the title column
-     * of the treeview, then the set_cursor below doesn't properly generate an
-     * entry box around the title text. The width of the box appears to be the
-     * column width before the treeview title column was widened. Seems like a
-     * bug...
-     *
-     *      I haven't found a work-around.
-     */
-    path = gtk_tree_model_get_path(model, &iter);
-    label_column = gtk_tree_view_get_column(fe_l, 2);
-    gtk_tree_view_set_cursor(fe_l, path, label_column, TRUE);
-    gtk_tree_path_free(path);
-}
-
-
-static gboolean
-filter_expressions_expression_changed_cb(GtkCellRendererText *cell _U_, const gchar *str_path, const gchar *new_expression, gpointer data)
-{
-    struct filter_expression *fe;
-    GtkTreeModel *model = (GtkTreeModel *)data;
-    GtkTreePath  *path = gtk_tree_path_new_from_string(str_path);
-    GtkTreeIter   iter;
-
-    gtk_tree_model_get_iter(model, &iter, path);
-    gtk_list_store_set(GTK_LIST_STORE(model), &iter, EXPRESSION_COLUMN,
-            new_expression, -1);
-
-    gtk_tree_model_get(model, &iter, DATA_COLUMN, &fe, -1);
-    if (fe != NULL) {
-        g_free(fe->expression);
-        fe->expression = g_strdup(new_expression);
-    }
-
-    gtk_tree_path_free(path);
-    return(TRUE);
-}
-
-static gboolean
-filter_expressions_label_changed_cb(GtkCellRendererText *cell _U_, const gchar *str_path, const gchar *new_label, gpointer data)
-{
-    struct filter_expression *fe;
-    GtkTreeModel *model = (GtkTreeModel *)data;
-    GtkTreePath  *path = gtk_tree_path_new_from_string(str_path);
-    GtkTreeIter   iter;
-
-    gtk_tree_model_get_iter(model, &iter, path);
-    gtk_list_store_set(GTK_LIST_STORE(model), &iter, LABEL_COLUMN, new_label, -1);
-
-    gtk_tree_model_get(model, &iter, DATA_COLUMN, &fe, -1);
-    if (fe != NULL) {
-        g_free(fe->label);
-        fe->label = g_strdup(new_label);
-    }
-
-    gtk_tree_path_free(path);
-    return TRUE;
-}
-
-
-void
-filter_expressions_prefs_fetch(GtkWidget *w)
-{
-    gboolean      items_left;
-    GtkTreeModel *model;
-    GtkTreeView  *column_l;
-    GtkTreeIter   iter;
-    GtkListStore *store;
-    struct filter_expression *fe;
-    gint          first_row = TRUE;
-    gint          indx = 0;
-
-    column_l = (GtkTreeView *)g_object_get_data(G_OBJECT(w),
-            E_FILTER_EXPRESSION_COLUMNL);
-    model = gtk_tree_view_get_model(column_l);
-    store = (GtkListStore *)g_object_get_data(G_OBJECT(w),
-            E_FILTER_EXPRESSION_STORE);
-
-    /* Record the order of the items in the list.  */
-    items_left = gtk_tree_model_get_iter_first(model, &iter);
-    while (items_left) {
-        gtk_tree_model_get(model, &iter, DATA_COLUMN, &fe, -1);
-        if (fe != NULL)
-            fe->filter_index = indx++;
-        items_left = gtk_tree_model_iter_next (model, &iter);
-    }
-
-    filter_expression_reinit(FILTER_EXPRESSION_REINIT_DESTROY | FILTER_EXPRESSION_REINIT_CREATE);
-
-    gtk_list_store_clear(store);
-    fe = *pfilter_expression_head;
-    while (fe != NULL) {
-        fe->filter_index = -1;
-        gtk_list_store_insert_with_values(store, &iter, G_MAXINT,
-                ENABLED_COLUMN, fe->enabled,
-                LABEL_COLUMN, fe->label,
-                EXPRESSION_COLUMN, fe->expression,
-                DATA_COLUMN, fe,
-                -1);
-
-        if (first_row) {
-            first_row = FALSE;
-        }
-        fe = fe->next;
-    }
+	GtkWidget	*filter_window, *main_grid, *expression_lb, *expression_bt;
+	int		row = 0;
+	const gchar     *tooltips_text;
+
+	/* Main vertical box */
+	filter_window = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 7, FALSE);
+	gtk_container_set_border_width(GTK_CONTAINER(filter_window), 5);
+
+	/* Main grid */
+	main_grid = ws_gtk_grid_new();
+	gtk_box_pack_start(GTK_BOX(filter_window), main_grid, FALSE, FALSE, 0);
+#if GTK_CHECK_VERSION(3,0,0)
+	gtk_widget_set_vexpand(GTK_WIDGET(main_grid), FALSE); /* Ignore VEXPAND requests from children */
+#endif
+	ws_gtk_grid_set_row_spacing(GTK_GRID(main_grid), 10);
+	ws_gtk_grid_set_column_spacing(GTK_GRID(main_grid), 15);
+	gtk_widget_show(main_grid);
+
+
+	/* Interface properties */
+	expression_lb = gtk_label_new("Display filter expressions:");
+	ws_gtk_grid_attach_defaults(GTK_GRID(main_grid), expression_lb, 0, row, 1, 1);
+	gtk_misc_set_alignment(GTK_MISC(expression_lb), 1.0f, 0.5f);
+	gtk_widget_show(expression_lb);
+
+	expression_bt = ws_gtk_button_new_from_stock(WIRESHARK_STOCK_EDIT);
+	tooltips_text = "Open a dialog box to configure display filter expression buttons.";
+	gtk_widget_set_tooltip_text(expression_lb, tooltips_text);
+	gtk_widget_set_tooltip_text(expression_bt, tooltips_text);
+	g_signal_connect(expression_bt, "clicked", G_CALLBACK(uat_window_cb), uat_get_table_by_name("Display expressions"));
+	ws_gtk_grid_attach_defaults(GTK_GRID(main_grid), expression_bt, 1, row, 1, 1);
+
+	/* Show 'em what we got */
+	gtk_widget_show_all(filter_window);
+
+	return(filter_window);
 }
 
 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
  * Local variables:
- * c-basic-offset: 4
+ * c-basic-offset: 8
  * tab-width: 8
- * indent-tabs-mode: nil
+ * indent-tabs-mode: t
  * End:
  *
- * vi: set shiftwidth=4 tabstop=8 expandtab:
- * :indentSize=4:tabSize=8:noTabs=true:
- */
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
\ No newline at end of file
diff --git a/ui/gtk/prefs_filter_expressions.h b/ui/gtk/prefs_filter_expressions.h
index 30a01fbb70..b0ea53ee65 100644
--- a/ui/gtk/prefs_filter_expressions.h
+++ b/ui/gtk/prefs_filter_expressions.h
@@ -34,10 +34,4 @@
  */
 GtkWidget *filter_expressions_prefs_show(void);
 
-/** Fetch preference values from page.
- *
- * @param widget widget from filtersave_prefs_show()
- */
-void filter_expressions_prefs_fetch(GtkWidget *widget);
-
 #endif
diff --git a/ui/gtk/uat_gui.c b/ui/gtk/uat_gui.c
index 13c89489d9..d63a153ea8 100644
--- a/ui/gtk/uat_gui.c
+++ b/ui/gtk/uat_gui.c
@@ -292,6 +292,8 @@ static gboolean uat_dlg_cb(GtkWidget *win _U_, gpointer user_data) {
 				break;
 
 			case PT_TXTMOD_STRING:
+			case PT_TXTMOD_BOOL:
+			case PT_TXTMOD_DISPLAY_FILTER:
 				text = gtk_entry_get_text(GTK_ENTRY(e));
 				len = (unsigned) strlen(text);
 				break;
@@ -515,6 +517,8 @@ static void uat_edit_dialog(uat_t *uat, gint row, gboolean copy) {
 			case PT_TXTMOD_NONE:
 			case PT_TXTMOD_STRING:
 			case PT_TXTMOD_HEXBYTES:
+			case PT_TXTMOD_DISPLAY_FILTER:
+			case PT_TXTMOD_BOOL:
 				entry = gtk_entry_new();
 				if (! dd->is_new || copy) {
 					gtk_entry_set_text(GTK_ENTRY(entry), text);
diff --git a/ui/qt/filter_expression_frame.cpp b/ui/qt/filter_expression_frame.cpp
index 2057cf1ee4..15fae7eeeb 100644
--- a/ui/qt/filter_expression_frame.cpp
+++ b/ui/qt/filter_expression_frame.cpp
@@ -23,6 +23,7 @@
 #include <ui_filter_expression_frame.h>
 
 #include <epan/filter_expressions.h>
+#include <epan/uat-int.h>
 #include <ui/preference_utils.h>
 
 #include <QPushButton>
@@ -91,6 +92,7 @@ void FilterExpressionFrame::on_labelLineEdit_textChanged(const QString)
 
 void FilterExpressionFrame::on_buttonBox_accepted()
 {
+    gchar* err = NULL;
     QByteArray label_ba = ui->labelLineEdit->text().toUtf8();
     QByteArray expr_ba = ui->displayFilterLineEdit->text().toUtf8();
 
@@ -98,7 +100,9 @@ void FilterExpressionFrame::on_buttonBox_accepted()
 
     on_buttonBox_rejected();
     emit filterExpressionsChanged();
-    prefs_main_write();
+
+    uat_save(uat_get_table_by_name("Display expressions"), &err);
+    g_free(err);
 }
 
 void FilterExpressionFrame::on_buttonBox_rejected()
diff --git a/ui/qt/filter_expressions_preferences_frame.cpp b/ui/qt/filter_expressions_preferences_frame.cpp
index 3284da5949..1b47225797 100644
--- a/ui/qt/filter_expressions_preferences_frame.cpp
+++ b/ui/qt/filter_expressions_preferences_frame.cpp
@@ -31,14 +31,13 @@
 #include "wireshark_application.h"
 
 #include "qt_ui_utils.h"
+#include <wsutil/report_message.h>
 
 #include <QLineEdit>
 #include <QKeyEvent>
 #include <QTreeWidgetItemIterator>
 
-static const int enabled_col_    = 0;
-static const int label_col_      = 1;
-static const int expression_col_ = 2;
+#include <QDebug>
 
 // This shouldn't exist in its current form. Instead it should be the "display filters"
 // dialog, and the "dfilters" file should support a "show in toolbar" flag.
@@ -46,257 +45,230 @@ static const int expression_col_ = 2;
 FilterExpressionsPreferencesFrame::FilterExpressionsPreferencesFrame(QWidget *parent) :
     QFrame(parent),
     ui(new Ui::FilterExpressionsPreferencesFrame),
-    cur_column_(0),
-    cur_line_edit_(NULL)
+    uat_model_(NULL),
+    uat_delegate_(NULL),
+    uat_(NULL)
 {
     ui->setupUi(this);
 
-    int one_em = ui->expressionTreeWidget->fontMetrics().height();
-    ui->expressionTreeWidget->resizeColumnToContents(enabled_col_);
-    ui->expressionTreeWidget->setColumnWidth(label_col_, one_em * 10);
-    ui->expressionTreeWidget->setColumnWidth(expression_col_, one_em * 5);
-
-    ui->expressionTreeWidget->setMinimumWidth(one_em * 15);
-    ui->expressionTreeWidget->setMinimumHeight(one_em * 10);
-
-    ui->expressionTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection);
-    ui->expressionTreeWidget->setDragEnabled(true);
-    ui->expressionTreeWidget->viewport()->setAcceptDrops(true);
-    ui->expressionTreeWidget->setDropIndicatorShown(true);
-    ui->expressionTreeWidget->setDragDropMode(QAbstractItemView::InternalMove);
-
-    ui->expressionTreeWidget->clear();
-
-    for (struct filter_expression *fe = *pfilter_expression_head; fe != NULL; fe = fe->next) {
-        if (fe->deleted) continue;
-        addExpression(fe->enabled, fe->label, fe->expression);
-    }
-
-    updateWidgets();
+#ifdef Q_OS_MAC
+    ui->newToolButton->setAttribute(Qt::WA_MacSmallSize, true);
+    ui->deleteToolButton->setAttribute(Qt::WA_MacSmallSize, true);
+    ui->copyToolButton->setAttribute(Qt::WA_MacSmallSize, true);
+    ui->pathLabel->setAttribute(Qt::WA_MacSmallSize, true);
+#endif
+
+    // FIXME: this prevents the columns from being resized, even if the text
+    // within a combobox needs more space (e.g. in the USER DLT settings).  For
+    // very long filenames in the SSL RSA keys dialog, it also results in a
+    // vertical scrollbar. Maybe remove this since the editor is not limited to
+    // the column width (and overlays other fields if more width is needed)?
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+    ui->uatTreeView->header()->setResizeMode(QHeaderView::ResizeToContents);
+#else
+    ui->uatTreeView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+#endif
+
+    // XXX - Need to add uat_move or uat_insert to the UAT API for drag/drop
 }
 
 FilterExpressionsPreferencesFrame::~FilterExpressionsPreferencesFrame()
 {
     delete ui;
+    delete uat_delegate_;
+    delete uat_model_;
 }
 
-void FilterExpressionsPreferencesFrame::unstash()
+void FilterExpressionsPreferencesFrame::setUat(epan_uat *uat)
 {
-    struct filter_expression *cur_fe = *pfilter_expression_head, *new_fe_head = NULL, *new_fe = NULL;
-    bool changed = false;
+    QString title(tr("Unknown User Accessible Table"));
 
-    QTreeWidgetItemIterator it(ui->expressionTreeWidget);
-    while (*it) {
-        struct filter_expression *fe = g_new0(struct filter_expression, 1);
+    uat_ = uat;
 
-        if (!new_fe_head) {
-            new_fe_head = fe;
-        } else {
-            new_fe->next = fe;
-        }
-        new_fe = fe;
-
-        new_fe->enabled = (*it)->checkState(enabled_col_) == Qt::Checked ? TRUE : FALSE;
-        new_fe->label = qstring_strdup((*it)->text(label_col_));
-        new_fe->expression = qstring_strdup((*it)->text(expression_col_));
-
-        if (cur_fe == NULL) {
-            changed = true;
-        } else {
-            if (cur_fe->enabled != new_fe->enabled ||
-                    g_strcmp0(cur_fe->label, new_fe->label) != 0 ||
-                    g_strcmp0(cur_fe->expression, new_fe->expression) != 0) {
-                changed = true;
-            }
-            cur_fe = cur_fe->next;
-        }
-        ++it;
-    }
+    ui->pathLabel->clear();
+    ui->pathLabel->setEnabled(false);
 
-    if (cur_fe) changed = true;
+    if (uat_) {
+        if (uat_->name) {
+            title = uat_->name;
+        }
 
-    cur_fe = new_fe_head;
-    if (changed) {
-        cur_fe = *pfilter_expression_head;
-        *pfilter_expression_head = new_fe_head;
-        wsApp->emitAppSignal(WiresharkApplication::FilterExpressionsChanged);
+        QString abs_path = gchar_free_to_qstring(uat_get_actual_filename(uat_, FALSE));
+        ui->pathLabel->setText(abs_path);
+        ui->pathLabel->setUrl(QUrl::fromLocalFile(abs_path).toString());
+        ui->pathLabel->setToolTip(tr("Open ") + uat->filename);
+        ui->pathLabel->setEnabled(true);
+
+        uat_model_ = new UatModel(NULL, uat);
+        uat_delegate_ = new UatDelegate;
+        ui->uatTreeView->setModel(uat_model_);
+        ui->uatTreeView->setItemDelegate(uat_delegate_);
+
+        connect(uat_model_, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+                this, SLOT(modelDataChanged(QModelIndex)));
+        connect(uat_model_, SIGNAL(rowsRemoved(QModelIndex, int, int)),
+                this, SLOT(modelRowsRemoved()));
+        connect(ui->uatTreeView, SIGNAL(currentItemChanged(QModelIndex,QModelIndex)),
+                this, SLOT(viewCurrentChanged(QModelIndex,QModelIndex)));
+
+        connect(this, SIGNAL(rejected()), this, SLOT(rejectChanges()));
+        connect(this, SIGNAL(accepted()), this, SLOT(acceptChanges()));
     }
 
-    while (cur_fe) {
-        struct filter_expression *fe = cur_fe;
-        cur_fe = fe->next;
-        g_free(fe->label);
-        g_free(fe->expression);
-        g_free(fe);
-    }
+    setWindowTitle(title);
 }
 
-void FilterExpressionsPreferencesFrame::keyPressEvent(QKeyEvent *evt)
+void FilterExpressionsPreferencesFrame::acceptChanges()
 {
-    if (cur_line_edit_ && cur_line_edit_->hasFocus()) {
-        switch (evt->key()) {
-        case Qt::Key_Escape:
-            cur_line_edit_->setText(saved_col_string_);
-            /* Fall Through */
-        case Qt::Key_Enter:
-        case Qt::Key_Return:
-            switch (cur_column_) {
-            case label_col_:
-                labelEditingFinished();
-                break;
-            case expression_col_:
-                expressionEditingFinished();
-                break;
-            default:
-                break;
-            }
+    if (!uat_) return;
 
-            delete cur_line_edit_;
-            return;
-        default:
-            break;
+    if (uat_->changed) {
+        gchar *err = NULL;
+
+        if (!uat_save(uat_, &err)) {
+            report_failure("Error while saving %s: %s", uat_->name, err);
+            g_free(err);
         }
-    }
-    QFrame::keyPressEvent(evt);
-}
 
-void FilterExpressionsPreferencesFrame::addExpression(bool enabled, const QString label, const QString expression)
-{
-    QTreeWidgetItem *item = new QTreeWidgetItem(ui->expressionTreeWidget);
+        if (uat_->post_update_cb) {
+            uat_->post_update_cb();
+        }
 
-    item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
-    item->setFlags(item->flags() & ~(Qt::ItemIsDropEnabled));
-    item->setCheckState(enabled_col_, enabled ? Qt::Checked : Qt::Unchecked);
-    item->setText(label_col_, label);
-    item->setText(expression_col_, expression);
+        //Filter expressions don't affect dissection, so there is no need to
+        //send any events to that effect.  However, the app needs to know
+        //about any button changes.
+        wsApp->emitAppSignal(WiresharkApplication::FilterExpressionsChanged);
+    }
 }
 
-void FilterExpressionsPreferencesFrame::updateWidgets()
+void FilterExpressionsPreferencesFrame::rejectChanges()
 {
-    int num_selected = ui->expressionTreeWidget->selectedItems().count();
-
-    ui->copyToolButton->setEnabled(num_selected == 1);
-    ui->deleteToolButton->setEnabled(num_selected > 0);
+    if (!uat_) return;
+
+    if (uat_->changed) {
+        gchar *err = NULL;
+        uat_clear(uat_);
+        if (!uat_load(uat_, &err)) {
+            report_failure("Error while loading %s: %s", uat_->name, err);
+            g_free(err);
+        }
+        //Filter expressions don't affect dissection, so there is no need to
+        //send any events to that effect
+    }
 }
 
-void FilterExpressionsPreferencesFrame::on_expressionTreeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous)
+void FilterExpressionsPreferencesFrame::addRecord(bool copy_from_current)
 {
-    ui->deleteToolButton->setEnabled(current ? true : false);
+    if (!uat_) return;
 
-    if (previous && ui->expressionTreeWidget->itemWidget(previous, label_col_)) {
-        ui->expressionTreeWidget->removeItemWidget(previous, label_col_);
+    const QModelIndex &current = ui->uatTreeView->currentIndex();
+    if (copy_from_current && !current.isValid()) return;
+
+    // should not fail, but you never know.
+    if (!uat_model_->insertRows(uat_model_->rowCount(), 1)) {
+        qDebug() << "Failed to add a new record";
+        return;
     }
-    if (previous && ui->expressionTreeWidget->itemWidget(previous, expression_col_)) {
-        ui->expressionTreeWidget->removeItemWidget(previous, expression_col_);
+    const QModelIndex &new_index = uat_model_->index(uat_model_->rowCount() - 1, 0);
+    if (copy_from_current) {
+        uat_model_->copyRow(new_index.row(), current.row());
     }
+    // due to an EditTrigger, this will also start editing.
+    ui->uatTreeView->setCurrentIndex(new_index);
+    // trigger updating error messages and the OK button state.
+    modelDataChanged(new_index);
 }
 
-void FilterExpressionsPreferencesFrame::on_expressionTreeWidget_itemActivated(QTreeWidgetItem *item, int column)
+// Invoked when a different field is selected. Note: when selecting a different
+// field after editing, this event is triggered after modelDataChanged.
+void FilterExpressionsPreferencesFrame::viewCurrentChanged(const QModelIndex &current, const QModelIndex &previous)
 {
-    if (!item || cur_line_edit_) return;
-
-    QWidget *editor = NULL;
-    cur_column_ = column;
-
-    switch (column) {
-    case label_col_:
-    {
-        cur_line_edit_ = new QLineEdit();
-        saved_col_string_ = item->text(label_col_);
-        connect(cur_line_edit_, SIGNAL(editingFinished()), this, SLOT(labelEditingFinished()));
-        editor = cur_line_edit_;
-        break;
-    }
-    case expression_col_:
-    {
-        DisplayFilterEdit *display_edit = new DisplayFilterEdit();
-        saved_col_string_ = item->text(expression_col_);
-        connect(display_edit, SIGNAL(textChanged(QString)),
-                display_edit, SLOT(checkDisplayFilter(QString)));
-        connect(display_edit, SIGNAL(editingFinished()), this, SLOT(expressionEditingFinished()));
-        editor = cur_line_edit_ = display_edit;
-        break;
-    }
-    default:
-        return;
-    }
-
-    if (cur_line_edit_) {
-        cur_line_edit_->setText(saved_col_string_);
-        cur_line_edit_->selectAll();
-        connect(cur_line_edit_, SIGNAL(destroyed()), this, SLOT(lineEditDestroyed()));
+    if (current.isValid()) {
+        ui->deleteToolButton->setEnabled(true);
+        ui->copyToolButton->setEnabled(true);
+    } else {
+        ui->deleteToolButton->setEnabled(false);
+        ui->copyToolButton->setEnabled(false);
     }
 
-    if (editor) {
-        QFrame *edit_frame = new QFrame();
-        QHBoxLayout *hb = new QHBoxLayout();
-        QSpacerItem *spacer = new QSpacerItem(5, 10);
-
-        hb->addWidget(editor, 0);
-        hb->addSpacerItem(spacer);
-        hb->setStretch(1, 1);
-        hb->setContentsMargins(0, 0, 0, 0);
-
-        edit_frame->setLineWidth(0);
-        edit_frame->setFrameStyle(QFrame::NoFrame);
-        // The documentation suggests setting autoFillbackground. That looks silly
-        // so we clear the item text instead.
-        item->setText(cur_column_, "");
-        edit_frame->setLayout(hb);
-        ui->expressionTreeWidget->setItemWidget(item, cur_column_, edit_frame);
-        editor->setFocus();
-    }
+    checkForErrorHint(current, previous);
 }
 
-void FilterExpressionsPreferencesFrame::lineEditDestroyed()
+// Invoked when a field in the model changes (e.g. by closing the editor)
+void FilterExpressionsPreferencesFrame::modelDataChanged(const QModelIndex &topLeft)
 {
-    cur_line_edit_ = NULL;
+    checkForErrorHint(topLeft, QModelIndex());
 }
 
-void FilterExpressionsPreferencesFrame::labelEditingFinished()
+// Invoked after a row has been removed from the model.
+void FilterExpressionsPreferencesFrame::modelRowsRemoved()
 {
-    QTreeWidgetItem *item = ui->expressionTreeWidget->currentItem();
-    if (!cur_line_edit_ || !item) return;
-
-    item->setText(label_col_, cur_line_edit_->text());
-    ui->expressionTreeWidget->removeItemWidget(item, label_col_);
+    const QModelIndex &current = ui->uatTreeView->currentIndex();
+    checkForErrorHint(current, QModelIndex());
 }
 
-void FilterExpressionsPreferencesFrame::expressionEditingFinished()
+// If the current field has errors, show them.
+// Otherwise if the row has not changed, but the previous field has errors, show them.
+// Otherwise pick the first error in the current row.
+// Otherwise show the error from the previous field (if any).
+// Otherwise clear the error hint.
+void FilterExpressionsPreferencesFrame::checkForErrorHint(const QModelIndex &current, const QModelIndex &previous)
 {
-    QTreeWidgetItem *item = ui->expressionTreeWidget->currentItem();
-    if (!cur_line_edit_ || !item) return;
+    if (current.isValid()) {
+        if (trySetErrorHintFromField(current)) {
+            return;
+        }
 
-    item->setText(expression_col_, cur_line_edit_->text());
-    ui->expressionTreeWidget->removeItemWidget(item, expression_col_);
+        const int row = current.row();
+        if (row == previous.row() && trySetErrorHintFromField(previous)) {
+            return;
+        }
+
+        for (int i = 0; i < uat_model_->columnCount(); i++) {
+            if (trySetErrorHintFromField(uat_model_->index(row, i))) {
+                return;
+            }
+        }
+    }
+
+    if (previous.isValid()) {
+        if (trySetErrorHintFromField(previous)) {
+            return;
+        }
+    }
+
+    ui->hintLabel->clear();
 }
 
-void FilterExpressionsPreferencesFrame::on_expressionTreeWidget_itemSelectionChanged()
+bool FilterExpressionsPreferencesFrame::trySetErrorHintFromField(const QModelIndex &index)
 {
-    updateWidgets();
+    const QVariant &data = uat_model_->data(index, Qt::UserRole + 1);
+    if (!data.isNull()) {
+        // use HTML instead of PlainText because that handles wordwrap properly
+        ui->hintLabel->setText("<small><i>" + html_escape(data.toString()) + "</i></small>");
+        return true;
+    }
+    return false;
 }
 
-static const QString new_button_label_ = QObject::tr("My Filter");
 void FilterExpressionsPreferencesFrame::on_newToolButton_clicked()
 {
-    addExpression(true, new_button_label_, QString());
+    addRecord();
 }
 
 void FilterExpressionsPreferencesFrame::on_deleteToolButton_clicked()
 {
-    QTreeWidgetItem *item = ui->expressionTreeWidget->currentItem();
-    if (item) {
-        ui->expressionTreeWidget->invisibleRootItem()->removeChild(item);
+    const QModelIndex &current = ui->uatTreeView->currentIndex();
+    if (uat_model_ && current.isValid()) {
+        if (!uat_model_->removeRows(current.row(), 1)) {
+            qDebug() << "Failed to remove row";
+        }
     }
 }
 
 void FilterExpressionsPreferencesFrame::on_copyToolButton_clicked()
 {
-    if (!ui->expressionTreeWidget->currentItem()) return;
-    QTreeWidgetItem *ti = ui->expressionTreeWidget->currentItem();
-
-    addExpression(ti->checkState(enabled_col_) == Qt::Checked,
-                  ti->text(label_col_), ti->text(expression_col_));
+    addRecord(true);
 }
 
 /*
diff --git a/ui/qt/filter_expressions_preferences_frame.h b/ui/qt/filter_expressions_preferences_frame.h
index eaefb49a7e..0eff7587dd 100644
--- a/ui/qt/filter_expressions_preferences_frame.h
+++ b/ui/qt/filter_expressions_preferences_frame.h
@@ -24,8 +24,9 @@
 
 #include <QFrame>
 
-class QLineEdit;
-class QTreeWidgetItem;
+#include <ui/qt/geometry_state_dialog.h>
+#include <ui/qt/uat_model.h>
+#include <ui/qt/uat_delegate.h>
 
 namespace Ui {
 class FilterExpressionsPreferencesFrame;
@@ -36,31 +37,29 @@ class FilterExpressionsPreferencesFrame : public QFrame
     Q_OBJECT
 
 public:
-    explicit FilterExpressionsPreferencesFrame(QWidget *parent = 0);
+    explicit FilterExpressionsPreferencesFrame(QWidget *parent = NULL);
     ~FilterExpressionsPreferencesFrame();
 
-    void unstash();
+    void setUat(struct epan_uat *uat);
 
-protected:
-    void keyPressEvent(QKeyEvent *evt);
+    void acceptChanges();
+    void rejectChanges();
 
 private:
     Ui::FilterExpressionsPreferencesFrame *ui;
 
-    int cur_column_;
-    QLineEdit *cur_line_edit_;
-    QString saved_col_string_;
+    UatModel *uat_model_;
+    UatDelegate *uat_delegate_;
+    struct epan_uat *uat_;
 
-    void addExpression(bool enabled, const QString label, const QString expression);
+    void checkForErrorHint(const QModelIndex &current, const QModelIndex &previous);
+    bool trySetErrorHintFromField(const QModelIndex &index);
+    void addRecord(bool copy_from_current = false);
 
 private slots:
-    void updateWidgets(void);
-    void on_expressionTreeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
-    void on_expressionTreeWidget_itemActivated(QTreeWidgetItem *item, int column);
-    void lineEditDestroyed();
-    void labelEditingFinished();
-    void expressionEditingFinished();
-    void on_expressionTreeWidget_itemSelectionChanged();
+    void modelDataChanged(const QModelIndex &topLeft);
+    void modelRowsRemoved();
+    void viewCurrentChanged(const QModelIndex &current, const QModelIndex &previous);
     void on_newToolButton_clicked();
     void on_deleteToolButton_clicked();
     void on_copyToolButton_clicked();
diff --git a/ui/qt/filter_expressions_preferences_frame.ui b/ui/qt/filter_expressions_preferences_frame.ui
index b973d7d7ee..d7dbd288c4 100644
--- a/ui/qt/filter_expressions_preferences_frame.ui
+++ b/ui/qt/filter_expressions_preferences_frame.ui
@@ -17,75 +17,133 @@
    <number>0</number>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QTreeWidget" name="expressionTreeWidget">
-     <column>
-      <property name="text">
-       <string>Enabled</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Button Label</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Filter Expression</string>
-      </property>
-     </column>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QToolButton" name="newToolButton">
-       <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
-         <normaloff>:/stock/plus-8.png</normaloff>:/stock/plus-8.png</iconset>
-       </property>
+    <item>
+      <widget class="UatTreeView" name="uatTreeView">
+        <column>
+          <property name="text">
+            <string notr="true">1</string>
+          </property>
+          <property name="dragEnabled">
+            <bool>false</bool>
+          </property>
+        </column>
       </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="deleteToolButton">
-       <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
-         <normaloff>:/stock/minus-8.png</normaloff>:/stock/minus-8.png</iconset>
-       </property>
+    </item>
+    <item>
+      <widget class="QLabel" name="hintLabel">
+        <property name="styleSheet">
+          <string notr="true">QLabel { color: red; }</string>
+        </property>
+        <property name="text">
+          <string/>
+        </property>
+        <property name="textFormat">
+          <set>Qt::RichText</set>
+        </property>
+        <property name="wordWrap">
+          <bool>true</bool>
+        </property>
       </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="copyToolButton">
-       <property name="toolTip">
-        <string>Copy this filter.</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
-         <normaloff>:/stock/copy-8.png</normaloff>:/stock/copy-8.png</iconset>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
+    </item>
+    <item>
+      <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0,0,1">
+        <item>
+          <widget class="QToolButton" name="newToolButton">
+            <property name="toolTip">
+              <string>Create a new entry.</string>
+            </property>
+            <property name="text">
+              <string/>
+            </property>
+            <property name="icon">
+              <iconset resource="../../image/toolbar.qrc">
+                <normaloff>:/stock/plus-8.png</normaloff>:/stock/plus-8.png
+              </iconset>
+            </property>
+          </widget>
+        </item>
+        <item>
+          <widget class="QToolButton" name="deleteToolButton">
+            <property name="enabled">
+              <bool>false</bool>
+            </property>
+            <property name="toolTip">
+              <string>Remove this entry.</string>
+            </property>
+            <property name="icon">
+              <iconset resource="../../image/toolbar.qrc">
+                <normaloff>:/stock/minus-8.png</normaloff>:/stock/minus-8.png
+              </iconset>
+            </property>
+          </widget>
+        </item>
+        <item>
+          <widget class="QToolButton" name="copyToolButton">
+            <property name="enabled">
+              <bool>false</bool>
+            </property>
+            <property name="toolTip">
+              <string>Copy this entry.</string>
+            </property>
+            <property name="text">
+              <string/>
+            </property>
+            <property name="icon">
+              <iconset resource="../../image/toolbar.qrc">
+                <normaloff>:/stock/copy-8.png</normaloff>:/stock/copy-8.png
+              </iconset>
+            </property>
+          </widget>
+        </item>
+        <item>
+          <spacer name="horizontalSpacer">
+            <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+              <size>
+                <width>40</width>
+                <height>20</height>
+              </size>
+            </property>
+          </spacer>
+        </item>
+        <item>
+          <widget class="ElidedLabel" name="pathLabel">
+            <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                <horstretch>1</horstretch>
+                <verstretch>0</verstretch>
+              </sizepolicy>
+            </property>
+            <property name="text">
+              <string/>
+            </property>
+            <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="openExternalLinks">
+              <bool>true</bool>
+            </property>
+          </widget>
+        </item>
+      </layout>
+    </item>
   </layout>
  </widget>
- <resources>
+ <customwidgets>
+    <customwidget>
+      <class>ElidedLabel</class>
+      <extends>QLabel</extends>
+      <header>elided_label.h</header>
+    </customwidget>
+    <customwidget>
+      <class>UatTreeView</class>
+      <extends>QTreeView</extends>
+      <header>uat_tree_view.h</header>
+    </customwidget>
+  </customwidgets>
+  <resources>
   <include location="../../image/toolbar.qrc"/>
  </resources>
  <connections/>
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h
index 1849e63eb8..a3509219e6 100644
--- a/ui/qt/main_window.h
+++ b/ui/qt/main_window.h
@@ -296,6 +296,7 @@ public slots:
     void captureFileSaveStarted(const QString &file_path);
 
     void filterExpressionsChanged();
+    static gboolean filter_expression_add_action(const void *key, void *value, void *user_data);
 
     void launchRLCGraph(bool channelKnown, guint16 ueid, guint8 rlcMode,
                         guint16 channelType, guint16 channelId, guint8 direction);
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 51851e6caa..8f675926d9 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -894,9 +894,36 @@ void MainWindow::captureFileSaveStarted(const QString &file_path)
     main_ui_->statusBar->pushFileStatus(tr("Saving %1" UTF8_HORIZONTAL_ELLIPSIS).arg(file_info.baseName()));
 }
 
+struct filter_expression_data
+{
+    MainWindow* window;
+    bool actions_added;
+};
+
+gboolean MainWindow::filter_expression_add_action(const void *key _U_, void *value, void *user_data)
+{
+    filter_expression_t* fe = (filter_expression_t*)value;
+    struct filter_expression_data* data = (filter_expression_data*)user_data;
+
+    if (!fe->enabled)
+        return FALSE;
+
+    QAction *dfb_action = new QAction(fe->label, data->window->filter_expression_toolbar_);
+    dfb_action->setToolTip(fe->expression);
+    dfb_action->setData(fe->expression);
+    dfb_action->setProperty(dfe_property_, true);
+    data->window->filter_expression_toolbar_->addAction(dfb_action);
+    connect(dfb_action, SIGNAL(data->window->triggered()), data->window, SLOT(data->window->displayFilterButtonClicked()));
+    data->actions_added = true;
+    return FALSE;
+}
+
 void MainWindow::filterExpressionsChanged()
 {
-    bool actions_added = false;
+    struct filter_expression_data data;
+
+    data.window = this;
+    data.actions_added = false;
 
     // Recreate filter buttons
     foreach (QAction *act, filter_expression_toolbar_->actions()) {
@@ -908,18 +935,9 @@ void MainWindow::filterExpressionsChanged()
     }
 
     // XXX Add a context menu for removing and changing buttons.
-    for (struct filter_expression *fe = *pfilter_expression_head; fe != NULL; fe = fe->next) {
-        if (!fe->enabled) continue;
-        QAction *dfb_action = new QAction(fe->label, filter_expression_toolbar_);
-        dfb_action->setToolTip(fe->expression);
-        dfb_action->setData(fe->expression);
-        dfb_action->setProperty(dfe_property_, true);
-        filter_expression_toolbar_->addAction(dfb_action);
-        connect(dfb_action, SIGNAL(triggered()), this, SLOT(displayFilterButtonClicked()));
-        actions_added = true;
-    }
-
-    if (actions_added) {
+    filter_expression_iterate_expressions(filter_expression_add_action, &data);
+
+    if (data.actions_added) {
         main_ui_->displayFilterToolBar->adjustSize();
     }
 }
diff --git a/ui/qt/preferences_dialog.cpp b/ui/qt/preferences_dialog.cpp
index 26b4c62fcd..2c7f9b905a 100644
--- a/ui/qt/preferences_dialog.cpp
+++ b/ui/qt/preferences_dialog.cpp
@@ -438,6 +438,8 @@ PreferencesDialog::PreferencesDialog(QWidget *parent) :
     prefs_pane_to_item_[ppCapture] = pd_ui_->prefsTree->topLevelItem(1);
     prefs_pane_to_item_[ppFilterExpressions] = pd_ui_->prefsTree->topLevelItem(2);
 
+    pd_ui_->filterExpressonsFrame->setUat(uat_get_table_by_name("Display expressions"));
+
     // Printing prefs don't apply here.
     module_t *print_module = prefs_find_module("print");
     if (print_module) print_module->use_gui = FALSE;
@@ -900,7 +902,7 @@ void PreferencesDialog::on_buttonBox_accepted()
     }
 
     pd_ui_->columnFrame->unstash();
-    pd_ui_->filterExpressonsFrame->unstash();
+    pd_ui_->filterExpressonsFrame->acceptChanges();
 
     prefs_main_write();
     if (save_decode_as_entries(&err) < 0)
@@ -948,6 +950,12 @@ void PreferencesDialog::on_buttonBox_accepted()
     }
 }
 
+void PreferencesDialog::on_buttonBox_rejected()
+{
+    //handle frames that don't have their own OK/Cancel "buttons"
+    pd_ui_->filterExpressonsFrame->rejectChanges();
+}
+
 void PreferencesDialog::on_buttonBox_helpRequested()
 {
     wsApp->helpTopicAction(HELP_PREFERENCES_DIALOG);
diff --git a/ui/qt/preferences_dialog.h b/ui/qt/preferences_dialog.h
index 987cfcdee8..2f35471b3c 100644
--- a/ui/qt/preferences_dialog.h
+++ b/ui/qt/preferences_dialog.h
@@ -91,6 +91,7 @@ private slots:
     void on_advancedTree_itemActivated(QTreeWidgetItem *item, int column);
 
     void on_buttonBox_accepted();
+    void on_buttonBox_rejected();
     void on_buttonBox_helpRequested();
 };