2021-03-21 Fred Gleason <fredg@paravelsystems.com>

* Added a 'Goto' section to 'RDMarkerDialog', with 'Cursor',
	'Home' and 'End' buttons.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-03-21 12:06:45 -04:00
parent 01cadd5b56
commit a4a8c05458
12 changed files with 175 additions and 11 deletions

View File

@ -21309,3 +21309,6 @@
2021-03-21 Fred Gleason <fredg@paravelsystems.com> 2021-03-21 Fred Gleason <fredg@paravelsystems.com>
* Modified the marker readouts to show a yellow background when the * Modified the marker readouts to show a yellow background when the
parent markers have been selected. parent markers have been selected.
2021-03-21 Fred Gleason <fredg@paravelsystems.com>
* Added a 'Goto' section to 'RDMarkerDialog', with 'Cursor',
'Home' and 'End' buttons.

View File

@ -3600,6 +3600,22 @@ Out</translation>
<source>Unable to open cut in audio player!</source> <source>Unable to open cut in audio player!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Goto</source>
<translation type="unfinished">Přejít na</translation>
</message>
<message>
<source>Cursor</source>
<translation type="unfinished">Ukazovátko</translation>
</message>
<message>
<source>Home</source>
<translation type="unfinished">Domov</translation>
</message>
<message>
<source>End</source>
<translation type="unfinished">Konec</translation>
</message>
</context> </context>
<context> <context>
<name>RDMarkerPlayer</name> <name>RDMarkerPlayer</name>

View File

@ -3589,6 +3589,22 @@ Out</translation>
<source>Unable to open cut in audio player!</source> <source>Unable to open cut in audio player!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Goto</source>
<translation type="unfinished">Gehe zu</translation>
</message>
<message>
<source>Cursor</source>
<translation type="unfinished">Cursor</translation>
</message>
<message>
<source>Home</source>
<translation type="unfinished">Home</translation>
</message>
<message>
<source>End</source>
<translation type="unfinished">Ende</translation>
</message>
</context> </context>
<context> <context>
<name>RDMarkerPlayer</name> <name>RDMarkerPlayer</name>

View File

@ -3576,6 +3576,22 @@ Todo</translation>
<source>Unable to open cut in audio player!</source> <source>Unable to open cut in audio player!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Goto</source>
<translation type="unfinished">Ir a</translation>
</message>
<message>
<source>Cursor</source>
<translation type="unfinished">Cursor</translation>
</message>
<message>
<source>Home</source>
<translation type="unfinished">Principio</translation>
</message>
<message>
<source>End</source>
<translation type="unfinished">Final</translation>
</message>
</context> </context>
<context> <context>
<name>RDMarkerPlayer</name> <name>RDMarkerPlayer</name>

View File

@ -2982,6 +2982,22 @@ Out</source>
<source>Unable to open cut in audio player!</source> <source>Unable to open cut in audio player!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Goto</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cursor</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Home</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>End</source>
<translation type="unfinished">Fin</translation>
</message>
</context> </context>
<context> <context>
<name>RDMarkerPlayer</name> <name>RDMarkerPlayer</name>

View File

@ -3539,6 +3539,22 @@ ut</translation>
<source>Unable to open cut in audio player!</source> <source>Unable to open cut in audio player!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Goto</source>
<translation type="unfinished"> til</translation>
</message>
<message>
<source>Cursor</source>
<translation type="unfinished">Markør</translation>
</message>
<message>
<source>Home</source>
<translation type="unfinished">Heim</translation>
</message>
<message>
<source>End</source>
<translation type="unfinished">Slutten</translation>
</message>
</context> </context>
<context> <context>
<name>RDMarkerPlayer</name> <name>RDMarkerPlayer</name>

View File

@ -3539,6 +3539,22 @@ ut</translation>
<source>Unable to open cut in audio player!</source> <source>Unable to open cut in audio player!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Goto</source>
<translation type="unfinished"> til</translation>
</message>
<message>
<source>Cursor</source>
<translation type="unfinished">Markør</translation>
</message>
<message>
<source>Home</source>
<translation type="unfinished">Heim</translation>
</message>
<message>
<source>End</source>
<translation type="unfinished">Slutten</translation>
</message>
</context> </context>
<context> <context>
<name>RDMarkerPlayer</name> <name>RDMarkerPlayer</name>

