osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Qt+macOS: Fix the default font name. 

"SF Mono" is the name of the new monospace font in Sierra. Note that it
appears to have limited availability and that we're outside those
limits.

Fix up a comment.

Change-Id: I97f0077098ea78d4550b58fb92645f4d62342b2e
Reviewed-on: https://code.wireshark.org/review/18168
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
This commit is contained in:
Gerald Combs 2016-10-12 10:48:59 -07:00 committed by Stig Bjørlykke
parent fcbb77191b
commit ad0a016bd2
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/qt/wireshark_application.cpp
View File

@ -258,11 +258,17 @@ void WiresharkApplication::setMonospaceFont(const char *font_string) {
}
// 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 = "San Francisco Mono";
// SF Mono might be a system font someday. Right now (Oct 2016) it appears
// to be limited to Xcode and Terminal.
// http://www.openradar.me/26790072
// http://www.openradar.me/26862220
const char *osx_default_font = "SF Mono";
const QStringList osx_alt_fonts = QStringList() << "Menlo" << "Monaco";
// XXX Detect Ubuntu systems (e.g. via /etc/os-release and/or
// /etc/lsb_release) and add "Ubuntu Mono Regular" there.
// http://font.ubuntu.com/
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";