osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Qt: Fix various issues with the bookmark menu 

Odering differed from the manage filter expression. Also, managing
filter expressions is called "Filter Button Preferences.." throughout
other functions. And finally it did not properly update the information
about the selected filter, if a new filter was saved or an existing
filter removed.

Change-Id: I005028cd0b741587f4c5f2f39612e36d5d7d6c25
Reviewed-on: https://code.wireshark.org/review/34958
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
This commit is contained in:
Roland Knall 2019-11-04 13:42:44 +00:00
parent 1628bff78d
commit 04bb48bf2c
3 changed files with 55 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
ui/qt/widgets/display_filter_edit.cpp
View File

@ -63,6 +63,7 @@ DisplayFilterEdit::DisplayFilterEdit(QWidget *parent, DisplayFilterEditType type
type_(type),
save_action_(NULL),
remove_action_(NULL),
actions_(Q_NULLPTR),
bookmark_button_(NULL),
clear_button_(NULL),
apply_button_(NULL)
@ -97,9 +98,7 @@ DisplayFilterEdit::DisplayFilterEdit(QWidget *parent, DisplayFilterEditType type
"}"
"QToolButton::menu-indicator { image: none; }"
);
}
if (type_ == DisplayFilterToApply) {
clear_button_ = new StockIconToolButton(this, "x-filter-clear");
clear_button_->setCursor(Qt::ArrowCursor);
clear_button_->setToolTip(tr("Clear display filter"));
@ -253,6 +252,9 @@ bool DisplayFilterEdit::checkFilter()
void DisplayFilterEdit::checkFilter(const QString& filter_text)
{
if ( text().length() == 0 && actions_ && actions_->checkedAction() )
actions_->checkedAction()->setChecked(false);
if (clear_button_) {
clear_button_->setVisible(!filter_text.isEmpty());
}
@ -284,26 +286,20 @@ void DisplayFilterEdit::checkFilter(const QString& filter_text)
bool enable_save_action = false;
bool match = false;
for (GList *df_item = get_filter_list_first(DFILTER_LIST); df_item; df_item = gxx_list_next(df_item)) {
if (!df_item->data) continue;
filter_def *df_def = gxx_list_data(filter_def *, df_item);
if (!df_def->name || !df_def->strval) continue;
FilterListModel model(FilterListModel::Display);
QModelIndex idx = model.findByExpression(filter_text);
if ( idx.isValid() ) {
match = true;
if (filter_text.compare(df_def->strval) == 0) {
match = true;
}
}
if (match) {
bookmark_button_->setStockIcon("x-filter-matching-bookmark");
if (remove_action_) {
remove_action_->setData(text());
remove_action_->setVisible(true);
remove_action_->setEnabled(true);
}
} else {
bookmark_button_->setStockIcon("x-display-filter-bookmark");
if (remove_action_) {
remove_action_->setVisible(false);
remove_action_->setEnabled(false);
}
}
@ -333,21 +329,34 @@ void DisplayFilterEdit::updateBookmarkMenu()
connect(remove_action_, &QAction::triggered, this, &DisplayFilterEdit::removeFilter);
QAction *manage_action = bb_menu->addAction(tr("Manage Display Filters"));
connect(manage_action, &QAction::triggered, this, &DisplayFilterEdit::showFilters);
QAction *expr_action = bb_menu->addAction(tr("Manage Filter Expressions"));
QAction *expr_action = bb_menu->addAction(tr("Filter Button Preferences..."));
connect(expr_action, &QAction::triggered, this, &DisplayFilterEdit::showExpressionPrefs);
bb_menu->addSeparator();
for (GList *df_item = get_filter_list_first(DFILTER_LIST); df_item; df_item = gxx_list_next(df_item)) {
if (!df_item->data) continue;
filter_def *df_def = gxx_list_data(filter_def *, df_item);
if (!df_def->name || !df_def->strval) continue;
FilterListModel model(FilterListModel::Display);
QModelIndex idx = model.findByExpression(text());
int one_em = bb_menu->fontMetrics().height();
if ( ! actions_ )
actions_ = new QActionGroup(this);
for(int row = 0; row < model.rowCount(); row++)
{
QModelIndex nameIdx = model.index(row, FilterListModel::ColumnName);
QString name = nameIdx.data().toString();
QString expr = model.index(row, FilterListModel::ColumnExpression).data().toString();
QString prep_text = QString("%1: %2").arg(name).arg(expr);
int one_em = bb_menu->fontMetrics().height();
QString prep_text = QString("%1: %2").arg(df_def->name).arg(df_def->strval);
prep_text = bb_menu->fontMetrics().elidedText(prep_text, Qt::ElideRight, one_em * 40);
QAction * prep_action = bb_menu->addAction(prep_text);
prep_action->setCheckable(true);
if ( nameIdx == idx )
prep_action->setChecked(true);
prep_action->setProperty("display_filter", expr);
actions_->addAction(prep_action);
QAction *prep_action = bb_menu->addAction(prep_text);
prep_action->setData(df_def->strval);
connect(prep_action, &QAction::triggered, this, &DisplayFilterEdit::applyOrPrepareFilter);
}
@ -400,15 +409,16 @@ void DisplayFilterEdit::buildCompletionList(const QString &field_word)
}
}
}
for (const GList *df_item = get_filter_list_first(DFILTER_LIST); df_item; df_item = gxx_constlist_next(df_item)) {
const filter_def *df_def = gxx_list_data(const filter_def *, df_item);
if (!df_def || !df_def->strval) continue;
QString saved_filter = df_def->strval;
FilterListModel model(FilterListModel::Display);
for (int row = 0; row < model.rowCount(); row++)
{
QString saved_filter = model.index(row, FilterListModel::ColumnExpression).data().toString();
if (isComplexFilter(saved_filter) && !complex_list.contains(saved_filter)) {
complex_list << saved_filter;
}
}
completion_model_->setStringList(complex_list);
completer()->setCompletionPrefix(field_word);
@ -489,23 +499,24 @@ void DisplayFilterEdit::saveFilter()
void DisplayFilterEdit::removeFilter()
{
QAction *ra = qobject_cast<QAction*>(sender());
if (!ra || ra->data().toString().isEmpty()) return;
if ( ! actions_ && ! actions_->checkedAction() )
return;
QString remove_filter = ra->data().toString();
QAction *ra = actions_->checkedAction();
if ( ra->property("display_filter").toString().isEmpty() )
return;
for (GList *df_item = get_filter_list_first(DFILTER_LIST); df_item; df_item = gxx_list_next(df_item)) {
if (!df_item->data) continue;
filter_def *df_def = gxx_list_data(filter_def *, df_item);
if (!df_def->name || !df_def->strval) continue;
QString remove_filter = ra->property("display_filter").toString();
if (remove_filter.compare(df_def->strval) == 0) {
remove_from_filter_list(DFILTER_LIST, df_item);
}
FilterListModel model(FilterListModel::Display);
QModelIndex idx = model.findByExpression(remove_filter);
if ( idx.isValid() )
{
model.removeFilter(idx);
model.saveList();
}
save_filter_list(DFILTER_LIST);
updateBookmarkMenu();
}
@ -525,9 +536,10 @@ void DisplayFilterEdit::showExpressionPrefs()
void DisplayFilterEdit::applyOrPrepareFilter()
{
QAction *pa = qobject_cast<QAction*>(sender());
if (!pa || pa->data().toString().isEmpty()) return;
if ( ! pa || pa->property("display_filter").toString().isEmpty() )
return;
setText(pa->data().toString());
setText(pa->property("display_filter").toString());
// Holding down the Shift key will only prepare filter.
if (!(QApplication::keyboardModifiers() & Qt::ShiftModifier)) {

2
ui/qt/widgets/display_filter_edit.h
View File

@ -11,6 +11,7 @@
#define DISPLAYFILTEREDIT_H
#include <QDrag>
#include <QActionGroup>
#include <ui/qt/widgets/syntax_line_edit.h>
@ -62,6 +63,7 @@ private:
QString placeholder_text_;
QAction *save_action_;
QAction *remove_action_;
QActionGroup * actions_;
StockIconToolButton *bookmark_button_;
StockIconToolButton *clear_button_;
StockIconToolButton *apply_button_;

3
ui/qt/wireshark_application.cpp
View File

@ -1182,9 +1182,6 @@ _e_prefs *WiresharkApplication::readConfigurationFiles(bool reset)
/* Read the capture filter file. */
read_filter_list(CFILTER_LIST);
/* Read the display filter file. */
read_filter_list(DFILTER_LIST);
return prefs_p;
}