Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-11 15:16:07 +01:00
Code Issues Projects Releases Wiki Activity

2021-08-31 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the 'Enable Now & Next' checkbox from the 'Edit Group'
	dialog in rdadmin(1).
	* Removed the 'RDGroup::enableNowNext()' and
	'RDGroup::setEnableNowNext()' methods.
	* Removed the 'RDLogLine::nowNextEnabled()' and
	'RDLogLine::setNowNextEnabled()' methods.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-08-31 14:55:27 -04:00
parent c672155788
commit 705fac3ae3
16 changed files with 32 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rdadmin/edit_group.cpp
View File

@@ -175,14 +175,6 @@ EditGroup::EditGroup(QString group,QWidget *parent)
group_delete_carts_label->setFont(labelFont());
group_delete_carts_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
// Now & Next Data Checkbox
//
group_nownext_check=new QCheckBox(this);
group_nownext_label=new QLabel(tr("Transmit Now && Next data"),this);
group_nownext_label->setFont(labelFont());
group_nownext_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
// Services Selector
//
@@ -238,7 +230,6 @@ EditGroup::EditGroup(QString group,QWidget *parent)
group_delete_carts_check->setChecked(group_group->deleteEmptyCarts());
}
purgeEnabledData(group_shelflife_check->isChecked());
group_nownext_check->setChecked(group_group->enableNowNext());
sql=QString("select `SERVICE_NAME` from `AUDIO_PERMS` where ")+
"`GROUP_NAME`='"+RDEscapeString(group_group->name())+"'";
q=new RDSqlQuery(sql);
@@ -364,7 +355,6 @@ void EditGroup::okData()
group_group->setCutShelflife(-1);
group_group->setDeleteEmptyCarts(false);
}
group_group->setEnableNowNext(group_nownext_check->isChecked());
group_group->setColor(group_color_button->
palette().color(QPalette::Active,
QPalette::ButtonText));
@@ -454,10 +444,7 @@ void EditGroup::resizeEvent(QResizeEvent *e)
group_delete_carts_check->setGeometry(40,256,15,15);
group_delete_carts_label->setGeometry(60,256,160,19);
group_nownext_check->setGeometry(20,277,15,15);
group_nownext_label->setGeometry(40,276,w-50,19);
group_svcs_sel->setGeometry(10,298,w-20,h-370);
group_svcs_sel->setGeometry(10,282,w-20,h-344);
group_color_button->setGeometry(10,h-60,80,50);

2
rdadmin/edit_group.h
View File

@@ -70,8 +70,6 @@ class EditGroup : public RDDialog
QCheckBox *group_music_check;
QLabel *group_traffic_label;
QCheckBox *group_traffic_check;
QLabel *group_nownext_label;
QCheckBox *group_nownext_check;
QLabel *group_carttype_label;
QComboBox *group_carttype_box;
QPushButton *group_color_button;

10
rdadmin/list_groups.cpp
View File

@@ -273,7 +273,7 @@ void ListGroups::reportData()
report+=QString("Generated: ")+
QDateTime::currentDateTime().toString("MM/dd/yyyy - hh:mm:ss")+"\n";
report+="\n";
report+="-Name----- -Description-------------------------------- -Cart Range---- Enf DefType Mus Tfc N&N\n";
report+="-Name----- -Description-------------------------------- -Cart Range---- Enf DefType Mus Tfc\n";
//
// Generate Body
@@ -286,8 +286,7 @@ void ListGroups::reportData()
"`ENFORCE_CART_RANGE`,"+ // 04
"`DEFAULT_CART_TYPE`,"+ // 05
"`REPORT_MUS`,"+ // 06
"`REPORT_TFC`,"+ // 07
"`ENABLE_NOW_NEXT` "+ // 08
"`REPORT_TFC` "+ // 07
"from `GROUPS` order by `NAME`";
q=new RDSqlQuery(sql);
while(q->next()) {
@@ -344,11 +343,6 @@ void ListGroups::reportData()
//
report+=QString(" ")+q->value(7).toString()+" ";
//
// Now & Next
//
report+=QString(" ")+q->value(8).toString();
//
// End of Line
//