sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8251 from pblottiere/as_dd_red

Browse Source 
Update data defined button on auxiliary field deletion correctly
This commit is contained in:
Blottiere Paul 2018-10-22 17:58:21 +01:00 committed by GitHub
commit 65884dbc28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/qgsvectorlayerproperties.cpp
View File

@ -1602,7 +1602,7 @@ void QgsVectorLayerProperties::showHelp()
}
}
void QgsVectorLayerProperties::updateAuxiliaryStoragePage( bool reset )
void QgsVectorLayerProperties::updateAuxiliaryStoragePage()
{
const QgsAuxiliaryLayer *alayer = mLayer->auxiliaryLayer();
@ -1663,11 +1663,6 @@ void QgsVectorLayerProperties::updateAuxiliaryStoragePage( bool reset )
mAuxiliaryStorageFieldsLineEdit->setText( QString() );
mAuxiliaryStorageFeaturesLineEdit->setText( QString() );
}
if ( reset && labelingDialog )
{
labelingDialog->setLayer( mLayer );
}
}
void QgsVectorLayerProperties::onAuxiliaryLayerNew()
@ -1680,7 +1675,7 @@ void QgsVectorLayerProperties::onAuxiliaryLayerNew()
QgsNewAuxiliaryLayerDialog dlg( mLayer, this );
if ( dlg.exec() == QDialog::Accepted )
{
updateAuxiliaryStoragePage( true );
updateAuxiliaryStoragePage();
}
}
@ -1700,7 +1695,7 @@ void QgsVectorLayerProperties::onAuxiliaryLayerClear()
QApplication::setOverrideCursor( Qt::WaitCursor );
alayer->clear();
QApplication::restoreOverrideCursor();
updateAuxiliaryStoragePage( true );
updateAuxiliaryStoragePage();
mLayer->triggerRepaint();
}
}
@ -1731,7 +1726,7 @@ void QgsVectorLayerProperties::onAuxiliaryLayerDelete()
mLayer->setAuxiliaryLayer(); // remove auxiliary layer
QgsAuxiliaryStorage::deleteTable( uri );
QApplication::restoreOverrideCursor();
updateAuxiliaryStoragePage( true );
updateAuxiliaryStoragePage();
mLayer->triggerRepaint();
}
}
@ -1820,7 +1815,7 @@ void QgsVectorLayerProperties::deleteAuxiliaryField( int index )
labelingDialog->labelingGui()->deactivateField( static_cast<QgsPalLayerSettings::Property>( key ) );
}
updateAuxiliaryStoragePage( true );
updateAuxiliaryStoragePage();
mSourceFieldsPropertiesDialog->init();
}
else

2
src/app/qgsvectorlayerproperties.h
View File

@ -220,7 +220,7 @@ class APP_EXPORT QgsVectorLayerProperties : public QgsOptionsDialogBase, private
//! Adds a new join to mJoinTreeWidget
void addJoinToTreeWidget( const QgsVectorLayerJoinInfo &join, int insertIndex = -1 );
void updateAuxiliaryStoragePage( bool reset = false );
void updateAuxiliaryStoragePage();
void deleteAuxiliaryField( int index );
QgsExpressionContext mContext;