From f0e623919115a4654a4bd68aeadeb25f963592b4 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Fri, 15 Aug 2014 11:23:14 -0700
Subject: [PATCH] Qt: Disable main menu items that don't do anything.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The functionality associated with Capture → Capture Filters, Analyze
→ Display Filters, Analyze → Display Filter Macros, and Analyze →
Apply As Column haven't been implemented yet. Disable each menu item
for now so that we don't play tricks on our users.

Follow our current action naming convention. Rename "Apply as Column"
to "Create a Column".

Change-Id: I01901db05adc897d877f6a0a699e3049b0149b4a
Reviewed-on: https://code.wireshark.org/review/3629
Reviewed-by: Gerald Combs <gerald@wireshark.org>
---
 ui/qt/main_window.ui        | 47 +++++++++++++++++++++++++++++--------
 ui/qt/main_window_slots.cpp |  8 +++----
 ui/qt/proto_tree.cpp        |  2 +-
 3 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui
index a79eaf8660..fd9c48cc93 100644
--- a/ui/qt/main_window.ui
+++ b/ui/qt/main_window.ui
@@ -28,7 +28,16 @@
     </sizepolicy>
    </property>
    <layout class="QGridLayout" name="gridLayout">
-    <property name="margin">
+    <property name="leftMargin">
+     <number>0</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="rightMargin">
+     <number>0</number>
+    </property>
+    <property name="bottomMargin">
      <number>0</number>
     </property>
     <property name="spacing">
@@ -59,7 +68,7 @@
        <item>
         <widget class="QLineEdit" name="goToLineEdit">
          <property name="inputMask">
-          <string>900000000; </string>
+          <string>900000000</string>
          </property>
         </widget>
        </item>
@@ -85,6 +94,9 @@
     </item>
     <item row="2" column="0">
      <widget class="QStackedWidget" name="mainStack">
+      <property name="enabled">
+       <bool>true</bool>
+      </property>
       <widget class="MainWelcome" name="welcomePage"/>
       <widget class="QWidget" name="packetPage"/>
      </widget>
@@ -97,7 +109,7 @@
      <x>0</x>
      <y>0</y>
      <width>960</width>
-     <height>27</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -269,10 +281,10 @@
      <addaction name="actionSCTPAnalyseThisAssociation"/>
      <addaction name="actionSCTPShowAllAssociations"/>
     </widget>
-    <addaction name="actionDisplayFilters"/>
-    <addaction name="actionDisplayFilterMacros"/>
+    <addaction name="actionAnalyzeDisplayFilters"/>
+    <addaction name="actionAnalyzeDisplayFilterMacros"/>
     <addaction name="separator"/>
-    <addaction name="actionApplyAsColumn"/>
+    <addaction name="actionAnalyzeCreateAColumn"/>
     <addaction name="menuApplyAsFilter"/>
     <addaction name="menuPrepareAFilter"/>
     <addaction name="separator"/>
@@ -905,6 +917,9 @@
    </property>
   </action>
   <action name="actionCaptureCaptureFilters">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="text">
     <string>Capture &amp;Filters...</string>
    </property>
@@ -1093,19 +1108,31 @@
     <string>... or not Selected</string>
    </property>
   </action>
-  <action name="actionDisplayFilters">
+  <action name="actionAnalyzeDisplayFilters">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="text">
     <string>Display Filters...</string>
    </property>
   </action>
-  <action name="actionDisplayFilterMacros">
+  <action name="actionAnalyzeDisplayFilterMacros">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="text">
     <string>Display Filter &amp;Macros...</string>
    </property>
   </action>
