mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-02 09:46:52 -05:00
gui: remove SubstituteFonts
This commit is contained in:
parent
6c6dbd8af5
commit
68c272527f
3 changed files with 0 additions and 50 deletions
|
@ -614,7 +614,6 @@ int main(int argc, char *argv[])
|
|||
QApplication::setOrganizationName(QAPP_ORG_NAME);
|
||||
QApplication::setOrganizationDomain(QAPP_ORG_DOMAIN);
|
||||
QApplication::setApplicationName(QAPP_APP_NAME_DEFAULT);
|
||||
GUIUtil::SubstituteFonts(GetLangTerritory());
|
||||
|
||||
/// 4. Initialization of translations, so that intro dialog is in user's language
|
||||
// Now that QSettings are accessible, initialize translations
|
||||
|
|
|
@ -63,16 +63,6 @@
|
|||
|
||||
static fs::detail::utf8_codecvt_facet utf8;
|
||||
|
||||
#if defined(Q_OS_MAC)
|
||||
extern double NSAppKitVersionNumber;
|
||||
#if !defined(NSAppKitVersionNumber10_8)
|
||||
#define NSAppKitVersionNumber10_8 1187
|
||||
#endif
|
||||
#if !defined(NSAppKitVersionNumber10_9)
|
||||
#define NSAppKitVersionNumber10_9 1265
|
||||
#endif
|
||||
#endif
|
||||
|
||||
namespace GUIUtil {
|
||||
|
||||
QString dateTimeStr(const QDateTime &date)
|
||||
|
@ -391,42 +381,6 @@ bool openBitcoinConf()
|
|||
return QDesktopServices::openUrl(QUrl::fromLocalFile(boostPathToQString(pathConfig)));
|
||||
}
|
||||
|
||||
void SubstituteFonts(const QString& language)
|
||||
{
|
||||
#if defined(Q_OS_MAC)
|
||||
// Background:
|
||||
// OSX's default font changed in 10.9 and Qt is unable to find it with its
|
||||
// usual fallback methods when building against the 10.7 sdk or lower.
|
||||
// The 10.8 SDK added a function to let it find the correct fallback font.
|
||||
// If this fallback is not properly loaded, some characters may fail to
|
||||
// render correctly.
|
||||
//
|
||||
// The same thing happened with 10.10. .Helvetica Neue DeskInterface is now default.
|
||||
//
|
||||
// Solution: If building with the 10.7 SDK or lower and the user's platform
|
||||
// is 10.9 or higher at runtime, substitute the correct font. This needs to
|
||||
// happen before the QApplication is created.
|
||||
#if defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_8
|
||||
if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_8)
|
||||
{
|
||||
if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_9)
|
||||
/* On a 10.9 - 10.9.x system */
|
||||
QFont::insertSubstitution(".Lucida Grande UI", "Lucida Grande");
|
||||
else
|
||||
{
|
||||
/* 10.10 or later system */
|
||||
if (language == "zh_CN" || language == "zh_TW" || language == "zh_HK") // traditional or simplified Chinese
|
||||
QFont::insertSubstitution(".Helvetica Neue DeskInterface", "Heiti SC");
|
||||
else if (language == "ja") // Japanese
|
||||
QFont::insertSubstitution(".Helvetica Neue DeskInterface", "Songti SC");
|
||||
else
|
||||
QFont::insertSubstitution(".Helvetica Neue DeskInterface", "Lucida Grande");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
ToolTipToRichTextFilter::ToolTipToRichTextFilter(int _size_threshold, QObject *parent) :
|
||||
QObject(parent),
|
||||
size_threshold(_size_threshold)
|
||||
|
|
|
@ -120,9 +120,6 @@ namespace GUIUtil
|
|||
// Open the config file
|
||||
bool openBitcoinConf();
|
||||
|
||||
// Replace invalid default fonts with known good ones
|
||||
void SubstituteFonts(const QString& language);
|
||||
|
||||
/** Qt event filter that intercepts ToolTipChange events, and replaces the tooltip with a rich text
|
||||
representation if needed. This assures that Qt can word-wrap long tooltip messages.
|
||||
Tooltips longer than the provided size threshold (in characters) are wrapped.
|
||||
|
|
Loading…
Add table
Reference in a new issue