Remove some duplicate code from ui/profile.c and move in more code from

ui/gtk/profile_dialog.c. Use the correct profile list in
profile_dialog.c so that deletion works.

Add a profile dialog to the Qt port. For some reason it crashes when
changing configuration profiles, which might be related to bug 7722.
Move the Qt configuration profile initialization from main.cpp to
wireshark_application.cpp. Make sure QMenuBar doesn't grab the
configuration profiles action on OS X. Add more role color names to
tango_colors.h.

svn path=/trunk/; revision=46834

1 files changed, 4 insertions, 2 deletions

diff --git a/ui/recent.h b/ui/recent.h
index dba023e395..7b22a6a8cc 100644
--- a/ui/recent.h
+++ b/ui/recent.h
@@ -32,6 +32,8 @@ extern "C" {
 
 #include <glib.h>
 
+#include "epan/timestamp.h"
+
 /** @file
  *  Recent user interface settings.
  *  @ingroup main_window_group
@@ -73,9 +75,9 @@ typedef struct recent_settings_tag {
     gboolean    byte_view_show;
     gboolean    statusbar_show;
     gboolean    packet_list_colorize;
-    gint        gui_time_format;
+    ts_type     gui_time_format;
     gint        gui_time_precision;
-    gint        gui_seconds_format;
+    ts_seconds_type gui_seconds_format;
     gint        gui_zoom_level;
     gint        gui_bytes_view;