diff --git a/ChangeLog b/ChangeLog index 19d64e49..440d178e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17474,3 +17474,6 @@ 2018-08-17 Fred Gleason * Fixed a bug in 'RDCartDrag' that caused corruption with UTF-8 strings. +2018-08-17 Fred Gleason + * Fixed a bug in the Cart Picker dialog that caused corruption + with UTF-8 strings. diff --git a/lib/librd_cs.ts b/lib/librd_cs.ts index 5be32379..7543cb62 100644 --- a/lib/librd_cs.ts +++ b/lib/librd_cs.ts @@ -892,43 +892,43 @@ barvu NUMBER - ČÍSLO + ČÍSLO LENGTH - DÉLKA + DÉLKA TITLE - NÁZEV + NÁZEV ARTIST - UMĚLEC + UMĚLEC GROUP - SKUPINA + SKUPINA CLIENT - ZÁKAZNÍK + ZÁKAZNÍK AGENCY - AGENTURA + AGENTURA USER DEF - DEF UŽIVATELE + DEF UŽIVATELE START - ZAČÁTEK + ZAČÁTEK END - KONEC + KONEC Send to @@ -995,13 +995,53 @@ ze &souboru Zavádí se - COMPOSER + Number - CONDUCTOR + Length + Délka + + + Title + + Artist + + + + Group + + + + Composer + + + + Conductor + + + + Client + + + + Agency + + + + User Def + + + + Start + + + + End + Konec + RDCueEdit diff --git a/lib/librd_de.ts b/lib/librd_de.ts index f93685e5..bbc09bd6 100644 --- a/lib/librd_de.ts +++ b/lib/librd_de.ts @@ -888,43 +888,43 @@ setzen NUMBER - NUMMER + NUMMER LENGTH - LÄNGE + LÄNGE TITLE - TITEL + TITEL ARTIST - KÜNSTLER + KÜNSTLER GROUP - GRUPPE + GRUPPE CLIENT - KUNDE + KUNDE AGENCY - AGENTUR + AGENTUR USER DEF - BENUTZER DEF + BENUTZER DEF START - START + START END - END + END Send to @@ -986,13 +986,53 @@ senden - COMPOSER + Number - CONDUCTOR + Length + Länge + + + Title + + Artist + + + + Group + + + + Composer + + + + Conductor + + + + Client + + + + Agency + + + + User Def + + + + Start + + + + End + Ende + RDCueEdit diff --git a/lib/librd_es.ts b/lib/librd_es.ts index 66d3daf6..92f8fbfa 100644 --- a/lib/librd_es.ts +++ b/lib/librd_es.ts @@ -880,39 +880,39 @@ Color NUMBER - NÚMERO + NÚMERO LENGTH - DURACIÓN + DURACIÓN TITLE - TÍTULO + TÍTULO ARTIST - ARTISTA + ARTISTA CLIENT - CLIENTE + CLIENTE AGENCY - AGENCIA + AGENCIA USER DEF - OTROS + OTROS START - INICIO + INICIO END - FIN + FIN &OK @@ -928,7 +928,7 @@ Color GROUP - GRUPO + GRUPO Send to @@ -986,13 +986,53 @@ Color - COMPOSER + Number - CONDUCTOR + Length + Longitud + + + Title + + Artist + + + + Group + + + + Composer + + + + Conductor + + + + Client + + + + Agency + + + + User Def + + + + Start + + + + End + Final + RDCueEdit diff --git a/lib/librd_fr.ts b/lib/librd_fr.ts index f04ccb14..cb0ddaa6 100644 --- a/lib/librd_fr.ts +++ b/lib/librd_fr.ts @@ -813,46 +813,6 @@ La Couleur Group: - - NUMBER - - - - LENGTH - - - - TITLE - - - - ARTIST - - - - GROUP - - - - CLIENT - - - - AGENCY - - - - USER DEF - - - - START - - - - END - - Send to &Editor @@ -882,14 +842,6 @@ La Couleur Matches - - COMPOSER - - - - CONDUCTOR - - Load From &File @@ -919,6 +871,54 @@ La Couleur Imported from + + Number + + + + Length + + + + Title + + + + Artist + + + + Group + + + + Composer + + + + Conductor + + + + Client + + + + Agency + + + + User Def + + + + Start + Début + + + End + Fin + RDCueEdit diff --git a/lib/librd_nb.ts b/lib/librd_nb.ts index aa555ed6..f1386da5 100644 --- a/lib/librd_nb.ts +++ b/lib/librd_nb.ts @@ -888,43 +888,43 @@ farge NUMBER - NUMMER + NUMMER LENGTH - LENGD + LENGD TITLE - TITTEL + TITTEL ARTIST - ARTIST + ARTIST GROUP - GRUPPE + GRUPPE CLIENT - KLIENT + KLIENT AGENCY - AGENT + AGENT USER DEF - BRUKARDEFINERT + BRUKARDEFINERT START - START + START END - SLUTT + SLUTT Send to @@ -985,13 +985,53 @@ farge - COMPOSER + Number - CONDUCTOR + Length + Lengd + + + Title + + Artist + + + + Group + + + + Composer + + + + Conductor + + + + Client + + + + Agency + + + + User Def + + + + Start + + + + End + Slutten + RDCueEdit diff --git a/lib/librd_nn.ts b/lib/librd_nn.ts index aa555ed6..f1386da5 100644 --- a/lib/librd_nn.ts +++ b/lib/librd_nn.ts @@ -888,43 +888,43 @@ farge NUMBER - NUMMER + NUMMER LENGTH - LENGD + LENGD TITLE - TITTEL + TITTEL ARTIST - ARTIST + ARTIST GROUP - GRUPPE + GRUPPE CLIENT - KLIENT + KLIENT AGENCY - AGENT + AGENT USER DEF - BRUKARDEFINERT + BRUKARDEFINERT START - START + START END - SLUTT + SLUTT Send to @@ -985,13 +985,53 @@ farge - COMPOSER + Number - CONDUCTOR + Length + Lengd + + + Title + + Artist + + + + Group + + + + Composer + + + + Conductor + + + + Client + + + + Agency + + + + User Def + + + + Start + + + + End + Slutten + RDCueEdit diff --git a/lib/librd_pt_BR.ts b/lib/librd_pt_BR.ts index e896b4d5..01ff2d4a 100644 --- a/lib/librd_pt_BR.ts +++ b/lib/librd_pt_BR.ts @@ -888,43 +888,43 @@ Cor NUMBER - NÚMERO + NÚMERO LENGTH - DURAÇÃO + DURAÇÃO TITLE - TÍTULO + TÍTULO ARTIST - ARTISTA + ARTISTA GROUP - GRUPO + GRUPO CLIENT - CLIENTE + CLIENTE AGENCY - AGÊNCIA + AGÊNCIA USER DEF - USO GENERICO + USO GENERICO START - INÍCIO + INÍCIO END - FINAL + FINAL Send to @@ -986,13 +986,53 @@ Cor - COMPOSER + Number - CONDUCTOR + Length + Duração + + + Title + + Artist + + + + Group + + + + Composer + + + + Conductor + + + + Client + + + + Agency + + + + User Def + + + + Start + + + + End + Fim + RDCueEdit diff --git a/lib/rdcart_dialog.cpp b/lib/rdcart_dialog.cpp index f81799ed..3e3a2093 100644 --- a/lib/rdcart_dialog.cpp +++ b/lib/rdcart_dialog.cpp @@ -2,7 +2,7 @@ // // A widget to select a Rivendell Cart. // -// (C) Copyright 2002-2004,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 Fred Gleason // // 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 #include #include -//Added by qt3to4: -#include -#include -#include #include #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 diff --git a/rdlibrary/rdlibrary.cpp b/rdlibrary/rdlibrary.cpp index 233644f8..d1717907 100644 --- a/rdlibrary/rdlibrary.cpp +++ b/rdlibrary/rdlibrary.cpp @@ -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_datetimesetBackgroundColor(RD_CART_ERROR_COLOR); - break; + } + else { + item->setBackgroundColor(RD_CART_CONDITIONAL_COLOR); + } + break; - case RDCart::ConditionallyValid: - if(end_datetime.isValid()&& - (end_datetimesetBackgroundColor(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; } } }