Showing with 234 additions and 233 deletions.
  1. +4 −4 python/plugins/fTools/tools/doIntersectLines.py
  2. +7 −7 src/app/qgsrasterlayerproperties.cpp
  3. +3 −3 src/ui/qgsnewspatialitelayerdialogbase.ui
  4. +220 −219 src/ui/qgsrasterlayerpropertiesbase.ui
8 changes: 4 additions & 4 deletions python/plugins/fTools/tools/doIntersectLines.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ def __init__(self, iface):

def populateLayers( self ):
layers = ftools_utils.getLayerNames([QGis.Line])
QObject.disconnect(self.inLine1, SIGNAL("currentIndexChanged(QString)"), self.update1)
QObject.disconnect(self.inLine2, SIGNAL("currentIndexChanged(QString)"), self.update2)
self.inLine1.blockSignals( True )
self.inLine2.blockSignals( True )
self.inLine1.clear()
self.inLine2.clear()
QObject.connect(self.inLine1, SIGNAL("currentIndexChanged(QString)"), self.update1)
QObject.connect(self.inLine2, SIGNAL("currentIndexChanged(QString)"), self.update2)
self.inLine1.blockSignals( False )
self.inLine2.blockSignals( False )
self.inLine1.addItems(layers)
self.inLine2.addItems(layers)

Expand Down
14 changes: 7 additions & 7 deletions src/app/qgsrasterlayerproperties.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer* lyr, QgsMapCanv
mColormapTreeWidget->setHeaderLabels( headerLabels );

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

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

if ( theText == tr( "Pseudocolor" ) || theText == tr( "Freak Out" ) )
{
tabPageColormap->setEnabled( false );
tabBar->setTabEnabled( tabBar->indexOf( tabPageColormap ), false );
rbtnSingleBandMinMax->setEnabled( false );
rbtnSingleBandStdDev->setEnabled( true );
sboxSingleBandStdDev->setEnabled( true );
Expand All @@ -1736,7 +1736,7 @@ void QgsRasterLayerProperties::on_cboxColorMap_currentIndexChanged( const QStrin
}
else if ( theText == tr( "Colormap" ) )
{
tabPageColormap->setEnabled( true );
tabBar->setTabEnabled( tabBar->indexOf( tabPageColormap ), true );
rbtnSingleBandMinMax->setEnabled( false );
rbtnSingleBandStdDev->setEnabled( false );
sboxSingleBandStdDev->setEnabled( false );
Expand All @@ -1746,7 +1746,7 @@ void QgsRasterLayerProperties::on_cboxColorMap_currentIndexChanged( const QStrin
}
else if ( theText == tr( "User Defined" ) )
{
tabPageColormap->setEnabled( false );
tabBar->setTabEnabled( tabBar->indexOf( tabPageColormap ), false );
rbtnSingleBandMinMax->setEnabled( true );
rbtnSingleBandStdDev->setEnabled( true );
sboxSingleBandStdDev->setEnabled( true );
Expand All @@ -1756,7 +1756,7 @@ void QgsRasterLayerProperties::on_cboxColorMap_currentIndexChanged( const QStrin
}
else
{
tabPageColormap->setEnabled( false );
tabBar->setTabEnabled( tabBar->indexOf( tabPageColormap ), false );
rbtnSingleBandMinMax->setEnabled( true );
rbtnSingleBandStdDev->setEnabled( true );
sboxSingleBandStdDev->setEnabled( true );
Expand Down Expand Up @@ -2136,7 +2136,7 @@ void QgsRasterLayerProperties::on_rbtnSingleBand_toggled( bool theState )

if ( cboxColorMap->currentText() == tr( "Pseudocolor" ) )
{
tabPageColormap->setEnabled( true );
tabBar->setTabEnabled( tabBar->indexOf( tabPageColormap ), true );
}

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

grpRgbBands->setEnabled( true );

Expand Down
6 changes: 3 additions & 3 deletions src/ui/qgsnewspatialitelayerdialogbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>430</width>
<height>574</height>
<width>412</width>
<height>587</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
Expand Down Expand Up @@ -231,7 +231,7 @@
<string>Specify the coordinate reference system of the layer's geometry.</string>
</property>
<property name="text">
<string>Find SRID</string>
<string>Specify CRS</string>
</property>
</widget>
</item>
Expand Down
Loading