[diagrams] Show message on messagebar instead of messagebox

m-kuhn · m-kuhn · commit 13e7b33aaf46 · 2013-05-03T19:45:02.000+02:00
And some indentation updates
diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp
@@ -490,8 +490,10 @@ void QgsDiagramProperties::apply()
 
     if ( 0 == mDiagramAttributesTreeWidget->topLevelItemCount() )
     {
-      QMessageBox::warning( this, tr( "No attributes added." ),
-                            tr( "You did not add any attributes to this diagram layer. Please specify the attributes to visualize on the diagrams or disable diagrams." ), QMessageBox::Ok );
+      QgisApp::instance()->messageBar()->pushMessage(
+        tr( "Diagrams: No attributes added." ),
+        tr( "You did not add any attributes to this diagram layer. Please specify the attributes to visualize on the diagrams or disable diagrams." ),
+        QgsMessageBar::WARNING );
     }
 
     bool scaleAttributeValueOk = false;
@@ -522,10 +524,10 @@ void QgsDiagramProperties::apply()
       if ( maxVal != DBL_MIN )
       {
         QgisApp::instance()->messageBar()->pushMessage(
-              tr( "Interpolation value" ),
-              tr( "You did not specify an interpolation value. A default value of %1 has been set." ).arg( QString::number( maxVal ) ),
-              QgsMessageBar::INFO,
-              5 );
+          tr( "Interpolation value" ),
+          tr( "You did not specify an interpolation value. A default value of %1 has been set." ).arg( QString::number( maxVal ) ),
+          QgsMessageBar::INFO,
+          5 );
 
         mValueLineEdit->setText( QString::number( maxVal ) );
       }

Original file line number	Diff line number	Diff line change
`@@ -490,8 +490,10 @@ void QgsDiagramProperties::apply()`
`490`	`490`
`491`	`491`	`if ( 0 == mDiagramAttributesTreeWidget->topLevelItemCount() )`
`492`	`492`	`{`
`493`		`- QMessageBox::warning( this, tr( "No attributes added." ),`
`494`		`- tr( "You did not add any attributes to this diagram layer. Please specify the attributes to visualize on the diagrams or disable diagrams." ), QMessageBox::Ok );`
	`493`	`+ QgisApp::instance()->messageBar()->pushMessage(`
	`494`	`+ tr( "Diagrams: No attributes added." ),`
	`495`	`+ tr( "You did not add any attributes to this diagram layer. Please specify the attributes to visualize on the diagrams or disable diagrams." ),`
	`496`	`+ QgsMessageBar::WARNING );`
`495`	`497`	`}`
`496`	`498`
`497`	`499`	`bool scaleAttributeValueOk = false;`
`@@ -522,10 +524,10 @@ void QgsDiagramProperties::apply()`
`522`	`524`	`if ( maxVal != DBL_MIN )`
`523`	`525`	`{`
`524`	`526`	`QgisApp::instance()->messageBar()->pushMessage(`
`525`		`- tr( "Interpolation value" ),`
`526`		`- tr( "You did not specify an interpolation value. A default value of %1 has been set." ).arg( QString::number( maxVal ) ),`
`527`		`- QgsMessageBar::INFO,`
`528`		`- 5 );`
	`527`	`+ tr( "Interpolation value" ),`
	`528`	`+ tr( "You did not specify an interpolation value. A default value of %1 has been set." ).arg( QString::number( maxVal ) ),`
	`529`	`+ QgsMessageBar::INFO,`
	`530`	`+ 5 );`
`529`	`531`
`530`	`532`	`mValueLineEdit->setText( QString::number( maxVal ) );`
`531`	`533`	`}`