-  <action name="actionApplyAsColumn">
+  <action name="actionAnalyzeCreateAColumn">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="text">
-    <string>Apply as Column</string>
+    <string>Create a Column</string>
+   </property>
+   <property name="toolTip">
+    <string>Create a packet list column from the selected field.</string>
    </property>
   </action>
   <action name="actionEditFindPacket">
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 1462bf80c6..c3c200a470 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -1049,7 +1049,7 @@ void MainWindow::setMenusForSelectedTreeRow(field_info *fi) {
 //        set_menu_sensitivity(ui_manager_tree_view_menu, "/TreeViewPopup/Copy",
 //                             TRUE);
 
-//        set_menu_sensitivity(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyasColumn",
+//        set_menu_sensitivity(ui_manager_tree_view_menu, "/TreeViewPopup/CreateAColumn",
 //                             hfinfo->type != FT_NONE);
 //        set_menu_sensitivity(ui_manager_tree_view_menu, "/TreeViewPopup/ColorizewithFilter",
 //                             proto_can_match_selected(cf->finfo_selected, cf->edt));
@@ -1082,7 +1082,7 @@ void MainWindow::setMenusForSelectedTreeRow(field_info *fi) {
 //        set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/EditMenu/Copy/AsFilter",
 //                             proto_can_match_selected(cf->finfo_selected, cf->edt));
 
-//        set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/AnalyzeMenu/ApplyasColumn",
+//        set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/AnalyzeMenu/CreateAColumn",
 //                             hfinfo->type != FT_NONE);
         main_ui_->actionAnalyzeAAFSelected->setEnabled(can_match_selected);
         main_ui_->actionAnalyzeAAFNotSelected->setEnabled(can_match_selected);
@@ -1112,7 +1112,7 @@ void MainWindow::setMenusForSelectedTreeRow(field_info *fi) {
 //        set_menu_sensitivity(ui_manager_tree_view_menu,
 //                             "/TreeViewPopup/GotoCorrespondingPacket", FALSE);
 //        set_menu_sensitivity(ui_manager_tree_view_menu, "/TreeViewPopup/Copy", FALSE);
-//        set_menu_sensitivity(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyasColumn", FALSE);
+//        set_menu_sensitivity(ui_manager_tree_view_menu, "/TreeViewPopup/CreateAColumn", FALSE);
 //        set_menu_sensitivity(ui_manager_tree_view_menu, "/TreeViewPopup/ApplyAsFilter", FALSE);
 //        set_menu_sensitivity(ui_manager_tree_view_menu, "/TreeViewPopup/PrepareaFilter", FALSE);
 //        set_menu_sensitivity(ui_manager_tree_view_menu, "/TreeViewPopup/ColorizewithFilter", FALSE);
@@ -1131,7 +1131,7 @@ void MainWindow::setMenusForSelectedTreeRow(field_info *fi) {
         main_ui_->actionEditCopyFieldName->setEnabled(false);
         main_ui_->actionEditCopyValue->setEnabled(false);
         main_ui_->actionEditCopyAsFilter->setEnabled(false);
-//        set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/AnalyzeMenu/ApplyasColumn", FALSE);
+//        set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/AnalyzeMenu/CreateAColumn", FALSE);
 
         main_ui_->actionAnalyzeAAFSelected->setEnabled(false);
         main_ui_->actionAnalyzeAAFNotSelected->setEnabled(false);
diff --git a/ui/qt/proto_tree.cpp b/ui/qt/proto_tree.cpp
index c827239211..058292287d 100644
--- a/ui/qt/proto_tree.cpp
+++ b/ui/qt/proto_tree.cpp
@@ -169,7 +169,7 @@ ProtoTree::ProtoTree(QWidget *parent) :
     ctx_menu_.addAction(window()->findChild<QAction *>("actionViewExpandAll"));
     ctx_menu_.addAction(window()->findChild<QAction *>("actionViewCollapseAll"));
     ctx_menu_.addSeparator();
-//    "     <menuitem name='ApplyasColumn' action='/Apply as Column'/>\n"
+//    "     <menuitem name='CreateAColumn' action='/Create a Column'/>\n"
     ctx_menu_.addSeparator();
     submenu = new QMenu(tr("Apply as Filter"));
     ctx_menu_.addMenu(submenu);