Instead of having the normal-weight and bold fonts set separately,

generate the name of the boldface font from the Roman font; if the two
fonts don't have the same widths, the display will look weird when a
field is selected, and it's a bit of a pain for the user to have to
select *two* fonts.

On UNIX/X, default to
"-*-fixed-medium-r-semicondensed-*-*-120-*-*-*-*-*-" rather than to
"-*-lucidatypewriter-medium-r-normal-*-*-120-*-*-*-*-iso8859-1" - some
Linux distributions appear to lack the Lucida typewriter font.

Add a "gui.font_name" preference to the preferences file, specifying the
normal-weight font to use.  Have it settable from the "GUI" tab in the
Preferences dialog box - the "Font..." button, when clicked, pops up a
font selection dialog box.

If we either can't open the selected font or the boldfaced version of
the font, default to "6x13" and "6x13bold" as fallbacks - the former
will probably be "fixed", and the latter would be "fixedbold" if X
actually created such an alias, but it doesn't so we use "6x13bold"
instead.

svn path=/trunk/; revision=2304

1 files changed, 7 insertions, 6 deletions

diff --git a/prefs.h b/prefs.h
index 3738ee6f14..28fbe4506b 100644
--- a/prefs.h
+++ b/prefs.h
@@ -1,7 +1,7 @@
 /* prefs.h
  * Definitions for preference handling routines
  *
- * $Id: prefs.h,v 1.20 2000/08/17 21:02:10 deniel Exp $
+ * $Id: prefs.h,v 1.21 2000/08/20 07:53:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -41,11 +41,12 @@ typedef struct _e_prefs {
   GList   *col_list;
   gint     num_cols;
   GdkColor st_client_fg, st_client_bg, st_server_fg, st_server_bg;
-  gboolean	gui_scrollbar_on_right;
-  gboolean	gui_plist_sel_browse;
-  gboolean	gui_ptree_sel_browse;
-  gint		gui_ptree_line_style;
-  gint		gui_ptree_expander_style;
+  gboolean gui_scrollbar_on_right;
+  gboolean gui_plist_sel_browse;
+  gboolean gui_ptree_sel_browse;
+  gint     gui_ptree_line_style;
+  gint     gui_ptree_expander_style;
+  gchar   *gui_font_name;
 } e_prefs;
 
 extern e_prefs prefs;