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

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

Browse Source 
* Modified the marker readouts to show a yellow background when the
	parent markers have been selected.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-03-21 11:11:49 -04:00
parent 7d72ad0676
commit 01cadd5b56
12 changed files with 46 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -21306,3 +21306,6 @@
rather than singly.
2021-03-20 Fred Gleason <fredg@paravelsystems.com>
* Implemented loop mode in 'RDMarkerDialog'.
2021-03-21 Fred Gleason <fredg@paravelsystems.com>
* Modified the marker readouts to show a yellow background when the
parent markers have been selected.

2
lib/librd_cs.ts
View File

@ -931,7 +931,7 @@
</message>
<message>
<source>Length</source>
<translation type="unfinished">Délka</translation>
<translation type="obsolete">Délka</translation>
</message>
<message>
<source>Talk</source>

2
lib/librd_de.ts
View File

@ -927,7 +927,7 @@
</message>
<message>
<source>Length</source>
<translation type="unfinished">Länge</translation>
<translation type="obsolete">Länge</translation>
</message>
<message>
<source>Talk</source>

2
lib/librd_es.ts
View File

@ -927,7 +927,7 @@
</message>
<message>
<source>Length</source>
<translation type="unfinished">Longitud</translation>
<translation type="obsolete">Longitud</translation>
</message>
<message>
<source>Talk</source>

4
lib/librd_fr.ts
View File

@ -895,10 +895,6 @@
<source>Energy export failed</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Length</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Talk</source>
<translation type="unfinished"></translation>

2
lib/librd_nb.ts
View File

@ -927,7 +927,7 @@
</message>
<message>
<source>Length</source>
<translation type="unfinished">Lengd</translation>
<translation type="obsolete">Lengd</translation>
</message>
<message>
<source>Talk</source>

2
lib/librd_nn.ts
View File

@ -927,7 +927,7 @@
</message>
<message>
<source>Length</source>
<translation type="unfinished">Lengd</translation>
<translation type="obsolete">Lengd</translation>
</message>
<message>
<source>Talk</source>

2
lib/librd_pt_BR.ts
View File

@ -927,7 +927,7 @@
</message>
<message>
<source>Length</source>
<translation type="unfinished">Duração</translation>
<translation type="obsolete">Duração</translation>
</message>
<message>
<source>Talk</source>

37
lib/rdmarkerdialog.cpp
View File

