2024-08-16 Fred Gleason <fredg@paravelsystems.com>

* Fixed a bug in the 'Edit Download' dialog in rdcatch(1) that
	caused the 'Username' and 'Password' controls to be disabled when
	entering a URL scheme of 'https'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2024-08-16 17:32:57 -04:00
parent 09c7c82c26
commit 08a9c09474
3 changed files with 7 additions and 8 deletions

View File

@ -24855,3 +24855,7 @@
2024-08-16 Fred Gleason <fredg@paravelsystems.com> 2024-08-16 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in the RDXport service that couldcause the IMPORT call * Fixed a bug in the RDXport service that couldcause the IMPORT call
to return a 'no such cart' error when trying to create a new cart. to return a 'no such cart' error when trying to create a new cart.
2024-08-16 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in the 'Edit Download' dialog in rdcatch(1) that
caused the 'Username' and 'Password' controls to be disabled when
entering a URL scheme of 'https'.

View File

@ -309,8 +309,8 @@ void EditDownload::urlChangedData(const QString &str)
{ {
QUrl url(str); QUrl url(str);
QString scheme=url.scheme(); QString scheme=url.scheme();
if((scheme=="ftp")||(scheme=="ftps")||(scheme=="http")||(scheme=="file")|| if((scheme=="ftp")||(scheme=="ftps")||(scheme=="http")||(scheme=="https")||
(scheme=="scp")||(scheme=="sftp")) { (scheme=="file")||(scheme=="scp")||(scheme=="sftp")) {
edit_username_label->setEnabled(true); edit_username_label->setEnabled(true);
edit_username_edit->setEnabled(true); edit_username_edit->setEnabled(true);
edit_password_label->setEnabled(true); edit_password_label->setEnabled(true);

View File

@ -244,12 +244,6 @@ bool MainObject::RunDownload(CatchEvent *evt,QString *err_msg)
// Execute Import // Execute Import
// //
bool imported=Import(evt,err_msg); bool imported=Import(evt,err_msg);
if(imported) {
rda->syslog(LOG_NOTICE,"HERE1!");
}
else {
rda->syslog(LOG_NOTICE,"HERE2!");
}
rda->syslog(LOG_INFO,"deleting file %s, id=%d", rda->syslog(LOG_INFO,"deleting file %s, id=%d",
evt->tempName().toUtf8().constData(),evt->id()); evt->tempName().toUtf8().constData(),evt->id());
unlink(evt->tempName().toUtf8()); unlink(evt->tempName().toUtf8());
@ -437,6 +431,7 @@ bool MainObject::Import(CatchEvent *evt,QString *err_msg)
delete cut; delete cut;
return false; return false;
} }
RDWaveFile *wave=new RDWaveFile(evt->tempName()); RDWaveFile *wave=new RDWaveFile(evt->tempName());
if(!wave->openWave()) { if(!wave->openWave()) {
rda->syslog(LOG_ERR,"unknown file format: %s, id: %d", rda->syslog(LOG_ERR,"unknown file format: %s, id: %d",