[QGIS Commit] r13441 - trunk/qgis/src/plugins/spatialquery

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-05-08 15:07:12 -0400 (Sat, 08 May 2010)
New Revision: 13441

Modified:
   trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.cpp
   trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialogbase.ui
Log:
apply #2634

Modified: trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.cpp
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.cpp	2010-05-08 15:53:24 UTC (rev 13440)
+++ trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.cpp	2010-05-08 19:07:12 UTC (rev 13441)
@@ -190,6 +190,7 @@
   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_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 )

Modified: trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialogbase.ui
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialogbase.ui	2010-05-08 15:53:24 UTC (rev 13440)
+++ trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialogbase.ui	2010-05-08 19:07:12 UTC (rev 13441)
@@ -315,22 +315,4 @@
   </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>