Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-22 07:39:35 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Fixed a bug in the Cart Picker dialog that caused corruption
	with UTF-8 strings.
This commit is contained in:
Fred Gleason 2018-08-17 11:35:22 -04:00
parent 04fac8e777
commit 4a40700f1b
10 changed files with 479 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -17474,3 +17474,6 @@
2018-08-17 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'RDCartDrag' that caused corruption with UTF-8
strings.
2018-08-17 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in the Cart Picker dialog that caused corruption
with UTF-8 strings.

64
lib/librd_cs.ts
View File

@ -892,43 +892,43 @@ barvu</translation>
</message>
<message>
<source>NUMBER</source>
<translation>ČÍSLO</translation>
<translation type="obsolete">ČÍSLO</translation>
</message>
<message>
<source>LENGTH</source>
<translation>DÉLKA</translation>
<translation type="obsolete">DÉLKA</translation>
</message>
<message>
<source>TITLE</source>
<translation>NÁZEV</translation>
<translation type="obsolete">NÁZEV</translation>
</message>
<message>
<source>ARTIST</source>
<translation>UMĚLEC</translation>
<translation type="obsolete">UMĚLEC</translation>
</message>
<message>
<source>GROUP</source>
<translation>SKUPINA</translation>
<translation type="obsolete">SKUPINA</translation>
</message>
<message>
<source>CLIENT</source>
<translation>ZÁKAZNÍK</translation>
<translation type="obsolete">ZÁKAZNÍK</translation>
</message>
<message>
<source>AGENCY</source>
<translation>AGENTURA</translation>
<translation type="obsolete">AGENTURA</translation>
</message>
<message>
<source>USER DEF</source>
<translation>DEF UŽIVATELE</translation>
<translation type="obsolete">DEF UŽIVATELE</translation>
</message>
<message>
<source>START</source>
<translation>ZAČÁTEK</translation>
<translation type="obsolete">ZAČÁTEK</translation>
</message>
<message>
<source>END</source>
<translation>KONEC</translation>
<translation type="obsolete">KONEC</translation>
</message>
<message>
<source>Send to
@ -995,13 +995,53 @@ ze &amp;souboru</translation>
<translation>Zavádí se</translation>
</message>
<message>
<source>COMPOSER</source>
<source>Number</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CONDUCTOR</source>
<source>Length</source>
<translation type="unfinished">Délka</translation>
</message>
<message>
<source>Title</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Artist</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Group</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Composer</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Conductor</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Client</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Agency</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>User Def</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Start</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>End</source>
<translation type="unfinished">Konec</translation>
</message>
</context>
<context>
<name>RDCueEdit</name>

64
lib/librd_de.ts
View File

@ -888,43 +888,43 @@ setzen</translation>
</message>
<message>
<source>NUMBER</source>
<translation>NUMMER</translation>
<translation type="obsolete">NUMMER</translation>
</message>
<message>
<source>LENGTH</source>
<translation>LÄNGE</translation>
<translation type="obsolete">LÄNGE</translation>
</message>
<message>
<source>TITLE</source>
<translation>TITEL</translation>
<translation type="obsolete">TITEL</translation>
</message>
<message>
<source>ARTIST</source>
<translation>KÜNSTLER</translation>
<translation type="obsolete">KÜNSTLER</translation>
</message>
<message>
<source>GROUP</source>
<translation>GRUPPE</translation>
<translation type="obsolete">GRUPPE</translation>
</message>
<message>
<source>CLIENT</source>
<translation>KUNDE</translation>
<translation type="obsolete">KUNDE</translation>
</message>
<message>
<source>AGENCY</source>
<translation>AGENTUR</translation>
<translation type="obsolete">AGENTUR</translation>
</message>
<message>
<source>USER DEF</source>
<translation>BENUTZER DEF</translation>
<translation type="obsolete">BENUTZER DEF</translation>
</message>
<message>
<source>START</source>
<translation>START</translation>
<translation type="obsolete">START</translation>
</message>
<message>
<source>END</source>
<translation>END</translation>
<translation type="obsolete">END</translation>
</message>
<message>
<source>Send to
@ -986,13 +986,53 @@ senden</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>COMPOSER</source>
<source>Number</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CONDUCTOR</source>
<source>Length</source>
<translation type="unfinished">Länge</translation>
</message>
<message>
<source>Title</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Artist</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Group</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Composer</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Conductor</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Client</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Agency</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>User Def</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Start</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>End</source>
<translation type="unfinished">Ende</translation>
</message>
</context>
<context>
<name>RDCueEdit</name>

