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

2021-06-29 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdairplay(1) that caused the event editor
	dialog to display the 'Cart Notes' editor window in the wrong
	location.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-06-29 16:17:49 -04:00
parent c9b60520e1
commit e0c3ab2b24
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -21977,3 +21977,7 @@
2021-06-28 Fred Gleason <fredg@paravelsystems.com> 2021-06-28 Fred Gleason <fredg@paravelsystems.com>
* Increased the minimum width of the rdairplay(1) main screen to * Increased the minimum width of the rdairplay(1) main screen to
accomodate the added sound panel margin. accomodate the added sound panel margin.
2021-06-29 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdairplay(1) that caused the event editor
dialog to display the 'Cart Notes' editor window in the wrong
location.

10
rdairplay/edit_event.cpp
View File

@ -110,6 +110,7 @@ EditEvent::EditEvent(RDLogPlay *log,QWidget *parent)
// Cue Editor // Cue Editor
// //
edit_cue_edit=new RDCueEdit(this); edit_cue_edit=new RDCueEdit(this);
edit_using_cue=true;
// //
// Cart Notes // Cart Notes
@ -225,6 +226,7 @@ int EditEvent::exec(int line)
if((edit_logline->cutNumber()<1)|| if((edit_logline->cutNumber()<1)||
(edit_logline->forcedLength()<=0)) { (edit_logline->forcedLength()<=0)) {
edit_cue_edit->hide(); edit_cue_edit->hide();
edit_using_cue=false;
if(edit_logline->cartNotes().isEmpty()) { if(edit_logline->cartNotes().isEmpty()) {
edit_height=195; edit_height=195;
edit_cart_notes_label->hide(); edit_cart_notes_label->hide();
@ -239,6 +241,7 @@ int EditEvent::exec(int line)
else { else {
edit_cue_edit->initialize(edit_logline); edit_cue_edit->initialize(edit_logline);
edit_cue_edit->show(); edit_cue_edit->show();
edit_using_cue=true;
if(edit_logline->cartNotes().isEmpty()) { if(edit_logline->cartNotes().isEmpty()) {
edit_height=360; edit_height=360;
edit_cart_notes_label->hide(); edit_cart_notes_label->hide();
@ -254,6 +257,7 @@ int EditEvent::exec(int line)
case RDLogLine::Macro: case RDLogLine::Macro:
edit_cue_edit->hide(); edit_cue_edit->hide();
edit_using_cue=false;
if(edit_logline->cartNotes().isEmpty()) { if(edit_logline->cartNotes().isEmpty()) {
edit_height=195; edit_height=195;
edit_cart_notes_label->hide(); edit_cart_notes_label->hide();
@ -269,6 +273,7 @@ int EditEvent::exec(int line)
case RDLogLine::Marker: case RDLogLine::Marker:
setWindowTitle(tr("Edit Marker")); setWindowTitle(tr("Edit Marker"));
edit_cue_edit->hide(); edit_cue_edit->hide();
edit_using_cue=false;
edit_cart_notes_label->hide(); edit_cart_notes_label->hide();
edit_cart_notes_text->hide(); edit_cart_notes_text->hide();
edit_height=195; edit_height=195;
@ -277,6 +282,7 @@ int EditEvent::exec(int line)
case RDLogLine::Track: case RDLogLine::Track:
setWindowTitle(tr("Edit Track")); setWindowTitle(tr("Edit Track"));
edit_cue_edit->hide(); edit_cue_edit->hide();
edit_using_cue=false;
edit_cart_notes_label->hide(); edit_cart_notes_label->hide();
edit_cart_notes_text->hide(); edit_cart_notes_text->hide();
edit_height=195; edit_height=195;
@ -285,6 +291,7 @@ int EditEvent::exec(int line)
case RDLogLine::Chain: case RDLogLine::Chain:
setWindowTitle(tr("Edit Log Track")); setWindowTitle(tr("Edit Log Track"));
edit_cue_edit->hide(); edit_cue_edit->hide();
edit_using_cue=false;
edit_cart_notes_label->hide(); edit_cart_notes_label->hide();
edit_cart_notes_text->hide(); edit_cart_notes_text->hide();
edit_height=195; edit_height=195;
@ -292,6 +299,7 @@ int EditEvent::exec(int line)
default: default:
edit_cue_edit->hide(); edit_cue_edit->hide();
edit_using_cue=false;
edit_height=195; edit_height=195;
break; break;
} }
@ -457,7 +465,7 @@ void EditEvent::resizeEvent(QResizeEvent *e)
edit_cue_edit->setGeometry(20,132,edit_cue_edit->sizeHint().width(), edit_cue_edit->setGeometry(20,132,edit_cue_edit->sizeHint().width(),
edit_cue_edit->sizeHint().height()); edit_cue_edit->sizeHint().height());
if(edit_cue_edit->isVisible()) { if(edit_using_cue) {
edit_cart_notes_label-> edit_cart_notes_label->
setGeometry(15,127+edit_cue_edit->sizeHint().height(), setGeometry(15,127+edit_cue_edit->sizeHint().height(),
size().width()-20,20); size().width()-20,20);

1
rdairplay/edit_event.h
View File

@ -71,6 +71,7 @@ class EditEvent : public RDDialog
QCheckBox *edit_overlap_box; QCheckBox *edit_overlap_box;
QLabel *edit_overlap_label; QLabel *edit_overlap_label;
RDCueEdit *edit_cue_edit; RDCueEdit *edit_cue_edit;
bool edit_using_cue;
QFont normal_font; QFont normal_font;
QLabel *edit_cart_notes_label; QLabel *edit_cart_notes_label;
QTextEdit *edit_cart_notes_text; QTextEdit *edit_cart_notes_text;