diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-09-22 16:33:05 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-09-23 14:26:45 +0000 |
| commit | 717ff08f324790cf655afc86ff7ab4b3695b0633 (patch) | |
| tree | 67d0e40f42f63e9a2ff7817c1872862a2c666c74 /ui/qt/packet_list_model.cpp | |
| parent | ad6a66388d7ded3743283f573738b122a2bccd3b (diff) | |
Qt: Add the colorization action.
Change-Id: I846a48c35c4ef3bbbcf17d03885acc5be8c9a6b5
Reviewed-on: https://code.wireshark.org/review/4259
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/packet_list_model.cpp')
| -rw-r--r-- | ui/qt/packet_list_model.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/ui/qt/packet_list_model.cpp b/ui/qt/packet_list_model.cpp index db9cf0d243..cc034a5af7 100644 --- a/ui/qt/packet_list_model.cpp +++ b/ui/qt/packet_list_model.cpp @@ -93,10 +93,6 @@ guint PacketListModel::recreateVisibleRows() return visible_rows_.count(); } -void PacketListModel::setColorEnabled(bool enable_color) { - enable_color_ = enable_color; -} - void PacketListModel::clear() { beginResetModel(); physical_rows_.clear(); @@ -114,6 +110,17 @@ void PacketListModel::resetColumns() endResetModel(); } +void PacketListModel::resetColorized() +{ + PacketListRecord *record; + + beginResetModel(); + foreach (record, physical_rows_) { + record->resetColorized(); + } + endResetModel(); +} + int PacketListModel::rowCount(const QModelIndex &parent) const { if (parent.column() >= prefs.num_cols) @@ -170,20 +177,19 @@ QVariant PacketListModel::data(const QModelIndex &index, int role) const color = &prefs.gui_ignored_bg; } else if (fdata->flags.marked) { color = &prefs.gui_marked_bg; - } else if (fdata->color_filter) { + } else if (fdata->color_filter && recent.packet_list_colorize) { const color_filter_t *color_filter = (const color_filter_t *) fdata->color_filter; color = &color_filter->bg_color; } else { return QVariant(); } -// g_log(NULL, G_LOG_LEVEL_DEBUG, "i: %d m: %d cf: %p bg: %d %d %d", fdata->flags.ignored, fdata->flags.marked, fdata->color_filter, color->red, color->green, color->blue); return QColor(color->red >> 8, color->green >> 8, color->blue >> 8); case Qt::ForegroundRole: if (fdata->flags.ignored) { color = &prefs.gui_ignored_fg; } else if (fdata->flags.marked) { color = &prefs.gui_marked_fg; - } else if (fdata->color_filter) { + } else if (fdata->color_filter && recent.packet_list_colorize) { const color_filter_t *color_filter = (const color_filter_t *) fdata->color_filter; color = &color_filter->fg_color; } else { @@ -193,7 +199,6 @@ QVariant PacketListModel::data(const QModelIndex &index, int role) const case Qt::DisplayRole: { int column = index.column(); - // g_log(NULL, G_LOG_LEVEL_DEBUG, "showing col %d", col_num); return record->columnString(cap_file_, column); } default: |