Merge pull request #329 from matthias-kuhn/diagram

mhugent · mhugent · commit c4904653c36b · 2012-11-13T05:19:22.000-08:00
Diagrams: Hide background color button when unnecessary
diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp
@@ -303,11 +303,15 @@ void QgsDiagramProperties::on_mDiagramTypeComboBox_currentIndexChanged( int inde
   {
     mLabelPlacementComboBox->show();
     mLabelPlacementLabel->show();
+    mBackgroundColorLabel->show();
+    mBackgroundColorButton->show();
   }
   else
   {
     mLabelPlacementComboBox->hide();
     mLabelPlacementLabel->hide();
+    mBackgroundColorLabel->hide();
+    mBackgroundColorButton->hide();
   }
 
   if ( DIAGRAM_NAME_HISTOGRAM == diagramType )

Original file line number	Diff line number	Diff line change
`@@ -303,11 +303,15 @@ void QgsDiagramProperties::on_mDiagramTypeComboBox_currentIndexChanged( int inde`
`303`	`303`	`{`
`304`	`304`	`mLabelPlacementComboBox->show();`
`305`	`305`	`mLabelPlacementLabel->show();`
	`306`	`+ mBackgroundColorLabel->show();`
	`307`	`+ mBackgroundColorButton->show();`
`306`	`308`	`}`
`307`	`309`	`else`
`308`	`310`	`{`
`309`	`311`	`mLabelPlacementComboBox->hide();`
`310`	`312`	`mLabelPlacementLabel->hide();`
	`313`	`+ mBackgroundColorLabel->hide();`
	`314`	`+ mBackgroundColorButton->hide();`
`311`	`315`	`}`
`312`	`316`
`313`	`317`	`if ( DIAGRAM_NAME_HISTOGRAM == diagramType )`