Skip to content

Commit 2e71121

Browse files
Merge pull request dogecoin#2676 from chromatic/reduce-font-warnings
[Qt] Reduce font warnings
2 parents 9bbf8c8 + da79697 commit 2e71121

7 files changed

+12
-0
lines changed

src/qt/bitcoin.qrc

+4
Original file line numberDiff line numberDiff line change
@@ -102,5 +102,9 @@
102102
<file alias="ComicNeue-Light-Oblique">res/fonts/ComicNeue-Light-Oblique.ttf</file>
103103
<file alias="ComicNeue-Regular">res/fonts/ComicNeue-Regular.ttf</file>
104104
<file alias="ComicNeue-Regular-Oblique">res/fonts/ComicNeue-Regular-Oblique.ttf</file>
105+
<file alias="NotoSans-Bold">res/fonts/NotoSans-Bold.ttf</file>
106+
<file alias="NotoSans-Light">res/fonts/NotoSans-Light.ttf</file>
107+
<file alias="NotoSans-Medium">res/fonts/NotoSans-Medium.ttf</file>
108+
<file alias="NotoSans-Regular">res/fonts/NotoSans-Regular.ttf</file>
105109
</qresource>
106110
</RCC>

src/qt/bitcoingui.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,12 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *
181181
QFontDatabase::addApplicationFont(":fonts/ComicNeue-Regular-Oblique");
182182
QFont::insertSubstitution("Comic Sans MS", "Comic Neue");
183183

184+
// Dogecoin: load this bundled font for Settings -> Options in case it's not available on the system
185+
QFontDatabase::addApplicationFont(":fonts/NotoSans-Bold");
186+
QFontDatabase::addApplicationFont(":fonts/NotoSans-Light");
187+
QFontDatabase::addApplicationFont(":fonts/NotoSans-Medium");
188+
QFontDatabase::addApplicationFont(":fonts/NotoSans-Regular");
189+
184190
// Dogecoin: Specify Comic Sans as new font.
185191
QFont newFont("Comic Sans MS", 10);
186192

src/qt/optionsdialog.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
8686

8787
/* Display elements init */
8888
QDir translations(":translations");
89+
QFont notoFont("Noto Sans Roboto", 10);
90+
ui->lang->setFont(notoFont);
8991

9092
ui->bitcoinAtStartup->setToolTip(ui->bitcoinAtStartup->toolTip().arg(tr(PACKAGE_NAME)));
9193
ui->bitcoinAtStartup->setText(ui->bitcoinAtStartup->text().arg(tr(PACKAGE_NAME)));

src/qt/res/fonts/NotoSans-Bold.ttf

544 KB
Binary file not shown.

src/qt/res/fonts/NotoSans-Light.ttf

542 KB
Binary file not shown.

src/qt/res/fonts/NotoSans-Medium.ttf

542 KB
Binary file not shown.

src/qt/res/fonts/NotoSans-Regular.ttf

543 KB
Binary file not shown.

0 commit comments

Comments
 (0)