diff --git a/ChangeLog b/ChangeLog index 780b1fff..18caf8f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21914,3 +21914,5 @@ color to be embedded when dragging a cart. 2021-06-16 Fred Gleason * Fixed a spelling typo in 'configure.ac'. +2021-06-17 Daniel Bair + * Update to support system dark themes 'rdairplay/loglinebox.cpp'. diff --git a/lib/librd_cs.ts b/lib/librd_cs.ts index c0f0dcef..53714790 100644 --- a/lib/librd_cs.ts +++ b/lib/librd_cs.ts @@ -3897,19 +3897,19 @@ End &OK - &OK + &OK &Cancel - &Zrušit + &Zrušit &Password: - He&slo: + He&slo: C&onfirm: - &Potvrdit: + &Potvrdit: Password Mismatch @@ -3925,6 +3925,18 @@ Zkuste to, prosím, znovu! OK OK + + Password: + + + + Confirm: + + + + Cancel + Zrušit + RDPodcastFilter diff --git a/lib/librd_de.ts b/lib/librd_de.ts index f8e8cd66..6840af87 100644 --- a/lib/librd_de.ts +++ b/lib/librd_de.ts @@ -3859,19 +3859,19 @@ End &OK - &OK + &OK &Cancel - &Abbrechen + &Abbrechen &Password: - &Paßwort: + &Paßwort: C&onfirm: - &Bestätigen: + &Bestätigen: Password Mismatch @@ -3887,6 +3887,18 @@ bitte erneut versuchen! OK OK + + Password: + + + + Confirm: + + + + Cancel + Abbrechen + RDPodcastFilter diff --git a/lib/librd_es.ts b/lib/librd_es.ts index 2092f7d0..8eb6a467 100644 --- a/lib/librd_es.ts +++ b/lib/librd_es.ts @@ -3861,19 +3861,19 @@ del audio &OK - &Aceptar + &Aceptar &Cancel - &Cancelar + &Cancelar &Password: - &Contraseña: + &Contraseña: C&onfirm: - C&onfirmar: + C&onfirmar: Password Mismatch @@ -3889,6 +3889,18 @@ please try again! OK Aceptar + + Password: + + + + Confirm: + + + + Cancel + Cancelar + RDPodcastFilter diff --git a/lib/librd_fr.ts b/lib/librd_fr.ts index 31a423b0..920c3010 100644 --- a/lib/librd_fr.ts +++ b/lib/librd_fr.ts @@ -3051,19 +3051,11 @@ End &OK - &OK + &OK &Cancel - &Annuler - - - &Password: - - - - C&onfirm: - + &Annuler Password Mismatch @@ -3078,6 +3070,18 @@ please try again! OK + + Password: + + + + Confirm: + + + + Cancel + + RDPodcastFilter diff --git a/lib/librd_nb.ts b/lib/librd_nb.ts index 988e7349..6a89e0b7 100644 --- a/lib/librd_nb.ts +++ b/lib/librd_nb.ts @@ -3809,19 +3809,19 @@ End &OK - &OK + &OK &Cancel - &Avbryt + &Avbryt &Password: - &Passord: + &Passord: C&onfirm: - &Stadfest: + &Stadfest: Password Mismatch @@ -3837,6 +3837,18 @@ prøv ein gong til! OK OK + + Password: + + + + Confirm: + + + + Cancel + + RDPodcastFilter diff --git a/lib/librd_nn.ts b/lib/librd_nn.ts index 988e7349..6a89e0b7 100644 --- a/lib/librd_nn.ts +++ b/lib/librd_nn.ts @@ -3809,19 +3809,19 @@ End &OK - &OK + &OK &Cancel - &Avbryt + &Avbryt &Password: - &Passord: + &Passord: C&onfirm: - &Stadfest: + &Stadfest: Password Mismatch @@ -3837,6 +3837,18 @@ prøv ein gong til! OK OK + + Password: + + + + Confirm: + + + + Cancel + + RDPodcastFilter diff --git a/lib/librd_pt_BR.ts b/lib/librd_pt_BR.ts index ff76af82..7167fdb8 100644 --- a/lib/librd_pt_BR.ts +++ b/lib/librd_pt_BR.ts @@ -3849,19 +3849,19 @@ End &OK - &OK + &OK &Cancel - &Cancelar + &Cancelar &Password: - &Senha: + &Senha: C&onfirm: - &Confirmar + &Confirmar Password Mismatch @@ -3877,6 +3877,18 @@ por favor, tente novamente! OK OK + + Password: + + + + Confirm: + + + + Cancel + Cancelar + RDPodcastFilter diff --git a/rdairplay/loglinebox.cpp b/rdairplay/loglinebox.cpp index c22aa1bc..f9993b53 100644 --- a/rdairplay/loglinebox.cpp +++ b/rdairplay/loglinebox.cpp @@ -111,6 +111,10 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent) line_changed_play_palette.setColor(QPalette::Inactive,QPalette::Highlight, QColor(BAR_CHANGED_TRANSITION_COLOR)); line_time_palette=QGuiApplication::palette(); + line_time_palette.setColor(QPalette::Active,QPalette::Foreground, + QColor(Qt::black)); + line_time_palette.setColor(QPalette::Inactive,QPalette::Foreground, + QColor(Qt::black)); line_hard_palette=QGuiApplication::palette(); line_hard_palette.setColor(QPalette::Active,QPalette::Foreground, QColor(LOG_HARDTIME_TEXT_COLOR)); @@ -140,6 +144,7 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent) // line_up_label=new QLabel(this); line_up_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + line_up_label->setPalette(line_text_palette); line_up_label->setFont(line_font); line_up_label->hide(); @@ -155,6 +160,7 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent) // line_down_label=new QLabel(this); line_down_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); + line_down_label->setPalette(line_text_palette); line_down_label->setFont(line_font); line_down_label->hide(); @@ -162,6 +168,7 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent) // Cut Description // line_description_label=new QLabel(this); + line_description_label->setPalette(line_text_palette); line_description_label->setFont(line_font); line_description_label->hide(); @@ -169,6 +176,7 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent) // Outcue // line_outcue_label=new QLabel(this); + line_outcue_label->setPalette(line_text_palette); line_outcue_label->setFont(outcue_font); line_outcue_label->hide(); @@ -176,18 +184,21 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent) // Artist // line_artist_label=new QLabel(this); + line_artist_label->setPalette(line_text_palette); line_artist_label->setFont(line_font); // // Title // line_title_label=new QLabel(this); + line_title_label->setPalette(line_text_palette); line_title_label->setFont(line_bold_font); // // Marker Comment // line_comment_label=new QLabel(this); + line_comment_label->setPalette(line_text_palette); line_comment_label->setFont(line_font); line_comment_label->setAlignment(Qt::AlignTop|Qt::AlignLeft); line_comment_label->setWordWrap(true); @@ -202,12 +213,14 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent) // Cart // line_cart_label=new QLabel(this); + line_cart_label->setPalette(line_text_palette); line_cart_label->setFont(line_font); // // Cut // line_cut_label=new QLabel(this); + line_cut_label->setPalette(line_text_palette); line_cut_label->setFont(line_font); // @@ -228,6 +241,7 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent) // Talk Time // line_talktime_label=new QLabel(this); + line_talktime_label->setPalette(line_text_palette); line_talktime_label->setFont(talk_font); line_talktime_label->setAlignment(Qt::AlignRight); @@ -235,6 +249,7 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent) // Length // line_length_label=new QLabel(this); + line_length_label->setPalette(line_text_palette); line_length_label->setFont(line_font); line_length_label->setAlignment(Qt::AlignRight); @@ -243,6 +258,7 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent) // line_trans_label=new QLabel(this); line_trans_label->setAlignment(Qt::AlignRight); + line_trans_label->setPalette(line_text_palette); line_trans_label->setFont(line_bold_font); // setBackgroundColor(QColor(LOGLINEBOX_BACKGROUND_COLOR)); @@ -408,12 +424,12 @@ void LogLineBox::setEvent(int line,RDLogLine::TransType next_type, switch(line_logline->transType()) { case RDLogLine::Stop: line_trans_label->setText(tr("STOP")); - line_trans_label->setPalette(QGuiApplication::palette()); + line_trans_label->setPalette(line_text_palette); break; case RDLogLine::Play: line_trans_label->setText(tr("PLAY")); - line_trans_label->setPalette(QGuiApplication::palette()); + line_trans_label->setPalette(line_text_palette); break; case RDLogLine::Segue: @@ -422,7 +438,7 @@ void LogLineBox::setEvent(int line,RDLogLine::TransType next_type, line_trans_label->setPalette(line_transition_palette); } else { - line_trans_label->setPalette(QGuiApplication::palette()); + line_trans_label->setPalette(line_text_palette); } break;