diff --git a/ChangeLog b/ChangeLog index 0e9ea683..df3ecb1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21965,3 +21965,6 @@ 2021-06-26 Fred Gleason * Refactored the layout in rdairplay(1) to achieve cleaner separation of global and per-log UI elements. +2021-06-26 Fred Gleason + * Added an 'AIR_WIDGET_BACKGROUND_COLOR' define to + 'rdairplay/colors.h'. diff --git a/rdairplay/button_log.cpp b/rdairplay/button_log.cpp index d07755f4..4e635800 100644 --- a/rdairplay/button_log.cpp +++ b/rdairplay/button_log.cpp @@ -21,6 +21,7 @@ #include #include "button_log.h" +#include "colors.h" ButtonLog::ButtonLog(RDLogPlay *log,int id,RDAirPlayConf *conf,bool allow_pause, QWidget *parent) @@ -535,7 +536,8 @@ void ButtonLog::resizeEvent(QResizeEvent *e) void ButtonLog::paintEvent(QPaintEvent *e) { QPainter *p=new QPainter(this); - p->fillRect(0,0,size().width(),size().height(),QColor("#D0D0D0")); + p->fillRect(0,0,size().width(),size().height(), + QColor(AIR_WIDGET_BACKGROUND_COLOR)); delete p; } diff --git a/rdairplay/colors.h b/rdairplay/colors.h index 36165036..9a598470 100644 --- a/rdairplay/colors.h +++ b/rdairplay/colors.h @@ -75,6 +75,7 @@ // #define AIR_FLASH_COLOR Qt::blue #define AIR_ERROR_COLOR Qt::red +#define AIR_WIDGET_BACKGROUND_COLOR "#D0D0D0" // // LogLineBox Colors diff --git a/rdairplay/pie_counter.cpp b/rdairplay/pie_counter.cpp index a9874da6..30e7efad 100644 --- a/rdairplay/pie_counter.cpp +++ b/rdairplay/pie_counter.cpp @@ -43,7 +43,8 @@ PieCounter::PieCounter(int count_length,QWidget *parent) onair_on_palette=palette(); onair_on_palette.setColor(QPalette::Background,PIE_ONAIR_COLOR); onair_off_palette=palette(); - onair_on_palette.setColor(QPalette::Background,QColor("#D0D0D0")); + onair_on_palette. + setColor(QPalette::Background,QColor(AIR_WIDGET_BACKGROUND_COLOR)); setPalette(onair_on_palette); setAutoFillBackground(true);