Skip to content

Commit 65884db

Browse files
authoredOct 22, 2018
Merge pull request #8251 from pblottiere/as_dd_red
Update data defined button on auxiliary field deletion correctly
2 parents b9ff49f + 16e0db4 commit 65884db

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed
 

‎src/app/qgsvectorlayerproperties.cpp

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1602,7 +1602,7 @@ void QgsVectorLayerProperties::showHelp()
16021602
}
16031603
}
16041604

1605-
void QgsVectorLayerProperties::updateAuxiliaryStoragePage( bool reset )
1605+
void QgsVectorLayerProperties::updateAuxiliaryStoragePage()
16061606
{
16071607
const QgsAuxiliaryLayer *alayer = mLayer->auxiliaryLayer();
16081608

@@ -1663,11 +1663,6 @@ void QgsVectorLayerProperties::updateAuxiliaryStoragePage( bool reset )
16631663
mAuxiliaryStorageFieldsLineEdit->setText( QString() );
16641664
mAuxiliaryStorageFeaturesLineEdit->setText( QString() );
16651665
}
1666-
1667-
if ( reset && labelingDialog )
1668-
{
1669-
labelingDialog->setLayer( mLayer );
1670-
}
16711666
}
16721667

16731668
void QgsVectorLayerProperties::onAuxiliaryLayerNew()
@@ -1680,7 +1675,7 @@ void QgsVectorLayerProperties::onAuxiliaryLayerNew()
16801675
QgsNewAuxiliaryLayerDialog dlg( mLayer, this );
16811676
if ( dlg.exec() == QDialog::Accepted )
16821677
{
1683-
updateAuxiliaryStoragePage( true );
1678+
updateAuxiliaryStoragePage();
16841679
}
16851680
}
16861681

@@ -1700,7 +1695,7 @@ void QgsVectorLayerProperties::onAuxiliaryLayerClear()
17001695
QApplication::setOverrideCursor( Qt::WaitCursor );
17011696
alayer->clear();
17021697
QApplication::restoreOverrideCursor();
1703-
updateAuxiliaryStoragePage( true );
1698+
updateAuxiliaryStoragePage();
17041699
mLayer->triggerRepaint();
17051700
}
17061701
}
@@ -1731,7 +1726,7 @@ void QgsVectorLayerProperties::onAuxiliaryLayerDelete()
17311726
mLayer->setAuxiliaryLayer(); // remove auxiliary layer
17321727
QgsAuxiliaryStorage::deleteTable( uri );
17331728
QApplication::restoreOverrideCursor();
1734-
updateAuxiliaryStoragePage( true );
1729+
updateAuxiliaryStoragePage();
17351730
mLayer->triggerRepaint();
17361731
}
17371732
}
@@ -1820,7 +1815,7 @@ void QgsVectorLayerProperties::deleteAuxiliaryField( int index )
18201815
labelingDialog->labelingGui()->deactivateField( static_cast<QgsPalLayerSettings::Property>( key ) );
18211816
}
18221817

1823-
updateAuxiliaryStoragePage( true );
1818+
updateAuxiliaryStoragePage();
18241819
mSourceFieldsPropertiesDialog->init();
18251820
}
18261821
else

‎src/app/qgsvectorlayerproperties.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ class APP_EXPORT QgsVectorLayerProperties : public QgsOptionsDialogBase, private
220220
//! Adds a new join to mJoinTreeWidget
221221
void addJoinToTreeWidget( const QgsVectorLayerJoinInfo &join, int insertIndex = -1 );
222222

223-
void updateAuxiliaryStoragePage( bool reset = false );
223+
void updateAuxiliaryStoragePage();
224224
void deleteAuxiliaryField( int index );
225225

226226
QgsExpressionContext mContext;

0 commit comments

Comments
 (0)
Please sign in to comment.