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

Remove deleted scheduler codes from rdlogmanager(1) events.

Browse Source
This commit is contained in:
Patrick Linstruth 2019-08-31 09:31:12 -07:00
parent 10d78c1a80
commit 396f457354
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -19045,3 +19045,5 @@
2019-08-28 Fred Gleason <fredg@paravelsystems.com> 2019-08-28 Fred Gleason <fredg@paravelsystems.com>
* Added the '%l' wildcard (unpadded month 1-12) to the filepath * Added the '%l' wildcard (unpadded month 1-12) to the filepath
wildcards. wildcards.
2019-08-31 Patrick Linstruth <patrick@deltecent.com>
* Remove deleted scheduler codes from rdlogmanager(1) events.

24
rdlogmanager/edit_event.cpp
View File

@ -500,7 +500,7 @@ EditEvent::EditEvent(QString eventname,bool new_event,
event_title_none_button->setText(tr("None")); event_title_none_button->setText(tr("None"));
connect(event_title_none_button,SIGNAL(clicked()),this,SLOT(titleData())); connect(event_title_none_button,SIGNAL(clicked()),this,SLOT(titleData()));
// Must have code.. // Must have code..
event_have_code_label=new QLabel(tr("Must have code"),this); event_have_code_label=new QLabel(tr("Must have code"),this);
event_have_code_label->setFont(bold_font); event_have_code_label->setFont(bold_font);
@ -508,13 +508,6 @@ EditEvent::EditEvent(QString eventname,bool new_event,
event_have_code_box=new QComboBox(this); event_have_code_box=new QComboBox(this);
event_have_code_box->setGeometry(CENTER_LINE+510,427,100,20); event_have_code_box->setGeometry(CENTER_LINE+510,427,100,20);
event_have_code_box->insertItem("");
sql2="select CODE from SCHED_CODES order by CODE";
q2=new RDSqlQuery(sql2);
while(q2->next()) {
event_have_code_box->insertItem(q2->value(0).toString());
}
delete q2;
// And code // And code
@ -524,10 +517,17 @@ EditEvent::EditEvent(QString eventname,bool new_event,
event_have_code2_box=new QComboBox(this); event_have_code2_box=new QComboBox(this);
event_have_code2_box->setGeometry(CENTER_LINE+510,448,100,20); event_have_code2_box->setGeometry(CENTER_LINE+510,448,100,20);
//
// Fill scheduler codes
//
event_have_code_box->insertItem("");
event_have_code2_box->insertItem(""); event_have_code2_box->insertItem("");
sql2="select CODE from SCHED_CODES order by CODE"; sql2="select CODE from SCHED_CODES order by CODE";
q2=new RDSqlQuery(sql2); q2=new RDSqlQuery(sql2);
while(q2->next()) { while(q2->next()) {
event_have_code_box->insertItem(q2->value(0).toString());
event_have_code2_box->insertItem(q2->value(0).toString()); event_have_code2_box->insertItem(q2->value(0).toString());
} }
delete q2; delete q2;
@ -790,8 +790,12 @@ EditEvent::EditEvent(QString eventname,bool new_event,
} }
event_artist_sep_spinbox->setValue(event_event->artistSep()); event_artist_sep_spinbox->setValue(event_event->artistSep());
event_title_sep_spinbox->setValue(event_event->titleSep()); event_title_sep_spinbox->setValue(event_event->titleSep());
event_have_code_box->setCurrentText(event_event->HaveCode()); if(event_have_code_box->findText(event_event->HaveCode())!=-1) {
event_have_code2_box->setCurrentText(event_event->HaveCode2()); event_have_code_box->setCurrentText(event_event->HaveCode());
}
if(event_have_code_box->findText(event_event->HaveCode2())!=-1) {
event_have_code2_box->setCurrentText(event_event->HaveCode2());
}
QColor color=event_event->color(); QColor color=event_event->color();
if(color.isValid()) { if(color.isValid()) {
event_color_button->setPalette(QPalette(color,backgroundColor())); event_color_button->setPalette(QPalette(color,backgroundColor()));