aboutsummaryrefslogtreecommitdiff
path: root/src/qt
diff options
context:
space:
mode:
Diffstat (limited to 'src/qt')
-rw-r--r--src/qt/bitcoin.qrc9
-rw-r--r--src/qt/bitcoingui.cpp16
-rw-r--r--src/qt/bitcoinstrings.cpp2
-rw-r--r--src/qt/bitcoinunits.cpp6
-rw-r--r--src/qt/forms/overviewpage.ui19
-rw-r--r--src/qt/guiutil.cpp12
-rw-r--r--src/qt/locale/bitcoin_en.ts22
-rw-r--r--src/qt/res/fonts/ComicNeue-Bold-Oblique.ttfbin0 -> 34088 bytes
-rw-r--r--src/qt/res/fonts/ComicNeue-Bold.ttfbin0 -> 68736 bytes
-rw-r--r--src/qt/res/fonts/ComicNeue-Light-Oblique.ttfbin0 -> 69376 bytes
-rw-r--r--src/qt/res/fonts/ComicNeue-Light.ttfbin0 -> 97744 bytes
-rw-r--r--src/qt/res/fonts/ComicNeue-Regular-Oblique.ttfbin0 -> 65012 bytes
-rw-r--r--src/qt/res/fonts/ComicNeue-Regular.ttfbin0 -> 82236 bytes
-rw-r--r--src/qt/res/icons/bitcoin.pngbin312944 -> 267950 bytes
-rw-r--r--src/qt/res/icons/wallet_bgcoin.pngbin0 -> 56285 bytes
-rw-r--r--src/qt/splashscreen.cpp2
16 files changed, 62 insertions, 26 deletions
diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc
index 451d39123..1976a4ef7 100644
--- a/src/qt/bitcoin.qrc
+++ b/src/qt/bitcoin.qrc
@@ -53,6 +53,7 @@
<file alias="hd_enabled">res/icons/hd_enabled.png</file>
<file alias="hd_disabled">res/icons/hd_disabled.png</file>
<file alias="network_disabled">res/icons/network_disabled.png</file>
+ <file alias="wallet_bgcoin">res/icons/wallet_bgcoin.png</file>
</qresource>
<qresource prefix="/movies">
<file alias="spinner-000">res/movies/spinner-000.png</file>
@@ -92,4 +93,12 @@
<file alias="spinner-034">res/movies/spinner-034.png</file>
<file alias="spinner-035">res/movies/spinner-035.png</file>
</qresource>
+ <qresource prefix="/fonts">
+ <file alias="ComicNeue-Bold">res/fonts/ComicNeue-Bold.ttf</file>
+ <file alias="ComicNeue-Bold-Oblique">res/fonts/ComicNeue-Bold-Oblique.ttf</file>
+ <file alias="ComicNeue-Light">res/fonts/ComicNeue-Light.ttf</file>
+ <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>
+ </qresource>
</RCC>
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index bab6c8689..35ba8eb1d 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -43,6 +43,7 @@
#include <QDateTime>
#include <QDesktopWidget>
#include <QDragEnterEvent>
+#include <QFontDatabase>
#include <QListWidget>
#include <QMenuBar>
#include <QMessageBox>
@@ -167,6 +168,21 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *
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/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index a1e5cccc0..ca55c930f 100644
--- a/src/qt/bitcoinstrings.cpp
+++ b/src/qt/bitcoinstrings.cpp
@@ -9,7 +9,7 @@
#define UNUSED
#endif
static const char UNUSED *bitcoin_strings[] = {
-QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin Core"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Dogecoin Core"),
QT_TRANSLATE_NOOP("bitcoin-core", "The %s developers"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"(1 = keep tx meta data e.g. account owner and payment request information, 2 "
diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp
index 4da414a4e..54b3a8afe 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 710801ee9..d53861541 100644
--- a/src/qt/forms/overviewpage.ui
+++ b/src/qt/forms/overviewpage.ui
@@ -419,6 +419,25 @@
</property>
</spacer>
</item>
+ <item>
+ <widget class="QLabel" name="label_wallet_bgcoin">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="pixmap">
+ <pixmap resource="../bitcoin.qrc">:/icons/wallet_bgcoin</pixmap>
+ </property>
+ <property name="scaledContents">
+ <bool>false</bool>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ <property name="margin">
+ <number>-2</number>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
<item>
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index e0961fe7d..1fcfad253 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -95,17 +95,9 @@ QString dateTimeStr(qint64 nTime)
QFont fixedPitchFont()
{
-#if QT_VERSION >= 0x50200
- return QFontDatabase::systemFont(QFontDatabase::FixedFont);
-#else
- 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;
-#endif
}
// Just some dummy data to generate an convincing random-looking (but consistent) address
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index b2019cf9a..6b31c371b 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -431,7 +431,7 @@
<message>
<location line="-510"/>
<source>Send coins to a Bitcoin address</source>
- <translation>Send coins to a Bitcoin address</translation>
+ <translation>Send coins to a Dogecoin address</translation>
</message>
<message>
<location line="+67"/>
@@ -461,7 +461,7 @@
<message>
<location line="+516"/>
<source>Bitcoin</source>
- <translation>Bitcoin</translation>
+ <translation>Dogecoin</translation>
</message>
<message>
<location line="-741"/>
@@ -496,12 +496,12 @@
<message>
<location line="+7"/>
<source>Sign messages with your Bitcoin addresses to prove you own them</source>
- <translation>Sign messages with your Bitcoin addresses to prove you own them</translation>
+ <translation>Sign messages with your Dogecoin addresses to prove you own them</translation>
</message>
<message>
<location line="+2"/>
<source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
- <translation>Verify messages to ensure they were signed with specified Bitcoin addresses</translation>
+ <translation>Verify messages to ensure they were signed with specified Dogecoin addresses</translation>
</message>
<message>
<location line="+58"/>
@@ -552,8 +552,8 @@
<location line="+356"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation>
- <numerusform>%n active connection to Bitcoin network</numerusform>
- <numerusform>%n active connections to Bitcoin network</numerusform>
+ <numerusform>%n active connection to Dogecoin network</numerusform>
+ <numerusform>%n active connections to Dogecoin network</numerusform>
</translation>
</message>
<message>
@@ -1325,7 +1325,7 @@
<message>
<location line="+30"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
- <translation>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</translation>
+ <translation>Automatically open the Dogecoin client port on the router. This only works when your router supports UPnP and it is enabled.</translation>
</message>
<message>
<location line="+3"/>
@@ -1515,7 +1515,7 @@
<location line="+62"/>
<location line="+386"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
- <translation>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</translation>
+ <translation>The displayed information may be out of date. Your wallet automatically synchronizes with the Dogecoin network after a connection is established, but this process has not completed yet.</translation>
</message>
<message>
<location line="-139"/>
@@ -3067,7 +3067,7 @@
<message>
<location line="+21"/>
<source>Sign the message to prove you own this Bitcoin address</source>
- <translation>Sign the message to prove you own this Bitcoin address</translation>
+ <translation>Sign the message to prove you own this Dogecoin address</translation>
</message>
<message>
<location line="+3"/>
@@ -3103,7 +3103,7 @@
<message>
<location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
- <translation>Verify the message to ensure it was signed with the specified Bitcoin address</translation>
+ <translation>Verify the message to ensure it was signed with the specified Dogecoin address</translation>
</message>
<message>
<location line="+3"/>
@@ -3954,7 +3954,7 @@
<message>
<location line="-360"/>
<source>Bitcoin Core</source>
- <translation type="unfinished">Bitcoin Core</translation>
+ <translation type="unfinished">Dogecoin Core</translation>
</message>
<message>
<location line="+1"/>
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
--- /dev/null
+++ b/src/qt/res/fonts/ComicNeue-Bold-Oblique.ttf
Binary files 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
--- /dev/null
+++ b/src/qt/res/fonts/ComicNeue-Bold.ttf
Binary files 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
--- /dev/null
+++ b/src/qt/res/fonts/ComicNeue-Light-Oblique.ttf
Binary files 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
--- /dev/null
+++ b/src/qt/res/fonts/ComicNeue-Light.ttf
Binary files 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
--- /dev/null
+++ b/src/qt/res/fonts/ComicNeue-Regular-Oblique.ttf
Binary files 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
--- /dev/null
+++ b/src/qt/res/fonts/ComicNeue-Regular.ttf
Binary files differ
diff --git a/src/qt/res/icons/bitcoin.png b/src/qt/res/icons/bitcoin.png
index 435621af2..714699df9 100644
--- a/src/qt/res/icons/bitcoin.png
+++ b/src/qt/res/icons/bitcoin.png
Binary files 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..20e538671
--- /dev/null
+++ b/src/qt/res/icons/wallet_bgcoin.png
Binary files differ
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
index f4377247e..656a2875c 100644
--- a/src/qt/splashscreen.cpp
+++ b/src/qt/splashscreen.cpp
@@ -47,7 +47,7 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle *networkStyle)
QString copyrightText = QString::fromUtf8(CopyrightHolders(strprintf("\xc2\xA9 %u-%u ", 2009, COPYRIGHT_YEAR)).c_str());
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);