Add descriptive names to message bar levels (from Matthais Kuhn)

dakcarto · dakcarto · commit a0628bf6daaf · 2013-01-11T18:04:52.000-07:00
- Enum containing INFO, WARNING and CRITICAL
diff --git a/python/gui/qgsmessagebar.sip b/python/gui/qgsmessagebar.sip
@@ -5,16 +5,23 @@ class QgsMessageBar: QFrame
 %End
 
   public:
+    enum MessageLevel
+    {
+      INFO = 0,
+      WARNING = 1,
+      CRITICAL = 2
+    };
+
     QgsMessageBar( QWidget *parent = 0 );
     ~QgsMessageBar();
 
     /*! display a widget on the bar after hiding the currently visible one
      *  and putting it in a stack
      * @param widget widget to add
-     * @param level is 0 for information, 1 for warning, 2 for critical
+     * @param level is QgsMessageBar::INFO, WARNING or CRITICAL
      * @param duration timeout duration of message in seconds, 0 value indicates no timeout
      */
-    void pushWidget( QWidget *widget /Transfer/, int level = 0, int duration = 0 );
+    void pushWidget( QWidget *widget /Transfer/, MessageLevel level = INFO, int duration = 0 );
 
     /*! remove the passed widget from the bar (if previously added),
      *  then display the next one in the stack if any or hide the bar
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3427,7 +3427,7 @@ bool QgisApp::addProject( QString projectFile )
         macroMsg->layout()->addWidget( btnEnableMacros );
 
         // display the macros notification widget
-        mInfoBar->pushWidget( macroMsg, 1 );
+        mInfoBar->pushWidget( macroMsg, QgsMessageBar::WARNING );
       }
     }
   }
@@ -4034,7 +4034,7 @@ void QgisApp::labeling()
                      tr( "Please select a vector layer first." ) ,
                      QgsApplication::getThemeIcon( "/mIconWarn.png" ),
                      mInfoBar );
-    mInfoBar->pushWidget( msg, 1, 4 );
+    mInfoBar->pushWidget( msg, QgsMessageBar::WARNING, 4 );
     return;
   }
 
@@ -5759,7 +5759,7 @@ void QgisApp::duplicateLayers( QList<QgsMapLayer *> lyrList )
   // display errors in message bar after duplication of layers
   foreach ( QWidget * msgBar, msgBars )
   {
-    mInfoBar->pushWidget( msgBar, 1 );
+    mInfoBar->pushWidget( msgBar, QgsMessageBar::WARNING );
   }
 
 }
diff --git a/src/gui/qgsmessagebar.cpp b/src/gui/qgsmessagebar.cpp
@@ -228,22 +228,22 @@ void QgsMessageBar::pushItem( QgsMessageBarItem *item )
   emit widgetAdded( item->widget() );
 }
 
-void QgsMessageBar::pushWidget( QWidget *widget, int level, int duration )
+void QgsMessageBar::pushWidget( QWidget *widget, MessageLevel level, int duration )
 {
   resetCountdown();
 
   QString stylesheet;
-  if ( level >= 2 )
+  if ( level >= CRITICAL )
   {
     stylesheet = "QgsMessageBar { background-color: #d65253; border: 1px solid #9b3d3d; } "
                  "QLabel { color: white; } ";
   }
-  else if ( level == 1 )
+  else if ( level == WARNING )
   {
     stylesheet = "QgsMessageBar { background-color: #ffc800; border: 1px solid #e0aa00; } "
                  "QLabel { color: black; } ";
   }
-  else if ( level <= 0 )
+  else if ( level <= INFO )
   {
     stylesheet = "QgsMessageBar { background-color: #e7f5fe; border: 1px solid #b9cfe4; } "
                  "QLabel { color: #2554a1; } ";
diff --git a/src/gui/qgsmessagebar.h b/src/gui/qgsmessagebar.h
@@ -43,16 +43,23 @@ class GUI_EXPORT QgsMessageBar: public QFrame
     Q_OBJECT
 
   public:
+    enum MessageLevel
+    {
+      INFO = 0,
+      WARNING = 1,
+      CRITICAL = 2
+    };
+
     QgsMessageBar( QWidget *parent = 0 );
     ~QgsMessageBar();
 
     /*! display a widget on the bar after hiding the currently visible one
      *  and putting it in a stack
      * @param widget widget to add
-     * @param level is 0 for information, 1 for warning, 2 for critical
+     * @param level is QgsMessageBar::INFO, WARNING or CRITICAL
      * @param duration timeout duration of message in seconds, 0 value indicates no timeout
      */
