database source select: 'move build query' to button box

jef · jef · commit de2ffe11cf1b · 2011-02-28T17:00:46.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@15283 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/spatialite/qgsspatialitesourceselect.cpp b/src/app/spatialite/qgsspatialitesourceselect.cpp
@@ -47,6 +47,11 @@ QgsSpatiaLiteSourceSelect::QgsSpatiaLiteSourceSelect( QgisApp * app, Qt::WFlags
   connectionsGroupBox->setTitle( tr( "Databases" ) );
   btnEdit->hide();  // hide the edit button
 
+  mBuildQueryButton = new QPushButton( tr( "&Build Query" ) );
+  buttonBox->addButton( mBuildQueryButton, QDialogButtonBox::ActionRole );
+  connect( mBuildQueryButton, SIGNAL( clicked() ), this, SLOT( buildQuery() ) );
+  mBuildQueryButton->setEnabled( false );
+
   mAddButton = new QPushButton( tr( "&Add" ) );
   buttonBox->addButton( mAddButton, QDialogButtonBox::ActionRole );
   connect( mAddButton, SIGNAL( clicked() ), this, SLOT( addClicked() ) );
@@ -101,14 +106,14 @@ void QgsSpatiaLiteSourceSelect::on_cmbConnections_activated( int )
   dbChanged();
 }
 
-void QgsSpatiaLiteSourceSelect::on_btnBuildQuery_clicked()
+void QgsSpatiaLiteSourceSelect::buildQuery()
 {
   setSql( mTablesTreeView->currentIndex() );
 }
 
 void QgsSpatiaLiteSourceSelect::on_mTablesTreeView_clicked( const QModelIndex &index )
 {
-  btnBuildQuery->setEnabled( index.parent().isValid() );
+  mBuildQueryButton->setEnabled( index.parent().isValid() );
 }
 
 void QgsSpatiaLiteSourceSelect::on_mTablesTreeView_doubleClicked( const QModelIndex &index )
diff --git a/src/app/spatialite/qgsspatialitesourceselect.h b/src/app/spatialite/qgsspatialitesourceselect.h
@@ -76,10 +76,10 @@ class QgsSpatiaLiteSourceSelect: public QDialog, private Ui::QgsDbSourceSelectBa
      * Once connected, available layers are displayed.
      */
     void on_btnConnect_clicked();
+    void buildQuery();
     void addClicked();
     //! Opens the create connection dialog to build a new connection
     void on_btnNew_clicked();
-    void on_btnBuildQuery_clicked();
     //! Deletes the selected connection
     void on_btnDelete_clicked();
     void on_mSearchTableEdit_textChanged( const QString & text );
@@ -151,6 +151,7 @@ class QgsSpatiaLiteSourceSelect: public QDialog, private Ui::QgsDbSourceSelectBa
     QgsDbFilterProxyModel mProxyModel;
 
     QString layerURI( const QModelIndex &index );
+    QPushButton *mBuildQueryButton;
     QPushButton *mAddButton;
 };
 
diff --git a/src/plugins/sqlanywhere/sasourceselect.cpp b/src/plugins/sqlanywhere/sasourceselect.cpp
@@ -59,6 +59,11 @@ SaSourceSelect::SaSourceSelect( QWidget *parent, Qt::WFlags fl )
 {
   setupUi( this );
 
+  mBuildQueryButton = new QPushButton( tr( "&Build Query" ) );
+  buttonBox->addButton( mBuildQueryButton, QDialogButtonBox::ActionRole );
+  connect( mBuildQueryButton, SIGNAL( clicked() ), this, SLOT( buildQuery() ) );
+  mBuildQueryButton->setEnabled( false );
+
   mAddButton = new QPushButton( tr( "&Add" ) );
   buttonBox->addButton( mAddButton, QDialogButtonBox::ActionRole );
   connect( mAddButton, SIGNAL( clicked() ), this, SLOT( addTables() ) );
@@ -168,7 +173,7 @@ void SaSourceSelect::on_cmbConnections_activated( int )
   settings.setValue( "/SQLAnywhere/connections/selected", cmbConnections->currentText() );
 }
 
-void SaSourceSelect::on_btnBuildQuery_clicked()
+void SaSourceSelect::buildQuery()
 {
   setSql( mTablesTreeView->currentIndex() );
 }
diff --git a/src/plugins/sqlanywhere/sasourceselect.h b/src/plugins/sqlanywhere/sasourceselect.h
@@ -114,6 +114,7 @@ class SaSourceSelect : public QDialog, private Ui::SaSourceSelectBase
   public slots:
     //! Determines the tables the user selected and closes the dialog
     void addTables();
