Skip to content

Commit e7b7b93

Browse files
author
jef
committedMay 8, 2010

File tree

2 files changed

+14
-20
lines changed

2 files changed

+14
-20
lines changed
 

‎src/plugins/spatialquery/qgsspatialquerydialog.cpp

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ void QgsSpatialQueryDialog::runQuery()
190190
buttonBox->button( QDialogButtonBox::Close )->show();
191191
buttonBox->button( QDialogButtonBox::Cancel )->hide();
192192
buttonBox->button( QDialogButtonBox::Ok )->hide();
193+
adjustSize();
193194
} // void QgsSpatialQueryDialog::runQuery()
194195

195196
void QgsSpatialQueryDialog::setInputsVisible( bool show )
@@ -586,8 +587,19 @@ void QgsSpatialQueryDialog::on_buttonBox_accepted()
586587

587588
void QgsSpatialQueryDialog::on_buttonBox_rejected()
588589
{
589-
reject();
590-
590+
if ( grpResults->isHidden() )
591+
{
592+
reject();
593+
}
594+
else
595+
{
596+
grpResults->hide();
597+
setInputsVisible( true );
598+
progressBarStatus->show();
599+
buttonBox->button( QDialogButtonBox::Close )->hide();
600+
buttonBox->button( QDialogButtonBox::Cancel )->show();
601+
buttonBox->button( QDialogButtonBox::Ok )->show();
602+
}
591603
} // void QgsSpatialQueryDialog::on_buttonBox_rejected()
592604

593605
void QgsSpatialQueryDialog::on_targetLayerComboBox_currentIndexChanged( int index )

‎src/plugins/spatialquery/qgsspatialquerydialogbase.ui

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -315,22 +315,4 @@ p, li { white-space: pre-wrap; }
315315
</layout>
316316
</widget>
317317
<resources/>
318-
<connections>
319-
<connection>
320-
<sender>buttonBox</sender>
321-
<signal>rejected()</signal>
322-
<receiver>QgsSpatialQueryDialogBase</receiver>
323-
<slot>reject()</slot>
324-
<hints>
325-
<hint type="sourcelabel">
326-
<x>288</x>
327-
<y>438</y>
328-
</hint>
329-
<hint type="destinationlabel">
330-
<x>292</x>
331-
<y>459</y>
332-
</hint>
333-
</hints>
334-
</connection>
335-
</connections>
336318
</ui>

0 commit comments

Comments
 (0)
Please sign in to comment.