maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Introduce basic Dogecoin branding

Browse source
This commit is contained in:
Ross Nicoll 2015-07-27 16:35:30 +01:00 committed by J Ross Nicoll
parent 73699f25bb
commit f448038b5f
17 changed files with 68 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Makefile.qt.include
View file

@ -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)/$(<F) | \
$(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/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' > $@

2
src/clientversion.cpp
View file

@ -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

9
src/qt/bitcoin.qrc
View file

@ -48,6 +48,7 @@
<file alias="warning">res/icons/warning.png</file>
<file alias="paper_wallet">res/icons/paper_wallet.png</file>
<file alias="print">res/icons/print.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>
@ -87,4 +88,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>

16
src/qt/bitcoingui.cpp
View file

@ -38,6 +38,7 @@
#include <QDateTime>
#include <QDesktopWidget>
#include <QDragEnterEvent>
#include <QFontDatabase>
#include <QListWidget>
#include <QMenuBar>
#include <QMessageBox>
@ -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);

6
src/qt/bitcoinunits.cpp
View file

@ -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("???");
}
}

19
src/qt/forms/overviewpage.ui
View file

@ -416,6 +416,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>

8
src/qt/guiutil.cpp
View file

@ -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;
}

14
src/qt/locale/bitcoin_en.ts
View file

@ -493,7 +493,7 @@
<message>
<location line="-311"/>
<source>Bitcoin Core</source>
<translation type="unfinished">Bitcoin Core</translation>
<translation type="unfinished">Dogecoin Core</translation>
</message>
<message>
<location line="+164"/>
@ -503,12 +503,12 @@
<message>
<location line="+38"/>
<source>&amp;About Bitcoin Core</source>
<translation type="unfinished"></translation>
<translation>About Dogecoin Core</translation>
</message>
<message>
<location line="+7"/>
<source>Modify configuration options for Bitcoin Core</source>
<translation type="unfinished"></translation>
<translation>Modify configuration options for Dogecoin Core</translation>
</message>
<message>
<location line="+21"/>
@ -1075,7 +1075,7 @@
<message>
<location filename="../utilitydialog.cpp" line="+33"/>
<source>Bitcoin Core</source>
<translation type="unfinished">Bitcoin Core</translation>
<translation type="unfinished">Dogecoin Core</translation>
</message>
<message>
<location line="+0"/>
@ -1091,7 +1091,7 @@
<message>
<location line="+5"/>
<source>About Bitcoin Core</source>
<translation type="unfinished"></translation>
<translation>About Dogecoin Core</translation>
</message>
<message>
<location line="+19"/>
@ -1144,7 +1144,7 @@
<message>
<location filename="../intro.cpp" line="+82"/>
<source>Bitcoin Core</source>
<translation type="unfinished">Bitcoin Core</translation>
<translation type="unfinished">Dogecoin Core</translation>
</message>
<message>
<location line="+1"/>
@ -2948,7 +2948,7 @@
<message>
<location filename="../splashscreen.cpp" line="+41"/>
<source>Bitcoin Core</source>
<translation type="unfinished">Bitcoin Core</translation>
<translation type="unfinished">Dogecoin Core</translation>
</message>
<message>
<location line="+2"/>

BIN
src/qt/res/fonts/ComicNeue-Bold-Oblique.ttf Normal file
View file

Binary file not shown.

BIN
src/qt/res/fonts/ComicNeue-Bold.ttf Normal file
View file

Binary file not shown.

BIN
src/qt/res/fonts/ComicNeue-Light-Oblique.ttf Normal file
View file

Binary file not shown.

BIN
src/qt/res/fonts/ComicNeue-Light.ttf Normal file
View file

Binary file not shown.

BIN
src/qt/res/fonts/ComicNeue-Regular-Oblique.ttf Normal file
View file

Binary file not shown.

BIN
src/qt/res/fonts/ComicNeue-Regular.ttf Normal file
View file

Binary file not shown.

BIN
src/qt/res/icons/bitcoin.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 306 KiB

After

Width:  |  Height:  |  Size: 262 KiB

BIN
src/qt/res/icons/wallet_bgcoin.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 46 KiB

2
src/qt/splashscreen.cpp
View file

@ -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);