diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-04-18 00:05:21 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-04-18 00:05:21 -0700 |
| commit | 52ae314b5e8082729e9c7f5914eba48aa6993a13 (patch) | |
| tree | 3d59643ebd7524a03beddc0fd2113ea6d056ab83 /src/qt/bitcoin.cpp | |
| parent | 8b1d72be3225648a7e2a1067eed528690ed047f4 (diff) | |
| parent | f9124587ccea723dbd743e3877a7071fbb6c5732 (diff) | |
| download | bitcoin-52ae314b5e8082729e9c7f5914eba48aa6993a13.tar.xz | |
Merge pull request #2524 from jonasschnelli/new_splashscreen_fresh
new splash screen
Diffstat (limited to 'src/qt/bitcoin.cpp')
| -rw-r--r-- | src/qt/bitcoin.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index f079f3b0e9..9131f8250b 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -14,13 +14,13 @@ #include "util.h" #include "ui_interface.h" #include "paymentserver.h" +#include "splashscreen.h" #include <QMessageBox> #include <QTextCodec> #include <QLocale> #include <QTimer> #include <QTranslator> -#include <QSplashScreen> #include <QLibraryInfo> #if defined(BITCOIN_NEED_QT_PLUGINS) && !defined(_BITCOIN_QT_PLUGINS_INCLUDED) @@ -36,7 +36,7 @@ Q_IMPORT_PLUGIN(qtaccessiblewidgets) // Need a global reference for the notifications to find the GUI static BitcoinGUI *guiref; -static QSplashScreen *splashref; +static SplashScreen *splashref; static bool ThreadSafeMessageBox(const std::string& message, const std::string& caption, unsigned int style) { @@ -82,7 +82,7 @@ static void InitMessage(const std::string &message) { if(splashref) { - splashref->showMessage(QString::fromStdString(message), Qt::AlignBottom|Qt::AlignHCenter, QColor(255,255,200)); + splashref->showMessage(QString::fromStdString(message), Qt::AlignBottom|Qt::AlignHCenter, QColor(55,55,55)); qApp->processEvents(); } printf("init message: %s\n", message.c_str()); @@ -192,7 +192,7 @@ int main(int argc, char *argv[]) return 1; } - QSplashScreen splash(QPixmap(":/images/splash"), 0); + SplashScreen splash(QPixmap(), 0); if (GetBoolArg("-splash", true) && !GetBoolArg("-min")) { splash.show(); |