From fff91190285af6520041fba90fe836bdb4870b69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lund=20Martsum?= Date: Tue, 18 Sep 2012 06:41:19 +0200 Subject: [PATCH] QSplashScreen - add message function There is no point in not being able to get the message. Sometimes it can be the case that we just want to append a dot (or something else) on the existing message. Change-Id: I171495f1edc568ae1654f43b3cf734a4eb67d374 Reviewed-by: Stephen Kelly Reviewed-by: Giuseppe D'Angelo --- src/widgets/widgets/qsplashscreen.cpp | 16 +++++++++++++++- src/widgets/widgets/qsplashscreen.h | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/widgets/widgets/qsplashscreen.cpp b/src/widgets/widgets/qsplashscreen.cpp index 746c02e4e2..b2a0d3f8b8 100644 --- a/src/widgets/widgets/qsplashscreen.cpp +++ b/src/widgets/widgets/qsplashscreen.cpp @@ -200,7 +200,7 @@ void QSplashScreen::repaint() is kept up to date with what your application is doing (e.g., loading files). - \sa Qt::Alignment, clearMessage() + \sa Qt::Alignment, clearMessage(), message() */ void QSplashScreen::showMessage(const QString &message, int alignment, const QColor &color) @@ -213,6 +213,20 @@ void QSplashScreen::showMessage(const QString &message, int alignment, repaint(); } +/*! + \since 5.2 + + Returns the message that is currently displayed on the splash screen. + + \sa showMessage(), clearMessage() +*/ + +QString QSplashScreen::message() const +{ + Q_D(const QSplashScreen); + return d->currStatus; +} + /*! Removes the message being displayed on the splash screen diff --git a/src/widgets/widgets/qsplashscreen.h b/src/widgets/widgets/qsplashscreen.h index a1af8e45ef..e675c2e7af 100644 --- a/src/widgets/widgets/qsplashscreen.h +++ b/src/widgets/widgets/qsplashscreen.h @@ -63,6 +63,7 @@ public: const QPixmap pixmap() const; void finish(QWidget *w); void repaint(); + QString message() const; public Q_SLOTS: void showMessage(const QString &message, int alignment = Qt::AlignLeft,