diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2015-11-22 21:25:15 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-11-23 05:41:09 +0000 |
| commit | c5fb402222be88e95e26793ffca9aa1c15c70732 (patch) | |
| tree | b81267fba9d3f2d625042cb23d1d9c432badc20f /ui/gtk/packet_list.c | |
| parent | fad15654b1900a9af59d9dabf705060c6f9f058d (diff) | |
| download | wireshark-c5fb402222be88e95e26793ffca9aa1c15c70732.tar.gz | |
Qt: Set tooltip for packet list header
Added get_column_tooltip() to use common code in GTK and Qt.
Change-Id: I2f6ce95e2e129752bbb958a28aec6f42aa81be3d
Reviewed-on: https://code.wireshark.org/review/12047
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/gtk/packet_list.c')
| -rw-r--r-- | ui/gtk/packet_list.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/ui/gtk/packet_list.c b/ui/gtk/packet_list.c index 7a604ed954..a46562367b 100644 --- a/ui/gtk/packet_list.c +++ b/ui/gtk/packet_list.c @@ -656,7 +656,6 @@ create_view_and_model(void) gint i, col_width; gdouble value; gchar *tooltip_text; - header_field_info *hfi; gint col_min_width; gchar *escaped_title; col_item_t* col_item; @@ -705,26 +704,7 @@ create_view_and_model(void) show_cell_data_func, GINT_TO_POINTER(i), NULL); - if (col_item->col_fmt == COL_CUSTOM) { - hfi = proto_registrar_get_byname(col_item->col_custom_field); - /* Check if this is a valid custom_field */ - if (hfi != NULL) { - if (hfi->parent != -1) { - /* Prefix with protocol name */ - if (col_item->col_custom_occurrence != 0) { - tooltip_text = g_strdup_printf("%s\n%s (%s#%d)", proto_get_protocol_name(hfi->parent), hfi->name, hfi->abbrev, col_item->col_custom_occurrence); - } else { - tooltip_text = g_strdup_printf("%s\n%s (%s)", proto_get_protocol_name(hfi->parent), hfi->name, hfi->abbrev); - } - } else { - tooltip_text = g_strdup_printf("%s (%s)", hfi->name, hfi->abbrev); - } - } else { - tooltip_text = g_strdup_printf("Unknown Field: %s", get_column_custom_field(i)); - } - } else { - tooltip_text = g_strdup(col_format_desc(col_item->col_fmt)); - } + escaped_title = ws_strdup_escape_char(col_item->col_title, '_'); gtk_tree_view_column_set_title(col, escaped_title); g_free (escaped_title); @@ -769,6 +749,7 @@ create_view_and_model(void) gtk_tree_view_append_column(GTK_TREE_VIEW(packetlist->view), col); + tooltip_text = get_column_tooltip(i); gtk_widget_set_tooltip_text(gtk_tree_view_column_get_button(col), tooltip_text); g_free(tooltip_text); g_signal_connect(gtk_tree_view_column_get_button(col), "button_press_event", |