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

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

Browse Source 
* Left-Justified the position of the 'Reset', 'Setup' and 'All'
	buttons in the SoundPanel widget.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-06-16 19:03:31 -04:00
parent 731dbd53c1
commit 59ca615f8a
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -21904,3 +21904,6 @@
resizeable. resizeable.
2021-06-16 Fred Gleason <fredg@paravelsystems.com> 2021-06-16 Fred Gleason <fredg@paravelsystems.com>
* Modified 'systemd/daemon-reload.sh' to use bash(1) explicitly. * Modified 'systemd/daemon-reload.sh' to use bash(1) explicitly.
2021-06-16 Fred Gleason <fredg@paravelsystems.com>
* Left-Justified the position of the 'Reset', 'Setup' and 'All'
buttons in the SoundPanel widget.

6
lib/rdsound_panel.cpp
View File

@ -887,11 +887,11 @@ void RDSoundPanel::resizeEvent(QResizeEvent *e)
panel_selector_box->setGeometry(0,h-50,2*PANEL_BUTTON_SIZE_X+10,50); panel_selector_box->setGeometry(0,h-50,2*PANEL_BUTTON_SIZE_X+10,50);
panel_playmode_box->setGeometry(2*PANEL_BUTTON_SIZE_X+15,h-50, panel_playmode_box->setGeometry(2*PANEL_BUTTON_SIZE_X+15,h-50,
PANEL_BUTTON_SIZE_X+10,50); PANEL_BUTTON_SIZE_X+10,50);
panel_reset_button->setGeometry(w-2*PANEL_BUTTON_SIZE_X-20,h-50, panel_reset_button->setGeometry(2*PANEL_BUTTON_SIZE_X+140,h-50,
PANEL_BUTTON_SIZE_X,50); PANEL_BUTTON_SIZE_X,50);
panel_all_button->setGeometry(w-PANEL_BUTTON_SIZE_X-15,h-50, panel_all_button->setGeometry(2*PANEL_BUTTON_SIZE_X+235,h-50,
PANEL_BUTTON_SIZE_X,50); PANEL_BUTTON_SIZE_X,50);
panel_setup_button->setGeometry(w-PANEL_BUTTON_SIZE_X-15,h-50, panel_setup_button->setGeometry(2*PANEL_BUTTON_SIZE_X+235,h-50,
PANEL_BUTTON_SIZE_X,50); PANEL_BUTTON_SIZE_X,50);
} }

9
lib/rdsound_panel.h
View File

@ -67,8 +67,10 @@ class RDSoundPanel : public RDWidget
void setLogName(const QString &logname); void setLogName(const QString &logname);
void setSvcName(const QString &svcname); void setSvcName(const QString &svcname);
void play(RDAirPlayConf::PanelType type,int panel,int row,int col, void play(RDAirPlayConf::PanelType type,int panel,int row,int col,
RDLogLine::StartSource src,int mport=-1,bool pause_when_finished=false); RDLogLine::StartSource src,int mport=-1,
bool pause(RDAirPlayConf::PanelType type,int panel,int row,int col,int mport=-1); bool pause_when_finished=false);
bool pause(RDAirPlayConf::PanelType type,int panel,int row,int col,
int mport=-1);
void stop(RDAirPlayConf::PanelType type,int panel,int row,int col, void stop(RDAirPlayConf::PanelType type,int panel,int row,int col,
int mport=-1,bool pause_when_finished=false,int fade_out=0); int mport=-1,bool pause_when_finished=false,int fade_out=0);
void channelStop(int mport); void channelStop(int mport);
@ -127,7 +129,8 @@ class RDSoundPanel : public RDWidget
bool pause_when_finished=false); bool pause_when_finished=false);
bool PlayAudio(RDPanelButton *button,RDCart *cart,bool hookmode,int mport=-1); bool PlayAudio(RDPanelButton *button,RDCart *cart,bool hookmode,int mport=-1);
void PlayMacro(RDPanelButton *button,RDCart *cart); void PlayMacro(RDPanelButton *button,RDCart *cart);
void PauseButton(RDAirPlayConf::PanelType type,int panel,int row,int col,int mport=-1); void PauseButton(RDAirPlayConf::PanelType type,int panel,int row,int col,
int mport=-1);
void StopButton(RDAirPlayConf::PanelType type,int panel,int row,int col, void StopButton(RDAirPlayConf::PanelType type,int panel,int row,int col,
int mport=-1,bool pause_when_finished=false,int fade_out=0); int mport=-1,bool pause_when_finished=false,int fade_out=0);
void StopButton(int id); void StopButton(int id);

4
rdpanel/rdpanel.cpp
View File

@ -319,9 +319,9 @@ void MainWidget::masterTimerData()
void MainWidget::resizeEvent(QResizeEvent *e) void MainWidget::resizeEvent(QResizeEvent *e)
{ {
panel_panel->setGeometry(10,10,size().width()-10,size().height()-25); panel_panel->setGeometry(10,10,size().width()-10,size().height()-25);
panel_empty_cart->setGeometry(323,size().height()-56,32,32); panel_empty_cart->setGeometry(533,size().height()-56,32,32);
panel_stereo_meter-> panel_stereo_meter->
setGeometry(375, setGeometry(585,
size().height()-panel_stereo_meter->sizeHint().height()-7, size().height()-panel_stereo_meter->sizeHint().height()-7,
panel_stereo_meter->sizeHint().width(), panel_stereo_meter->sizeHint().width(),
panel_stereo_meter->sizeHint().height()); panel_stereo_meter->sizeHint().height());