Merge branch 'new-logo'

This commit is contained in:
Evan Duffield 2014-04-24 15:09:16 -07:00
commit 4301c16f4a
10 changed files with 3 additions and 3 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 104 KiB

After

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

BIN
src/qt/res/icons/bitcoin_testnet.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 90 KiB

BIN
src/qt/res/icons/toolbar.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 944 B

BIN
src/qt/res/icons/toolbar_testnet.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 944 B

BIN
src/qt/res/images/about.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 324 KiB

After

Width:  |  Height:  |  Size: 95 KiB

BIN
src/qt/res/images/splash_testnet.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 232 KiB

After

Width:  |  Height:  |  Size: 256 KiB

View File

@ -10,8 +10,8 @@ SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) :
QSplashScreen(pixmap, f) QSplashScreen(pixmap, f)
{ {
// set reference point, paddings // set reference point, paddings
int paddingLeftCol2 = 230; int paddingLeftCol2 = 33;
int paddingTopCol2 = 376; int paddingTopCol2 = 476;
int line1 = 0; int line1 = 0;
int line2 = 13; int line2 = 13;
int line3 = 26; int line3 = 26;
@ -36,7 +36,7 @@ SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) :
} }
QPainter pixPaint(&newPixmap); QPainter pixPaint(&newPixmap);
pixPaint.setPen(QColor(70,70,70)); pixPaint.setPen(QColor(255,255,255));
pixPaint.setFont(QFont(font, 9*fontFactor)); pixPaint.setFont(QFont(font, 9*fontFactor));
pixPaint.drawText(paddingLeftCol2,paddingTopCol2+line3,versionText); pixPaint.drawText(paddingLeftCol2,paddingTopCol2+line3,versionText);