from Douglas Pratley:

Based on comments from Ulf (http://www.wireshark.org/lists/wireshark-dev/200701/msg02802.html), have revised menu structure and labels for copying items, and updated the documentation to match.

(a) All copying now under one sub-menu in each of packet list and details panes
(b) Revised names for copy items, now the same for both panes
(c) Export Selected Packet Bytes item now in pop-up menu for packet list and details panes
(d) Removed Copy and Export from packet bytes pane; this leaves no items in the pop-up menu.
 

This last is because the functionality in the bytes pane was odd and inconsistent
- right-clicking would often change the selection in unexpected ways
- the export worked on the selected bytes, the copy on the whole packet
- the documentation did not reflect the functionality correctly (at least for Copy / Text Only).

svn path=/trunk/; revision=20787

6 files changed, 60 insertions, 110 deletions

diff --git a/docbook/Makefile.common b/docbook/Makefile.common
index bbe5c7a1e6..0867aea08b 100644
--- a/docbook/Makefile.common
+++ b/docbook/Makefile.common
@@ -20,7 +20,6 @@ WSUG_FILES =	\
 
 WSUG_GRAPHICS =	\
 	wsug_graphics/ws-analyze-menu.png		\
-	wsug_graphics/ws-bytes-pane-popup-menu.png	\
 	wsug_graphics/ws-bytes-pane-tabs.png		\
 	wsug_graphics/ws-bytes-pane.png			\
 	wsug_graphics/ws-capture-info.png		\
diff --git a/docbook/wsug_graphics/ws-bytes-pane-popup-menu.png b/docbook/wsug_graphics/ws-bytes-pane-popup-menu.png
deleted file mode 100644
index df0ed89078..0000000000
--- a/docbook/wsug_graphics/ws-bytes-pane-popup-menu.png
+++ /dev/null
diff --git a/docbook/wsug_graphics/ws-details-pane-popup-menu.png b/docbook/wsug_graphics/ws-details-pane-popup-menu.png
index dd97da0271..95c6ccb056 100644
--- a/docbook/wsug_graphics/ws-details-pane-popup-menu.png
+++ b/docbook/wsug_graphics/ws-details-pane-popup-menu.png
diff --git a/docbook/wsug_graphics/ws-packet-pane-popup-menu.png b/docbook/wsug_graphics/ws-packet-pane-popup-menu.png
index 53606e012c..7104ebd60f 100644
--- a/docbook/wsug_graphics/ws-packet-pane-popup-menu.png
+++ b/docbook/wsug_graphics/ws-packet-pane-popup-menu.png
diff --git a/docbook/wsug_src/WSUG_chapter_use.xml b/docbook/wsug_src/WSUG_chapter_use.xml
index 6bc3acd5f9..d5c22252df 100644
--- a/docbook/wsug_src/WSUG_chapter_use.xml
+++ b/docbook/wsug_src/WSUG_chapter_use.xml
@@ -2168,10 +2168,6 @@
 	are displayed.
     </para>
     <para>
-	There is a context menu (right mouse click) available, see details in
-	<xref linkend="ChWorkPacketBytesPanePopUpMenu"/>.
-    </para>
-    <para>
 	Depending on the packet data, sometimes more than one page is available,
 	e.g. when Wireshark has reassembled some packets into a single chunk of
 	data, see <xref linkend="ChAdvReassemblySection"/>. In this case there are
diff --git a/docbook/wsug_src/WSUG_chapter_work.xml b/docbook/wsug_src/WSUG_chapter_work.xml
index 53db2c5b7b..1935eac844 100644
--- a/docbook/wsug_src/WSUG_chapter_work.xml
+++ b/docbook/wsug_src/WSUG_chapter_work.xml
@@ -185,27 +185,16 @@
 		</entry>
 		  </row>
 		  <row>
-		<entry><command>Copy/ Hex and Text</command></entry>
+		<entry><command>Copy/ Bytes (Offset Hex Text)</command></entry>
 		<entry>-</entry>
 		<entry>
 		<para>
-		  Copy the packet bytes to the clipboard in hexdump-like format; similar to the Packet Bytes Pane 
-		"Copy/ All Information" command.
+		  Copy the packet bytes to the clipboard in hexdump-like format.
 		</para>
 		</entry>
 		  </row>
 		  <row>
-		<entry><command>Copy/ Text Only</command></entry>
-		<entry>-</entry>
-		<entry>
-		<para>
-		  Copy the packet bytes to the clipboard as ASCII text; similar to the Packet Bytes Pane 
-		"Copy/ Text Only" command.
-		</para>
-		</entry>
-		  </row>
-		  <row>
-		<entry><command>Copy/ Hex Columns</command></entry>
+		<entry><command>Copy/ Bytes (Offset Hex)</command></entry>
 		<entry>-</entry>
 		<entry>
 		<para>
@@ -214,25 +203,25 @@
 		</entry>
 		  </row>
 		  <row>
-		<entry><command>Copy/ Hex Stream</command></entry>
+		<entry><command>Copy/ Bytes (Printable Text Only)</command></entry>
 		<entry>-</entry>
 		<entry>
 		<para>
-		  Copy the packet bytes to the clipboard as an unpunctuated list of hex digits.
+		  Copy the packet bytes to the clipboard as ASCII text, excluding non-printable characters.
 		</para>
 		</entry>
 		  </row>
 		  <row>
-		<entry><command>Copy/ Base64 Stream</command></entry>
+		<entry><command>Copy/ Bytes (Hex Stream)</command></entry>
 		<entry>-</entry>
 		<entry>
 		<para>
-		  Copy the packet bytes to the clipboard as a Base64 text encoding.
+		  Copy the packet bytes to the clipboard as an unpunctuated list of hex digits.
 		</para>
 		</entry>
 		  </row>
 		  <row>
-		<entry><command>Copy/ Binary Stream</command></entry>
+		<entry><command>Copy/ Bytes (Binary Stream)</command></entry>
 		<entry>-</entry>
 		<entry>
 		<para>
@@ -247,6 +236,21 @@
 		<entry></entry>
 	      </row>
 	      <row>
+		<entry><command>Export Selected Packet Bytes...</command></entry>
+		<entry>File</entry>
+		<entry>
+	    <para>
+	      This menu item is the same as the File menu item of the same 
+	      name. It allows you to export raw packet bytes to a binary file.
+	    </para>
+		</entry>
+	      </row>
+	      <row>
+		<entry>-----</entry>
+		<entry></entry>
+		<entry></entry>
+	      </row>
+	      <row>
 		<entry><command>Decode As...</command></entry>
 		<entry>Analyze</entry>
 		<entry>
@@ -340,7 +344,7 @@
 		<entry></entry>
 	      </row>
 	      <row>
-		<entry><command>Copy</command></entry>
+		<entry><command>Copy/ Description</command></entry>
 		<entry>-</entry>
 		<entry>
 	    <para>
@@ -350,59 +354,57 @@
 		</entry>
 	      </row>
 		  <row>
-		<entry><command>Copy Selected Bytes As/ Hex and Text</command></entry>
+		<entry><command>Copy/ Bytes (Offset Hex Text)</command></entry>
 		<entry>-</entry>
 		<entry>
 		<para>
-		  Copy the selected packet bytes to the clipboard in hexdump-like format; similar to the Packet Bytes Pane 
-		"Copy/ All Information" command, but copies only the bytes relevant to the selected part of the tree (the bytes selected
-		in the Packet Bytes Pane).
+		  Copy the packet bytes to the clipboard in hexdump-like format; similar to the Packet List Pane 
+		  command, but copies only the bytes relevant to the selected part of the tree (the bytes selected
+		  in the Packet Bytes Pane).
 		</para>
 		</entry>
 		  </row>
 		  <row>
-		<entry><command>Copy Selected Bytes As/ Text Only</command></entry>
+		<entry><command>Copy/ Bytes (Offset Hex)</command></entry>
 		<entry>-</entry>
 		<entry>
 		<para>
-		  Copy the selected packet bytes to the clipboard as ASCII text; similar to the Packet Bytes Pane 
-		"Copy/ Text Only" command, but copies only the bytes relevant to the selected part of the tree.
+		  Copy the packet bytes to the clipboard in hexdump-like format, but without the text portion; similar to the 		Packet List Pane 
+		  command, but copies only the bytes relevant to the selected part of the tree (the bytes selected
+		  in the Packet Bytes Pane).
 		</para>
 		</entry>
 		  </row>
 		  <row>
-		<entry><command>Copy Selected Bytes As/ Hex Columns</command></entry>
+		<entry><command>Copy/ Bytes (Printable Text Only)</command></entry>
 		<entry>-</entry>
 		<entry>
 		<para>
-		  Copy the selected packet bytes to the clipboard in hexdump-like format, but without the text portion.
+		  Copy the packet bytes to the clipboard as ASCII text, excluding non-printable characters; similar to the Packet List Pane 
+		  command, but copies only the bytes relevant to the selected part of the tree (the bytes selected
+		  in the Packet Bytes Pane).
 		</para>
 		</entry>
 		  </row>
 		  <row>
-		<entry><command>Copy Selected Bytes As/ Hex Stream</command></entry>
+		<entry><command>Copy/ Bytes (Hex Stream)</command></entry>
 		<entry>-</entry>
 		<entry>
 		<para>
-		  Copy the selected packet bytes to the clipboard as an unpunctuated list of hex digits.
+		  Copy the packet bytes to the clipboard as an unpunctuated list of hex digits; similar to the Packet List Pane 
+		  command, but copies only the bytes relevant to the selected part of the tree (the bytes selected
+		  in the Packet Bytes Pane).
 		</para>
 		</entry>
 		  </row>
 		  <row>
-		<entry><command>Copy Selected Bytes As/ Base64 Stream</command></entry>
+		<entry><command>Copy/ Bytes (Binary Stream)</command></entry>
 		<entry>-</entry>
 		<entry>
 		<para>
-		  Copy the selected packet bytes to the clipboard as a Base64 text encoding.
-		</para>
-		</entry>
-		  </row>
-		  <row>
-		<entry><command>Copy Selected Bytes As/ Binary Stream</command></entry>
-		<entry>-</entry>
-		<entry>
-		<para>
-		  Copy the selected packet bytes to the clipboard as raw binary. The data is stored in the
+		  Copy the packet bytes to the clipboard as raw binary; similar to the Packet List Pane 
+		  command, but copies only the bytes relevant to the selected part of the tree (the bytes selected
+		  in the Packet Bytes Pane). The data is stored in the
 		  clipboard as MIME-type "application/octet-stream".</para>
 		<para>This option is not available in versions of Wireshark built using GTK+ 1.x.</para>
 		</entry>
@@ -413,6 +415,21 @@
 		<entry></entry>
 	      </row>
 	      <row>
+		<entry><command>Export Selected Packet Bytes...</command></entry>
+		<entry>File</entry>
+		<entry>
+	    <para>
+	      This menu item is the same as the File menu item of the same 
+	      name. It allows you to export raw packet bytes to a binary file.
+	    </para>
+		</entry>
+	      </row>
+	      <row>
+		<entry>-----</entry>
+		<entry></entry>
+		<entry></entry>
+	      </row>
+	      <row>
 		<entry><command>Apply as Filter</command></entry>
 		<entry>Analyze</entry>
 		<entry>
@@ -530,69 +547,6 @@
 	</table>
   </section>
   
-  <section id="ChWorkPacketBytesPanePopUpMenuSection">
-    <title>Pop-up menu of the "Packet Bytes" pane</title>
-    <para>
-      <figure id="ChWorkPacketBytesPanePopUpMenu">
-	<title>Pop-up menu of the "Packet Bytes" pane</title>
-	<graphic entityref="WiresharkBytesPanePopupMenu" format="PNG"/>
-      </figure>
-	  </para>
-	  <para>
-	  The following table gives an overview of which functions are available 
-	  in this pane, where to find the corresponding function in the main menu, 
-	  and a short description of each item.
-	  </para>
-	<table id="PacketBytesPopupMenuTable">
-	  <title>The menu items of the "Packet Bytes" pop-up menu</title>
-	  <tgroup cols="3">
-		<colspec colnum="1" colwidth="80pt"/>
-		<colspec colnum="2" colwidth="80pt"/>
-	    <thead>
-	      <row>
-		<entry>Item</entry>
-		<entry>Identical to main menu's item:</entry>
-		<entry>Description</entry>
-	      </row>
-	    </thead>
-	    <tbody>
-	      <row>
-		<entry><command>Copy/ All Information</command></entry>
-		<entry>-</entry>
-		<entry>
-	    <para>
-	      Copy the packet data to the clipboard in hexdump format - as displayed in 
-		  the pane. All the packet data is copied - to copy only the selected data use the
-		  Packet Details Pane "Copy Selected Bytes" command.
-	    </para>
-		</entry>
-	      </row>
-	      <row>
-		<entry><command>Copy/ Text Only</command></entry>
-		<entry>-</entry>
-		<entry>
-	    <para>
-	      Copy the packet data to the clipboard as ASCII text. Non-printable characters are
-		  replaced with '.'.All the packet data is copied - to copy only the selected data use the
-		  Packet Details Pane "Copy Selected Bytes" command.
-	    </para>
-		</entry>
-	      </row>
-	      <row>
-		<entry><command>Export Selected Packet Bytes...</command></entry>
-		<entry>File</entry>
-		<entry>
-	    <para>
-	      This menu item is the same as the File menu item of the same 
-	      name. It allows you to export raw packet bytes to a binary file.
-	    </para>
-		</entry>
-	      </row>
-	    </tbody>
-	  </tgroup>
-	</table>
-  </section>
-	
   </section>
   
   <section id="ChWorkDisplayFilterSection">
@@ -1530,3 +1484,4 @@ eth.src[1-2] == 00:83
 </chapter>
 <!-- End of WSUG Chapter Work -->
 
+