Changed empty scheduler code selection from "" to "[none]" in

rdlogmanager(1) event editor.
This commit is contained in:
Patrick Linstruth 2019-08-31 15:34:56 -07:00
parent 9d66a3ae21
commit f19eed120a
9 changed files with 50 additions and 9 deletions

View File

@ -19047,3 +19047,5 @@
wildcards.
2019-08-31 Patrick Linstruth <patrick@deltecent.com>
* Remove deleted scheduler codes from rdlogmanager(1) events.
* Changed empty scheduler code selection from "" to "[none]" in
rdlogmanager(1) event editor.

View File

@ -479,7 +479,7 @@ EditEvent::EditEvent(QString eventname,bool new_event,
event_artist_none_button=new QPushButton(this);
event_artist_none_button->setGeometry(CENTER_LINE+570,383,40,20);
event_artist_none_button->setFont(font);
event_artist_none_button->setText(tr("None"));
event_artist_none_button->setText(tr("none"));
connect(event_artist_none_button,SIGNAL(clicked()),this,SLOT(artistData()));
// Title Separation SpinBox
@ -521,8 +521,8 @@ EditEvent::EditEvent(QString eventname,bool new_event,
//
// Fill scheduler codes
//
event_have_code_box->insertItem("");
event_have_code2_box->insertItem("");
event_have_code_box->insertItem("[None]");
event_have_code2_box->insertItem("[None]");
sql2="select CODE from SCHED_CODES order by CODE";
q2=new RDSqlQuery(sql2);
@ -1480,13 +1480,24 @@ void EditEvent::Save()
event_event->setSchedGroup(event_sched_group_box->currentText());
event_event->setArtistSep(event_artist_sep_spinbox->value());
event_event->setTitleSep(event_title_sep_spinbox->value());
event_event->setHaveCode(event_have_code_box->currentText());
if (event_have_code_box->currentText() != QString("")) {
event_event->setHaveCode("");
event_event->setHaveCode2("");
if(event_have_code_box->currentIndex()>0) {
event_event->setHaveCode(event_have_code_box->currentText());
}
if(event_have_code2_box->currentIndex()>0) {
event_event->setHaveCode2(event_have_code2_box->currentText());
} else {
// save second code as first code when first code isn't defined
event_event->setHaveCode(event_have_code2_box->currentText());
event_event->setHaveCode2(QString(""));
}
// If both codes are the same, remove second code
if (event_event->HaveCode()==event_event->HaveCode2()) {
event_event->setHaveCode2("");
}
// Save second code as first code when first code isn't defined
if (event_event->HaveCode().isEmpty()) {
event_event->setHaveCode(event_event->HaveCode2());
event_event->setHaveCode2("");
}
event_preimport_list->setEventName(event_name);

View File

@ -599,6 +599,10 @@ Chcete ji přepsat?</translation>
<source>Artist Separation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>none</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditEventLine</name>

View File

@ -599,6 +599,10 @@ Wollen Sie es überschreiben?</translation>
<source>Artist Separation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>none</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditEventLine</name>

View File

@ -601,6 +601,10 @@ Do you want to overwrite it?</source>
<source>Artist Separation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>none</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditEventLine</name>

View File

@ -533,6 +533,10 @@ Do you want to overwrite it?</source>
<source>Artist Separation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>none</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditEventLine</name>

View File

@ -608,6 +608,10 @@ Vil du byta henne ut?</translation>
<source>Artist Separation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>none</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditEventLine</name>

View File

@ -608,6 +608,10 @@ Vil du byta henne ut?</translation>
<source>Artist Separation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>none</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditEventLine</name>

View File

@ -601,6 +601,10 @@ Você quer sobreescrêve-lo?</translation>
<source>Artist Separation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>none</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditEventLine</name>