Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #3688 from mhugo/fix_15737
Don't delete QgsAttributeDialog too early. Fixes #15737
  • Loading branch information
Hugo Mercier committed Oct 28, 2016
2 parents 7a05a7a + 9ecdf61 commit 9166142
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 18 deletions.
30 changes: 19 additions & 11 deletions src/app/qgsfeatureaction.cpp
Expand Up @@ -102,7 +102,9 @@ bool QgsFeatureAction::viewFeatureForm( QgsHighlight *h )

QgsAttributeDialog *dialog = newDialog( true );
dialog->setHighlight( h );
dialog->show(); // will also delete the dialog on close (show() is overridden)
// delete the dialog when it is closed
dialog->setAttribute( Qt::WA_DeleteOnClose );
dialog->show();

return true;
}
Expand All @@ -112,22 +114,27 @@ bool QgsFeatureAction::editFeature( bool showModal )
if ( !mLayer )
return false;

QgsAttributeDialog *dialog = newDialog( false );

if ( !mFeature->isValid() )
dialog->setMode( QgsAttributeForm::AddFeatureMode );

if ( showModal )
{
dialog->setAttribute( Qt::WA_DeleteOnClose );
int rv = dialog->exec();
QScopedPointer<QgsAttributeDialog> dialog( newDialog( false ) );

if ( !mFeature->isValid() )
dialog->setMode( QgsAttributeForm::AddFeatureMode );

int rv = dialog->exec();
mFeature->setAttributes( dialog->feature()->attributes() );
return rv;
}
else
{
dialog->show(); // will also delete the dialog on close (show() is overridden)
QgsAttributeDialog* dialog = newDialog( false );

if ( !mFeature->isValid() )
dialog->setMode( QgsAttributeForm::AddFeatureMode );

// delete the dialog when it is closed
dialog->setAttribute( Qt::WA_DeleteOnClose );
dialog->show();
}

return true;
Expand Down Expand Up @@ -204,6 +211,8 @@ bool QgsFeatureAction::addFeature( const QgsAttributeMap& defaultAttributes, boo
else
{
QgsAttributeDialog *dialog = newDialog( false );
// delete the dialog when it is closed
dialog->setAttribute( Qt::WA_DeleteOnClose );
dialog->setMode( QgsAttributeForm::AddFeatureMode );
dialog->setEditCommandMessage( text() );

Expand All @@ -212,12 +221,11 @@ bool QgsFeatureAction::addFeature( const QgsAttributeMap& defaultAttributes, boo
if ( !showModal )
{
setParent( dialog ); // keep dialog until the dialog is closed and destructed
dialog->show(); // will also delete the dialog on close (show() is overridden)
dialog->show();
mFeature = nullptr;
return true;
}

dialog->setAttribute( Qt::WA_DeleteOnClose );
dialog->exec();
}

Expand Down
5 changes: 1 addition & 4 deletions src/gui/qgsattributedialog.cpp
Expand Up @@ -69,11 +69,8 @@ void QgsAttributeDialog::accept()
QDialog::accept();
}

void QgsAttributeDialog::show( bool autoDelete )
void QgsAttributeDialog::show()
{
if ( autoDelete )
setAttribute( Qt::WA_DeleteOnClose );

QDialog::show();
raise();
activateWindow();
Expand Down
5 changes: 2 additions & 3 deletions src/gui/qgsattributedialog.h
Expand Up @@ -106,9 +106,8 @@ class GUI_EXPORT QgsAttributeDialog : public QDialog
void accept() override;
void reject() override;

//! Show the dialog non-blocking. Reparents this dialog to be a child of the dialog form and is deleted when
//! closed.
void show( bool autoDelete = true );
//! Show the dialog non-blocking. Reparents this dialog to be a child of the dialog form
void show();

private:
void init( QgsVectorLayer* layer, QgsFeature* feature, const QgsAttributeEditorContext& context, bool showDialogButtons );
Expand Down

0 comments on commit 9166142

Please sign in to comment.