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

2018-08-17 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Corrected background colors of the Button Log and Message widgets
	in rdairplay(1).
This commit is contained in:
Fred Gleason 2018-08-17 10:43:41 -04:00
parent 3c93beb206
commit 72b851ecfa
4 changed files with 116 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -17468,3 +17468,6 @@
2018-08-17 Fred Gleason <fredg@paravelsystems.com> 2018-08-17 Fred Gleason <fredg@paravelsystems.com>
* Fixed incorrect column alignment in the library list in * Fixed incorrect column alignment in the library list in
rdlibrary(1). rdlibrary(1).
2018-08-17 Fred Gleason <fredg@paravelsystems.com>
* Corrected background colors of the Button Log and Message widgets
in rdairplay(1).

254
rdairplay/loglinebox.cpp
View File

@ -260,7 +260,7 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent)
line_trans_label->setAlignment(Qt::AlignRight); line_trans_label->setAlignment(Qt::AlignRight);
line_trans_label->setFont(line_bold_font); line_trans_label->setFont(line_bold_font);
SetColor(QColor(LOGLINEBOX_BACKGROUND_COLOR)); setBackgroundColor(QColor(LOGLINEBOX_BACKGROUND_COLOR));
// //
// Countdown Timer // Countdown Timer
@ -275,13 +275,13 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent)
QSize LogLineBox::sizeHint() const QSize LogLineBox::sizeHint() const
{ {
switch(line_mode) { switch(line_mode) {
case LogLineBox::Full: case LogLineBox::Full:
return QSize(393,LOGLINEBOX_FULL_HEIGHT); return QSize(393,LOGLINEBOX_FULL_HEIGHT);
break; break;
case LogLineBox::Half: case LogLineBox::Half:
return QSize(393,LOGLINEBOX_HALF_HEIGHT); return QSize(393,LOGLINEBOX_HALF_HEIGHT);
break; break;
} }
return QSize(0,0); return QSize(0,0);
} }
@ -326,46 +326,46 @@ RDLogLine *LogLineBox::logLine()
void LogLineBox::setMode(LogLineBox::Mode mode) void LogLineBox::setMode(LogLineBox::Mode mode)
{ {
switch(mode) { switch(mode) {
case LogLineBox::Full: case LogLineBox::Full:
switch(line_type) { switch(line_type) {
case RDLogLine::Cart: case RDLogLine::Cart:
if(log_id!=-1) { if(log_id!=-1) {
line_up_label->show(); line_up_label->show();
line_down_label->show(); line_down_label->show();
line_position_bar->show(); line_position_bar->show();
line_description_label->show(); line_description_label->show();
} }
else { else {
line_up_label->hide();
line_down_label->hide();
line_position_bar->hide();
line_description_label->hide();
}
break;
case RDLogLine::Marker:
case RDLogLine::Track:
case RDLogLine::Macro:
case RDLogLine::Chain:
line_up_label->hide();
line_down_label->hide();
line_position_bar->hide();
line_description_label->hide();
break;
default:
break;
}
line_comment_label->setGeometry(5,18,sizeHint().width()-10,62);
break;
case LogLineBox::Half:
line_up_label->hide(); line_up_label->hide();
line_down_label->hide(); line_down_label->hide();
line_position_bar->hide(); line_position_bar->hide();
line_description_label->hide(); line_description_label->hide();
line_comment_label->setGeometry(5,18,sizeHint().width()-10,31); }
break; break;
case RDLogLine::Marker:
case RDLogLine::Track:
case RDLogLine::Macro:
case RDLogLine::Chain:
line_up_label->hide();
line_down_label->hide();
line_position_bar->hide();
line_description_label->hide();
break;
default:
break;
}
line_comment_label->setGeometry(5,18,sizeHint().width()-10,62);
break;
case LogLineBox::Half:
line_up_label->hide();
line_down_label->hide();
line_position_bar->hide();
line_description_label->hide();
line_comment_label->setGeometry(5,18,sizeHint().width()-10,31);
break;
} }
line_mode=mode; line_mode=mode;
update(); update();
@ -375,13 +375,13 @@ void LogLineBox::setMode(LogLineBox::Mode mode)
void LogLineBox::setStatus(RDLogLine::Status status) void LogLineBox::setStatus(RDLogLine::Status status)
{ {
switch(status) { switch(status) {
case RDLogLine::Scheduled: case RDLogLine::Scheduled:
line_outcue_label->hide(); line_outcue_label->hide();
break; break;
default: default:
line_outcue_label->show(); line_outcue_label->show();
break; break;
} }
line_status=status; line_status=status;
} }
@ -403,28 +403,28 @@ void LogLineBox::setEvent(int line,RDLogLine::TransType next_type,
log_line=line; log_line=line;
line_type=logline->type(); line_type=logline->type();
switch(line_logline->transType()) { switch(line_logline->transType()) {
case RDLogLine::Stop: case RDLogLine::Stop:
line_trans_label->setText(tr("STOP")); line_trans_label->setText(tr("STOP"));
line_trans_label->setPalette(palette()); line_trans_label->setPalette(palette());
break; break;
case RDLogLine::Play: case RDLogLine::Play:
line_trans_label->setText(tr("PLAY")); line_trans_label->setText(tr("PLAY"));
line_trans_label->setPalette(palette()); line_trans_label->setPalette(palette());
break; break;
case RDLogLine::Segue: case RDLogLine::Segue:
line_trans_label->setText(tr("SEGUE")); line_trans_label->setText(tr("SEGUE"));
if(logline->hasCustomTransition()) { if(logline->hasCustomTransition()) {
line_trans_label->setPalette(line_transition_palette); line_trans_label->setPalette(line_transition_palette);
} }
else { else {
line_trans_label->setPalette(palette()); line_trans_label->setPalette(palette());
} }
break; break;
default: default:
break; break;
} }
switch(line_type) { switch(line_type) {
case RDLogLine::Cart: case RDLogLine::Cart:
@ -452,7 +452,7 @@ void LogLineBox::setEvent(int line,RDLogLine::TransType next_type,
line_icon_label->setPixmap(*line_playout_map); line_icon_label->setPixmap(*line_playout_map);
break; break;
} }
SetColor(QColor(LOGLINEBOX_MISSING_COLOR)); setBackgroundColor(QColor(LOGLINEBOX_MISSING_COLOR));
delete cart; delete cart;
delete cut; delete cut;
} }
@ -473,7 +473,7 @@ void LogLineBox::setEvent(int line,RDLogLine::TransType next_type,
line_comment_label->clear(); line_comment_label->clear();
line_icon_label->setPixmap(*line_playout_map); line_icon_label->setPixmap(*line_playout_map);
line_title_label->setText(logline->title()); line_title_label->setText(logline->title());
SetColor(QColor(LOGLINEBOX_MISSING_COLOR)); setBackgroundColor(QColor(LOGLINEBOX_MISSING_COLOR));
delete cart; delete cart;
delete cut; delete cut;
} }
@ -481,10 +481,10 @@ void LogLineBox::setEvent(int line,RDLogLine::TransType next_type,
line_cart_label-> line_cart_label->
setText(QString().sprintf("%06u",logline->cartNumber())); setText(QString().sprintf("%06u",logline->cartNumber()));
if(line_logline->evergreen()) { if(line_logline->evergreen()) {
SetColor(QColor(LOGLINEBOX_EVERGREEN_COLOR)); setBackgroundColor(QColor(LOGLINEBOX_EVERGREEN_COLOR));
} }
else { else {
SetColor(QColor(LOGLINEBOX_BACKGROUND_COLOR)); setBackgroundColor(QColor(LOGLINEBOX_BACKGROUND_COLOR));
} }
if(line_logline->source()==RDLogLine::Tracker) { if(line_logline->source()==RDLogLine::Tracker) {
line_icon_label->setPixmap(*line_track_cart_map); line_icon_label->setPixmap(*line_track_cart_map);
@ -552,7 +552,7 @@ void LogLineBox::setEvent(int line,RDLogLine::TransType next_type,
setText(RDResolveNowNext(line_outcue_template,line_logline)); setText(RDResolveNowNext(line_outcue_template,line_logline));
} }
else { else {
SetColor(QColor(LOGLINEBOX_MISSING_COLOR)); setBackgroundColor(QColor(LOGLINEBOX_MISSING_COLOR));
line_cut_label->clear(); line_cut_label->clear();
line_outcue_label->setText(tr("[NO VALID CUT AVAILABLE]")); line_outcue_label->setText(tr("[NO VALID CUT AVAILABLE]"));
} }
@ -567,7 +567,7 @@ void LogLineBox::setEvent(int line,RDLogLine::TransType next_type,
case RDLogLine::Marker: case RDLogLine::Marker:
line_icon_label->setPixmap(*line_notemarker_map); line_icon_label->setPixmap(*line_notemarker_map);
SetColor(QColor(LOGLINEBOX_MARKER_COLOR)); setBackgroundColor(QColor(LOGLINEBOX_MARKER_COLOR));
line_title_label->hide(); line_title_label->hide();
line_description_label->hide(); line_description_label->hide();
line_artist_label->hide(); line_artist_label->hide();
@ -582,7 +582,7 @@ void LogLineBox::setEvent(int line,RDLogLine::TransType next_type,
case RDLogLine::Track: case RDLogLine::Track:
line_icon_label->setPixmap(*line_mic16_map); line_icon_label->setPixmap(*line_mic16_map);
SetColor(QColor(LOGLINEBOX_MARKER_COLOR)); setBackgroundColor(QColor(LOGLINEBOX_MARKER_COLOR));
line_title_label->hide(); line_title_label->hide();
line_description_label->hide(); line_description_label->hide();
line_artist_label->hide(); line_artist_label->hide();
@ -597,7 +597,7 @@ void LogLineBox::setEvent(int line,RDLogLine::TransType next_type,
case RDLogLine::MusicLink: case RDLogLine::MusicLink:
line_icon_label->setPixmap(*line_music_map); line_icon_label->setPixmap(*line_music_map);
SetColor(QColor(LOGLINEBOX_MARKER_COLOR)); setBackgroundColor(QColor(LOGLINEBOX_MARKER_COLOR));
line_title_label->hide(); line_title_label->hide();
line_description_label->hide(); line_description_label->hide();
line_artist_label->hide(); line_artist_label->hide();
@ -612,7 +612,7 @@ void LogLineBox::setEvent(int line,RDLogLine::TransType next_type,
case RDLogLine::TrafficLink: case RDLogLine::TrafficLink:
line_icon_label->setPixmap(*line_traffic_map); line_icon_label->setPixmap(*line_traffic_map);
SetColor(QColor(LOGLINEBOX_MARKER_COLOR)); setBackgroundColor(QColor(LOGLINEBOX_MARKER_COLOR));
line_title_label->hide(); line_title_label->hide();
line_description_label->hide(); line_description_label->hide();
line_artist_label->hide(); line_artist_label->hide();
@ -627,7 +627,7 @@ void LogLineBox::setEvent(int line,RDLogLine::TransType next_type,
case RDLogLine::Chain: case RDLogLine::Chain:
line_icon_label->setPixmap(*line_chain_map); line_icon_label->setPixmap(*line_chain_map);
SetColor(QColor(LOGLINEBOX_CHAIN_COLOR)); setBackgroundColor(QColor(LOGLINEBOX_CHAIN_COLOR));
line_title_label->setText(logline->markerLabel()); line_title_label->setText(logline->markerLabel());
line_description_label->setText(""); line_description_label->setText("");
line_artist_label->setText(logline->markerComment()); line_artist_label->setText(logline->markerComment());
@ -648,10 +648,10 @@ void LogLineBox::setEvent(int line,RDLogLine::TransType next_type,
cut=new RDCut(QString().sprintf("%06u_%03u",logline->cartNumber(), cut=new RDCut(QString().sprintf("%06u_%03u",logline->cartNumber(),
logline->cutNumber())); logline->cutNumber()));
if(!cart->exists()) { if(!cart->exists()) {
SetColor(QColor(LOGLINEBOX_MISSING_COLOR)); setBackgroundColor(QColor(LOGLINEBOX_MISSING_COLOR));
} }
else { else {
SetColor(QColor(LOGLINEBOX_BACKGROUND_COLOR)); setBackgroundColor(QColor(LOGLINEBOX_BACKGROUND_COLOR));
} }
line_cart_label->setText(QString().sprintf("%06u",cart->number())); line_cart_label->setText(QString().sprintf("%06u",cart->number()));
line_cut_label->setText(""); line_cut_label->setText("");
@ -696,7 +696,7 @@ void LogLineBox::setTimer(int msecs)
void LogLineBox::clear() void LogLineBox::clear()
{ {
SetColor(QColor(LOGLINEBOX_BACKGROUND_COLOR)); setBackgroundColor(QColor(LOGLINEBOX_BACKGROUND_COLOR));
line_cart_label->setText(""); line_cart_label->setText("");
line_cut_label->setText(""); line_cut_label->setText("");
line_group_label->setText(""); line_group_label->setText("");
@ -732,33 +732,33 @@ void LogLineBox::clear()
void LogLineBox::setBarMode(LogLineBox::BarMode mode) void LogLineBox::setBarMode(LogLineBox::BarMode mode)
{ {
switch(mode) { switch(mode) {
case LogLineBox::Transitioning: case LogLineBox::Transitioning:
if(line_logline!=NULL) { if(line_logline!=NULL) {
if(line_logline->playPositionChanged()) { if(line_logline->playPositionChanged()) {
line_position_bar->setPalette(line_changed_play_palette); line_position_bar->setPalette(line_changed_play_palette);
} }
else { else {
line_position_bar->setPalette(line_unchanged_play_palette); line_position_bar->setPalette(line_unchanged_play_palette);
} }
} }
else { else {
line_position_bar->setPalette(line_unchanged_play_palette); line_position_bar->setPalette(line_unchanged_play_palette);
} }
break; break;
case LogLineBox::Stopping: case LogLineBox::Stopping:
if(line_logline!=NULL) { if(line_logline!=NULL) {
if(line_logline->playPositionChanged()) { if(line_logline->playPositionChanged()) {
line_position_bar->setPalette(line_changed_stop_palette); line_position_bar->setPalette(line_changed_stop_palette);
} }
else { else {
line_position_bar->setPalette(line_unchanged_stop_palette); line_position_bar->setPalette(line_unchanged_stop_palette);
} }
} }
else { else {
line_position_bar->setPalette(line_unchanged_stop_palette); line_position_bar->setPalette(line_unchanged_stop_palette);
} }
break; break;
} }
} }
@ -820,6 +820,8 @@ void LogLineBox::mouseDoubleClickEvent(QMouseEvent *e)
void LogLineBox::paintEvent(QPaintEvent *e) void LogLineBox::paintEvent(QPaintEvent *e)
{ {
QPainter *p=new QPainter(this); QPainter *p=new QPainter(this);
p->fillRect(0,0,sizeHint().width()-2,sizeHint().height()-2,
backgroundColor());
p->drawRect(0,0,sizeHint().width()-2,sizeHint().height()-2); p->drawRect(0,0,sizeHint().width()-2,sizeHint().height()-2);
p->end(); p->end();
delete p; delete p;
@ -842,42 +844,6 @@ void LogLineBox::dropEvent(QDropEvent *e)
} }
void LogLineBox::SetColor(QColor color)
{
setBackgroundColor(color);
// color=Qt::red;
line_cart_label->setBackgroundColor(color);
line_cart_label->setPalette(line_text_palette);
line_cut_label->setBackgroundColor(color);
line_cut_label->setPalette(line_text_palette);
line_group_label->setBackgroundColor(color);
line_trans_label->setBackgroundColor(color);
line_trans_label->setPalette(line_text_palette);
line_title_label->setBackgroundColor(color);
line_title_label->setPalette(line_text_palette);
line_description_label->setBackgroundColor(color);
line_description_label->setPalette(line_text_palette);
line_artist_label->setBackgroundColor(color);
line_artist_label->setPalette(line_text_palette);
line_outcue_label->setBackgroundColor(color);
line_outcue_label->setPalette(line_text_palette);
line_time_label->setBackgroundColor(color);
line_time_label->setPalette(line_text_palette);
line_length_label->setBackgroundColor(color);
line_length_label->setPalette(line_text_palette);
line_talktime_label->setBackgroundColor(color);
line_talktime_label->setPalette(line_text_palette);
line_up_label->setBackgroundColor(color);
line_up_label->setPalette(line_text_palette);
line_position_bar->setBackgroundColor(QColor(Qt::lightGray));
line_down_label->setBackgroundColor(color);
line_down_label->setPalette(line_text_palette);
line_comment_label->setBackgroundColor(color);
line_comment_label->setPalette(line_text_palette);
line_icon_label->setBackgroundColor(color);
}
void LogLineBox::UpdateCountdown() void LogLineBox::UpdateCountdown()
{ {
QTime current=QTime::currentTime().addMSecs(rda->station()->timeOffset()); QTime current=QTime::currentTime().addMSecs(rda->station()->timeOffset());

1
rdairplay/loglinebox.h
View File

@ -92,7 +92,6 @@ class LogLineBox : public QWidget
void dropEvent(QDropEvent *e); void dropEvent(QDropEvent *e);
private: private:
void SetColor(QColor);
void UpdateCountdown(); void UpdateCountdown();
void PrintTime(); void PrintTime();
QString TimeString(const QTime &time); QString TimeString(const QTime &time);

4
rdairplay/rdairplay.cpp
View File

@ -460,12 +460,14 @@ MainWidget::MainWidget(QWidget *parent)
air_message_label=new RDLabel(this); air_message_label=new RDLabel(this);
air_message_label->setGeometry(sizeHint().width()-425,70, air_message_label->setGeometry(sizeHint().width()-425,70,
MESSAGE_WIDGET_WIDTH,air_stereo_meter->sizeHint().height()); MESSAGE_WIDGET_WIDTH,air_stereo_meter->sizeHint().height());
air_message_label->setStyleSheet("background-color: "+
QColor(LOGLINEBOX_BACKGROUND_COLOR).name());
air_message_label->setWordWrapEnabled(true); air_message_label->setWordWrapEnabled(true);
air_message_label->setLineWidth(1); air_message_label->setLineWidth(1);
air_message_label->setMidLineWidth(1); air_message_label->setMidLineWidth(1);
air_message_label->setFrameStyle(Q3Frame::Box|Q3Frame::Raised); air_message_label->setFrameStyle(Q3Frame::Box|Q3Frame::Raised);
air_message_label->setAlignment(Qt::AlignCenter); air_message_label->setAlignment(Qt::AlignCenter);
air_message_label->setFocusPolicy(Qt::NoFocus); air_message_label->setFocusPolicy(Qt::NoFocus);
// //
// Stop Counter // Stop Counter