+    void buildQuery();
 
     /*! Connects to the database using the stored connection parameters.
     * Once connected, available layers are displayed.
@@ -123,7 +124,6 @@ class SaSourceSelect : public QDialog, private Ui::SaSourceSelectBase
     void on_btnNew_clicked();
     //! Opens a dialog to edit an existing connection
     void on_btnEdit_clicked();
-    void on_btnBuildQuery_clicked();
     //! Deletes the selected connection
     void on_btnDelete_clicked();
     void on_mSearchTableEdit_textChanged( const QString & text );
@@ -183,6 +183,9 @@ class SaSourceSelect : public QDialog, private Ui::SaSourceSelectBase
     SaDbTableModel mTableModel;
     SaDbFilterProxyModel mProxyModel;
 
+    // button for building queries
+    QPushButton *mBuildQueryButton;
+
     // button for adding layers
     QPushButton *mAddButton;
 };
diff --git a/src/ui/qgsdbsourceselectbase.ui b/src/ui/qgsdbsourceselectbase.ui
@@ -83,16 +83,6 @@
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="QPushButton" name="btnBuildQuery">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="text">
-      <string>Build query</string>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="QGroupBox" name="mSearchGroupBox">
      <property name="title">

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,11 @@ QgsSpatiaLiteSourceSelect::QgsSpatiaLiteSourceSelect( QgisApp * app, Qt::WFlags`
`47`	`47`	`connectionsGroupBox->setTitle( tr( "Databases" ) );`
`48`	`48`	`btnEdit->hide(); // hide the edit button`
`49`	`49`
	`50`	`+ mBuildQueryButton = new QPushButton( tr( "&Build Query" ) );`
	`51`	`+ buttonBox->addButton( mBuildQueryButton, QDialogButtonBox::ActionRole );`
	`52`	`+ connect( mBuildQueryButton, SIGNAL( clicked() ), this, SLOT( buildQuery() ) );`
	`53`	`+ mBuildQueryButton->setEnabled( false );`
	`54`	`+`
`50`	`55`	`mAddButton = new QPushButton( tr( "&Add" ) );`
`51`	`56`	`buttonBox->addButton( mAddButton, QDialogButtonBox::ActionRole );`
`52`	`57`	`connect( mAddButton, SIGNAL( clicked() ), this, SLOT( addClicked() ) );`
`@@ -101,14 +106,14 @@ void QgsSpatiaLiteSourceSelect::on_cmbConnections_activated( int )`
`101`	`106`	`dbChanged();`
`102`	`107`	`}`
`103`	`108`
`104`		`-void QgsSpatiaLiteSourceSelect::on_btnBuildQuery_clicked()`
	`109`	`+void QgsSpatiaLiteSourceSelect::buildQuery()`
`105`	`110`	`{`
`106`	`111`	`setSql( mTablesTreeView->currentIndex() );`
`107`	`112`	`}`
`108`	`113`
`109`	`114`	`void QgsSpatiaLiteSourceSelect::on_mTablesTreeView_clicked( const QModelIndex &index )`
`110`	`115`	`{`
`111`		`- btnBuildQuery->setEnabled( index.parent().isValid() );`
	`116`	`+ mBuildQueryButton->setEnabled( index.parent().isValid() );`
`112`	`117`	`}`
`113`	`118`
`114`	`119`	`void QgsSpatiaLiteSourceSelect::on_mTablesTreeView_doubleClicked( const QModelIndex &index )`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,11 @@ SaSourceSelect::SaSourceSelect( QWidget *parent, Qt::WFlags fl )`
`59`	`59`	`{`
`60`	`60`	`setupUi( this );`
`61`	`61`
	`62`	`+ mBuildQueryButton = new QPushButton( tr( "&Build Query" ) );`
	`63`	`+ buttonBox->addButton( mBuildQueryButton, QDialogButtonBox::ActionRole );`
	`64`	`+ connect( mBuildQueryButton, SIGNAL( clicked() ), this, SLOT( buildQuery() ) );`
	`65`	`+ mBuildQueryButton->setEnabled( false );`
	`66`	`+`
`62`	`67`	`mAddButton = new QPushButton( tr( "&Add" ) );`
`63`	`68`	`buttonBox->addButton( mAddButton, QDialogButtonBox::ActionRole );`
`64`	`69`	`connect( mAddButton, SIGNAL( clicked() ), this, SLOT( addTables() ) );`
`@@ -168,7 +173,7 @@ void SaSourceSelect::on_cmbConnections_activated( int )`
`168`	`173`	`settings.setValue( "/SQLAnywhere/connections/selected", cmbConnections->currentText() );`
`169`	`174`	`}`
`170`	`175`
`171`		`-void SaSourceSelect::on_btnBuildQuery_clicked()`
	`176`	`+void SaSourceSelect::buildQuery()`
`172`	`177`	`{`
`173`	`178`	`setSql( mTablesTreeView->currentIndex() );`
`174`	`179`	`}`