diff --git a/src/app/qgspgsourceselect.cpp b/src/app/qgspgsourceselect.cpp index aaa0748f380..4c8593a8b2f 100644 --- a/src/app/qgspgsourceselect.cpp +++ b/src/app/qgspgsourceselect.cpp @@ -43,7 +43,12 @@ QgsPgSourceSelect::QgsPgSourceSelect( QWidget *parent, Qt::WFlags fl ) : QDialog( parent, fl ), mColumnTypeThread( NULL ), pd( 0 ) { setupUi( this ); - btnAdd->setEnabled( false ); + mAddButton = new QPushButton( tr( "&Add" ) ); + buttonBox->addButton( mAddButton, QDialogButtonBox::ActionRole ); + connect( mAddButton,SIGNAL( clicked() ), this, SLOT( addClicked() ) ); + connect( buttonBox,SIGNAL( helpRequested() ), this, SLOT( helpClicked() ) ); + + mAddButton->setEnabled( false ); populateConnectionList(); mSearchModeComboBox->addItem( tr( "Wildcard" ) ); @@ -92,7 +97,7 @@ void QgsPgSourceSelect::on_btnDelete_clicked() deleteConnection(); } // Slot for performing action when the Add button is clicked -void QgsPgSourceSelect::on_btnAdd_clicked() +void QgsPgSourceSelect::addClicked() { addTables(); } @@ -104,7 +109,7 @@ void QgsPgSourceSelect::on_btnEdit_clicked() } // Slot for showing help -void QgsPgSourceSelect::on_btnHelp_clicked() +void QgsPgSourceSelect::helpClicked() { showHelp(); } @@ -466,7 +471,7 @@ void QgsPgSourceSelect::on_btnConnect_clicked() } // BEGIN CHANGES ECOS if ( cmbConnections->count() > 0 ) - btnAdd->setEnabled( true ); + mAddButton->setEnabled( true ); // END CHANGES ECOS } else diff --git a/src/app/qgspgsourceselect.h b/src/app/qgspgsourceselect.h index 70437d40c13..7a71f11adab 100644 --- a/src/app/qgspgsourceselect.h +++ b/src/app/qgspgsourceselect.h @@ -21,6 +21,7 @@ #include "qgisgui.h" #include "qgsdbfilterproxymodel.h" #include "qgsdbtablemodel.h" +#include extern "C" { @@ -124,11 +125,14 @@ class QgsPgSourceSelect : public QDialog, private Ui::QgsPgSourceSelectBase void dbChanged(); public slots: + + void helpClicked(); + void addClicked(); + /*! Connects to the database using the stored connection parameters. * Once connected, available layers are displayed. */ void on_btnConnect_clicked(); - void on_btnAdd_clicked(); void on_btnNew_clicked(); void on_btnEdit_clicked(); void on_btnBuildQuery_clicked(); @@ -138,7 +142,6 @@ class QgsPgSourceSelect : public QDialog, private Ui::QgsPgSourceSelectBase void on_mSearchColumnComboBox_currentIndexChanged( const QString & text ); void on_mSearchModeComboBox_currentIndexChanged( const QString & text ); void setSql( const QModelIndex& index ); - void on_btnHelp_clicked(); void on_cmbConnections_activated( int ); void setLayerType( QString schema, QString table, QString column, QString type ); @@ -188,6 +191,7 @@ class QgsPgSourceSelect : public QDialog, private Ui::QgsPgSourceSelectBase QgsDbFilterProxyModel mProxyModel; QString layerURI( const QModelIndex &index ); + QPushButton * mAddButton; }; diff --git a/src/ui/qgspgsourceselectbase.ui b/src/ui/qgspgsourceselectbase.ui index 52f80c68a1e..aed2d8cf30d 100644 --- a/src/ui/qgspgsourceselectbase.ui +++ b/src/ui/qgspgsourceselectbase.ui @@ -6,8 +6,8 @@ 0 0 - 672 - 687 + 406 + 470 @@ -24,21 +24,8 @@ true - - - 9 - - - 6 - - - - - QAbstractItemView::ExtendedSelection - - - - + + PostgreSQL Connections @@ -84,78 +71,44 @@ - - - - 6 + + + + QAbstractItemView::ExtendedSelection - - 11 - - - - - true - - - Help - - - F1 - - - true - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 141 - 21 - - - - - - - - Add - - - - - - true - - - true - - - - - - - Close - - - - - - true - - - - + - + + + + false + + + Build query + + + + + + + Qt::Horizontal + + + + 271 + 20 + + + + + + + + Search options... + + + + @@ -172,6 +125,9 @@ Search: + + mSearchTableEdit + @@ -179,6 +135,9 @@ Search mode: + + mSearchModeComboBox + @@ -189,6 +148,9 @@ Search in columns: + + mSearchColumnComboBox + @@ -200,36 +162,13 @@ - - - - false - - - Build query + + + + QDialogButtonBox::Close|QDialogButtonBox::Help - - - - Search options... - - - - - - - Qt::Horizontal - - - - 271 - 20 - - - - @@ -239,25 +178,29 @@ btnNew btnEdit btnDelete - btnHelp - btnAdd - btnCancel + mTablesTreeView + btnBuildQuery + mSearchOptionsButton + mSearchTableEdit + mSearchColumnComboBox + mSearchModeComboBox + buttonBox - btnCancel - clicked() + buttonBox + rejected() QgsPgSourceSelectBase reject() - 404 + 353 446 - 229 - 236 + 404 + 421 diff --git a/src/ui/qgsprojectionselectorbase.ui b/src/ui/qgsprojectionselectorbase.ui index 1239460eeb8..f0b34cd6052 100644 --- a/src/ui/qgsprojectionselectorbase.ui +++ b/src/ui/qgsprojectionselectorbase.ui @@ -1,140 +1,132 @@ - + + QgsProjectionSelectorBase - - + + 0 0 - 466 - 416 + 428 + 313 - - + + 0 0 - + Coordinate Reference System Selector - + - - + + 3 - + 3 - - 3 - - - 3 - - - 3 - - - - + + + true - + true - + 3 - + Coordinate Reference System - + EPSG - + ID - - - - + + + + 0 0 - + 0 30 - + 16777215 50 - + 0 50 - + QTextEdit::AutoBulletList - + true - - - - + + + + 0 0 - + Search - - - - + + + + EPSG ID - + 16 10 - + true - - - + + + Name - + 16 10 @@ -142,21 +134,21 @@ - - + + - - - + + + 100 16777215 - + Find - + true @@ -164,25 +156,21 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + - + @@ -191,13 +179,13 @@ pbnFind click() - - 292 - 380 + + 362 + 276 - - 375 - 373 + + 453 + 277 diff --git a/src/ui/qgsprojectpropertiesbase.ui b/src/ui/qgsprojectpropertiesbase.ui index 7049587e449..efabc32a8f2 100644 --- a/src/ui/qgsprojectpropertiesbase.ui +++ b/src/ui/qgsprojectpropertiesbase.ui @@ -1,76 +1,80 @@ - + + QgsProjectPropertiesBase - - + + 0 0 - 500 - 557 + 552 + 525 - + Project Properties - + true - + true - - - - + + + + 0 - - + + General - - - - + + + + General settings - - - - + + + + Project title + + titleEdit + - - - + + + Descriptive project name - + Default project title - - - + + + Selection color - + pbnSelectionColour - + - + Qt::Horizontal - + QSizePolicy::Expanding - + 40 20 @@ -78,35 +82,35 @@ - - - + + + 100 0 - + - - - + + + Background color - + pbnCanvasColor - + - + Qt::Horizontal - + 40 20 @@ -114,46 +118,49 @@ - - - + + + 100 0 - + - - + + - + absolute - + relative - - - + + + Save paths + + cbxAbsolutePath + - + - + Qt::Horizontal - + 40 20 @@ -164,39 +171,39 @@ - - - + + + Layer units (only used when CRS transformation is disabled) - - - - + + + + Meters - + true - - - + + + Feet - - - + + + Decimal degrees - - - + + + Degrees, Minutes, Seconds @@ -204,96 +211,99 @@ - - - + + + Precision - - - - + + + + Automatically sets the number of decimal places in the mouse position display - + The number of decimal places that are used when displaying the mouse position is automatically set to be enough so that moving the mouse by one pixel gives a change in the position display - + Automatic - + true - - - + + + Sets the number of decimal places to use for the mouse position display - + Sets the number of decimal places to use for the mouse position display - + Manual - - - + + + The number of decimal places for the manual option - + The number of decimal places for the manual option - - - - + + + + 0 0 - + decimal places + + spinBoxDP + - - - - + + + + 0 0 - + Digitizing - - - - + + + + Enable topological editing - - - + + + Avoid intersections of new polygons... - - - + + + Snapping options... @@ -303,57 +313,57 @@ - - + + Coordinate Reference System (CRS) - - + + 3 - + 11 - + 3 - + 11 - - - + + + Enable 'on the fly' CRS transformation - - + + - - + + Identifiable layers - + - - + + true - + Layer - + Type - + Identifiable @@ -363,19 +373,19 @@ - - - + + + Qt::Horizontal - + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok - + QgsColorButton @@ -402,11 +412,12 @@ radManual spinBoxDP mEnableTopologicalEditingCheckBox + mAvoidIntersectionsPushButton mSnappingOptionsPushButton - buttonBox cbxProjectionEnabled twIdentifyLayers tabWidget + buttonBox @@ -416,13 +427,13 @@ spinBoxDP setEnabled(bool) - - 229 - 280 + + 289 + 322 - - 416 - 286 + + 418 + 325 @@ -432,13 +443,13 @@ textLabel3 setEnabled(bool) - - 240 - 281 + + 289 + 322 - - 583 - 290 + + 522 + 320 @@ -448,13 +459,13 @@ spinBoxDP setDisabled(bool) - - 100 - 290 + + 128 + 322 - - 395 - 285 + + 418 + 325 @@ -464,13 +475,13 @@ textLabel3 setDisabled(bool) - - 87 - 284 + + 115 + 322 - - 589 - 285 + + 522 + 320