@ -320,33 +320,40 @@ void RDMarkerDialog::resizeEvent(QResizeEvent *e)
//
// Readout Section
//
d_cut_readout->setGeometry(10,30+RDMARKERDIALOG_WAVEFORM_HEIGHT+94,
d_cut_readout->setGeometry(2,
2+d_marker_view->sizeHint().height(),
//30+RDMARKERDIALOG_WAVEFORM_HEIGHT+94,
d_cut_readout->sizeHint().width(),
d_cut_readout->sizeHint().height());
d_talk_readout->setGeometry(10+1*(d_talk_readout->sizeHint().width()-2),
30+RDMARKERDIALOG_WAVEFORM_HEIGHT+94,
d_talk_readout->setGeometry(2+1*(d_talk_readout->sizeHint().width()-2),
2+d_marker_view->sizeHint().height(),
//30+RDMARKERDIALOG_WAVEFORM_HEIGHT+94,
d_talk_readout->sizeHint().width(),
d_talk_readout->sizeHint().height());
d_segue_readout->setGeometry(10+2*(d_segue_readout->sizeHint().width()-2),
30+RDMARKERDIALOG_WAVEFORM_HEIGHT+94,
d_segue_readout->setGeometry(2+2*(d_segue_readout->sizeHint().width()-2),
2+d_marker_view->sizeHint().height(),
//30+RDMARKERDIALOG_WAVEFORM_HEIGHT+94,
d_segue_readout->sizeHint().width(),
d_segue_readout->sizeHint().height());
d_hook_readout->setGeometry(10+3*(d_hook_readout->sizeHint().width()-2),
30+RDMARKERDIALOG_WAVEFORM_HEIGHT+94,
d_hook_readout->setGeometry(2+3*(d_hook_readout->sizeHint().width()-2),
2+d_marker_view->sizeHint().height(),
//30+RDMARKERDIALOG_WAVEFORM_HEIGHT+94,
d_hook_readout->sizeHint().width(),
d_hook_readout->sizeHint().height());
d_fadeup_readout->setGeometry(10,
30+RDMARKERDIALOG_WAVEFORM_HEIGHT+90+
d_fadeup_readout->setGeometry(2,
d_marker_view->sizeHint().height()-2+
//30+RDMARKERDIALOG_WAVEFORM_HEIGHT+90+
d_hook_readout->sizeHint().height(),
2*d_fadeup_readout->sizeHint().width()-2,
d_fadeup_readout->sizeHint().height());
d_fadedown_readout->setGeometry(6+2*d_fadedown_readout->sizeHint().width(),
30+RDMARKERDIALOG_WAVEFORM_HEIGHT+90+
d_fadedown_readout->setGeometry(2*d_fadedown_readout->sizeHint().width()-2,
d_marker_view->sizeHint().height()-2+
//30+RDMARKERDIALOG_WAVEFORM_HEIGHT+90+
d_hook_readout->sizeHint().height(),
2*d_fadedown_readout->sizeHint().width()-2,
d_fadedown_readout->sizeHint().height());
@ -354,10 +361,16 @@ void RDMarkerDialog::resizeEvent(QResizeEvent *e)
//
// Transport Section
//
d_player->setGeometry(2*d_fadedown_readout->sizeHint().width()+
2*d_fadedown_readout->sizeHint().width()-6,
2+d_marker_view->sizeHint().height(),
d_player->sizeHint().width(),
d_player->sizeHint().height());
/*
d_player->setGeometry(2,2+d_marker_view->sizeHint().height(),
d_player->sizeHint().width(),
d_player->sizeHint().height());
*/
d_ok_button->setGeometry(w-180,h-60,80,50);
d_cancel_button->setGeometry(w-90,h-60,80,50);
}

7
lib/rdmarkerplayer.cpp
View File

@ -132,7 +132,7 @@ RDMarkerPlayer::~RDMarkerPlayer()
QSize RDMarkerPlayer::sizeHint() const
{
return QSize(717,92);
return QSize(736,96);
}
@ -201,8 +201,9 @@ void RDMarkerPlayer::setSelectedMarkers(RDMarkerHandle::PointerRole start_role,
if(start_role==RDMarkerHandle::LastRole) {
color=RDMarkerHandle::pointerRoleColor(end_role);
}
d_region_edit_label->
setStyleSheet("background-color: "+color.name());
QString ss=
"color:"+RDGetTextColor(color).name()+";background-color:"+color.name();
d_region_edit_label->setStyleSheet(ss);
d_play_from_button->setAccentColor(color);
d_play_to_button->setAccentColor(color);
d_selected_markers[0]=start_role;

10
lib/rdmarkerreadout.cpp
View File

@ -33,8 +33,6 @@ RDMarkerReadout::RDMarkerReadout(RDMarkerHandle::PointerRole role,
d_label=new QLabel(RDMarkerHandle::pointerRoleText(role),this);
d_label->setAlignment(Qt::AlignCenter);
d_label->setFont(labelFont());
d_label->setStyleSheet("background-color: "+
RDMarkerHandle::pointerRoleColor(role).name());
switch(role) {
case RDMarkerHandle::CutStart:
@ -115,11 +113,13 @@ void RDMarkerReadout::setSelectedMarkers(RDMarkerHandle::PointerRole start_role,
if(d_roles.contains(start_role)||d_roles.contains(end_role)) {
for(int i=0;i<d_edits.size();i++) {
d_edits.at(i)->setFont(labelFont());
d_edits.at(i)->setStyleSheet("background-color:#FFFF00");
}
}
else {
for(int i=0;i<d_edits.size();i++) {
d_edits.at(i)->setFont(defaultFont());
d_edits.at(i)->setStyleSheet("");
}
}
}
@ -130,7 +130,11 @@ void RDMarkerReadout::setEnabled(bool state)
if(state) {
d_label->
setStyleSheet("background-color: "+
RDMarkerHandle::pointerRoleColor(d_roles.first()).name());
RDMarkerHandle::
pointerRoleColor(d_roles.first()).name()+";"+
"color: "+
RDGetTextColor(RDMarkerHandle::
pointerRoleColor(d_roles.first())).name());
}
else {
d_label->setStyleSheet("background-color: "+LABEL_DISABLED_COLOR);

2
lib/rdmarkerview.cpp
View File

@ -195,7 +195,7 @@ QString RDMarkerHandle::pointerRoleText(PointerRole role)
switch(role) {
case RDMarkerHandle::CutStart:
case RDMarkerHandle::CutEnd:
ret=QObject::tr("Length");
ret=QObject::tr("Cut");
break;
case RDMarkerHandle::TalkStart: