Fix the behaviour of the trusted connection checkbox (#6262)

qgis · Mar 5, 2013 · 6d1eb26 · 6d1eb26
1 parent 2b52f49
commit 6d1eb26
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/src/providers/mssql/qgsmssqlnewconnection.cpp b/src/providers/mssql/qgsmssqlnewconnection.cpp
@@ -49,6 +49,7 @@ QgsMssqlNewConnection::QgsMssqlNewConnection( QWidget *parent, const QString& co
     {
       txtUsername->setText( settings.value( key + "/username" ).toString() );
       chkStoreUsername->setChecked( true );
+      cb_trustedConnection->setChecked (false);
     }
 
     if ( settings.value( key + "/savePassword" ).toString() == "true" )
@@ -71,6 +72,7 @@ QgsMssqlNewConnection::QgsMssqlNewConnection( QWidget *parent, const QString& co
 
     txtName->setText( connName );
   }
+  on_cb_trustedConnection_clicked();
 }
 /** Autoconnected SLOTS **/
 void QgsMssqlNewConnection::accept()
@@ -127,6 +129,22 @@ void QgsMssqlNewConnection::on_btnConnect_clicked()
   testConnection();
 }
 
+void QgsMssqlNewConnection::on_cb_trustedConnection_clicked()
+{
+  if ( cb_trustedConnection->checkState() == Qt::Checked )
+  {
+    txtUsername->setEnabled( false );
+    txtUsername->setText( "" );
+    txtPassword->setEnabled( false );
+    txtPassword->setText( "" );
+  }
+  else
+  {
+    txtUsername->setEnabled( true );
+    txtPassword->setEnabled( true );
+  }
+}
+
 /** end  Autoconnected SLOTS **/
 
 QgsMssqlNewConnection::~QgsMssqlNewConnection()

diff --git a/src/providers/mssql/qgsmssqlnewconnection.h b/src/providers/mssql/qgsmssqlnewconnection.h
@@ -37,6 +37,7 @@ class QgsMssqlNewConnection : public QDialog, private Ui::QgsMssqlNewConnectionB
   public slots:
     void accept();
     void on_btnConnect_clicked();
+    void on_cb_trustedConnection_clicked();
     void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
   private:
     QString mOriginalConnName; //store initial name to delete entry in case of rename