diff options
16 files changed, 108 insertions, 43 deletions
diff --git a/docbook/Makefile b/docbook/Makefile index 959b826252..b8ed89b044 100644 --- a/docbook/Makefile +++ b/docbook/Makefile @@ -130,9 +130,16 @@ EUG_GRAPHICS = \ graphics/note.png \ graphics/tip.png \ graphics/warning.png \ - graphics/toolbar/capture_24.png \ - graphics/toolbar/cfilter_24.png \ - graphics/toolbar/dfilter_24.png \ + graphics/toolbar/autoscroll_24.png \ + graphics/toolbar/capture_filter_24.png \ + graphics/toolbar/capture_interfaces_24.png \ + graphics/toolbar/capture_options_24.png \ + graphics/toolbar/capture_restart_24.png \ + graphics/toolbar/capture_start_24.png \ + graphics/toolbar/capture_stop_24.png \ + graphics/toolbar/colorize_24.png \ + graphics/toolbar/display_filter_24.png \ + graphics/toolbar/resize_columns_24.png \ graphics/toolbar/stock_add_24.png \ graphics/toolbar/stock_bottom_24.png \ graphics/toolbar/stock_close_24.png \ diff --git a/docbook/eug_src/EUG_chapter_use.xml b/docbook/eug_src/EUG_chapter_use.xml index 162fed03aa..46838a7ec7 100644 --- a/docbook/eug_src/EUG_chapter_use.xml +++ b/docbook/eug_src/EUG_chapter_use.xml @@ -1444,40 +1444,56 @@ </thead> <tbody> <row> - <entry><graphic entityref="EtherealToolbarCapture" format="PNG"/></entry> - <entry><command>Start Capture...</command></entry> - <entry>Capture/Start...</entry> + <entry><graphic entityref="EtherealToolbarCaptureInterfaces" format="PNG"/></entry> + <entry><command>Interfaces...</command></entry> + <entry>Capture/Interfaces...</entry> + <entry><para> + This item brings up the Capture Interfaces List + dialog box (discussed further in + <xref linkend="ChCapCapturingSection"/>). + </para> + </entry> + </row> + <row> + <entry><graphic entityref="EtherealToolbarCaptureOptions" format="PNG"/></entry> + <entry><command>Options...</command></entry> + <entry>Capture/Options...</entry> <entry><para> This item brings up the Capture Options dialog box (discussed further in <xref linkend="ChCapCapturingSection"/>) and allows you to start capturing packets. </para> - <note><title>Note!</title> - <para> - If a live capture is in progress, and you are using "Update List - of Packets in Realtime", this icon will be replaced by the Stop - Capture icon - <inlinegraphic entityref="EtherealToolbarStop" format="PNG"/>. - </para></note> </entry> </row> <row> - <entry><graphic entityref="EtherealToolbarStop" format="PNG"/></entry> - <entry><command>Stop Capture</command></entry> + <entry><graphic entityref="EtherealToolbarCaptureStart" format="PNG"/></entry> + <entry><command>Start</command></entry> + <entry>Capture/Start</entry> + <entry><para> + This item starts capturing packets with the options form + the last time. + </para> + </entry> + </row> + <row> + <entry><graphic entityref="EtherealToolbarCaptureStop" format="PNG"/></entry> + <entry><command>Stop</command></entry> <entry>Capture/Stop</entry> <entry><para> This item stops the currently running live capture process <xref linkend="ChCapCapturingSection"/>). </para> - <note><title>Note!</title> - <para> - This icon is shown if a live capture is in progress, and you are - using "Update List of Packets in Realtime", otherwise the Start - Capture icon - <inlinegraphic entityref="EtherealToolbarCapture" format="PNG"/> - is shown. - </para></note> + </entry> + </row> + <row> + <entry><graphic entityref="EtherealToolbarCaptureRestart" format="PNG"/></entry> + <entry><command>Restart</command></entry> + <entry>Capture/Restart</entry> + <entry><para> + This item stops the currently running live capture process + and restarts it again, for convenience. + </para> </entry> </row> <row> @@ -1556,29 +1572,22 @@ </para></entry> </row> <row> - <entry><graphic entityref="EtherealToolbarFindPrevious" format="PNG"/></entry> - <entry><command>Find Previous</command></entry> - <entry>Edit/Find Previous</entry> + <entry><graphic entityref="EtherealToolbarGoBack" format="PNG"/></entry> + <entry><command>Go Back</command></entry> + <entry>Go/Go Back</entry> <entry><para> - This item tries to find the previous packet, matching the - settings from "Find Packet...". + This item jumps back in the packet history. </para></entry> </row> <row> - <entry><graphic entityref="EtherealToolbarFindNext" format="PNG"/></entry> - <entry><command>Find Next</command></entry> - <entry>Edit/Find Next</entry> + <entry><graphic entityref="EtherealToolbarGoForward" format="PNG"/></entry> + <entry><command>Go Forward</command></entry> + <entry>Go/Go Forward</entry> <entry><para> - This item tries to find the next packet, matching the - settings from "Find Packet...". + This item jumps forward in the packet history. </para></entry> </row> <row> - <entry><command>------</command></entry> - <entry></entry> - <entry></entry> - </row> - <row> <entry><graphic entityref="EtherealToolbarGoTo" format="PNG"/></entry> <entry><command>Go to Packet...</command></entry> <entry>Go/Go to Packet...</entry> @@ -1609,6 +1618,27 @@ <entry></entry> </row> <row> + <entry><graphic entityref="EtherealToolbarColorize" format="PNG"/></entry> + <entry><command>Colorize</command></entry> + <entry>View/Colorize</entry> + <entry><para> + Colorize the packet list (or not). + </para></entry> + </row> + <row> + <entry><graphic entityref="EtherealToolbarAutoScroll" format="PNG"/></entry> + <entry><command>Auto Scroll in Live Capture</command></entry> + <entry>View/Auto Scroll in Live Capture</entry> + <entry><para> + Auto scroll packet list while doing a live capture (or not). + </para></entry> + </row> + <row> + <entry><command>------</command></entry> + <entry></entry> + <entry></entry> + </row> + <row> <entry><graphic entityref="EtherealToolbarZoomIn" format="PNG"/></entry> <entry><command>Zoom In</command></entry> <entry>View/Zoom In</entry> @@ -1633,6 +1663,14 @@ </para></entry> </row> <row> + <entry><graphic entityref="EtherealToolbarResizeColumns" format="PNG"/></entry> + <entry><command>Resize Columns</command></entry> + <entry>View/Resize Columns</entry> + <entry><para> + Resize columns, so the content fits into them. + </para></entry> + </row> + <row> <entry><command>------</command></entry> <entry></entry> <entry></entry> @@ -1686,6 +1724,19 @@ is provided in <xref linkend="ChCustPreferencesSection"/> </para></entry> </row> + <row> + <entry><command>------</command></entry> + <entry></entry> + <entry></entry> + </row> + <row> + <entry><graphic entityref="EtherealToolbarHelp" format="PNG"/></entry> + <entry><command>Help</command></entry> + <entry>Help/Contents</entry> + <entry><para> + This item brings up help dialog box. + </para></entry> + </row> </tbody> </tgroup> </table> diff --git a/docbook/graphics/toolbar/autoscroll_24.png b/docbook/graphics/toolbar/autoscroll_24.png Binary files differnew file mode 100644 index 0000000000..8fe4cb339b --- /dev/null +++ b/docbook/graphics/toolbar/autoscroll_24.png diff --git a/docbook/graphics/toolbar/capture_24.png b/docbook/graphics/toolbar/capture_24.png Binary files differdeleted file mode 100644 index 352da870f8..0000000000 --- a/docbook/graphics/toolbar/capture_24.png +++ /dev/null diff --git a/docbook/graphics/toolbar/capture_filter_24.png b/docbook/graphics/toolbar/capture_filter_24.png Binary files differnew file mode 100644 index 0000000000..cfadbb4e11 --- /dev/null +++ b/docbook/graphics/toolbar/capture_filter_24.png diff --git a/docbook/graphics/toolbar/capture_interfaces_24.png b/docbook/graphics/toolbar/capture_interfaces_24.png Binary files differnew file mode 100644 index 0000000000..1cecb22e54 --- /dev/null +++ b/docbook/graphics/toolbar/capture_interfaces_24.png diff --git a/docbook/graphics/toolbar/capture_options_24.png b/docbook/graphics/toolbar/capture_options_24.png Binary files differnew file mode 100644 index 0000000000..e7adb81cf2 --- /dev/null +++ b/docbook/graphics/toolbar/capture_options_24.png diff --git a/docbook/graphics/toolbar/capture_restart_24.png b/docbook/graphics/toolbar/capture_restart_24.png Binary files differnew file mode 100644 index 0000000000..a60bddced5 --- /dev/null +++ b/docbook/graphics/toolbar/capture_restart_24.png diff --git a/docbook/graphics/toolbar/capture_start_24.png b/docbook/graphics/toolbar/capture_start_24.png Binary files differnew file mode 100644 index 0000000000..8fef78b0bf --- /dev/null +++ b/docbook/graphics/toolbar/capture_start_24.png diff --git a/docbook/graphics/toolbar/capture_stop_24.png b/docbook/graphics/toolbar/capture_stop_24.png Binary files differnew file mode 100644 index 0000000000..027dcf5ed1 --- /dev/null +++ b/docbook/graphics/toolbar/capture_stop_24.png diff --git a/docbook/graphics/toolbar/cfilter_24.png b/docbook/graphics/toolbar/cfilter_24.png Binary files differdeleted file mode 100644 index 4a67f4d26d..0000000000 --- a/docbook/graphics/toolbar/cfilter_24.png +++ /dev/null diff --git a/docbook/graphics/toolbar/colorize_24.png b/docbook/graphics/toolbar/colorize_24.png Binary files differnew file mode 100644 index 0000000000..cec867b938 --- /dev/null +++ b/docbook/graphics/toolbar/colorize_24.png diff --git a/docbook/graphics/toolbar/dfilter_24.png b/docbook/graphics/toolbar/dfilter_24.png Binary files differdeleted file mode 100644 index eb4924dc3f..0000000000 --- a/docbook/graphics/toolbar/dfilter_24.png +++ /dev/null diff --git a/docbook/graphics/toolbar/display_filter_24.png b/docbook/graphics/toolbar/display_filter_24.png Binary files differnew file mode 100644 index 0000000000..74c0e04270 --- /dev/null +++ b/docbook/graphics/toolbar/display_filter_24.png diff --git a/docbook/graphics/toolbar/resize_columns_24.png b/docbook/graphics/toolbar/resize_columns_24.png Binary files differnew file mode 100644 index 0000000000..f8c877875f --- /dev/null +++ b/docbook/graphics/toolbar/resize_columns_24.png diff --git a/docbook/user-guide.xml b/docbook/user-guide.xml index 74e376b37e..f0938f2a23 100644 --- a/docbook/user-guide.xml +++ b/docbook/user-guide.xml @@ -181,22 +181,26 @@ FILE SECTION <!ENTITY EtherealDecodeAsShow SYSTEM "./graphics/ethereal-decode-as-show.png" NDATA PNG> <!-- Third Chapter Toolbar--> - <!ENTITY EtherealToolbarCapture SYSTEM "./graphics/toolbar/capture_24.png" NDATA PNG> - <!ENTITY EtherealToolbarCaptureFilters SYSTEM "./graphics/toolbar/cfilter_24.png" NDATA PNG> - <!ENTITY EtherealToolbarDisplayFilters SYSTEM "./graphics/toolbar/dfilter_24.png" NDATA PNG> + <!ENTITY EtherealToolbarCaptureInterfaces SYSTEM "./graphics/toolbar/capture_interfaces_24.png" NDATA PNG> + <!ENTITY EtherealToolbarCaptureOptions SYSTEM "./graphics/toolbar/capture_options_24.png" NDATA PNG> + <!ENTITY EtherealToolbarCaptureStart SYSTEM "./graphics/toolbar/capture_start_24.png" NDATA PNG> + <!ENTITY EtherealToolbarCaptureStop SYSTEM "./graphics/toolbar/capture_stop_24.png" NDATA PNG> + <!ENTITY EtherealToolbarCaptureRestart SYSTEM "./graphics/toolbar/capture_restart_24.png" NDATA PNG> + <!ENTITY EtherealToolbarCaptureFilters SYSTEM "./graphics/toolbar/capture_filter_24.png" NDATA PNG> + <!ENTITY EtherealToolbarDisplayFilters SYSTEM "./graphics/toolbar/display_filter_24.png" NDATA PNG> <!ENTITY EtherealToolbarAdd SYSTEM "./graphics/toolbar/stock_add_24.png" NDATA PNG> <!ENTITY EtherealToolbarGoLast SYSTEM "./graphics/toolbar/stock_bottom_24.png" NDATA PNG> <!ENTITY EtherealToolbarClose SYSTEM "./graphics/toolbar/stock_close_24.png" NDATA PNG> <!ENTITY EtherealToolbarColoringRules SYSTEM "./graphics/toolbar/stock_colorselector_24.png" NDATA PNG> <!ENTITY EtherealToolbarHelp SYSTEM "./graphics/toolbar/stock_help_24.png" NDATA PNG> <!ENTITY EtherealToolbarGoTo SYSTEM "./graphics/toolbar/stock_jump_to_24.png" NDATA PNG> - <!ENTITY EtherealToolbarFindPrevious SYSTEM "./graphics/toolbar/stock_left_arrow_24.png" NDATA PNG> + <!ENTITY EtherealToolbarGoBack SYSTEM "./graphics/toolbar/stock_left_arrow_24.png" NDATA PNG> <!ENTITY EtherealToolbarOpen SYSTEM "./graphics/toolbar/stock_open_24.png" NDATA PNG> <!ENTITY EtherealToolbarPreferences SYSTEM "./graphics/toolbar/stock_preferences_24.png" NDATA PNG> <!ENTITY EtherealToolbarPrint SYSTEM "./graphics/toolbar/stock_print_24.png" NDATA PNG> <!ENTITY EtherealToolbarProperties SYSTEM "./graphics/toolbar/stock_properties_24.png" NDATA PNG> <!ENTITY EtherealToolbarReload SYSTEM "./graphics/toolbar/stock_refresh_24.png" NDATA PNG> - <!ENTITY EtherealToolbarFindNext SYSTEM "./graphics/toolbar/stock_right_arrow_24.png" NDATA PNG> + <!ENTITY EtherealToolbarGoForward SYSTEM "./graphics/toolbar/stock_right_arrow_24.png" NDATA PNG> <!ENTITY EtherealToolbarSave SYSTEM "./graphics/toolbar/stock_save_24.png" NDATA PNG> <!ENTITY EtherealToolbarSaveAs SYSTEM "./graphics/toolbar/stock_save_as_24.png" NDATA PNG> <!ENTITY EtherealToolbarFind SYSTEM "./graphics/toolbar/stock_search_24.png" NDATA PNG> @@ -205,6 +209,9 @@ FILE SECTION <!ENTITY EtherealToolbarZoom100 SYSTEM "./graphics/toolbar/stock_zoom_1_24.png" NDATA PNG> <!ENTITY EtherealToolbarZoomIn SYSTEM "./graphics/toolbar/stock_zoom_in_24.png" NDATA PNG> <!ENTITY EtherealToolbarZoomOut SYSTEM "./graphics/toolbar/stock_zoom_out_24.png" NDATA PNG> + <!ENTITY EtherealToolbarColorize SYSTEM "./graphics/toolbar/colorize_24.png" NDATA PNG> + <!ENTITY EtherealToolbarAutoScroll SYSTEM "./graphics/toolbar/autoscroll_24.png" NDATA PNG> + <!ENTITY EtherealToolbarResizeColumns SYSTEM "./graphics/toolbar/resize_columns_24.png" NDATA PNG> <!-- Third Chapter Statistics --> <!ENTITY EtherealStatsSummary SYSTEM "./graphics/ethereal-stats-summary.png" NDATA PNG> |
