[QGIS Commit] r15285 - in trunk/qgis/src: app/postgres app/spatialite plugins/sqlanywhere

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-02-28 11:09:44 -0800 (Mon, 28 Feb 2011)
New Revision: 15285

Modified:
   trunk/qgis/src/app/postgres/qgspgsourceselect.cpp
   trunk/qgis/src/app/spatialite/qgsspatialitesourceselect.cpp
   trunk/qgis/src/plugins/sqlanywhere/sasourceselect.cpp
   trunk/qgis/src/plugins/sqlanywhere/sasourceselectbase.ui
Log:
db source select: move 'add' back to the first position in the button box

Modified: trunk/qgis/src/app/postgres/qgspgsourceselect.cpp
===================================================================
--- trunk/qgis/src/app/postgres/qgspgsourceselect.cpp	2011-02-28 17:01:13 UTC (rev 15284)
+++ trunk/qgis/src/app/postgres/qgspgsourceselect.cpp	2011-02-28 19:09:44 UTC (rev 15285)
@@ -51,16 +51,16 @@
 {
   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" ) );

Modified: trunk/qgis/src/app/spatialite/qgsspatialitesourceselect.cpp
===================================================================
--- trunk/qgis/src/app/spatialite/qgsspatialitesourceselect.cpp	2011-02-28 17:01:13 UTC (rev 15284)
+++ trunk/qgis/src/app/spatialite/qgsspatialitesourceselect.cpp	2011-02-28 19:09:44 UTC (rev 15285)
@@ -47,16 +47,16 @@
   connectionsGroupBox->setTitle( tr( "Databases" ) );
   btnEdit->hide();  // hide the edit button
 
+  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 );
 
-  mAddButton = new QPushButton( tr( "&Add" ) );
-  buttonBox->addButton( mAddButton, QDialogButtonBox::ActionRole );
-  connect( mAddButton, SIGNAL( clicked() ), this, SLOT( addClicked() ) );
-  mAddButton->setEnabled( false );
-
   populateConnectionList();
 
   mSearchModeComboBox->addItem( tr( "Wildcard" ) );

Modified: trunk/qgis/src/plugins/sqlanywhere/sasourceselect.cpp
===================================================================
--- trunk/qgis/src/plugins/sqlanywhere/sasourceselect.cpp	2011-02-28 17:01:13 UTC (rev 15284)
+++ trunk/qgis/src/plugins/sqlanywhere/sasourceselect.cpp	2011-02-28 19:09:44 UTC (rev 15285)
@@ -59,16 +59,16 @@
 {
   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::on_mTablesTreeView_clicked( const QModelIndex &index )
 {
-  btnBuildQuery->setEnabled( index.parent().isValid() );
+  mBuildQueryButton->setEnabled( index.parent().isValid() );
 }
 
 void SaSourceSelect::on_mTablesTreeView_doubleClicked( const QModelIndex &index )

Modified: trunk/qgis/src/plugins/sqlanywhere/sasourceselectbase.ui
===================================================================
--- trunk/qgis/src/plugins/sqlanywhere/sasourceselectbase.ui	2011-02-28 17:01:13 UTC (rev 15284)
+++ trunk/qgis/src/plugins/sqlanywhere/sasourceselectbase.ui	2011-02-28 19:09:44 UTC (rev 15285)
@@ -78,16 +78,6 @@
     </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" >
       <string>Search options</string>