Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-11 09:03:40 +02:00
Code Issues Projects Releases Wiki Activity

2021-06-14 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Made the sound panel resizeable in rdairplay(1).
	* Make the sound panel resizeable in rdpanel(1).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-06-14 20:00:53 -04:00
parent fb671f430d
commit a0023dbc1e
11 changed files with 126 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
rdpanel/rdpanel.cpp
View File

@@ -50,7 +50,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
//
#ifndef RESIZABLE
setMinimumSize(sizeHint());
setMaximumSize(sizeHint());
// setMaximumSize(sizeHint());
#endif // RESIZABLE
//
@@ -132,15 +132,12 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
rda->panelConf()->panels(RDAirPlayConf::UserPanel)){
int card=-1;
panel_panel=
new RDSoundPanel(RDPANEL_PANEL_BUTTON_COLUMNS,RDPANEL_PANEL_BUTTON_ROWS,
rda->panelConf()->panels(RDAirPlayConf::StationPanel),
new RDSoundPanel(rda->panelConf()->panels(RDAirPlayConf::StationPanel),
rda->panelConf()->panels(RDAirPlayConf::UserPanel),
rda->panelConf()->flashPanel(),
"RDPanel",
rda->panelConf()->buttonLabelTemplate(),true,
panel_player,panel_cart_dialog,this);
panel_panel->setGeometry(10,10,panel_panel->sizeHint().width(),
panel_panel->sizeHint().height());
panel_panel->setPauseEnabled(rda->panelConf()->panelPauseEnabled());
panel_panel->setCard(0,rda->panelConf()->card(RDAirPlayConf::SoundPanel1Channel));
panel_panel->setPort(0,rda->panelConf()->port(RDAirPlayConf::SoundPanel1Channel));
@@ -239,11 +236,6 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
// Audio Meter
//
panel_stereo_meter=new RDStereoMeter(this);
panel_stereo_meter->
setGeometry(20,
sizeHint().height()-panel_stereo_meter->sizeHint().height()-7,
panel_stereo_meter->sizeHint().width(),
panel_stereo_meter->sizeHint().height());
panel_stereo_meter->setMode(RDSegMeter::Peak);
panel_stereo_meter->setFocusPolicy(Qt::NoFocus);
@@ -251,7 +243,6 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
// Empty Cart
//
panel_empty_cart=new RDEmptyCart(this);
panel_empty_cart->setGeometry(373,sizeHint().height()-52,32,32);
if(!rda->station()->enableDragdrop()) {
panel_empty_cart->hide();
}
@@ -325,6 +316,18 @@ void MainWidget::masterTimerData()
}
void MainWidget::resizeEvent(QResizeEvent *e)
{
panel_panel->setGeometry(10,10,size().width()-10,size().height()-25);
panel_empty_cart->setGeometry(323,size().height()-56,32,32);
panel_stereo_meter->
setGeometry(375,
size().height()-panel_stereo_meter->sizeHint().height()-7,
panel_stereo_meter->sizeHint().width(),
panel_stereo_meter->sizeHint().height());
}
void MainWidget::wheelEvent(QWheelEvent *e)
{
if(e->orientation()==Qt::Vertical) {

5
rdpanel/rdpanel.h
View File

@@ -31,8 +31,8 @@
//
#define MASTER_TIMER_INTERVAL 100
#define METER_INTERVAL 50
#define RDPANEL_PANEL_BUTTON_ROWS 7
#define RDPANEL_PANEL_BUTTON_COLUMNS 9
//#define RDPANEL_PANEL_BUTTON_ROWS 7
//#define RDPANEL_PANEL_BUTTON_COLUMNS 9
#define RDPANEL_USAGE "\n"
class MainWidget : public RDWidget
@@ -51,6 +51,7 @@ class MainWidget : public RDWidget
void rmlReceivedData(RDMacro *rml);
protected:
void resizeEvent(QResizeEvent *e);
void wheelEvent(QWheelEvent *e);
void closeEvent(QCloseEvent *e);