Skip to content

Commit 32d4af2

Browse files
committed
#9191: More fixes
1 parent 57e9411 commit 32d4af2

5 files changed

+20
-1
lines changed

src/gui/qgsmanageconnectionsdialog.cpp

+11
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,13 @@ QgsManageConnectionsDialog::QgsManageConnectionsDialog( QWidget *parent, Mode mo
4646
{
4747
label->setText( tr( "Select connections to import" ) );
4848
buttonBox->button( QDialogButtonBox::Ok )->setText( tr( "Import" ) );
49+
buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false );
4950
}
5051
else
5152
{
5253
//label->setText( tr( "Select connections to export" ) );
5354
buttonBox->button( QDialogButtonBox::Ok )->setText( tr( "Export" ) );
55+
buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false );
5456
}
5557

5658
if ( !populateConnections() )
@@ -61,6 +63,13 @@ QgsManageConnectionsDialog::QgsManageConnectionsDialog( QWidget *parent, Mode mo
6163
// use Ok button for starting import and export operations
6264
disconnect( buttonBox, SIGNAL( accepted() ), this, SLOT( accept() ) );
6365
connect( buttonBox, SIGNAL( accepted() ), this, SLOT( doExportImport() ) );
66+
67+
connect( listConnections, SIGNAL( itemSelectionChanged() ), this, SLOT( selectionChanged() ) );
68+
}
69+
70+
void QgsManageConnectionsDialog::selectionChanged()
71+
{
72+
buttonBox->button( QDialogButtonBox::Ok )->setEnabled( !listConnections->selectedItems().isEmpty() );
6473
}
6574

6675
void QgsManageConnectionsDialog::doExportImport()
@@ -945,9 +954,11 @@ void QgsManageConnectionsDialog::loadOracleConnections( const QDomDocument &doc,
945954
void QgsManageConnectionsDialog::selectAll()
946955
{
947956
listConnections->selectAll();
957+
buttonBox->button( QDialogButtonBox::Ok )->setEnabled( !listConnections->selectedItems().isEmpty() );
948958
}
949959

950960
void QgsManageConnectionsDialog::clearSelection()
951961
{
952962
listConnections->clearSelection();
963+
buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false );
953964
}

src/gui/qgsmanageconnectionsdialog.h

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ class GUI_EXPORT QgsManageConnectionsDialog : public QDialog, private Ui::QgsMan
5252
void doExportImport();
5353
void selectAll();
5454
void clearSelection();
55+
void selectionChanged();
5556

5657
private:
5758
bool populateConnections();

src/gui/qgsowssourceselect.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -538,13 +538,15 @@ void QgsOWSSourceSelect::setConnectionListPosition()
538538
mConnectButton->setEnabled( false );
539539
mEditButton->setEnabled( false );
540540
mDeleteButton->setEnabled( false );
541+
mSaveButton->setEnabled( false );
541542
}
542543
else
543544
{
544545
// Connections - enable various buttons
545546
mConnectButton->setEnabled( true );
546547
mEditButton->setEnabled( true );
547548
mDeleteButton->setEnabled( true );
549+
mSaveButton->setEnabled( true );
548550
}
549551

550552
QgsOWSConnection::setSelectedConnection( mService, mConnectionsComboBox->currentText() );

src/providers/wfs/qgswfssourceselect.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -132,14 +132,15 @@ void QgsWFSSourceSelect::populateConnectionList()
132132
btnConnect->setEnabled( true );
133133
btnEdit->setEnabled( true );
134134
btnDelete->setEnabled( true );
135+
btnSave->setEnabled( true );
135136
}
136-
137137
else
138138
{
139139
// No connections available - disable various buttons
140140
btnConnect->setEnabled( false );
141141
btnEdit->setEnabled( false );
142142
btnDelete->setEnabled( false );
143+
btnSave->setEnabled( false );
143144
}
144145

145146
//set last used connection
@@ -310,13 +311,15 @@ void QgsWFSSourceSelect::deleteEntryOfServerList()
310311
btnConnect->setEnabled( true );
311312
btnEdit->setEnabled( true );
312313
btnDelete->setEnabled( true );
314+
btnSave->setEnabled( true );
313315
}
314316
else
315317
{
316318
// No connections available - disable various buttons
317319
btnConnect->setEnabled( false );
318320
btnEdit->setEnabled( false );
319321
btnDelete->setEnabled( false );
322+
btnSave->setEnabled( false );
320323
}
321324
}
322325
}

src/providers/wms/qgswmssourceselect.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -1016,13 +1016,15 @@ void QgsWMSSourceSelect::setConnectionListPosition()
10161016
btnConnect->setEnabled( false );
10171017
btnEdit->setEnabled( false );
10181018
btnDelete->setEnabled( false );
1019+
btnSave->setEnabled( false );
10191020
}
10201021
else
10211022
{
10221023
// Connections - enable various buttons
10231024
btnConnect->setEnabled( true );
10241025
btnEdit->setEnabled( true );
10251026
btnDelete->setEnabled( true );
1027+
btnSave->setEnabled( true );
10261028
}
10271029
}
10281030

0 commit comments

Comments
 (0)