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

2021-02-25 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in sound panels where changing the name of
	a panel would fail to be reflected in the panel selector.
	* Fixed regressions in sound panels where configuration changes
	would not be updated properly.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-02-25 14:16:58 -05:00
parent 6ee9578318
commit a923e8953d
4 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/rdbutton_dialog.cpp
View File

@@ -2,7 +2,7 @@
//
// Button Editor for SoundPanel
//
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
//
// 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
@@ -18,15 +18,14 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qpushbutton.h>
#include <qlabel.h>
#include <qcolordialog.h>
#include <rddb.h>
#include <rdcart.h>
#include <rdcart_dialog.h>
#include <rd.h>
#include <rdbutton_dialog.h>
#include <rdconf.h>
#include <QColorDialog>
#include "rdbutton_dialog.h"
#include "rdcart.h"
#include "rdcart_dialog.h"
#include "rdconf.h"
#include "rd.h"
#include "rddb.h"
RDButtonDialog::RDButtonDialog(QString station_name,const QString &caption,
const QString &label_template,
@@ -154,7 +153,7 @@ int RDButtonDialog::exec(RDPanelButton *button,bool hookmode,
void RDButtonDialog::setCartData()
{
if(edit_cart_dialog->exec(&edit_cart,RDCart::All,edit_svcname,NULL)==0) {
if(edit_cart_dialog->exec(&edit_cart,RDCart::All,edit_svcname,NULL)) {
DisplayCart(edit_cart);
}
}
@@ -205,13 +204,13 @@ void RDButtonDialog::okData()
edit_button->setActiveLength(edit_button->length(edit_hookmode));
edit_button->setHookMode(edit_hookmode);
delete cart;
done(0);
done(true);
}
void RDButtonDialog::cancelData()
{
done(-1);
done(false);
}