From 1fdc150116cad39aae5c5da407c3312b47a59e3a Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Fri, 17 Dec 2021 07:06:30 -0500 Subject: New upstream version 3.3.3+dfsg1. --- .../guiSQLiteStudio/common/widgetstateindicator.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'SQLiteStudio3/guiSQLiteStudio/common/widgetstateindicator.h') diff --git a/SQLiteStudio3/guiSQLiteStudio/common/widgetstateindicator.h b/SQLiteStudio3/guiSQLiteStudio/common/widgetstateindicator.h index eee49d5..28c6e0b 100644 --- a/SQLiteStudio3/guiSQLiteStudio/common/widgetstateindicator.h +++ b/SQLiteStudio3/guiSQLiteStudio/common/widgetstateindicator.h @@ -7,7 +7,6 @@ class QLabel; class QGraphicsDropShadowEffect; class QGraphicsColorizeEffect; -class QSequentialAnimationGroup; class GUI_API_EXPORT WidgetStateIndicator : public QObject { @@ -32,14 +31,14 @@ class GUI_API_EXPORT WidgetStateIndicator : public QObject ~WidgetStateIndicator(); void setMode(Mode mode); - void show(const QString& msg = QString(), bool animated = true); + void show(const QString& msg = QString()); void hide(); void setVisible(bool visible, const QString& msg = QString()); void release(); - void info(const QString& msg, bool animated = true); - void warn(const QString& msg, bool animated = true); - void error(const QString& msg, bool animated = true); - void hint(const QString& msg, bool animated = true); + void info(const QString& msg); + void warn(const QString& msg); + void error(const QString& msg); + void hint(const QString& msg); static bool exists(QWidget* widget); static WidgetStateIndicator* getInstance(QWidget* widget); @@ -57,7 +56,6 @@ class GUI_API_EXPORT WidgetStateIndicator : public QObject void initEffects(); void initGlowEffects(); void initHighlightingEffects(); - void initAnimations(); void initPositionMode(); void finalInit(); void setMessage(const QString& msg); @@ -66,15 +64,18 @@ class GUI_API_EXPORT WidgetStateIndicator : public QObject QWidget* findParentWindow(QWidget* w); bool shouldHide(); bool shouldShow(); + bool eventFilterFromWidget(QEvent *ev); + bool eventFilterFromParentWidget(QEvent *ev); + bool eventFilterFromIndicatorLabel(QEvent *ev); QWidget* labelParent = nullptr; QLabel* label = nullptr; Mode mode = Mode::ERROR; QWidget* widget = nullptr; QString message; + QString processedMessage; QGraphicsColorizeEffect* highlightingEffect = nullptr; QGraphicsDropShadowEffect* glowEffect = nullptr; - QSequentialAnimationGroup* animation = nullptr; bool widgetVisible = false; bool visibilityRequested = false; QWidget* windowParent = nullptr; -- cgit v1.2.3