Skip to content

Commit 0edfd7d

Browse files
committed
move Colormap tab next to the Style tab (fix #5018)
1 parent 0a2d75f commit 0edfd7d

File tree

2 files changed

+227
-226
lines changed

2 files changed

+227
-226
lines changed

src/app/qgsrasterlayerproperties.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer* lyr, QgsMapCanv
157157
mColormapTreeWidget->setHeaderLabels( headerLabels );
158158

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

162162
//
163163
// Set up the combo boxes that contain band lists using the qstring list generated above
@@ -1726,7 +1726,7 @@ void QgsRasterLayerProperties::on_cboxColorMap_currentIndexChanged( const QStrin
17261726

17271727
if ( theText == tr( "Pseudocolor" ) || theText == tr( "Freak Out" ) )
17281728
{
1729-
tabPageColormap->setEnabled( false );
1729+
tabBar->setTabEnabled( tabBar->indexOf( tabPageColormap ), false );
17301730
rbtnSingleBandMinMax->setEnabled( false );
17311731
rbtnSingleBandStdDev->setEnabled( true );
17321732
sboxSingleBandStdDev->setEnabled( true );
@@ -1736,7 +1736,7 @@ void QgsRasterLayerProperties::on_cboxColorMap_currentIndexChanged( const QStrin
17361736
}
17371737
else if ( theText == tr( "Colormap" ) )
17381738
{
1739-
tabPageColormap->setEnabled( true );
1739+
tabBar->setTabEnabled( tabBar->indexOf( tabPageColormap ), true );
17401740
rbtnSingleBandMinMax->setEnabled( false );
17411741
rbtnSingleBandStdDev->setEnabled( false );
17421742
sboxSingleBandStdDev->setEnabled( false );
@@ -1746,7 +1746,7 @@ void QgsRasterLayerProperties::on_cboxColorMap_currentIndexChanged( const QStrin
17461746
}
17471747
else if ( theText == tr( "User Defined" ) )
17481748
{
1749-
tabPageColormap->setEnabled( false );
1749+
tabBar->setTabEnabled( tabBar->indexOf( tabPageColormap ), false );
17501750
rbtnSingleBandMinMax->setEnabled( true );
17511751
rbtnSingleBandStdDev->setEnabled( true );
17521752
sboxSingleBandStdDev->setEnabled( true );
@@ -1756,7 +1756,7 @@ void QgsRasterLayerProperties::on_cboxColorMap_currentIndexChanged( const QStrin
17561756
}
17571757
else
17581758
{
1759-
tabPageColormap->setEnabled( false );
1759+
tabBar->setTabEnabled( tabBar->indexOf( tabPageColormap ), false );
17601760
rbtnSingleBandMinMax->setEnabled( true );
17611761
rbtnSingleBandStdDev->setEnabled( true );
17621762
sboxSingleBandStdDev->setEnabled( true );
@@ -2136,7 +2136,7 @@ void QgsRasterLayerProperties::on_rbtnSingleBand_toggled( bool theState )
21362136

21372137
if ( cboxColorMap->currentText() == tr( "Pseudocolor" ) )
21382138
{
2139-
tabPageColormap->setEnabled( true );
2139+
tabBar->setTabEnabled( tabBar->indexOf( tabPageColormap ), true );
21402140
}
21412141

21422142
if ( cboxColorMap->currentText() == tr( "Pseudocolor" ) || cboxColorMap->currentText() == tr( "Color Ramp" ) || cboxColorMap->currentText() == tr( "Freak Out" ) || mRasterLayer->rasterType() == QgsRasterLayer::Palette )
@@ -2214,7 +2214,7 @@ void QgsRasterLayerProperties::on_rbtnThreeBand_toggled( bool theState )
22142214
stackedWidget->setCurrentIndex( 0 );
22152215
rbtnSingleBand->setChecked( false );
22162216
cboxColorMap->setEnabled( false );
2217-
tabPageColormap->setEnabled( false );
2217+
tabBar->setTabEnabled( tabBar->indexOf( tabPageColormap ), false );
22182218

22192219
grpRgbBands->setEnabled( true );
22202220

0 commit comments

Comments
 (0)