Skip to content

Commit 9375071

Browse files
author
timlinux
committed
Implement property list ui for raster props dialog
git-svn-id: http://svn.osgeo.org/qgis/trunk@12195 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent de166f6 commit 9375071

File tree

2 files changed

+263
-226
lines changed

2 files changed

+263
-226
lines changed

src/app/qgsrasterlayerproperties.cpp

+14-14
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer *lyr, QWidget *p
149149
mColormapTreeWidget->setHeaderLabels( headerLabels );
150150

151151
//disable colormap tab completely until 'Colormap' is selected (and only for type GrayOrUndefined)
152-
tabBar->setTabEnabled( tabBar->indexOf( tabPageColormap ), FALSE );
152+
tabPageColormap->setEnabled( false );
153153

154154
//
155155
// Set up the combo boxes that contain band lists using the qstring list generated above
@@ -295,10 +295,10 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer *lyr, QWidget *p
295295
else if ( mRasterLayerIsWms )
296296
{
297297
// disable Pyramids tab completely
298-
tabBar->setTabEnabled( tabBar->indexOf( tabPagePyramids ), FALSE );
298+
tabPagePyramids->setEnabled( false );
299299

300300
// disable Histogram tab completely
301-
tabBar->setTabEnabled( tabBar->indexOf( tabPageHistogram ), FALSE );
301+
tabPageHistogram->setEnabled( false );
302302
}
303303

304304
leSpatialRefSys->setText( mRasterLayer->srs().toProj4() );
@@ -550,13 +550,13 @@ void QgsRasterLayerProperties::sync()
550550

551551
if ( mRasterLayerIsWms )
552552
{
553-
tabBar->setCurrentIndex( tabBar->indexOf( tabPageMetadata ) );
554-
tabBar->removeTab( tabBar->indexOf( tabPageColormap ) );
555-
tabBar->removeTab( tabBar->indexOf( tabPageSymbology ) );
553+
tabBar->setCurrentWidget( tabPageMetadata );
554+
tabBar->removeWidget( tabPageColormap );
555+
tabBar->removeWidget( tabPageSymbology );
556556
gboxNoDataValue->setEnabled( false );
557557
gboxCustomTransparency->setEnabled( false );
558-
tabBar->removeTab( tabBar->indexOf( tabPageHistogram ) );
559-
tabBar->removeTab( tabBar->indexOf( tabPagePyramids ) );
558+
tabBar->removeWidget( tabPageHistogram );
559+
tabBar->removeWidget( tabPagePyramids );
560560
}
561561
#if 0
562562
if ( mRasterLayer->rasterType() == QgsRasterLayer::Multiband )
@@ -1690,7 +1690,7 @@ void QgsRasterLayerProperties::on_cboxColorMap_currentIndexChanged( const QStrin
16901690
{
16911691
if ( mRasterLayerIsGdal && ( theText == tr( "Pseudocolor" ) || theText == tr( "Freak Out" ) ) )
16921692
{
1693-
tabBar->setTabEnabled( tabBar->indexOf( tabPageColormap ), FALSE );
1693+
tabPageColormap->setEnabled( false );
16941694
rbtnSingleBandMinMax->setEnabled( false );
16951695
rbtnSingleBandStdDev->setEnabled( true );
16961696
sboxSingleBandStdDev->setEnabled( true );
@@ -1700,7 +1700,7 @@ void QgsRasterLayerProperties::on_cboxColorMap_currentIndexChanged( const QStrin
17001700
}
17011701
else if ( mRasterLayerIsGdal && theText == tr( "Colormap" ) )
17021702
{
1703-
tabBar->setTabEnabled( tabBar->indexOf( tabPageColormap ), TRUE );
1703+
tabPageColormap->setEnabled( true );
17041704
rbtnSingleBandMinMax->setEnabled( false );
17051705
rbtnSingleBandStdDev->setEnabled( false );
17061706
sboxSingleBandStdDev->setEnabled( false );
@@ -1710,7 +1710,7 @@ void QgsRasterLayerProperties::on_cboxColorMap_currentIndexChanged( const QStrin
17101710
}
17111711
else if ( mRasterLayerIsGdal && theText == tr( "User Defined" ) )
17121712
{
1713-
tabBar->setTabEnabled( tabBar->indexOf( tabPageColormap ), FALSE );
1713+
tabPageColormap->setEnabled( false );
17141714
rbtnSingleBandMinMax->setEnabled( true );
17151715
rbtnSingleBandStdDev->setEnabled( true );
17161716
sboxSingleBandStdDev->setEnabled( true );
@@ -1720,7 +1720,7 @@ void QgsRasterLayerProperties::on_cboxColorMap_currentIndexChanged( const QStrin
17201720
}
17211721
else if ( mRasterLayerIsGdal )
17221722
{
1723-
tabBar->setTabEnabled( tabBar->indexOf( tabPageColormap ), FALSE );
1723+
tabPageColormap->setEnabled( false );
17241724
rbtnSingleBandMinMax->setEnabled( true );
17251725
rbtnSingleBandStdDev->setEnabled( true );
17261726
sboxSingleBandStdDev->setEnabled( true );
@@ -2354,7 +2354,7 @@ void QgsRasterLayerProperties::on_rbtnSingleBand_toggled( bool theState )
23542354

23552355
if ( cboxColorMap->currentText() == tr( "Pseudocolor" ) )
23562356
{
2357-
tabBar->setTabEnabled( tabBar->indexOf( tabPageColormap ), true );
2357+
tabPageColormap->setEnabled ( true );
23582358
}
23592359

23602360
if ( cboxColorMap->currentText() == tr( "Pseudocolor" ) || cboxColorMap->currentText() == tr( "Color Ramp" ) || cboxColorMap->currentText() == tr( "Freak Out" ) || mRasterLayer->rasterType() == QgsRasterLayer::Palette )
@@ -2424,7 +2424,7 @@ void QgsRasterLayerProperties::on_rbtnThreeBand_toggled( bool theState )
24242424
stackedWidget->setCurrentIndex( 0 );
24252425
rbtnSingleBand->setChecked( false );
24262426
cboxColorMap->setEnabled( false );
2427-
tabBar->setTabEnabled( tabBar->indexOf( tabPageColormap ), false );
2427+
tabPageColormap->setEnabled( false );
24282428

24292429
grpRgbBands->setEnabled( true );
24302430

0 commit comments

Comments
 (0)