From dde4191bfeba800f7c895b2ba759b3380d494441 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Sat, 29 Apr 2023 14:07:24 -0400 Subject: [PATCH] 2023-04-29 Fred Gleason * Changed the behavior of the logo display in rdairplay(1) so as to show the default Rivendell logo when the 'Logo Image' control in rdadmin(1) is not set to a valid graphical image file. Signed-off-by: Fred Gleason --- ChangeLog | 4 ++++ rdairplay/topstrip.cpp | 10 +++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index bccecc10..e8ca5ffd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24045,3 +24045,7 @@ * Added a 'RDWidget::setBackgroundPixmap()' method. * Fixed a bug in the voice tracker in rdairplay(1) that caused the the track waveform areas to be painted solid black. +2023-04-29 Fred Gleason + * Changed the behavior of the logo display in rdairplay(1) so as to + show the default Rivendell logo when the 'Logo Image' control in + rdadmin(1) is not set to a valid graphical image file. diff --git a/rdairplay/topstrip.cpp b/rdairplay/topstrip.cpp index 171cecde..3af1d577 100644 --- a/rdairplay/topstrip.cpp +++ b/rdairplay/topstrip.cpp @@ -62,16 +62,12 @@ TopStrip::TopStrip(QWidget *parent) // Logo // QPixmap pix(rda->airplayConf()->logoPath()); + if(pix.isNull()) { + pix.load("/usr/share/pixmaps/rivendell/rdairplay_logo.png"); + } d_logo=new QLabel(this); d_logo->setAlignment(Qt::AlignCenter); d_logo->setPixmap(pix); - /* - d_logo->setFont(bannerFont()); - d_logo->setText(QString::asprintf("User Logo\n(%dx%d)", - RD_RDAIRPLAY_LOGO_WIDTH, - RD_RDAIRPLAY_LOGO_HEIGHT)); - d_logo->setStyleSheet("background-color: #99FF99"); - */ setFocusPolicy(Qt::NoFocus); }