Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-08 16:37:46 +02:00
Code Issues Projects Releases Wiki Activity

Fixed a regression in rdpanel(1) background image.

Browse Source
This commit is contained in:
Patrick Linstruth 2018-11-09 07:35:12 -08:00
parent 85a7704854
commit d58fa84afe
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -17999,3 +17999,5 @@
* Tweaked layout and appearance of the status bubble in rdmonitor(1).
2018-11-09 Fred Gleason <fredg@paravelsystems.com>
* Removed superceded 'StatusTip' class from rdmonitor(1).
2018-11-09 Patrick Linstruth <patrick@deltecent.com>
* Fixed a regression in rdpanel(1) background image.

20
rdpanel/rdpanel.cpp
View File

@ -53,8 +53,7 @@ RDCartDialog *panel_cart_dialog;
MainWidget::MainWidget(QWidget *parent)
: QWidget(parent)
{
QPixmap *pm;
QPainter *pd;
QPixmap panel_skin_pixmap;
QString err_msg;
//
@ -110,14 +109,13 @@ MainWidget::MainWidget(QWidget *parent)
//
// Allocate Global Resources
//
panel_skin_pixmap=new QPixmap(rda->panelConf()->skinPath());
if(panel_skin_pixmap->isNull()||(panel_skin_pixmap->width()<1024)||
(panel_skin_pixmap->height()<738)) {
delete panel_skin_pixmap;
panel_skin_pixmap=NULL;
}
else {
setErasePixmap(*panel_skin_pixmap);
panel_skin_pixmap=QPixmap(rda->panelConf()->skinPath());
if(!panel_skin_pixmap.isNull()&&(panel_skin_pixmap.width()>=1024)&&
(panel_skin_pixmap.height()>=738)) {
QPalette p=palette();
p.setBrush(backgroundRole(),panel_skin_pixmap);
setPalette(p);
fprintf(stderr,"setPalette\n");
}
//
@ -168,6 +166,7 @@ MainWidget::MainWidget(QWidget *parent)
panel_panel->setLogfile(rda->config()->airplayLogname());
panel_panel->setGeometry(10,10,panel_panel->sizeHint().width(),
panel_panel->sizeHint().height());
#if 0
if(panel_skin_pixmap!=NULL) {
pm=new QPixmap(1024,738);
pd=new QPainter(pm);
@ -177,6 +176,7 @@ MainWidget::MainWidget(QWidget *parent)
delete pd;
delete pm;
}
#endif
panel_panel->setPauseEnabled(rda->panelConf()->panelPauseEnabled());
panel_panel->setCard(0,rda->panelConf()->card(RDAirPlayConf::SoundPanel1Channel));
panel_panel->setPort(0,rda->panelConf()->port(RDAirPlayConf::SoundPanel1Channel));

1
rdpanel/rdpanel.h
View File

@ -71,7 +71,6 @@ class MainWidget : public QWidget
QString panel_filter;
QString panel_group;
QString panel_schedcode;
QPixmap *panel_skin_pixmap;
RDEmptyCart *panel_empty_cart;
};