View File

@ -3579,6 +3579,22 @@ Mínimo</translation>
<source>Unable to open cut in audio player!</source> <source>Unable to open cut in audio player!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Goto</source>
<translation type="unfinished">Ir Até</translation>
</message>
<message>
<source>Cursor</source>
<translation type="unfinished">Cursor</translation>
</message>
<message>
<source>Home</source>
<translation type="unfinished">Casa</translation>
</message>
<message>
<source>End</source>
<translation type="unfinished">Fim</translation>
</message>
</context> </context>
<context> <context>
<name>RDMarkerPlayer</name> <name>RDMarkerPlayer</name>

View File

@ -72,6 +72,28 @@ RDMarkerDialog::RDMarkerDialog(const QString &caption,int card,int port,
connect(d_time_fullout_button,SIGNAL(clicked()), connect(d_time_fullout_button,SIGNAL(clicked()),
d_marker_view,SLOT(setMaximumShrinkFactor())); d_marker_view,SLOT(setMaximumShrinkFactor()));
//
// Goto Buttons
//
d_goto_group=new QGroupBox(tr("Goto"),this);
d_goto_group->setFont(labelFont());
d_goto_cursor_button=new QPushButton(tr("Cursor"),d_goto_group);
d_goto_cursor_button->setFont(buttonFont());
connect(d_goto_cursor_button,SIGNAL(clicked()),
d_marker_view,SLOT(gotoCursor()));
d_goto_home_button=new QPushButton(tr("Home"),d_goto_group);
d_goto_home_button->setFont(buttonFont());
connect(d_goto_home_button,SIGNAL(clicked()),
d_marker_view,SLOT(gotoHome()));
d_goto_end_button=new QPushButton(tr("End"),d_goto_group);
d_goto_end_button->setFont(buttonFont());
connect(d_goto_end_button,SIGNAL(clicked()),
d_marker_view,SLOT(gotoEnd()));
/************************************************************************** /**************************************************************************
* Transport Section * Transport Section
**************************************************************************/ **************************************************************************/
@ -322,38 +344,32 @@ void RDMarkerDialog::resizeEvent(QResizeEvent *e)
// //
d_cut_readout->setGeometry(2, d_cut_readout->setGeometry(2,
2+d_marker_view->sizeHint().height(), 2+d_marker_view->sizeHint().height(),
//30+RDMARKERDIALOG_WAVEFORM_HEIGHT+94,
d_cut_readout->sizeHint().width(), d_cut_readout->sizeHint().width(),
d_cut_readout->sizeHint().height()); d_cut_readout->sizeHint().height());
d_talk_readout->setGeometry(2+1*(d_talk_readout->sizeHint().width()-2), d_talk_readout->setGeometry(2+1*(d_talk_readout->sizeHint().width()-2),
2+d_marker_view->sizeHint().height(), 2+d_marker_view->sizeHint().height(),
//30+RDMARKERDIALOG_WAVEFORM_HEIGHT+94,
d_talk_readout->sizeHint().width(), d_talk_readout->sizeHint().width(),
d_talk_readout->sizeHint().height()); d_talk_readout->sizeHint().height());
d_segue_readout->setGeometry(2+2*(d_segue_readout->sizeHint().width()-2), d_segue_readout->setGeometry(2+2*(d_segue_readout->sizeHint().width()-2),
2+d_marker_view->sizeHint().height(), 2+d_marker_view->sizeHint().height(),
//30+RDMARKERDIALOG_WAVEFORM_HEIGHT+94,
d_segue_readout->sizeHint().width(), d_segue_readout->sizeHint().width(),
d_segue_readout->sizeHint().height()); d_segue_readout->sizeHint().height());
d_hook_readout->setGeometry(2+3*(d_hook_readout->sizeHint().width()-2), d_hook_readout->setGeometry(2+3*(d_hook_readout->sizeHint().width()-2),
2+d_marker_view->sizeHint().height(), 2+d_marker_view->sizeHint().height(),
//30+RDMARKERDIALOG_WAVEFORM_HEIGHT+94,
d_hook_readout->sizeHint().width(), d_hook_readout->sizeHint().width(),
d_hook_readout->sizeHint().height()); d_hook_readout->sizeHint().height());
d_fadeup_readout->setGeometry(2, d_fadeup_readout->setGeometry(2,
d_marker_view->sizeHint().height()-2+ d_marker_view->sizeHint().height()-2+
//30+RDMARKERDIALOG_WAVEFORM_HEIGHT+90+
d_hook_readout->sizeHint().height(), d_hook_readout->sizeHint().height(),
2*d_fadeup_readout->sizeHint().width()-2, 2*d_fadeup_readout->sizeHint().width()-2,
d_fadeup_readout->sizeHint().height()); d_fadeup_readout->sizeHint().height());
d_fadedown_readout->setGeometry(2*d_fadedown_readout->sizeHint().width()-2, d_fadedown_readout->setGeometry(2*d_fadedown_readout->sizeHint().width()-2,
d_marker_view->sizeHint().height()-2+ d_marker_view->sizeHint().height()-2+
//30+RDMARKERDIALOG_WAVEFORM_HEIGHT+90+
d_hook_readout->sizeHint().height(), d_hook_readout->sizeHint().height(),
2*d_fadedown_readout->sizeHint().width()-2, 2*d_fadedown_readout->sizeHint().width()-2,
d_fadedown_readout->sizeHint().height()); d_fadedown_readout->sizeHint().height());
@ -366,11 +382,16 @@ void RDMarkerDialog::resizeEvent(QResizeEvent *e)
2+d_marker_view->sizeHint().height(), 2+d_marker_view->sizeHint().height(),
d_player->sizeHint().width(), d_player->sizeHint().width(),
d_player->sizeHint().height()); d_player->sizeHint().height());
/*
d_player->setGeometry(2,2+d_marker_view->sizeHint().height(), d_goto_group->setGeometry(10,
d_player->sizeHint().width(), 2+d_marker_view->sizeHint().height()+
d_player->sizeHint().height()); d_player->sizeHint().height()+5,
*/ 90*3,
80);
d_goto_cursor_button->setGeometry(5,25,80,50);
d_goto_home_button->setGeometry(95,25,80,50);
d_goto_end_button->setGeometry(185,25,80,50);
d_ok_button->setGeometry(w-180,h-60,80,50); d_ok_button->setGeometry(w-180,h-60,80,50);
d_cancel_button->setGeometry(w-90,h-60,80,50); d_cancel_button->setGeometry(w-90,h-60,80,50);
} }

