diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 9ed241a..b8070ee 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -91,7 +91,7 @@ static void InitMessage(const std::string &message) { 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(); } printf("init message: %s\n", message.c_str()); diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 8c5f052..f2dfc8f 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -852,7 +852,7 @@ void BitcoinGUI::toggleHidden() void BitcoinGUI::detectShutdown() { if (ShutdownRequested()) - QMetaObject::invokeMethod(QCoreApplication::instance(), "quit", Qt::QueuedConnection); + QMetaObject::invokeMethod(QCoreApplication::instance(), "quit", Qt::QueuedConnection); } void BitcoinGUI::slotMenuToolbarItemClicked( GUIMenuToolbarControl::EMenuToolbarItemTypes a_eType ) diff --git a/src/qt/res/images/splash-v1.3.png b/src/qt/res/images/splash-v1.3.png new file mode 100644 index 0000000..696fa85 Binary files /dev/null and b/src/qt/res/images/splash-v1.3.png differ diff --git a/src/qt/res/images/splash.png b/src/qt/res/images/splash.png index 696fa85..cd4b2d3 100644 Binary files a/src/qt/res/images/splash.png and b/src/qt/res/images/splash.png differ diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index 758c864..9ffc4a0 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -10,19 +10,17 @@ SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) : QSplashScreen(pixmap, f) { // set reference point, paddings - int paddingLeftCol2 = 230; - int paddingTopCol2 = 376; + int paddingLeftCol1 = 110; + int paddingLeftCol2 = 170; + int paddingTopCol = 300; int line1 = 0; - int line2 = 13; - int line3 = 26; + int line2 = 20; float fontFactor = 1.0; // 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 copyrightText1 = QChar(0xA9)+QString(" 2009-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Bitcoin developers")); - QString copyrightText2 = QChar(0xA9)+QString(" 2013-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The CasinoCoin developers")); + QString copyrightText = QChar(0xA9)+QString(" 2013-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The CasinoCoin developers")); QString font = "Arial"; @@ -36,15 +34,17 @@ SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) : } QPainter pixPaint(&newPixmap); - pixPaint.setPen(QColor(255,255,255)); - - pixPaint.setFont(QFont(font, 9*fontFactor)); - pixPaint.drawText(paddingLeftCol2,paddingTopCol2+line3,versionText); + QPen pen; + pen.setWidth(1); + pen.setColor(Qt::black); + pixPaint.setPen(pen); // draw copyright stuff -// pixPaint.setFont(QFont(font, 9*fontFactor)); -// pixPaint.drawText(paddingLeftCol2,paddingTopCol2+line1,copyrightText1); -// pixPaint.drawText(paddingLeftCol2,paddingTopCol2+line2,copyrightText2); + pixPaint.setFont(QFont(font, 8*fontFactor)); + pixPaint.drawText(paddingLeftCol1,paddingTopCol+line1,copyrightText); + // draw version number + pixPaint.setFont(QFont(font, 8*fontFactor)); + pixPaint.drawText(paddingLeftCol2,paddingTopCol+line2,versionText); pixPaint.end(); diff --git a/src/version.cpp b/src/version.cpp index 51f06d7..75b73bd 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -11,7 +11,7 @@ const std::string CLIENT_NAME("digishield"); // Client version number -#define CLIENT_VERSION_SUFFIX "-beta" +#define CLIENT_VERSION_SUFFIX "" // The following part of the code determines the CLIENT_BUILD variable.