From f50bd8742852f4684e0bd9443d30bcd5ecc52334 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Fri, 9 Oct 2020 18:06:10 -0400 Subject: [PATCH] 2020-10-09 Fred Gleason * Renamed the 'Inline Traffic Inheritance' control to 'Inline Traffic Start/Length' and moved it to the 'Music Data Import' section of the 'Edit Service' dialog in rdadmin(1). Signed-off-by: Fred Gleason --- ChangeLog | 4 ++ rdadmin/edit_svc.cpp | 90 ++++++++++++++++++++-------------------- rdadmin/rdadmin_cs.ts | 8 ++-- rdadmin/rdadmin_de.ts | 8 ++-- rdadmin/rdadmin_es.ts | 8 ++-- rdadmin/rdadmin_fr.ts | 8 ++-- rdadmin/rdadmin_nb.ts | 8 ++-- rdadmin/rdadmin_nn.ts | 8 ++-- rdadmin/rdadmin_pt_BR.ts | 8 ++-- 9 files changed, 77 insertions(+), 73 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f226bfa..83f80ed8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20446,3 +20446,7 @@ * Added an index to the 'GPIO_EVENTS.EVENT_DATETIME' field. * Incremented the database version to 342. * Implemented the '--verbose' switch for rdmaint(8). +2020-10-09 Fred Gleason + * Renamed the 'Inline Traffic Inheritance' control to 'Inline + Traffic Start/Length' and moved it to the 'Music Data Import' + section of the 'Edit Service' dialog in rdadmin(1). diff --git a/rdadmin/edit_svc.cpp b/rdadmin/edit_svc.cpp index b4a8a425..d02e18b1 100644 --- a/rdadmin/edit_svc.cpp +++ b/rdadmin/edit_svc.cpp @@ -145,37 +145,23 @@ EditSvc::EditSvc(QString svc,QWidget *parent) label->setGeometry(10,157,170,19); label->setAlignment(Qt::AlignRight); - // - // Inline Event Inheritance Log - // - svc_sub_event_inheritance_box=new QComboBox(this); - svc_sub_event_inheritance_box->setGeometry(185,178,240,19); - svc_sub_event_inheritance_box-> - insertItem((int)RDSvc::ParentEvent,tr("From Parent RDLogManager Event")); - svc_sub_event_inheritance_box-> - insertItem((int)RDSvc::SchedFile,tr("From Music Scheduler File")); - label=new QLabel(svc_sub_event_inheritance_box, - tr("Inline Traffic Inheritance")+":",this); - label->setGeometry(10,178,170,19); - label->setAlignment(Qt::AlignRight); - // // Chain Log // svc_chain_box=new QCheckBox(this); - svc_chain_box->setGeometry(30,201,15,15); + svc_chain_box->setGeometry(30,180,15,15); label=new QLabel(svc_chain_box,tr("Insert CHAIN TO at log end"),this); - label->setGeometry(50,201,170,19); + label->setGeometry(50,180,170,19); label->setAlignment(Qt::AlignLeft); // // Default Auto Refresh // svc_autorefresh_box=new QCheckBox(this); - svc_autorefresh_box->setGeometry(230,201,15,15); + svc_autorefresh_box->setGeometry(230,180,15,15); label= new QLabel(svc_autorefresh_box,tr("Enable AutoRefresh By Default"),this); - label->setGeometry(250,201,200,19); + label->setGeometry(250,180,200,19); label->setAlignment(Qt::AlignLeft); // @@ -253,7 +239,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) // Traffic Import Section // label=new QLabel(tr("Traffic Data Import"),this); - label->setGeometry(10,231,160,24); + label->setGeometry(10,210,160,24); label->setFont(sectionLabelFont()); label->setAlignment(Qt::AlignLeft); @@ -261,11 +247,11 @@ EditSvc::EditSvc(QString svc,QWidget *parent) // Linux Traffic Import Path // svc_tfc_path_edit=new QLineEdit(this); - svc_tfc_path_edit->setGeometry(185,255,240,19); - svc_tfc_path_edit->setMaxLength(255); + svc_tfc_path_edit->setGeometry(185,234,240,19); + svc_tfc_path_edit->setMaxLength(191); svc_tfc_path_edit->setValidator(validator); label=new QLabel(svc_tfc_path_edit,tr("Import Path:"),this); - label->setGeometry(10,255,170,19); + label->setGeometry(10,234,170,19); label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_tfc_path_edit,SIGNAL(textChanged(const QString &)), this,SLOT(textChangedData(const QString &))); @@ -274,11 +260,11 @@ EditSvc::EditSvc(QString svc,QWidget *parent) // Linux Traffic Preimport Command // svc_tfc_preimport_cmd_edit=new QLineEdit(this); - svc_tfc_preimport_cmd_edit->setGeometry(185,276,240,19); + svc_tfc_preimport_cmd_edit->setGeometry(185,255,240,19); svc_tfc_preimport_cmd_edit->setValidator(validator); label= new QLabel(svc_tfc_preimport_cmd_edit,tr("Preimport Command:"),this); - label->setGeometry(10,276,170,19); + label->setGeometry(10,255,170,19); label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_tfc_preimport_cmd_edit,SIGNAL(textChanged(const QString &)), this,SLOT(textChangedData(const QString &))); @@ -287,10 +273,10 @@ EditSvc::EditSvc(QString svc,QWidget *parent) // Note Cart // svc_tfc_label_cart_edit=new QLineEdit(this); - svc_tfc_label_cart_edit->setGeometry(185,297,240,19); + svc_tfc_label_cart_edit->setGeometry(185,276,240,19); svc_tfc_label_cart_edit->setMaxLength(32); label=new QLabel(svc_tfc_label_cart_edit,tr("Note Cart String:"),this); - label->setGeometry(10,297,170,19); + label->setGeometry(10,276,170,19); label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_tfc_label_cart_edit,SIGNAL(textChanged(const QString &)), this,SLOT(textChangedData(const QString &))); @@ -299,10 +285,10 @@ EditSvc::EditSvc(QString svc,QWidget *parent) // Track String // svc_tfc_track_edit=new QLineEdit(this); - svc_tfc_track_edit->setGeometry(185,318,240,19); + svc_tfc_track_edit->setGeometry(185,297,240,19); svc_tfc_track_edit->setMaxLength(32); label=new QLabel(svc_tfc_track_edit,tr("Insert Voice Track String:"),this); - label->setGeometry(10,318,170,19); + label->setGeometry(10,297,170,19); label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_tfc_track_edit,SIGNAL(textChanged(const QString &)), this,SLOT(textChangedData(const QString &))); @@ -311,9 +297,9 @@ EditSvc::EditSvc(QString svc,QWidget *parent) // Traffic Import Template // svc_tfc_import_template_box=new QComboBox(this); - svc_tfc_import_template_box->setGeometry(185,339,240,19); + svc_tfc_import_template_box->setGeometry(185,318,240,19); label=new QLabel(svc_tfc_import_template_box,tr("Import Template:"),this); - label->setGeometry(10,339,170,19); + label->setGeometry(10,318,170,19); label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_tfc_import_template_box,SIGNAL(activated(int)), this,SLOT(tfcTemplateActivatedData(int))); @@ -322,14 +308,14 @@ EditSvc::EditSvc(QString svc,QWidget *parent) // Traffic Parser Settings // svc_tfc_fields=new ImportFields(this); - svc_tfc_fields->setGeometry(10,360,svc_tfc_fields->sizeHint().width(), + svc_tfc_fields->setGeometry(10,339,svc_tfc_fields->sizeHint().width(), svc_tfc_fields->sizeHint().height()); // // Traffic Test Button // button=new QPushButton(this); - button->setGeometry(360,360,60,40); + button->setGeometry(360,339,60,40); button->setFont(buttonFont()); button->setText(tr("Test \n&Traffic")); connect(button,SIGNAL(clicked()),this,SLOT(trafficData())); @@ -338,7 +324,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) // Traffic Copy Button // svc_tfc_copy_button=new QPushButton(this); - svc_tfc_copy_button->setGeometry(360,410,60,40); + svc_tfc_copy_button->setGeometry(360,389,60,40); svc_tfc_copy_button->setFont(buttonFont()); svc_tfc_copy_button->setText(tr("Copy To\nCustom")); connect(svc_tfc_copy_button,SIGNAL(clicked()),this,SLOT(trafficCopyData())); @@ -347,7 +333,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) // Music Import Section // label=new QLabel(tr("Music Data Import"),this); - label->setGeometry(445,234,160,24); + label->setGeometry(445,213,160,24); label->setFont(sectionLabelFont()); label->setAlignment(Qt::AlignLeft); @@ -355,11 +341,11 @@ EditSvc::EditSvc(QString svc,QWidget *parent) // Linux Music Import Path // svc_mus_path_edit=new QLineEdit(this); - svc_mus_path_edit->setGeometry(620,255,240,19); - svc_mus_path_edit->setMaxLength(255); + svc_mus_path_edit->setGeometry(620,234,240,19); + svc_mus_path_edit->setMaxLength(191); svc_mus_path_edit->setValidator(validator); label=new QLabel(svc_mus_path_edit,tr("Import Path:"),this); - label->setGeometry(450,255,165,19); + label->setGeometry(450,234,165,19); label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_mus_path_edit,SIGNAL(textChanged(const QString &)), this,SLOT(textChangedData(const QString &))); @@ -368,11 +354,11 @@ EditSvc::EditSvc(QString svc,QWidget *parent) // Linux Music Preimport Command // svc_mus_preimport_cmd_edit=new QLineEdit(this); - svc_mus_preimport_cmd_edit->setGeometry(620,276,240,19); + svc_mus_preimport_cmd_edit->setGeometry(620,255,240,19); svc_mus_preimport_cmd_edit->setValidator(validator); label= new QLabel(svc_mus_preimport_cmd_edit,tr("Preimport Command:"),this); - label->setGeometry(450,276,165,19); + label->setGeometry(450,255,165,19); label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_mus_preimport_cmd_edit,SIGNAL(textChanged(const QString &)), this,SLOT(textChangedData(const QString &))); @@ -381,10 +367,10 @@ EditSvc::EditSvc(QString svc,QWidget *parent) // Label Cart // svc_mus_label_cart_edit=new QLineEdit(this); - svc_mus_label_cart_edit->setGeometry(620,297,240,19); + svc_mus_label_cart_edit->setGeometry(620,276,240,19); svc_mus_label_cart_edit->setMaxLength(32); label=new QLabel(svc_mus_label_cart_edit,tr("Note Cart String:"),this); - label->setGeometry(450,297,165,19); + label->setGeometry(450,276,165,19); label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_mus_label_cart_edit,SIGNAL(textChanged(const QString &)), this,SLOT(textChangedData(const QString &))); @@ -393,10 +379,10 @@ EditSvc::EditSvc(QString svc,QWidget *parent) // Insert Voice Track String // svc_mus_track_edit=new QLineEdit(this); - svc_mus_track_edit->setGeometry(620,318,240,19); + svc_mus_track_edit->setGeometry(620,297,240,19); svc_mus_track_edit->setMaxLength(255); label=new QLabel(svc_mus_track_edit,tr("Insert Voice Track String:"),this); - label->setGeometry(450,318,165,19); + label->setGeometry(450,297,165,19); label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_mus_track_edit,SIGNAL(textChanged(const QString &)), this,SLOT(textChangedData(const QString &))); @@ -405,14 +391,28 @@ EditSvc::EditSvc(QString svc,QWidget *parent) // Insert Spot Break String // svc_mus_break_edit=new QLineEdit(this); - svc_mus_break_edit->setGeometry(620,339,240,19); + svc_mus_break_edit->setGeometry(620,318,240,19); svc_mus_break_edit->setMaxLength(255); label=new QLabel(svc_mus_break_edit,tr("Insert Traffic Break String:"),this); - label->setGeometry(450,339,165,19); + label->setGeometry(450,318,165,19); label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_mus_break_edit,SIGNAL(textChanged(const QString &)), this,SLOT(textChangedData(const QString &))); + // + // Inline Event Inheritance Log + // + svc_sub_event_inheritance_box=new QComboBox(this); + svc_sub_event_inheritance_box->setGeometry(620,339,240,19); + svc_sub_event_inheritance_box-> + insertItem((int)RDSvc::ParentEvent,tr("From Parent RDLogManager Event")); + svc_sub_event_inheritance_box-> + insertItem((int)RDSvc::SchedFile,tr("From Music Scheduler File")); + label=new QLabel(svc_sub_event_inheritance_box, + tr("Inline Traffic Start/Length")+":",this); + label->setGeometry(450,339,165,19); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + // // Music Import Template // diff --git a/rdadmin/rdadmin_cs.ts b/rdadmin/rdadmin_cs.ts index e8daa329..08a33c51 100644 --- a/rdadmin/rdadmin_cs.ts +++ b/rdadmin/rdadmin_cs.ts @@ -4345,10 +4345,6 @@ Custom This action will overwrite your existing [custom] Music Data Import settings. Continue? - - Inline Traffic Inheritance - - From Parent RDLogManager Event @@ -4357,6 +4353,10 @@ Custom From Music Scheduler File + + Inline Traffic Start/Length + + EditSvcPerms diff --git a/rdadmin/rdadmin_de.ts b/rdadmin/rdadmin_de.ts index bd6b8053..14587025 100644 --- a/rdadmin/rdadmin_de.ts +++ b/rdadmin/rdadmin_de.ts @@ -4154,10 +4154,6 @@ Custom This action will overwrite your existing [custom] Music Data Import settings. Continue? - - Inline Traffic Inheritance - - From Parent RDLogManager Event @@ -4166,6 +4162,10 @@ Custom From Music Scheduler File + + Inline Traffic Start/Length + + EditSvcPerms diff --git a/rdadmin/rdadmin_es.ts b/rdadmin/rdadmin_es.ts index c527333f..06d4be91 100644 --- a/rdadmin/rdadmin_es.ts +++ b/rdadmin/rdadmin_es.ts @@ -4298,10 +4298,6 @@ Custom This action will overwrite your existing [custom] Music Data Import settings. Continue? - - Inline Traffic Inheritance - - From Parent RDLogManager Event @@ -4310,6 +4306,10 @@ Custom From Music Scheduler File + + Inline Traffic Start/Length + + EditSvcPerms diff --git a/rdadmin/rdadmin_fr.ts b/rdadmin/rdadmin_fr.ts index 33df7f09..46414eaf 100644 --- a/rdadmin/rdadmin_fr.ts +++ b/rdadmin/rdadmin_fr.ts @@ -3440,10 +3440,6 @@ Custom This action will overwrite your existing [custom] Music Data Import settings. Continue? - - Inline Traffic Inheritance - - From Parent RDLogManager Event @@ -3452,6 +3448,10 @@ Custom From Music Scheduler File + + Inline Traffic Start/Length + + EditSvcPerms diff --git a/rdadmin/rdadmin_nb.ts b/rdadmin/rdadmin_nb.ts index 005e84cf..b0dbbd30 100644 --- a/rdadmin/rdadmin_nb.ts +++ b/rdadmin/rdadmin_nb.ts @@ -4059,10 +4059,6 @@ Custom This action will overwrite your existing [custom] Music Data Import settings. Continue? - - Inline Traffic Inheritance - - From Parent RDLogManager Event @@ -4071,6 +4067,10 @@ Custom From Music Scheduler File + + Inline Traffic Start/Length + + EditSvcPerms diff --git a/rdadmin/rdadmin_nn.ts b/rdadmin/rdadmin_nn.ts index 005e84cf..b0dbbd30 100644 --- a/rdadmin/rdadmin_nn.ts +++ b/rdadmin/rdadmin_nn.ts @@ -4059,10 +4059,6 @@ Custom This action will overwrite your existing [custom] Music Data Import settings. Continue? - - Inline Traffic Inheritance - - From Parent RDLogManager Event @@ -4071,6 +4067,10 @@ Custom From Music Scheduler File + + Inline Traffic Start/Length + + EditSvcPerms diff --git a/rdadmin/rdadmin_pt_BR.ts b/rdadmin/rdadmin_pt_BR.ts index 8bf8a63b..c5db71da 100644 --- a/rdadmin/rdadmin_pt_BR.ts +++ b/rdadmin/rdadmin_pt_BR.ts @@ -4138,10 +4138,6 @@ Custom This action will overwrite your existing [custom] Music Data Import settings. Continue? - - Inline Traffic Inheritance - - From Parent RDLogManager Event @@ -4150,6 +4146,10 @@ Custom From Music Scheduler File + + Inline Traffic Start/Length + + EditSvcPerms