mirror of
https://github.com/dogecoin/dogecoin.git
synced 2026-01-31 10:30:52 +00:00
Merge pull request #2676 from chromatic/reduce-font-warnings
[Qt] Reduce font warnings
This commit is contained in:
commit
2e711213ec
@ -102,5 +102,9 @@
|
||||
<file alias="ComicNeue-Light-Oblique">res/fonts/ComicNeue-Light-Oblique.ttf</file>
|
||||
<file alias="ComicNeue-Regular">res/fonts/ComicNeue-Regular.ttf</file>
|
||||
<file alias="ComicNeue-Regular-Oblique">res/fonts/ComicNeue-Regular-Oblique.ttf</file>
|
||||
<file alias="NotoSans-Bold">res/fonts/NotoSans-Bold.ttf</file>
|
||||
<file alias="NotoSans-Light">res/fonts/NotoSans-Light.ttf</file>
|
||||
<file alias="NotoSans-Medium">res/fonts/NotoSans-Medium.ttf</file>
|
||||
<file alias="NotoSans-Regular">res/fonts/NotoSans-Regular.ttf</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
||||
@ -181,6 +181,12 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *
|
||||
QFontDatabase::addApplicationFont(":fonts/ComicNeue-Regular-Oblique");
|
||||
QFont::insertSubstitution("Comic Sans MS", "Comic Neue");
|
||||
|
||||
// Dogecoin: load this bundled font for Settings -> Options in case it's not available on the system
|
||||
QFontDatabase::addApplicationFont(":fonts/NotoSans-Bold");
|
||||
QFontDatabase::addApplicationFont(":fonts/NotoSans-Light");
|
||||
QFontDatabase::addApplicationFont(":fonts/NotoSans-Medium");
|
||||
QFontDatabase::addApplicationFont(":fonts/NotoSans-Regular");
|
||||
|
||||
// Dogecoin: Specify Comic Sans as new font.
|
||||
QFont newFont("Comic Sans MS", 10);
|
||||
|
||||
|
||||
@ -86,6 +86,8 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
|
||||
|
||||
/* Display elements init */
|
||||
QDir translations(":translations");
|
||||
QFont notoFont("Noto Sans Roboto", 10);
|
||||
ui->lang->setFont(notoFont);
|
||||
|
||||
ui->bitcoinAtStartup->setToolTip(ui->bitcoinAtStartup->toolTip().arg(tr(PACKAGE_NAME)));
|
||||
ui->bitcoinAtStartup->setText(ui->bitcoinAtStartup->text().arg(tr(PACKAGE_NAME)));
|
||||
|
||||
BIN
src/qt/res/fonts/NotoSans-Bold.ttf
Normal file
BIN
src/qt/res/fonts/NotoSans-Bold.ttf
Normal file
Binary file not shown.
BIN
src/qt/res/fonts/NotoSans-Light.ttf
Normal file
BIN
src/qt/res/fonts/NotoSans-Light.ttf
Normal file
Binary file not shown.
BIN
src/qt/res/fonts/NotoSans-Medium.ttf
Normal file
BIN
src/qt/res/fonts/NotoSans-Medium.ttf
Normal file
Binary file not shown.
BIN
src/qt/res/fonts/NotoSans-Regular.ttf
Normal file
BIN
src/qt/res/fonts/NotoSans-Regular.ttf
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user