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

Qt: "Conversation" → "Coloring" 

Change actionViewColorizeNewConversationRule to
actionViewColorizeNewColoringRule and change its text accordingly.
We're building a rule based on a general filter, not a conversation.

Change-Id: Ic408050eed6f24690e3e759e6963f9930fe4b5e9
Reviewed-on: https://code.wireshark.org/review/13266
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Gerald Combs 2016-01-13 12:10:04 -08:00 committed by Anders Broman
parent 9b1e318b8e
commit cd5b932812
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/qt/main_window.h
View File

@ -417,7 +417,7 @@ private slots:
void colorizeConversation(bool create_rule = false); void colorizeConversation(bool create_rule = false);
void colorizeWithFilter(); void colorizeWithFilter();
void on_actionViewColorizeResetColorization_triggered(); void on_actionViewColorizeResetColorization_triggered();
void on_actionViewColorizeNewConversationRule_triggered(); void on_actionViewColorizeNewColoringRule_triggered();
void on_actionViewResizeColumns_triggered(); void on_actionViewResizeColumns_triggered();
void on_actionViewInternalsConversationHashTables_triggered(); void on_actionViewInternalsConversationHashTables_triggered();

8
ui/qt/main_window.ui
View File

@ -306,7 +306,7 @@
<addaction name="actionViewColorizeConversation10"/> <addaction name="actionViewColorizeConversation10"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionViewColorizeResetColorization"/> <addaction name="actionViewColorizeResetColorization"/>
<addaction name="actionViewColorizeNewConversationRule"/> <addaction name="actionViewColorizeNewColoringRule"/>
</widget> </widget>
<widget class="QMenu" name="menuInternals"> <widget class="QMenu" name="menuInternals">
<property name="title"> <property name="title">
@ -2783,12 +2783,12 @@
<string>Mark the current conversation with its own color.</string> <string>Mark the current conversation with its own color.</string>
</property> </property>
</action> </action>
<action name="actionViewColorizeNewConversationRule"> <action name="actionViewColorizeNewColoringRule">
<property name="text"> <property name="text">
<string>New Conversation Rule…</string> <string>New Coloring Rule…</string>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Create a new coloring rule based on this conversation.</string> <string>Create a new coloring rule based on this field.</string>
</property> </property>
</action> </action>
<action name="actionViewColorizeResetColorization"> <action name="actionViewColorizeResetColorization">

10
ui/qt/main_window_slots.cpp
View File

@ -1200,12 +1200,10 @@ void MainWindow::setMenusForSelectedPacket()
foreach (QAction *cc_action, cc_actions) { foreach (QAction *cc_action, cc_actions) {
cc_action->setEnabled(frame_selected); cc_action->setEnabled(frame_selected);
} }
main_ui_->actionViewColorizeNewConversationRule->setEnabled(frame_selected); main_ui_->actionViewColorizeNewColoringRule->setEnabled(frame_selected);
main_ui_->actionViewColorizeResetColorization->setEnabled(tmp_color_filters_used()); main_ui_->actionViewColorizeResetColorization->setEnabled(tmp_color_filters_used());
main_ui_->actionViewColorizeNewConversationRule->setEnabled(frame_selected);
main_ui_->actionViewShowPacketInNewWindow->setEnabled(frame_selected); main_ui_->actionViewShowPacketInNewWindow->setEnabled(frame_selected);
main_ui_->actionViewEditResolvedName->setEnabled(frame_selected && is_ip); main_ui_->actionViewEditResolvedName->setEnabled(frame_selected && is_ip);
@ -1242,7 +1240,7 @@ void MainWindow::setMenusForSelectedPacket()
connect(colorize_action, SIGNAL(triggered()), this, SLOT(colorizeWithFilter())); connect(colorize_action, SIGNAL(triggered()), this, SLOT(colorizeWithFilter()));
} }
QAction *conv_rule_action = submenu->addAction(main_ui_->actionViewColorizeNewConversationRule->text()); QAction *conv_rule_action = submenu->addAction(main_ui_->actionViewColorizeNewColoringRule->text());
conv_rule_action->setData(conv_action->data()); conv_rule_action->setData(conv_action->data());
conv_rule_action->setEnabled(enable); conv_rule_action->setEnabled(enable);
connect(conv_rule_action, SIGNAL(triggered()), this, SLOT(colorizeWithFilter())); connect(conv_rule_action, SIGNAL(triggered()), this, SLOT(colorizeWithFilter()));
@ -1375,7 +1373,7 @@ void MainWindow::setMenusForSelectedTreeRow(field_info *fi) {
connect(colorize_action, SIGNAL(triggered()), this, SLOT(colorizeWithFilter())); connect(colorize_action, SIGNAL(triggered()), this, SLOT(colorizeWithFilter()));
} }
QAction *conv_rule_action = proto_tree_->colorizeMenu()->addAction(main_ui_->actionViewColorizeNewConversationRule->text()); QAction *conv_rule_action = proto_tree_->colorizeMenu()->addAction(main_ui_->actionViewColorizeNewColoringRule->text());
conv_rule_action->setData(field_filter); conv_rule_action->setData(field_filter);
conv_rule_action->setEnabled(!field_filter.isEmpty()); conv_rule_action->setEnabled(!field_filter.isEmpty());
connect(conv_rule_action, SIGNAL(triggered()), this, SLOT(colorizeWithFilter())); connect(conv_rule_action, SIGNAL(triggered()), this, SLOT(colorizeWithFilter()));
@ -2433,7 +2431,7 @@ void MainWindow::on_actionViewColorizeResetColorization_triggered()
setMenusForSelectedPacket(); setMenusForSelectedPacket();
} }
void MainWindow::on_actionViewColorizeNewConversationRule_triggered() void MainWindow::on_actionViewColorizeNewColoringRule_triggered()
{ {
colorizeConversation(true); colorizeConversation(true);
} }