db source select: move 'add' back to the first position in the button…

… box git-svn-id: http://svn.osgeo.org/qgis/trunk@15285 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 28, 2011 · f8789e4 · f8789e4
1 parent ebc2629
commit f8789e4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 25 deletions.
diff --git a/src/app/postgres/qgspgsourceselect.cpp b/src/app/postgres/qgspgsourceselect.cpp
@@ -51,16 +51,16 @@ QgsPgSourceSelect::QgsPgSourceSelect( QWidget *parent, Qt::WFlags fl )
 {
   setupUi( this );
 
+  mAddButton = new QPushButton( tr( "&Add" ) );
+  buttonBox->addButton( mAddButton, QDialogButtonBox::ActionRole );
+  connect( mAddButton, SIGNAL( clicked() ), this, SLOT( addTables() ) );
+
   mBuildQueryButton = new QPushButton( tr( "&Build query" ) );
   mBuildQueryButton->setToolTip( tr( "Build query" ) );
   buttonBox->addButton( mBuildQueryButton, QDialogButtonBox::ActionRole );
   connect( mBuildQueryButton, SIGNAL( clicked() ), this, SLOT( buildQuery() ) );
   mBuildQueryButton->setDisabled( true );
 
-  mAddButton = new QPushButton( tr( "&Add" ) );
-  buttonBox->addButton( mAddButton, QDialogButtonBox::ActionRole );
-  connect( mAddButton, SIGNAL( clicked() ), this, SLOT( addTables() ) );
-
   QPushButton *pb;
   pb = new QPushButton( tr( "&Save" ) );
   pb->setToolTip( tr( "Save connections" ) );

diff --git a/src/app/spatialite/qgsspatialitesourceselect.cpp b/src/app/spatialite/qgsspatialitesourceselect.cpp
@@ -47,16 +47,16 @@ 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() ) );
   mAddButton->setEnabled( false );
 
+  mBuildQueryButton = new QPushButton( tr( "&Build Query" ) );
+  buttonBox->addButton( mBuildQueryButton, QDialogButtonBox::ActionRole );
+  connect( mBuildQueryButton, SIGNAL( clicked() ), this, SLOT( buildQuery() ) );
+  mBuildQueryButton->setEnabled( false );
+
   populateConnectionList();
 
   mSearchModeComboBox->addItem( tr( "Wildcard" ) );

diff --git a/src/plugins/sqlanywhere/sasourceselect.cpp b/src/plugins/sqlanywhere/sasourceselect.cpp
@@ -59,16 +59,16 @@ SaSourceSelect::SaSourceSelect( QWidget *parent, Qt::WFlags fl )
 {
   setupUi( this );
 
+  mAddButton = new QPushButton( tr( "&Add" ) );
+  buttonBox->addButton( mAddButton, QDialogButtonBox::ActionRole );
+  connect( mAddButton, SIGNAL( clicked() ), this, SLOT( addTables() ) );
+  mAddButton->setEnabled( false );
+
   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() ) );
-
-  mAddButton->setEnabled( false );
   populateConnectionList();
 
   mSearchModeComboBox->addItem( tr( "Wildcard" ) );
@@ -180,7 +180,7 @@ void SaSourceSelect::buildQuery()
 
 void SaSourceSelect::on_mTablesTreeView_clicked( const QModelIndex &index )
 {
-  btnBuildQuery->setEnabled( index.parent().isValid() );
+  mBuildQueryButton->setEnabled( index.parent().isValid() );
 }
 
 void SaSourceSelect::on_mTablesTreeView_doubleClicked( const QModelIndex &index )

diff --git a/src/plugins/sqlanywhere/sasourceselectbase.ui b/src/plugins/sqlanywhere/sasourceselectbase.ui
@@ -77,16 +77,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" >