-    void pushWidget( QWidget *widget, int level = 0, int duration = 0 );
+    void pushWidget( QWidget *widget, MessageLevel level = INFO, int duration = 0 );
 
     /*! remove the passed widget from the bar (if previously added),
      *  then display the next one in the stack if any or hide the bar

Original file line number	Diff line number	Diff line change
`@@ -3427,7 +3427,7 @@ bool QgisApp::addProject( QString projectFile )`
`3427`	`3427`	`macroMsg->layout()->addWidget( btnEnableMacros );`
`3428`	`3428`
`3429`	`3429`	`// display the macros notification widget`
`3430`		`- mInfoBar->pushWidget( macroMsg, 1 );`
	`3430`	`+ mInfoBar->pushWidget( macroMsg, QgsMessageBar::WARNING );`
`3431`	`3431`	`}`
`3432`	`3432`	`}`
`3433`	`3433`	`}`
`@@ -4034,7 +4034,7 @@ void QgisApp::labeling()`
`4034`	`4034`	`tr( "Please select a vector layer first." ) ,`
`4035`	`4035`	`QgsApplication::getThemeIcon( "/mIconWarn.png" ),`
`4036`	`4036`	`mInfoBar );`
`4037`		`- mInfoBar->pushWidget( msg, 1, 4 );`
	`4037`	`+ mInfoBar->pushWidget( msg, QgsMessageBar::WARNING, 4 );`
`4038`	`4038`	`return;`
`4039`	`4039`	`}`
`4040`	`4040`
`@@ -5759,7 +5759,7 @@ void QgisApp::duplicateLayers( QList<QgsMapLayer *> lyrList )`
`5759`	`5759`	`// display errors in message bar after duplication of layers`
`5760`	`5760`	`foreach ( QWidget * msgBar, msgBars )`
`5761`	`5761`	`{`
`5762`		`- mInfoBar->pushWidget( msgBar, 1 );`
	`5762`	`+ mInfoBar->pushWidget( msgBar, QgsMessageBar::WARNING );`
`5763`	`5763`	`}`
`5764`	`5764`
`5765`	`5765`	`}`
Original file line number	Diff line number	Diff line change
`@@ -228,22 +228,22 @@ void QgsMessageBar::pushItem( QgsMessageBarItem *item )`
`228`	`228`	`emit widgetAdded( item->widget() );`
`229`	`229`	`}`
`230`	`230`
`231`		`-void QgsMessageBar::pushWidget( QWidget *widget, int level, int duration )`
	`231`	`+void QgsMessageBar::pushWidget( QWidget *widget, MessageLevel level, int duration )`
`232`	`232`	`{`
`233`	`233`	`resetCountdown();`
`234`	`234`
`235`	`235`	`QString stylesheet;`
`236`		`- if ( level >= 2 )`
	`236`	`+ if ( level >= CRITICAL )`
`237`	`237`	`{`
`238`	`238`	`stylesheet = "QgsMessageBar { background-color: #d65253; border: 1px solid #9b3d3d; } "`
`239`	`239`	`"QLabel { color: white; } ";`
`240`	`240`	`}`
`241`		`- else if ( level == 1 )`
	`241`	`+ else if ( level == WARNING )`
`242`	`242`	`{`
`243`	`243`	`stylesheet = "QgsMessageBar { background-color: #ffc800; border: 1px solid #e0aa00; } "`
`244`	`244`	`"QLabel { color: black; } ";`
`245`	`245`	`}`
`246`		`- else if ( level <= 0 )`
	`246`	`+ else if ( level <= INFO )`
`247`	`247`	`{`
`248`	`248`	`stylesheet = "QgsMessageBar { background-color: #e7f5fe; border: 1px solid #b9cfe4; } "`
`249`	`249`	`"QLabel { color: #2554a1; } ";`