diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-01-24 01:10:12 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-01-24 01:10:12 +0000 |
| commit | 2dff8d760594661114615366c7cb51133fec0c10 (patch) | |
| tree | d71608abb24be34d21cac0900d64a6ed01142af1 /epan/prefs.c | |
| parent | 70755ffa17fc454b4e32c5c586ebbddda0e482e4 (diff) | |
Add font and color preferences. Unfortunately Qt doesn't have a color
picker widget so we're back to popping up dialogs. Move the contents of
monospace_font.{cpp,h} to wireshark_application.{cpp,h}.
Pango and Qt use completely different string representations for fonts.
Add a separate gui.qt.font_name preference so that they don't clobber
each other.
svn path=/trunk/; revision=47240
Diffstat (limited to 'epan/prefs.c')
| -rw-r--r-- | epan/prefs.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/epan/prefs.c b/epan/prefs.c index 9a4b224413..e3e4086bc8 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -1915,7 +1915,10 @@ prefs_register_modules(void) prefs_register_obsolete_preference(gui_font_module, "font_name"); prefs_register_string_preference(gui_font_module, "gtk2.font_name", "Font name", - "Font name for packet list, protocol tree, and hex dump panes.", (const char**)(&prefs.gui_font_name)); + "Font name for packet list, protocol tree, and hex dump panes. (GTK+)", (const char**)(&prefs.gui_gtk2_font_name)); + + prefs_register_string_preference(gui_font_module, "qt.font_name", "Font name", + "Font name for packet list, protocol tree, and hex dump panes. (Qt)", (const char**)(&prefs.gui_qt_font_name)); /* User Interface : Colors */ gui_color_module = prefs_register_subtree(gui_module, "Colors", "Colors", NULL); @@ -2571,12 +2574,13 @@ pre_init_prefs(void) prefs.gui_toolbar_main_style = TB_STYLE_ICONS; prefs.gui_toolbar_filter_style = TB_STYLE_TEXT; /* This can be g_freed, so it must be g_mallocated. */ - /* XXX - are these the right font names for Qt? */ #ifdef _WIN32 - prefs.gui_font_name = g_strdup("Lucida Console 10"); + prefs.gui_gtk2_font_name = g_strdup("Lucida Console 10"); #else - prefs.gui_font_name = g_strdup("Monospace 10"); + prefs.gui_gtk2_font_name = g_strdup("Monospace 10"); #endif + /* We try to find the best font in the Qt code */ + prefs.gui_qt_font_name = g_strdup(""); prefs.gui_marked_fg.pixel = 65535; prefs.gui_marked_fg.red = 65535; prefs.gui_marked_fg.green = 65535; |