Instead of each set of built-in preferences having "ok", "save",

"cancel", and "delete" methods, give them:

	"fetch" - fetch from the notebook tab any values not already
	stored in "prefs", and store them there, but doesn't apply them;

	"apply" - apply the settings in "prefs";

	"destroy" - clean up any windows created from the tab.

As we no longer have "cancel" methods, we don't have per-preference code
to revert preference values; instead, we have the common preference
dialog box code make a copy of all the current preferences, and, when
the "Cancel" button is clicked, free the current preferences and copy
the saved preferences to it, and apply the preferences.

Add an "Apply" button to the preference dialog box, which applies the
current preferences without closing the dialog box.

Treat a request to delete the preferences dialog box as equivalent to
clicking "Cancel".

Have a "remember_ptree_widget()" routine to remember all protocol tree
widgets, and use the list of those widgets when we set GUI preferences
for the protocol tree widgets, rather than setting the main protocol
tree widget and then using the list of packet windows.  Move that code
out of "main.c" to "proto_draw.c", as it's not used by anything in
"main.c", but is used by stuff in "proto_draw.c".

Make the font one of the preferences we can set on the fly for protocol
tree widgets.  Also make it something we can set on the fly for the
packet list widget.

svn path=/trunk/; revision=2317

1 files changed, 22 insertions, 9 deletions

diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index ca21af63e2..dbc7c582b9 100644
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -7,7 +7,6 @@ Ethereal - Interactively browse network traffic
 
 B<ethereal>
 S<[ B<-B> byte view height ]>
-S<[ B<-b> bold font ]>
 S<[ B<-c> count ]>
 S<[ B<-D> ]>
 S<[ B<-f> filter expression ]>
@@ -77,11 +76,6 @@ be unable to read compressed files.
 
 Sets the initial height of the byte view (bottom) pane.
 
-=item -b
-
-Sets the name of the bold font used for the data in the byte view
-pane that corresponds to the field selected in the protocol tree pane.
-
 =item -c
 
 Sets the default number of packets to read when capturing live
@@ -120,7 +114,10 @@ doesn't start the capture.
 
 =item -m
 
-Sets the name of the font used by B<Ethereal> for most text.
+Sets the name of the font used by B<Ethereal> for most text. 
+B<Ethereal> will construct the name of the bold font used for the data
+in the byte view pane that corresponds to the field selected in the
+protocol tree pane from the name of the main text font.
 
 =item -n
 
@@ -487,8 +484,18 @@ desired color.  The new text colors are displayed in a sample window.
 =item GUI Preferences
 
 The I<GUI> page is used to modify small aspects of the GUI to your own
-personal taste. The vertical scrollbars in the three panes can be
-set to be either on the left or the right. The selection bar in the
+personal taste:
+
+=over 6
+
+=item Scrollbars
+
+The vertical scrollbars in the three panes can be set to be either on
+the left or the right. 
+
+=item Selection Bars
+
+The selection bar in the
 packet list and protocol tree can have either a "browse" or "select"
 behavior. If the selection bar has a "browse" behavior, the arrow keys
 will move an outline of the selection bar, allowing you to browse
@@ -497,6 +504,12 @@ until you press the space bar. If the selection bar has a "select"
 behavior, the arrow keys will move the selection bar and change
 the selection to the new item in the packet list or protocol tree.
 
+=item Fonts
+
+The "Font..." button lets you select the font to be used for most text.
+
+=back
+
 =item Protocol Preferences
 
 There are also pages for various protocols that Ethereal dissects,