aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2007-05-23 17:12:01 +0000
committerGerald Combs <gerald@wireshark.org>2007-05-23 17:12:01 +0000
commitf4f8079986f5a7288b02d1944107d584e9b16d62 (patch)
tree466fb3e06d74414a18bf835e8498c7b9c1770d88
parent009c784fb62a7971943920e44a7bedd7af7c04a7 (diff)
Add shortcuts for expanding/collapsing the packet detail.
svn path=/trunk/; revision=21910
-rw-r--r--docbook/wsug_src/WSUG_chapter_use.xml23
-rw-r--r--gtk/menu.c14
2 files changed, 28 insertions, 9 deletions
diff --git a/docbook/wsug_src/WSUG_chapter_use.xml b/docbook/wsug_src/WSUG_chapter_use.xml
index f4118cc7dc..15acd0e270 100644
--- a/docbook/wsug_src/WSUG_chapter_use.xml
+++ b/docbook/wsug_src/WSUG_chapter_use.xml
@@ -169,14 +169,14 @@
</para></entry>
</row>
<row>
- <entry>Ctrl-Down, F8</entry>
+ <entry>Ctrl+Down, F8</entry>
<entry><para>
Move to the next packet, even if the packet
list isn't focused.
</para></entry>
</row>
<row>
- <entry>Ctrl-Up, F7</entry>
+ <entry>Ctrl+Up, F7</entry>
<entry><para>
Move to the previous packet, even if the packet
list isn't focused.
@@ -196,6 +196,25 @@
</para></entry>
</row>
<row>
+ <entry>Shift+Right</entry>
+ <entry><para>
+ In the packet detail, opens the selected tree item
+ and all of its subtrees.
+ </para></entry>
+ </row>
+ <row>
+ <entry>Ctrl+Right</entry>
+ <entry><para>
+ In the packet detail, opens all tree items.
+ </para></entry>
+ </row>
+ <row>
+ <entry>Ctrl+Left</entry>
+ <entry><para>
+ In the packet detail, closes all tree items.
+ </para></entry>
+ </row>
+ <row>
<entry>Backspace</entry>
<entry><para>
In the packet detail, jumps to the parent node.
diff --git a/gtk/menu.c b/gtk/menu.c
index 0cbf1075f4..6dca0cc9b0 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -529,10 +529,10 @@ static GtkItemFactoryEntry menu_items[] =
ITEM_FACTORY_STOCK_ENTRY("/View/Resize All Columns", NULL, packet_list_resize_columns_cb,
0, WIRESHARK_STOCK_RESIZE_COLUMNS),
ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_ENTRY("/View/E_xpand Subtrees", NULL, expand_tree_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/View/_Expand All", NULL, expand_all_cb,
+ ITEM_FACTORY_ENTRY("/View/E_xpand Subtrees", "<shift>Right", expand_tree_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/View/_Expand All", "<control>Right", expand_all_cb,
0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/View/Collapse _All", NULL, collapse_all_cb,
+ ITEM_FACTORY_ENTRY("/View/Collapse _All", "<control>Left", collapse_all_cb,
0, NULL, NULL),
ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
ITEM_FACTORY_STOCK_ENTRY("/View/_Coloring Rules...", NULL, color_display_cb,
@@ -540,8 +540,8 @@ static GtkItemFactoryEntry menu_items[] =
ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
ITEM_FACTORY_ENTRY("/View/Display Filter _Macros...", NULL, macros_dialog_cb, 0, NULL, NULL),
ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-
-
+
+
ITEM_FACTORY_ENTRY("/View/Show Packet in New _Window", NULL,
new_window_cb, 0, NULL, NULL),
ITEM_FACTORY_STOCK_ENTRY("/View/_Reload", "<control>R", file_reload_cmd_cb,
@@ -906,7 +906,7 @@ menus_init(void) {
/* init with an empty recent files list */
clear_menu_recent_capture_file_cmd_cb(NULL, NULL);
-
+
}
}
@@ -1215,7 +1215,7 @@ void merge_all_tap_menus(GList *node) {
if (merge_tap_menus_layered(node, REGISTER_TOOLS_GROUP_NONE)) {
/*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/
}
-#endif
+#endif
}