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

2021-01-18 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdlibrary(1) that caused macro carts to
	get an evergreen background color.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-01-18 08:50:29 -05:00
parent cd581d3c51
commit fa323e8961
2 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -20821,3 +20821,6 @@
2021-01-17 Fred Gleason <fredg@paravelsystems.com>
* Restored enforcement of service authorized groups in rdairplay(1)
and rdlogedit(1).
2021-01-18 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdlibrary(1) that caused macro carts to
get an evergreen background color.

54
lib/rdlibrarymodel.cpp
View File

@ -603,37 +603,41 @@ void RDLibraryModel::updateRow(int row,RDSqlQuery *q)
d_texts[row][20]=q->value(21); // Owned By
d_notes[row]=q->value(30).toString();
switch((RDCart::Validity)q->value(22).toUInt()) {
case RDCart::NeverValid:
d_background_colors[row]=QColor(RD_CART_ERROR_COLOR);
break;
if(q->value(15).toUInt()==RDCart::Audio) {
switch((RDCart::Validity)q->value(22).toUInt()) {
case RDCart::NeverValid:
d_background_colors[row]=QColor(RD_CART_ERROR_COLOR);
break;
case RDCart::ConditionallyValid:
if(q->value(14).toDateTime().isValid()&&
(q->value(14).toDateTime()<QDateTime::currentDateTime())) {
d_background_colors[row]= QColor(RD_CART_ERROR_COLOR);
case RDCart::ConditionallyValid:
if(q->value(14).toDateTime().isValid()&&
(q->value(14).toDateTime()<QDateTime::currentDateTime())) {
d_background_colors[row]= QColor(RD_CART_ERROR_COLOR);
}
else {
d_background_colors[row]=QColor(RD_CART_CONDITIONAL_COLOR);
}
break;
case RDCart::FutureValid:
d_background_colors[row]=QColor(RD_CART_FUTURE_COLOR);
break;
case RDCart::AlwaysValid:
d_background_colors[row]=
QColor(palette().color(QPalette::Active,QColorGroup::Base));
break;
case RDCart::EvergreenValid:
d_background_colors[row]=QColor(RD_CART_EVERGREEN_COLOR);
break;
}
else {
d_background_colors[row]=QColor(RD_CART_CONDITIONAL_COLOR);
}
break;
case RDCart::FutureValid:
d_background_colors[row]=QColor(RD_CART_FUTURE_COLOR);
break;
case RDCart::AlwaysValid:
}
if(q->value(15).toUInt()==RDCart::Macro) {
d_background_colors[row]=
QColor(palette().color(QPalette::Active,QColorGroup::Base));
break;
case RDCart::EvergreenValid:
d_background_colors[row]=QColor(RD_CART_EVERGREEN_COLOR);
break;
}
// printf("start at: %d\n",q->at());
//
// Cut Attributes
//