From 5c82d99de710d9b1368385d5af1121e7dfb6df62 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Thu, 23 Jun 2016 10:37:43 -0400 Subject: [PATCH] 2016-06-23 Fred Gleason * Refactored layout of dialogs in rdlogedit(1) so as to display dialog heirarchy correctly. --- ChangeLog | 3 +++ lib/rdcart_dialog.cpp | 6 ++++-- rdlogedit/edit_log.cpp | 20 ++++++++++++-------- rdlogedit/edit_log.h | 14 ++++++++------ rdlogedit/edit_logline.cpp | 22 +++++++++++++++++++--- rdlogedit/edit_logline.h | 7 +++++-- rdlogedit/globals.h | 2 -- rdlogedit/rdlogedit.cpp | 19 ++++--------------- 8 files changed, 55 insertions(+), 38 deletions(-) diff --git a/ChangeLog b/ChangeLog index 110340ee..c9608fd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15263,3 +15263,6 @@ * Reimplemented 'get_distro.sh' as 'get_distro.pl'. 2016-06-22 Fred Gleason * Added statment to create an 'm4' directory in 'autogen.sh'. +2016-06-23 Fred Gleason + * Refactored layout of dialogs in rdlogedit(1) so as to display + dialog heirarchy correctly. diff --git a/lib/rdcart_dialog.cpp b/lib/rdcart_dialog.cpp index 8fde434a..78a02c78 100644 --- a/lib/rdcart_dialog.cpp +++ b/lib/rdcart_dialog.cpp @@ -67,6 +67,9 @@ RDCartDialog::RDCartDialog(QString *filter,QString *group,QString *schedcode, cart_type=RDCart::All; cart_group=group; cart_schedcode=schedcode; + if(cart_schedcode->isNull()) { + *cart_schedcode=tr("ALL"); + } cart_temp_allowed=NULL; #ifdef WIN32 cart_filter_mode=RDStation::FilterSynchronous; @@ -128,8 +131,7 @@ RDCartDialog::RDCartDialog(QString *filter,QString *group,QString *schedcode, // cart_filter_edit=new QLineEdit(this); cart_filter_edit->setValidator(validator); - cart_filter_label=new QLabel(cart_filter_edit,tr("Cart Filter:"), - this,"cart_filter_label"); + cart_filter_label=new QLabel(cart_filter_edit,tr("Cart Filter:"),this); cart_filter_label->setAlignment(AlignRight|AlignVCenter); cart_filter_label->setFont(button_font); connect(cart_filter_edit,SIGNAL(textChanged(const QString &)), diff --git a/rdlogedit/edit_log.cpp b/rdlogedit/edit_log.cpp index d23f4a33..cdf238c4 100644 --- a/rdlogedit/edit_log.cpp +++ b/rdlogedit/edit_log.cpp @@ -62,7 +62,8 @@ #include "../icons/mic16.xpm" #include "../icons/traffic.xpm" -EditLog::EditLog(QString logname,vector *clipboard, +EditLog::EditLog(QString logname,QString *filter,QString *group, + QString *schedcode,vector *clipboard, vector *new_logs,QWidget *parent) : QDialog(parent,"",true) { @@ -73,6 +74,9 @@ EditLog::EditLog(QString logname,vector *clipboard, QColor system_button_color = palette().active().button(); edit_logname=logname; + edit_filter=filter; + edit_group=group; + edit_schedcode=schedcode; edit_clipboard=clipboard; edit_newlogs=new_logs; edit_default_trans=RDLogLine::Play; @@ -109,7 +113,6 @@ EditLog::EditLog(QString logname,vector *clipboard, title_font.setPixelSize(12); QFont length_font=QFont("Helvetica",10,QFont::Bold); length_font.setPixelSize(10); - // // Create Icons @@ -682,9 +685,9 @@ void EditLog::insertCartButtonData() edit_log_event->logLine(line)->setFadeupGain(-3000); edit_log_event->logLine(line)->setFadedownGain(-3000); EditLogLine *edit= -new EditLogLine(edit_log_event->logLine(line),&edit_filter,&edit_group, - edit_service_box->currentText(), - &edit_group_list,edit_log_event,line,this); + new EditLogLine(edit_log_event->logLine(line),edit_filter,edit_group, + edit_schedcode,edit_service_box->currentText(), + &edit_group_list,edit_log_event,line,this); int ret=edit->exec(); if(ret>=0) { edit_log_event->refresh(line); @@ -827,9 +830,10 @@ void EditLog::editButtonData() switch(edit_log_event->logLine(line)->type()) { case RDLogLine::Cart: case RDLogLine::Macro: - edit_cart=new EditLogLine(edit_log_event->logLine(line),&edit_filter, - &edit_group,edit_service_box->currentText(), - &edit_group_list,edit_log_event,line,this); + edit_cart= + new EditLogLine(edit_log_event->logLine(line),edit_filter,edit_group, + edit_schedcode,edit_service_box->currentText(), + &edit_group_list,edit_log_event,line,this); if(edit_cart->exec()>=0) { edit_log_event->refresh(item->text(14).toInt()); edit_changed=true; diff --git a/rdlogedit/edit_log.h b/rdlogedit/edit_log.h index d791f8c2..d4a32613 100644 --- a/rdlogedit/edit_log.h +++ b/rdlogedit/edit_log.h @@ -32,6 +32,7 @@ #include #include +#include #include #include #include @@ -51,8 +52,9 @@ class EditLog : public QDialog { Q_OBJECT public: - EditLog(QString logname,vector *clipboard, - vector *new_logs,QWidget *parent=0); + EditLog(QString logname,QString *filter,QString *group,QString *schedcode, + vector *clipboard,vector *new_logs, + QWidget *parent=0); ~EditLog(); QSize sizeHint() const; QSizePolicy sizePolicy() const; @@ -108,6 +110,9 @@ class EditLog : public QDialog std::vector edit_deleted_tracks; std::vector *edit_newlogs; QString edit_logname; + QString *edit_filter; + QString *edit_group; + QString *edit_schedcode; QLabel *edit_description_label; QLineEdit *edit_description_edit; QLabel *edit_service_label; @@ -125,8 +130,6 @@ class EditLog : public QDialog QLabel *edit_enddate_label; QCheckBox *edit_enddate_box; DropListView *edit_log_list; - QString edit_filter; - QString edit_group; QPixmap *edit_playout_map; QPixmap *edit_macro_map; QPixmap *edit_marker_map; @@ -178,5 +181,4 @@ class EditLog : public QDialog }; -#endif - +#endif // EDIT_LOG_H diff --git a/rdlogedit/edit_logline.cpp b/rdlogedit/edit_logline.cpp index 5ad6d8ee..eba76af1 100644 --- a/rdlogedit/edit_logline.cpp +++ b/rdlogedit/edit_logline.cpp @@ -30,8 +30,9 @@ #include EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, - QString svcname,RDGroupList *grplist, - RDLogEvent *log,int lineno,QWidget *parent) + QString *schedcode,QString svcname, + RDGroupList *grplist,RDLogEvent *log,int lineno, + QWidget *parent) : QDialog(parent,"",true) { // @@ -47,6 +48,7 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, edit_logline=line; edit_filter=filter; edit_group=group; + edit_schedcode=schedcode; edit_service=svcname; edit_group_list=grplist; edit_log_event=log; @@ -64,6 +66,19 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, QFont radio_font=QFont("Helvetica",10,QFont::Normal); radio_font.setPixelSize(10); + // + // Cart Picker + // +#ifdef WIN32 + edit_cart_dialog=new RDCartDialog(&edit_filter,&edit_group,&edit_schedcode, + NULL,NULL,rdstation_conf,rdsystem, + log_config,this); +#else + edit_cart_dialog=new RDCartDialog(edit_filter,edit_group,edit_schedcode, + rdcae,rdripc,rdstation_conf,rdsystem, + log_config,this); +#endif + // // Time Type // @@ -246,6 +261,7 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, EditLogLine::~EditLogLine() { + delete edit_cart_dialog; } @@ -268,7 +284,7 @@ void EditLogLine::selectCartData() if(!ok) { cartnum=-1; } - if(log_cart_dialog->exec(&cartnum,RDCart::All,&edit_service,1, + if(edit_cart_dialog->exec(&cartnum,RDCart::All,&edit_service,1, rduser->name(),rduser->password())==0) { FillCart(cartnum); } diff --git a/rdlogedit/edit_logline.h b/rdlogedit/edit_logline.h index 7461632c..1906dd10 100644 --- a/rdlogedit/edit_logline.h +++ b/rdlogedit/edit_logline.h @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -39,8 +40,8 @@ class EditLogLine : public QDialog { Q_OBJECT public: - EditLogLine(RDLogLine *,QString *filter,QString *group,QString svcname, - RDGroupList *grplist,RDLogEvent *log,int lineno, + EditLogLine(RDLogLine *,QString *filter,QString *group,QString *schedcode, + QString svcname,RDGroupList *grplist,RDLogEvent *log,int lineno, QWidget *parent=0); ~EditLogLine(); QSize sizeHint() const; @@ -71,8 +72,10 @@ class EditLogLine : public QDialog QLineEdit *edit_cart_edit; QLineEdit *edit_title_edit; QLineEdit *edit_artist_edit; + RDCartDialog *edit_cart_dialog; QString *edit_filter; QString *edit_group; + QString *edit_schedcode; QButtonGroup *edit_grace_group; RDTimeEdit *edit_grace_edit; QString edit_service; diff --git a/rdlogedit/globals.h b/rdlogedit/globals.h index a53949ac..441cfbd2 100644 --- a/rdlogedit/globals.h +++ b/rdlogedit/globals.h @@ -27,7 +27,6 @@ #include #include #include -#include #ifndef WIN32 #include #endif // WIN32 @@ -40,7 +39,6 @@ extern RDUser *rduser; extern RDRipc *rdripc; extern RDConfig *log_config; extern RDLogeditConf *rdlogedit_conf; -extern RDCartDialog *log_cart_dialog; extern bool import_running; extern RDSystem *rdsystem; #ifndef WIN32 diff --git a/rdlogedit/rdlogedit.cpp b/rdlogedit/rdlogedit.cpp index f12e14c9..2770a5ad 100644 --- a/rdlogedit/rdlogedit.cpp +++ b/rdlogedit/rdlogedit.cpp @@ -227,19 +227,6 @@ MainWidget::MainWidget(QWidget *parent) log_greenball_map=new QPixmap(greenball_xpm); log_redball_map=new QPixmap(redball_xpm); - // - // Cart Picker - // -#ifdef WIN32 - log_cart_dialog=new RDCartDialog(&log_filter,&log_group,&log_schedcode, - NULL,NULL,rdstation_conf,rdsystem, - log_config,this); -#else - log_cart_dialog=new RDCartDialog(&log_filter,&log_group,&log_schedcode, - rdcae,rdripc,rdstation_conf,rdsystem, - log_config,this); -#endif - // // User // @@ -486,7 +473,8 @@ void MainWidget::addData() } delete q; RDCreateLogTable(RDLog::tableName(logname)); - EditLog *editlog=new EditLog(logname,&log_clipboard,&newlogs,this); + EditLog *editlog=new EditLog(logname,&log_filter,&log_group,&log_schedcode, + &log_clipboard,&newlogs,this); editlog->exec(); delete editlog; ListListViewItem *item=new ListListViewItem(log_log_list); @@ -511,7 +499,8 @@ void MainWidget::editData() if(item==NULL) { return; } - EditLog *log=new EditLog(item->text(1),&log_clipboard,&newlogs,this); + EditLog *log=new EditLog(item->text(1),&log_filter,&log_group,&log_schedcode, + &log_clipboard,&newlogs,this); log->exec(); delete log; RefreshItem(item);