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

Qt: Simplify disabling entries in ContextMenu 

We have direct access to every entry (action) in ContextMenu.
Use it instead of storing "actions" and checking its name.

Change-Id: I97a1723898409faf13280c5655b7738661ab594b
Reviewed-on: https://code.wireshark.org/review/5135
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Michal Labedzki 2014-11-04 18:47:11 +01:00 committed by Alexis La Goutte
parent ce4be19bdc
commit 1af7c2b838
2 changed files with 18 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
ui/qt/packet_list.cpp
View File

@ -266,8 +266,6 @@ PacketList::PacketList(QWidget *parent) :
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowUDPStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowSSLStream"));
filter_actions_ << submenu->actions();
action = window()->findChild<QAction *>("actionSCTP");
submenu = new QMenu();
action->setMenu(submenu);
@ -276,7 +274,6 @@ PacketList::PacketList(QWidget *parent) :
submenu->addAction(window()->findChild<QAction *>("actionSCTPAnalyseThisAssociation"));
submenu->addAction(window()->findChild<QAction *>("actionSCTPShowAllAssociations"));
submenu->addAction(window()->findChild<QAction *>("actionSCTPFilterThisAssociation"));
filter_actions_ << submenu->actions();
ctx_menu_.addSeparator();
@ -293,7 +290,6 @@ PacketList::PacketList(QWidget *parent) :
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeAAFOrSelected"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeAAFAndNotSelected"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeAAFOrNotSelected"));
filter_actions_ << submenu->actions();
action = window()->findChild<QAction *>("actionPrepare_a_Filter");
submenu = new QMenu();
@ -305,7 +301,6 @@ PacketList::PacketList(QWidget *parent) :
submenu->addAction(window()->findChild<QAction *>("actionAnalyzePAFOrSelected"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzePAFAndNotSelected"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzePAFOrNotSelected"));
filter_actions_ << submenu->actions();
// action = window()->findChild<QAction *>("actionColorize_with_Filter");
// submenu = new QMenu();
@ -393,7 +388,6 @@ PacketList::PacketList(QWidget *parent) :
// " <menuitem name='SummaryTxt' action='/Copy/SummaryTxt'/>\n"
// " <menuitem name='SummaryCSV' action='/Copy/SummaryCSV'/>\n"
submenu->addAction(window()->findChild<QAction *>("actionEditCopyAsFilter"));
filter_actions_ << window()->findChild<QAction *>("actionEditCopyAsFilter");
submenu->addSeparator();
action = window()->findChild<QAction *>("actionBytes");
@ -496,65 +490,39 @@ void PacketList::selectionChanged (const QItemSelection & selected, const QItemS
void PacketList::contextMenuEvent(QContextMenuEvent *event)
{
bool fa_enabled = filter_actions_[0]->isEnabled();
QAction *act;
QAction *action;
gboolean is_tcp = FALSE, is_udp = FALSE;
/* walk the list of a available protocols in the packet to see what we have */
if ((cap_file_ != NULL) && (cap_file_->edt != NULL))
{
if (cap_file_ != NULL && cap_file_->edt != NULL)
proto_get_frame_protocols(cap_file_->edt->pi.layers, NULL, &is_tcp, &is_udp, NULL, NULL);
}
foreach (act, filter_actions_)
{
act->setEnabled(true);
action = window()->findChild<QAction *>("actionSCTP");
if (cap_file_ != NULL && cap_file_->edt != NULL &&
cap_file_->edt->pi.ipproto == IP_PROTO_SCTP)
action->setEnabled(TRUE);
else
action->setEnabled(FALSE);
// check SCTP
if (act->objectName().contains("SCTP"))
{
if ((cap_file_ != NULL) && (cap_file_->edt != NULL) && (cap_file_->edt->pi.ipproto == IP_PROTO_SCTP))
{
act->setEnabled(true);
}
else
{
act->setEnabled(false);
}
}
action = window()->findChild<QAction *>("actionAnalyzeFollowTCPStream");
action->setEnabled(is_tcp);
// check follow stream
if (act->text().contains("TCP"))
{
act->setEnabled(is_tcp);
}
action = window()->findChild<QAction *>("actionAnalyzeFollowUDPStream");
action->setEnabled(is_udp);
action = window()->findChild<QAction *>("actionAnalyzeFollowSSLStream");
if (act->text().contains("UDP"))
{
act->setEnabled(is_udp);
}
if (cap_file_ != NULL && cap_file_->edt != NULL &&
epan_dissect_packet_contains_field(cap_file_->edt, "ssl"))
action->setEnabled(TRUE);
else
action->setEnabled(FALSE);
if ((cap_file_ != NULL) && act->text().contains("SSL"))
{
if (epan_dissect_packet_contains_field(cap_file_->edt, "ssl"))
{
act->setEnabled(true);
}
else
{
act->setEnabled(false);
}
}
}
decode_as_->setData(qVariantFromValue(true));
ctx_column_ = columnAt(event->x());
ctx_menu_.exec(event->globalPos());
ctx_column_ = -1;
decode_as_->setData(QVariant());
foreach (act, filter_actions_) {
act->setEnabled(fa_enabled);
}
}
void PacketList::markFramesReady()

2
ui/qt/packet_list.h
View File

@ -61,8 +61,6 @@ private:
ByteViewTab *byte_view_tab_;
capture_file *cap_file_;
QMenu ctx_menu_;
QList<QMenu *> submenus_;
QList<QAction *> filter_actions_;
QAction *decode_as_;
int ctx_column_;
RelatedPacketDelegate related_packet_delegate_;