diff options
author | Gerald Combs <gerald@wireshark.org> | 2012-08-01 19:18:49 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2012-08-01 19:18:49 +0000 |
commit | 02894a0be8f12768f362d475f761d7e25c92ab9c (patch) | |
tree | ec52d52ed4c6338498a6418e782f2a7b586298d7 | |
parent | ecf26166fa54bc8d23e1cd9378bf8c333487c75a (diff) |
Move utf8_entities.h to the "ui" directory. Separate packet information
items with MIDDLE DOTs.
svn path=/trunk/; revision=44194
-rw-r--r-- | ui/Makefile.common | 1 | ||||
-rw-r--r-- | ui/gtk/Makefile.common | 1 | ||||
-rw-r--r-- | ui/gtk/conversations_table.c | 2 | ||||
-rw-r--r-- | ui/gtk/decode_as_dlg.c | 2 | ||||
-rw-r--r-- | ui/gtk/expert_comp_table.c | 2 | ||||
-rw-r--r-- | ui/gtk/follow_ssl.c | 2 | ||||
-rw-r--r-- | ui/gtk/follow_tcp.c | 2 | ||||
-rw-r--r-- | ui/gtk/follow_udp.c | 2 | ||||
-rw-r--r-- | ui/gtk/hostlist_table.c | 2 | ||||
-rw-r--r-- | ui/gtk/iax2_analysis.c | 2 | ||||
-rw-r--r-- | ui/gtk/main_menubar.c | 10 | ||||
-rw-r--r-- | ui/gtk/main_statusbar.c | 9 | ||||
-rw-r--r-- | ui/gtk/main_welcome.c | 2 | ||||
-rw-r--r-- | ui/gtk/proto_hier_stats_dlg.c | 4 | ||||
-rw-r--r-- | ui/gtk/rtp_analysis.c | 2 | ||||
-rw-r--r-- | ui/gtk/service_response_time_table.c | 2 | ||||
-rw-r--r-- | ui/gtk/wlan_stat_dlg.c | 2 | ||||
-rw-r--r-- | ui/qt/display_filter_edit.cpp | 2 | ||||
-rw-r--r-- | ui/qt/main_status_bar.cpp | 10 | ||||
-rw-r--r-- | ui/utf8_entities.h (renamed from ui/gtk/utf8_entities.h) | 2 | ||||
-rw-r--r-- | wsutil/CMakeLists.txt | 3 |
21 files changed, 36 insertions, 30 deletions
diff --git a/ui/Makefile.common b/ui/Makefile.common index 9e99daae86..f220a34ba8 100644 --- a/ui/Makefile.common +++ b/ui/Makefile.common @@ -53,4 +53,5 @@ noinst_HEADERS = \ recent_utils.h \ simple_dialog.h \ ui_util.h \ + utf8_entities.h \ util.h diff --git a/ui/gtk/Makefile.common b/ui/gtk/Makefile.common index 09f906ee16..8b805b2612 100644 --- a/ui/gtk/Makefile.common +++ b/ui/gtk/Makefile.common @@ -350,7 +350,6 @@ noinst_HEADERS = \ text_import_scanner.h \ text_page_utils.h \ uat_gui.h \ - utf8_entities.h \ voip_calls.h \ voip_calls_dlg.h \ webbrowser.h \ diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c index e495d08754..10231a63ba 100644 --- a/ui/gtk/conversations_table.c +++ b/ui/gtk/conversations_table.c @@ -42,6 +42,7 @@ #include "../globals.h" #include "ui/simple_dialog.h" +#include "ui/utf8_entities.h" #include "ui/gtk/sat.h" #include "ui/gtk/conversations_table.h" @@ -55,7 +56,6 @@ #include "ui/gtk/follow_tcp.h" #include "ui/gtk/follow_udp.h" #include "ui/gtk/keys.h" -#include "ui/gtk/utf8_entities.h" #include "old-gtk-compat.h" diff --git a/ui/gtk/decode_as_dlg.c b/ui/gtk/decode_as_dlg.c index de870b5610..7db25da2ae 100644 --- a/ui/gtk/decode_as_dlg.c +++ b/ui/gtk/decode_as_dlg.c @@ -42,6 +42,7 @@ #include <wsutil/file_util.h> #include "ui/simple_dialog.h" +#include "ui/utf8_entities.h" #include "ui/gtk/main.h" #include "ui/gtk/decode_as_dlg.h" @@ -50,7 +51,6 @@ #include "ui/gtk/decode_as_dcerpc.h" #include "ui/gtk/decode_as_ber.h" #include "ui/gtk/help_dlg.h" -#include "utf8_entities.h" #include "ui/gtk/old-gtk-compat.h" #undef DEBUG diff --git a/ui/gtk/expert_comp_table.c b/ui/gtk/expert_comp_table.c index 221b8956e2..7734e28a3c 100644 --- a/ui/gtk/expert_comp_table.c +++ b/ui/gtk/expert_comp_table.c @@ -42,6 +42,7 @@ #include <epan/expert.h> #include "ui/simple_dialog.h" +#include "ui/utf8_entities.h" #include "ui/gtk/expert_comp_table.h" #include "ui/gtk/filter_utils.h" @@ -52,7 +53,6 @@ #include "ui/gtk/gtkglobals.h" #include "ui/gtk/webbrowser.h" #include "ui/gtk/stock_icons.h" -#include "ui/gtk/utf8_entities.h" #include "ui/gtk/old-gtk-compat.h" diff --git a/ui/gtk/follow_ssl.c b/ui/gtk/follow_ssl.c index 07614b8442..5b1a29044b 100644 --- a/ui/gtk/follow_ssl.c +++ b/ui/gtk/follow_ssl.c @@ -48,6 +48,7 @@ #include <ui/alert_box.h> #include <ui/simple_dialog.h> +#include <ui/utf8_entities.h> #include <ui/util.h> #include "gtkglobals.h" @@ -60,7 +61,6 @@ #include "ui/gtk/font_utils.h" #include "ui/gtk/follow_ssl.h" #include "ui/gtk/follow_stream.h" -#include "ui/gtk/utf8_entities.h" #ifdef SSL_PLUGIN #include "packet-ssl-utils.h" diff --git a/ui/gtk/follow_tcp.c b/ui/gtk/follow_tcp.c index 2abacb218a..fee22ea376 100644 --- a/ui/gtk/follow_tcp.c +++ b/ui/gtk/follow_tcp.c @@ -51,6 +51,7 @@ #include "../file.h" #include "ui/alert_box.h" #include "ui/simple_dialog.h" +#include "ui/utf8_entities.h" #include "../tempfile.h" #include <wsutil/file_util.h> @@ -66,7 +67,6 @@ #include "ui/gtk/font_utils.h" #include "ui/gtk/help_dlg.h" #include "ui/gtk/follow_stream.h" -#include "ui/gtk/utf8_entities.h" /* With MSVC and a libwireshark.dll, we need a special declaration. */ WS_VAR_IMPORT FILE *data_out_file; diff --git a/ui/gtk/follow_udp.c b/ui/gtk/follow_udp.c index 6b26321f46..a75d6916b9 100644 --- a/ui/gtk/follow_udp.c +++ b/ui/gtk/follow_udp.c @@ -38,13 +38,13 @@ #include <epan/tap.h> #include <ui/simple_dialog.h> +#include <ui/utf8_entities.h> #include "gtkglobals.h" #include "ui/gtk/follow_stream.h" #include "ui/gtk/keys.h" #include "ui/gtk/main.h" #include "ui/gtk/follow_udp.h" -#include "ui/gtk/utf8_entities.h" static int udp_queue_packet_data(void *tapdata, packet_info *pinfo, diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c index 0b485f4f19..bfe8d5ff7c 100644 --- a/ui/gtk/hostlist_table.c +++ b/ui/gtk/hostlist_table.c @@ -51,6 +51,7 @@ #include "ui/simple_dialog.h" #include "ui/alert_box.h" +#include "ui/utf8_entities.h" #include "../tempfile.h" #include "ui/gtk/hostlist_table.h" @@ -61,7 +62,6 @@ #include "ui/gtk/dlg_utils.h" #include "ui/gtk/help_dlg.h" #include "ui/gtk/main.h" -#include "ui/gtk/utf8_entities.h" #ifdef HAVE_GEOIP #include "ui/gtk/webbrowser.h" #include "ui/gtk/stock_icons.h" diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c index 3c9ba7854e..fcda275f7d 100644 --- a/ui/gtk/iax2_analysis.c +++ b/ui/gtk/iax2_analysis.c @@ -73,6 +73,7 @@ #include "ui/last_open_dir.h" #include "ui/progress_dlg.h" #include "ui/simple_dialog.h" +#include "ui/utf8_entities.h" #include <wsutil/file_util.h> @@ -86,7 +87,6 @@ #include "ui/gtk/iax2_analysis.h" #include "ui/gtk/rtp_stream.h" #include "ui/gtk/rtp_stream_dlg.h" -#include "ui/gtk/utf8_entities.h" #include "ui/gtk/old-gtk-compat.h" diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c index 287a76b239..4a07ad6c35 100644 --- a/ui/gtk/main_menubar.c +++ b/ui/gtk/main_menubar.c @@ -58,6 +58,7 @@ #include "ui/recent.h" #include "ui/simple_dialog.h" #include "ui/main_statusbar.h" +#include "ui/utf8_entities.h" #include "ui/gtk/about_dlg.h" #include "ui/gtk/capture_dlg.h" @@ -107,7 +108,6 @@ #include "ui/gtk/manual_addr_resolv.h" #include "ui/gtk/proto_help.h" #include "ui/gtk/dissector_tables_dlg.h" -#include "ui/gtk/utf8_entities.h" #include "ui/gtk/expert_comp_dlg.h" #include "ui/gtk/time_shift_dlg.h" #include "ui/gtk/edit_packet_comment_dlg.h" @@ -3487,7 +3487,7 @@ menus_init(void) { merge_id = gtk_ui_manager_new_merge_id (ui_manager_main_menubar); add_recent_items (merge_id, ui_manager_main_menubar); - /* Add statistics tap plug-in to the menu + /* Add statistics tap plug-in to the menu */ merge_id = gtk_ui_manager_new_merge_id (ui_manager_main_menubar); add_tap_plugins (merge_id, ui_manager_main_menubar); @@ -4164,7 +4164,7 @@ add_tap_plugins (guint merge_id, GtkUIManager *ui_manager) GList *cfg_list; GList *iter; gchar *action_name; - + action_group = gtk_action_group_new ("tap-plugins-group"); submenu_statistics = gtk_ui_manager_get_widget(ui_manager_main_menubar, MENU_STATISTICS_PATH); @@ -5004,7 +5004,7 @@ set_menus_for_selected_packet(capture_file *cf) set_menu_sensitivity(ui_manager_packet_list_menu, "/PacketListMenuPopup/PrepareaFilter", frame_selected); set_menu_sensitivity(ui_manager_tree_view_menu, "/TreeViewPopup/ResolveName", - frame_selected && (gbl_resolv_flags.mac_name || gbl_resolv_flags.network_name || + frame_selected && (gbl_resolv_flags.mac_name || gbl_resolv_flags.network_name || gbl_resolv_flags.transport_name || gbl_resolv_flags.concurrent_dns)); set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/AnalyzeMenu/FollowTCPStream", frame_selected ? (cf->edt->pi.ipproto == IP_PROTO_TCP) : FALSE); @@ -5015,7 +5015,7 @@ set_menus_for_selected_packet(capture_file *cf) set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/AnalyzeMenu/DecodeAs", frame_selected && decode_as_ok()); set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/ViewMenu/NameResolution/ResolveName", - frame_selected && (gbl_resolv_flags.mac_name || gbl_resolv_flags.network_name || + frame_selected && (gbl_resolv_flags.mac_name || gbl_resolv_flags.network_name || gbl_resolv_flags.transport_name || gbl_resolv_flags.concurrent_dns)); set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/ToolsMenu/FirewallACLRules", frame_selected); diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c index c1c27dfd65..0e5f39bdd0 100644 --- a/ui/gtk/main_statusbar.c +++ b/ui/gtk/main_statusbar.c @@ -48,6 +48,7 @@ #include "ui/main_statusbar.h" #include "ui/recent.h" +#include "ui/utf8_entities.h" #include "ui/gtk/main.h" #include "ui/gtk/main_statusbar_private.h" @@ -492,18 +493,18 @@ packets_bar_update(void) /* Do we have any packets? */ if(cfile.count) { - g_string_printf(packets_str, " Packets: %u Displayed: %u Marked: %u", + g_string_printf(packets_str, " Packets: %u " UTF8_MIDDLE_DOT " Displayed: %u " UTF8_MIDDLE_DOT " Marked: %u", cfile.count, cfile.displayed_count, cfile.marked_count); if(cfile.drops_known) { - g_string_append_printf(packets_str, " Dropped: %u", cfile.drops); + g_string_append_printf(packets_str, " " UTF8_MIDDLE_DOT " Dropped: %u", cfile.drops); } if(cfile.ignored_count > 0) { - g_string_append_printf(packets_str, " Ignored: %u", cfile.ignored_count); + g_string_append_printf(packets_str, " " UTF8_MIDDLE_DOT " Ignored: %u", cfile.ignored_count); } if(!cfile.is_tempfile){ /* Loading an existing file */ gulong computed_elapsed = cf_get_computed_elapsed(); - g_string_append_printf(packets_str, " Load time: %lu:%02lu.%03lu", + g_string_append_printf(packets_str, " " UTF8_MIDDLE_DOT " Load time: %lu:%02lu.%03lu", computed_elapsed/60000, computed_elapsed%60000/1000, computed_elapsed%1000); diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c index a7757dbe90..246789d97f 100644 --- a/ui/gtk/main_welcome.c +++ b/ui/gtk/main_welcome.c @@ -43,6 +43,7 @@ #include "ui/recent.h" #include "ui/simple_dialog.h" +#include "ui/utf8_entities.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/color_utils.h" @@ -54,7 +55,6 @@ #include "ui/gtk/help_dlg.h" #include "ui/gtk/capture_file_dlg.h" #include "ui/gtk/stock_icons.h" -#include "ui/gtk/utf8_entities.h" #ifdef HAVE_LIBPCAP #include "ui/gtk/capture_dlg.h" #include "ui/gtk/capture_if_dlg.h" diff --git a/ui/gtk/proto_hier_stats_dlg.c b/ui/gtk/proto_hier_stats_dlg.c index c95c19b373..d076560986 100644 --- a/ui/gtk/proto_hier_stats_dlg.c +++ b/ui/gtk/proto_hier_stats_dlg.c @@ -33,6 +33,7 @@ #include "../proto_hier_stats.h" #include "ui/simple_dialog.h" +#include "ui/utf8_entities.h" #include "ui/gtk/proto_hier_stats_dlg.h" #include "ui/gtk/dlg_utils.h" @@ -40,7 +41,6 @@ #include "ui/gtk/filter_utils.h" #include "ui/gtk/gtkglobals.h" #include "ui/gtk/help_dlg.h" -#include "ui/gtk/utf8_entities.h" enum { @@ -112,7 +112,7 @@ proto_hier_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data _U_, g } apply_selected_filter (callback_action, str); - + gtk_tree_path_free(path); g_free (str); } diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c index c7d0661e54..43185ef389 100644 --- a/ui/gtk/rtp_analysis.c +++ b/ui/gtk/rtp_analysis.c @@ -71,6 +71,7 @@ #include "ui/last_open_dir.h" #include "ui/progress_dlg.h" #include "ui/simple_dialog.h" +#include "ui/utf8_entities.h" #include <wsutil/file_util.h> @@ -85,7 +86,6 @@ #include "ui/gtk/rtp_stream.h" #include "ui/gtk/rtp_stream_dlg.h" #include "ui/gtk/stock_icons.h" -#include "ui/gtk/utf8_entities.h" #ifdef HAVE_LIBPORTAUDIO #include "ui/gtk/graph_analysis.h" diff --git a/ui/gtk/service_response_time_table.c b/ui/gtk/service_response_time_table.c index 6bc671bfff..7bf70ff9be 100644 --- a/ui/gtk/service_response_time_table.c +++ b/ui/gtk/service_response_time_table.c @@ -34,11 +34,11 @@ #include "epan/packet_info.h" #include "ui/simple_dialog.h" +#include "ui/utf8_entities.h" #include "ui/gtk/service_response_time_table.h" #include "ui/gtk/filter_utils.h" #include "ui/gtk/gui_utils.h" -#include "ui/gtk/utf8_entities.h" #define NANOSECS_PER_SEC 1000000000 diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c index 54b3b8e23b..8d923dd852 100644 --- a/ui/gtk/wlan_stat_dlg.c +++ b/ui/gtk/wlan_stat_dlg.c @@ -39,6 +39,7 @@ #include "ui/recent.h" #include "ui/simple_dialog.h" +#include "ui/utf8_entities.h" #include "../stat_menu.h" @@ -49,7 +50,6 @@ #include "ui/gtk/gui_utils.h" #include "ui/gtk/help_dlg.h" #include "ui/gtk/main.h" -#include "ui/gtk/utf8_entities.h" #include "ui/gtk/old-gtk-compat.h" diff --git a/ui/qt/display_filter_edit.cpp b/ui/qt/display_filter_edit.cpp index 6fa400a296..c6ec014b1d 100644 --- a/ui/qt/display_filter_edit.cpp +++ b/ui/qt/display_filter_edit.cpp @@ -31,7 +31,7 @@ #include "display_filter_edit.h" -#include "ui/gtk/utf8_entities.h" +#include "ui/utf8_entities.h" // platform // osx diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp index 350a95e1ae..38ed87a5fd 100644 --- a/ui/qt/main_status_bar.cpp +++ b/ui/qt/main_status_bar.cpp @@ -36,6 +36,7 @@ #include "epan/expert.h" #include "ui/main_statusbar.h" +#include "ui/utf8_entities.h" #include <QSplitter> #include <QHBoxLayout> @@ -96,20 +97,21 @@ packets_bar_update(void) /* Do we have any packets? */ if (cfile.count) { - packetsStr.append(QString(QObject::tr("Packets: %1 Displayed: %2 Marked: %3")) + packetsStr.append(QString("Packets: %1 " UTF8_MIDDLE_DOT " Displayed: %2 " UTF8_MIDDLE_DOT " Marked: %3") +// packetsStr.append(QString(QObject::tr("Packets: %1 Displayed: %2 Marked: %3")) .arg(cfile.count) .arg(cfile.displayed_count) .arg(cfile.marked_count)); if(cfile.drops_known) { - packetsStr.append(QString(QObject::tr(" Dropped: %1")).arg(cfile.drops)); + packetsStr.append(QString(" " UTF8_MIDDLE_DOT " Dropped: %1")).arg(cfile.drops); } if(cfile.ignored_count > 0) { - packetsStr.append(QString(QObject::tr(" Ignored: %1")).arg(cfile.ignored_count)); + packetsStr.append(QString(" " UTF8_MIDDLE_DOT " Ignored: %1").arg(cfile.ignored_count)); } if(!cfile.is_tempfile) { /* Loading an existing file */ gulong computed_elapsed = cf_get_computed_elapsed(); - packetsStr.append(QString(QObject::tr(" Load time: %1:%2.%3")) + packetsStr.append(QString(" " UTF8_MIDDLE_DOT " Load time: %1:%2.%3") .arg(computed_elapsed/60000) .arg(computed_elapsed%60000/1000) .arg(computed_elapsed%1000)); diff --git a/ui/gtk/utf8_entities.h b/ui/utf8_entities.h index 4f9d349cba..e848effe21 100644 --- a/ui/gtk/utf8_entities.h +++ b/ui/utf8_entities.h @@ -33,6 +33,8 @@ * and other places */ +#define UTF8_MIDDLE_DOT "\xc2\xb7" /* 183 / 0xb7 */ + #define UTF8_HORIZONTAL_ELLIPSIS "\xe2\x80\xa6" /* 8230 / 0x2026 */ #define UTF8_LEFTWARDS_ARROW "\xe2\x86\x90" /* 8592 / 0x2190 */ #define UTF8_RIGHTWARDS_ARROW "\xe2\x86\x92" /* 8594 / 0x2192 */ diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index c995d72e99..2866d2db75 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -52,7 +52,8 @@ set(WSUTIL_FILES ) set(wsutil_LIBS - ${GLIB2_LIBRARIES} +# ${GLIB2_LIBRARIES} + ${GLIB2_LDFLAGS} ) add_library(wsutil ${LINK_MODE_LIB} |