Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-13 15:17:44 +02:00
Code Issues Projects Releases Wiki Activity

2018-07-17 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Cleaned up SQL quieries in 'rdlogedit/' ensure UTF-8
	compatibility.
This commit is contained in:
Fred Gleason 2018-07-17 20:01:40 +00:00
parent a3e23f24fb
commit d1f184f6bf
15 changed files with 183 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -17149,3 +17149,6 @@
2018-07-17 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up SQL quieries in 'rdcatchd/' ensure UTF-8
compatibility.
2018-07-17 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up SQL quieries in 'rdlogedit/' ensure UTF-8
compatibility.

23
rdlogedit/edit_chain.cpp
View File

@ -23,6 +23,7 @@
#include <rdapplication.h>
#include <rddb.h>
#include <rdescape_string.h>
#include <rdlist_logs.h>
#include <edit_chain.h>
@ -220,35 +221,27 @@ QSizePolicy EditChain::sizePolicy() const
void EditChain::timeChangedData(const QTime &time)
{
QString str;
if(edit_timetype_box->isChecked()) {
str=QString(tr("Transition If Previous Cart Ends Before"));
edit_time_label->
setText(QString().sprintf("%s %s:",(const char *)str,
(const char *)edit_time_edit->time().
toString("hh:mm:ss.zzz").left(10)));
setText(tr("Transition If Previous Cart Ends Before")+" "+
edit_time_edit->time().toString("hh:mm:ss.zzz").left(10)+":");
}
}
void EditChain::timeToggledData(bool state)
{
QString str;
edit_time_edit->setEnabled(state);
edit_grace_group->setEnabled(state);
if(state) {
graceClickedData(edit_grace_group->selectedId());
str=QString(tr("Transition If Previous Cart Ends Before"));
edit_time_label->
setText(QString().sprintf("%s %s:",(const char *)str,
(const char *)edit_time_edit->time().
toString("hh:mm:ss.zzz").left(10)));
setText(tr("Transition If Previous Cart Ends Before")+" "+
edit_time_edit->time().toString("hh:mm:ss.zzz").left(10)+":");
}
else {
edit_grace_box->setDisabled(true);
edit_time_label->setText(tr("Transition Type:"));
edit_time_label->setText(tr("Transition Type")+":");
}
}
@ -304,8 +297,8 @@ void EditChain::selectLogData()
void EditChain::labelChangedData(const QString &logname)
{
QString sql=
QString().sprintf("select DESCRIPTION from LOGS where NAME=\"%s\"",
(const char *)logname);
QString("select DESCRIPTION from LOGS where ")+
"NAME=\""+RDEscapeString(logname)+"\"";
RDSqlQuery *q=new RDSqlQuery(sql);
if(!q->first()) {
delete q;

8
rdlogedit/edit_log.cpp
View File

@ -1509,12 +1509,8 @@ void EditLog::RefreshLine(RDListViewItem *item)
item->setText(6,logline->title());
}
else {
item->setText(6,QString().
sprintf("%s -- %s %s",
(const char *)logline->title(),
(const char *)logline->originUser(),
(const char *)logline->originDateTime().
toString("M/d hh:mm")));
item->setText(6,logline->title()+" -- "+logline->originUser()+
" "+logline->originDateTime().toString("M/d hh:mm"));
}
}
item->

18
rdlogedit/edit_logline.cpp
View File

@ -286,35 +286,27 @@ void EditLogLine::selectCartData()
void EditLogLine::timeChangedData(const QTime &time)
{
QString str;
if(edit_timetype_box->isChecked()) {
str=QString(tr("Transition If Previous Cart Ends Before"));
edit_time_label->
setText(QString().sprintf("%s %s:",(const char *)str,
(const char *)edit_time_edit->time().
toString("hh:mm:ss.zzz").left(10)));
setText(tr("Transition If Previous Cart Ends Before")+" "+
edit_time_edit->time().toString("hh:mm:ss.zzz").left(10)+":");
}
}
void EditLogLine::timeToggledData(bool state)
{
QString str;
edit_time_edit->setEnabled(state);
edit_grace_group->setEnabled(state);
if(state) {
graceClickedData(edit_grace_group->selectedId());
str=QString(tr("Transition If Previous Cart Ends Before"));
edit_time_label->
setText(QString().sprintf("%s %s:",(const char *)str,
(const char *)edit_time_edit->time().
toString("hh:mm:ss.zzz").left(10)));
setText(tr("Transition If Previous Cart Ends Before")+" "+
edit_time_edit->time().toString("hh:mm:ss.zzz").left(10)+":");
}
else {
edit_grace_edit->setDisabled(true);
edit_time_label->setText(tr("Transition Type:"));
edit_time_label->setText(tr("Transition Type")+":");
}
}

