From 73a0ee0e41ce9f561d4f440902dc3aebce3285c8 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Thu, 22 Sep 2016 09:24:38 -0700 Subject: [PATCH] Qt+macOS: Look for San Francisco Mono Make San Francisco Mono the default monospace font on macOS. Note that we should look for Ubuntu Mono on that platform. Change-Id: I6f563099ae3797a7f73ea595158a2844581fbeec Reviewed-on: https://code.wireshark.org/review/17867 Reviewed-by: Gerald Combs Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- ui/qt/wireshark_application.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp index 41de756f35..608c42e757 100644 --- a/ui/qt/wireshark_application.cpp +++ b/ui/qt/wireshark_application.cpp @@ -253,16 +253,15 @@ void WiresharkApplication::setMonospaceFont(const char *font_string) { if (font_string && strlen(font_string) > 0) { mono_font_.fromString(font_string); -// mono_bold_font_ = QFont(mono_regular_font_); -// mono_bold_font_.setBold(true); return; } // http://en.wikipedia.org/wiki/Category:Monospaced_typefaces + // XXX Add "Ubuntu Mono Regular" http://font.ubuntu.com/ const char *win_default_font = "Consolas"; const char *win_alt_font = "Lucida Console"; - const char *osx_default_font = "Menlo"; - const char *osx_alt_font = "Monaco"; + const char *osx_default_font = "San Francisco Mono"; + const QStringList osx_alt_fonts = QStringList() << "Menlo" << "Monaco"; const char *x11_default_font = "Liberation Mono"; const QStringList x11_alt_fonts = QStringList() << "DejaVu Sans Mono" << "Bitstream Vera Sans Mono"; const QStringList fallback_fonts = QStringList() << "Lucida Sans Typewriter" << "Inconsolata" << "Droid Sans Mono" << "Andale Mono" << "Courier New" << "monospace"; @@ -272,14 +271,14 @@ void WiresharkApplication::setMonospaceFont(const char *font_string) { // Try to pick the latest, shiniest fixed-width font for our OS. #if defined(Q_OS_WIN) const char *default_font = win_default_font; - substitutes << win_alt_font << osx_default_font << osx_alt_font << x11_default_font << x11_alt_fonts << fallback_fonts; + substitutes << win_alt_font << osx_default_font << osx_alt_fonts << x11_default_font << x11_alt_fonts << fallback_fonts; font_size_adjust = 2; #elif defined(Q_OS_MAC) const char *default_font = osx_default_font; - substitutes << osx_alt_font << win_default_font << win_alt_font << x11_default_font << x11_alt_fonts << fallback_fonts; + substitutes << osx_alt_fonts << win_default_font << win_alt_font << x11_default_font << x11_alt_fonts << fallback_fonts; #else const char *default_font = x11_default_font; - substitutes << x11_alt_fonts << win_default_font << win_alt_font << osx_default_font << osx_alt_font << fallback_fonts; + substitutes << x11_alt_fonts << win_default_font << win_alt_font << osx_default_font << osx_alt_fonts << fallback_fonts; #endif mono_font_.setFamily(default_font); @@ -287,9 +286,6 @@ void WiresharkApplication::setMonospaceFont(const char *font_string) { mono_font_.setPointSize(wsApp->font().pointSize() + font_size_adjust); mono_font_.setBold(false); -// mono_bold_font_ = QFont(mono_font_); -// mono_bold_font_.setBold(true); - g_free(prefs.gui_qt_font_name); prefs.gui_qt_font_name = qstring_strdup(mono_font_.toString()); } -- 2.34.1