From b6632a81aa6d0fcb648884805d44acaa163759df Mon Sep 17 00:00:00 2001 From: Marco Bernasocchi Date: Sun, 14 Dec 2014 15:55:50 +0100 Subject: [PATCH] added QgsMessageBar::SUCCESS --- python/gui/qgsmessagebar.sip | 3 ++- src/gui/qgsmessagebar.h | 5 +++-- src/gui/qgsmessagebaritem.cpp | 12 ++++++++++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/python/gui/qgsmessagebar.sip b/python/gui/qgsmessagebar.sip index 9c73e9561a81..f21deee6a56f 100644 --- a/python/gui/qgsmessagebar.sip +++ b/python/gui/qgsmessagebar.sip @@ -10,6 +10,7 @@ class QgsMessageBar: QFrame INFO, WARNING, CRITICAL, + SUCCESS }; QgsMessageBar( QWidget *parent = 0 ); @@ -24,7 +25,7 @@ class QgsMessageBar: QFrame /*! display a widget as a message on the bar after hiding the currently visible one * and putting it in a stack. * @param widget message widget to display - * @param level is QgsMessageBar::INFO, WARNING or CRITICAL + * @param level is QgsMessageBar::INFO, WARNING, CRITICAL or SUCCESS * @param duration timeout duration of message in seconds, 0 value indicates no timeout */ QgsMessageBarItem *pushWidget( QWidget *widget /Transfer/, MessageLevel level = INFO, int duration = 0 ); diff --git a/src/gui/qgsmessagebar.h b/src/gui/qgsmessagebar.h index 2b66675ac526..404ed2507504 100644 --- a/src/gui/qgsmessagebar.h +++ b/src/gui/qgsmessagebar.h @@ -48,7 +48,8 @@ class GUI_EXPORT QgsMessageBar: public QFrame { INFO = 0, WARNING = 1, - CRITICAL = 2 + CRITICAL = 2, + SUCCESS = 3 }; QgsMessageBar( QWidget *parent = 0 ); @@ -63,7 +64,7 @@ class GUI_EXPORT QgsMessageBar: public QFrame /*! display a widget as a message on the bar after hiding the currently visible one * and putting it in a stack. * @param widget message widget to display - * @param level is QgsMessageBar::INFO, WARNING or CRITICAL + * @param level is QgsMessageBar::INFO, WARNING, CRITICAL or SUCCESS * @param duration timeout duration of message in seconds, 0 value indicates no timeout */ QgsMessageBarItem *pushWidget( QWidget *widget, MessageLevel level = INFO, int duration = 0 ); diff --git a/src/gui/qgsmessagebaritem.cpp b/src/gui/qgsmessagebaritem.cpp index ec2e5e781509..f2d7e0e59744 100644 --- a/src/gui/qgsmessagebaritem.cpp +++ b/src/gui/qgsmessagebaritem.cpp @@ -111,6 +111,9 @@ void QgsMessageBarItem::writeContent() case QgsMessageBar::WARNING: msgIcon = QString( "/mIconWarn.png" ); break; + case QgsMessageBar::SUCCESS: + msgIcon = QString( "/mActionCheckQgisVersion.png" ); + break; default: break; } @@ -167,7 +170,12 @@ void QgsMessageBarItem::writeContent() } // STYLESHEET - if ( mLevel >= QgsMessageBar::CRITICAL ) + if ( mLevel == QgsMessageBar::SUCCESS ) + { + mStyleSheet = "QgsMessageBar { background-color: #dff0d8; border: 1px solid #8e998a; } " + "QLabel,QTextEdit { color: black; } "; + } + else if ( mLevel == QgsMessageBar::CRITICAL ) { mStyleSheet = "QgsMessageBar { background-color: #d65253; border: 1px solid #9b3d3d; } " "QLabel,QTextEdit { color: white; } "; @@ -177,7 +185,7 @@ void QgsMessageBarItem::writeContent() mStyleSheet = "QgsMessageBar { background-color: #ffc800; border: 1px solid #e0aa00; } " "QLabel,QTextEdit { color: black; } "; } - else if ( mLevel <= QgsMessageBar::INFO ) + else if ( mLevel == QgsMessageBar::INFO ) { mStyleSheet = "QgsMessageBar { background-color: #e7f5fe; border: 1px solid #b9cfe4; } " "QLabel,QTextEdit { color: #2554a1; } ";