Skip to content
Permalink
Browse files

Merge pull request #8251 from pblottiere/as_dd_red

Update data defined button on auxiliary field deletion correctly
  • Loading branch information
pblottiere committed Oct 22, 2018
2 parents b9ff49f + 16e0db4 commit 65884dbc2835fb44ae94c3f68fa88f8e4e4cf00b
Showing with 6 additions and 11 deletions.
  1. +5 −10 src/app/qgsvectorlayerproperties.cpp
  2. +1 −1 src/app/qgsvectorlayerproperties.h
@@ -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
@@ -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;

0 comments on commit 65884db

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