* Expert info is now filterable (if the dissector has been updated to support the new API).
* The Windows installer now uninstalls the previous version of Wireshark silently.
You can still run the uninstaller manually beforehand if you wish to run it interactively.
+* The "Number" column shows related packets and protocol conversation spans (Qt only).
=== New Protocol Support
memset(conversation, 0, sizeof(conversation_t));
conversation->index = new_index;
- conversation->setup_frame = setup_frame;
+ conversation->setup_frame = conversation->last_frame = setup_frame;
conversation->data_list = NULL;
/* clear dissector handle */
/* Have we seen this conversation before? */
if((conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport,
- pinfo->destport, 0)) == NULL) {
+ pinfo->destport, 0)) != NULL) {
+ if (pinfo->fd->num > conv->last_frame) {
+ conv->last_frame = pinfo->fd->num;
+ }
+ } else {
/* No, this is a new conversation. */
conv = conversation_new(pinfo->fd->num, &pinfo->src,
&pinfo->dst, pinfo->ptype,
/** pointer to the last conversation on hash chain */
guint32 index; /** unique ID for conversation */
guint32 setup_frame; /** frame number that setup this conversation */
+ /* Assume that setup_frame is also the lowest frame number for now. */
+ guint32 last_frame; /** highest frame number in this conversation */
GSList *data_list; /** list of data associated with conversation */
dissector_handle_t dissector_handle;
/** handle for protocol dissector client associated with conversation */
export_object_http.c
export_object_smb.c
help_url.c
+ packet_list_utils.c
iface_lists.c
preference_utils.c
profile.c
export_object_smb.c \
iface_lists.c \
help_url.c \
+ packet_list_utils.c \
preference_utils.c \
profile.c \
recent.c \
last_open_dir.h \
file_dialog.h \
help_url.h \
+ packet_list_utils.h \
iface_lists.h \
main_statusbar.h \
preference_utils.h \
#include <epan/emem.h>
#include "ui/main_statusbar.h"
+#include "ui/packet_list_utils.h"
#include "ui/preference_utils.h"
#include "ui/progress_dlg.h"
#include "ui/recent.h"
return visible_pos;
}
-static gboolean
-right_justify_column (gint col)
-{
- header_field_info *hfi;
- gboolean right_justify = FALSE;
-
- switch (cfile.cinfo.col_fmt[col]) {
-
- case COL_NUMBER:
- case COL_PACKET_LENGTH:
- case COL_CUMULATIVE_BYTES:
- case COL_DCE_CALL:
- case COL_DSCP_VALUE:
- case COL_UNRES_DST_PORT:
- case COL_UNRES_SRC_PORT:
- case COL_DEF_DST_PORT:
- case COL_DEF_SRC_PORT:
- case COL_DELTA_TIME:
- case COL_DELTA_TIME_DIS:
- right_justify = TRUE;
- break;
-
- case COL_CUSTOM:
- hfi = proto_registrar_get_byname(cfile.cinfo.col_custom_field[col]);
- /* Check if this is a valid field and we have no strings lookup table */
- if ((hfi != NULL) && ((hfi->strings == NULL) || !get_column_resolved(col))) {
- /* Check for bool, framenum and decimal/octal integer types */
- if ((hfi->type == FT_BOOLEAN) || (hfi->type == FT_FRAMENUM) ||
- (((hfi->display == BASE_DEC) || (hfi->display == BASE_OCT)) &&
- (IS_FT_INT(hfi->type) || IS_FT_UINT(hfi->type)))) {
- right_justify = TRUE;
- }
- }
- break;
-
- default:
- break;
- }
-
- return right_justify;
-}
-
-static gboolean
-resolve_column (gint col)
-{
- header_field_info *hfi;
- gboolean resolve = FALSE;
-
- switch (cfile.cinfo.col_fmt[col]) {
-
- case COL_CUSTOM:
- hfi = proto_registrar_get_byname(cfile.cinfo.col_custom_field[col]);
- /* Check if this is a valid field */
- if (hfi != NULL) {
- /* Check if we have an OID or a strings table with integer values */
- if ((hfi->type == FT_OID) ||
- ((hfi->strings != NULL) &&
- ((hfi->type == FT_BOOLEAN) || (hfi->type == FT_FRAMENUM) ||
- IS_FT_INT(hfi->type) || IS_FT_UINT(hfi->type)))) {
- resolve = TRUE;
- }
- }
- break;
-
- default:
- break;
- }
-
- return resolve;
-}
-
static void
col_title_change_ok (GtkWidget *w, gpointer parent_w)
{
packet_list_xalign_column (gint col_id, GtkTreeViewColumn *col, gchar xalign)
{
GList *renderers = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT(col));
- gboolean right_justify = right_justify_column(col_id);
+ gboolean right_justify = right_justify_column(col_id, &cfile);
gdouble value = get_xalign_value (xalign, right_justify);
GList *entry;
GtkCellRenderer *renderer;
GtkWidget *col = (GtkWidget *) data;
GtkWidget *menu = (GtkWidget *)g_object_get_data(G_OBJECT(popup_menu_object), PM_PACKET_LIST_COL_KEY);
gint col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(col), E_MPACKET_LIST_COL_KEY));
- gboolean right_justify = right_justify_column (col_id);
+ gboolean right_justify = right_justify_column (col_id, &cfile);
menus_set_column_align_default (right_justify);
- menus_set_column_resolved (get_column_resolved (col_id), resolve_column (col_id));
+ menus_set_column_resolved (get_column_resolved (col_id), resolve_column (col_id, &cfile));
g_object_set_data(G_OBJECT(packetlist->view), E_MPACKET_LIST_COLUMN_KEY, col);
return popup_menu_handler (widget, event, menu);
}
renderer = gtk_cell_renderer_text_new();
col = gtk_tree_view_column_new();
gtk_tree_view_column_pack_start(col, renderer, TRUE);
- value = get_xalign_value(recent_get_column_xalign(i), right_justify_column(i));
+ value = get_xalign_value(recent_get_column_xalign(i), right_justify_column(i, &cfile));
g_object_set(G_OBJECT(renderer),
"xalign", value,
NULL);
--- /dev/null
+/* packet_list_utils.c
+ * Packet list display utilities
+ * Copied from gtk/packet_list.c
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
+#include "config.h"
+
+#include <glib.h>
+
+#include "packet_list_utils.h"
+
+#include <epan/column.h>
+#include <epan/proto.h>
+
+gboolean
+right_justify_column (gint col, capture_file *cf)
+{
+ header_field_info *hfi;
+ gboolean right_justify = FALSE;
+
+ if (!cf) return FALSE;
+
+ switch (cf->cinfo.col_fmt[col]) {
+
+ case COL_NUMBER:
+ case COL_PACKET_LENGTH:
+ case COL_CUMULATIVE_BYTES:
+ case COL_DCE_CALL:
+ case COL_DSCP_VALUE:
+ case COL_UNRES_DST_PORT:
+ case COL_UNRES_SRC_PORT:
+ case COL_DEF_DST_PORT:
+ case COL_DEF_SRC_PORT:
+ case COL_DELTA_TIME:
+ case COL_DELTA_TIME_DIS:
+ right_justify = TRUE;
+ break;
+
+ case COL_CUSTOM:
+ hfi = proto_registrar_get_byname(cf->cinfo.col_custom_field[col]);
+ /* Check if this is a valid field and we have no strings lookup table */
+ if ((hfi != NULL) && ((hfi->strings == NULL) || !get_column_resolved(col))) {
+ /* Check for bool, framenum and decimal/octal integer types */
+ if ((hfi->type == FT_BOOLEAN) || (hfi->type == FT_FRAMENUM) ||
+ (((hfi->display == BASE_DEC) || (hfi->display == BASE_OCT)) &&
+ (IS_FT_INT(hfi->type) || IS_FT_UINT(hfi->type)))) {
+ right_justify = TRUE;
+ }
+ }
+ break;
+
+ default:
+ break;
+ }
+
+ return right_justify;
+}
+
+gboolean
+resolve_column (gint col, capture_file *cf)
+{
+ header_field_info *hfi;
+ gboolean resolve = FALSE;
+
+ if (!cf) return FALSE;
+
+ switch (cf->cinfo.col_fmt[col]) {
+
+ case COL_CUSTOM:
+ hfi = proto_registrar_get_byname(cf->cinfo.col_custom_field[col]);
+ /* Check if this is a valid field */
+ if (hfi != NULL) {
+ /* Check if we have an OID or a strings table with integer values */
+ if ((hfi->type == FT_OID) ||
+ ((hfi->strings != NULL) &&
+ ((hfi->type == FT_BOOLEAN) || (hfi->type == FT_FRAMENUM) ||
+ IS_FT_INT(hfi->type) || IS_FT_UINT(hfi->type)))) {
+ resolve = TRUE;
+ }
+ }
+ break;
+
+ default:
+ break;
+ }
+
+ return resolve;
+}
+
+/*
+ * Editor modelines
+ *
+ * Local Variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
--- /dev/null
+/* packet_list_utils.h
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
+#ifndef __PACKET_LIST_UTILS_H__
+#define __PACKET_LIST_UTILS_H__
+
+#include "cfile.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/**
+ * Check to see if a column should be right justified.
+ *
+ * @param col[IN] The column number.
+ * @param cf[IN] The capture file containing the packet data.
+ *
+ * @return TRUE if the column should be right justified, FALSE otherwise.
+ */
+gboolean right_justify_column (gint col, capture_file *cf);
+
+/**
+ * Check to see if a column's data should be resolved.
+ *
+ * @param col[IN] The column number.
+ * @param cf[IN] The capture file containing the packet data.
+ *
+ * @return TRUE if resolution is required, FALSE otherwise.
+ */
+gboolean resolve_column (gint col, capture_file *cf);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __PACKET_LIST_UTILS_H__ */
+
+/*
+ * Editor modelines
+ *
+ * Local Variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
# No Q_OBJECT:
# packet_list_record.h
# qt_ui_utils.h
+ # related_packet_delegate.h
# sparkline_delegate.h
)
proto_tree.cpp
qt_ui_utils.cpp
recent_file_status.cpp
+ related_packet_delegate.cpp
simple_dialog_qt.cpp
sparkline_delegate.cpp
search_frame.cpp
progress_bar.h \
proto_tree.h \
recent_file_status.h \
+ related_packet_delegate.h \
search_frame.h \
simple_dialog_qt.h \
sparkline_delegate.h \
proto_tree.cpp \
qt_ui_utils.cpp \
recent_file_status.cpp \
+ related_packet_delegate.cpp \
search_frame.cpp \
simple_dialog_qt.cpp \
sparkline_delegate.cpp \
qt_ui_utils.h \
qt_ui_utils.h \
recent_file_status.h \
+ related_packet_delegate.h \
simple_dialog_qt.h \
sparkline_delegate.h \
syntax_line_edit.h \
proto_tree.cpp \
qt_ui_utils.cpp \
recent_file_status.cpp \
+ related_packet_delegate.cpp \
search_frame.cpp \
simple_dialog_qt.cpp \
sparkline_delegate.cpp \
setSortingEnabled(TRUE);
setUniformRowHeights(TRUE);
setAccessibleName("Packet list");
-
+ setItemDelegateForColumn(0, &related_packet_delegate_);
packet_list_model_ = new PacketListModel(this, cap_file_);
setModel(packet_list_model_);
proto_tree_ = proto_tree;
connect(proto_tree_, SIGNAL(goToFrame(int)), this, SLOT(goToPacket(int)));
+ connect(proto_tree_, SIGNAL(relatedFrame(int)), this, SLOT(addRelatedFrame(int)));
}
void PacketList::setByteViewTab (ByteViewTab *byte_view_tab) {
if (!cap_file_) return;
- if (proto_tree_) {
- int row = selected.first().top();
- cf_select_packet(cap_file_, row);
+ int row = selected.first().top();
+ cf_select_packet(cap_file_, row);
+ related_packet_delegate_.clear();
- if (!cap_file_->edt && !cap_file_->edt->tree) {
- return;
- }
+ if (!cap_file_->edt) return;
+ if (proto_tree_ && cap_file_->edt->tree) {
proto_tree_->fillProtocolTree(cap_file_->edt->tree);
+ packet_info *pi = &cap_file_->edt->pi;
+ conversation_t *conv = find_conversation(pi->fd->num, &pi->src, &pi->dst, pi->ptype,
+ pi->srcport, pi->destport, 0);
+ if (conv) {
+ related_packet_delegate_.setConversationSpan(conv->setup_frame, conv->last_frame);
+ }
+ viewport()->update();
}
- if (byte_view_tab_ && cap_file_->edt) {
+ if (byte_view_tab_) {
GSList *src_le;
struct data_source *source;
void PacketList::clear() {
// packet_history_clear();
+ related_packet_delegate_.clear();
packet_list_model_->clear();
proto_tree_->clear();
byte_view_tab_->clear();
/* XXX is this correct in all cases?
* Reset the sort column, use packetlist as model in case the list is frozen.
*/
- gbl_cur_packet_list->sortByColumn(0, Qt::AscendingOrder);
+ sortByColumn(0, Qt::AscendingOrder);
}
void PacketList::writeRecent(FILE *rf) {
updateAll();
}
+void PacketList::addRelatedFrame(int related_frame)
+{
+ related_packet_delegate_.addRelatedFrame(related_frame);
+}
+
/*
* Editor modelines
*
#ifndef PACKET_LIST_H
#define PACKET_LIST_H
+#include "byte_view_tab.h"
#include "packet_list_model.h"
#include "proto_tree.h"
-#include "byte_view_tab.h"
+#include "related_packet_delegate.h"
#include <QTreeView>
#include <QTreeWidget>
QList<QMenu *> submenus_;
QList<QAction *> filter_actions_;
int ctx_column_;
+ RelatedPacketDelegate related_packet_delegate_;
void markFramesReady();
void setFrameMark(gboolean set, frame_data *fdata);
void ignoreAllDisplayedFrames(bool set);
void setTimeReference();
void unsetAllTimeReferences();
+
+private slots:
+ void addRelatedFrame(int related_frame);
};
#endif // PACKET_LIST_H
#include <wsutil/nstime.h>
#include <epan/prefs.h>
+#include "ui/packet_list_utils.h"
+#include "ui/recent.h"
+
#include "color.h"
#include "color_filters.h"
-#include "globals.h"
-
#include "wireshark_application.h"
#include <QColor>
+#include <QModelIndex>
PacketListModel::PacketListModel(QObject *parent, capture_file *cf) :
QAbstractItemModel(parent)
switch (role) {
case Qt::FontRole:
return wsApp->monospaceFont();
-// case Qt::TextAlignmentRole:
+ case Qt::TextAlignmentRole:
+ switch(recent_get_column_xalign(index.column())) {
+ case COLUMN_XALIGN_RIGHT:
+ return Qt::AlignRight;
+ break;
+ case COLUMN_XALIGN_CENTER:
+ return Qt::AlignCenter;
+ break;
+ case COLUMN_XALIGN_LEFT:
+ return Qt::AlignLeft;
+ break;
+ case COLUMN_XALIGN_DEFAULT:
+ default:
+ if (right_justify_column(index.column(), cap_file_)) {
+ return Qt::AlignRight;
+ }
+ break;
+ }
+ return Qt::AlignLeft;
+
case Qt::BackgroundRole:
const color_t *color;
if (fdata->flags.ignored) {
}
return QColor(color->red >> 8, color->green >> 8, color->blue >> 8);
case Qt::DisplayRole:
- // Fall through
+ // Need packet data -- fall through
break;
default:
return QVariant();
epan_dissect_cleanup(&edt);
buffer_free(&buf);
- return record->data(col_num, cinfo);
+ switch (role) {
+ case Qt::DisplayRole:
+ return record->data(col_num, cinfo);
+ break;
+ default:
+ break;
+ }
+ return QVariant();
}
QVariant PacketListModel::headerData(int section, Qt::Orientation orientation,
if (!cinfo)
return QVariant();
- if (col_based_on_frame_data(cinfo, col_num)) //{
+ if (col_based_on_frame_data(cinfo, col_num))
col_fill_in_frame_data(fdata_, cinfo, col_num, FALSE);
- return cinfo->col_data[col_num];
-// } else {
-// QString unknown;
-// return unknown.sprintf("Unknown: frame %d col %d", fdata->num, col_num);
-// }
+
+ return cinfo->col_data[col_num];
}
frame_data *PacketListRecord::getFdata() {
QTreeWidgetItem *parentItem = (QTreeWidgetItem *)data;
QTreeWidgetItem *item;
+ ProtoTree *proto_tree = qobject_cast<ProtoTree *>(parentItem->treeWidget());
+
item = new QTreeWidgetItem(parentItem, 0);
// Set our colors.
item->setData(0, Qt::ForegroundRole, pal.link());
font.setUnderline(true);
item->setData(0, Qt::FontRole, font);
+
+ if (fi->hfinfo->type == FT_FRAMENUM) {
+ proto_tree->emitRelatedFrame(fi->value.value.uinteger);
+ }
}
}
proto_tree_children_foreach(protocol_tree, proto_tree_draw_node, invisibleRootItem());
}
+void ProtoTree::emitRelatedFrame(int related_frame)
+{
+ emit relatedFrame(related_frame);
+}
+
void ProtoTree::updateSelectionStatus(QTreeWidgetItem* item) {
if (item) {
public:
explicit ProtoTree(QWidget *parent = 0);
void fillProtocolTree(proto_tree *protocol_tree);
+ void emitRelatedFrame(int related_frame);
void clear();
protected:
void protoItemSelected(QString &);
void protoItemSelected(field_info *);
void goToFrame(int);
+ void relatedFrame(int);
public slots:
void updateSelectionStatus(QTreeWidgetItem*);
--- /dev/null
+/* related_packet_delegate.cpp
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "related_packet_delegate.h"
+#include "packet_list_record.h"
+
+#include <QPainter>
+#include <QApplication>
+
+void RelatedPacketDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
+ const QModelIndex &index) const
+{
+ int en_w = option.fontMetrics.height() / 2;
+
+ QStyleOptionViewItemV4 optv4 = option;
+ QStyledItemDelegate::initStyleOption(&optv4, index);
+
+ optv4.features |= QStyleOptionViewItemV4::HasDecoration;
+ optv4.decorationSize.setHeight(1);
+ optv4.decorationSize.setWidth(en_w);
+ QStyledItemDelegate::paint(painter, optv4, index);
+
+ frame_data *fd;
+ PacketListRecord *record = static_cast<PacketListRecord*>(index.internalPointer());
+ if (!record || (fd = record->getFdata()) == NULL) {
+ return;
+ }
+
+ painter->save();
+
+ if (QApplication::style()->objectName().contains("vista")) {
+ // QWindowsVistaStyle::drawControl does this internally. Unfortunately there
+ // doesn't appear to be a more general way to do this.
+ optv4.palette.setColor(QPalette::All, QPalette::HighlightedText, optv4.palette.color(QPalette::Active, QPalette::Text));
+ }
+
+ QPalette::ColorGroup cg = optv4.state & QStyle::State_Enabled
+ ? QPalette::Normal : QPalette::Disabled;
+ QColor fg;
+ if (cg == QPalette::Normal && !(optv4.state & QStyle::State_Active))
+ cg = QPalette::Inactive;
+ if (optv4.state & QStyle::State_Selected) {
+ fg = optv4.palette.color(cg, QPalette::HighlightedText);
+ } else {
+ fg = optv4.palette.color(cg, QPalette::Text);
+ }
+ qreal alpha = 0.20; // Arbitrary. Should arguably be a preference.
+
+ // We draw in the same place more than once so we first draw on a
+ // QImage at 100% opacity then draw that on our packet list item.
+ QImage overlay = QImage(en_w * 2, optv4.rect.height(), QImage::Format_ARGB32_Premultiplied);
+ QPainter op(&overlay);
+
+ overlay.fill(Qt::transparent);
+ op.setPen(fg);
+ op.translate(en_w + 0.5, 0.5);
+ op.setRenderHint(QPainter::Antialiasing, true);
+
+ if (first_frame_ > 0 && last_frame_ > 0 && first_frame_ != last_frame_) {
+ int height = optv4.rect.height();
+ if ((int) fd->num == first_frame_) {
+ op.drawLine(0, height / 2, 0, height);
+ op.drawLine(1, height / 2, en_w, height / 2);
+ } else if ((int) fd->num > first_frame_ && (int) fd->num < last_frame_) {
+ op.drawLine(0, 0, 0, height);
+ } else if ((int) fd->num == last_frame_) {
+ op.drawLine(0, 0, 0, height / 2);
+ op.drawLine(1, height / 2, en_w, height / 2);
+ }
+ }
+ if (related_frames_.contains(fd->num)) {
+ op.setBrush(fg);
+ op.drawEllipse(QPointF(0.0, optv4.rect.height() / 2), 2, 2);
+ }
+
+ painter->setOpacity(alpha);
+ painter->drawImage(optv4.rect.x(), optv4.rect.y(), overlay);
+ painter->restore();
+}
+
+QSize RelatedPacketDelegate::sizeHint(const QStyleOptionViewItem &option,
+ const QModelIndex &index) const {
+ return QSize(option.fontMetrics.height() + QStyledItemDelegate::sizeHint(option, index).width(),
+ QStyledItemDelegate::sizeHint(option, index).height());
+}
+
+void RelatedPacketDelegate::clear()
+{
+ related_frames_.clear();
+ first_frame_ = last_frame_ = -1;
+}
+
+void RelatedPacketDelegate::addRelatedFrame(int frame_num)
+{
+ related_frames_ << frame_num;
+}
+
+void RelatedPacketDelegate::setConversationSpan(int first_frame, int last_frame)
+{
+ first_frame_ = first_frame;
+ last_frame_ = last_frame;
+}
+
+/*
+ * Editor modelines
+ *
+ * Local Variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
--- /dev/null
+/* related_packet_delegate.h
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef RELATED_PACKET_DELEGATE_H
+#define RELATED_PACKET_DELEGATE_H
+
+#include "config.h"
+
+#include "epan/conversation.h"
+
+#include <QList>
+#include <QStyledItemDelegate>
+
+class RelatedPacketDelegate : public QStyledItemDelegate
+{
+public:
+ RelatedPacketDelegate(QWidget *parent = 0) : QStyledItemDelegate(parent) { clear(); }
+ void clear();
+ void addRelatedFrame(int frame_num);
+ void setConversationSpan(int first_frame, int last_frame);
+
+protected:
+ void paint(QPainter *painter, const QStyleOptionViewItem &option,
+ const QModelIndex &index) const;
+ QSize sizeHint(const QStyleOptionViewItem &option,
+ const QModelIndex &index) const;
+
+private:
+ QList<int> related_frames_;
+ int first_frame_;
+ int last_frame_;
+
+signals:
+
+
+};
+
+#endif // RELATED_PACKET_DELEGATE_H
+
+/*
+ * Editor modelines
+ *
+ * Local Variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
git.samba.org / metze / wireshark / wip.git / commitdiff