Skip to content
Permalink
Browse files
apply #2634
git-svn-id: http://svn.osgeo.org/qgis/trunk@13441 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed May 8, 2010
1 parent 46285a2 commit 062f329c0745449675552b8ce205f2b1cd83ea76
@@ -190,6 +190,7 @@ void QgsSpatialQueryDialog::runQuery()
buttonBox->button( QDialogButtonBox::Close )->show();
buttonBox->button( QDialogButtonBox::Cancel )->hide();
buttonBox->button( QDialogButtonBox::Ok )->hide();
adjustSize();
} // void QgsSpatialQueryDialog::runQuery()

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

void QgsSpatialQueryDialog::on_buttonBox_rejected()
{
reject();

if ( grpResults->isHidden() )
{
reject();
}
else
{
grpResults->hide();
setInputsVisible( true );
progressBarStatus->show();
buttonBox->button( QDialogButtonBox::Close )->hide();
buttonBox->button( QDialogButtonBox::Cancel )->show();
buttonBox->button( QDialogButtonBox::Ok )->show();
}
} // void QgsSpatialQueryDialog::on_buttonBox_rejected()

void QgsSpatialQueryDialog::on_targetLayerComboBox_currentIndexChanged( int index )
@@ -315,22 +315,4 @@ p, li { white-space: pre-wrap; }
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>QgsSpatialQueryDialogBase</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>288</x>
<y>438</y>
</hint>
<hint type="destinationlabel">
<x>292</x>
<y>459</y>
</hint>
</hints>
</connection>
</connections>
</ui>

0 comments on commit 062f329

Please sign in to comment.