Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/matthias-kuhn/Quantum-GIS

Conflicts:
	src/app/qgsdiagramproperties.cpp
  • Loading branch information
m-kuhn committed Aug 29, 2012
2 parents 0eab969 + dae596a commit 260a182f62bad01dc0a648522aa25572bfe5f95e
Showing with 5 additions and 4 deletions.
  1. +5 −4 src/app/qgsdiagramproperties.cpp
@@ -298,7 +298,8 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer, QWidget* pare
void QgsDiagramProperties::on_mDiagramTypeComboBox_currentIndexChanged( int index )
{
QString diagramType = mDiagramTypeComboBox->itemData( index ).toString();
if ( diagramType == DIAGRAM_NAME_TEXT )

if ( DIAGRAM_NAME_TEXT == diagramType )
{
mLabelPlacementComboBox->show();
mLabelPlacementLabel->show();
@@ -308,7 +309,7 @@ void QgsDiagramProperties::on_mDiagramTypeComboBox_currentIndexChanged( int inde
mLabelPlacementLabel->hide();
}

if ( diagramType == DIAGRAM_NAME_HISTOGRAM )
if ( DIAGRAM_NAME_HISTOGRAM == diagramType )
{
mBarWidthLabel->show();
mBarWidthSpinBox->show();
@@ -321,7 +322,7 @@ void QgsDiagramProperties::on_mDiagramTypeComboBox_currentIndexChanged( int inde
mOrientationFrame->hide();
}

if ( diagramType == DIAGRAM_NAME_HISTOGRAM || diagramType == DIAGRAM_NAME_TEXT )
if ( DIAGRAM_NAME_HISTOGRAM == diagramType || DIAGRAM_NAME_TEXT == diagramType )
{
mDiagramPropertiesTabWidget->setTabEnabled( 3, true );
}
@@ -330,7 +331,7 @@ void QgsDiagramProperties::on_mDiagramTypeComboBox_currentIndexChanged( int inde
mDiagramPropertiesTabWidget->setTabEnabled( 3, false );
}

if ( diagramType == DIAGRAM_NAME_TEXT || diagramType == DIAGRAM_NAME_PIE )
if ( DIAGRAM_NAME_TEXT == diagramType || DIAGRAM_NAME_PIE == diagramType )
{
mScaleDependencyComboBox->show();
mScaleDependencyLabel->show();

0 comments on commit 260a182

Please sign in to comment.
You can’t perform that action at this time.