From cd5b93281287b7fb169e1bd9be0a3c60814c4dec Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Wed, 13 Jan 2016 12:10:04 -0800
Subject: [PATCH] =?UTF-8?q?Qt:=20"Conversation"=20=E2=86=92=20"Coloring"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 ui/qt/main_window.h         |  2 +-
 ui/qt/main_window.ui        |  8 ++++----
 ui/qt/main_window_slots.cpp | 10 ++++------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h
index 6d0a610aea..e0cbdcc668 100644
--- a/ui/qt/main_window.h
+++ b/ui/qt/main_window.h
@@ -417,7 +417,7 @@ private slots:
     void colorizeConversation(bool create_rule = false);
     void colorizeWithFilter();
     void on_actionViewColorizeResetColorization_triggered();
-    void on_actionViewColorizeNewConversationRule_triggered();
+    void on_actionViewColorizeNewColoringRule_triggered();
     void on_actionViewResizeColumns_triggered();
 
     void on_actionViewInternalsConversationHashTables_triggered();
diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui
index af190c0ac4..667a3e2bbd 100644
--- a/ui/qt/main_window.ui
+++ b/ui/qt/main_window.ui
@@ -306,7 +306,7 @@
      <addaction name="actionViewColorizeConversation10"/>
      <addaction name="separator"/>
      <addaction name="actionViewColorizeResetColorization"/>
-     <addaction name="actionViewColorizeNewConversationRule"/>
+     <addaction name="actionViewColorizeNewColoringRule"/>
     </widget>
     <widget class="QMenu" name="menuInternals">
      <property name="title">
@@ -2783,12 +2783,12 @@
     <string>Mark the current conversation with its own color.</string>
    </property>
   </action>
-  <action name="actionViewColorizeNewConversationRule">
+  <action name="actionViewColorizeNewColoringRule">
    <property name="text">
-    <string>New Conversation Rule…</string>
+    <string>New Coloring Rule…</string>
    </property>
    <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>
   </action>
   <action name="actionViewColorizeResetColorization">
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 17c3eba1c6..06abeb5ae4 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -1200,12 +1200,10 @@ void MainWindow::setMenusForSelectedPacket()
     foreach (QAction *cc_action, cc_actions) {
         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_->actionViewColorizeNewConversationRule->setEnabled(frame_selected);
-
     main_ui_->actionViewShowPacketInNewWindow->setEnabled(frame_selected);
     main_ui_->actionViewEditResolvedName->setEnabled(frame_selected && is_ip);
 
@@ -1242,7 +1240,7 @@ void MainWindow::setMenusForSelectedPacket()
             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->setEnabled(enable);
         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()));
     }
 
-    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->setEnabled(!field_filter.isEmpty());
     connect(conv_rule_action, SIGNAL(triggered()), this, SLOT(colorizeWithFilter()));
@@ -2433,7 +2431,7 @@ void MainWindow::on_actionViewColorizeResetColorization_triggered()
     setMenusForSelectedPacket();
 }
 
-void MainWindow::on_actionViewColorizeNewConversationRule_triggered()
+void MainWindow::on_actionViewColorizeNewColoringRule_triggered()
 {
     colorizeConversation(true);
 }