64
lib/librd_es.ts
View File

@ -880,39 +880,39 @@ Color</translation>
</message>
<message>
<source>NUMBER</source>
<translation>NÚMERO</translation>
<translation type="obsolete">NÚMERO</translation>
</message>
<message>
<source>LENGTH</source>
<translation>DURACIÓN</translation>
<translation type="obsolete">DURACIÓN</translation>
</message>
<message>
<source>TITLE</source>
<translation>TÍTULO</translation>
<translation type="obsolete">TÍTULO</translation>
</message>
<message>
<source>ARTIST</source>
<translation>ARTISTA </translation>
<translation type="obsolete">ARTISTA </translation>
</message>
<message>
<source>CLIENT</source>
<translation>CLIENTE</translation>
<translation type="obsolete">CLIENTE</translation>
</message>
<message>
<source>AGENCY</source>
<translation>AGENCIA</translation>
<translation type="obsolete">AGENCIA</translation>
</message>
<message>
<source>USER DEF</source>
<translation>OTROS</translation>
<translation type="obsolete">OTROS</translation>
</message>
<message>
<source>START</source>
<translation>INICIO</translation>
<translation type="obsolete">INICIO</translation>
</message>
<message>
<source>END</source>
<translation>FIN</translation>
<translation type="obsolete">FIN</translation>
</message>
<message>
<source>&amp;OK</source>
@ -928,7 +928,7 @@ Color</translation>
</message>
<message>
<source>GROUP</source>
<translation>GRUPO</translation>
<translation type="obsolete">GRUPO</translation>
</message>
<message>
<source>Send to
@ -986,13 +986,53 @@ Color</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>COMPOSER</source>
<source>Number</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CONDUCTOR</source>
<source>Length</source>
<translation type="unfinished">Longitud</translation>
</message>
<message>
<source>Title</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Artist</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Group</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Composer</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Conductor</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Client</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Agency</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>User Def</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Start</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>End</source>
<translation type="unfinished">Final</translation>
</message>
</context>
<context>
<name>RDCueEdit</name>

96
lib/librd_fr.ts
View File

@ -813,46 +813,6 @@ La Couleur</translation>
<source>Group:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>NUMBER</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LENGTH</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TITLE</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ARTIST</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>GROUP</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CLIENT</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AGENCY</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>USER DEF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>START</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>END</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Send to
&amp;Editor</source>
@ -882,14 +842,6 @@ La Couleur</translation>
<source>Matches</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>COMPOSER</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CONDUCTOR</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Load From
&amp;File</source>
@ -919,6 +871,54 @@ La Couleur</translation>
<source>Imported from</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Number</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Length</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Title</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Artist</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Group</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Composer</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Conductor</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Client</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Agency</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>User Def</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Start</source>
<translation type="unfinished">Début</translation>
</message>
<message>
<source>End</source>
<translation type="unfinished">Fin</translation>
</message>
</context>
<context>
<name>RDCueEdit</name>

64
lib/librd_nb.ts
View File

@ -888,43 +888,43 @@ farge</translation>
</message>
<message>
<source>NUMBER</source>
<translation>NUMMER</translation>
<translation type="obsolete">NUMMER</translation>
</message>
<message>
<source>LENGTH</source>
<translation>LENGD</translation>
<translation type="obsolete">LENGD</translation>
</message>
<message>
<source>TITLE</source>
<translation>TITTEL</translation>
<translation type="obsolete">TITTEL</translation>
</message>
<message>
<source>ARTIST</source>
<translation>ARTIST</translation>
<translation type="obsolete">ARTIST</translation>
</message>
<message>
<source>GROUP</source>
<translation>GRUPPE</translation>
<translation type="obsolete">GRUPPE</translation>
</message>
<message>
<source>CLIENT</source>
<translation>KLIENT</translation>
<translation type="obsolete">KLIENT</translation>
</message>
<message>
<source>AGENCY</source>
<translation>AGENT</translation>
<translation type="obsolete">AGENT</translation>
</message>
<message>
<source>USER DEF</source>
<translation>BRUKARDEFINERT</translation>
<translation type="obsolete">BRUKARDEFINERT</translation>
</message>
<message>
<source>START</source>
<translation>START</translation>
<translation type="obsolete">START</translation>
</message>
<message>
<source>END</source>
<translation>SLUTT</translation>
<translation type="obsolete">SLUTT</translation>
</message>
<message>
<source>Send to
@ -985,13 +985,53 @@ farge</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>COMPOSER</source>
<source>Number</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CONDUCTOR</source>
<source>Length</source>
<translation type="unfinished">Lengd</translation>
</message>
<message>
<source>Title</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Artist</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Group</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Composer</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Conductor</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Client</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Agency</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>User Def</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Start</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>End</source>
<translation type="unfinished">Slutten</translation>
</message>
</context>
<context>
<name>RDCueEdit</name>

