Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-17 08:01:13 +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
Download Patch File Download Diff File Expand all files Collapse all files

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);
case Qt::DecorationRole:
if(col==0) {
return d_icons.at(row);
}
return d_icons.at(row).at(col);
case Qt::TextAlignmentRole:
return d_alignments.at(col);
@@ -534,8 +532,17 @@ void RecordListModel::updateRow(int row,RDSqlQuery *q)
//
// 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());
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
@@ -593,7 +600,7 @@ void RecordListModel::updateRow(int row,RDSqlQuery *q)
texts[27]=q->value(0).toString(); // Id
texts[28]=q->value(26).toString(); // Type
texts[31]=QString().sprintf("%u",RDDeck::Idle);
// item->setPixmap(0,*(catch_type_maps[q->value(26).toInt()]));
switch((RDRecording::Type)q->value(26).toInt()) {
case RDRecording::Recording:
texts[1]=q->value(3).toString()+
@@ -767,6 +774,7 @@ void RecordListModel::updateRow(int row,RDSqlQuery *q)
break;
}
d_icons[row]=icons;
d_texts[row]=texts;
}
@@ -819,10 +827,13 @@ QString RecordListModel::sqlFields() const
"`RECORDINGS`.`URL`,"+ // 42
"`RECORDINGS`.`QUALITY`,"+ // 43
"`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` "+
"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;
}