Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-14 16:49:17 +02:00
Code Issues Projects Releases Wiki Activity

2020-06-18 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in the 'Edit Event' dialog in rdlogmanager(1)
	that caused the first cart transition type to be incorrect when
	the 'Pre-Import Carts' list was populated.
This commit is contained in:
Fred Gleason 2020-06-18 16:40:43 -04:00
parent 70839e1466
commit dcf2076087
4 changed files with 38 additions and 5 deletions

4
ChangeLog

@ -19893,3 +19893,7 @@
2020-06-18 Fred Gleason <fredg@paravelsystems.com>
* Removed the checkbox from the 'Delete' right-click menu item
in the 'Edit Event' dialog in rdlogmanager(1).
2020-06-18 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in the 'Edit Event' dialog in rdlogmanager(1)
that caused the first cart transition type to be incorrect when
the 'Pre-Import Carts' list was populated.

32
rdlogmanager/edit_event.cpp

@ -460,9 +460,9 @@ EditEvent::EditEvent(QString eventname,bool new_event,
connect(event_preimport_down_button,SIGNAL(clicked()),
this,SLOT(preimportDownData()));
//
// *************************
// Import Section
//
// *************************
label=new QLabel(tr("IMPORT"),this);
label->setFont(labelFont());
label->setGeometry(CENTER_LINE+15,387,200,16);
@ -767,8 +767,6 @@ EditEvent::EditEvent(QString eventname,bool new_event,
case RDLogLine::Hard:
event_timetype_check->setChecked(true);
// event_post_box->setChecked(event_event->postPoint());
event_firsttrans_box->setCurrentItem(event_event->firstTransType());
switch((grace=event_event->graceTime())) {
case 0:
event_grace_group->button(0)->setChecked(true);
@ -801,7 +799,31 @@ EditEvent::EditEvent(QString eventname,bool new_event,
event_source_group->button(event_event->importSource())->setChecked(true);
event_startslop_edit->setTime(QTime().addMSecs(event_event->startSlop()));
event_endslop_edit->setTime(QTime().addMSecs(event_event->endSlop()));
event_firsttrans_box->setCurrentItem(event_event->firstTransType());
if(event_position_box->isChecked()||event_timetype_check->isChecked()) {
event_firsttrans_box->setCurrentItem(event_event->firstTransType());
}
else {
if(event_preimport_list->eventImportList()->size()>=1) {
event_firsttrans_box->
setCurrentItem(event_preimport_list->eventImportList()->
item(0)->transType());
}
else {
if(event_event->importSource()!=RDEventLine::None) {
event_firsttrans_box->setCurrentItem(event_event->firstTransType());
}
else {
if(event_postimport_list->eventImportList()->size()>=1) {
event_firsttrans_box->
setCurrentItem(event_postimport_list->eventImportList()->
item(0)->transType());
}
else {
event_firsttrans_box->setCurrentItem(event_event->firstTransType());
}
}
}
}
event_defaulttrans_box->setCurrentItem(event_event->defaultTransType());
if(!event_event->schedGroup().isEmpty()) {
event_sched_group_box->setCurrentText(event_event->schedGroup());

6
rdlogmanager/import_listview.cpp

@ -103,6 +103,12 @@ ImportListView::ImportListView(QWidget *parent)
}
RDEventImportList *ImportListView::eventImportList() const
{
return import_list;
}
void ImportListView::setForceTrans(RDLogLine::TransType trans)
{
import_force_trans=trans;

1
rdlogmanager/import_listview.h

@ -33,6 +33,7 @@ class ImportListView : public Q3ListView
public:
ImportListView(QWidget *parent);
RDEventImportList *eventImportList() const;
void setForceTrans(RDLogLine::TransType trans);
void setAllowStop(bool state);
void setAllowFirstTrans(bool state);