View File

@ -104,6 +104,11 @@ class RDMarkerDialog : public RDDialog
RDMarkerReadout *d_segue_readout; RDMarkerReadout *d_segue_readout;
RDMarkerReadout *d_hook_readout; RDMarkerReadout *d_hook_readout;
QGroupBox *d_goto_group;
QPushButton *d_goto_cursor_button;
QPushButton *d_goto_home_button;
QPushButton *d_goto_end_button;
QPushButton *d_ok_button; QPushButton *d_ok_button;
QPushButton *d_cancel_button; QPushButton *d_cancel_button;
unsigned d_cart_number; unsigned d_cart_number;

View File

@ -610,6 +610,26 @@ void RDMarkerView::setCursorPosition(unsigned msec)
} }
void RDMarkerView::gotoCursor()
{
d_view->horizontalScrollBar()->
setValue(d_cursor->pos().x()-d_view->width()/2);
}
void RDMarkerView::gotoHome()
{
d_view->horizontalScrollBar()->setValue(0);
}
void RDMarkerView::gotoEnd()
{
d_view->horizontalScrollBar()->
setValue(d_view->horizontalScrollBar()->maximum());
}
void RDMarkerView::save() void RDMarkerView::save()
{ {
QString sql; QString sql;

View File

@ -110,6 +110,9 @@ class RDMarkerView : public QWidget
void setMaximumShrinkFactor(); void setMaximumShrinkFactor();
bool setCut(QString *err_msg,unsigned cartnum,int cutnum); bool setCut(QString *err_msg,unsigned cartnum,int cutnum);
void setCursorPosition(unsigned msec); void setCursorPosition(unsigned msec);
void gotoCursor();
void gotoHome();
void gotoEnd();
void save(); void save();
void clear(); void clear();