apply #2634

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13441 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · May 8, 2010 · e7b7b93 · e7b7b93
1 parent eeabb9c
commit e7b7b93
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/src/plugins/spatialquery/qgsspatialquerydialog.cpp b/src/plugins/spatialquery/qgsspatialquerydialog.cpp
@@ -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 )

diff --git a/src/plugins/spatialquery/qgsspatialquerydialogbase.ui b/src/plugins/spatialquery/qgsspatialquerydialogbase.ui
@@ -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>