Fix startup state of diagram option widgets

m-kuhn · m-kuhn · commit bd4a85ac1680 · 2012-08-13T18:32:27.000+02:00
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -1377,11 +1377,13 @@ void QgsVectorLayerProperties::handleDiagramTypeChanged( const QString& itemtext
   {
     mDiagramOptionsGroupBox->show();
     mBarWidthLabel->show();
+    mBarWidthSpinBox->show();
   }
   else
   {
     mDiagramOptionsGroupBox->hide();
     mBarWidthLabel->hide();
+    mBarWidthSpinBox->hide();
   }
 
   if ( tr( "Text diagram" ) == itemtext || tr( "Pie chart" ) == itemtext )
@@ -1871,7 +1873,7 @@ void QgsVectorLayerProperties::initDiagramTab()
         mDiagramTypeComboBox->setCurrentIndex( mDiagramTypeComboBox->findText( tr( "Histogram" ) ) );
       }
     }
-  } // if ( !dr ), else
+  } // if ( !dr )
 
   // Popuplate the widget list with all widgets which should be enabled/disabled when diagrams are
   // enabled / disabled
@@ -1880,6 +1882,9 @@ void QgsVectorLayerProperties::initDiagramTab()
     << mPlacementGroupBox << mAttributesLabel << mDiagramAttributesComboBox << mRemoveCategoryPushButton 
     << mAddCategoryPushButton << mDiagramAttributesTreeWidget << mDiagramOptionsGroupBox;
 
+  // Trigger a clicked event, so all the items get properly enabled and disabled
+  on_mDisplayDiagramsCheckBox_stateChanged( mDisplayDiagramsCheckBox->checkState() );
+
   connect( mDiagramAttributesTreeWidget, SIGNAL( itemDoubleClicked( QTreeWidgetItem*, int ) ), this, SLOT( handleDiagramItemDoubleClick( QTreeWidgetItem*, int ) ) );
   connect( mDiagramTypeComboBox, SIGNAL( currentIndexChanged( const QString& ) ), this, SLOT( handleDiagramTypeChanged( const QString& ) ) );
 }

Original file line number	Diff line number	Diff line change
`@@ -1377,11 +1377,13 @@ void QgsVectorLayerProperties::handleDiagramTypeChanged( const QString& itemtext`
`1377`	`1377`	`{`
`1378`	`1378`	`mDiagramOptionsGroupBox->show();`
`1379`	`1379`	`mBarWidthLabel->show();`
	`1380`	`+ mBarWidthSpinBox->show();`
`1380`	`1381`	`}`
`1381`	`1382`	`else`
`1382`	`1383`	`{`
`1383`	`1384`	`mDiagramOptionsGroupBox->hide();`
`1384`	`1385`	`mBarWidthLabel->hide();`
	`1386`	`+ mBarWidthSpinBox->hide();`
`1385`	`1387`	`}`
`1386`	`1388`
`1387`	`1389`	`if ( tr( "Text diagram" ) == itemtext \|\| tr( "Pie chart" ) == itemtext )`
`@@ -1871,7 +1873,7 @@ void QgsVectorLayerProperties::initDiagramTab()`
`1871`	`1873`	`mDiagramTypeComboBox->setCurrentIndex( mDiagramTypeComboBox->findText( tr( "Histogram" ) ) );`
`1872`	`1874`	`}`
`1873`	`1875`	`}`
`1874`		`- } // if ( !dr ), else`
	`1876`	`+ } // if ( !dr )`
`1875`	`1877`
`1876`	`1878`	`// Popuplate the widget list with all widgets which should be enabled/disabled when diagrams are`
`1877`	`1879`	`// enabled / disabled`
`@@ -1880,6 +1882,9 @@ void QgsVectorLayerProperties::initDiagramTab()`
`1880`	`1882`	`<< mPlacementGroupBox << mAttributesLabel << mDiagramAttributesComboBox << mRemoveCategoryPushButton`
`1881`	`1883`	`<< mAddCategoryPushButton << mDiagramAttributesTreeWidget << mDiagramOptionsGroupBox;`
`1882`	`1884`
	`1885`	`+ // Trigger a clicked event, so all the items get properly enabled and disabled`
	`1886`	`+ on_mDisplayDiagramsCheckBox_stateChanged( mDisplayDiagramsCheckBox->checkState() );`
	`1887`	`+`
`1883`	`1888`	`connect( mDiagramAttributesTreeWidget, SIGNAL( itemDoubleClicked( QTreeWidgetItem, int ) ), this, SLOT( handleDiagramItemDoubleClick( QTreeWidgetItem, int ) ) );`
`1884`	`1889`	`connect( mDiagramTypeComboBox, SIGNAL( currentIndexChanged( const QString& ) ), this, SLOT( handleDiagramTypeChanged( const QString& ) ) );`
`1885`	`1890`	`}`