osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Qt: Analyze->Enabled Protocols search in enabled/disabled 

Rearrange some of the code from ddb943bf so that searches in
`Only enabled protocols` or `Only disabled protocols` return
filtered results.
This commit is contained in:
Chuck Craft 2021-09-19 13:06:47 -05:00 committed by AndersBroman
parent 3af1a21bfa
commit 5dfbc40b4b
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ui/qt/models/enabled_protocols_model.cpp
View File

@ -423,24 +423,29 @@ bool EnabledProtocolsProxyModel::filterAcceptsSelf(int sourceRow, const QModelIn
if (! regex.isValid())
return false;
if ((type_ != EnabledProtocolsProxyModel::EnabledItems && type_ != EnabledProtocolsProxyModel::DisabledItems) &&
(protocolType_ == EnabledProtocolItem::Any || protocolType_ == item->type()) )
if (protocolType_ == EnabledProtocolItem::Any || protocolType_ == item->type())
{
if (! filter_.isEmpty())
if (type_ != EnabledProtocolsProxyModel::EnabledItems && type_ != EnabledProtocolsProxyModel::DisabledItems)
{
if (item->name().contains(regex) && type_ != OnlyDescription)
return true;
if (! filter_.isEmpty())
{
if (item->name().contains(regex) && type_ != OnlyDescription)
return true;
if (item->description().contains(regex) && type_ != OnlyProtocol)
if (item->description().contains(regex) && type_ != OnlyProtocol)
return true;
}
else
return true;
}
else if (filter_.isEmpty() || (! filter_.isEmpty() && (item->name().contains(regex) || item->description().contains(regex))))
{
if (type_ == EnabledProtocolsProxyModel::EnabledItems && item->enabled())
return true;
else if (type_ == EnabledProtocolsProxyModel::DisabledItems && ! item->enabled())
return true;
}
else
return true;
}
else if (type_ == EnabledProtocolsProxyModel::EnabledItems && item->enabled())
return true;
else if (type_ == EnabledProtocolsProxyModel::DisabledItems && ! item->enabled())
return true;
return false;
}