Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-06-12 22:30:27 +02:00
Code Issues Projects Releases Wiki Activity

2022-04-30 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdairplay(1) that caused all of the button
	labels in the Button Log widget to be initialized with a black
	background.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2022-04-30 18:29:28 -04:00
parent 52cfa40dbc
commit dd991ebe0d
2 changed files with 11 additions and 4 deletions

4
ChangeLog

@ -23017,3 +23017,7 @@
the added event. the added event.
2022-04-30 Fred Gleason <fredg@paravelsystems.com> 2022-04-30 Fred Gleason <fredg@paravelsystems.com>
* Removed debugging printf()s from lib/rdmarkerview.cpp'. * Removed debugging printf()s from lib/rdmarkerview.cpp'.
2022-04-30 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdairplay(1) that caused all of the button
labels in the Button Log widget to be initialized with a black
background.

11
rdairplay/loglinebox.cpp

@ -2,7 +2,7 @@
// //
// On Air Playout Utility for Rivendell. // On Air Playout Utility for Rivendell.
// //
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as // it under the terms of the GNU General Public License version 2 as
@ -302,6 +302,8 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent)
line_trans_label->setStyleSheet("background-color: #FF00FF"); line_trans_label->setStyleSheet("background-color: #FF00FF");
#endif // COLORIZE_LAYOUT #endif // COLORIZE_LAYOUT
SetPalette(line_default_palette,Qt::black);
setAcceptDrops(true); setAcceptDrops(true);
} }
@ -893,7 +895,8 @@ void LogLineBox::paintEvent(QPaintEvent *e)
{ {
QPainter *p=new QPainter(this); QPainter *p=new QPainter(this);
p->fillRect(0,0,size().width()-2,size().height()-2, p->fillRect(0,0,size().width()-2,size().height()-2,
palette().color(QPalette::Window)); palette().color(QPalette::Window));
// QGuiApplication::palette().color(QPalette::Window));
p->setPen(palette().color(QPalette::Dark)); p->setPen(palette().color(QPalette::Dark));
p->drawRect(0,0,size().width()-1,size().height()-1); p->drawRect(0,0,size().width()-1,size().height()-1);
p->end(); p->end();
@ -924,8 +927,8 @@ void LogLineBox::dropEvent(QDropEvent *e)
void LogLineBox::SetPalette(const QPalette &pal,const QColor &grp_color) void LogLineBox::SetPalette(const QPalette &pal,const QColor &grp_color)
{ {
// printf("%d:SetPalette(%s,%s)\n",log_line, // printf("%d:SetPalette(%s,%s)\n",log_line,
// pal.color(QPalette::WindowText).name().toUtf8().constData(), // pal.color(QPalette::WindowText).name().toUtf8().constData(),
// pal.color(QPalette::Window).name().toUtf8().constData()); // pal.color(QPalette::Window).name().toUtf8().constData());
setPalette(pal); setPalette(pal);
setStyleSheet("color:"+pal.color(QPalette::WindowText).name()+ setStyleSheet("color:"+pal.color(QPalette::WindowText).name()+
";background-color:"+pal.color(QPalette::Window).name()); ";background-color:"+pal.color(QPalette::Window).name());