From 1f574b964824ca5433d996a1a1a9f4cb40a1dd01 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Fri, 1 Sep 2017 11:30:41 -0400 Subject: [PATCH] 2017-09-01 Fred Gleason * Renamed 'Origin' field to 'Ingest' in the 'Cut Info/Record' dialog in RDLibrary. --- ChangeLog | 3 +++ rdlibrary/rdlibrary_cs.ts | 10 +++++++--- rdlibrary/rdlibrary_de.ts | 10 +++++++--- rdlibrary/rdlibrary_es.ts | 10 +++++++--- rdlibrary/rdlibrary_fr.ts | 12 ++++++------ rdlibrary/rdlibrary_nb.ts | 10 +++++++--- rdlibrary/rdlibrary_nn.ts | 10 +++++++--- rdlibrary/rdlibrary_pt_BR.ts | 10 +++++++--- rdlibrary/record_cut.cpp | 34 +++++++++++++++++----------------- rdlibrary/record_cut.h | 4 ++-- 10 files changed, 70 insertions(+), 43 deletions(-) diff --git a/ChangeLog b/ChangeLog index 80aec83d..60257baa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16011,3 +16011,6 @@ * Added 'src_hostname' and 'user_name' parameters to the 'RDCut::checkInRecording()' method in 'lib/rdcut.cpp' and 'lib/rdcut.h'. +2017-09-01 Fred Gleason + * Renamed 'Origin' field to 'Ingest' in the 'Cut Info/Record' dialog + in RDLibrary. diff --git a/rdlibrary/rdlibrary_cs.ts b/rdlibrary/rdlibrary_cs.ts index d9174cc4..0611afdf 100644 --- a/rdlibrary/rdlibrary_cs.ts +++ b/rdlibrary/rdlibrary_cs.ts @@ -1357,7 +1357,7 @@ Přesto smazat? Origin - Původ + Původ ISRC @@ -1582,11 +1582,15 @@ Přesto uložit? - Source Host + unknown - unknown + Ingest + + + + Source diff --git a/rdlibrary/rdlibrary_de.ts b/rdlibrary/rdlibrary_de.ts index 3c27c044..2f7a8eff 100644 --- a/rdlibrary/rdlibrary_de.ts +++ b/rdlibrary/rdlibrary_de.ts @@ -1334,7 +1334,7 @@ verwendet. Trotzdem löschen? Origin - HERKUNFT + HERKUNFT ISRC @@ -1559,11 +1559,15 @@ Trotzdem speichern? - Source Host + unknown - unknown + Ingest + + + + Source diff --git a/rdlibrary/rdlibrary_es.ts b/rdlibrary/rdlibrary_es.ts index cb1fdb93..4442948f 100644 --- a/rdlibrary/rdlibrary_es.ts +++ b/rdlibrary/rdlibrary_es.ts @@ -1339,7 +1339,7 @@ Do you still want to delete it? Origin - Origen + Origen Weight @@ -1564,11 +1564,15 @@ Do you still want to save? - Source Host + unknown - unknown + Ingest + + + + Source diff --git a/rdlibrary/rdlibrary_fr.ts b/rdlibrary/rdlibrary_fr.ts index 166f7564..3383657b 100644 --- a/rdlibrary/rdlibrary_fr.ts +++ b/rdlibrary/rdlibrary_fr.ts @@ -1181,10 +1181,6 @@ Do you still want to delete it? &Outcue - - Origin - - ISRC @@ -1401,11 +1397,15 @@ Do you still want to save? - Source Host + unknown - unknown + Ingest + + + + Source diff --git a/rdlibrary/rdlibrary_nb.ts b/rdlibrary/rdlibrary_nb.ts index 280724fd..800925f0 100644 --- a/rdlibrary/rdlibrary_nb.ts +++ b/rdlibrary/rdlibrary_nb.ts @@ -1330,7 +1330,7 @@ Vil du sletta ho likevel? Origin - Opphav + Opphav ISRC @@ -1555,11 +1555,15 @@ Vil du lagra likevel? - Source Host + unknown - unknown + Ingest + + + + Source diff --git a/rdlibrary/rdlibrary_nn.ts b/rdlibrary/rdlibrary_nn.ts index 280724fd..800925f0 100644 --- a/rdlibrary/rdlibrary_nn.ts +++ b/rdlibrary/rdlibrary_nn.ts @@ -1330,7 +1330,7 @@ Vil du sletta ho likevel? Origin - Opphav + Opphav ISRC @@ -1555,11 +1555,15 @@ Vil du lagra likevel? - Source Host + unknown - unknown + Ingest + + + + Source diff --git a/rdlibrary/rdlibrary_pt_BR.ts b/rdlibrary/rdlibrary_pt_BR.ts index 94efea85..f9fc0bc2 100644 --- a/rdlibrary/rdlibrary_pt_BR.ts +++ b/rdlibrary/rdlibrary_pt_BR.ts @@ -1332,7 +1332,7 @@ Você ainda quer deletá-lo? Origin - Origem + Origem ISRC @@ -1557,11 +1557,15 @@ Você ainda quer salvar? - Source Host + unknown - unknown + Ingest + + + + Source diff --git a/rdlibrary/record_cut.cpp b/rdlibrary/record_cut.cpp index 0b57cf01..11b57351 100644 --- a/rdlibrary/record_cut.cpp +++ b/rdlibrary/record_cut.cpp @@ -162,24 +162,24 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, cut_isrc_label->setFont(font); cut_isrc_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - // - // Cut Origin - // - cut_origin_edit=new QLineEdit(this); - cut_origin_edit->setReadOnly(true); - cut_origin_label=new QLabel(cut_origin_edit,tr("Origin")+":",this); - cut_origin_label->setFont(font); - cut_origin_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - // // Cut Source // cut_source_edit=new QLineEdit(this); cut_source_edit->setReadOnly(true); - cut_source_label=new QLabel(cut_source_edit,tr("Source Host")+":",this); + cut_source_label=new QLabel(cut_source_edit,tr("Source")+":",this); cut_source_label->setFont(font); cut_source_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + // + // Cut Ingest + // + cut_ingest_edit=new QLineEdit(this); + cut_ingest_edit->setReadOnly(true); + cut_ingest_label=new QLabel(cut_ingest_edit,tr("Ingest")+":",this); + cut_ingest_label->setFont(font); + cut_ingest_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + // // Cut Play Date Time // @@ -421,14 +421,14 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, user=""; } if(valid) { - cut_origin_edit->setText(user+cut_origin_name+" - "+ + cut_ingest_edit->setText(cut_origin_name+" - "+ cut_origin_datetime.toString("M/d/yyyy hh:mm:ss")); } if(rec_cut->sourceHostname().isEmpty()) { cut_source_edit->setText("["+tr("unknown")+"]"); } else { - cut_source_edit->setText(rec_cut->sourceHostname()); + cut_source_edit->setText(user+rec_cut->sourceHostname()); } cut_isci_edit->setText(rec_cut->isci()); cut_isrc_edit->setText(rec_cut->isrc(RDCut::FormattedIsrc)); @@ -682,7 +682,7 @@ void RecordCut::recordData() rec_cut->setOriginName(rdstation_conf->name()); cut_origin_name=rdstation_conf->name(); cut_origin_datetime=QDateTime::currentDateTime(); - cut_origin_edit->setText(cut_origin_name+" - "+ + cut_ingest_edit->setText(cut_origin_name+" - "+ cut_origin_datetime.toString("M/d/yyyy hh:mm:ss")); rdcae->loadRecord(rec_card_no[0],rec_port_no[0],rec_name,rec_format, rec_channels,rec_samprate,rec_bitrate*rec_channels); @@ -1051,11 +1051,11 @@ void RecordCut::resizeEvent(QResizeEvent *e) cut_isrc_label->setGeometry(0,76,85,20); cut_isrc_edit->setGeometry(90,76,w-100,20); - cut_origin_label->setGeometry(0,105,85,20); - cut_origin_edit->setGeometry(90,105,w-100,20); + cut_source_label->setGeometry(0,105,85,20); + cut_source_edit->setGeometry(90,105,w-100,20); - cut_source_label->setGeometry(0,127,85,20); - cut_source_edit->setGeometry(90,127,w-100,20); + cut_ingest_label->setGeometry(0,127,85,20); + cut_ingest_edit->setGeometry(90,127,w-100,20); cut_playdate_label->setGeometry(0,149,85,20); cut_playdate_edit->setGeometry(90,149,130,20); diff --git a/rdlibrary/record_cut.h b/rdlibrary/record_cut.h index 42a97e84..66f8ace6 100644 --- a/rdlibrary/record_cut.h +++ b/rdlibrary/record_cut.h @@ -93,8 +93,8 @@ class RecordCut : public QDialog QLineEdit *cut_isrc_edit; QLabel *cut_isci_label; QLineEdit *cut_isci_edit; - QLabel *cut_origin_label; - QLineEdit *cut_origin_edit; + QLabel *cut_ingest_label; + QLineEdit *cut_ingest_edit; QLabel *cut_source_label; QLineEdit *cut_source_edit; QLabel *cut_weight_label;