mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-05-19 22:48:01 +02:00
2021-02-25 Fred Gleason <fredg@paravelsystems.com>
* Fixed regressions in rdairplay(1), rdcastmanager(1) and rdcatch(1) where configuration changes would not be updated properly. Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
parent
a923e8953d
commit
33921a3781
@ -21228,3 +21228,6 @@
|
|||||||
a panel would fail to be reflected in the panel selector.
|
a panel would fail to be reflected in the panel selector.
|
||||||
* Fixed regressions in sound panels where configuration changes
|
* Fixed regressions in sound panels where configuration changes
|
||||||
would not be updated properly.
|
would not be updated properly.
|
||||||
|
2021-02-25 Fred Gleason <fredg@paravelsystems.com>
|
||||||
|
* Fixed regressions in rdairplay(1), rdcastmanager(1) and
|
||||||
|
rdcatch(1) where configuration changes would not be updated properly.
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
//
|
//
|
||||||
// A Dialog Box for using an RDDatePicker widget.
|
// A Dialog Box for using an RDDatePicker widget.
|
||||||
//
|
//
|
||||||
// (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
|
// This program is free software; you can redistribute it and/or modify
|
||||||
// it under the terms of the GNU Library General Public License
|
// it under the terms of the GNU Library General Public License
|
||||||
@ -18,20 +18,10 @@
|
|||||||
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <qapplication.h>
|
#include <QPushButton>
|
||||||
#include <qwidget.h>
|
|
||||||
#include <qpushbutton.h>
|
|
||||||
#include <qrect.h>
|
|
||||||
#include <qpoint.h>
|
|
||||||
#include <qpainter.h>
|
|
||||||
#include <qstring.h>
|
|
||||||
#include <qmessagebox.h>
|
|
||||||
#include <qlineedit.h>
|
|
||||||
#include <qlabel.h>
|
|
||||||
#include <qsignalmapper.h>
|
|
||||||
|
|
||||||
#include <rdconf.h>
|
#include "rdconf.h"
|
||||||
#include <rddatedialog.h>
|
#include "rddatedialog.h"
|
||||||
|
|
||||||
//
|
//
|
||||||
// Global Classes
|
// Global Classes
|
||||||
@ -93,11 +83,11 @@ int RDDateDialog::exec(QDate *date)
|
|||||||
void RDDateDialog::okData()
|
void RDDateDialog::okData()
|
||||||
{
|
{
|
||||||
*date_date=date_picker->date();
|
*date_date=date_picker->date();
|
||||||
done(0);
|
done(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void RDDateDialog::cancelData()
|
void RDDateDialog::cancelData()
|
||||||
{
|
{
|
||||||
done(-1);
|
done(false);
|
||||||
}
|
}
|
||||||
|
@ -2206,7 +2206,7 @@ void MainWidget::SetActionMode(StartButton::Mode mode)
|
|||||||
air_panel->setActionMode(RDAirPlayConf::Normal);
|
air_panel->setActionMode(RDAirPlayConf::Normal);
|
||||||
}
|
}
|
||||||
if(air_cart_dialog->
|
if(air_cart_dialog->
|
||||||
exec(&air_add_cart,RDCart::All,air_log[0]->serviceName(),NULL)==0) {
|
exec(&air_add_cart,RDCart::All,air_log[0]->serviceName(),NULL)) {
|
||||||
SetActionMode(StartButton::AddTo);
|
SetActionMode(StartButton::AddTo);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -313,7 +313,7 @@ void EditCast::expirationSelectData()
|
|||||||
|
|
||||||
RDDateDialog *dd=
|
RDDateDialog *dd=
|
||||||
new RDDateDialog(1970,current_date.year()+10,this);
|
new RDDateDialog(1970,current_date.year()+10,this);
|
||||||
if(dd->exec(&date)==0) {
|
if(dd->exec(&date)) {
|
||||||
cast_item_expiration_edit->setDate(date);
|
cast_item_expiration_edit->setDate(date);
|
||||||
}
|
}
|
||||||
delete dd;
|
delete dd;
|
||||||
|
@ -287,15 +287,13 @@ void EditCartEvent::selectCartData()
|
|||||||
if(edit_cart!=NULL) {
|
if(edit_cart!=NULL) {
|
||||||
cartnum=edit_cart->number();
|
cartnum=edit_cart->number();
|
||||||
}
|
}
|
||||||
switch(catch_cart_dialog->exec(&cartnum,RDCart::Macro,QString(),NULL)) {
|
if(catch_cart_dialog->exec(&cartnum,RDCart::Macro,QString(),NULL)) {
|
||||||
case 0:
|
if(edit_cart!=NULL) {
|
||||||
if(edit_cart!=NULL) {
|
delete edit_cart;
|
||||||
delete edit_cart;
|
}
|
||||||
}
|
edit_cart=new RDCart(cartnum);
|
||||||
edit_cart=new RDCart(cartnum);
|
edit_destination_edit->setText(QString().sprintf("%d",cartnum));
|
||||||
edit_destination_edit->setText(QString().sprintf("%d",cartnum));
|
edit_description_edit->setText(edit_cart->title());
|
||||||
edit_description_edit->setText(edit_cart->title());
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -81,7 +81,7 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
|
|||||||
//
|
//
|
||||||
edit_station_box=new RDComboBox(this);
|
edit_station_box=new RDComboBox(this);
|
||||||
edit_station_box->setGeometry(200,10,140,23);
|
edit_station_box->setGeometry(200,10,140,23);
|
||||||
connect(edit_station_box,SIGNAL(textChanged(const QString &)),
|
connect(edit_station_box,SIGNAL(editTextChanged(const QString &)),
|
||||||
this,SLOT(stationChangedData(const QString &)));
|
this,SLOT(stationChangedData(const QString &)));
|
||||||
label=new QLabel(tr("Location:"),this);
|
label=new QLabel(tr("Location:"),this);
|
||||||
label->setGeometry(125,10,70,23);
|
label->setGeometry(125,10,70,23);
|
||||||
|
@ -307,7 +307,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
|
|||||||
// Cart Picker
|
// Cart Picker
|
||||||
//
|
//
|
||||||
catch_cart_dialog=new RDCartDialog(&catch_filter,&catch_group,
|
catch_cart_dialog=new RDCartDialog(&catch_filter,&catch_group,
|
||||||
&catch_schedcode,"RDCatch",false,this);
|
&catch_schedcode,"RDCatch",false,this);
|
||||||
|
|
||||||
//
|
//
|
||||||
// Cart List
|
// Cart List
|
||||||
|
Loading…
x
Reference in New Issue
Block a user