UI Tidy ups

timlinux · timlinux · commit a640eb0295b3 · 2010-02-27T18:48:10.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12981 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/postgres/qgspgsourceselect.cpp b/src/app/postgres/qgspgsourceselect.cpp
@@ -81,7 +81,6 @@ QgsPgSourceSelect::QgsPgSourceSelect( QWidget *parent, Qt::WFlags fl )
                                      QAbstractItemView::ExtendedSelection :
                                      QAbstractItemView::MultiSelection );
 
-  mSearchGroupBox->hide();
 
   //for Qt < 4.3.2, passing -1 to include all model columns
   //in search does not seem to work
@@ -93,6 +92,16 @@ QgsPgSourceSelect::QgsPgSourceSelect( QWidget *parent, Qt::WFlags fl )
   {
     mTablesTreeView->setColumnWidth( i, settings.value( QString( "/Windows/PgSourceSelect/columnWidths/%1" ).arg( i ), mTablesTreeView->columnWidth( i ) ).toInt() );
   }
+
+  //hide the search options by default
+  //they will be shown when the user ticks 
+  //the search options group box
+  mSearchLabel->setVisible( false );
+  mSearchColumnComboBox->setVisible( false );
+  mSearchColumnsLabel->setVisible( false );
+  mSearchModeComboBox->setVisible( false );
+  mSearchModeLabel->setVisible( false );
+  mSearchTableEdit->setVisible( false );
 }
 /** Autoconnected SLOTS **/
 // Slot for adding a new connection
@@ -186,18 +195,6 @@ void QgsPgSourceSelect::on_mTablesTreeView_doubleClicked( const QModelIndex &ind
   }
 }
 
-void QgsPgSourceSelect::on_mSearchOptionsButton_clicked()
-{
-  if ( mSearchGroupBox->isVisible() )
-  {
-    mSearchGroupBox->hide();
-  }
-  else
-  {
-    mSearchGroupBox->show();
-  }
-}
-
 void QgsPgSourceSelect::on_mSearchTableEdit_textChanged( const QString & text )
 {
   if ( mSearchModeComboBox->currentText() == tr( "Wildcard" ) )
diff --git a/src/app/postgres/qgspgsourceselect.h b/src/app/postgres/qgspgsourceselect.h
@@ -135,7 +135,6 @@ class QgsPgSourceSelect : public QDialog, private Ui::QgsPgSourceSelectBase
     void on_btnSave_clicked();
     //! Loads the selected connections from the file
     void on_btnLoad_clicked();
-    void on_mSearchOptionsButton_clicked();
     void on_mSearchTableEdit_textChanged( const QString & text );
     void on_mSearchColumnComboBox_currentIndexChanged( const QString & text );
     void on_mSearchModeComboBox_currentIndexChanged( const QString & text );
