g711.c \
merge.c \
proto_hier_stats.c \
+ recent.c \
summary.c \
tempfile.c \
u3.c
ui/main_statusbar.h \
merge.h \
ui/progress_dlg.h \
+ ui/recent.h \
+ ui/recent_utils.h \
proto_hier_stats.h \
ui/simple_dialog.h \
stat_menu.h \
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+
#include <stdio.h>
#include <string.h>
#include <ctype.h>
-
-#ifndef QT_GUI_LIB
-#include <gtk/gtk.h>
-#endif
+#include <errno.h>
#include <epan/epan.h>
#include <epan/filesystem.h>
#include <epan/prefs.h>
#include <epan/prefs-int.h>
#include <epan/column.h>
+#include <epan/timestamp.h>
+#include "ui/last_open_dir.h"
+#include "ui/recent.h"
+#include "ui/recent_utils.h"
#include "ui/simple_dialog.h"
-#include "../u3.h"
-#include <wsutil/file_util.h>
+#include "ui/ui_util.h"
-#include "ui/gtk/recent.h"
-#ifndef QT_GUI_LIB
-#include "ui/gtk/main.h"
-#include "ui/gtk/menus.h"
-#include "ui/gtk/gui_utils.h"
-#include "ui/gtk/new_packet_list.h"
-#include "ui/gtk/file_dlg.h"
-#include "ui/gtk/cfilter_combo_utils.h"
+#include "u3.h"
-#ifdef HAVE_PCAP_REMOTE
-#include "ui/gtk/capture_dlg.h"
-#endif
-#else /* QT_GUI_LIB */
-#include "qt_ui_utils.h"
-#include "../file.h"
-#endif /* QT_GUI_LIB */
+#include <wsutil/file_util.h>
#define RECENT_KEY_MAIN_TOOLBAR_SHOW "gui.toolbar_main_show"
#define RECENT_KEY_FILTER_TOOLBAR_SHOW "gui.filter_toolbar_show"
proto_help.c \
proto_hier_stats_dlg.c \
range_utils.c \
- recent.c \
rtp_player.c \
rtp_stream.c \
sctp_byte_graph_dlg.c \
proto_help.h \
proto_hier_stats_dlg.h \
range_utils.h \
- recent.h \
remote_icons.h \
rtp_analysis.h \
rtp_player.h \
#include "../log.h"
#include "../version_info.h"
+#include "ui/last_open_dir.h"
+
#include "ui/gtk/about_dlg.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"
#include "../capture_ui_utils.h"
#include "../ringbuffer.h"
+#include "ui/recent_utils.h"
#include "ui/simple_dialog.h"
#include "ui/gtk/main.h"
activate_monitor (GtkTreeViewColumn *tree_column, GtkCellRenderer *renderer,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data);
-#ifdef HAVE_PCAP_REMOTE
-#define RECENT_KEY_REMOTE_HOST "recent.remote_host"
-
-/** Write all remote hosts to the recent file
- *
- * @param rf recent file
- */
-void
-capture_remote_combo_recent_write_all(FILE *rf);
-
-/** Add a new remote host from the recent file
- *
- * @param s string with hostname,port,auth_type
- * @return TRUE if correctly added
- */
-gboolean
-capture_remote_combo_add_recent(gchar *s);
-#endif
-
gboolean
dlg_window_present(void);
#include <wsutil/file_util.h>
#include "ui/alert_box.h"
+#include "ui/last_open_dir.h"
+#include "ui/recent.h"
#include "ui/simple_dialog.h"
#include "ui/ui_util.h"
#include "ui/gtk/drag_and_drop.h"
#include "ui/gtk/main.h"
#include "ui/gtk/menus.h"
-#include "ui/gtk/recent.h"
#include "ui/gtk/color_dlg.h"
#include "ui/gtk/new_packet_list.h"
#ifdef HAVE_LIBPCAP
#include "wsutil/file_util.h"
#include <wiretap/wtap.h>
+#include "ui/recent.h"
#include "ui/simple_dialog.h"
#ifdef _WIN32
#include "ui/gtk/stock_icons.h"
#include "ui/gtk/capture_dlg.h"
#include "ui/gtk/capture_if_dlg.h"
-#include "ui/gtk/recent.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/main.h"
#include <gtk/gtk.h>
+#include "ui/recent.h"
+#include "ui/recent_utils.h"
+
#include "ui/gtk/main.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/cfilter_combo_utils.h"
-#include "ui/gtk/recent.h"
/* XXX: use a preference for this setting! */
* Capture filter combo box routines
*/
-extern void cfilter_combo_recent_write_all(FILE *rf);
-extern gboolean cfilter_combo_add_recent(gchar *s);
-
#define E_CFILTER_CM_KEY "capture_filter_combo"
#define E_CFILTER_FL_KEY "capture_filter_list"
-#define RECENT_KEY_CAPTURE_FILTER "recent.capture_filter"
#endif /* __CFILTER_COMBO_UTILS_H__ */
#include "../capture.h"
#endif
+#include "ui/recent_utils.h"
#include "ui/simple_dialog.h"
#include "ui/gtk/gtkglobals.h"
#include "../isprint.h"
-#include "ui/simple_dialog.h"
#include "ui/alert_box.h"
+#include "ui/last_open_dir.h"
#include "ui/progress_dlg.h"
+#include "ui/recent.h"
+#include "ui/simple_dialog.h"
#include "ui/ui_util.h"
#include "ui/gtk/keys.h"
#include "ui/gtk/webbrowser.h"
#include "ui/gtk/main.h"
#include "ui/gtk/menus.h"
-#include "ui/gtk/recent.h"
#include "ui/gtk/export_sslkeys.h"
#ifdef _WIN32
extern void
file_selection_browse(GtkWidget *file_bt, GtkWidget *file_te, const char *title, file_selection_action_t action);
-/** Get the latest opened directory.
- *
- * @return the dirname
- */
-extern char *get_last_open_dir(void);
-
/** Set the latest opened directory.
* Will already be done when using file_selection_new().
*
#include <epan/dissectors/packet-ipv6.h>
#include <ui/alert_box.h>
+#include <ui/last_open_dir.h>
#include <ui/simple_dialog.h>
+
#include <wsutil/file_util.h>
#include "ui/gtk/main.h"
#include <epan/prefs.h>
#include <epan/charsets.h>
-#include <ui/alert_box.h>
#include <../isprint.h>
#include <../print.h>
+
+#include <ui/alert_box.h>
+#include <ui/last_open_dir.h>
#include <ui/simple_dialog.h>
+
#include <wsutil/file_util.h>
#include "ui/gtk/color_utils.h"
#include <wsutil/unicode-utils.h>
#endif
+#include "ui/recent.h"
#include "ui/simple_dialog.h"
#include "ui/gtk/main.h"
-#include "ui/gtk/recent.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/font_utils.h"
#include "ui/gtk/main_proto_draw.h"
#include <epan/filesystem.h>
#include "../util.h"
-#include "ui/simple_dialog.h"
+
#include "ui/alert_box.h"
+#include "ui/last_open_dir.h"
+#include "ui/recent.h"
+#include "ui/simple_dialog.h"
+
#include <wsutil/file_util.h>
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/main.h"
#include "ui/gtk/graph_analysis.h"
-#include "ui/gtk/recent.h"
#include "ui/gtk/old-gtk-compat.h"
#include "epan/epan.h"
#include <epan/packet_info.h>
+
+#include "ui/recent.h"
#include "ui/ui_util.h"
+
#include <wsutil/file_util.h>
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/font_utils.h"
-#include "ui/gtk/recent.h"
#include "ui/gtk/old-gtk-compat.h"
#ifndef __GUI_UTILS_H__
#define __GUI_UTILS_H__
+#include "ui/ui_util.h"
+
/** @defgroup windows_group Windows
*
* There are the following toplevel windows:
*/
extern gboolean window_delete_event_cb(GtkWidget *win, GdkEvent *event _U_, gpointer user_data _U_);
-/** geometry values for use in window_get_geometry() and window_set_geometry() */
-typedef struct window_geometry_s {
- gchar *key; /**< current key in hashtable (internally used only) */
- gboolean set_pos; /**< set the x and y position values */
- gint x; /**< the windows x position */
- gint y; /**< the windows y position */
- gboolean set_size; /**< set the width and height values */
- gint width; /**< the windows width */
- gint height; /**< the windows height */
-
- gboolean set_maximized; /**< set the maximized state (GTK2 only) */
- gboolean maximized; /**< the windows maximized state (GTK2 only) */
-} window_geometry_t;
-
/** Get the geometry of a window.
*
* @param win the window from window_new()
*/
extern void window_set_geometry(GtkWidget *win, window_geometry_t *geom);
-/** Write all geometry values of all windows to the recent file.
- * Will call write_recent_geom() for every existing window type.
- *
- * @param rf recent file handle from caller
- */
-extern void window_geom_recent_write_all(gpointer rf);
-
-/** Read in a single geometry key value pair from the recent file.
- *
- * @param name the geom_name of the window
- * @param key the subkey of this pair (e.g. "x")
- * @param value the new value (e.g. "123")
- */
-extern void window_geom_recent_read_pair(const char *name, const char *key, const char *value);
-
/** Raise a top-level window and de-iconify it.
* This routine is used if the user has done something to
* ask that a window of a certain type be popped up when there can be only
#include "../util.h"
#include "../g711.h"
-#include "ui/alert_box.h"
-#include "ui/simple_dialog.h"
#include "../stat_menu.h"
-#include "ui/progress_dlg.h"
#include "../tempfile.h"
+
+#include "ui/alert_box.h"
+#include "ui/last_open_dir.h"
+#include "ui/progress_dlg.h"
+#include "ui/simple_dialog.h"
+
#include <wsutil/file_util.h>
#include "ui/gtk/gtkglobals.h"
#include "../color.h"
#include "../color_filters.h"
#include "../print.h"
-#include "ui/simple_dialog.h"
-#include "ui/main_statusbar.h"
#include "../register.h"
#include "../ringbuffer.h"
-#include "ui/ui_util.h"
#include "../util.h"
#include "../clopts_common.h"
#include "../console_io.h"
#include "../cmdarg_err.h"
#include "../version_info.h"
#include "../merge.h"
-#include "ui/alert_box.h"
#include "../log.h"
#include "../u3.h"
+
+#include "ui/alert_box.h"
+#include "ui/main_statusbar.h"
+#include "ui/recent.h"
+#include "ui/recent_utils.h"
+#include "ui/simple_dialog.h"
+#include "ui/ui_util.h"
+
#include <wsutil/file_util.h>
#ifdef HAVE_LIBPCAP
#include "ui/gtk/packet_win.h"
#include "ui/gtk/stock_icons.h"
#include "ui/gtk/find_dlg.h"
-#include "ui/gtk/recent.h"
#include "ui/gtk/follow_tcp.h"
#include "ui/gtk/font_utils.h"
#include "ui/gtk/about_dlg.h"
*/
extern void find_prev_mark_cb(GtkWidget *widget, gpointer data, int action);
-/** Add a display filter coming from the user's recent file to the dfilter combo box.
- *
- * @param dftext the filter string
- */
-extern gboolean dfilter_combo_add_recent(gchar *dftext);
-
#if 0
/** Empty out the combobox entry field */
extern void dfilter_combo_add_empty(void);
#endif
-/** Write all non empty display filters (until maximum count)
- * of the combo box GList to the user's recent file.
- *
- * @param rf the recent file
- */
-extern void dfilter_recent_combo_write_all(FILE *rf);
/** Quit the program.
*
#include <string.h>
#include <gtk/gtk.h>
+
+#include "ui/recent.h"
+
#include "ui/gtk/old-gtk-compat.h"
#include "filter_dlg.h"
#include "keys.h"
#include "gtkglobals.h"
#include "stock_icons.h"
-#include "recent.h"
#include "main.h"
#include "menus.h"
#include <epan/filesystem.h>
#include "../print.h"
-#include "ui/ui_util.h"
-#include "ui/simple_dialog.h"
-#include "ui/main_statusbar.h"
#include "../color_filters.h"
#include "../stat_menu.h"
#include "../u3.h"
+#include "ui/ui_util.h"
+#include "ui/recent.h"
+#include "ui/simple_dialog.h"
+#include "ui/main_statusbar.h"
+
#include "ui/gtk/about_dlg.h"
#include "ui/gtk/capture_dlg.h"
#include "ui/gtk/capture_if_dlg.h"
#include "ui/gtk/keys.h"
#include "ui/gtk/stock_icons.h"
#include "ui/gtk/gtkglobals.h"
-#include "ui/gtk/recent.h"
#include "ui/gtk/main_proto_draw.h"
#include "ui/gtk/conversations_table.h"
#include "ui/gtk/hostlist_table.h"
#include <epan/filesystem.h>
#include "../isprint.h"
+
#include "ui/alert_box.h"
-#include "ui/simple_dialog.h"
+#include "ui/last_open_dir.h"
#include "ui/progress_dlg.h"
+#include "ui/recent.h"
+#include "ui/simple_dialog.h"
#include "ui/ui_util.h"
+
#include <wsutil/file_util.h>
#include "ui/gtk/keys.h"
#include "ui/gtk/main.h"
#include "ui/gtk/menus.h"
#include "ui/gtk/main_proto_draw.h"
-#include "ui/gtk/recent.h"
#ifdef _WIN32
#include <gdk/gdkwin32.h>
#endif
#include "ui/main_statusbar.h"
+#include "ui/recent.h"
-#include "ui/gtk/recent.h"
#include "ui/gtk/main.h"
#include "ui/gtk/main_statusbar_private.h"
#include "ui/gtk/gui_utils.h"
#include "../color_filters.h"
+#include "ui/recent.h"
+
#ifdef HAVE_LIBPCAP
#include "ui/gtk/capture_dlg.h"
#include "ui/gtk/capture_if_dlg.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/stock_icons.h"
#include "ui/gtk/keys.h"
-#include "ui/gtk/recent.h"
#include "ui/gtk/packet_history.h"
#include "ui/gtk/new_packet_list.h"
#include <wsutil/file_util.h>
+#include "ui/recent.h"
#include "ui/simple_dialog.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/color_utils.h"
-#include "ui/gtk/recent.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/main.h"
#include "ui/gtk/menus.h"
extern "C" {
#endif /* __cplusplus */
-/* Add a new recent capture filename to the "Recent Files" submenu
- (duplicates will be ignored) */
-extern void add_menu_recent_capture_file(gchar *cf_name);
-
/* Open a file(name)
(will not ask to close existing capture file!) */
extern void menu_open_filename(gchar *cf_name);
* @ingroup main_window_group
*/
-/** Write all recent capture filenames to the user's recent file.
- * @param rf recent file
- */
-extern void menu_recent_file_write_all(FILE *rf);
-
/** User pushed a recent file submenu item.
*
* @param widget parent widget
#include <gtk/gtk.h>
#include <glib.h>
-#include "gui_utils.h"
-#include "packet_list_store.h"
-#include "ui/gtk/new_packet_list.h"
-#include "epan/column_info.h"
-#include "epan/prefs.h"
+#include <epan/column_info.h>
+#include <epan/prefs.h>
#include <epan/packet.h>
#include <epan/epan_dissect.h>
-#include "ui/ui_util.h"
+#include <epan/column.h>
+#include <epan/strutil.h>
+#include <epan/emem.h>
+
+#include "ui/main_statusbar.h"
#include "ui/progress_dlg.h"
+#include "ui/recent.h"
+#include "ui/recent_utils.h"
#include "ui/simple_dialog.h"
-#include "ui/main_statusbar.h"
-#include "epan/emem.h"
+#include "ui/ui_util.h"
+
+#include "gui_utils.h"
+#include "packet_list_store.h"
+#include "ui/gtk/new_packet_list.h"
#include "globals.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/font_utils.h"
#include "ui/gtk/packet_history.h"
-#include "epan/column.h"
-#include "epan/strutil.h"
-#include "ui/gtk/recent.h"
#include "ui/gtk/keys.h"
#include "ui/gtk/menus.h"
#include "color.h"
* @ingroup main_window_group
*/
-#define RECENT_KEY_COL_WIDTH "column.width"
-
typedef enum {
COLUMN_SELECTED_SORT_ASCENDING,
COLUMN_SELECTED_SORT_DESCENDING,
*/
void new_packet_list_copy_summary_cb(gpointer data _U_, copy_summary_type copy_type);
-/** Write all packet list geometry values to the recent file.
- *
- * @param rf recent file handle from caller
- */
-extern void new_packet_list_recent_write_all(FILE *rf);
-
GtkWidget * new_packet_list_get_widget(void);
void new_packet_list_colorize_packets(void);
#include "../file.h"
#include "../print.h"
-#include "ui/ui_util.h"
#include "../summary.h"
+
+#include "ui/recent.h"
#include "ui/simple_dialog.h"
+#include "ui/ui_util.h"
#include "ui/gtk/font_utils.h"
#include "ui/gtk/main.h"
#include "ui/gtk/keys.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/gui_utils.h"
-#include "ui/gtk/recent.h"
#define BV_SIZE 75
#define TV_SIZE 95
#include <epan/filesystem.h>
+#include "ui/last_open_dir.h"
#include "ui/simple_dialog.h"
#include "ui/gtk/pixmap_save.h"
#include <epan/prefs.h>
+#include "ui/recent.h"
#include "ui/simple_dialog.h"
#include "ui/gtk/prefs_gui.h"
#include "ui/gtk/main_proto_draw.h"
#include "ui/gtk/main_toolbar.h"
#include "ui/gtk/font_utils.h"
-#include "ui/gtk/recent.h"
#include "ui/gtk/webbrowser.h"
#include "ui/gtk/main_welcome.h"
#include <epan/filesystem.h>
#include <epan/prefs.h>
+#include "ui/recent.h"
#include "ui/simple_dialog.h"
+
#include <wsutil/file_util.h>
#include "ui/gtk/main.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/help_dlg.h"
-#include "ui/gtk/recent.h"
#include "ui/gtk/old-gtk-compat.h"
+
enum {
NAME_COLUMN,
GLOBAL_COLUMN,
#include "../util.h"
#include "../g711.h"
-#include "ui/alert_box.h"
-#include "ui/simple_dialog.h"
#include "../stat_menu.h"
-#include "ui/progress_dlg.h"
#include "../tempfile.h"
+
+#include "ui/alert_box.h"
+#include "ui/last_open_dir.h"
+#include "ui/progress_dlg.h"
+#include "ui/simple_dialog.h"
+
#include <wsutil/file_util.h>
#include "ui/gtk/gtkglobals.h"
#include "../globals.h"
#include "../stat_menu.h"
+
+#include "ui/last_open_dir.h"
#include "ui/simple_dialog.h"
#include "ui/gtk/rtp_stream_dlg.h"
#include <epan/dissectors/packet-ieee80211.h>
#include <epan/strutil.h>
+#include "ui/recent.h"
#include "ui/simple_dialog.h"
+
#include "../stat_menu.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/filter_utils.h"
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/gui_utils.h"
-#include "ui/gtk/recent.h"
#include "ui/gtk/help_dlg.h"
#include "ui/gtk/main.h"
#include "ui/gtk/utf8_entities.h"
#endif /* __cplusplus */
// These are defined elsewhere in ../gtk/
-#define RECENT_KEY_COL_WIDTH "column.width"
-#define RECENT_KEY_CAPTURE_FILTER "recent.capture_filter"
#define RECENT_KEY_CAPTURE_FILE "recent.capture_file"
#define RECENT_KEY_REMOTE_HOST "recent.remote_host"
-extern gboolean dfilter_combo_add_recent(gchar *filter);
-extern gboolean cfilter_combo_add_recent(gchar *filter);
-extern void dfilter_recent_combo_write_all(FILE *rf);
-extern void cfilter_combo_recent_write_all(FILE *rf);
-extern void new_packet_list_recent_write_all(FILE *rf);
-/** Get the latest opened directory.
- *
- * @return the dirname
- */
-extern char *get_last_open_dir(void);
-/* Add a new recent capture filename to the "Recent Files" submenu
- (duplicates will be ignored) */
-extern void add_menu_recent_capture_file(gchar *cf_name);
-/** Write all recent capture filenames to the user's recent file.
- * @param rf recent file
- */
-extern void menu_recent_file_write_all(FILE *rf);
-
-
/* Type of capture source */
typedef enum {
CAPTURE_IFLOCAL, /**< Local network interface */
* @todo Move these window functions to a new file win_utils.h?
* @{ */
-
-/** geometry values for use in window_get_geometry() and window_set_geometry() */
-typedef struct window_geometry_s {
- gchar *key; /**< current key in hashtable (internally used only) */
- gboolean set_pos; /**< set the x and y position values */
- gint x; /**< the windows x position */
- gint y; /**< the windows y position */
- gboolean set_size; /**< set the width and height values */
- gint width; /**< the windows width */
- gint height; /**< the windows height */
-
- gboolean set_maximized; /**< set the maximized state (GTK2 only) */
- gboolean maximized; /**< the windows maximized state (GTK2 only) */
-} window_geometry_t;
-
-/** Write all geometry values of all windows to the recent file.
- * Will call write_recent_geom() for every existing window type.
- *
- * @param rf recent file handle from caller
- */
-extern void window_geom_recent_write_all(gpointer rf);
-
-/** Read in a single geometry key value pair from the recent file.
- *
- * @param name the geom_name of the window
- * @param key the subkey of this pair (e.g. "x")
- * @param value the new value (e.g. "123")
- */
-extern void window_geom_recent_read_pair(const char *name, const char *key, const char *value);
-
#ifdef __cplusplus
}
#endif /* __cplusplus */
/** ???. */
#define RECENT_KEY_DISPLAY_FILTER "recent.display_filter"
+#define RECENT_KEY_COL_WIDTH "column.width"
+
+#define RECENT_KEY_CAPTURE_FILTER "recent.capture_filter"
+
+#define RECENT_KEY_REMOTE_HOST "recent.remote_host"
+
typedef struct _col_width_data {
gint cfmt;
gchar *cfield;
extern "C" {
#endif /* __cplusplus */
-/* gui_utils.c */
+/** geometry values for use in window_get_geometry() and window_set_geometry() */
+typedef struct window_geometry_s {
+ gchar *key; /**< current key in hashtable (internally used only) */
+ gboolean set_pos; /**< set the x and y position values */
+ gint x; /**< the windows x position */
+ gint y; /**< the windows y position */
+ gboolean set_size; /**< set the width and height values */
+ gint width; /**< the windows width */
+ gint height; /**< the windows height */
+
+ gboolean set_maximized; /**< set the maximized state (GTK2 only) */
+ gboolean maximized; /**< the windows maximized state (GTK2 only) */
+} window_geometry_t;
/* Set the name of the top-level window and its icon. */
void set_main_window_name(const gchar *);