@@ -1602,7 +1602,7 @@ void QgsVectorLayerProperties::showHelp()
1602
1602
}
1603
1603
}
1604
1604
1605
- void QgsVectorLayerProperties::updateAuxiliaryStoragePage ( bool reset )
1605
+ void QgsVectorLayerProperties::updateAuxiliaryStoragePage ()
1606
1606
{
1607
1607
const QgsAuxiliaryLayer *alayer = mLayer ->auxiliaryLayer ();
1608
1608
@@ -1663,11 +1663,6 @@ void QgsVectorLayerProperties::updateAuxiliaryStoragePage( bool reset )
1663
1663
mAuxiliaryStorageFieldsLineEdit ->setText ( QString () );
1664
1664
mAuxiliaryStorageFeaturesLineEdit ->setText ( QString () );
1665
1665
}
1666
-
1667
- if ( reset && labelingDialog )
1668
- {
1669
- labelingDialog->setLayer ( mLayer );
1670
- }
1671
1666
}
1672
1667
1673
1668
void QgsVectorLayerProperties::onAuxiliaryLayerNew ()
@@ -1680,7 +1675,7 @@ void QgsVectorLayerProperties::onAuxiliaryLayerNew()
1680
1675
QgsNewAuxiliaryLayerDialog dlg ( mLayer , this );
1681
1676
if ( dlg.exec () == QDialog::Accepted )
1682
1677
{
1683
- updateAuxiliaryStoragePage ( true );
1678
+ updateAuxiliaryStoragePage ();
1684
1679
}
1685
1680
}
1686
1681
@@ -1700,7 +1695,7 @@ void QgsVectorLayerProperties::onAuxiliaryLayerClear()
1700
1695
QApplication::setOverrideCursor ( Qt::WaitCursor );
1701
1696
alayer->clear ();
1702
1697
QApplication::restoreOverrideCursor ();
1703
- updateAuxiliaryStoragePage ( true );
1698
+ updateAuxiliaryStoragePage ();
1704
1699
mLayer ->triggerRepaint ();
1705
1700
}
1706
1701
}
@@ -1731,7 +1726,7 @@ void QgsVectorLayerProperties::onAuxiliaryLayerDelete()
1731
1726
mLayer ->setAuxiliaryLayer (); // remove auxiliary layer
1732
1727
QgsAuxiliaryStorage::deleteTable ( uri );
1733
1728
QApplication::restoreOverrideCursor ();
1734
- updateAuxiliaryStoragePage ( true );
1729
+ updateAuxiliaryStoragePage ();
1735
1730
mLayer ->triggerRepaint ();
1736
1731
}
1737
1732
}
@@ -1820,7 +1815,7 @@ void QgsVectorLayerProperties::deleteAuxiliaryField( int index )
1820
1815
labelingDialog->labelingGui ()->deactivateField ( static_cast <QgsPalLayerSettings::Property>( key ) );
1821
1816
}
1822
1817
1823
- updateAuxiliaryStoragePage ( true );
1818
+ updateAuxiliaryStoragePage ();
1824
1819
mSourceFieldsPropertiesDialog ->init ();
1825
1820
}
1826
1821
else
0 commit comments