13
0

Undo habits of a Serif font lover

This commit is contained in:
Robin Gareus 2019-12-05 23:33:27 +01:00
parent 407c2bed63
commit 65b6f39e21
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
5 changed files with 5 additions and 5 deletions

View File

@ -187,7 +187,7 @@ void load_custom_fonts()
kCFStringEncodingUTF8, FALSE);
fontURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, ttf, kCFURLPOSIXPathStyle, TRUE);
if (CTFontManagerRegisterFontsForURL(fontURL, kCTFontManagerScopeProcess, &error) != true) {
cerr << _("Cannot load ArdourSerif TrueType font.") << endl;
cerr << _("Cannot load ArdourSans TrueType font.") << endl;
}
}
#endif

View File

@ -98,7 +98,7 @@ unload_custom_fonts()
if (find_file (ardour_data_search_path(), "ArdourMono.ttf", font_file)) {
RemoveFontResource(font_file.c_str());
}
if (find_file (ardour_data_search_path(), "ArdourSerif.ttf", font_file)) {
if (find_file (ardour_data_search_path(), "ArdourSans.ttf", font_file)) {
RemoveFontResource(font_file.c_str());
}
}

View File

@ -919,7 +919,7 @@ def build(bld):
# Icons/Images
bld.install_files(os.path.join (bld.env['DATADIR'], 'icons'), bld.path.ant_glob('icons/*.png'))
bld.install_files(bld.env['DATADIR'], 'ArdourMono.ttf')
bld.install_files(bld.env['DATADIR'], 'ArdourSerif.ttf')
bld.install_files(bld.env['DATADIR'], 'ArdourSans.ttf')
# Application/Product specific resources (icon, splash)
pgmname = bld.env['PROGRAM_NAME']

View File

@ -647,7 +647,7 @@ cp ../../system_config $Etc/system_config
cp ../../gtk2_ardour/icons/*.png ${Shared}/icons
cp -r ../../gtk2_ardour/icons/cursor_* ${Shared}/icons/
cp ../../gtk2_ardour/ArdourMono.ttf $Shared
cp ../../gtk2_ardour/ArdourSerif.ttf $Shared
cp ../../gtk2_ardour/ArdourSans.ttf $Shared
cp ../../gtk2_ardour/resources/${APPNAME}-* ${Shared}/resources/
# Themes: only install those named for this app

View File

@ -509,7 +509,7 @@ cp ../../system_config $Resources/system_config
cp ../../gtk2_ardour/icons/*.png ${Resources}/icons/
cp -r ../../gtk2_ardour/icons/cursor_* ${Resources}/icons/
cp ../../gtk2_ardour/ArdourMono.ttf $Shared
cp ../../gtk2_ardour/ArdourSerif.ttf $Shared
cp ../../gtk2_ardour/ArdourSans.ttf $Shared
cp ../../gtk2_ardour/resources/${PRODUCT_PKG_DIR}-* ${Resources}/resources/