22
rdlogedit/edit_marker.cpp
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell Log Marker Entry
//
// (C) Copyright 2002-2004,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2004,2016-2018 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -21,7 +21,7 @@
#include <qpushbutton.h>
#include <qmessagebox.h>
#include <edit_marker.h>
#include "edit_marker.h"
EditMarker::EditMarker(RDLogLine *line,QWidget *parent)
: QDialog(parent,"",true)
@ -202,35 +202,27 @@ QSizePolicy EditMarker::sizePolicy() const
void EditMarker::timeChangedData(const QTime &time)
{
QString str;
if(edit_timetype_box->isChecked()) {
str=QString(tr("Transition If Previous Cart Ends Before"));
edit_time_label->
setText(QString().sprintf("%s %s:",(const char *)str,
(const char *)edit_time_edit->time().
toString("hh:mm:ss.zzz").left(10)));
setText(tr("Transition If Previous Cart Ends Before")+" "+
edit_time_edit->time().toString("hh:mm:ss.zzz").left(10)+":");
}
}
void EditMarker::timeToggledData(bool state)
{
QString str;
edit_time_edit->setEnabled(state);
edit_grace_group->setEnabled(state);
if(state) {
graceClickedData(edit_grace_group->selectedId());
str=QString(tr("Transition If Previous Cart Ends Before"));
edit_time_label->
setText(QString().sprintf("%s %s:",(const char *)str,
(const char *)edit_time_edit->time().
toString("hh:mm:ss.zzz").left(10)));
setText(tr("Transition If Previous Cart Ends Before")+" "+
edit_time_edit->time().toString("hh:mm:ss.zzz").left(10)+":");
}
else {
edit_grace_box->setDisabled(true);
edit_time_label->setText(tr("Transition Type:"));
edit_time_label->setText(tr("Transition Type")+":");
}
}

16
rdlogedit/edit_track.cpp
View File

