Showing with 6 additions and 2 deletions.
  1. +4 −2 src/app/qgsvectorlayerproperties.cpp
  2. +2 −0 src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp
6 changes: 4 additions & 2 deletions src/app/qgsvectorlayerproperties.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
if ( layer->hasGeometryType() )
{
// Create the Labeling dialog tab
layout= new QVBoxLayout( labelingFrame );
layout = new QVBoxLayout( labelingFrame );
layout->setMargin( 0 );
labelingDialog = new QgsLabelingGui( QgisApp::instance()->palLabeling(), layer, QgisApp::instance()->mapCanvas(), labelingFrame );
layout->addWidget( labelingDialog );
Expand Down Expand Up @@ -470,10 +470,12 @@ void QgsVectorLayerProperties::updateButtons()
}
else
{
int cap = layer->dataProvider()->capabilities();
bool canChangeAttributes = cap & QgsVectorDataProvider::ChangeAttributeValues;
mAddAttributeButton->setEnabled( false );
mDeleteAttributeButton->setEnabled( false );
mToggleEditingButton->setChecked( false );
mToggleEditingButton->setEnabled( false );
mToggleEditingButton->setEnabled( canChangeAttributes && !layer->isReadOnly() );
mCalculateFieldButton->setEnabled( false );
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ QgsStyleV2ExportImportDialog::QgsStyleV2ExportImportDialog( QgsStyleV2* style, Q

if ( mDialogMode == Import )
{
setWindowTitle( tr( "Import style(s)" ) );
// populate the import types
importTypeCombo->addItem( "file specified below", QVariant( "file" ) );
// importTypeCombo->addItem( "official QGIS repo online", QVariant( "official" ) );
Expand All @@ -79,6 +80,7 @@ QgsStyleV2ExportImportDialog::QgsStyleV2ExportImportDialog( QgsStyleV2* style, Q
}
else
{
setWindowTitle( tr( "Export style(s)" ) );
// hide import specific controls when exporting
btnBrowse->setHidden( true );
fromLabel->setHidden( true );
Expand Down