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

2021-07-12 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Modified the 'Edit Upload' dialog in rdcatch(1) to disable the
	'Url', 'Username', 'Password' and 'Export Format' controls when
	an RSS feed is selected.
	* Added the feed icon to the 'RSS Feed' column in the record list
	display in rdcatch(1).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-07-12 09:56:24 -04:00
parent cbdf0a4735
commit cd91364485
10 changed files with 304 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -22033,3 +22033,9 @@
2021-07-08 Fred Gleason <fredg@paravelsystems.com> 2021-07-08 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in the 'Add Recording' dialog in rdcatch(1) * Fixed a regression in the 'Add Recording' dialog in rdcatch(1)
that threw a SQL error. that threw a SQL error.
2021-07-12 Fred Gleason <fredg@paravelsystems.com>
* Modified the 'Edit Upload' dialog in rdcatch(1) to disable the
'Url', 'Username', 'Password' and 'Export Format' controls when
an RSS feed is selected.
* Added the feed icon to the 'RSS Feed' column in the record list
display in rdcatch(1).

17
lib/rdfeedlistmodel.cpp
View File

@ -25,10 +25,11 @@
#include "rdfeedlistmodel.h" #include "rdfeedlistmodel.h"
#include "rdpodcast.h" #include "rdpodcast.h"
RDFeedListModel::RDFeedListModel(bool is_admin,QObject *parent) RDFeedListModel::RDFeedListModel(bool is_admin,bool incl_none,QObject *parent)
: QAbstractItemModel(parent) : QAbstractItemModel(parent)
{ {
d_is_admin=is_admin; d_is_admin=is_admin;
d_include_none=incl_none;
d_font_metrics=NULL; d_font_metrics=NULL;
d_bold_font_metrics=NULL; d_bold_font_metrics=NULL;
@ -481,6 +482,7 @@ void RDFeedListModel::updateModel(const QString &filter_sql)
} }
QList<QList<QVariant> > list_list; QList<QList<QVariant> > list_list;
list_list.push_back(list); list_list.push_back(list);
QList<unsigned> ids;
sql=sqlFields()+ sql=sqlFields()+
filter_sql+ filter_sql+
@ -493,8 +495,19 @@ void RDFeedListModel::updateModel(const QString &filter_sql)
d_cast_ids.clear(); d_cast_ids.clear();
d_cast_icons.clear(); d_cast_icons.clear();
d_icons.clear(); d_icons.clear();
if(d_include_none) {
d_texts.push_back(list);
d_texts[0][0]=tr("[none]");
d_key_names.push_back(QString());
d_feed_ids.push_back(0);
d_cast_texts.push_back(list_list);
d_cast_ids.push_back(ids);
d_cast_icons.push_back(list);
d_icons.push_back(icons);
}
QString prev_keyname; QString prev_keyname;
QList<unsigned> ids;
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
while(q->next()) { while(q->next()) {
if(q->value(0).toString()!=prev_keyname) { if(q->value(0).toString()!=prev_keyname) {

3
lib/rdfeedlistmodel.h
View File

@ -36,7 +36,7 @@ class RDFeedListModel : public QAbstractItemModel
{ {
Q_OBJECT Q_OBJECT
public: public:
RDFeedListModel(bool is_admin,QObject *parent=0); RDFeedListModel(bool is_admin,bool incl_none,QObject *parent);
~RDFeedListModel(); ~RDFeedListModel();
QPalette palette(); QPalette palette();
void setPalette(const QPalette &pal); void setPalette(const QPalette &pal);
@ -96,6 +96,7 @@ class RDFeedListModel : public QAbstractItemModel
QStringList d_key_names; QStringList d_key_names;
QList<unsigned> d_feed_ids; QList<unsigned> d_feed_ids;
bool d_is_admin; bool d_is_admin;
bool d_include_none;
}; };

2
lib/rdrecording.cpp
View File

@ -671,7 +671,7 @@ QString RDRecording::feedKeyName() const
feedId()); feedId());
RDSqlQuery *q=new RDSqlQuery(sql); RDSqlQuery *q=new RDSqlQuery(sql);
if(q->first()) { if(q->first()) {
QString ret=q->value(0).toString(); ret=q->value(0).toString();
} }
delete q; delete q;
return ret; return ret;

2
rdadmin/list_feeds.cpp
View File

@ -99,7 +99,7 @@ ListFeeds::ListFeeds(QWidget *parent)
// Feed List // Feed List
// //
list_feeds_view=new RDTableView(this); list_feeds_view=new RDTableView(this);
list_feeds_model=new RDFeedListModel(true,this); list_feeds_model=new RDFeedListModel(true,false,this);
list_feeds_model->setFont(font()); list_feeds_model->setFont(font());
list_feeds_model->setPalette(palette()); list_feeds_model->setPalette(palette());
list_feeds_view->setModel(list_feeds_model); list_feeds_view->setModel(list_feeds_model);

2
rdcastmanager/rdcastmanager.cpp
View File

@ -92,7 +92,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
// Feed List // Feed List
// //
cast_feed_view=new RDTreeView(this); cast_feed_view=new RDTreeView(this);
cast_feed_model=new RDFeedListModel(false,this); cast_feed_model=new RDFeedListModel(false,false,this);
cast_feed_model->setFont(font()); cast_feed_model->setFont(font());
cast_feed_model->setPalette(palette()); cast_feed_model->setPalette(palette());
cast_feed_view->setModel(cast_feed_model); cast_feed_view->setModel(cast_feed_model);

410
rdcatch/edit_upload.cpp
View File

@ -70,96 +70,81 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
// Active Button // Active Button
// //
edit_active_button=new QCheckBox(this); edit_active_button=new QCheckBox(this);
edit_active_button->setGeometry(10,11,20,20); edit_active_label=new QLabel(tr("Event Active"),this);
QLabel *label=new QLabel(tr("Event Active"),this); edit_active_label->setFont(labelFont());
label->setGeometry(30,11,125,20); edit_active_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
label->setFont(labelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
// //
// Station // Station
// //
edit_station_box=new RDComboBox(this); edit_station_box=new RDComboBox(this);
edit_station_box->setGeometry(200,10,140,23);
connect(edit_station_box,SIGNAL(editTextChanged(const QString &)), connect(edit_station_box,SIGNAL(editTextChanged(const QString &)),
this,SLOT(stationChangedData(const QString &))); this,SLOT(stationChangedData(const QString &)));
label=new QLabel(tr("Location:"),this); edit_station_label=new QLabel(tr("Location:"),this);
label->setGeometry(125,10,70,23); edit_station_label->setFont(labelFont());
label->setFont(labelFont()); edit_station_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
// //
// Start Time // Start Time
// //
edit_starttime_edit=new QTimeEdit(this); edit_starttime_edit=new QTimeEdit(this);
edit_starttime_edit->setGeometry(sizeHint().width()-90,12,80,20);
edit_starttime_edit->setDisplayFormat("hh:mm:ss"); edit_starttime_edit->setDisplayFormat("hh:mm:ss");
label=new QLabel(tr("Start Time:"),this); edit_starttime_label=new QLabel(tr("Start Time:"),this);
label->setGeometry(sizeHint().width()-175,12,80,20); edit_starttime_label->setFont(labelFont());
label->setFont(labelFont()); edit_starttime_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
// RSS Feed
//
edit_feed_box=new QComboBox(this);
edit_feed_box->setGeometry(115,43,100,20);
edit_feed_box->insertItem(0,tr("[none]"));
label=new QLabel(tr("RSS Feed:"),this);
label->setGeometry(10,43,100,19);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
// //
// Source // Source
// //
edit_destination_edit=new QLineEdit(this); edit_source_edit=new QLineEdit(this);
edit_destination_edit->setGeometry(115,70,sizeHint().width()-195,20); edit_source_edit->setReadOnly(true);
edit_destination_edit->setReadOnly(true); edit_source_label=new QLabel(tr("Source:"),this);
label=new QLabel(tr("Source:"),this); edit_source_label->setFont(labelFont());
label->setGeometry(10,70,100,19); edit_source_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
label->setFont(labelFont()); edit_source_select_button=new QPushButton(this);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); edit_source_select_button->setFont(subButtonFont());
QPushButton *button=new QPushButton(this); edit_source_select_button->setText(tr("Select"));
button->setGeometry(sizeHint().width()-70,68,60,24); connect(edit_source_select_button,SIGNAL(clicked()),this,SLOT(selectCartData()));
button->setFont(subButtonFont());
button->setText(tr("Select"));
connect(button,SIGNAL(clicked()),this,SLOT(selectCartData()));
// //
// Description // Description
// //
edit_description_edit=new QLineEdit(this); edit_description_edit=new QLineEdit(this);
edit_description_edit->setGeometry(115,97,sizeHint().width()-125,20);
edit_description_edit->setValidator(validator); edit_description_edit->setValidator(validator);
label=new QLabel(tr("Description:"),this); edit_description_label=new QLabel(tr("Description:"),this);
label->setGeometry(10,97,100,20); edit_description_label->setFont(labelFont());
label->setFont(labelFont()); edit_description_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
// RSS Feed
//
edit_feed_box=new QComboBox(this);
connect(edit_feed_box,SIGNAL(activated(int)),this,SLOT(feedChangedData(int)));
edit_feed_label=new QLabel(tr("RSS Feed:"),this);
edit_feed_label->setFont(labelFont());
edit_feed_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
edit_feed_model=new RDFeedListModel(true,true,this);
edit_feed_box->setModel(edit_feed_model);
// //
// Url // Url
// //
edit_url_edit=new QLineEdit(this); edit_url_edit=new QLineEdit(this);
edit_url_edit->setGeometry(115,124,sizeHint().width()-125,20); edit_url_edit->setMaxLength(191);
edit_url_edit->setMaxLength(255);
edit_url_edit->setValidator(validator); edit_url_edit->setValidator(validator);
connect(edit_url_edit,SIGNAL(textChanged(const QString &)), connect(edit_url_edit,SIGNAL(textChanged(const QString &)),
this,SLOT(urlChangedData(const QString &))); this,SLOT(urlChangedData(const QString &)));
label=new QLabel(tr("Url:"),this); edit_url_label=new QLabel(tr("Url:"),this);
label->setGeometry(10,124,100,20); edit_url_label->setFont(labelFont());
label->setFont(labelFont()); edit_url_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
// //
// Username // Username
// //
edit_username_edit=new QLineEdit(this); edit_username_edit=new QLineEdit(this);
edit_username_edit->setGeometry(115,151,150,20);
edit_username_edit->setMaxLength(64); edit_username_edit->setMaxLength(64);
edit_username_edit->setValidator(validator); edit_username_edit->setValidator(validator);
edit_username_label=new QLabel(tr("Username:"),this); edit_username_label=new QLabel(tr("Username:"),this);
edit_username_label->setGeometry(10,151,100,20);
edit_username_label->setFont(labelFont()); edit_username_label->setFont(labelFont());
edit_username_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); edit_username_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
@ -167,12 +152,10 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
// Password // Password
// //
edit_password_edit=new QLineEdit(this); edit_password_edit=new QLineEdit(this);
edit_password_edit->setGeometry(360,151,sizeHint().width()-370,20);
edit_password_edit->setEchoMode(QLineEdit::Password); edit_password_edit->setEchoMode(QLineEdit::Password);
edit_password_edit->setMaxLength(64); edit_password_edit->setMaxLength(64);
edit_username_edit->setValidator(validator); edit_username_edit->setValidator(validator);
edit_password_label=new QLabel(tr("Password:"),this); edit_password_label=new QLabel(tr("Password:"),this);
edit_password_label->setGeometry(275,151,80,20);
edit_password_label->setFont(labelFont()); edit_password_label->setFont(labelFont());
edit_password_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); edit_password_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
@ -180,28 +163,23 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
// Audio Format // Audio Format
// //
edit_format_edit=new QLineEdit(this); edit_format_edit=new QLineEdit(this);
edit_format_edit->setGeometry(115,178,sizeHint().width()-195,20);
edit_format_edit->setReadOnly(true); edit_format_edit->setReadOnly(true);
label=new QLabel(tr("Export Format:"),this); edit_format_label=new QLabel(tr("Export Format:"),this);
label->setGeometry(5,178,105,20); edit_format_label->setFont(labelFont());
label->setFont(labelFont()); edit_format_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); edit_format_set_button=new QPushButton(this);
button=new QPushButton(this); edit_format_set_button->setFont(subButtonFont());
button->setGeometry(sizeHint().width()-70,176,60,24); edit_format_set_button->setText(tr("Set"));
button->setFont(subButtonFont()); connect(edit_format_set_button,SIGNAL(clicked()),this,SLOT(setFormatData()));
button->setText(tr("Set"));
connect(button,SIGNAL(clicked()),this,SLOT(setFormatData()));
// //
// Normalize Check Box // Normalize Check Box
// //
edit_normalize_box=new QCheckBox(this); edit_normalize_box=new QCheckBox(this);
edit_normalize_box->setGeometry(115,208,15,15);
edit_normalize_box->setChecked(true); edit_normalize_box->setChecked(true);
label=new QLabel(tr("Normalize"),this); edit_normalize_label=new QLabel(tr("Normalize"),this);
label->setGeometry(135,206,83,20); edit_normalize_label->setFont(labelFont());
label->setFont(labelFont()); edit_normalize_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
connect(edit_normalize_box,SIGNAL(toggled(bool)), connect(edit_normalize_box,SIGNAL(toggled(bool)),
this,SLOT(normalizeCheckData(bool))); this,SLOT(normalizeCheckData(bool)));
@ -209,14 +187,11 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
// Normalize Level // Normalize Level
// //
edit_normalize_spin=new QSpinBox(this); edit_normalize_spin=new QSpinBox(this);
edit_normalize_spin->setGeometry(265,206,40,20);
edit_normalize_spin->setRange(-30,0); edit_normalize_spin->setRange(-30,0);
edit_normalize_label=new QLabel(tr("Level:"),this); edit_normalize_level_label=new QLabel(tr("Level:"),this);
edit_normalize_label->setGeometry(215,206,45,20); edit_normalize_level_label->setFont(labelFont());
edit_normalize_label->setFont(labelFont()); edit_normalize_level_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
edit_normalize_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
edit_normalize_unit=new QLabel(tr("dBFS"),this); edit_normalize_unit=new QLabel(tr("dBFS"),this);
edit_normalize_unit->setGeometry(310,206,40,20);
edit_normalize_unit->setFont(labelFont()); edit_normalize_unit->setFont(labelFont());
edit_normalize_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); edit_normalize_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
@ -224,11 +199,9 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
// Export Metadata Box // Export Metadata Box
// //
edit_metadata_box=new QCheckBox(this); edit_metadata_box=new QCheckBox(this);
edit_metadata_box->setGeometry(115,231,15,15); edit_metadata_label=new QLabel(tr("Export Library Metadata"),this);
label=new QLabel(tr("Export Library Metadata"),this); edit_metadata_label->setFont(labelFont());
label->setGeometry(135,231,160,20); edit_metadata_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
label->setFont(labelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
// //
// Button Label // Button Label
@ -241,127 +214,105 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
// Monday Button // Monday Button
// //
edit_mon_button=new QCheckBox(this); edit_mon_button=new QCheckBox(this);
edit_mon_button->setGeometry(20,282,20,20); edit_mon_label=new QLabel(tr("Monday"),this);
label=new QLabel(tr("Monday"),this); edit_mon_label->setFont(subLabelFont());
label->setGeometry(40,282,115,20); edit_mon_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
// //
// Tuesday Button // Tuesday Button
// //
edit_tue_button=new QCheckBox(this); edit_tue_button=new QCheckBox(this);
edit_tue_button->setGeometry(115,282,20,20); edit_tue_label=new QLabel(tr("Tuesday"),this);
label=new QLabel(tr("Tuesday"),this); edit_tue_label->setFont(subLabelFont());
label->setGeometry(135,282,115,20); edit_tue_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
// //
// Wednesday Button // Wednesday Button
// //
edit_wed_button=new QCheckBox(this); edit_wed_button=new QCheckBox(this);
edit_wed_button->setGeometry(215,282,20,20); edit_wed_label=new QLabel(tr("Wednesday"),this);
label=new QLabel(tr("Wednesday"),this); edit_wed_label->setFont(subLabelFont());
label->setGeometry(235,282,115,20); edit_wed_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
// //
// Thursday Button // Thursday Button
// //
edit_thu_button=new QCheckBox(this); edit_thu_button=new QCheckBox(this);
edit_thu_button->setGeometry(335,282,20,20); edit_thu_label=new QLabel(tr("Thursday"),this);
label=new QLabel(tr("Thursday"),this); edit_thu_label->setFont(subLabelFont());
label->setGeometry(355,282,115,20); edit_thu_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
// //
// Friday Button // Friday Button
// //
edit_fri_button=new QCheckBox(this); edit_fri_button=new QCheckBox(this);
edit_fri_button->setGeometry(440,282,20,20); edit_fri_label=new QLabel(tr("Friday"),this);
label=new QLabel(tr("Friday"),this); edit_fri_label->setFont(subLabelFont());
label->setGeometry(460,282,40,20); edit_fri_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
// //
// Saturday Button // Saturday Button
// //
edit_sat_button=new QCheckBox(this); edit_sat_button=new QCheckBox(this);
edit_sat_button->setGeometry(130,307,20,20); edit_sat_label=new QLabel(tr("Saturday"),this);
label=new QLabel(tr("Saturday"),this); edit_sat_label->setFont(subLabelFont());
label->setGeometry(150,307,60,20); edit_sat_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
// //
// Sunday Button // Sunday Button
// //
edit_sun_button=new QCheckBox(this); edit_sun_button=new QCheckBox(this);
edit_sun_button->setGeometry(300,307,20,20); edit_sun_label=new QLabel(tr("Sunday"),this);
label=new QLabel(tr("Sunday"),this); edit_sun_label->setFont(subLabelFont());
label->setGeometry(320,307,60,20); edit_sun_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
// //
// OneShot Button // OneShot Button
// //
edit_oneshot_box=new QCheckBox(this); edit_oneshot_box=new QCheckBox(this);
edit_oneshot_box->setGeometry(20,342,15,15); edit_oneshot_label=new QLabel(tr("Make OneShot"),this);
label=new QLabel(tr("Make OneShot"),this); edit_oneshot_label->setFont(labelFont());
label->setGeometry(40,340,115,20); edit_oneshot_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
label->setFont(labelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
// //
// Event Offset // Event Offset
// //
edit_eventoffset_spin=new QSpinBox(this); edit_eventoffset_spin=new QSpinBox(this);
edit_eventoffset_spin->setGeometry(245,340,45,20);
edit_eventoffset_spin->setRange(-30,30); edit_eventoffset_spin->setRange(-30,30);
label=new QLabel(tr("Event Offset:"),this); edit_eventoffset_label=new QLabel(tr("Event Offset:"),this);
label->setGeometry(140,340,100,20); edit_eventoffset_label->setFont(labelFont());
label->setFont(labelFont()); edit_eventoffset_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight);
label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); edit_eventoffset_unit_label=new QLabel(tr("days"),this);
label=new QLabel(tr("days"),this); edit_eventoffset_unit_label->setFont(labelFont());
label->setGeometry(295,335,40,20); edit_eventoffset_unit_label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft);
label->setFont(labelFont());
label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft);
// //
// Save As Button // Save As Button
// //
button=new QPushButton(this); event_saveas_button=new QPushButton(this);
button->setGeometry(sizeHint().width()-300,sizeHint().height()-60,80,50); event_saveas_button->setFont(buttonFont());
button->setFont(buttonFont()); event_saveas_button->setText(tr("Save As\nNew"));
button->setText(tr("Save As\nNew")); connect(event_saveas_button,SIGNAL(clicked()),this,SLOT(saveasData()));
connect(button,SIGNAL(clicked()),this,SLOT(saveasData()));
if(adds==NULL) { if(adds==NULL) {
button->hide(); event_saveas_button->hide();
} }
// //
// Ok Button // Ok Button
// //
button=new QPushButton(this); event_ok_button=new QPushButton(this);
button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); event_ok_button->setDefault(true);
button->setDefault(true); event_ok_button->setFont(buttonFont());
button->setFont(buttonFont()); event_ok_button->setText(tr("OK"));
button->setText(tr("OK")); connect(event_ok_button,SIGNAL(clicked()),this,SLOT(okData()));
connect(button,SIGNAL(clicked()),this,SLOT(okData()));
// //
// Cancel Button // Cancel Button
// //
button=new QPushButton(this); event_cancel_button=new QPushButton(this);
button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); event_cancel_button->setFont(buttonFont());
button->setFont(buttonFont()); event_cancel_button->setText(tr("Cancel"));
button->setText(tr("Cancel")); connect(event_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
connect(button,SIGNAL(clicked()),this,SLOT(cancelData()));
// //
// Populate Data // Populate Data
@ -382,7 +333,7 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
edit_password_edit->setText(edit_recording->urlPassword()); edit_password_edit->setText(edit_recording->urlPassword());
edit_cutname=edit_recording->cutName(); edit_cutname=edit_recording->cutName();
if(!edit_recording->cutName().isEmpty()) { if(!edit_recording->cutName().isEmpty()) {
edit_destination_edit->setText("Cut "+edit_recording->cutName()); edit_source_edit->setText("Cut "+edit_recording->cutName());
} }
edit_metadata_box->setChecked(edit_recording->enableMetadata()); edit_metadata_box->setChecked(edit_recording->enableMetadata());
edit_mon_button->setChecked(edit_recording->mon()); edit_mon_button->setChecked(edit_recording->mon());
@ -408,16 +359,8 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
edit_normalize_spin->setValue(edit_recording->normalizationLevel()/100); edit_normalize_spin->setValue(edit_recording->normalizationLevel()/100);
} }
normalizeCheckData(edit_normalize_box->isChecked()); normalizeCheckData(edit_normalize_box->isChecked());
int feed_id=edit_recording->feedId(); edit_feed_box->setCurrentText(edit_recording->feedKeyName());
sql="select `ID`,`KEY_NAME` from `FEEDS` order by `KEY_NAME`"; feedChangedData(edit_feed_box->currentIndex());
q=new RDSqlQuery(sql);
while(q->next()) {
edit_feed_box->insertItem(edit_feed_box->count(),q->value(1).toString());
if(q->value(0).toInt()==feed_id) {
edit_feed_box->setCurrentIndex(edit_feed_box->count()-1);
}
}
delete q;
} }
@ -451,6 +394,32 @@ void EditUpload::stationChangedData(const QString &str)
} }
void EditUpload::feedChangedData(int index)
{
edit_url_label->setEnabled(index==0);
edit_url_edit->setEnabled(index==0);
edit_username_label->setEnabled(index==0);
edit_username_edit->setEnabled(index==0);
edit_password_label->setEnabled(index==0);
edit_password_edit->setEnabled(index==0);
edit_format_label->setEnabled(index==0);
edit_format_edit->setEnabled(index==0);
edit_format_set_button->setEnabled(index==0);
edit_normalize_box->setEnabled(index==0);
edit_normalize_label->setEnabled(index==0);
edit_normalize_level_label->setEnabled(index==0);
edit_normalize_spin->setEnabled(index==0);
edit_normalize_unit->setEnabled(index==0);
edit_metadata_box->setEnabled(index==0);
edit_metadata_label->setEnabled(index==0);
}
void EditUpload::urlChangedData(const QString &str) void EditUpload::urlChangedData(const QString &str)
{ {
QUrl url(str); QUrl url(str);
@ -478,7 +447,7 @@ void EditUpload::selectCartData()
if(edit_cut_dialog->exec(&edit_cutname)) { if(edit_cut_dialog->exec(&edit_cutname)) {
edit_description_edit->setText(RDCutPath(edit_cutname)); edit_description_edit->setText(RDCutPath(edit_cutname));
str=QString(tr("Cut")); str=QString(tr("Cut"));
edit_destination_edit->setText(tr("Cut")+" "+edit_cutname); edit_source_edit->setText(tr("Cut")+" "+edit_cutname);
} }
} }
@ -495,6 +464,7 @@ void EditUpload::setFormatData()
void EditUpload::normalizeCheckData(bool state) void EditUpload::normalizeCheckData(bool state)
{ {
edit_normalize_label->setEnabled(state); edit_normalize_label->setEnabled(state);
edit_normalize_level_label->setEnabled(state);
edit_normalize_spin->setEnabled(state); edit_normalize_spin->setEnabled(state);
edit_normalize_unit->setEnabled(state); edit_normalize_unit->setEnabled(state);
} }
@ -516,31 +486,33 @@ void EditUpload::saveasData()
void EditUpload::okData() void EditUpload::okData()
{ {
if(!CheckFormat()) { if(edit_feed_box->currentIndex()==0) { // No RSS feed selected
QMessageBox::warning(this,tr("Unsupported Format"), if(!CheckFormat()) {
tr("The currently selected export format is unsupported on host ")+edit_station_box->currentText()+"!"); QMessageBox::warning(this,tr("Unsupported Format"),
return; tr("The currently selected export format is unsupported on host ")+edit_station_box->currentText()+"!");
} return;
QUrl url(edit_url_edit->text()); }
if(url.isRelative()||(edit_url_edit->text().right(1)=="/")) { QUrl url(edit_url_edit->text());
QMessageBox::warning(this,tr("Invalid URL"),tr("The URL is invalid!")); if(url.isRelative()||(edit_url_edit->text().right(1)=="/")) {
return; QMessageBox::warning(this,tr("Invalid URL"),tr("The URL is invalid!"));
} return;
QString scheme=url.scheme(); }
if((scheme!="ftp")&&(scheme!="ftps")&&(scheme!="file")&& QString scheme=url.scheme();
(scheme!="scp")&&(scheme!="sftp")) { if((scheme!="ftp")&&(scheme!="ftps")&&(scheme!="file")&&
QMessageBox::warning(this, (scheme!="scp")&&(scheme!="sftp")) {
tr("Invalid URL"),tr("Unsupported URL scheme!")); QMessageBox::warning(this,
return; tr("Invalid URL"),tr("Unsupported URL scheme!"));
} return;
if((scheme=="file")&&(edit_username_edit->text().isEmpty())) { }
QMessageBox::warning(this,tr("Missing Username"), if((scheme=="file")&&(edit_username_edit->text().isEmpty())) {
tr("You must specify a username!")); QMessageBox::warning(this,tr("Missing Username"),
return; tr("You must specify a username!"));
return;
}
} }
if(!CheckEvent(false)) { if(!CheckEvent(false)) {
QMessageBox::warning(this,tr("Duplicate Event"), QMessageBox::warning(this,tr("Duplicate Event"),
tr("An event with these parameters already exists!")); tr("An event with these parameters already exists!"));
return; return;
} }
Save(); Save();
@ -554,6 +526,68 @@ void EditUpload::cancelData()
} }
void EditUpload::resizeEvent(QResizeEvent *e)
{
edit_active_button->setGeometry(10,11,20,20);
edit_active_label->setGeometry(30,11,125,20);
edit_station_box->setGeometry(200,10,140,23);
edit_station_label->setGeometry(125,10,70,23);
edit_starttime_edit->setGeometry(sizeHint().width()-90,12,80,20);
edit_starttime_label->setGeometry(sizeHint().width()-175,12,80,20);
edit_source_edit->setGeometry(115,43,sizeHint().width()-195,20);
edit_source_label->setGeometry(10,43,100,19);
edit_source_select_button->setGeometry(sizeHint().width()-70,41,60,24);
edit_description_edit->setGeometry(115,70,sizeHint().width()-125,20);
edit_description_label->setGeometry(10,70,100,20);
edit_feed_box->setGeometry(115,97,160,20);
edit_feed_label->setGeometry(10,97,100,19);
edit_url_edit->setGeometry(115,124,sizeHint().width()-125,20);
edit_url_label->setGeometry(10,124,100,20);
edit_username_edit->setGeometry(115,151,150,20);
edit_username_label->setGeometry(10,151,100,20);
edit_password_edit->setGeometry(360,151,sizeHint().width()-370,20);
edit_password_label->setGeometry(275,151,80,20);
edit_username_edit->setGeometry(115,151,150,20);
edit_username_label->setGeometry(10,151,100,20);
edit_password_edit->setGeometry(360,151,sizeHint().width()-370,20);
edit_password_label->setGeometry(275,151,80,20);
edit_format_label->setGeometry(5,178,105,20);
edit_format_edit->setGeometry(115,178,sizeHint().width()-195,20);
edit_format_set_button->setGeometry(sizeHint().width()-70,176,60,24);
edit_normalize_box->setGeometry(115,208,15,15);
edit_normalize_label->setGeometry(135,206,83,20);
edit_normalize_spin->setGeometry(265,206,40,20);
edit_normalize_level_label->setGeometry(215,206,45,20);
edit_normalize_unit->setGeometry(310,206,40,20);
edit_metadata_box->setGeometry(115,231,15,15);
edit_metadata_label->setGeometry(135,231,160,20);
edit_mon_button->setGeometry(20,282,20,20);
edit_mon_label->setGeometry(40,282,115,20);
edit_tue_button->setGeometry(115,282,20,20);
edit_tue_label->setGeometry(135,282,115,20);
edit_wed_button->setGeometry(215,282,20,20);
edit_wed_label->setGeometry(235,282,115,20);
edit_thu_button->setGeometry(335,282,20,20);
edit_thu_label->setGeometry(355,282,115,20);
edit_fri_button->setGeometry(440,282,20,20);
edit_fri_label->setGeometry(460,282,40,20);
edit_sat_button->setGeometry(130,307,20,20);
edit_sat_label->setGeometry(150,307,60,20);
edit_sun_button->setGeometry(300,307,20,20);
edit_sun_label->setGeometry(320,307,60,20);
edit_oneshot_box->setGeometry(20,342,15,15);
edit_oneshot_label->setGeometry(40,340,115,20);
edit_eventoffset_spin->setGeometry(245,340,45,20);
edit_eventoffset_label->setGeometry(140,340,100,20);
edit_eventoffset_unit_label->setGeometry(295,340,40,20);
event_saveas_button->setGeometry(sizeHint().width()-300,sizeHint().height()-60,80,50);
event_ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
event_cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50);
}
void EditUpload::keyPressEvent(QKeyEvent *e) void EditUpload::keyPressEvent(QKeyEvent *e)
{ {
switch(e->key()) { switch(e->key()) {
@ -623,7 +657,7 @@ void EditUpload::Save()
edit_recording->setType(RDRecording::Upload); edit_recording->setType(RDRecording::Upload);
edit_recording->setStartTime(edit_starttime_edit->time()); edit_recording->setStartTime(edit_starttime_edit->time());
edit_recording->setDescription(edit_description_edit->text()); edit_recording->setDescription(edit_description_edit->text());
edit_recording->setCutName(edit_destination_edit->text().right(10)); edit_recording->setCutName(edit_source_edit->text().right(10));
edit_recording->setUrl(edit_url_edit->text()); edit_recording->setUrl(edit_url_edit->text());
edit_recording->setUrlUsername(edit_username_edit->text()); edit_recording->setUrlUsername(edit_username_edit->text());
edit_recording->setUrlPassword(edit_password_edit->text()); edit_recording->setUrlPassword(edit_password_edit->text());
@ -648,7 +682,19 @@ void EditUpload::Save()
else { else {
edit_recording->setNormalizationLevel(1); edit_recording->setNormalizationLevel(1);
} }
edit_recording->setFeedId(edit_feed_box->currentText());
//
// FIXME: The indexing schema for feeds is lame and fundamentally broken.
//
int feed_id=edit_feed_model->
feedId(edit_feed_model->index(edit_feed_box->currentIndex(),0));
if(feed_id==0) {
edit_recording->setFeedId(-1);
}
else {
edit_recording->setFeedId(feed_id);
}
// edit_recording->setFeedId(edit_feed_box->currentText());
} }
@ -659,7 +705,7 @@ bool EditUpload::CheckEvent(bool include_myself)
QString().sprintf("(`TYPE`=%d)&&",RDRecording::Upload)+ QString().sprintf("(`TYPE`=%d)&&",RDRecording::Upload)+
"(`START_TIME`='"+edit_starttime_edit->time().toString("hh:mm:ss")+"')&&"+ "(`START_TIME`='"+edit_starttime_edit->time().toString("hh:mm:ss")+"')&&"+
"(`URL`='"+RDEscapeString(edit_url_edit->text())+"')&&"+ "(`URL`='"+RDEscapeString(edit_url_edit->text())+"')&&"+
"(`CUT_NAME`='"+RDEscapeString(edit_destination_edit->text().right(10))+ "(`CUT_NAME`='"+RDEscapeString(edit_source_edit->text().right(10))+
"')"; "')";
if(edit_sun_button->isChecked()) { if(edit_sun_button->isChecked()) {
sql+="&&(`SUN`='Y')"; sql+="&&(`SUN`='Y')";

33
rdcatch/edit_upload.h
View File

@ -30,6 +30,7 @@
#include <rdcut_dialog.h> #include <rdcut_dialog.h>
#include <rddeck.h> #include <rddeck.h>
#include <rddialog.h> #include <rddialog.h>
#include <rdfeedlistmodel.h>
#include <rdrecording.h> #include <rdrecording.h>
class EditUpload : public RDDialog class EditUpload : public RDDialog
@ -43,6 +44,7 @@ class EditUpload : public RDDialog
private slots: private slots:
void stationChangedData(const QString &str); void stationChangedData(const QString &str);
void feedChangedData(int index);
void urlChangedData(const QString &str); void urlChangedData(const QString &str);
void selectCartData(); void selectCartData();
void setFormatData(); void setFormatData();
@ -52,6 +54,7 @@ class EditUpload : public RDDialog
void cancelData(); void cancelData();
protected: protected:
void resizeEvent(QResizeEvent *e);
void keyPressEvent(QKeyEvent *); void keyPressEvent(QKeyEvent *);
void closeEvent(QCloseEvent *e); void closeEvent(QCloseEvent *e);
@ -64,32 +67,58 @@ class EditUpload : public RDDialog
RDRecording *edit_recording; RDRecording *edit_recording;
RDSettings edit_settings; RDSettings edit_settings;
QCheckBox *edit_active_button; QCheckBox *edit_active_button;
QLabel *edit_active_label;
QLabel *edit_station_label;
RDComboBox *edit_station_box; RDComboBox *edit_station_box;
QLabel *edit_starttime_label;
QTimeEdit *edit_starttime_edit; QTimeEdit *edit_starttime_edit;
QLabel *edit_feed_label;
QComboBox *edit_feed_box; QComboBox *edit_feed_box;
RDFeedListModel *edit_feed_model;
QLabel *edit_description_label;
QLineEdit *edit_description_edit; QLineEdit *edit_description_edit;
QPushButton *edit_source_select_button;
QLabel *edit_url_label;
QLineEdit *edit_url_edit; QLineEdit *edit_url_edit;
QLabel *edit_username_label; QLabel *edit_username_label;
QLineEdit *edit_username_edit; QLineEdit *edit_username_edit;
QLabel *edit_password_label; QLabel *edit_password_label;
QLineEdit *edit_password_edit; QLineEdit *edit_password_edit;
QString edit_cutname; QString edit_cutname;
QLineEdit *edit_destination_edit; QLabel *edit_source_label;
QLineEdit *edit_source_edit;
QLabel *edit_format_label;
QLineEdit *edit_format_edit; QLineEdit *edit_format_edit;
QPushButton *edit_format_set_button;
QCheckBox *edit_normalize_box; QCheckBox *edit_normalize_box;
QLabel *edit_normalize_label; QLabel *edit_normalize_label;
QLabel *edit_normalize_level_label;
QSpinBox *edit_normalize_spin; QSpinBox *edit_normalize_spin;
QLabel *edit_normalize_unit; QLabel *edit_normalize_unit;
QCheckBox *edit_metadata_box; QCheckBox *edit_metadata_box;
QLabel *edit_metadata_label;
QCheckBox *edit_sun_button; QCheckBox *edit_sun_button;
QLabel *edit_sun_label;
QCheckBox *edit_mon_button; QCheckBox *edit_mon_button;
QLabel *edit_mon_label;
QCheckBox *edit_tue_button; QCheckBox *edit_tue_button;
QLabel *edit_tue_label;
QCheckBox *edit_wed_button; QCheckBox *edit_wed_button;
QLabel *edit_wed_label;
QCheckBox *edit_thu_button; QCheckBox *edit_thu_button;
QLabel *edit_thu_label;
QCheckBox *edit_fri_button; QCheckBox *edit_fri_button;
QLabel *edit_fri_label;
QCheckBox *edit_sat_button; QCheckBox *edit_sat_button;
QLabel *edit_sat_label;
QLabel *edit_eventoffset_label;
QSpinBox *edit_eventoffset_spin; QSpinBox *edit_eventoffset_spin;
QLabel *edit_eventoffset_unit_label;
QCheckBox *edit_oneshot_box; QCheckBox *edit_oneshot_box;
QLabel *edit_oneshot_label;
QPushButton *event_saveas_button;
QPushButton *event_ok_button;
QPushButton *event_cancel_button;
std::vector<int> *edit_added_events; std::vector<int> *edit_added_events;
QString *edit_filter; QString *edit_filter;
QString edit_group; QString edit_group;
@ -97,4 +126,4 @@ class EditUpload : public RDDialog
}; };
#endif #endif // EDIT_UPLOAD_H

25
rdcatch/recordlistmodel.cpp
View File

@ -195,9 +195,7 @@ QVariant RecordListModel::data(const QModelIndex &index,int role) const
return d_texts.at(row).at(col); return d_texts.at(row).at(col);
case Qt::DecorationRole: case Qt::DecorationRole:
if(col==0) { return d_icons.at(row).at(col);
return d_icons.at(row);
}
case Qt::TextAlignmentRole: case Qt::TextAlignmentRole:
return d_alignments.at(col); return d_alignments.at(col);
@ -534,8 +532,17 @@ void RecordListModel::updateRow(int row,RDSqlQuery *q)
// //
// Qt::DecorationType // Qt::DecorationType
// //
d_icons[row]= QList<QVariant> icons;
for(int i=0;i<columnCount();i++) {
icons.push_back(QPixmap());
}
icons[0]=
rda->iconEngine()->catchIcon((RDRecording::Type)q->value(26).toUInt()); rda->iconEngine()->catchIcon((RDRecording::Type)q->value(26).toUInt());
icons[1]=rda->iconEngine()->stationIcon();
if(!q->value(47).isNull()) {
icons[13]=QImage::fromData(q->value(47).toByteArray()).
scaled(22,22,Qt::IgnoreAspectRatio,Qt::SmoothTransformation);
}
// //
// Qt::DisplayType // Qt::DisplayType
@ -593,7 +600,7 @@ void RecordListModel::updateRow(int row,RDSqlQuery *q)
texts[27]=q->value(0).toString(); // Id texts[27]=q->value(0).toString(); // Id
texts[28]=q->value(26).toString(); // Type texts[28]=q->value(26).toString(); // Type
texts[31]=QString().sprintf("%u",RDDeck::Idle); texts[31]=QString().sprintf("%u",RDDeck::Idle);
// item->setPixmap(0,*(catch_type_maps[q->value(26).toInt()]));
switch((RDRecording::Type)q->value(26).toInt()) { switch((RDRecording::Type)q->value(26).toInt()) {
case RDRecording::Recording: case RDRecording::Recording:
texts[1]=q->value(3).toString()+ texts[1]=q->value(3).toString()+
@ -767,6 +774,7 @@ void RecordListModel::updateRow(int row,RDSqlQuery *q)
break; break;
} }
d_icons[row]=icons;
d_texts[row]=texts; d_texts[row]=texts;
} }
@ -819,10 +827,13 @@ QString RecordListModel::sqlFields() const
"`RECORDINGS`.`URL`,"+ // 42 "`RECORDINGS`.`URL`,"+ // 42
"`RECORDINGS`.`QUALITY`,"+ // 43 "`RECORDINGS`.`QUALITY`,"+ // 43
"`FEEDS`.`KEY_NAME`,"+ // 44 "`FEEDS`.`KEY_NAME`,"+ // 44
"`EXIT_TEXT` "+ // 45 "`FEEDS`.`CHANNEL_IMAGE_ID`,"+ // 45
"`RECORDINGS`.`EXIT_TEXT`,"+ // 46
"`FEED_IMAGES`.`DATA` "+ // 47
"from `RECORDINGS` left join `CUTS` "+ "from `RECORDINGS` left join `CUTS` "+
"on (`RECORDINGS`.`CUT_NAME`=`CUTS`.`CUT_NAME`) left join `FEEDS` "+ "on (`RECORDINGS`.`CUT_NAME`=`CUTS`.`CUT_NAME`) left join `FEEDS` "+
"on (`RECORDINGS`.`FEED_ID`=`FEEDS`.`ID`) "; "on (`RECORDINGS`.`FEED_ID`=`FEEDS`.`ID`) left join `FEED_IMAGES` "+
"on (`FEEDS`.`ID`=`FEED_IMAGES`.`FEED_ID`) ";
return sql; return sql;
} }

2
rdcatch/recordlistmodel.h
View File

@ -89,7 +89,7 @@ class RecordListModel : public QAbstractTableModel
QList<QVariant> d_back_colors; QList<QVariant> d_back_colors;
QList<bool> d_is_nexts; QList<bool> d_is_nexts;
QList<RDDeck::Status> d_statuses; QList<RDDeck::Status> d_statuses;
QList<QVariant> d_icons; QList<QList<QVariant> > d_icons;
QString d_filter_sql; QString d_filter_sql;
}; };