Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-08-16 08:34:12 +02:00
Code Issues Projects Releases Wiki Activity

2022-09-20 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Tweaked the credentials section in the 'Edit Upload' and
	'Edit Download' dialogs in rdcatch(1) to indicate whether a
	'Password' or a 'Passphrase' is required.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2022-09-20 12:14:21 -04:00
parent de1908cb53
commit e2b45d83f9
5 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -23349,3 +23349,7 @@
* Changed the 'RECORDINGS.URL_PASSWORD' from 'varchar(64)' to 'text'. * Changed the 'RECORDINGS.URL_PASSWORD' from 'varchar(64)' to 'text'.
* Base64 encoded the contents of the 'RECORDINGS.URL_PASSWORD' field. * Base64 encoded the contents of the 'RECORDINGS.URL_PASSWORD' field.
* Incremented the database version to 358. * Incremented the database version to 358.
2022-09-20 Fred Gleason <fredg@paravelsystems.com>
* Tweaked the credentials section in the 'Edit Upload' and
'Edit Download' dialogs in rdcatch(1) to indicate whether a
'Password' or a 'Passphrase' is required.

15
rdcatch/edit_download.cpp
View File

@ -100,6 +100,8 @@ EditDownload::EditDownload(QString *filter,QWidget *parent)
edit_use_id_file_label->setFont(labelFont()); edit_use_id_file_label->setFont(labelFont());
edit_use_id_file_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); edit_use_id_file_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
edit_use_id_file_check=new QCheckBox(this); edit_use_id_file_check=new QCheckBox(this);
connect(edit_use_id_file_check,SIGNAL(toggled(bool)),
this,SLOT(useIdFileData(bool)));
// //
// Destination // Destination
@ -318,10 +320,23 @@ void EditDownload::urlChangedData(const QString &str)
if((scheme=="sftp")&&(!rda->station()->sshIdentityFile().isEmpty())) { if((scheme=="sftp")&&(!rda->station()->sshIdentityFile().isEmpty())) {
edit_use_id_file_check->setEnabled(true); edit_use_id_file_check->setEnabled(true);
edit_use_id_file_label->setEnabled(true); edit_use_id_file_label->setEnabled(true);
useIdFileData(edit_use_id_file_check->isChecked());
} }
else { else {
edit_use_id_file_check->setDisabled(true); edit_use_id_file_check->setDisabled(true);
edit_use_id_file_label->setDisabled(true); edit_use_id_file_label->setDisabled(true);
useIdFileData(false);
}
}
void EditDownload::useIdFileData(bool state)
{
if(state) {
edit_password_label->setText(tr("Passphrase")+":");
}
else {
edit_password_label->setText(tr("Password")+":");
} }
} }

1
rdcatch/edit_download.h
View File

@ -51,6 +51,7 @@ class EditDownload : public RDDialog
private slots: private slots:
void urlChangedData(const QString &str); void urlChangedData(const QString &str);
void useIdFileData(bool state);
void selectCartData(); void selectCartData();
void autotrimToggledData(bool state); void autotrimToggledData(bool state);
void normalizeToggledData(bool state); void normalizeToggledData(bool state);

15
rdcatch/edit_upload.cpp
View File

@ -116,6 +116,8 @@ EditUpload::EditUpload(QString *filter,QWidget *parent)
edit_use_id_file_label->setFont(labelFont()); edit_use_id_file_label->setFont(labelFont());
edit_use_id_file_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); edit_use_id_file_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
edit_use_id_file_check=new QCheckBox(this); edit_use_id_file_check=new QCheckBox(this);
connect(edit_use_id_file_check,SIGNAL(toggled(bool)),
this,SLOT(useIdFileData(bool)));
// //
// Audio Format // Audio Format
@ -391,10 +393,23 @@ void EditUpload::urlChangedData(const QString &str)
(edit_feed_box->currentIndex()==0)) { (edit_feed_box->currentIndex()==0)) {
edit_use_id_file_check->setEnabled(true); edit_use_id_file_check->setEnabled(true);
edit_use_id_file_label->setEnabled(true); edit_use_id_file_label->setEnabled(true);
useIdFileData(edit_use_id_file_check->isChecked());
} }
else { else {
edit_use_id_file_check->setDisabled(true); edit_use_id_file_check->setDisabled(true);
edit_use_id_file_label->setDisabled(true); edit_use_id_file_label->setDisabled(true);
useIdFileData(false);
}
}
void EditUpload::useIdFileData(bool state)
{
if(state) {
edit_password_label->setText(tr("Passphrase")+":");
}
else {
edit_password_label->setText(tr("Password")+":");
} }
} }

1
rdcatch/edit_upload.h
View File

@ -52,6 +52,7 @@ class EditUpload : public RDDialog
void stationChangedData(const QString &str); void stationChangedData(const QString &str);
void feedChangedData(int index); void feedChangedData(int index);
void urlChangedData(const QString &str); void urlChangedData(const QString &str);
void useIdFileData(bool state);
void selectCartData(); void selectCartData();
void setFormatData(); void setFormatData();
void normalizeCheckData(bool state); void normalizeCheckData(bool state);