Wireshark-dev: Re: [Wireshark-dev] [Wireshark-commits] rev 21005: /trunk/ /trunk/doc/: wireshar

From: Sake Blok <sake@xxxxxxxxxx>
Date: Wed, 14 Mar 2007 15:03:11 +0100
On Thu, Mar 08, 2007 at 11:37:56PM +0000, ulfl@xxxxxxxxxxxxx wrote:
> http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=21005
> 
> User: ulfl
> Date: 2007/03/08 11:37 PM
> 
> Log:
>  from Sake Blok:
>  I have changed the patch according to your suggestions and also changed
>  the doc[book] files accordingly. I tested the patch and it does seem to
>  work fine on my test-system.
>  
>  ULFL: In addition, I've added the en-/disabling to the other (already existing) Copy menu items - some just did nothing, some crashed if nothing was selected.
>  I've also sligthly changed the menu seperators and made both context menus look a bit more identical.

OK, things look great! I did however see some small errors in the 
documentation that I did not notice when I sent in the patch. This
patch corrects them and adds an accelerated key:

- table 6.1 remove "Analyze" from "Identical..." column for "Copy as Filter" 
- table 6.2 add "Edit" from "Identical..." column for "Copy as Filter"
- Added accelerator key for "Copy as Filter". I chose "Shift+Ctrl+C", so 
  that "Ctrl+C" is still available for "standard" copy

Image figure 3.4 should be renewed, reflecting the change in the menu
structure. But I use different columns and colors, so it might be better
renewed by someone with the default settings.

Cheers,


Sake


Index: docbook/wsug_src/WSUG_chapter_work.xml
===================================================================
--- docbook/wsug_src/WSUG_chapter_work.xml	(revision 21024)
+++ docbook/wsug_src/WSUG_chapter_work.xml	(working copy)
@@ -185,8 +185,8 @@
 		</entry>
 		  </row>
 		  <row>
-		    <entry><command>Copy as Filter</command></entry>
-		    <entry>Analyze</entry>
+		    <entry><command>Copy/ As Filter</command></entry>
+		    <entry></entry>
 	 	    <entry>
 	            <para>
 	 	      Prepare a display filter based on the currently selected item
@@ -360,7 +360,7 @@
 	      </row>
 	      <row>
 		<entry><command>Copy/ As Filter</command></entry>
-		<entry>-</entry>
+		<entry>Edit</entry>
 		<entry>
 	    <para>
 		  Prepare a display filter based on the currently selected item
Index: docbook/wsug_src/WSUG_chapter_use.xml
===================================================================
--- docbook/wsug_src/WSUG_chapter_use.xml	(revision 21024)
+++ docbook/wsug_src/WSUG_chapter_use.xml	(working copy)
@@ -575,7 +575,7 @@
 	    <tbody>
 	      <row>
 		<entry><command>Copy > As Filter</command></entry>
-		<entry></entry>
+		<entry>Shift+Ctrl+C</entry>
 		<entry><para>
 			This menu item will use the selected item in the detail view to
 			create a display filter. This display filter is then copied to
Index: gtk/menu.c
===================================================================
--- gtk/menu.c	(revision 21024)
+++ gtk/menu.c	(working copy)
@@ -433,7 +433,7 @@
                              0, GTK_STOCK_QUIT),
     ITEM_FACTORY_ENTRY("/_Edit", NULL, NULL, 0, "<Branch>", NULL),
     ITEM_FACTORY_ENTRY("/Edit/Copy", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Edit/Copy/As Filter", NULL, match_selected_ptree_cb,
+    ITEM_FACTORY_ENTRY("/Edit/Copy/As Filter", "<shift><control>C", match_selected_ptree_cb,
                        MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY, NULL, NULL),
 #if 0
     /* Un-#if this when we actually implement Cut/Copy/Paste. */