Fix disabled add button in ogr source select for valid protocols

nyalldawson · nyalldawson · commit df0d717f928e · 2017-10-18T10:51:43.000+10:00
Fixes #17206
diff --git a/src/providers/ogr/qgsogrsourceselect.cpp b/src/providers/ogr/qgsogrsourceselect.cpp
@@ -114,7 +114,14 @@ QgsOgrSourceSelect::QgsOgrSourceSelect( QWidget *parent, Qt::WindowFlags fl, Qgs
   connect( mFileWidget, &QgsFileWidget::fileChanged, this, [ = ]( const QString & path )
   {
     mVectorPath = path;
-    emit enableButtons( ! mVectorPath.isEmpty() );
+    if ( radioSrcFile->isChecked() || radioSrcDirectory->isChecked() )
+      emit enableButtons( ! mVectorPath.isEmpty() );
+  } );
+
+  connect( protocolURI, &QLineEdit::textChanged, this, [ = ]( const QString & text )
+  {
+    if ( radioSrcProtocol->isChecked() )
+      emit enableButtons( !text.isEmpty() );
   } );
 }
 
@@ -378,6 +385,8 @@ void QgsOgrSourceSelect::radioSrcFile_toggled( bool checked )
     mFileWidget->setFilePath( QString() );
 
     mDataSourceType = QStringLiteral( "file" );
+
+    emit enableButtons( ! mFileWidget->filePath().isEmpty() );
   }
 }
 
@@ -396,6 +405,8 @@ void QgsOgrSourceSelect::radioSrcDirectory_toggled( bool checked )
     mFileWidget->setFilePath( QString() );
 
     mDataSourceType = QStringLiteral( "directory" );
+
+    emit enableButtons( ! mFileWidget->filePath().isEmpty() );
   }
 }
 
@@ -412,6 +423,8 @@ void QgsOgrSourceSelect::radioSrcDatabase_toggled( bool checked )
     populateConnectionList();
     setConnectionListPosition();
     mDataSourceType = QStringLiteral( "database" );
+
+    emit enableButtons( true );
   }
 }
 
@@ -423,6 +436,8 @@ void QgsOgrSourceSelect::radioSrcProtocol_toggled( bool checked )
     dbGroupBox->hide();
     protocolGroupBox->show();
     mDataSourceType = QStringLiteral( "protocol" );
+
+    emit enableButtons( ! protocolURI->text().isEmpty() );
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,14 @@ QgsOgrSourceSelect::QgsOgrSourceSelect( QWidget *parent, Qt::WindowFlags fl, Qgs`
`114`	`114`	`connect( mFileWidget, &QgsFileWidget::fileChanged, this, [ = ]( const QString & path )`
`115`	`115`	`{`
`116`	`116`	`mVectorPath = path;`
`117`		`- emit enableButtons( ! mVectorPath.isEmpty() );`
	`117`	`+ if ( radioSrcFile->isChecked() \|\| radioSrcDirectory->isChecked() )`
	`118`	`+ emit enableButtons( ! mVectorPath.isEmpty() );`
	`119`	`+ } );`
	`120`	`+`
	`121`	`+ connect( protocolURI, &QLineEdit::textChanged, this, [ = ]( const QString & text )`
	`122`	`+ {`
	`123`	`+ if ( radioSrcProtocol->isChecked() )`
	`124`	`+ emit enableButtons( !text.isEmpty() );`
`118`	`125`	`} );`
`119`	`126`	`}`
`120`	`127`
`@@ -378,6 +385,8 @@ void QgsOgrSourceSelect::radioSrcFile_toggled( bool checked )`
`378`	`385`	`mFileWidget->setFilePath( QString() );`
`379`	`386`
`380`	`387`	`mDataSourceType = QStringLiteral( "file" );`
	`388`	`+`
	`389`	`+ emit enableButtons( ! mFileWidget->filePath().isEmpty() );`
`381`	`390`	`}`
`382`	`391`	`}`
`383`	`392`
`@@ -396,6 +405,8 @@ void QgsOgrSourceSelect::radioSrcDirectory_toggled( bool checked )`
`396`	`405`	`mFileWidget->setFilePath( QString() );`
`397`	`406`
`398`	`407`	`mDataSourceType = QStringLiteral( "directory" );`
	`408`	`+`
	`409`	`+ emit enableButtons( ! mFileWidget->filePath().isEmpty() );`
`399`	`410`	`}`
`400`	`411`	`}`
`401`	`412`
`@@ -412,6 +423,8 @@ void QgsOgrSourceSelect::radioSrcDatabase_toggled( bool checked )`
`412`	`423`	`populateConnectionList();`
`413`	`424`	`setConnectionListPosition();`
`414`	`425`	`mDataSourceType = QStringLiteral( "database" );`
	`426`	`+`
	`427`	`+ emit enableButtons( true );`
`415`	`428`	`}`
`416`	`429`	`}`
`417`	`430`
`@@ -423,6 +436,8 @@ void QgsOgrSourceSelect::radioSrcProtocol_toggled( bool checked )`
`423`	`436`	`dbGroupBox->hide();`
`424`	`437`	`protocolGroupBox->show();`
`425`	`438`	`mDataSourceType = QStringLiteral( "protocol" );`
	`439`	`+`
	`440`	`+ emit enableButtons( ! protocolURI->text().isEmpty() );`
`426`	`441`	`}`
`427`	`442`	`}`
`428`	`443`