64
lib/librd_nn.ts
View File

@ -888,43 +888,43 @@ farge</translation>
</message>
<message>
<source>NUMBER</source>
<translation>NUMMER</translation>
<translation type="obsolete">NUMMER</translation>
</message>
<message>
<source>LENGTH</source>
<translation>LENGD</translation>
<translation type="obsolete">LENGD</translation>
</message>
<message>
<source>TITLE</source>
<translation>TITTEL</translation>
<translation type="obsolete">TITTEL</translation>
</message>
<message>
<source>ARTIST</source>
<translation>ARTIST</translation>
<translation type="obsolete">ARTIST</translation>
</message>
<message>
<source>GROUP</source>
<translation>GRUPPE</translation>
<translation type="obsolete">GRUPPE</translation>
</message>
<message>
<source>CLIENT</source>
<translation>KLIENT</translation>
<translation type="obsolete">KLIENT</translation>
</message>
<message>
<source>AGENCY</source>
<translation>AGENT</translation>
<translation type="obsolete">AGENT</translation>
</message>
<message>
<source>USER DEF</source>
<translation>BRUKARDEFINERT</translation>
<translation type="obsolete">BRUKARDEFINERT</translation>
</message>
<message>
<source>START</source>
<translation>START</translation>
<translation type="obsolete">START</translation>
</message>
<message>
<source>END</source>
<translation>SLUTT</translation>
<translation type="obsolete">SLUTT</translation>
</message>
<message>
<source>Send to
@ -985,13 +985,53 @@ farge</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>COMPOSER</source>
<source>Number</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CONDUCTOR</source>
<source>Length</source>
<translation type="unfinished">Lengd</translation>
</message>
<message>
<source>Title</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Artist</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Group</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Composer</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Conductor</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Client</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Agency</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>User Def</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Start</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>End</source>
<translation type="unfinished">Slutten</translation>
</message>
</context>
<context>
<name>RDCueEdit</name>

64
lib/librd_pt_BR.ts
View File

@ -888,43 +888,43 @@ Cor</translation>
</message>
<message>
<source>NUMBER</source>
<translation>NÚMERO</translation>
<translation type="obsolete">NÚMERO</translation>
</message>
<message>
<source>LENGTH</source>
<translation>DURAÇÃO</translation>
<translation type="obsolete">DURAÇÃO</translation>
</message>
<message>
<source>TITLE</source>
<translation>TÍTULO</translation>
<translation type="obsolete">TÍTULO</translation>
</message>
<message>
<source>ARTIST</source>
<translation>ARTISTA</translation>
<translation type="obsolete">ARTISTA</translation>
</message>
<message>
<source>GROUP</source>
<translation>GRUPO</translation>
<translation type="obsolete">GRUPO</translation>
</message>
<message>
<source>CLIENT</source>
<translation>CLIENTE</translation>
<translation type="obsolete">CLIENTE</translation>
</message>
<message>
<source>AGENCY</source>
<translation>AGÊNCIA</translation>
<translation type="obsolete">AGÊNCIA</translation>
</message>
<message>
<source>USER DEF</source>
<translation>USO GENERICO</translation>
<translation type="obsolete">USO GENERICO</translation>
</message>
<message>
<source>START</source>
<translation>INÍCIO</translation>
<translation type="obsolete">INÍCIO</translation>
</message>
<message>
<source>END</source>
<translation>FINAL</translation>
<translation type="obsolete">FINAL</translation>
</message>
<message>
<source>Send to
@ -986,13 +986,53 @@ Cor</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>COMPOSER</source>
<source>Number</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CONDUCTOR</source>
<source>Length</source>
<translation type="unfinished">Duração</translation>
</message>
<message>
<source>Title</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Artist</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Group</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Composer</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Conductor</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Client</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Agency</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>User Def</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Start</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>End</source>
<translation type="unfinished">Fim</translation>
</message>
</context>
<context>
<name>RDCueEdit</name>

