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

2023-09-27 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed bugs in 'RDSoundPanel' affecting drag-and-drop operation.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2023-09-27 14:53:11 -04:00
parent f49d03682b
commit 901d93aabe
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -24391,3 +24391,5 @@
2023-09-27 Fred Gleason <fredg@paravelsystems.com> 2023-09-27 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'RDSoundPanel' where clicking a non-configured * Fixed a bug in 'RDSoundPanel' where clicking a non-configured
button in Setup mode would fail to open the 'Edit Button' dialog. button in Setup mode would fail to open the 'Edit Button' dialog.
2023-09-27 Fred Gleason <fredg@paravelsystems.com>
* Fixed bugs in 'RDSoundPanel' affecting drag-and-drop operation.

8
lib/rdbutton_panel.cpp
View File

@ -31,9 +31,11 @@ RDButtonPanel::RDButtonPanel(RDAirPlayConf::PanelType type,QWidget *parent)
panel_button[i][j]= panel_button[i][j]=
new RDPanelButton(i,j,rda->station(),rda->panelConf()->flashPanel(), new RDPanelButton(i,j,rda->station(),rda->panelConf()->flashPanel(),
parent); parent);
if(rda->station()->enableDragdrop()&& if(rda->station()->enableDragdrop()) {
(!rda->station()->enforcePanelSetup())) { panel_button[i][j]->setAllowDrags(true);
panel_button[i][j]->setAcceptDrops(true); if(!rda->station()->enforcePanelSetup()) {
panel_button[i][j]->setAcceptDrops(true);
}
} }
panel_button[i][j]->setGeometry((15+PANEL_BUTTON_SIZE_X)*j, panel_button[i][j]->setGeometry((15+PANEL_BUTTON_SIZE_X)*j,
(15+PANEL_BUTTON_SIZE_Y)*i, (15+PANEL_BUTTON_SIZE_Y)*i,

4
lib/rdpanel_button.cpp
View File

@ -2,7 +2,7 @@
// //
// The SoundPanel Button for RDAirPlay. // The SoundPanel Button for RDAirPlay.
// //
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2023 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as // it under the terms of the GNU General Public License version 2 as
@ -383,7 +383,7 @@ void RDPanelButton::mousePressEvent(QMouseEvent *e)
void RDPanelButton::mouseMoveEvent(QMouseEvent *e) void RDPanelButton::mouseMoveEvent(QMouseEvent *e)
{ {
button_move_count--; button_move_count--;
if(button_move_count==0) { if(button_allow_drags&&(button_move_count==0)) {
QPushButton::mouseReleaseEvent(e); QPushButton::mouseReleaseEvent(e);
QDrag *drag=new QDrag(this); QDrag *drag=new QDrag(this);
RDCartDrag *cd=new RDCartDrag(button_cart,button_text,button_color); RDCartDrag *cd=new RDCartDrag(button_cart,button_text,button_color);

9
lib/rdsound_panel.cpp
View File

@ -704,9 +704,10 @@ void RDSoundPanel::setupClickedData()
panel_playmode_box->setDisabled(true); panel_playmode_box->setDisabled(true);
} }
if(rda->station()->enableDragdrop()&&(rda->station()->enforcePanelSetup())) { if(rda->station()->enableDragdrop()&&(rda->station()->enforcePanelSetup())) {
for(int i=0;i<panel_panels.size();i++) { for(QMap<QString,QList<RDButtonPanel *> >::const_iterator it=
if(panel_panels.value(username).at(i)!=NULL) { panel_panels.begin();it!=panel_panels.end();it++) {
panel_panels.value(username).at(i)->setAcceptDrops(panel_setup_mode); for(int i=0;i<it.value().size();i++) {
it.value().at(i)->setAcceptDrops(panel_setup_mode);
} }
} }
} }
@ -716,8 +717,6 @@ void RDSoundPanel::setupClickedData()
void RDSoundPanel::buttonMapperData(int grid_pos) void RDSoundPanel::buttonMapperData(int grid_pos)
{ {
printf("buttonMapperData(%d)\n",grid_pos);
RDPanelButton *button=GetCurrentPanel()-> RDPanelButton *button=GetCurrentPanel()->
panelButton(grid_pos/PANEL_MAX_BUTTON_COLUMNS, panelButton(grid_pos/PANEL_MAX_BUTTON_COLUMNS,
grid_pos%PANEL_MAX_BUTTON_COLUMNS); grid_pos%PANEL_MAX_BUTTON_COLUMNS);