Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-30 15:42:34 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'deltecent-rdpanel-qt4'

Browse Source
This commit is contained in:
Fred Gleason 2018-11-09 14:01:28 -05:00
commit 8af01a466d
3 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -18003,3 +18003,7 @@
* Restored cart note bubbles in rdlibrary(1). * Restored cart note bubbles in rdlibrary(1).
2018-11-09 Patrick Linstruth <patrick@deltecent.com> 2018-11-09 Patrick Linstruth <patrick@deltecent.com>
* Fixed a regression in rdairplay(1) pie widget. * Fixed a regression in rdairplay(1) pie widget.
2018-11-09 Patrick Linstruth <patrick@deltecent.com>
* Fixed a regression in rdpanel(1) background image.
2018-11-09 Fred Gleason <fredg@paravelsystems.com>
* Removed a debugging printf in rdpanel(1).

26
rdpanel/rdpanel.cpp
View File

@ -53,8 +53,7 @@ RDCartDialog *panel_cart_dialog;
MainWidget::MainWidget(QWidget *parent) MainWidget::MainWidget(QWidget *parent)
: QWidget(parent) : QWidget(parent)
{ {
QPixmap *pm; QPixmap panel_skin_pixmap;
QPainter *pd;
QString err_msg; QString err_msg;
// //
@ -110,14 +109,12 @@ MainWidget::MainWidget(QWidget *parent)
// //
// Allocate Global Resources // Allocate Global Resources
// //
panel_skin_pixmap=new QPixmap(rda->panelConf()->skinPath()); panel_skin_pixmap=QPixmap(rda->panelConf()->skinPath());
if(panel_skin_pixmap->isNull()||(panel_skin_pixmap->width()<1024)|| if(!panel_skin_pixmap.isNull()&&(panel_skin_pixmap.width()>=1024)&&
(panel_skin_pixmap->height()<738)) { (panel_skin_pixmap.height()>=738)) {
delete panel_skin_pixmap; QPalette p=palette();
panel_skin_pixmap=NULL; p.setBrush(backgroundRole(),panel_skin_pixmap);
} setPalette(p);
else {
setErasePixmap(*panel_skin_pixmap);
} }
// //
@ -168,15 +165,6 @@ MainWidget::MainWidget(QWidget *parent)
panel_panel->setLogfile(rda->config()->airplayLogname()); panel_panel->setLogfile(rda->config()->airplayLogname());
panel_panel->setGeometry(10,10,panel_panel->sizeHint().width(), panel_panel->setGeometry(10,10,panel_panel->sizeHint().width(),
panel_panel->sizeHint().height()); panel_panel->sizeHint().height());
if(panel_skin_pixmap!=NULL) {
pm=new QPixmap(1024,738);
pd=new QPainter(pm);
pd->drawPixmap(-10,-10,*panel_skin_pixmap);
pd->end();
panel_panel->setErasePixmap(*pm);
delete pd;
delete pm;
}
panel_panel->setPauseEnabled(rda->panelConf()->panelPauseEnabled()); panel_panel->setPauseEnabled(rda->panelConf()->panelPauseEnabled());
panel_panel->setCard(0,rda->panelConf()->card(RDAirPlayConf::SoundPanel1Channel)); panel_panel->setCard(0,rda->panelConf()->card(RDAirPlayConf::SoundPanel1Channel));
panel_panel->setPort(0,rda->panelConf()->port(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_filter;
QString panel_group; QString panel_group;
QString panel_schedcode; QString panel_schedcode;
QPixmap *panel_skin_pixmap;
RDEmptyCart *panel_empty_cart; RDEmptyCart *panel_empty_cart;
}; };