@ -191,31 +191,23 @@ QSizePolicy EditTrack::sizePolicy() const
void EditTrack::timeChangedData(const QTime &time)
{
QString str;
if(edit_timetype_box->isChecked()) {
str=QString(tr("Transition If Previous Cart Ends Before"));
edit_time_label->
setText(QString().sprintf("%s %s:",(const char *)str,
(const char *)edit_time_edit->time().
toString("hh:mm:ss.zzz").left(10)));
setText(tr("Transition If Previous Cart Ends Before")+" "+
edit_time_edit->time().toString("hh:mm:ss.zzz").left(10)+":");
}
}
void EditTrack::timeToggledData(bool state)
{
QString str;
edit_time_edit->setEnabled(state);
edit_grace_group->setEnabled(state);
if(state) {
graceClickedData(edit_grace_group->selectedId());
str=QString(tr("Transition If Previous Cart Ends Before"));
edit_time_label->
setText(QString().sprintf("%s %s:",(const char *)str,
(const char *)edit_time_edit->time().
toString("hh:mm:ss.zzz").left(10)));
setText(tr("Transition If Previous Cart Ends Before")+" "+
edit_time_edit->time().toString("hh:mm:ss.zzz").left(10)+":");
}
else {
edit_grace_box->setDisabled(true);

38
rdlogedit/rdlogedit.cpp
View File

@ -99,8 +99,6 @@ void SigHandler(int signo)
MainWidget::MainWidget(QWidget *parent)
:QMainWindow(parent)
{
QString str1;
QString str2;
QString err_msg;
log_resize=false;
@ -294,20 +292,17 @@ MainWidget::MainWidget(QWidget *parent)
log_close_button->setText(tr("&Close"));
connect(log_close_button,SIGNAL(clicked()),this,SLOT(quitMainWidget()));
str1=QString("RDLogEdit")+"v"+VERSION+" - "+tr("Host");
#ifdef WIN32
RefreshList();
str2=tr("User")+": ["+tr("Windows")+"]";
#else
//
// Setup Signal Handling
//
::signal(SIGCHLD,SigHandler);
str2=tr("User")+": ["+tr("Unknown")+"]";
#endif // WIN32
setCaption(QString().sprintf("%s: %s, %s",(const char *)str1,
(const char *)rda->config()->stationName(),
(const char *)str2));
setCaption(QString("RDLogEdit")+"v"+VERSION+" - "+tr("Host")+": "+
rda->config()->stationName()+", "+
tr("User")+": ["+tr("Unknown")+"]");
log_resize=true;
}
@ -771,13 +766,26 @@ void MainWidget::RefreshItem(ListListViewItem *item)
RDSqlQuery *q;
QString sql;
sql=QString().sprintf("select DESCRIPTION,SERVICE,START_DATE,END_DATE,\
ORIGIN_USER,ORIGIN_DATETIME,COMPLETED_TRACKS,\
SCHEDULED_TRACKS,MUSIC_LINKS,MUSIC_LINKED,\
TRAFFIC_LINKS,TRAFFIC_LINKED,LINK_DATETIME,\
MODIFIED_DATETIME,AUTO_REFRESH from LOGS\
where (TYPE=0)&&(LOG_EXISTS=\"Y\")&&(NAME=\"%s\")",
(const char *)item->text(1));
sql=QString("select ")+
"DESCRIPTION,"+ // 00
"SERVICE,"+ // 01
"START_DATE,"+ // 02
"END_DATE,"+ // 03
"ORIGIN_USER,"+ // 04
"ORIGIN_DATETIME,"+ // 05
"COMPLETED_TRACKS,"+ // 06
"SCHEDULED_TRACKS,"+ // 07
"MUSIC_LINKS,"+ // 08
"MUSIC_LINKED,"+ // 09
"TRAFFIC_LINKS,"+ // 10
"TRAFFIC_LINKED,"+ // 11
"LINK_DATETIME,"+ // 12
"MODIFIED_DATETIME,"+ // 13
"AUTO_REFRESH "+ // 14
"from LOGS where "+
"(TYPE=0)&&"+
"(LOG_EXISTS=\"Y\")&&"+
"(NAME=\""+RDEscapeString(item->text(1))+"\")";
q=new RDSqlQuery(sql);
if(q->next()) {
item->setText(2,q->value(0).toString());

22
rdlogedit/rdlogedit_cs.ts
View File

@ -88,6 +88,10 @@
<source>Transition If Previous Cart Ends Before</source>
<translation>Přechod, když předchozí vozík skončí dříve</translation>
</message>
<message>
<source>Transition Type</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditLog</name>
@ -540,6 +544,10 @@ vybrané služby!</translation>
<source>An event is already scheduled with this start time!</source>
<translation>Již existuje událost s tímto začátečním časem!</translation>
</message>
<message>
<source>Transition Type</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditMarker</name>
@ -601,7 +609,11 @@ vybrané služby!</translation>
</message>
<message>
<source>Transition Type:</source>
<translation>Typ přechodu:</translation>
<translation type="obsolete">Typ přechodu:</translation>
</message>
<message>
<source>Transition Type</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -935,10 +947,6 @@ Vyhledejte svého správce systému kvůli aktualizaci!</translation>
<source>audio deletion error!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Log</source>
<translation type="unfinished"></translation>
@ -1282,5 +1290,9 @@ therefore only existing transitions will be editable.</source>
<source>Log already being edited by</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Talk</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

22
rdlogedit/rdlogedit_de.ts
View File

@ -88,6 +88,10 @@
<source>Transition If Previous Cart Ends Before</source>
<translation>Übergang wenn der vorheriger Cart eher aufhört</translation>
</message>
<message>
<source>Transition Type</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditLog</name>
@ -540,6 +544,10 @@ Gruppe des ausgewählten Service!</translation>
<source>An event is already scheduled with this start time!</source>
<translation>Es existiert bereits ein Event mit dieser Startzeit!</translation>
</message>
<message>
<source>Transition Type</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditMarker</name>
@ -601,7 +609,11 @@ Gruppe des ausgewählten Service!</translation>
</message>
<message>
<source>Transition Type:</source>
<translation>Übergangstyp:</translation>
<translation type="obsolete">Übergangstyp:</translation>
</message>
<message>
<source>Transition Type</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -925,10 +937,6 @@ Fortfahren?</translation>
<source>audio deletion error!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Log</source>
<translation type="unfinished"></translation>
@ -1272,5 +1280,9 @@ therefore only existing transitions will be editable.</source>
<source>Log already being edited by</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Talk</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

22
rdlogedit/rdlogedit_es.ts
View File

@ -88,6 +88,10 @@
<source>Transition If Previous Cart Ends Before</source>
<translation>Transic. si cart. previo termina antes de</translation>
</message>
<message>
<source>Transition Type</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditLog</name>
@ -540,6 +544,10 @@ desactivado para el servicio especificado!</translation>
<source>An event is already scheduled with this start time!</source>
<translation>¡Se programó un evento para esta misma hora de inicio!</translation>
</message>
<message>
<source>Transition Type</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditMarker</name>
@ -601,7 +609,11 @@ desactivado para el servicio especificado!</translation>
</message>
<message>
<source>Transition Type:</source>
<translation>Tipo de transición:</translation>
<translation type="obsolete">Tipo de transición:</translation>
</message>
<message>
<source>Transition Type</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -931,10 +943,6 @@ See your system administrator for an update!</source>
<source>audio deletion error!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Log</source>
<translation type="unfinished"></translation>
@ -1284,5 +1292,9 @@ sólo podrás editar transiciones ya existentes.</translation>
<source>Log already being edited by</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Talk</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

18
rdlogedit/rdlogedit_fr.ts
View File

@ -88,6 +88,10 @@
<source>Transition If Previous Cart Ends Before</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Transition Type</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditLog</name>
@ -512,6 +516,10 @@ group for the specified service!</source>
<source>An event is already scheduled with this start time!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Transition Type</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditMarker</name>
@ -572,7 +580,7 @@ group for the specified service!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Transition Type:</source>
<source>Transition Type</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -834,10 +842,6 @@ Report</source>
<source>audio deletion error!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Log</source>
<translation type="unfinished"></translation>
@ -1181,5 +1185,9 @@ therefore only existing transitions will be editable.</source>
<source>Log already being edited by</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Talk</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

22
rdlogedit/rdlogedit_nb.ts
View File

@ -92,6 +92,10 @@
<source>Transition If Previous Cart Ends Before</source>
<translation>Overgang viss førre korg endar før</translation>
</message>
<message>
<source>Transition Type</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditLog</name>
@ -554,6 +558,10 @@ som er skrudd av for denne tenesta!</translation>
<source>An event is already scheduled with this start time!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Transition Type</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditMarker</name>
@ -619,7 +627,11 @@ som er skrudd av for denne tenesta!</translation>
</message>
<message>
<source>Transition Type:</source>
<translation>Overgangstype:</translation>
<translation type="obsolete">Overgangstype:</translation>
</message>
<message>
<source>Transition Type</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -943,10 +955,6 @@ Vil du halda fram?</translation>
<source>audio deletion error!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Log</source>
<translation type="unfinished"></translation>
@ -1290,5 +1298,9 @@ therefore only existing transitions will be editable.</source>
<source>Log already being edited by</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Talk</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

22
rdlogedit/rdlogedit_nn.ts
View File

@ -92,6 +92,10 @@
<source>Transition If Previous Cart Ends Before</source>
<translation>Overgang viss førre korg endar før</translation>
</message>
<message>
<source>Transition Type</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditLog</name>
@ -554,6 +558,10 @@ som er skrudd av for denne tenesta!</translation>
<source>An event is already scheduled with this start time!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Transition Type</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditMarker</name>
@ -619,7 +627,11 @@ som er skrudd av for denne tenesta!</translation>
</message>
<message>
<source>Transition Type:</source>
<translation>Overgangstype:</translation>
<translation type="obsolete">Overgangstype:</translation>
</message>
<message>
<source>Transition Type</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -943,10 +955,6 @@ Vil du halda fram?</translation>
<source>audio deletion error!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Log</source>
<translation type="unfinished"></translation>
@ -1290,5 +1298,9 @@ therefore only existing transitions will be editable.</source>
<source>Log already being edited by</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Talk</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

22
rdlogedit/rdlogedit_pt_BR.ts
View File

@ -89,6 +89,10 @@ Ação se Evento anterior estiver sendo executado</translation>
<source>Transition If Previous Cart Ends Before</source>
<translation>Transição de Cartão anterior terminar antes</translation>
</message>
<message>
<source>Transition Type</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditLog</name>
@ -541,6 +545,10 @@ para o Serviço especificado!</translation>
<source>An event is already scheduled with this start time!</source>
<translation>Um evento já foi agendado para esta hora!</translation>
</message>
<message>
<source>Transition Type</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditMarker</name>
@ -602,7 +610,11 @@ para o Serviço especificado!</translation>
</message>
<message>
<source>Transition Type:</source>
<translation>Tipo de Transição:</translation>
<translation type="obsolete">Tipo de Transição:</translation>
</message>
<message>
<source>Transition Type</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -922,10 +934,6 @@ Continuar?</translation>
<source>audio deletion error!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Log</source>
<translation type="unfinished"></translation>
@ -1276,5 +1284,9 @@ Assim sendo, somente transições existentes serão editáveis.</translation>
<source>Log already being edited by</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Talk</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

41
rdlogedit/voice_tracker.cpp
View File

@ -2550,12 +2550,8 @@ void VoiceTracker::RefreshLine(RDListViewItem *item)
item->setText(6,logline->title());
}
else {
item->setText(6,QString().
sprintf("%s -- %s %s",
(const char *)logline->title(),
(const char *)logline->originUser(),
(const char *)logline->originDateTime().
toString("M/d hh:mm")));
item->setText(6,logline->title()+" -- "+logline->originUser()+" "+
logline->originDateTime().toString("M/d hh:mm"));
}
}
item->setText(7,logline->artist());
@ -3145,9 +3141,8 @@ void VoiceTracker::DrawTrackMap(int trackno)
}
}
wpg[0]->setPen(TRACKER_TEXT_COLOR);
wpg[0]->drawText(5,14,QString().sprintf("%s - %s",
(const char *)edit_logline[0]->title(),
(const char *)edit_logline[0]->artist()));
wpg[0]->drawText(5,14,edit_logline[0]->title()+" - "+
edit_logline[0]->artist());
wpg[0]->end();
}
break;
@ -3171,8 +3166,8 @@ void VoiceTracker::DrawTrackMap(int trackno)
if(track_start_time>QTime(0,0,0)) {
p->setFont(QFont("Helvetica",12,QFont::Bold));
p->setPen(TRACKER_TEXT_COLOR);
p->drawText(550,75,QString().sprintf("Start %s",
(const char*)track_start_time.toString("h:mm:ss")));
p->drawText(550,75,tr("Start")+" "+
track_start_time.toString("h:mm:ss"));
}
p->end();
delete p;
@ -3204,8 +3199,7 @@ void VoiceTracker::DrawTrackMap(int trackno)
track_time=track_start_time;
track_time=track_time.addMSecs(
track_time_remaining_start-track_time_counter);
p->drawText(550,75,QString().sprintf("Time %s",
(const char*)track_time.toString("h:mm:ss")));
p->drawText(550,75,tr("Time")+" "+track_time.toString("h:mm:ss"));
}
p->end();
delete p;
@ -3298,8 +3292,8 @@ void VoiceTracker::DrawTrackMap(int trackno)
wpg[1]->drawText(5,14,edit_logline[1]->title());
}
if(track_start_time>QTime(0,0,0)) {
wpg[1]->drawText(550,75,QString().sprintf("Start %s",
(const char*)track_start_time.toString("h:mm:ss")));
wpg[1]->drawText(550,75,tr("Start")+" "+
track_start_time.toString("h:mm:ss"));
}
wpg[1]->end();
break;
@ -3415,9 +3409,8 @@ void VoiceTracker::DrawTrackMap(int trackno)
DrawRubberBand(wpg[2],2);
}
wpg[2]->setPen(TRACKER_TEXT_COLOR);
wpg[2]->drawText(5,14,QString().sprintf("%s - %s",
(const char *)edit_logline[2]->title(),
(const char *)edit_logline[2]->artist()));
wpg[2]->drawText(5,14,edit_logline[2]->title()+" - "+
edit_logline[2]->artist());
if(track_recording && (edit_deck[2]->state()==RDPlayDeck::Playing ||
edit_deck[2]->state()==RDPlayDeck::Stopping)) {
int talk_len=edit_logline[2]->talkLength();
@ -3426,12 +3419,12 @@ void VoiceTracker::DrawTrackMap(int trackno)
talk_len-=edit_deck[2]->currentPosition()-
edit_logline[2]->talkStartPoint();
}
wpg[2]->drawText(550,75,QString().sprintf("Talk :%d",
(talk_len+500)/1000));
wpg[2]->drawText(550,75,tr("Talk")+
QString().sprintf(" :%d",(talk_len+500)/1000));
}
else {
wpg[2]->drawText(550,75,QString().sprintf("Talk :%d",
(edit_logline[2]->talkLength()+500)/1000));
wpg[2]->drawText(550,75,tr("Talk")+QString().
sprintf(" :%d",(edit_logline[2]->talkLength()+500)/1000));
}
wpg[2]->end();
@ -3920,9 +3913,7 @@ void VoiceTracker::UpdateRemaining()
edit_tracks_remaining_label->setText(QString().sprintf("%d",track_tracks));
if(track_block_valid) {
edit_time_remaining_label->
setText(QString().sprintf("%s",(const char *)
RDGetTimeLength(track_time_remaining,
true,true)));
setText(RDGetTimeLength(track_time_remaining,true,true));
if(track_time_remaining>=0) {
edit_time_remaining_label->setPalette(edit_time_remaining_palette[0]);
}