diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 61a497c28..6a5027547 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -326,6 +326,14 @@ RES_IMAGES = RES_MOVIES = $(wildcard qt/res/movies/spinner-*.png) +RES_FONTS = \ + qt/res/fonts/ComicNeue-Bold-Oblique.ttf \ + qt/res/fonts/ComicNeue-Bold.ttf \ + qt/res/fonts/ComicNeue-Light-Oblique.ttf \ + qt/res/fonts/ComicNeue-Light.ttf \ + qt/res/fonts/ComicNeue-Regular-Oblique.ttf \ + qt/res/fonts/ComicNeue-Regular.ttf + BITCOIN_RC = qt/res/bitcoin-qt-res.rc BITCOIN_QT_INCLUDES = -I$(builddir)/qt -I$(srcdir)/qt -I$(srcdir)/qt/forms \ @@ -335,7 +343,7 @@ qt_libbitcoinqt_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ $(QT_INCLUDES) $(QT_DBUS_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS) qt_libbitcoinqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \ - $(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(PROTOBUF_PROTO) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) + $(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(PROTOBUF_PROTO) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(RES_FONTS) nodist_qt_libbitcoinqt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) $(PROTOBUF_CC) \ $(PROTOBUF_H) $(QT_QRC_CPP) $(QT_QRC_LOCALE_CPP) @@ -392,7 +400,7 @@ $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM) $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin_locale $(@D)/$( $@ -$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(PROTOBUF_H) +$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(RES_FONTS) $(PROTOBUF_H) @test -f $(RCC) $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin $< | \ $(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@ diff --git a/src/clientversion.cpp b/src/clientversion.cpp index aae0569bb..c473e056c 100644 --- a/src/clientversion.cpp +++ b/src/clientversion.cpp @@ -13,7 +13,7 @@ * for both bitcoind and bitcoin-core, to make it harder for attackers to * target servers or GUI users specifically. */ -const std::string CLIENT_NAME("Satoshi"); +const std::string CLIENT_NAME("Shibetoshi"); /** * Client version number diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index 5c008866a..3580d563d 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -48,6 +48,7 @@ res/icons/warning.png res/icons/paper_wallet.png res/icons/print.png + res/icons/wallet_bgcoin.png res/movies/spinner-000.png @@ -87,4 +88,12 @@ res/movies/spinner-034.png res/movies/spinner-035.png + + res/fonts/ComicNeue-Bold.ttf + res/fonts/ComicNeue-Bold-Oblique.ttf + res/fonts/ComicNeue-Light.ttf + res/fonts/ComicNeue-Light-Oblique.ttf + res/fonts/ComicNeue-Regular.ttf + res/fonts/ComicNeue-Regular-Oblique.ttf + diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 426df3e54..22abdf795 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -147,6 +148,21 @@ BitcoinGUI::BitcoinGUI(const NetworkStyle *networkStyle, QWidget *parent) : setCentralWidget(rpcConsole); } + // Dogecoin: load fallback font in case Comic Sans is not availble on the system + QFontDatabase::addApplicationFont(":fonts/ComicNeue-Bold"); + QFontDatabase::addApplicationFont(":fonts/ComicNeue-Bold-Oblique"); + QFontDatabase::addApplicationFont(":fonts/ComicNeue-Light"); + QFontDatabase::addApplicationFont(":fonts/ComicNeue-Light-Oblique"); + QFontDatabase::addApplicationFont(":fonts/ComicNeue-Regular"); + QFontDatabase::addApplicationFont(":fonts/ComicNeue-Regular-Oblique"); + QFont::insertSubstitution("Comic Sans MS", "Comic Neue"); + + // Dogecoin: Specify Comic Sans as new font. + QFont newFont("Comic Sans MS", 10); + + // Dogecoin: Set new application font + QApplication::setFont(newFont); + // Accept D&D of URIs setAcceptDrops(true); diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp index 425b45d91..0dc06057c 100644 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -40,9 +40,9 @@ QString BitcoinUnits::name(int unit) { switch(unit) { - case BTC: return QString("BTC"); - case mBTC: return QString("mBTC"); - case uBTC: return QString::fromUtf8("μBTC"); + case BTC: return QString("DOGE"); + case mBTC: return QString("mDOGE"); + case uBTC: return QString::fromUtf8("μDOGE"); default: return QString("???"); } } diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index 6d792d147..6bb33d2c3 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -416,6 +416,25 @@ + + + + + + + :/icons/wallet_bgcoin + + + false + + + Qt::AlignCenter + + + -2 + + + diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 4a1f728e1..f79fc9659 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -90,12 +90,8 @@ QString dateTimeStr(qint64 nTime) QFont bitcoinAddressFont() { - QFont font("Monospace"); -#if QT_VERSION >= 0x040800 - font.setStyleHint(QFont::Monospace); -#else - font.setStyleHint(QFont::TypeWriter); -#endif + QFont font("Cursive"); + font.setFamily("Comic Sans MS"); return font; } diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 4f065e53c..dcfc9031a 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -493,7 +493,7 @@ Bitcoin Core - Bitcoin Core + Dogecoin Core @@ -503,12 +503,12 @@ &About Bitcoin Core - + About Dogecoin Core Modify configuration options for Bitcoin Core - + Modify configuration options for Dogecoin Core @@ -1075,7 +1075,7 @@ Bitcoin Core - Bitcoin Core + Dogecoin Core @@ -1091,7 +1091,7 @@ About Bitcoin Core - + About Dogecoin Core @@ -1144,7 +1144,7 @@ Bitcoin Core - Bitcoin Core + Dogecoin Core @@ -2948,7 +2948,7 @@ Bitcoin Core - Bitcoin Core + Dogecoin Core diff --git a/src/qt/res/fonts/ComicNeue-Bold-Oblique.ttf b/src/qt/res/fonts/ComicNeue-Bold-Oblique.ttf new file mode 100644 index 000000000..3eaf37258 Binary files /dev/null and b/src/qt/res/fonts/ComicNeue-Bold-Oblique.ttf differ diff --git a/src/qt/res/fonts/ComicNeue-Bold.ttf b/src/qt/res/fonts/ComicNeue-Bold.ttf new file mode 100644 index 000000000..eb76c1ee2 Binary files /dev/null and b/src/qt/res/fonts/ComicNeue-Bold.ttf differ diff --git a/src/qt/res/fonts/ComicNeue-Light-Oblique.ttf b/src/qt/res/fonts/ComicNeue-Light-Oblique.ttf new file mode 100644 index 000000000..2233cab3a Binary files /dev/null and b/src/qt/res/fonts/ComicNeue-Light-Oblique.ttf differ diff --git a/src/qt/res/fonts/ComicNeue-Light.ttf b/src/qt/res/fonts/ComicNeue-Light.ttf new file mode 100644 index 000000000..0f2dbd33f Binary files /dev/null and b/src/qt/res/fonts/ComicNeue-Light.ttf differ diff --git a/src/qt/res/fonts/ComicNeue-Regular-Oblique.ttf b/src/qt/res/fonts/ComicNeue-Regular-Oblique.ttf new file mode 100644 index 000000000..8dd1c668f Binary files /dev/null and b/src/qt/res/fonts/ComicNeue-Regular-Oblique.ttf differ diff --git a/src/qt/res/fonts/ComicNeue-Regular.ttf b/src/qt/res/fonts/ComicNeue-Regular.ttf new file mode 100644 index 000000000..ac8aac6d9 Binary files /dev/null and b/src/qt/res/fonts/ComicNeue-Regular.ttf differ diff --git a/src/qt/res/icons/bitcoin.png b/src/qt/res/icons/bitcoin.png index 435621af2..714699df9 100644 Binary files a/src/qt/res/icons/bitcoin.png and b/src/qt/res/icons/bitcoin.png differ diff --git a/src/qt/res/icons/wallet_bgcoin.png b/src/qt/res/icons/wallet_bgcoin.png new file mode 100644 index 000000000..b36e78b50 Binary files /dev/null and b/src/qt/res/icons/wallet_bgcoin.png differ diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index 8430e017c..174f8552d 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -43,7 +43,7 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle *networkStyle) QString copyrightText = QChar(0xA9)+QString(" 2009-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Bitcoin Core developers")); QString titleAddText = networkStyle->getTitleAddText(); - QString font = QApplication::font().toString(); + QString font = "Comic Sans MS"; // create a bitmap according to device pixelratio QSize splashSize(480*devicePixelRatio,320*devicePixelRatio);