32
lib/rdcart_dialog.cpp
View File

@ -2,7 +2,7 @@
//
// A widget to select a Rivendell Cart.
//
// (C) Copyright 2002-2004,2016-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-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
@ -29,10 +29,6 @@
#include <qeventloop.h>
#include <q3filedialog.h>
#include <qmessagebox.h>
//Added by qt3to4:
#include <QPixmap>
#include <QResizeEvent>
#include <QCloseEvent>
#include <rdapplication.h>
#ifndef WIN32
@ -208,42 +204,42 @@ RDCartDialog::RDCartDialog(QString *filter,QString *group,QString *schedcode,
cart_cart_list->addColumn("");
cart_cart_list->setColumnAlignment(0,Qt::AlignHCenter);
cart_cart_list->addColumn(tr("NUMBER"));
cart_cart_list->addColumn(tr("Number"));
cart_cart_list->setColumnAlignment(1,Qt::AlignHCenter);
cart_cart_list->addColumn(tr("LENGTH"));
cart_cart_list->addColumn(tr("Length"));
cart_cart_list->setColumnAlignment(2,Qt::AlignRight);
cart_cart_list->setColumnSortType(2,RDListView::TimeSort);
cart_cart_list->addColumn(tr("TITLE"),200);
cart_cart_list->addColumn(tr("Title"),200);
cart_cart_list->setColumnAlignment(3,Qt::AlignLeft);
cart_cart_list->setColumnWidthMode(3,Q3ListView::Manual);
cart_cart_list->addColumn(tr("ARTIST"));
cart_cart_list->addColumn(tr("Artist"));
cart_cart_list->setColumnAlignment(4,Qt::AlignLeft);
cart_cart_list->addColumn(tr("GROUP"));
cart_cart_list->addColumn(tr("Group"));
cart_cart_list->setColumnAlignment(5,Qt::AlignLeft);
cart_cart_list->addColumn(tr("COMPOSER"));
cart_cart_list->addColumn(tr("Composer"));
cart_cart_list->setColumnAlignment(6,Qt::AlignLeft);
cart_cart_list->addColumn(tr("CONDUCTOR"));
cart_cart_list->addColumn(tr("Conductor"));
cart_cart_list->setColumnAlignment(7,Qt::AlignLeft);
cart_cart_list->addColumn(tr("CLIENT"));
cart_cart_list->addColumn(tr("Client"));
cart_cart_list->setColumnAlignment(8,Qt::AlignLeft);
cart_cart_list->addColumn(tr("AGENCY"));
cart_cart_list->addColumn(tr("Agency"));
cart_cart_list->setColumnAlignment(9,Qt::AlignLeft);
cart_cart_list->addColumn(tr("USER DEF"));
cart_cart_list->addColumn(tr("User Def"));
cart_cart_list->setColumnAlignment(10,Qt::AlignLeft);
cart_cart_list->addColumn(tr("START"));
cart_cart_list->addColumn(tr("Start"));
cart_cart_list->setColumnAlignment(11,Qt::AlignLeft);
cart_cart_list->addColumn(tr("END"));
cart_cart_list->addColumn(tr("End"));
cart_cart_list->setColumnAlignment(12,Qt::AlignLeft);
//
@ -894,7 +890,7 @@ QString RDCartDialog::GetSearchFilter(const QString &filter,
if(schedcode!=tr("ALL")) {
sched=schedcode;
}
QString search=RDCartSearchText(filter,group,sched,false).utf8();
QString search=RDCartSearchText(filter,group,sched,false);
//
// Excluded Groups

185
rdlibrary/rdlibrary.cpp
View File

@ -214,12 +214,12 @@ MainWidget::MainWidget(QWidget *parent)
lib_search_button->setFont(button_font);
connect(lib_search_button,SIGNAL(clicked()),this,SLOT(searchClickedData()));
switch(lib_filter_mode) {
case RDStation::FilterSynchronous:
lib_search_button->hide();
break;
case RDStation::FilterSynchronous:
lib_search_button->hide();
break;
case RDStation::FilterAsynchronous:
break;
case RDStation::FilterAsynchronous:
break;
}
//
@ -758,12 +758,12 @@ Do you still want to delete it?"),item->text(1).toUInt());
switch(QMessageBox::question(this,tr("Empty Clipboard"),str,
QMessageBox::Yes,
QMessageBox::No)) {
case QMessageBox::No:
case QMessageBox::NoButton:
del_flag=false;
case QMessageBox::No:
case QMessageBox::NoButton:
del_flag=false;
default:
break;
default:
break;
}
delete cut_clipboard;
cut_clipboard=NULL;
@ -1225,15 +1225,15 @@ void SigHandler(int signo)
pid_t pLocalPid;
switch(signo) {
case SIGCHLD:
pLocalPid=waitpid(-1,NULL,WNOHANG);
while(pLocalPid>0) {
pLocalPid=waitpid(-1,NULL,WNOHANG);
}
ripper_running=false;
import_active=false;
signal(SIGCHLD,SigHandler);
break;
case SIGCHLD:
pLocalPid=waitpid(-1,NULL,WNOHANG);
while(pLocalPid>0) {
pLocalPid=waitpid(-1,NULL,WNOHANG);
}
ripper_running=false;
import_active=false;
signal(SIGCHLD,SigHandler);
break;
}
}
@ -1242,28 +1242,47 @@ void MainWidget::RefreshLine(RDListViewItem *item)
{
RDCart::Validity validity=RDCart::NeverValid;
QDateTime current_datetime(QDate::currentDate(),QTime::currentTime());
QString sql=QString().sprintf("select CART.FORCED_LENGTH,CART.TITLE,\
CART.ARTIST,\
CART.ALBUM,CART.LABEL,\
CART.CLIENT,\
CART.AGENCY,CART.USER_DEFINED,\
CART.COMPOSER,CART.CONDUCTOR,CART.PUBLISHER,\
CART.GROUP_NAME,CART.START_DATETIME,\
CART.END_DATETIME,CART.TYPE,\
CART.CUT_QUANTITY,CART.LAST_CUT_PLAYED,\
CART.ENFORCE_LENGTH,\
CART.PRESERVE_PITCH,\
CART.LENGTH_DEVIATION,CART.OWNER,\
CART.VALIDITY,GROUPS.COLOR,CUTS.LENGTH,\
CUTS.EVERGREEN,CUTS.START_DATETIME,\
CUTS.END_DATETIME,CUTS.START_DAYPART,\
CUTS.END_DAYPART,CUTS.MON,CUTS.TUE,\
CUTS.WED,CUTS.THU,CUTS.FRI,CUTS.SAT,CUTS.SUN \
from CART left join GROUPS on \
CART.GROUP_NAME=GROUPS.NAME left join \
CUTS on CART.NUMBER=CUTS.CART_NUMBER \
where CART.NUMBER=%u",
item->text(1).toUInt());
QString sql=QString("select ")+
"CART.FORCED_LENGTH,"+ // 00
"CART.TITLE,"+ // 01
"CART.ARTIST,"+ // 02
"CART.ALBUM,"+ // 03
"CART.LABEL,"+ // 04
"CART.CLIENT,"+ // 05
"CART.AGENCY,"+ // 06
"CART.USER_DEFINED,"+ // 07
"CART.COMPOSER,"+ // 08
"CART.CONDUCTOR,"+ // 09
"CART.PUBLISHER,"+ // 10
"CART.GROUP_NAME,"+ // 11
"CART.START_DATETIME,"+ // 12
"CART.END_DATETIME,"+ // 13
"CART.TYPE,"+ // 14
"CART.CUT_QUANTITY,"+ // 15
"CART.LAST_CUT_PLAYED,"+ // 16
"CART.ENFORCE_LENGTH,"+ // 17
"CART.PRESERVE_PITCH,"+ // 18
"CART.LENGTH_DEVIATION,"+ // 19
"CART.OWNER,"+ // 20
"CART.VALIDITY,"+ // 21
"GROUPS.COLOR,"+ // 22
"CUTS.LENGTH,"+ // 23
"CUTS.EVERGREEN,"+ // 24
"CUTS.START_DATETIME,"+ // 25
"CUTS.END_DATETIME,"+ // 26
"CUTS.START_DAYPART,"+ // 27
"CUTS.END_DAYPART,"+ // 28
"CUTS.MON,"+ // 29
"CUTS.TUE,"+ // 30
"CUTS.WED,"+ // 31
"CUTS.THU,"+ // 32
"CUTS.FRI,"+ // 33
"CUTS.SAT,"+ // 34
"CUTS.SUN "+ // 35
"from CART left join GROUPS "+
"on CART.GROUP_NAME=GROUPS.NAME left join CUTS on "+
"CART.NUMBER=CUTS.CART_NUMBER where "+
QString().sprintf("CART.NUMBER=%u",item->text(1).toUInt());
RDSqlQuery *q=new RDSqlQuery(sql);
while(q->next()) {
if((RDCart::Type)q->value(14).toUInt()==RDCart::Macro) {
@ -1273,28 +1292,28 @@ void MainWidget::RefreshLine(RDListViewItem *item)
validity=ValidateCut(q,23,validity,current_datetime);
}
switch((RDCart::Type)q->value(14).toUInt()) {
case RDCart::Audio:
if(q->value(20).isNull()) {
item->setPixmap(0,*lib_playout_map);
}
else {
item->setPixmap(0,*lib_track_cart_map);
}
if(q->value(0).toUInt()==0) {
item->setBackgroundColor(RD_CART_ERROR_COLOR);
}
else {
UpdateItemColor(item,validity,
q->value(13).toDateTime(),current_datetime);
}
break;
case RDCart::Audio:
if(q->value(20).isNull()) {
item->setPixmap(0,*lib_playout_map);
}
else {
item->setPixmap(0,*lib_track_cart_map);
}
if(q->value(0).toUInt()==0) {
item->setBackgroundColor(RD_CART_ERROR_COLOR);
}
else {
UpdateItemColor(item,validity,
q->value(13).toDateTime(),current_datetime);
}
break;
case RDCart::Macro:
item->setPixmap(0,*lib_macro_map);
break;
case RDCart::Macro:
item->setPixmap(0,*lib_macro_map);
break;
case RDCart::All:
break;
break;
}
item->setText(2,q->value(11).toString());
item->setTextColor(2,q->value(22).toString(),QFont::Bold);
@ -1358,32 +1377,32 @@ void MainWidget::UpdateItemColor(RDListViewItem *item,
{
if(item!=NULL) {
switch(validity) {
case RDCart::NeverValid:
case RDCart::NeverValid:
item->setBackgroundColor(RD_CART_ERROR_COLOR);
break;
case RDCart::ConditionallyValid:
if(end_datetime.isValid()&&
(end_datetime<current_datetime)) {
item->setBackgroundColor(RD_CART_ERROR_COLOR);
break;
}
else {
item->setBackgroundColor(RD_CART_CONDITIONAL_COLOR);
}
break;
case RDCart::ConditionallyValid:
if(end_datetime.isValid()&&
(end_datetime<current_datetime)) {
item->setBackgroundColor(RD_CART_ERROR_COLOR);
}
else {
item->setBackgroundColor(RD_CART_CONDITIONAL_COLOR);
}
break;
case RDCart::FutureValid:
item->setBackgroundColor(RD_CART_FUTURE_COLOR);
break;
case RDCart::FutureValid:
item->setBackgroundColor(RD_CART_FUTURE_COLOR);
break;
case RDCart::AlwaysValid:
item->setBackgroundColor(palette().color(QPalette::Active,
QColorGroup::Base));
break;
case RDCart::EvergreenValid:
item->setBackgroundColor(RD_CART_EVERGREEN_COLOR);
break;
case RDCart::AlwaysValid:
item->setBackgroundColor(palette().color(QPalette::Active,
QColorGroup::Base));
break;
case RDCart::EvergreenValid:
item->setBackgroundColor(RD_CART_EVERGREEN_COLOR);
break;
}
}
}