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

* Added 'RDSchedRulesModel'.
	* Added a pseudo-schema change to force checking of schedule code
	rules.
	* Incremented the database version to 348.
	* Added a check for scheduler code rules to rddbmgr(8).
	* Refactored the 'Scheduler Rules' dialog in rdlogmanager(1) to
	use the model based API.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-02-11 15:28:48 -05:00
parent 57922f947b
commit f1703ba647
34 changed files with 1181 additions and 419 deletions

View File

@@ -3,7 +3,7 @@
// Edit scheduler rules of a clock
//
// (C) Copyright Stefan Gabriel <stg@st-gabriel.de>
// (C) Copyright 2002-2018 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
@@ -19,7 +19,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qmessagebox.h>
#include <QMessageBox>
#include <rdescape_string.h>
@@ -44,30 +44,16 @@ EditSchedRules::EditSchedRules(QString clock,unsigned *artistsep,
// Fix the Window Size
//
setMinimumSize(sizeHint());
setMaximumSize(sizeHint());
edit_artist_sep_label=new QLabel(this);
edit_artist_sep_label->setGeometry(QRect(10,10,130,20));
edit_artist_sep_label->setFont(labelFont());
edit_artist_sep_label->setText(tr("Artist Separation:"));
edit_artist_sep_label->setEnabled(false);
edit_artist_sep_spin=new QSpinBox(this);
edit_artist_sep_spin->setGeometry(QRect(160,10,70,20));
edit_artist_sep_spin->setMaxValue(10000);
edit_artist_sep_spin->setValue(*edit_artistsep);
edit_artist_sep_spin->setEnabled(false);
QLabel *artist_sep_dep=
new QLabel(this,tr("(This setting is deprecated and has been moved to events)"),this);
artist_sep_dep->setFont(labelFont());
artist_sep_dep->setGeometry(240,10,540,20);
//
// Dialogs
//
list_editrules_dialog=new EditSchedCodeRules(this);
//
// Edit Button
//
QPushButton *list_edit_button=new QPushButton(this);
list_edit_button->setGeometry(10,sizeHint().height()-60,80,50);
list_edit_button=new QPushButton(this);
list_edit_button->setFont(buttonFont());
list_edit_button->setText(tr("&Edit"));
connect(list_edit_button,SIGNAL(clicked()),this,SLOT(editData()));
@@ -75,36 +61,37 @@ EditSchedRules::EditSchedRules(QString clock,unsigned *artistsep,
//
// Import Button
//
QPushButton *list_import_button=new QPushButton(this);
list_import_button->setGeometry(100,sizeHint().height()-60,80,50);
list_import_button=new QPushButton(this);
list_import_button->setFont(buttonFont());
list_import_button->setText(tr("&Import"));
connect(list_import_button,SIGNAL(clicked()),this,SLOT(importData()));
//
// Ok Button
// Close Button
//
QPushButton *ok_button=new QPushButton(this);
ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
ok_button->setDefault(true);
ok_button->setFont(buttonFont());
ok_button->setText(tr("&OK"));
connect(ok_button,SIGNAL(clicked()),this,SLOT(okData()));
list_close_button=new QPushButton(this);
list_close_button->setFont(buttonFont());
list_close_button->setText(tr("&Close"));
connect(list_close_button,SIGNAL(clicked()),this,SLOT(closeData()));
//
// Cancel Button
// Rules List
//
QPushButton *cancel_button=new QPushButton(this);
cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,
80,50);
cancel_button->setFont(buttonFont());
cancel_button->setText(tr("&Cancel"));
connect(cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
edit_schedcodes_view=new RDTableView(this);
edit_schedcodes_view->
setGeometry(10,10,sizeHint().width()-20,sizeHint().height()-80);
edit_schedcodes_model=new SchedRulesModel(clock,this);
edit_schedcodes_model->setFont(font());
edit_schedcodes_model->setPalette(palette());
edit_schedcodes_view->setModel(edit_schedcodes_model);
connect(edit_schedcodes_view,SIGNAL(doubleClicked(const QModelIndex &)),
this,SLOT(doubleClickedData(const QModelIndex &)));
connect(edit_schedcodes_model,SIGNAL(modelReset()),
edit_schedcodes_view,SLOT(resizeColumnsToContents()));
edit_schedcodes_view->resizeColumnsToContents();
// List
/*
edit_schedcodes_view=new RDListView(this);
edit_schedcodes_view->setGeometry(10,60,size().width()-20,size().height()-140);
edit_schedcodes_view->setAllColumnsShowFocus(true);
edit_schedcodes_view->addColumn(tr("CODE"));
edit_schedcodes_view->addColumn(tr("MAX. IN A ROW"));
@@ -113,23 +100,19 @@ EditSchedRules::EditSchedRules(QString clock,unsigned *artistsep,
edit_schedcodes_view->addColumn(tr("OR AFTER"));
edit_schedcodes_view->addColumn(tr("OR AFTER"));
edit_schedcodes_view->addColumn(tr("DESCRIPTION"));
*/
QLabel *list_box_label=
list_box_label=
new QLabel(edit_schedcodes_view,tr("Scheduler Codes:"),this);
list_box_label->setFont(labelFont());
list_box_label->setGeometry(10,40,200,20);
connect(edit_schedcodes_view,
SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)),
this,
SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int)));
edit_modified=false;
Load();
edit_modified=false;
// Load();
}
EditSchedRules::~EditSchedRules()
{
delete list_editrules_dialog;
}
@@ -144,45 +127,19 @@ QSizePolicy EditSchedRules::sizePolicy() const
return QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
}
void EditSchedRules::Load()
{
QString str;
RDListViewItem *item;
edit_schedcodes_view->clear();
for (int i=0; i<edit_sched_rules_list->getNumberOfItems(); i++) {
item=new RDListViewItem(edit_schedcodes_view);
item->setId(i);
item->setText(0,edit_sched_rules_list->getItemSchedCode(i));
str=QString().sprintf("%d",edit_sched_rules_list->getItemMaxRow(i));
item->setText(1,str);
str=QString().sprintf("%d",edit_sched_rules_list->getItemMinWait(i));
item->setText(2,str);
item->setText(3,edit_sched_rules_list->getItemNotAfter(i));
item->setText(4,edit_sched_rules_list->getItemOrAfter(i));
item->setText(5,edit_sched_rules_list->getItemOrAfterII(i));
item->setText(6,edit_sched_rules_list->getItemDescription(i));
}
}
void EditSchedRules::Close()
{
RDListViewItem *item=(RDListViewItem *)edit_schedcodes_view->firstChild();
*edit_rules_modified=true;
while(item!=NULL) {
edit_sched_rules_list->
insertItem(item->id(),item->text(1).toInt(),item->text(2).toInt(),
item->text(3),item->text(4),item->text(5));
item=(RDListViewItem *)item->nextSibling();
}
}
void EditSchedRules::editData()
{
QModelIndexList rows=edit_schedcodes_view->selectionModel()->selectedRows();
if(rows.size()!=1) {
return;
}
if(list_editrules_dialog->exec(edit_schedcodes_model->ruleId(rows.first()))) {
edit_schedcodes_model->refresh(rows.first());
}
/*
RDListViewItem *item=(RDListViewItem *)edit_schedcodes_view->selectedItem();
if(item==NULL) {
return;
@@ -195,24 +152,33 @@ void EditSchedRules::editData()
}
delete edit_CodeRules;
edit_CodeRules=NULL;
*/
}
void EditSchedRules::importData()
{
QString clockname="";
QString str;
RDListViewItem *item;
/*
QModelIndexList rows=edit_schedcodes_view->selectionModel()->selectedRows();
if(rows.size()!=1) {
return;
}
// RDListViewItem *item;
QString sql;
RDSqlQuery *q;
ListClocks *listclocks=new ListClocks(&clockname,this);
listclocks->setCaption(tr("Import Rules from Clock"));
if(listclocks->exec()<0) {
listclocks->setWindowTitle("RDLogManager - "+tr("Import Rules from Clock"));
if(!listclocks->exec()) {
delete listclocks;
return;
}
delete listclocks;
sql=QString("select ")+
"
RDSchedRulesList *import_list=new RDSchedRulesList(clockname,rda->config());
edit_schedcodes_view->clear();
@@ -238,53 +204,64 @@ void EditSchedRules::importData()
if (q->first())
{
*edit_artistsep=q->value(0).toUInt();
edit_artist_sep_spin->setValue(*edit_artistsep);
// edit_artist_sep_spin->setValue(*edit_artistsep);
}
delete q;
edit_modified=true;
*/
}
void EditSchedRules::doubleClickedData(Q3ListViewItem *item,const QPoint &pt,int col)
void EditSchedRules::doubleClickedData(const QModelIndex &index)
{
editData();
}
void EditSchedRules::okData()
void EditSchedRules::closeData()
{
*edit_artistsep=edit_artist_sep_spin->value();
Close();
done(0);
}
void EditSchedRules::cancelData()
{
if(edit_modified) {
switch(QMessageBox::question(this,tr("Rules Modified"),
tr("The rules have been modified.\nDo you want to save?"),QMessageBox::Yes,QMessageBox::No,QMessageBox::Cancel)) {
case QMessageBox::Yes:
Close();
done(0);
break;
case QMessageBox::No:
done(-1);
break;
case QMessageBox::NoButton:
return;
}
}
else {
done(-1);
}
done(true);
}
void EditSchedRules::closeEvent(QCloseEvent *e)
{
cancelData();
closeData();
}
void EditSchedRules::resizeEvent(QResizeEvent *e)
{
list_box_label->setGeometry(10,2,200,20);
edit_schedcodes_view->
setGeometry(10,22,size().width()-20,size().height()-102);
list_edit_button->setGeometry(10,size().height()-60,80,50);
list_import_button->setGeometry(100,size().height()-60,80,50);
list_close_button->setGeometry(size().width()-90,size().height()-60,80,50);
}
/*
void EditSchedRules::Load()
{
QString str;
RDListViewItem *item;
edit_schedcodes_view->clear();
for (int i=0; i<edit_sched_rules_list->getNumberOfItems(); i++) {
item=new RDListViewItem(edit_schedcodes_view);
item->setId(i);
item->setText(0,edit_sched_rules_list->getItemSchedCode(i));
str=QString().sprintf("%d",edit_sched_rules_list->getItemMaxRow(i));
item->setText(1,str);
str=QString().sprintf("%d",edit_sched_rules_list->getItemMinWait(i));
item->setText(2,str);
item->setText(3,edit_sched_rules_list->getItemNotAfter(i));
item->setText(4,edit_sched_rules_list->getItemOrAfter(i));
item->setText(5,edit_sched_rules_list->getItemOrAfterII(i));
item->setText(6,edit_sched_rules_list->getItemDescription(i));
}
}
*/