Merge pull request #4941

a49f11d qt: Change splash screen to normal window (Wladimir J. van der Laan)

1 files changed, 13 insertions, 2 deletions

diff --git a/src/qt/splashscreen.h b/src/qt/splashscreen.h
index d79038d81d..1151d6c111 100644
--- a/src/qt/splashscreen.h
+++ b/src/qt/splashscreen.h
@@ -9,23 +9,34 @@
 
 /** class for the splashscreen with information of the running client
  */
-class SplashScreen : public QSplashScreen
+class SplashScreen : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f, bool isTestNet);
+    explicit SplashScreen(Qt::WindowFlags f, bool isTestNet);
     ~SplashScreen();
 
+protected:
+     void paintEvent(QPaintEvent *event);
+
 public slots:
     /** Slot to call finish() method as it's not defined as slot */
     void slotFinish(QWidget *mainWin);
 
+    /** Show message and progress */
+    void showMessage(const QString &message, int alignment, const QColor &color);
+
 private:
     /** Connect core signals to splash screen */
     void subscribeToCoreSignals();
     /** Disconnect core signals to splash screen */
     void unsubscribeFromCoreSignals();
+
+    QPixmap pixmap;
+    QString curMessage;
+    QColor curColor;
+    int curAlignment;
 };
 
 #endif // SPLASHSCREEN_H