GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 15587b4f1d into merged_master (Bitcoin PR bitcoin-core/gui#448)

Browse source
This commit is contained in:
Byron Hambly 2023-05-10 12:43:19 +00:00
commit 7aeb30eca5
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/qt/bitcoin.cpp
View file

@ -45,7 +45,6 @@
#include <QApplication>
#include <QDebug>
#include <QFontDatabase>
#include <QLatin1String>
#include <QLibraryInfo>
#include <QLocale>
@ -469,7 +468,7 @@ int GuiMain(int argc, char* argv[])
#endif
BitcoinApplication app;
QFontDatabase::addApplicationFont(":/fonts/monospace");
GUIUtil::LoadFont(QStringLiteral(":/fonts/monospace"));
/// 2. Parse command-line options. We do this after qt in order to show an error if there are problems parsing these
// Command-line options take precedence:

6
src/qt/guiutil.cpp
View file

@ -279,6 +279,12 @@ bool hasEntryData(const QAbstractItemView *view, int column, int role)
return !selection.at(0).data(role).toString().isEmpty();
}
void LoadFont(const QString& file_name)
{
const int id = QFontDatabase::addApplicationFont(file_name);
assert(id != -1);
}
QString getDefaultDataDirectory()
{
return boostPathToQString(GetDefaultDataDir());

5
src/qt/guiutil.h
View file

@ -115,6 +115,11 @@ namespace GUIUtil
void setClipboard(const QString& str);
/**
* Loads the font from the file specified by file_name, aborts if it fails.
*/
void LoadFont(const QString& file_name);
/**
* Determine default data directory for operating system.
*/