Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-12-18 14:41:26 +01:00
Code Issues Projects Releases Wiki Activity

2019-06-11 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rdlogmanager(1) where the 'End of Clock' marker
	appeared at the start rather than at the end of the segment list.
This commit is contained in:
Fred Gleason
2019-06-11 17:25:03 -04:00
parent 5f323857f9
commit 65cf9d3f75
3 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -18759,3 +18759,6 @@
2019-06-10 Fred Gleason <fredg@paravelsystems.com> 2019-06-10 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in caed(8) that caused mixer commands to * Fixed a regression in caed(8) that caused mixer commands to
be applied with inverted sign. be applied with inverted sign.
2019-06-11 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdlogmanager(1) where the 'End of Clock' marker
appeared at the start rather than at the end of the segment list.

53
rdlogmanager/edit_clock.cpp
View File

@@ -107,6 +107,8 @@ EditClock::EditClock(QString clockname,bool new_clock,
edit_clocks_list->setColumnAlignment(3,Qt::AlignRight); edit_clocks_list->setColumnAlignment(3,Qt::AlignRight);
edit_clocks_list->addColumn(tr("Count")); edit_clocks_list->addColumn(tr("Count"));
edit_clocks_list->setColumnAlignment(4,Qt::AlignCenter); edit_clocks_list->setColumnAlignment(4,Qt::AlignCenter);
edit_clocks_list->setColumnSortType(4,RDListView::LineSort);
edit_clocks_list->setHardSortColumn(4);
connect(edit_clocks_list, connect(edit_clocks_list,
SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)),
this,SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); this,SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int)));
@@ -118,38 +120,38 @@ EditClock::EditClock(QString clockname,bool new_clock,
// //
// Add Button // Add Button
// //
QPushButton *button=new QPushButton(this); edit_add_button=new QPushButton(this);
button->setGeometry(10,sizeHint().height()-210,80,50); edit_add_button->setGeometry(10,sizeHint().height()-210,80,50);
button->setFont(bold_font); edit_add_button->setFont(bold_font);
button->setText(tr("&Add")); edit_add_button->setText(tr("&Add"));
connect(button,SIGNAL(clicked()),this,SLOT(addData())); connect(edit_add_button,SIGNAL(clicked()),this,SLOT(addData()));
// //
// Clone Button // Clone Button
// //
button=new QPushButton(this); edit_clone_button=new QPushButton(this);
button->setGeometry(110,sizeHint().height()-210,80,50); edit_clone_button->setGeometry(110,sizeHint().height()-210,80,50);
button->setFont(bold_font); edit_clone_button->setFont(bold_font);
button->setText(tr("&Clone")); edit_clone_button->setText(tr("&Clone"));
connect(button,SIGNAL(clicked()),this,SLOT(cloneData())); connect(edit_clone_button,SIGNAL(clicked()),this,SLOT(cloneData()));
// //
// Edit Button // Edit Button
// //
button=new QPushButton(this); edit_edit_button=new QPushButton(this);
button->setGeometry(210,sizeHint().height()-210,80,50); edit_edit_button->setGeometry(210,sizeHint().height()-210,80,50);
button->setFont(bold_font); edit_edit_button->setFont(bold_font);
button->setText(tr("&Edit")); edit_edit_button->setText(tr("&Edit"));
connect(button,SIGNAL(clicked()),this,SLOT(editData())); connect(edit_edit_button,SIGNAL(clicked()),this,SLOT(editData()));
// //
// Delete Button // Delete Button
// //
button=new QPushButton(this); edit_delete_button=new QPushButton(this);
button->setGeometry(310,sizeHint().height()-210,80,50); edit_delete_button->setGeometry(310,sizeHint().height()-210,80,50);
button->setFont(bold_font); edit_delete_button->setFont(bold_font);
button->setText(tr("&Delete")); edit_delete_button->setText(tr("&Delete"));
connect(button,SIGNAL(clicked()),this,SLOT(deleteData())); connect(edit_delete_button,SIGNAL(clicked()),this,SLOT(deleteData()));
// //
// Remarks // Remarks
@@ -165,7 +167,7 @@ EditClock::EditClock(QString clockname,bool new_clock,
// //
// Scheduler-Rules button // Scheduler-Rules button
// //
button=new QPushButton(this); QPushButton *button=new QPushButton(this);
button->setGeometry(CENTER_LINE+20,sizeHint().height()-60,70,50); button->setGeometry(CENTER_LINE+20,sizeHint().height()-60,70,50);
button->setFont(bold_font); button->setFont(bold_font);
button->setText(tr("Scheduler\nRules")); button->setText(tr("Scheduler\nRules"));
@@ -321,6 +323,9 @@ void EditClock::editData()
return; return;
} }
int line=item->text(4).toInt(); int line=item->text(4).toInt();
if(line<0) {
return;
}
EditEventLine *edit_eventline= EditEventLine *edit_eventline=
new EditEventLine(edit_clock->eventLine(line),edit_clock,line,this); new EditEventLine(edit_clock->eventLine(line),edit_clock,line,this);
if(edit_eventline->exec()<0) { if(edit_eventline->exec()<0) {
@@ -369,6 +374,7 @@ void EditClock::cloneData()
RefreshList(line); RefreshList(line);
} }
void EditClock::deleteData() void EditClock::deleteData()
{ {
QString str; QString str;
@@ -624,6 +630,7 @@ void EditClock::RefreshList(int select_line)
edit_clocks_list->clear(); edit_clocks_list->clear();
item=new RDListViewItem(edit_clocks_list); item=new RDListViewItem(edit_clocks_list);
item->setText(2,tr("--- End of clock ---")); item->setText(2,tr("--- End of clock ---"));
item->setText(4,"-2");
for(int i=edit_clock->size()-1;i>=0;i--) { for(int i=edit_clock->size()-1;i>=0;i--) {
if((eventline=edit_clock->eventLine(i))!=NULL) { if((eventline=edit_clock->eventLine(i))!=NULL) {
item=new RDListViewItem(edit_clocks_list); item=new RDListViewItem(edit_clocks_list);
@@ -722,6 +729,10 @@ void EditClock::UpdateClock(int line)
delete p; delete p;
edit_clock_label->setPixmap(*map); edit_clock_label->setPixmap(*map);
delete map; delete map;
edit_clone_button->setDisabled(line<0);
edit_edit_button->setDisabled(line<0);
edit_delete_button->setDisabled(line<0);
} }

4
rdlogmanager/edit_clock.h
View File

@@ -83,6 +83,10 @@ class EditClock : public QDialog
bool ValidateCode(); bool ValidateCode();
ClockListView *edit_clocks_list; ClockListView *edit_clocks_list;
RDClock *edit_clock; RDClock *edit_clock;
QPushButton *edit_add_button;
QPushButton *edit_clone_button;
QPushButton *edit_edit_button;
QPushButton *edit_delete_button;
QPushButton *edit_color_button; QPushButton *edit_color_button;
QLabel *edit_clockname_label; QLabel *edit_clockname_label;
QLineEdit *edit_shortname_edit; QLineEdit *edit_shortname_edit;