Skip to content
Permalink
Browse files

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

  • Loading branch information
volaya committed Oct 14, 2012
2 parents cdb9abd + d06203b commit 2754df0b48543410e166197956f174c53847451f
@@ -126,6 +126,8 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
}
else
{
labelingDialog = 0;
labelDialog = 0;
tabWidget->setTabEnabled( 1, false ); // hide labeling item
tabWidget->setTabEnabled( 2, false ); // hide labeling (deprecated) item
}
@@ -705,7 +707,8 @@ QgsVectorLayer::EditType QgsVectorLayerProperties::editTypeFromButtonText( QStri

void QgsVectorLayerProperties::apply()
{
labelingDialog->apply();
if ( labelingDialog )
labelingDialog->apply();

//
// Set up sql subset query if applicable
@@ -749,7 +752,8 @@ void QgsVectorLayerProperties::apply()

actionDialog->apply();

labelDialog->apply();
if ( labelDialog )
labelDialog->apply();
layer->enableLabels( labelCheckBox->isChecked() );
layer->setLayerName( displayName() );

@@ -155,7 +155,7 @@ QgsPalLayerSettings::QgsPalLayerSettings()
yOffset = 0;
angleOffset = 0;
centroidWhole = false;
//textFont = QFont();
textFont = QApplication::font();
textNamedStyle = QString( "" );
textColor = Qt::black;
textTransp = 0;
@@ -363,6 +363,8 @@ void QgsPalLayerSettings::readFromLayer( QgsVectorLayer* layer )
if ( layer->customProperty( "labeling" ).toString() != QString( "pal" ) )
return; // there's no information available

// NOTE: set defaults for newly added properties, for backwards compatibility

fieldName = layer->customProperty( "labeling/fieldName" ).toString();
isExpression = layer->customProperty( "labeling/isExpression" ).toBool();
placement = ( Placement ) layer->customProperty( "labeling/placement" ).toInt();
@@ -373,7 +375,7 @@ void QgsPalLayerSettings::readFromLayer( QgsVectorLayer* layer )
yOffset = layer->customProperty( "labeling/yOffset", QVariant( 0.0 ) ).toDouble();
angleOffset = layer->customProperty( "labeling/angleOffset", QVariant( 0.0 ) ).toDouble();
centroidWhole = layer->customProperty( "labeling/centroidWhole", QVariant( false ) ).toBool();
QString fontFamily = layer->customProperty( "labeling/fontFamily" ).toString();
QString fontFamily = layer->customProperty( "labeling/fontFamily", QVariant( QApplication::font().family() ) ).toString();
double fontSize = layer->customProperty( "labeling/fontSize" ).toDouble();
int fontWeight = layer->customProperty( "labeling/fontWeight" ).toInt();
bool fontItalic = layer->customProperty( "labeling/fontItalic" ).toBool();
@@ -57,6 +57,7 @@ class CORE_EXPORT QgsRasterIterator
@param bandNumber band to read
@param nCols number of columns on output device
@param nRows number of rows on output device
@param block address of block pointer
@param topLeftCol top left column
@param topLeftRow top left row
@return false if the last part was already returned*/
@@ -1025,7 +1025,9 @@ void QgsPostgresConn::retrieveLayerTypes( QgsPostgresLayerProperty &layerPropert

if ( !layerProperty.schemaName.isEmpty() )
{
table = QString( "%1.%2" ).arg( quotedIdentifier( layerProperty.schemaName ) ).arg( layerProperty.tableName );
table = QString( "%1.%2" )
.arg( quotedIdentifier( layerProperty.schemaName ) )
.arg( quotedIdentifier( layerProperty.tableName ) );
}
else
{
@@ -158,7 +158,7 @@ void QgsTileScaleWidget::showTileScale( QMainWindow *mainWindow )

dock->setWidget( tws );

connect( dock->toggleViewAction(), SIGNAL( triggered( bool ) ), tws, SLOT( scaleEnabled( bool ) ) );
connect( dock, SIGNAL( visibilityChanged( bool ) ), tws, SLOT( scaleEnabled( bool ) ) );

QSettings settings;
dock->setVisible( settings.value( "/UI/tileScaleEnabled", false ).toBool() );

0 comments on commit 2754df0

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