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

Do not change property widget status if the dialog is rejected

Browse Source 
refs #16766
This commit is contained in:
Harrissou Sant-anna 2017-11-25 14:34:21 +01:00 committed by Nyall Dawson
parent 731b57c8a7
commit 4f9e2a5f29
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/qgspropertyoverridebutton.cpp
View File

@ -639,16 +639,18 @@ void QgsPropertyOverrideButton::showAssistant()
connect( buttonBox, &QDialogButtonBox::rejected, dlg, &QDialog::reject ); connect( buttonBox, &QDialogButtonBox::rejected, dlg, &QDialog::reject );
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsPropertyOverrideButton::showHelp ); connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsPropertyOverrideButton::showHelp );
dlg->layout()->addWidget( buttonBox ); dlg->layout()->addWidget( buttonBox );
dlg->exec();
if ( dlg->exec() == QDialog::Accepted )
{
widget->updateProperty( mProperty );
mExpressionString = mProperty.asExpression();
mFieldName = mProperty.field();
widget->acceptPanel();
updateGui();
emit changed();
}
settings.setValue( key, dlg->saveGeometry() ); settings.setValue( key, dlg->saveGeometry() );
widget->updateProperty( mProperty );
mExpressionString = mProperty.asExpression();
mFieldName = mProperty.field();
widget->acceptPanel();
updateGui();
emit changed();
} }
} }