diff --git a/ChangeLog b/ChangeLog index aa75467d..1283d523 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14397,3 +14397,7 @@ * Fixed a regression in 'web/rdcastmanager/Makefile.am' that caused the incorrect executable to be installed for 'rdcastmanager.cgi'. * Refactored SQL statements in 'lib/rdweb.cpp'. +2014-08-21 Fred Gleason <fredg@paravelsystems.com> + * Removed code that disabled 'Delete cuts before importing' checkbox + when no 'To Cart' value was specified in the 'Dropbox Configuration' + dialog in 'rdadmin/edit_dropbox.cpp'. diff --git a/rdadmin/edit_dropbox.cpp b/rdadmin/edit_dropbox.cpp index 86486df8..a9aef2b9 100644 --- a/rdadmin/edit_dropbox.cpp +++ b/rdadmin/edit_dropbox.cpp @@ -115,8 +115,6 @@ EditDropbox::EditDropbox(int id,QWidget *parent,const char *name) new QPushButton(tr("Select"),this); box_select_cart_button->setGeometry(190,52,50,23); box_select_cart_button->setFont(normal_font); - connect(box_to_cart_edit,SIGNAL(textChanged(const QString &)), - this,SLOT(toCartChangedData(const QString &))); connect(box_select_cart_button,SIGNAL(clicked()), this,SLOT(selectCartData())); @@ -393,7 +391,6 @@ EditDropbox::EditDropbox(int id,QWidget *parent,const char *name) box_create_dates_box->setChecked(box_dropbox->createDates()); box_create_startdate_offset_spin->setValue(box_dropbox->createStartdateOffset()); box_create_enddate_offset_spin->setValue(box_dropbox->createEnddateOffset()); - toCartChangedData(box_to_cart_edit->text()); normalizationToggledData(box_normalization_box->isChecked()); autotrimToggledData(box_autotrim_box->isChecked()); createDatesToggledData(box_create_dates_box->isChecked()); @@ -441,13 +438,6 @@ void EditDropbox::selectCartData() } -void EditDropbox::toCartChangedData(const QString &str) -{ - box_delete_cuts_box->setDisabled(str.isEmpty()); - box_delete_cuts_label->setDisabled(str.isEmpty()); -} - - void EditDropbox::selectLogPathData() { QString path=box_log_path_edit->text(); diff --git a/rdadmin/edit_dropbox.h b/rdadmin/edit_dropbox.h index f1fe7c98..9f959eed 100644 --- a/rdadmin/edit_dropbox.h +++ b/rdadmin/edit_dropbox.h @@ -52,7 +52,6 @@ class EditDropbox : public QDialog private slots: void selectPathData(); void selectCartData(); - void toCartChangedData(const QString &str); void selectLogPathData(); void schedcodesData(); void normalizationToggledData(bool state);