AskDavis/Casinotest
1
0
Fork 0
mirror of https://github.com/AskDavis/Casinotest.git synced 2026-01-04 12:29:46 -08:00
Code Issues Packages Projects Releases Wiki Activity

Splashcreen update

Browse Source
This commit is contained in:
Andre Jochems
2015-11-12 23:04:47 +01:00
parent 4e92856123
commit 22f98699bd
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/bitcoin.cpp
View File

@@ -91,7 +91,7 @@ static void InitMessage(const std::string &message)
{ {
if(splashref) if(splashref)
{ {
splashref->showMessage(QString::fromStdString(message), Qt::AlignBottom|Qt::AlignHCenter, QColor(55,55,55)); splashref->showMessage(QString::fromStdString(message), Qt::AlignBottom|Qt::AlignHCenter, QColor(Qt::black));
qApp->processEvents(); qApp->processEvents();
} }
printf("init message: %s\n", message.c_str()); printf("init message: %s\n", message.c_str());

2
src/qt/bitcoingui.cpp
View File

@@ -852,7 +852,7 @@ void BitcoinGUI::toggleHidden()
void BitcoinGUI::detectShutdown() void BitcoinGUI::detectShutdown()
{ {
if (ShutdownRequested()) if (ShutdownRequested())
QMetaObject::invokeMethod(QCoreApplication::instance(), "quit", Qt::QueuedConnection); QMetaObject::invokeMethod(QCoreApplication::instance(), "quit", Qt::QueuedConnection);
} }
void BitcoinGUI::slotMenuToolbarItemClicked( GUIMenuToolbarControl::EMenuToolbarItemTypes a_eType ) void BitcoinGUI::slotMenuToolbarItemClicked( GUIMenuToolbarControl::EMenuToolbarItemTypes a_eType )

BIN
src/qt/res/images/splash-v1.3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 241 KiB

BIN
src/qt/res/images/splash.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 241 KiB

After

Width:  |  Height:  |  Size: 35 KiB

28
src/qt/splashscreen.cpp
View File

@@ -10,19 +10,17 @@ 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 paddingLeftCol1 = 110;
int paddingTopCol2 = 376; int paddingLeftCol2 = 170;
int paddingTopCol = 300;
int line1 = 0; int line1 = 0;
int line2 = 13; int line2 = 20;
int line3 = 26;
float fontFactor = 1.0; float fontFactor = 1.0;
// define text to place // define text to place
QString titleText = QString(QApplication::applicationName()).replace(QString("-testnet"), QString(""), Qt::CaseSensitive); // cut of testnet, place it as single object further down
QString versionText = QString("Version %1 ").arg(QString::fromStdString(FormatFullVersion())); QString versionText = QString("Version %1 ").arg(QString::fromStdString(FormatFullVersion()));
QString copyrightText1 = QChar(0xA9)+QString(" 2009-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Bitcoin developers")); QString copyrightText = QChar(0xA9)+QString(" 2013-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The CasinoCoin developers"));
QString copyrightText2 = QChar(0xA9)+QString(" 2013-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The CasinoCoin developers"));
QString font = "Arial"; QString font = "Arial";
@@ -36,15 +34,17 @@ SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) :
} }
QPainter pixPaint(&newPixmap); QPainter pixPaint(&newPixmap);
pixPaint.setPen(QColor(255,255,255)); QPen pen;
pen.setWidth(1);
pixPaint.setFont(QFont(font, 9*fontFactor)); pen.setColor(Qt::black);
pixPaint.drawText(paddingLeftCol2,paddingTopCol2+line3,versionText); pixPaint.setPen(pen);
// draw copyright stuff // draw copyright stuff
// pixPaint.setFont(QFont(font, 9*fontFactor)); pixPaint.setFont(QFont(font, 8*fontFactor));
// pixPaint.drawText(paddingLeftCol2,paddingTopCol2+line1,copyrightText1); pixPaint.drawText(paddingLeftCol1,paddingTopCol+line1,copyrightText);
// pixPaint.drawText(paddingLeftCol2,paddingTopCol2+line2,copyrightText2); // draw version number
pixPaint.setFont(QFont(font, 8*fontFactor));
pixPaint.drawText(paddingLeftCol2,paddingTopCol+line2,versionText);
pixPaint.end(); pixPaint.end();

2
src/version.cpp
View File

@@ -11,7 +11,7 @@
const std::string CLIENT_NAME("digishield"); const std::string CLIENT_NAME("digishield");
// Client version number // Client version number
#define CLIENT_VERSION_SUFFIX "-beta" #define CLIENT_VERSION_SUFFIX ""
// The following part of the code determines the CLIENT_BUILD variable. // The following part of the code determines the CLIENT_BUILD variable.