Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-30 17:20:32 +01:00
Code Issues Projects Releases Wiki Activity

2022-10-16 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Modified the 'Log Grids' dialog in rdlogmanager(1) to not display
	services with 'Bypass Grid Processing' set to 'Yes'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2022-10-16 12:05:28 -04:00
parent f038c0beae
commit 656a1a6d38
11 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -23515,3 +23515,6 @@
* Fixed a regression in the 'Test Music Import' dialog that caused
the 'Imported Events' list to fail to be cleared when starting a
new test.
2022-10-16 Fred Gleason <fredg@paravelsystems.com>
* Modified the 'Log Grids' dialog in rdlogmanager(1) to not display
services with 'Bypass Grid Processing' set to 'Yes'.

2
lib/rdlistsvcs.cpp
View File

@@ -36,7 +36,7 @@ RDListSvcs::RDListSvcs(const QString &caption,QWidget *parent)
// Services
//
edit_svc_view=new RDTableView(this);
edit_svc_model=new RDServiceListModel(false,this);
edit_svc_model=new RDServiceListModel(false,false,this);
edit_svc_model->setFont(font());
edit_svc_model->setPalette(palette());
edit_svc_view->setModel(edit_svc_model);

7
lib/rdservicelistmodel.cpp
View File

@@ -22,10 +22,12 @@
#include "rdescape_string.h"
#include "rdservicelistmodel.h"
RDServiceListModel::RDServiceListModel(bool incl_none,QObject *parent)
RDServiceListModel::RDServiceListModel(bool incl_none,bool exclude_bypass,
QObject *parent)
: QAbstractTableModel(parent)
{
d_include_none=incl_none;
d_exclude_bypass=exclude_bypass;
//
// Load Color Map
@@ -257,6 +259,9 @@ void RDServiceListModel::updateModel()
RDSqlQuery *q=NULL;
QString sql=sqlFields();
if(d_exclude_bypass) {
sql+="where `BYPASS_MODE`='N' ";
}
sql+="order by NAME ";
beginResetModel();
d_texts.clear();

3
lib/rdservicelistmodel.h
View File

@@ -42,7 +42,7 @@ class RDServiceListModel : public QAbstractTableModel
{
Q_OBJECT
public:
RDServiceListModel(bool incl_none,QObject *parent);
RDServiceListModel(bool incl_none,bool exclude_bypass,QObject *parent);
~RDServiceListModel();
QPalette palette();
void setPalette(const QPalette &pal);
@@ -70,6 +70,7 @@ class RDServiceListModel : public QAbstractTableModel
QFont d_font;
QFont d_bold_font;
bool d_include_none;
bool d_exclude_bypass;
QList<QVariant> d_headers;
QList<QVariant> d_alignments;
QList<QList<QVariant> > d_texts;

2
rdadmin/add_svc.cpp
View File

@@ -66,7 +66,7 @@ AddSvc::AddSvc(QString *svcname,QWidget *parent)
//
svc_exemplar_box=new QComboBox(this);
svc_exemplar_box->setGeometry(155,36,sizeHint().width()-165,19);
svc_services_model=new RDServiceListModel(true,this);
svc_services_model=new RDServiceListModel(true,false,this);
svc_services_model->setFont(defaultFont());
svc_services_model->setPalette(palette());
svc_exemplar_box->setModel(svc_services_model);

2
rdadmin/edit_cartslots.cpp
View File

@@ -155,7 +155,7 @@ EditCartSlots::EditCartSlots(RDStation *station,RDStation *cae_station,
//
edit_service_box=new QComboBox(this);
edit_service_box->setGeometry(127,240,120,20);
edit_service_model=new RDServiceListModel(true,this);
edit_service_model=new RDServiceListModel(true,false,this);
edit_service_model->setFont(defaultFont());
edit_service_model->setPalette(palette());
edit_service_box->setModel(edit_service_model);

2
rdadmin/edit_rdairplay.cpp
View File

@@ -64,7 +64,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station,
//
// Models
//
air_service_model=new RDServiceListModel(true,this);
air_service_model=new RDServiceListModel(true,false,this);
//
// Channel Assignments Section

2
rdadmin/edit_rdpanel.cpp
View File

@@ -54,7 +54,7 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station,
//
// Models
//
air_service_model=new RDServiceListModel(true,this);
air_service_model=new RDServiceListModel(true,false,this);
//
// Channel Assignments Section

2
rdadmin/list_svcs.cpp
View File

@@ -80,7 +80,7 @@ ListSvcs::ListSvcs(QWidget *parent)
list_title_label=new QLabel(tr("Services:"),this);
list_title_label->setFont(labelFont());
list_title_label->setGeometry(14,11,85,19);
list_services_model=new RDServiceListModel(false,this);
list_services_model=new RDServiceListModel(false,false,this);
list_services_model->setFont(defaultFont());
list_services_model->setPalette(palette());
list_services_view->setModel(list_services_model);

2
rdlogmanager/list_grids.cpp
View File

@@ -39,7 +39,7 @@ ListGrids::ListGrids(QWidget *parent)
edit_grids_view=new RDTableView(this);
edit_grids_view->
setGeometry(10,10,sizeHint().width()-20,sizeHint().height()-80);
edit_grids_model=new RDServiceListModel(false,this);
edit_grids_model=new RDServiceListModel(false,true,this);
edit_grids_model->setFont(font());
edit_grids_model->setPalette(palette());
edit_grids_view->setModel(edit_grids_model);

2
rdlogmanager/list_svcs.cpp
View File

@@ -39,7 +39,7 @@ ListSvcs::ListSvcs(QWidget *parent)
// Log List
//
list_log_view=new RDTableView(this);
list_log_model=new RDServiceListModel(false,this);
list_log_model=new RDServiceListModel(false,false,this);
list_log_model->setFont(font());
list_log_model->setPalette(palette());
list_log_view->setModel(list_log_model);