From 9603db48d1ab9900c7bd7544e6351b72f34d7aa1 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Thu, 30 Jul 2015 12:34:53 -0700
Subject: Make copy menu item names more consistent.

Change-Id: Ia7b2a87ba9ad843dfa9200d69eeb94275a3dc0bb
Reviewed-on: https://code.wireshark.org/review/9827
Reviewed-by: Gerald Combs <gerald@wireshark.org>
---
 ui/qt/main_window.ui  |  6 +++---
 ui/qt/packet_list.cpp | 12 +++---------
 2 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'ui')

diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui
index 1876ddf73c..8fa7bf8111 100644
--- a/ui/qt/main_window.ui
+++ b/ui/qt/main_window.ui
@@ -1144,12 +1144,12 @@
   </action>
   <action name="actionCopyAllVisibleItems">
    <property name="text">
-    <string>Copy All Visible Items</string>
+    <string>All Visible Items</string>
    </property>
   </action>
   <action name="actionCopyAllVisibleSelectedTreeItems">
    <property name="text">
-    <string>Copy All Visible Selected Tree Items</string>
+    <string>All Visible Selected Tree Items</string>
    </property>
   </action>
   <action name="actionEditCopyFieldName">
@@ -2287,7 +2287,7 @@
   </action>
   <action name="actionContextCopyBytesHexTextDump">
    <property name="text">
-    <string>Copy Bytes as Hex + ASCII Dump</string>
+    <string>Bytes as Hex + ASCII Dump</string>
    </property>
    <property name="toolTip">
     <string>Copy packet bytes as a hex and ASCII dump.</string>
diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index 3aa103476e..879242874b 100644
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -339,13 +339,13 @@ PacketList::PacketList(QWidget *parent) :
     submenu = new QMenu(main_menu_item->title());
     ctx_menu_.addMenu(submenu);
 
-    action = submenu->addAction(tr("Summary (Text)"));
+    action = submenu->addAction(tr("Summary as Text"));
     action->setData(copy_summary_text_);
     connect(action, SIGNAL(triggered()), this, SLOT(copySummary()));
-    action = submenu->addAction(tr("Summary (CSV)"));
+    action = submenu->addAction(tr(UTF8_HORIZONTAL_ELLIPSIS " as CSV"));
     action->setData(copy_summary_csv_);
     connect(action, SIGNAL(triggered()), this, SLOT(copySummary()));
-    action = submenu->addAction(tr("Summary (YAML)"));
+    action = submenu->addAction(tr(UTF8_HORIZONTAL_ELLIPSIS " as YAML"));
     action->setData(copy_summary_yaml_);
     connect(action, SIGNAL(triggered()), this, SLOT(copySummary()));
     submenu->addSeparator();
@@ -369,12 +369,6 @@ PacketList::PacketList(QWidget *parent) :
     submenu->addAction(action);
     copy_actions_ << action;
 
-    //    "           <menuitem name='OffsetHexText' action='/Copy/Bytes/OffsetHexText'/>\n"
-    //    "           <menuitem name='OffsetHex' action='/Copy/Bytes/OffsetHex'/>\n"
-    //    "           <menuitem name='PrintableTextOnly' action='/Copy/Bytes/PrintableTextOnly'/>\n"
-//    ctx_menu_.addSeparator();
-//    "           <menuitem name='HexStream' action='/Copy/Bytes/HexStream'/>\n"
-//    "           <menuitem name='BinaryStream' action='/Copy/Bytes/BinaryStream'/>\n"
     ctx_menu_.addSeparator();
     ctx_menu_.addMenu(&proto_prefs_menu_);
     decode_as_ = window()->findChild<QAction *>("actionAnalyzeDecodeAs");
-- 
cgit v1.2.3