diff --git a/ChangeLog b/ChangeLog index 61f3dffd..49dcaea0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19148,3 +19148,6 @@ 2019-10-03 Fred Gleason * Refactored rdlibrary(1) to use the 'RDDialog' and 'RDWidget' base classes. +2019-10-04 Fred Gleason + * Refactored rdlogedit(1) to use the 'RDDialog' and 'RDWidget' + base classes. diff --git a/lib/rdfontset.cpp b/lib/rdfontset.cpp index 75d78c25..29509e37 100644 --- a/lib/rdfontset.cpp +++ b/lib/rdfontset.cpp @@ -82,6 +82,12 @@ QFont RDFontSet::bannerFont() const } +QFont RDFontSet::timerFont() const +{ + return font_timer_font; +} + + QFont RDFontSet::defaultFont() const { return font_default_font; @@ -132,6 +138,9 @@ void RDFontSet::MakeFonts(const QFont &default_font) font_banner_font=QFont(family,26,QFont::Normal); font_banner_font.setPixelSize(26); + font_timer_font=QFont(family,20,QFont::Normal); + font_timer_font.setPixelSize(20); + font_default_font=QFont(family,default_size,QFont::Normal); font_default_font.setPixelSize(default_size); } diff --git a/lib/rdfontset.h b/lib/rdfontset.h index 2d29bb37..43166290 100644 --- a/lib/rdfontset.h +++ b/lib/rdfontset.h @@ -37,6 +37,7 @@ class RDFontSet QFont subLabelFont() const; QFont progressFont() const; QFont bannerFont() const; + QFont timerFont() const; QFont defaultFont() const; private: @@ -49,6 +50,7 @@ class RDFontSet QFont font_sub_label_font; QFont font_progress_font; QFont font_banner_font; + QFont font_timer_font; QFont font_default_font; RDConfig *font_config; }; diff --git a/rdlibrary/record_cut.cpp b/rdlibrary/record_cut.cpp index 9b855bf0..35abdf0c 100644 --- a/rdlibrary/record_cut.cpp +++ b/rdlibrary/record_cut.cpp @@ -319,7 +319,7 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight,QWidget *parent) rec_timer=new QTimer(this); connect(rec_timer,SIGNAL(timeout()),this,SLOT(recTimerData())); rec_timer_label=new QLabel(this); - rec_timer_label->setFont(bigButtonFont()); + rec_timer_label->setFont(timerFont()); rec_timer_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); rec_timer_label->setText(RDGetTimeLength(rec_length,true)); diff --git a/rdlogedit/Makefile.am b/rdlogedit/Makefile.am index 5fce061e..94b0dec7 100644 --- a/rdlogedit/Makefile.am +++ b/rdlogedit/Makefile.am @@ -2,7 +2,7 @@ ## ## Use automake to process this into a Makefile.in ## -## (C) Copyright 2002-2005,2016-2018 Fred Gleason +## (C) Copyright 2002-2019 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -43,11 +43,11 @@ bin_PROGRAMS = rdlogedit dist_rdlogedit_SOURCES = add_meta.cpp add_meta.h\ drop_listview.cpp drop_listview.h\ edit_chain.cpp edit_chain.h\ + edit_event.cpp edit_event.h\ edit_log.cpp edit_log.h\ edit_logline.cpp edit_logline.h\ edit_marker.cpp edit_marker.h\ edit_track.cpp edit_track.h\ - import_track.cpp import_track.h\ list_listviewitem.cpp list_listviewitem.h\ list_reports.cpp list_reports.h\ log_listview.cpp log_listview.h\ @@ -58,11 +58,11 @@ dist_rdlogedit_SOURCES = add_meta.cpp add_meta.h\ nodist_rdlogedit_SOURCES = moc_add_meta.cpp\ moc_drop_listview.cpp\ moc_edit_chain.cpp\ + moc_edit_event.cpp\ moc_edit_log.cpp\ moc_edit_logline.cpp\ moc_edit_marker.cpp\ moc_edit_track.cpp\ - moc_import_track.cpp\ moc_list_reports.cpp\ moc_log_listview.cpp\ moc_rdlogedit.cpp\ diff --git a/rdlogedit/add_meta.cpp b/rdlogedit/add_meta.cpp index 976cf3c7..a65dcba6 100644 --- a/rdlogedit/add_meta.cpp +++ b/rdlogedit/add_meta.cpp @@ -2,7 +2,7 @@ // // Add a Rivendell RDCatch Event // -// (C) Copyright 2002-2018 Fred Gleason +// (C) Copyright 2002-2019 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -18,50 +18,30 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include #include -#include -#include -#include -#include -#include #include #include -#include +#include "add_meta.h" AddMeta::AddMeta(QWidget *parent) - : QDialog(parent,Qt::WStyle_Customize|Qt::WStyle_DialogBorder) + : RDDialog(parent) { - setModal(true); - setWindowTitle(""); + setWindowTitle("RDLogEdit"); // // Fix the Window Size // - setMinimumWidth(sizeHint().width()); - setMaximumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); - setMaximumHeight(sizeHint().height()); - - // - // Generate Fonts - // - QFont button_font=QFont("Helvetica",12,QFont::Bold); - button_font.setPixelSize(12); - QFont label_font=QFont("Helvetica",12,QFont::Bold); - label_font.setPixelSize(12); - QFont day_font=QFont("Helvetica",12,QFont::Normal); - day_font.setPixelSize(12); + setMinimumSize(sizeHint()); + setMaximumSize(sizeHint()); // // Title Label // QLabel *label=new QLabel(tr("Insert a:"),this); label->setGeometry(0,0,sizeHint().width(),30); - label->setFont(label_font); + label->setFont(labelFont()); label->setAlignment(Qt::AlignCenter); // @@ -69,7 +49,7 @@ AddMeta::AddMeta(QWidget *parent) // QPushButton *button=new QPushButton(this); button->setGeometry(10,30,sizeHint().width()-20,50); - button->setFont(button_font); + button->setFont(buttonFont()); button->setText(tr("&Marker")); connect(button,SIGNAL(clicked()),this,SLOT(markerData())); @@ -78,7 +58,7 @@ AddMeta::AddMeta(QWidget *parent) // button=new QPushButton(this); button->setGeometry(10,80,sizeHint().width()-20,50); - button->setFont(button_font); + button->setFont(buttonFont()); button->setText(tr("Voice &Track")); connect(button,SIGNAL(clicked()),this,SLOT(trackData())); @@ -87,7 +67,7 @@ AddMeta::AddMeta(QWidget *parent) // button=new QPushButton(this); button->setGeometry(10,130,sizeHint().width()-20,50); - button->setFont(button_font); + button->setFont(buttonFont()); button->setText(tr("Log C&hain")); connect(button,SIGNAL(clicked()),this,SLOT(chainData())); @@ -96,7 +76,7 @@ AddMeta::AddMeta(QWidget *parent) // button=new QPushButton(this); button->setGeometry(10,sizeHint().height()-60,sizeHint().width()-20,50); - button->setFont(button_font); + button->setFont(buttonFont()); button->setText(tr("&Cancel")); button->setDefault(true); connect(button,SIGNAL(clicked()),this,SLOT(cancelData())); @@ -110,7 +90,7 @@ AddMeta::~AddMeta() QSize AddMeta::sizeHint() const { - return QSize(200,240); + return QSize(200,260); } diff --git a/rdlogedit/add_meta.h b/rdlogedit/add_meta.h index e038272b..79bee22b 100644 --- a/rdlogedit/add_meta.h +++ b/rdlogedit/add_meta.h @@ -2,7 +2,7 @@ // // Add a Rivendell RDCatch Event // -// (C) Copyright 2018 Fred Gleason +// (C) Copyright 2018-2019 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -21,16 +21,11 @@ #ifndef ADD_META_H #define ADD_META_H -#include -#include -#include -#include -#include -#include -#include #include -class AddMeta : public QDialog +#include + +class AddMeta : public RDDialog { Q_OBJECT public: diff --git a/rdlogedit/edit_chain.cpp b/rdlogedit/edit_chain.cpp index e03d1df0..dcbd91ed 100644 --- a/rdlogedit/edit_chain.cpp +++ b/rdlogedit/edit_chain.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Log Chain Entry // -// (C) Copyright 2002-2018 Fred Gleason +// (C) Copyright 2002-2019 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -31,184 +31,50 @@ #include "globals.h" EditChain::EditChain(RDLogLine *line,QWidget *parent) - : QDialog(parent) + : EditEvent(line,parent) { - setModal(true); + setWindowTitle("RDLogEdit - "+tr("Edit Log Chain")); // // Fix the Window Size // - setMinimumWidth(sizeHint().width()); - setMaximumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); - setMaximumHeight(sizeHint().height()); - - setWindowTitle("RDLogEdit - "+tr("Edit Log Chain")); - - edit_logline=line; - - // - // Create Fonts - // - QFont button_font=QFont("Helvetica",12,QFont::Bold); - button_font.setPixelSize(12); - QFont label_font=QFont("Helvetica",12,QFont::Bold); - label_font.setPixelSize(12); - QFont radio_font=QFont("Helvetica",10,QFont::Normal); - radio_font.setPixelSize(10); - - // - // Time Type - // - edit_timetype_box=new QCheckBox(this); - edit_timetype_box->setGeometry(10,22,15,15); - edit_timetype_label=new QLabel(edit_timetype_box,tr("Start at:"),this); - edit_timetype_label->setGeometry(30,21,85,17); - edit_timetype_label->setFont(label_font); - edit_timetype_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); - - // - // Start Time - // - edit_time_edit=new RDTimeEdit(this); - edit_time_edit->setGeometry(85,19,85,20); - edit_time_edit->setDisplay(RDTimeEdit::Hours|RDTimeEdit::Minutes| - RDTimeEdit::Seconds|RDTimeEdit::Tenths); - connect(edit_time_edit,SIGNAL(valueChanged(const QTime &)), - this,SLOT(timeChangedData(const QTime &))); - - // - // Grace Time - // - edit_grace_group - =new Q3ButtonGroup(1,Qt::Vertical, - tr("Action If Previous Event Still Playing"),this); - edit_grace_group->setGeometry(175,11,435,50); - edit_grace_group->setFont(label_font); - edit_grace_group->setRadioButtonExclusive(true); - QRadioButton *radio_button= - new QRadioButton(tr("Start Immediately"),edit_grace_group); - edit_grace_group->insert(radio_button); - radio_button->setFont(radio_font); - radio_button=new QRadioButton(tr("Make Next"),edit_grace_group); - edit_grace_group->insert(radio_button); - radio_button->setFont(radio_font); - radio_button=new QRadioButton(tr("Wait up to"),edit_grace_group); - edit_grace_group->insert(radio_button); - radio_button->setFont(radio_font); - edit_grace_box=new Q3TimeEdit(this); - edit_grace_box->setGeometry(543,31,60,20); - edit_grace_box->setDisplay(Q3TimeEdit::Minutes|Q3TimeEdit::Seconds); - connect(edit_timetype_box,SIGNAL(toggled(bool)), - this,SLOT(timeToggledData(bool))); - connect(edit_grace_group,SIGNAL(clicked(int)), - this,SLOT(graceClickedData(int))); - - // - // Transition Type - // - edit_transtype_box=new QComboBox(this); - edit_transtype_box->setGeometry(385,68,110,26); - edit_transtype_box->insertItem(tr("Play")); - edit_transtype_box->insertItem(tr("Segue")); - edit_transtype_box->insertItem(tr("Stop")); - edit_time_label=new QLabel(edit_transtype_box,tr("Transition Type:"),this); - edit_time_label->setGeometry(10,68,370,26); - edit_time_label->setFont(label_font); - edit_time_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + setMinimumSize(sizeHint()); + setMaximumSize(sizeHint()); // // Label // edit_label_edit=new QLineEdit(this); - edit_label_edit->setGeometry(10,116,sizeHint().width()-90,18); edit_label_edit->setMaxLength(64); - QLabel *label=new QLabel(tr("Log Name"),this); - label->setFont(label_font); - label->setGeometry(12,100,160,14); + edit_label_label=new QLabel(tr("Log Name"),this); + edit_label_label->setFont(labelFont()); connect(edit_label_edit,SIGNAL(textChanged(const QString &)), this,SLOT(labelChangedData(const QString &))); // // Select Log Button // - QPushButton *button=new QPushButton(this); - button->setGeometry(sizeHint().width()-70,111,60,28); - button->setDefault(true); - button->setFont(radio_font); - button->setText(tr("Select")); - connect(button,SIGNAL(clicked()),this,SLOT(selectLogData())); + edit_select_button=new QPushButton(this); + edit_select_button->setFont(subButtonFont()); + edit_select_button->setText(tr("Select")); + connect(edit_select_button,SIGNAL(clicked()),this,SLOT(selectLogData())); // // Comment // edit_comment_edit=new QLineEdit(this); - edit_comment_edit->setGeometry(10,156,sizeHint().width()-20,18); edit_comment_edit->setReadOnly(true); - label=new QLabel(tr("Log Description"),this); - label->setFont(label_font); - label->setGeometry(12,140,160,14); - - // - // Ok Button - // - button=new QPushButton(this); - button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); - button->setDefault(true); - button->setFont(button_font); - button->setText(tr("&OK")); - connect(button,SIGNAL(clicked()),this,SLOT(okData())); - - // - // Cancel Button - // - button=new QPushButton(this); - button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, - 80,50); - button->setFont(button_font); - button->setText(tr("&Cancel")); - connect(button,SIGNAL(clicked()),this,SLOT(cancelData())); + edit_comment_label=new QLabel(tr("Log Description"),this); + edit_comment_label->setFont(labelFont()); // // Populate Data // - edit_time_edit->setTime(edit_logline->startTime(RDLogLine::Logged)); - if(edit_logline->timeType()==RDLogLine::Hard) { - edit_timetype_box->setChecked(true); - timeToggledData(true); - } - else { - timeToggledData(false); - } - timeChangedData(edit_time_edit->time()); - switch(edit_logline->graceTime()) { - case -1: - edit_grace_group->setButton(1); - graceClickedData(1); - break; - - case 0: - edit_grace_group->setButton(0); - graceClickedData(0); - break; - - default: - edit_grace_group->setButton(2); - edit_grace_box->setTime(QTime().addMSecs(edit_logline->graceTime())); - graceClickedData(2); - break; - } - edit_transtype_box->setCurrentItem(edit_logline->transType()); - edit_label_edit->setText(edit_logline->markerLabel()); + edit_label_edit->setText(logLine()->markerLabel()); labelChangedData(edit_label_edit->text()); } -EditChain::~EditChain() -{ -} - - QSize EditChain::sizeHint() const { return QSize(625,260); @@ -221,65 +87,6 @@ QSizePolicy EditChain::sizePolicy() const } -void EditChain::timeChangedData(const QTime &time) -{ - if(edit_timetype_box->isChecked()) { - edit_time_label-> - setText(tr("Transition If Previous Cart Ends Before")+" "+ - edit_time_edit->time().toString("hh:mm:ss.zzz").left(10)+":"); - } -} - - -void EditChain::timeToggledData(bool state) -{ - edit_time_edit->setEnabled(state); - edit_grace_group->setEnabled(state); - if(state) { - graceClickedData(edit_grace_group->selectedId()); - edit_time_label-> - setText(tr("Transition If Previous Cart Ends Before")+" "+ - edit_time_edit->time().toString("hh:mm:ss.zzz").left(10)+":"); - } - else { - edit_grace_box->setDisabled(true); - edit_time_label->setText(tr("Transition Type")+":"); - } -} - - -void EditChain::graceClickedData(int id) -{ - switch(id) { - case 0: - edit_grace_box->setDisabled(true); - break; - - case 1: - edit_grace_box->setDisabled(true); - break; - - case 2: - edit_grace_box->setEnabled(true); - break; - } -} - - -void EditChain::selectTimeData(int id) -{ - if(id==RDLogLine::Relative) { - edit_time_edit->setDisabled(true); - edit_time_label->setDisabled(true); - edit_grace_box->setDisabled(true); - } - else { - edit_time_edit->setEnabled(true); - edit_time_label->setEnabled(true); - } -} - - void EditChain::selectLogData() { QString logname; @@ -312,45 +119,23 @@ void EditChain::labelChangedData(const QString &logname) } -void EditChain::okData() +bool EditChain::saveData() { - if(edit_timetype_box->isChecked()) { - edit_logline->setTimeType(RDLogLine::Hard); - edit_logline->setStartTime(RDLogLine::Logged,edit_time_edit->time()); - switch(edit_grace_group->selectedId()) { - case 0: - edit_logline->setGraceTime(0); - break; + logLine()->setMarkerLabel(edit_label_edit->text()); + logLine()->setMarkerComment(edit_comment_edit->text()); - case 1: - edit_logline->setGraceTime(-1); - break; - - case 2: - edit_logline->setGraceTime(QTime().msecsTo(edit_grace_box->time())); - break; - } - } - else { - edit_logline->setTimeType(RDLogLine::Relative); - edit_logline->setStartTime(RDLogLine::Logged,QTime()); - edit_logline->setGraceTime(0); - } - edit_logline-> - setTransType((RDLogLine::TransType)edit_transtype_box->currentItem()); - edit_logline->setMarkerLabel(edit_label_edit->text()); - edit_logline->setMarkerComment(edit_comment_edit->text()); - done(edit_logline->id()); + return true; } -void EditChain::cancelData() +void EditChain::resizeEvent(QResizeEvent *e) { - done(-1); -} + edit_label_label->setGeometry(12,100,160,14); + edit_label_edit->setGeometry(10,116,size().width()-90,18); + edit_select_button->setGeometry(size().width()-70,111,60,28); + edit_comment_label->setGeometry(12,140,160,14); + edit_comment_edit->setGeometry(10,156,sizeHint().width()-20,18); -void EditChain::closeEvent(QCloseEvent *e) -{ - cancelData(); + EditEvent::resizeEvent(e); } diff --git a/rdlogedit/edit_chain.h b/rdlogedit/edit_chain.h index 6ca9f177..6aa37d57 100644 --- a/rdlogedit/edit_chain.h +++ b/rdlogedit/edit_chain.h @@ -1,8 +1,8 @@ // edit_chain.h // -// Edit a Rivendell Log Entry +// Edit a Rivendell Chain-To event // -// (C) Copyright 2002-2018 Fred Gleason +// (C) Copyright 2002-2019 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -21,56 +21,43 @@ #ifndef EDIT_CHAIN_H #define EDIT_CHAIN_H -#include -#include +#include #include -#include -#include #include -#include +#include +#include +#include #include -#include +#include #include #include -class EditChain : public QDialog +#include "edit_event.h" + +class EditChain : public EditEvent { Q_OBJECT public: EditChain(RDLogLine *,QWidget *parent=0); - ~EditChain(); QSize sizeHint() const; QSizePolicy sizePolicy() const; private slots: - void timeChangedData(const QTime &); - void timeToggledData(bool state); - void graceClickedData(int id); - void selectTimeData(int); - void selectLogData(); + void selectLogData(); void labelChangedData(const QString &); - void okData(); - void cancelData(); protected: - void closeEvent(QCloseEvent *e); + bool saveData(); + void resizeEvent(QResizeEvent *e); private: - RDLogLine *edit_logline; - RDTimeEdit *edit_time_edit; - QLabel *edit_time_label; - QCheckBox *edit_timetype_box; - QLabel *edit_timetype_label; - QCheckBox *edit_time_box; - QComboBox *edit_transtype_box; + QLabel *edit_comment_label; QLineEdit *edit_comment_edit; + QLabel *edit_label_label; QLineEdit *edit_label_edit; - Q3ButtonGroup *edit_grace_group; - QFont normal_font; - Q3TimeEdit *edit_grace_box; + QPushButton *edit_select_button; }; -#endif - +#endif // EDIT_CHAIN_H diff --git a/rdlogedit/edit_event.cpp b/rdlogedit/edit_event.cpp new file mode 100644 index 00000000..3cfcd6dd --- /dev/null +++ b/rdlogedit/edit_event.cpp @@ -0,0 +1,270 @@ +// edit_event.cpp +// +// Base class for rdlogedit(1) event editor dialogs +// +// (C) Copyright 2002-2019 Fred Gleason +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License version 2 as +// published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public +// License along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// + +#include +#include + +#include +#include +#include +#include + +#include "edit_event.h" + +#include "globals.h" + +EditEvent::EditEvent(RDLogLine *line,QWidget *parent) + : RDDialog(parent) +{ + edit_logline=line; + + // + // Time Type + // + edit_timetype_box=new QCheckBox(this); + edit_timetype_label=new QLabel(edit_timetype_box,tr("Start at:"),this); + edit_timetype_label->setGeometry(30,21,85,17); + edit_timetype_label->setFont(labelFont()); + edit_timetype_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); + + // + // Start Time + // + edit_time_edit=new RDTimeEdit(this); + edit_time_edit->setDisplay(RDTimeEdit::Hours|RDTimeEdit::Minutes| + RDTimeEdit::Seconds|RDTimeEdit::Tenths); + connect(edit_time_edit,SIGNAL(valueChanged(const QTime &)), + this,SLOT(timeChangedData(const QTime &))); + + // + // Grace Time + // + edit_grace_group= + new QGroupBox(tr("Action If Previous Event Still Playing"),this); + edit_grace_group->setFont(labelFont()); + edit_grace_bgroup=new QButtonGroup(this); + edit_grace_bgroup->setExclusive(true); + QRadioButton *radio_button= + new QRadioButton(tr("Start Immediately"),edit_grace_group); + radio_button->setFont(subLabelFont()); + + edit_grace_bgroup->addButton(radio_button,0); + radio_button=new QRadioButton(tr("Make Next"),edit_grace_group); + radio_button->setFont(subLabelFont()); + edit_grace_bgroup->addButton(radio_button,1); + radio_button=new QRadioButton(tr("Wait up to"),edit_grace_group); + radio_button->setFont(subLabelFont()); + edit_grace_bgroup->addButton(radio_button,2); + edit_grace_timeedit=new QTimeEdit(this); + edit_grace_timeedit->setDisplayFormat("mm:ss"); + // edit_grace_timeedit->setDisplay(Q3TimeEdit::Minutes|Q3TimeEdit::Seconds); + connect(edit_timetype_box,SIGNAL(toggled(bool)), + this,SLOT(timeToggledData(bool))); + connect(edit_grace_bgroup,SIGNAL(buttonClicked(int)), + this,SLOT(graceClickedData(int))); + + // + // Transition Type + // + edit_transtype_box=new QComboBox(this); + edit_transtype_box->insertItem(tr("Play")); + edit_transtype_box->insertItem(tr("Segue")); + edit_transtype_box->insertItem(tr("Stop")); + edit_time_label=new QLabel(edit_transtype_box,tr("Transition Type:"),this); + edit_time_label->setGeometry(10,68,370,26); + edit_time_label->setFont(labelFont()); + edit_time_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + + // + // Ok Button + // + edit_ok_button=new QPushButton(this); + edit_ok_button->setDefault(true); + edit_ok_button->setFont(buttonFont()); + edit_ok_button->setText(tr("&OK")); + connect(edit_ok_button,SIGNAL(clicked()),this,SLOT(okData())); + + // + // Cancel Button + // + edit_cancel_button=new QPushButton(this); + edit_cancel_button->setFont(buttonFont()); + edit_cancel_button->setText(tr("&Cancel")); + connect(edit_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); + + // + // Populate Data + // + edit_time_edit->setTime(edit_logline->startTime(RDLogLine::Logged)); + if(edit_logline->timeType()==RDLogLine::Hard) { + edit_timetype_box->setChecked(true); + timeToggledData(true); + } + else { + timeToggledData(false); + } + timeChangedData(edit_time_edit->time()); + switch(edit_logline->graceTime()) { + case -1: + edit_grace_bgroup->button(1)->setChecked(true); + graceClickedData(1); + break; + + case 0: + edit_grace_bgroup->button(0)->setChecked(true); + graceClickedData(0); + break; + + default: + edit_grace_bgroup->button(2)->setChecked(true); + edit_grace_timeedit->setTime(QTime().addMSecs(edit_logline->graceTime())); + graceClickedData(2); + break; + } + edit_transtype_box->setCurrentItem(edit_logline->transType()); +} + + +void EditEvent::timeChangedData(const QTime &time) +{ + if(edit_timetype_box->isChecked()) { + edit_time_label-> + setText(tr("Transition If Previous Cart Ends Before")+" "+ + edit_time_edit->time().toString("hh:mm:ss.zzz").left(10)+":"); + } +} + + +void EditEvent::timeToggledData(bool state) +{ + edit_time_edit->setEnabled(state); + edit_grace_group->setEnabled(state); + edit_grace_bgroup->button(0)->setEnabled(state); + edit_grace_bgroup->button(1)->setEnabled(state); + edit_grace_bgroup->button(2)->setEnabled(state); + if(state) { + graceClickedData(edit_grace_bgroup->checkedId()); + edit_time_label-> + setText(tr("Transition If Previous Cart Ends Before")+" "+ + edit_time_edit->time().toString("hh:mm:ss.zzz").left(10)+":"); + } + else { + edit_grace_timeedit->setDisabled(true); + edit_time_label->setText(tr("Transition Type")+":"); + } +} + + +void EditEvent::graceClickedData(int id) +{ + switch(id) { + case 0: + edit_grace_timeedit->setDisabled(true); + break; + + case 1: + edit_grace_timeedit->setDisabled(true); + break; + + case 2: + edit_grace_timeedit->setEnabled(true); + break; + } +} + + +void EditEvent::selectTimeData(int id) +{ + if(id==RDLogLine::Relative) { + edit_time_edit->setDisabled(true); + edit_time_label->setDisabled(true); + edit_grace_timeedit->setDisabled(true); + } + else { + edit_time_edit->setEnabled(true); + edit_time_label->setEnabled(true); + } +} + + +void EditEvent::okData() +{ + if(saveData()) { + if(edit_timetype_box->isChecked()) { + edit_logline->setTimeType(RDLogLine::Hard); + edit_logline->setStartTime(RDLogLine::Logged,edit_time_edit->time()); + switch(edit_grace_bgroup->checkedId()) { + case 0: + edit_logline->setGraceTime(0); + break; + + case 1: + edit_logline->setGraceTime(-1); + break; + + case 2: + edit_logline->setGraceTime(QTime().msecsTo(edit_grace_timeedit->time())); + break; + } + } + else { + edit_logline->setTimeType(RDLogLine::Relative); + edit_logline->setStartTime(RDLogLine::Logged,QTime()); + edit_logline->setGraceTime(0); + } + edit_logline-> + setTransType((RDLogLine::TransType)edit_transtype_box->currentItem()); + done(edit_logline->id()); + } +} + + +void EditEvent::cancelData() +{ + done(-1); +} + + +RDLogLine *EditEvent::logLine() +{ + return edit_logline; +} + + +void EditEvent::resizeEvent(QResizeEvent *e) +{ + edit_timetype_box->setGeometry(10,22,15,15); + edit_time_edit->setGeometry(85,19,85,20); + edit_grace_group->setGeometry(175,11,435,50); + edit_grace_bgroup->button(0)->setGeometry(10,21,145,20); + edit_grace_bgroup->button(1)->setGeometry(155,21,105,20); + edit_grace_bgroup->button(2)->setGeometry(265,21,95,20); + edit_grace_timeedit->setGeometry(543,31,60,20); + edit_transtype_box->setGeometry(385,68,110,26); + + edit_ok_button->setGeometry(size().width()-180,size().height()-60,80,50); + edit_cancel_button->setGeometry(size().width()-90,size().height()-60,80,50); +} + + +void EditEvent::closeEvent(QCloseEvent *e) +{ + cancelData(); +} diff --git a/rdlogedit/edit_event.h b/rdlogedit/edit_event.h new file mode 100644 index 00000000..f0694fd4 --- /dev/null +++ b/rdlogedit/edit_event.h @@ -0,0 +1,72 @@ +// edit_event.h +// +// Base class for rdlogedit(1) event editor dialogs +// +// (C) Copyright 2002-2019 Fred Gleason +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License version 2 as +// published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public +// License along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// + +#ifndef EDIT_EVENT_H +#define EDIT_EVENT_H + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +class EditEvent : public RDDialog +{ + Q_OBJECT + protected: + EditEvent(RDLogLine *,QWidget *parent=0); + + private slots: + void timeChangedData(const QTime &); + void timeToggledData(bool state); + void graceClickedData(int id); + void selectTimeData(int); + void okData(); + void cancelData(); + + protected: + RDLogLine *logLine(); + virtual bool saveData()=0; + void resizeEvent(QResizeEvent *e); + void closeEvent(QCloseEvent *e); + + private: + RDLogLine *edit_logline; + RDTimeEdit *edit_time_edit; + QLabel *edit_time_label; + QCheckBox *edit_timetype_box; + QLabel *edit_timetype_label; + QCheckBox *edit_time_box; + QComboBox *edit_transtype_box; + QButtonGroup *edit_grace_bgroup; + QGroupBox *edit_grace_group; + QTimeEdit *edit_grace_timeedit; + QPushButton *edit_ok_button; + QPushButton *edit_cancel_button; +}; + + +#endif // EDIT_EVENT_H diff --git a/rdlogedit/edit_log.cpp b/rdlogedit/edit_log.cpp index 6d2c32b6..04eb3eb4 100644 --- a/rdlogedit/edit_log.cpp +++ b/rdlogedit/edit_log.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Log // -// (C) Copyright 2002-2018 Fred Gleason +// (C) Copyright 2002-2019 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -18,25 +18,12 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include - -#include -#include -#include -#include #include #include -#include -#include #include -#include #include #include -#include -#include -#include -#include #include #include "add_meta.h" @@ -63,7 +50,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, QString *schedcode,vector *clipboard, vector *new_logs,QWidget *parent) - : QDialog(parent) + : RDDialog(parent) { setModal(true); @@ -103,20 +90,6 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, setMinimumWidth(sizeHint().width()); setMinimumHeight(sizeHint().height()); - // - // Create Fonts - // - QFont modified_font=QFont("Helvetica",18,QFont::Bold); - modified_font.setPixelSize(18); - QFont button_font=QFont("Helvetica",12,QFont::Bold); - button_font.setPixelSize(12); - QFont label_font=QFont("Helvetica",12,QFont::Bold); - label_font.setPixelSize(12); - QFont title_font=QFont("Helvetica",12,QFont::Normal); - title_font.setPixelSize(12); - QFont length_font=QFont("Helvetica",10,QFont::Bold); - length_font.setPixelSize(10); - // // Create Icons // @@ -165,14 +138,13 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, edit_modified_label=new QLabel(this); edit_modified_label->setBackgroundColor(QColor(system_mid_color)); edit_modified_label->setAlignment(Qt::AlignCenter|Qt::AlignVCenter); - edit_modified_label->setFont(modified_font); + edit_modified_label->setFont(progressFont()); edit_logname_label=new QLabel(logname,this); edit_logname_label->setBackgroundColor(QColor(system_mid_color)); edit_logname_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); - edit_logname_label->setFont(title_font); edit_logname_label_label=new QLabel(tr("Log Name:"),this); edit_logname_label_label->setBackgroundColor(QColor(system_mid_color)); - edit_logname_label_label->setFont(label_font); + edit_logname_label_label->setFont(labelFont()); edit_logname_label_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // @@ -181,10 +153,9 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, edit_track_label=new QLabel(this); edit_track_label->setBackgroundColor(QColor(system_mid_color)); edit_track_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); - edit_track_label->setFont(title_font); edit_track_label_label=new QLabel(tr("Tracks:"),this); edit_track_label_label->setBackgroundColor(QColor(system_mid_color)); - edit_track_label_label->setFont(label_font); + edit_track_label_label->setFont(labelFont()); edit_track_label_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // @@ -196,10 +167,9 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, this); edit_origin_label->setBackgroundColor(QColor(system_mid_color)); edit_origin_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); - edit_origin_label->setFont(title_font); edit_origin_label_label=new QLabel(tr("Origin:"),this); edit_origin_label_label->setBackgroundColor(QColor(system_mid_color)); - edit_origin_label_label->setFont(label_font); + edit_origin_label_label->setFont(labelFont()); edit_origin_label_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // @@ -211,7 +181,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, this,SLOT(descriptionChangedData(const QString &))); edit_description_label= new QLabel(edit_description_edit,tr("Description:"),this); - edit_description_label->setFont(label_font); + edit_description_label->setFont(labelFont()); edit_description_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // @@ -219,11 +189,11 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, // edit_purgedate_box=new QCheckBox(this); edit_purgedate_label=new QLabel(edit_purgedate_box,tr("Delete on"),this); - edit_purgedate_label->setFont(label_font); + edit_purgedate_label->setFont(labelFont()); edit_purgedate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); edit_purgedate_edit=new Q3DateEdit(this); edit_purgedate_button=new QPushButton(tr("Select"),this); - edit_purgedate_button->setFont(label_font); + edit_purgedate_button->setFont(buttonFont()); connect(edit_purgedate_box,SIGNAL(toggled(bool)), this,SLOT(purgeDateToggledData(bool))); connect(edit_purgedate_box,SIGNAL(toggled(bool)), @@ -242,7 +212,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, edit_service_edit=new QLineEdit(this); edit_service_edit->setReadOnly(true); edit_service_label=new QLabel(edit_service_box,tr("Service:"),this); - edit_service_label->setFont(label_font); + edit_service_label->setFont(labelFont()); edit_service_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(edit_service_box,SIGNAL(activated(const QString &)), this,SLOT(serviceActivatedData(const QString &))); @@ -257,7 +227,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, edit_autorefresh_edit->setReadOnly(true); edit_autorefresh_label= new QLabel(edit_autorefresh_box,tr("Enable AutoRefresh:"),this); - edit_autorefresh_label->setFont(label_font); + edit_autorefresh_label->setFont(labelFont()); edit_autorefresh_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(edit_autorefresh_box,SIGNAL(activated(int)), this,SLOT(autorefreshChangedData(int))); @@ -267,7 +237,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, // edit_startdate_edit=new Q3DateEdit(this); edit_startdate_label=new QLabel(edit_startdate_edit,tr("Start Date:"),this); - edit_startdate_label->setFont(label_font); + edit_startdate_label->setFont(labelFont()); edit_startdate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(edit_startdate_edit,SIGNAL(valueChanged(const QDate &)), this,SLOT(dateValueChangedData(const QDate &))); @@ -278,7 +248,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, // edit_enddate_edit=new Q3DateEdit(this); edit_enddate_label=new QLabel(edit_startdate_edit,tr("End Date:"),this); - edit_enddate_label->setFont(label_font); + edit_enddate_label->setFont(labelFont()); edit_enddate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(edit_enddate_edit,SIGNAL(valueChanged(const QDate &)), this,SLOT(dateValueChangedData(const QDate &))); @@ -291,7 +261,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, this,SLOT(startDateEnabledData(bool))); edit_startdate_box_label= new QLabel(edit_startdate_box,tr("Start Date Enabled"),this); - edit_startdate_box_label->setFont(label_font); + edit_startdate_box_label->setFont(labelFont()); edit_startdate_box_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // @@ -302,21 +272,21 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, this,SLOT(endDateEnabledData(bool))); edit_enddate_box_label= new QLabel(edit_enddate_box,tr("End Date Enabled"),this); - edit_enddate_box_label->setFont(label_font); + edit_enddate_box_label->setFont(labelFont()); edit_enddate_box_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Time Counter Section // edit_time_groupbox=new QGroupBox(tr("Run Length"),this); - edit_time_groupbox->setFont(label_font); + edit_time_groupbox->setFont(labelFont()); // // Stop Time Counter // edit_stoptime_edit=new QLineEdit(this); edit_stoptime_label=new QLabel(edit_stoptime_edit,tr("Next Stop:"),this); - edit_stoptime_label->setFont(label_font); + edit_stoptime_label->setFont(labelFont()); edit_stoptime_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // @@ -324,7 +294,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, // edit_endtime_edit=new QLineEdit(this); edit_endtime_label=new QLabel(edit_endtime_edit,tr("Log End:"),this); - edit_endtime_label->setFont(label_font); + edit_endtime_label->setFont(labelFont()); edit_endtime_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // @@ -382,7 +352,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, // edit_cart_button=new QPushButton(this); edit_cart_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); - edit_cart_button->setFont(button_font); + edit_cart_button->setFont(buttonFont()); edit_cart_button->setText(tr("Insert\nCart")); connect(edit_cart_button,SIGNAL(clicked()), this,SLOT(insertCartButtonData())); @@ -392,7 +362,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, // edit_marker_button=new QPushButton(this); edit_marker_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); - edit_marker_button->setFont(button_font); + edit_marker_button->setFont(buttonFont()); edit_marker_button->setText(tr("Insert\nMeta")); connect(edit_marker_button,SIGNAL(clicked()), this,SLOT(insertMarkerButtonData())); @@ -402,7 +372,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, // edit_edit_button=new QPushButton(this); edit_edit_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); - edit_edit_button->setFont(button_font); + edit_edit_button->setFont(buttonFont()); edit_edit_button->setText(tr("Edit")); connect(edit_edit_button,SIGNAL(clicked()),this,SLOT(editButtonData())); @@ -411,7 +381,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, // edit_delete_button=new QPushButton(this); edit_delete_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); - edit_delete_button->setFont(button_font); + edit_delete_button->setFont(buttonFont()); edit_delete_button->setText(tr("Delete")); connect(edit_delete_button,SIGNAL(clicked()),this,SLOT(deleteButtonData())); @@ -434,7 +404,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, // edit_cut_button=new QPushButton(this); edit_cut_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); - edit_cut_button->setFont(button_font); + edit_cut_button->setFont(buttonFont()); edit_cut_button->setText(tr("Cut")); connect(edit_cut_button,SIGNAL(clicked()),this,SLOT(cutButtonData())); @@ -443,7 +413,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, // edit_copy_button=new QPushButton(this); edit_copy_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); - edit_copy_button->setFont(button_font); + edit_copy_button->setFont(buttonFont()); edit_copy_button->setText(tr("Copy")); connect(edit_copy_button,SIGNAL(clicked()),this,SLOT(copyButtonData())); @@ -452,7 +422,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, // edit_paste_button=new QPushButton(this); edit_paste_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); - edit_paste_button->setFont(button_font); + edit_paste_button->setFont(buttonFont()); edit_paste_button->setText(tr("Paste")); connect(edit_paste_button,SIGNAL(clicked()),this,SLOT(pasteButtonData())); @@ -460,7 +430,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, // Save Button // edit_save_button=new QPushButton(this); - edit_save_button->setFont(button_font); + edit_save_button->setFont(buttonFont()); edit_save_button->setText(tr("&Save")); edit_save_button->setDisabled(true); connect(edit_save_button,SIGNAL(clicked()),this,SLOT(saveData())); @@ -469,7 +439,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, // Save As Button // edit_saveas_button=new QPushButton(this); - edit_saveas_button->setFont(button_font); + edit_saveas_button->setFont(buttonFont()); edit_saveas_button->setText(tr("Save")+"\n"+tr("As")); connect(edit_saveas_button,SIGNAL(clicked()),this,SLOT(saveasData())); @@ -477,7 +447,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, // Render Button // edit_renderas_button=new QPushButton(this); - edit_renderas_button->setFont(button_font); + edit_renderas_button->setFont(buttonFont()); edit_renderas_button->setText(tr("Render")); connect(edit_renderas_button,SIGNAL(clicked()),this,SLOT(renderasData())); @@ -485,7 +455,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, // Reports Button // edit_reports_button=new QPushButton(this); - edit_reports_button->setFont(button_font); + edit_reports_button->setFont(buttonFont()); edit_reports_button->setText(tr("&Reports")); connect(edit_reports_button,SIGNAL(clicked()),this,SLOT(reportsData())); @@ -502,7 +472,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, // edit_ok_button=new QPushButton(this); edit_ok_button->setDefault(true); - edit_ok_button->setFont(button_font); + edit_ok_button->setFont(buttonFont()); edit_ok_button->setText(tr("&OK")); connect(edit_ok_button,SIGNAL(clicked()),this,SLOT(okData())); @@ -510,7 +480,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, // Cancel Button // edit_cancel_button=new QPushButton(this); - edit_cancel_button->setFont(button_font); + edit_cancel_button->setFont(buttonFont()); edit_cancel_button->setText(tr("&Cancel")); connect(edit_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); @@ -1300,7 +1270,7 @@ void EditLog::resizeEvent(QResizeEvent *e) edit_startdate_box_label->setGeometry(270,96,175,20); edit_enddate_box_label->setGeometry(450,96,140,20); - edit_time_groupbox->setGeometry(624,65,136,59); + edit_time_groupbox->setGeometry(620,65,140,59); edit_stoptime_label->setGeometry(625,82,65,18); edit_stoptime_edit->setGeometry(695,82,60,18); edit_endtime_label->setGeometry(625,102,65,18); @@ -1339,14 +1309,6 @@ void EditLog::paintEvent(QPaintEvent *e) p->fillRect(60,8,size().width()-120,24,QColor(system_mid_color)); p->fillRect(9,size().height()-130,size().width()-20,60, QColor(system_mid_color)); - /* - p->setPen(Qt::black); - p->setBrush(Qt::black); - p->drawLine(624,70,760,70); - p->drawLine(760,70,760,124); - p->drawLine(760,124,624,124); - p->drawLine(624,124,624,70); - */ p->end(); delete p; } diff --git a/rdlogedit/edit_log.h b/rdlogedit/edit_log.h index 81207cdd..ad06f71d 100644 --- a/rdlogedit/edit_log.h +++ b/rdlogedit/edit_log.h @@ -1,8 +1,8 @@ // edit_log.h // -// Create a Rivendell Log +// Edit a Rivendell Log // -// (C) Copyright 2002-2018 Fred Gleason +// (C) Copyright 2002-2019 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -21,27 +21,12 @@ #ifndef EDIT_LOG_H #define EDIT_LOG_H -#include - -#include -#include -#include #include -#include -#include - -#include #include +#include #include -#include -#include -#include #include -#include -#include -#include -#include #include "drop_listview.h" #include "list_reports.h" @@ -52,7 +37,7 @@ // #define END_MARKER_ID -2 -class EditLog : public QDialog +class EditLog : public RDDialog { Q_OBJECT public: diff --git a/rdlogedit/edit_logline.cpp b/rdlogedit/edit_logline.cpp index 195c052f..e4591529 100644 --- a/rdlogedit/edit_logline.cpp +++ b/rdlogedit/edit_logline.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Log Entry // -// (C) Copyright 2002-2018 Fred Gleason +// (C) Copyright 2002-2019 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -18,36 +18,24 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include #include -#include - -#include -#include -#include -#include #include "edit_logline.h" -#include "globals.h" EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, QString *schedcode,QString svcname, RDGroupList *grplist,RDLogEvent *log,int lineno, QWidget *parent) - : QDialog(parent) + : EditEvent(line,parent) { - setModal(true); // // Fix the Window Size // - setMinimumWidth(sizeHint().width()); - setMaximumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); - setMaximumHeight(sizeHint().height()); + setMinimumSize(sizeHint()); + setMaximumSize(sizeHint()); setWindowTitle("RDLogEdit - "+tr("Edit Log Entry")); - edit_logline=line; edit_filter=filter; edit_group=group; edit_schedcode=schedcode; @@ -56,93 +44,22 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, edit_log_event=log; edit_line=lineno; - // - // Create Fonts - // - QFont button_font=QFont("Helvetica",12,QFont::Bold); - button_font.setPixelSize(12); - QFont label_font=QFont("Helvetica",12,QFont::Bold); - label_font.setPixelSize(12); - QFont normal_font=QFont("Helvetica",12,QFont::Normal); - normal_font.setPixelSize(12); - QFont radio_font=QFont("Helvetica",10,QFont::Normal); - radio_font.setPixelSize(10); - // // Cart Picker // edit_cart_dialog=new RDCartDialog(edit_filter,edit_group,edit_schedcode,this); // - // Time Type - // - edit_timetype_box=new QCheckBox(this); - edit_timetype_box->setGeometry(10,22,15,15); - edit_timetype_label=new QLabel(edit_timetype_box,tr("Start at:"),this); - edit_timetype_label->setGeometry(30,21,80,17); - edit_timetype_label->setFont(label_font); - edit_timetype_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); - - // - // Start Time - // - edit_time_edit=new RDTimeEdit(this); - edit_time_edit->setGeometry(85,19,85,20); - edit_time_edit->setDisplay(RDTimeEdit::Hours|RDTimeEdit::Minutes| - RDTimeEdit::Seconds|RDTimeEdit::Tenths); - connect(edit_time_edit,SIGNAL(valueChanged(const QTime &)), - this,SLOT(timeChangedData(const QTime &))); - - // - // Grace Time - // - edit_grace_group - =new Q3ButtonGroup(1,Qt::Vertical, - tr("Action If Previous Event Still Playing"),this); - edit_grace_group->setGeometry(175,11,435,50); - edit_grace_group->setFont(label_font); - edit_grace_group->setRadioButtonExclusive(true); - QRadioButton *radio_button= - new QRadioButton(tr("Start Immediately"),edit_grace_group); - edit_grace_group->insert(radio_button); - radio_button->setFont(radio_font); - radio_button=new QRadioButton(tr("Make Next"),edit_grace_group); - edit_grace_group->insert(radio_button); - radio_button->setFont(radio_font); - radio_button=new QRadioButton(tr("Wait up to"),edit_grace_group); - edit_grace_group->insert(radio_button); - radio_button->setFont(radio_font); - - edit_grace_edit=new RDTimeEdit(this); - edit_grace_edit->setGeometry(538,31,65,20); - edit_grace_edit-> - setDisplay(RDTimeEdit::Minutes|RDTimeEdit::Seconds|RDTimeEdit::Tenths); - connect(edit_timetype_box,SIGNAL(toggled(bool)), - this,SLOT(timeToggledData(bool))); - connect(edit_grace_group,SIGNAL(clicked(int)), - this,SLOT(graceClickedData(int))); - - // - // Transition Type - // - edit_transtype_box=new QComboBox(this); - edit_transtype_box->setGeometry(485,68,110,26); - edit_transtype_box->insertItem(tr("Play")); - edit_transtype_box->insertItem(tr("Segue")); - edit_transtype_box->insertItem(tr("Stop")); - edit_time_label=new QLabel(edit_transtype_box,tr("Transition Type:"),this); - edit_time_label->setGeometry(190,68,290,26); - edit_time_label->setFont(label_font); - edit_time_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - // Overlap Box + // edit_overlap_box=new QCheckBox(this); edit_overlap_box->setGeometry(30,72,15,15); edit_overlap_label= new QLabel(edit_overlap_box,tr("No Fade on Segue Out"),this); edit_overlap_label->setGeometry(50,68,130,26); - edit_overlap_label->setFont(button_font); - edit_overlap_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); + edit_overlap_label->setFont(labelFont()); + edit_overlap_label-> + setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Cart Number @@ -150,7 +67,7 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, edit_cart_edit=new QLineEdit(this); edit_cart_edit->setGeometry(10,116,60,18); QLabel *label=new QLabel(tr("Cart"),this); - label->setFont(label_font); + label->setFont(labelFont()); label->setGeometry(12,100,60,14); // @@ -160,7 +77,7 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, edit_title_edit->setGeometry(75,116,260,18); edit_title_edit->setReadOnly(true); label=new QLabel(tr("Title"),this); - label->setFont(label_font); + label->setFont(labelFont()); label->setGeometry(77,100,110,14); // @@ -170,7 +87,7 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, edit_artist_edit->setGeometry(340,116,sizeHint().width()-350,18); edit_artist_edit->setReadOnly(true); label=new QLabel(tr("Artist"),this); - label->setFont(label_font); + label->setFont(labelFont()); label->setGeometry(342,100,110,14); // @@ -178,67 +95,20 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, // QPushButton *button=new QPushButton(this); button->setGeometry(20,144,80,50); - button->setFont(button_font); + button->setFont(buttonFont()); button->setText(tr("Select\nCart")); connect(button,SIGNAL(clicked()),this,SLOT(selectCartData())); - // - // Ok Button - // - button=new QPushButton(this); - button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); - button->setDefault(true); - button->setFont(button_font); - button->setText(tr("&OK")); - connect(button,SIGNAL(clicked()),this,SLOT(okData())); - - // - // Cancel Button - // - button=new QPushButton(this); - button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, - 80,50); - button->setFont(button_font); - button->setText(tr("&Cancel")); - connect(button,SIGNAL(clicked()),this,SLOT(cancelData())); - // // Populate Data // - edit_time_edit->setTime(edit_logline->startTime(RDLogLine::Logged)); - if(edit_logline->timeType()==RDLogLine::Hard) { - edit_timetype_box->setChecked(true); - timeToggledData(true); - } - else { - timeToggledData(false); - } - timeChangedData(edit_time_edit->time()); - switch(edit_logline->graceTime()) { - case -1: - edit_grace_group->setButton(1); - graceClickedData(1); - break; - - case 0: - edit_grace_group->setButton(0); - graceClickedData(0); - break; - - default: - edit_grace_group->setButton(2); - graceClickedData(2); - edit_grace_edit->setTime(QTime().addMSecs(edit_logline->graceTime())); - break; - } - edit_transtype_box->setCurrentItem(edit_logline->transType()); - if(edit_logline->segueStartPoint(RDLogLine::LogPointer)<0 - && edit_logline->segueEndPoint(RDLogLine::LogPointer)<0 - && edit_logline->endPoint(RDLogLine::LogPointer)<0 - && edit_logline->fadedownPoint(RDLogLine::LogPointer)<0) { + if(logLine()->segueStartPoint(RDLogLine::LogPointer)<0 + && logLine()->segueEndPoint(RDLogLine::LogPointer)<0 + && logLine()->endPoint(RDLogLine::LogPointer)<0 + && logLine()->fadedownPoint(RDLogLine::LogPointer)<0) { edit_overlap_box->setEnabled(true); edit_overlap_label->setEnabled(true); - if(edit_logline->segueGain()==0) { + if(logLine()->segueGain()==0) { edit_overlap_box->setChecked(true); } else { @@ -249,7 +119,7 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, edit_overlap_box->setEnabled(false); edit_overlap_label->setEnabled(false); } - FillCart(edit_logline->cartNumber()); + FillCart(logLine()->cartNumber()); } @@ -285,57 +155,12 @@ void EditLogLine::selectCartData() } -void EditLogLine::timeChangedData(const QTime &time) -{ - if(edit_timetype_box->isChecked()) { - edit_time_label-> - setText(tr("Transition If Previous Cart Ends Before")+" "+ - edit_time_edit->time().toString("hh:mm:ss.zzz").left(10)+":"); - } -} - - -void EditLogLine::timeToggledData(bool state) -{ - edit_time_edit->setEnabled(state); - edit_grace_group->setEnabled(state); - if(state) { - graceClickedData(edit_grace_group->selectedId()); - edit_time_label-> - setText(tr("Transition If Previous Cart Ends Before")+" "+ - edit_time_edit->time().toString("hh:mm:ss.zzz").left(10)+":"); - } - else { - edit_grace_edit->setDisabled(true); - edit_time_label->setText(tr("Transition Type")+":"); - } -} - - -void EditLogLine::graceClickedData(int id) -{ - switch(id) { - case 0: - edit_grace_edit->setDisabled(true); - break; - - case 1: - edit_grace_edit->setDisabled(true); - break; - - case 2: - edit_grace_edit->setEnabled(true); - break; - } -} - - -void EditLogLine::okData() +bool EditLogLine::saveData() { if(edit_cart_edit->text().isEmpty()) { QMessageBox::warning(this,tr("Missing Cart"), tr("You must supply a cart number!")); - return; + return false; } RDCart *cart=new RDCart(edit_cart_edit->text().toUInt()); if(cart->exists()) { @@ -343,65 +168,23 @@ void EditLogLine::okData() delete cart; QMessageBox::warning(this,tr("Disabled Cart"), tr("This cart belongs to a disabled\ngroup for the specified service!")); - return; + return false; } } delete cart; - if(edit_timetype_box->isChecked()&& - edit_log_event->exists(edit_time_edit->time(),edit_line)) { - QMessageBox::warning(this,tr("Duplicate Start Time"), - tr("An event is already scheduled with this start time!")); - return; - } - if(edit_timetype_box->isChecked()) { - edit_logline->setTimeType(RDLogLine::Hard); - edit_logline->setStartTime(RDLogLine::Logged,edit_time_edit->time()); - switch(edit_grace_group->selectedId()) { - case 0: - edit_logline->setGraceTime(0); - break; - - case 1: - edit_logline->setGraceTime(-1); - break; - - case 2: - edit_logline->setGraceTime(QTime().msecsTo(edit_grace_edit->time())); - break; - } - } - else { - edit_logline->setTimeType(RDLogLine::Relative); - edit_logline->setStartTime(RDLogLine::Logged,QTime()); - edit_logline->setGraceTime(0); - } - edit_logline-> - setTransType((RDLogLine::TransType)edit_transtype_box->currentItem()); - edit_logline->setCartNumber(edit_cart_edit->text().toUInt()); - if(edit_logline->segueStartPoint(RDLogLine::LogPointer)<0 - && edit_logline->segueEndPoint(RDLogLine::LogPointer)<0 - && edit_logline->endPoint(RDLogLine::LogPointer)<0 - && edit_logline->fadedownPoint(RDLogLine::LogPointer)<0) { + logLine()->setCartNumber(edit_cart_edit->text().toUInt()); + if(logLine()->segueStartPoint(RDLogLine::LogPointer)<0 + && logLine()->segueEndPoint(RDLogLine::LogPointer)<0 + && logLine()->endPoint(RDLogLine::LogPointer)<0 + && logLine()->fadedownPoint(RDLogLine::LogPointer)<0) { if(edit_overlap_box->isChecked()) { - edit_logline->setSegueGain(0); + logLine()->setSegueGain(0); } else { - edit_logline->setSegueGain(RD_FADE_DEPTH); + logLine()->setSegueGain(RD_FADE_DEPTH); } } - done(edit_logline->id()); -} - - -void EditLogLine::cancelData() -{ - done(-1); -} - - -void EditLogLine::closeEvent(QCloseEvent *e) -{ - cancelData(); + return true; } diff --git a/rdlogedit/edit_logline.h b/rdlogedit/edit_logline.h index a013e09e..717489dc 100644 --- a/rdlogedit/edit_logline.h +++ b/rdlogedit/edit_logline.h @@ -1,8 +1,8 @@ // edit_logline.h // -// Edit a Rivendell Log Entry +// Edit a Rivendell cart event // -// (C) Copyright 2002-2018 Fred Gleason +// (C) Copyright 2002-2019 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -21,22 +21,13 @@ #ifndef EDIT_LOGLINE_H #define EDIT_LOGLINE_H -#include -#include -#include -#include -#include -#include -#include -#include - #include #include -#include #include -#include -class EditLogLine : public QDialog +#include "edit_event.h" + +class EditLogLine : public EditEvent { Q_OBJECT public: @@ -49,24 +40,12 @@ class EditLogLine : public QDialog private slots: void selectCartData(); - void timeChangedData(const QTime &); - void timeToggledData(bool state); - void graceClickedData(int id); - void okData(); - void cancelData(); protected: - void closeEvent(QCloseEvent *e); + bool saveData(); private: void FillCart(int cartnum); - RDLogLine *edit_logline; - RDTimeEdit *edit_time_edit; - QLabel *edit_time_label; - QCheckBox *edit_timetype_box; - QLabel *edit_timetype_label; - QCheckBox *edit_time_box; - QComboBox *edit_transtype_box; QCheckBox *edit_overlap_box; QLabel *edit_overlap_label; QLineEdit *edit_cart_edit; @@ -76,8 +55,6 @@ class EditLogLine : public QDialog QString *edit_filter; QString *edit_group; QString *edit_schedcode; - Q3ButtonGroup *edit_grace_group; - RDTimeEdit *edit_grace_edit; QString edit_service; RDGroupList *edit_group_list; RDLogEvent *edit_log_event; @@ -85,5 +62,4 @@ class EditLogLine : public QDialog }; -#endif - +#endif // EDIT_LOGLINE_H diff --git a/rdlogedit/edit_marker.cpp b/rdlogedit/edit_marker.cpp index cfb77ccb..d18cba18 100644 --- a/rdlogedit/edit_marker.cpp +++ b/rdlogedit/edit_marker.cpp @@ -1,8 +1,8 @@ // edit_marker.cpp // -// Edit a Rivendell Log Marker Entry +// Edit a Rivendell marker event // -// (C) Copyright 2002-2018 Fred Gleason +// (C) Copyright 2002-2019 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -18,16 +18,11 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include - #include "edit_marker.h" EditMarker::EditMarker(RDLogLine *line,QWidget *parent) - : QDialog(parent) + : EditEvent(line,parent) { - setModal(true); - // // Fix the Window Size // @@ -38,78 +33,6 @@ EditMarker::EditMarker(RDLogLine *line,QWidget *parent) setWindowTitle("RDLogEdit - "+tr("Edit Log Marker")); - edit_logline=line; - - // - // Create Fonts - // - QFont button_font=QFont("Helvetica",12,QFont::Bold); - button_font.setPixelSize(12); - QFont label_font=QFont("Helvetica",12,QFont::Bold); - label_font.setPixelSize(12); - QFont radio_font=QFont("Helvetica",10,QFont::Normal); - radio_font.setPixelSize(10); - - // - // Time Type - // - edit_timetype_box=new QCheckBox(this); - edit_timetype_box->setGeometry(10,22,15,15); - edit_timetype_label=new QLabel(edit_timetype_box,tr("Start at:"),this); - edit_timetype_label->setGeometry(30,21,85,17); - edit_timetype_label->setFont(label_font); - edit_timetype_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); - - // - // Start Time - // - edit_time_edit=new RDTimeEdit(this); - edit_time_edit->setGeometry(85,19,85,20); - edit_time_edit->setDisplay(RDTimeEdit::Hours|RDTimeEdit::Minutes| - RDTimeEdit::Seconds|RDTimeEdit::Tenths); - connect(edit_time_edit,SIGNAL(valueChanged(const QTime &)), - this,SLOT(timeChangedData(const QTime &))); - - // - // Grace Time - // - edit_grace_group - =new Q3ButtonGroup(1,Qt::Vertical, - tr("Action If Previous Event Still Playing"),this); - edit_grace_group->setGeometry(175,11,435,50); - edit_grace_group->setFont(label_font); - edit_grace_group->setRadioButtonExclusive(true); - QRadioButton *radio_button= - new QRadioButton(tr("Start Immediately"),edit_grace_group); - edit_grace_group->insert(radio_button); - radio_button->setFont(radio_font); - radio_button=new QRadioButton(tr("Make Next"),edit_grace_group); - edit_grace_group->insert(radio_button); - radio_button->setFont(radio_font); - radio_button=new QRadioButton(tr("Wait up to"),edit_grace_group); - edit_grace_group->insert(radio_button); - radio_button->setFont(radio_font); - edit_grace_box=new Q3TimeEdit(this); - edit_grace_box->setGeometry(543,31,60,20); - edit_grace_box->setDisplay(Q3TimeEdit::Minutes|Q3TimeEdit::Seconds); - connect(edit_timetype_box,SIGNAL(toggled(bool)), - this,SLOT(timeToggledData(bool))); - connect(edit_grace_group,SIGNAL(clicked(int)), - this,SLOT(graceClickedData(int))); - - // - // Transition Type - // - edit_transtype_box=new QComboBox(this); - edit_transtype_box->setGeometry(385,68,110,26); - edit_transtype_box->insertItem(tr("Play")); - edit_transtype_box->insertItem(tr("Segue")); - edit_transtype_box->insertItem(tr("Stop")); - edit_time_label=new QLabel(edit_transtype_box,"Transition Type:",this); - edit_time_label->setGeometry(10,68,370,26); - edit_time_label->setFont(label_font); - edit_time_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - // // Comment // @@ -117,7 +40,7 @@ EditMarker::EditMarker(RDLogLine *line,QWidget *parent) edit_comment_edit->setGeometry(10,116,sizeHint().width()-20,18); edit_comment_edit->setMaxLength(255); QLabel *label=new QLabel(tr("Comment"),this); - label->setFont(label_font); + label->setFont(labelFont()); label->setGeometry(12,100,70,14); // @@ -127,66 +50,14 @@ EditMarker::EditMarker(RDLogLine *line,QWidget *parent) edit_label_edit->setGeometry(10,156,100,18); edit_label_edit->setMaxLength(10); label=new QLabel(tr("Label"),this); - label->setFont(label_font); + label->setFont(labelFont()); label->setGeometry(12,140,60,14); - // - // Ok Button - // - QPushButton *button=new QPushButton(this); - button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); - button->setDefault(true); - button->setFont(button_font); - button->setText(tr("&OK")); - connect(button,SIGNAL(clicked()),this,SLOT(okData())); - - // - // Cancel Button - // - button=new QPushButton(this); - button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, - 80,50); - button->setFont(button_font); - button->setText(tr("&Cancel")); - connect(button,SIGNAL(clicked()),this,SLOT(cancelData())); - // // Populate Data // - edit_time_edit->setTime(edit_logline->startTime(RDLogLine::Logged)); - if(edit_logline->timeType()==RDLogLine::Hard) { - edit_timetype_box->setChecked(true); - timeToggledData(true); - } - else { - timeToggledData(false); - } - timeChangedData(edit_time_edit->time()); - switch(edit_logline->graceTime()) { - case -1: - edit_grace_group->setButton(1); - graceClickedData(1); - break; - - case 0: - edit_grace_group->setButton(0); - graceClickedData(0); - break; - - default: - edit_grace_group->setButton(2); - edit_grace_box->setTime(QTime().addMSecs(edit_logline->graceTime())); - graceClickedData(2); - break; - } - edit_transtype_box->setCurrentItem(edit_logline->transType()); - edit_comment_edit->setText(edit_logline->markerComment()); - edit_label_edit->setText(edit_logline->markerLabel()); -} - - -EditMarker::~EditMarker() -{ + edit_comment_edit->setText(logLine()->markerComment()); + edit_label_edit->setText(logLine()->markerLabel()); } @@ -202,104 +73,10 @@ QSizePolicy EditMarker::sizePolicy() const } -void EditMarker::timeChangedData(const QTime &time) +bool EditMarker::saveData() { - if(edit_timetype_box->isChecked()) { - edit_time_label-> - setText(tr("Transition If Previous Cart Ends Before")+" "+ - edit_time_edit->time().toString("hh:mm:ss.zzz").left(10)+":"); - } -} - - -void EditMarker::timeToggledData(bool state) -{ - edit_time_edit->setEnabled(state); - edit_grace_group->setEnabled(state); - if(state) { - graceClickedData(edit_grace_group->selectedId()); - edit_time_label-> - setText(tr("Transition If Previous Cart Ends Before")+" "+ - edit_time_edit->time().toString("hh:mm:ss.zzz").left(10)+":"); - } - else { - edit_grace_box->setDisabled(true); - edit_time_label->setText(tr("Transition Type")+":"); - } -} - - -void EditMarker::graceClickedData(int id) -{ - switch(id) { - case 0: - edit_grace_box->setDisabled(true); - break; - - case 1: - edit_grace_box->setDisabled(true); - break; - - case 2: - edit_grace_box->setEnabled(true); - break; - } -} - - -void EditMarker::selectTimeData(int id) -{ - if(id==RDLogLine::Relative) { - edit_time_edit->setDisabled(true); - edit_time_label->setDisabled(true); - edit_grace_box->setDisabled(true); - } - else { - edit_time_edit->setEnabled(true); - edit_time_label->setEnabled(true); - } -} - - -void EditMarker::okData() -{ - if(edit_timetype_box->isChecked()) { - edit_logline->setTimeType(RDLogLine::Hard); - edit_logline->setStartTime(RDLogLine::Logged,edit_time_edit->time()); - switch(edit_grace_group->selectedId()) { - case 0: - edit_logline->setGraceTime(0); - break; - - case 1: - edit_logline->setGraceTime(-1); - break; - - case 2: - edit_logline->setGraceTime(QTime().msecsTo(edit_grace_box->time())); - break; - } - } - else { - edit_logline->setTimeType(RDLogLine::Relative); - edit_logline->setStartTime(RDLogLine::Logged,QTime()); - edit_logline->setGraceTime(0); - } - edit_logline-> - setTransType((RDLogLine::TransType)edit_transtype_box->currentItem()); - edit_logline->setMarkerComment(edit_comment_edit->text()); - edit_logline->setMarkerLabel(edit_label_edit->text()); - done(edit_logline->id()); -} - - -void EditMarker::cancelData() -{ - done(-1); -} - - -void EditMarker::closeEvent(QCloseEvent *e) -{ - cancelData(); + logLine()->setMarkerComment(edit_comment_edit->text()); + logLine()->setMarkerLabel(edit_label_edit->text()); + + return true; } diff --git a/rdlogedit/edit_marker.h b/rdlogedit/edit_marker.h index 4d11bc1b..32b37725 100644 --- a/rdlogedit/edit_marker.h +++ b/rdlogedit/edit_marker.h @@ -1,8 +1,8 @@ // edit_marker.h // -// Edit a Rivendell Log Entry +// Edit a Rivendell marker event // -// (C) Copyright 2002-2018 Fred Gleason +// (C) Copyright 2002-2019 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -21,54 +21,25 @@ #ifndef EDIT_MARKER_H #define EDIT_MARKER_H -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include +#include "edit_event.h" -class EditMarker : public QDialog +class EditMarker : public EditEvent { Q_OBJECT public: EditMarker(RDLogLine *,QWidget *parent=0); - ~EditMarker(); QSize sizeHint() const; QSizePolicy sizePolicy() const; - private slots: - void timeChangedData(const QTime &); - void timeToggledData(bool state); - void graceClickedData(int id); - void selectTimeData(int); - void okData(); - void cancelData(); - protected: - void closeEvent(QCloseEvent *e); + bool saveData(); private: - RDLogLine *edit_logline; - RDTimeEdit *edit_time_edit; - QLabel *edit_time_label; - QCheckBox *edit_timetype_box; - QLabel *edit_timetype_label; - QCheckBox *edit_time_box; - QComboBox *edit_transtype_box; QLineEdit *edit_comment_edit; QLineEdit *edit_label_edit; - Q3ButtonGroup *edit_grace_group; - QFont normal_font; - Q3TimeEdit *edit_grace_box; }; -#endif - +#endif // EDIT_MARKER_H diff --git a/rdlogedit/edit_track.cpp b/rdlogedit/edit_track.cpp index a77ad856..aea404c8 100644 --- a/rdlogedit/edit_track.cpp +++ b/rdlogedit/edit_track.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Voice Track Log Entry // -// (C) Copyright 2002-2018 Fred Gleason +// (C) Copyright 2002-2019 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -18,97 +18,18 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include - -#include +#include "edit_track.h" EditTrack::EditTrack(RDLogLine *line,QWidget *parent) - : QDialog(parent) + : EditEvent(line,parent) { - setModal(true); + setWindowTitle("RDLogEdit - "+tr("Edit Voice Track Marker")); // // Fix the Window Size // - setMinimumWidth(sizeHint().width()); - setMaximumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); - setMaximumHeight(sizeHint().height()); - - setWindowTitle("RDLogEdit - "+tr("Edit Voice Track Marker")); - - edit_logline=line; - - // - // Create Fonts - // - QFont button_font=QFont("Helvetica",12,QFont::Bold); - button_font.setPixelSize(12); - QFont label_font=QFont("Helvetica",12,QFont::Bold); - label_font.setPixelSize(12); - QFont radio_font=QFont("Helvetica",10,QFont::Normal); - radio_font.setPixelSize(10); - - // - // Time Type - // - edit_timetype_box=new QCheckBox(this); - edit_timetype_box->setGeometry(10,22,15,15); - edit_timetype_label=new QLabel(edit_timetype_box,tr("Start at:"),this); - edit_timetype_label->setGeometry(30,21,85,17); - edit_timetype_label->setFont(label_font); - edit_timetype_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); - - // - // Start Time - // - edit_time_edit=new RDTimeEdit(this); - edit_time_edit->setGeometry(85,19,85,20); - edit_time_edit->setDisplay(RDTimeEdit::Hours|RDTimeEdit::Minutes| - RDTimeEdit::Seconds|RDTimeEdit::Tenths); - connect(edit_time_edit,SIGNAL(valueChanged(const QTime &)), - this,SLOT(timeChangedData(const QTime &))); - - // - // Grace Time - // - edit_grace_group - =new Q3ButtonGroup(1,Qt::Vertical, - tr("Action If Previous Event Still Playing"),this); - edit_grace_group->setGeometry(175,11,435,50); - edit_grace_group->setFont(label_font); - edit_grace_group->setRadioButtonExclusive(true); - QRadioButton *radio_button= - new QRadioButton(tr("Start Immediately"),edit_grace_group); - edit_grace_group->insert(radio_button); - radio_button->setFont(radio_font); - radio_button=new QRadioButton(tr("Make Next"),edit_grace_group); - edit_grace_group->insert(radio_button); - radio_button->setFont(radio_font); - radio_button=new QRadioButton(tr("Wait up to"),edit_grace_group); - edit_grace_group->insert(radio_button); - radio_button->setFont(radio_font); - edit_grace_box=new Q3TimeEdit(this); - edit_grace_box->setGeometry(543,31,60,20); - edit_grace_box->setDisplay(Q3TimeEdit::Minutes|Q3TimeEdit::Seconds); - connect(edit_timetype_box,SIGNAL(toggled(bool)), - this,SLOT(timeToggledData(bool))); - connect(edit_grace_group,SIGNAL(clicked(int)), - this,SLOT(graceClickedData(int))); - - // - // Transition Type - // - edit_transtype_box=new QComboBox(this); - edit_transtype_box->setGeometry(385,68,110,26); - edit_transtype_box->insertItem(tr("Play")); - edit_transtype_box->insertItem(tr("Segue")); - edit_transtype_box->insertItem(tr("Stop")); - edit_time_label=new QLabel(edit_transtype_box,"Transition Type:",this); - edit_time_label->setGeometry(10,68,370,26); - edit_time_label->setFont(label_font); - edit_time_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + setMinimumSize(sizeHint()); + setMaximumSize(sizeHint()); // // Comment @@ -117,65 +38,13 @@ EditTrack::EditTrack(RDLogLine *line,QWidget *parent) edit_comment_edit->setGeometry(10,116,sizeHint().width()-20,18); edit_comment_edit->setMaxLength(255); QLabel *label=new QLabel(tr("Comment"),this); - label->setFont(label_font); + label->setFont(labelFont()); label->setGeometry(12,100,70,14); - // - // Ok Button - // - QPushButton *button=new QPushButton(this); - button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); - button->setDefault(true); - button->setFont(button_font); - button->setText(tr("&OK")); - connect(button,SIGNAL(clicked()),this,SLOT(okData())); - - // - // Cancel Button - // - button=new QPushButton(this); - button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, - 80,50); - button->setFont(button_font); - button->setText(tr("&Cancel")); - connect(button,SIGNAL(clicked()),this,SLOT(cancelData())); - // // Populate Data // - edit_time_edit->setTime(edit_logline->startTime(RDLogLine::Logged)); - if(edit_logline->timeType()==RDLogLine::Hard) { - edit_timetype_box->setChecked(true); - timeToggledData(true); - } - else { - timeToggledData(false); - } - timeChangedData(edit_time_edit->time()); - switch(edit_logline->graceTime()) { - case -1: - edit_grace_group->setButton(1); - graceClickedData(1); - break; - - case 0: - edit_grace_group->setButton(0); - graceClickedData(0); - break; - - default: - edit_grace_group->setButton(2); - edit_grace_box->setTime(QTime().addMSecs(edit_logline->graceTime())); - graceClickedData(2); - break; - } - edit_transtype_box->setCurrentItem(edit_logline->transType()); - edit_comment_edit->setText(edit_logline->markerComment()); -} - - -EditTrack::~EditTrack() -{ + edit_comment_edit->setText(logLine()->markerComment()); } @@ -191,103 +60,9 @@ QSizePolicy EditTrack::sizePolicy() const } -void EditTrack::timeChangedData(const QTime &time) +bool EditTrack::saveData() { - if(edit_timetype_box->isChecked()) { - edit_time_label-> - setText(tr("Transition If Previous Cart Ends Before")+" "+ - edit_time_edit->time().toString("hh:mm:ss.zzz").left(10)+":"); - } -} - - -void EditTrack::timeToggledData(bool state) -{ - edit_time_edit->setEnabled(state); - edit_grace_group->setEnabled(state); - if(state) { - graceClickedData(edit_grace_group->selectedId()); - edit_time_label-> - setText(tr("Transition If Previous Cart Ends Before")+" "+ - edit_time_edit->time().toString("hh:mm:ss.zzz").left(10)+":"); - } - else { - edit_grace_box->setDisabled(true); - edit_time_label->setText(tr("Transition Type:")); - } -} - - -void EditTrack::graceClickedData(int id) -{ - switch(id) { - case 0: - edit_grace_box->setDisabled(true); - break; - - case 1: - edit_grace_box->setDisabled(true); - break; - - case 2: - edit_grace_box->setEnabled(true); - break; - } -} - - -void EditTrack::selectTimeData(int id) -{ - if(id==RDLogLine::Relative) { - edit_time_edit->setDisabled(true); - edit_time_label->setDisabled(true); - edit_grace_box->setDisabled(true); - } - else { - edit_time_edit->setEnabled(true); - edit_time_label->setEnabled(true); - } -} - - -void EditTrack::okData() -{ - if(edit_timetype_box->isChecked()) { - edit_logline->setTimeType(RDLogLine::Hard); - edit_logline->setStartTime(RDLogLine::Logged,edit_time_edit->time()); - switch(edit_grace_group->selectedId()) { - case 0: - edit_logline->setGraceTime(0); - break; - - case 1: - edit_logline->setGraceTime(-1); - break; - - case 2: - edit_logline->setGraceTime(QTime().msecsTo(edit_grace_box->time())); - break; - } - } - else { - edit_logline->setTimeType(RDLogLine::Relative); - edit_logline->setStartTime(RDLogLine::Logged,QTime()); - edit_logline->setGraceTime(0); - } - edit_logline-> - setTransType((RDLogLine::TransType)edit_transtype_box->currentItem()); - edit_logline->setMarkerComment(edit_comment_edit->text()); - done(edit_logline->id()); -} - - -void EditTrack::cancelData() -{ - done(-1); -} - - -void EditTrack::closeEvent(QCloseEvent *e) -{ - cancelData(); + logLine()->setMarkerComment(edit_comment_edit->text()); + + return true; } diff --git a/rdlogedit/edit_track.h b/rdlogedit/edit_track.h index e457737d..98160ec8 100644 --- a/rdlogedit/edit_track.h +++ b/rdlogedit/edit_track.h @@ -2,7 +2,7 @@ // // Edit a Rivendell Voice Track Log Entry // -// (C) Copyright 2002-2018 Fred Gleason +// (C) Copyright 2002-2019 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -21,56 +21,26 @@ #ifndef EDIT_TRACK_H #define EDIT_TRACK_H -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include +#include "edit_event.h" -class EditTrack : public QDialog +class EditTrack : public EditEvent { Q_OBJECT public: EditTrack(RDLogLine *,QWidget *parent=0); - ~EditTrack(); QSize sizeHint() const; QSizePolicy sizePolicy() const; - - private slots: - void timeChangedData(const QTime &); - void timeToggledData(bool state); - void graceClickedData(int id); - void selectTimeData(int); - void okData(); - void cancelData(); protected: - void closeEvent(QCloseEvent *e); + bool saveData(); private: - RDLogLine *edit_logline; - RDTimeEdit *edit_time_edit; - QLabel *edit_time_label; - QCheckBox *edit_timetype_box; - QLabel *edit_timetype_label; - QCheckBox *edit_time_box; - QComboBox *edit_transtype_box; QCheckBox *edit_overlap_box; QLabel *edit_overlap_label; QLineEdit *edit_comment_edit; - Q3ButtonGroup *edit_grace_group; - QFont normal_font; - Q3TimeEdit *edit_grace_box; - QLabel *edit_grace_label; }; -#endif - +#endif // EDIT_TRACK_H diff --git a/rdlogedit/import_track.cpp b/rdlogedit/import_track.cpp deleted file mode 100644 index 7a81cc20..00000000 --- a/rdlogedit/import_track.cpp +++ /dev/null @@ -1,196 +0,0 @@ -// import_track.cpp -// -// Insert Audio for a Voice Track -// -// (C) Copyright 2002-2018 Fred Gleason -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2 as -// published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public -// License along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -// - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include "import_track.h" - -extern RDStation *rdstation_conf; - -ImportTrack::ImportTrack(QString *filter,QString *group,QWidget *parent) - : QDialog(parent,Qt::WStyle_Customize|Qt::WStyle_DialogBorder) -{ - setModal(true); - setWindowTitle(""); - - // - // Fix the Window Size - // - setMinimumWidth(sizeHint().width()); - setMaximumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); - setMaximumHeight(sizeHint().height()); - - // - // Generate Fonts - // - QFont button_font=QFont("Helvetica",12,QFont::Bold); - button_font.setPixelSize(12); - QFont label_font=QFont("Helvetica",12,QFont::Bold); - label_font.setPixelSize(12); - QFont day_font=QFont("Helvetica",12,QFont::Normal); - day_font.setPixelSize(12); - - add_filter=filter; - add_group=group; - - // - // Title Label - // - QLabel *label=new QLabel(tr("Insert audio from a:"),this); - label->setGeometry(0,0,sizeHint().width(),30); - label->setFont(label_font); - label->setAlignment(Qt::AlignCenter); - - // - // Cart Button - // - QPushButton *button=new QPushButton(this); - button->setGeometry(10,30,sizeHint().width()-20,50); - button->setFont(button_font); - button->setText(tr("&Cart")); - button->setDisabled(true); - QString sql=QString("select CHANNEL from DECKS \ - where (CARD_NUMBER>=0)&&(CHANNEL>0)&&(CHANNEL<=9)"); - RDSqlQuery *q=new RDSqlQuery(sql); - if(q->first()) { - button->setEnabled(true); - } - delete q; - connect(button,SIGNAL(clicked()),this,SLOT(cartData())); - - // - // Import Button - // - button=new QPushButton(this); - button->setGeometry(10,80,sizeHint().width()-20,50); - button->setFont(button_font); - button->setText(tr("&File")); - button->setDisabled(true); - sql=QString("select CHANNEL from DECKS \ - where (CARD_NUMBER>=0)&&(CHANNEL>128)&&(CHANNEL<=137)"); - q=new RDSqlQuery(sql); - if(q->first()) { - button->setEnabled(true); - } - delete q; - connect(button,SIGNAL(clicked()),this,SLOT(importData())); - - // - // Cancel Button - // - button=new QPushButton(this); - button->setGeometry(10,140,sizeHint().width()-20,50); - button->setFont(button_font); - button->setText(tr("&Cancel")); - button->setDefault(true); - connect(button,SIGNAL(clicked()),this,SLOT(cancelData())); -} - - -ImportTrack::~ImportTrack() -{ -} - - -QSize ImportTrack::sizeHint() const -{ - return QSize(200,200); -} - - -QSizePolicy ImportTrack::sizePolicy() const -{ - return QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed); -} - - -void ImportTrack::closeEvent(QCloseEvent *e) -{ - cancelData(); -} - - -void ImportTrack::cartData() -{ -/* - EditRecording *recording= - new EditRecording(add_id,NULL,add_filter,this,"recording"); - if(recording->exec()<0) { - delete recording; - done(-1); - return; - } - delete recording; - done((int)RDRecording::Recording); -*/ -} - - -void ImportTrack::importData() -{ -/* - EditPlayout *playout= - new EditPlayout(add_id,NULL,add_filter,this,"playout"); - if(playout->exec()<0) { - delete playout; - done(-1); - return; - } - delete playout; - done((int)RDRecording::Playout); -*/ -} - - -void ImportTrack::cancelData() -{ - done(-1); -} - - -void ImportTrack::keyPressEvent(QKeyEvent *e) -{ - switch(e->key()) { - case Qt::Key_Escape: - cancelData(); - break; - - default: - QWidget::keyPressEvent(e); - break; - } -} diff --git a/rdlogedit/import_track.h b/rdlogedit/import_track.h deleted file mode 100644 index ee07d5f4..00000000 --- a/rdlogedit/import_track.h +++ /dev/null @@ -1,63 +0,0 @@ -// import_track.h -// -// Import Audio for a Voice Track -// -// (C) Copyright 2002-2018 Fred Gleason -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2 as -// published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public -// License along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -// - -#ifndef IMPORT_TRACK_H -#define IMPORT_TRACK_H - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -class ImportTrack : public QDialog -{ - Q_OBJECT - public: - ImportTrack(QString *filter,QString *group,QWidget *parent=0); - ~ImportTrack(); - QSize sizeHint() const; - QSizePolicy sizePolicy() const; - - protected: - void closeEvent(QCloseEvent *e); - - private slots: - void cartData(); - void importData(); - void cancelData(); - - protected: - void keyPressEvent(QKeyEvent *e); - - private: - int add_id; - QString *add_filter; - QString *add_group; -}; - - -#endif // IMPORT_TRACK_H diff --git a/rdlogedit/list_reports.cpp b/rdlogedit/list_reports.cpp index df63c1af..b03b665c 100644 --- a/rdlogedit/list_reports.cpp +++ b/rdlogedit/list_reports.cpp @@ -2,7 +2,7 @@ // // List and Generate Log Reports // -// (C) Copyright 2002-2018 Fred Gleason +// (C) Copyright 2002-2019 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,10 +33,8 @@ ListReports::ListReports(const QString &logname,const QString &description, const QString service_name,const QDate &start_date, const QDate &end_date,bool auto_refresh, RDLogEvent *events,QWidget *parent) - : QDialog(parent) + : RDDialog(parent) { - setModal(true); - list_log_name=logname; list_description=description; list_service_name=service_name; @@ -45,23 +43,13 @@ ListReports::ListReports(const QString &logname,const QString &description, list_auto_refresh=auto_refresh; list_events=events; + setWindowTitle("RDLogEdit - "+tr("Reports")); + // // Fix the Window Size // - setMinimumWidth(sizeHint().width()); - setMaximumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); - setMaximumHeight(sizeHint().height()); - - setCaption("RDLogEdit - "+tr("Reports")); - - // - // Create Fonts - // - QFont font=QFont("Helvetica",12,QFont::Bold); - font.setPixelSize(12); - QFont select_font=QFont("Helvetica",12,QFont::Normal); - select_font.setPixelSize(12); + setMinimumSize(sizeHint()); + setMaximumSize(sizeHint()); // // Reports List @@ -73,7 +61,7 @@ ListReports::ListReports(const QString &logname,const QString &description, QLabel *list_reports_label= new QLabel(list_reports_box,tr("Type:"),this); list_reports_label->setGeometry(10,10,35,19); - list_reports_label->setFont(font); + list_reports_label->setFont(labelFont()); list_reports_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // @@ -83,11 +71,11 @@ ListReports::ListReports(const QString &logname,const QString &description, list_date_edit->setGeometry(110,34,100,19); QLabel *list_date_label=new QLabel(list_date_edit,tr("Effective Date:"),this); list_date_label->setGeometry(10,34,95,19); - list_date_label->setFont(font); + list_date_label->setFont(labelFont()); list_date_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); QPushButton *button=new QPushButton(this); button->setGeometry(215,32,60,24); - button->setFont(select_font); + button->setFont(subButtonFont()); button->setText(tr("&Select")); connect(button,SIGNAL(clicked()),this,SLOT(selectDateData())); list_date_edit->setDate(QDate::currentDate()); @@ -98,7 +86,7 @@ ListReports::ListReports(const QString &logname,const QString &description, button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); - button->setFont(font); + button->setFont(buttonFont()); button->setText(tr("&Generate")); connect(button,SIGNAL(clicked()),this,SLOT(generateData())); @@ -107,7 +95,7 @@ ListReports::ListReports(const QString &logname,const QString &description, // button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); - button->setFont(font); + button->setFont(buttonFont()); button->setText(tr("&Close")); connect(button,SIGNAL(clicked()),this,SLOT(closeData())); } diff --git a/rdlogedit/list_reports.h b/rdlogedit/list_reports.h index 3ace32c9..1ec560ec 100644 --- a/rdlogedit/list_reports.h +++ b/rdlogedit/list_reports.h @@ -2,7 +2,7 @@ // // List and Generate Log Reports // -// (C) Copyright 2002-2018 Fred Gleason +// (C) Copyright 2002-2019 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -21,14 +21,14 @@ #ifndef LIST_REPORTS_H #define LIST_REPORTS_H -#include #include + #include +#include #include -#include -class ListReports : public QDialog +class ListReports : public RDDialog { Q_OBJECT public: diff --git a/rdlogedit/rdlogedit.cpp b/rdlogedit/rdlogedit.cpp index 350e8128..9789e454 100644 --- a/rdlogedit/rdlogedit.cpp +++ b/rdlogedit/rdlogedit.cpp @@ -2,7 +2,7 @@ // // The Log Editor Utility for Rivendell. // -// (C) Copyright 2002-2018 Fred Gleason +// (C) Copyright 2002-2019 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -18,38 +18,14 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include -#include -#include - #include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include #include -#include -#include #include -#include #include -#include -#include #include -#include #include #include "edit_log.h" @@ -73,8 +49,8 @@ RDCartDialog *log_cart_dialog; bool import_running=false; -MainWidget::MainWidget(QWidget *parent) - :QWidget(parent) +MainWidget::MainWidget(RDConfig *c,QWidget *parent) + : RDWidget(c,parent) { QString err_msg; @@ -85,8 +61,7 @@ MainWidget::MainWidget(QWidget *parent) // // Fix the Window Size // - setMinimumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); + setMinimumSize(sizeHint()); // // Open the Database @@ -127,15 +102,6 @@ MainWidget::MainWidget(QWidget *parent) rda->ripc() ->connectHost("localhost",RIPCD_TCP_PORT,rda->config()->password()); - // - // Create Fonts - // - QFont default_font("Helvetica",12,QFont::Normal); - default_font.setPixelSize(12); - qApp->setFont(default_font); - QFont button_font=QFont("Helvetica",12,QFont::Bold); - button_font.setPixelSize(12); - // // Create Icons // @@ -159,7 +125,6 @@ MainWidget::MainWidget(QWidget *parent) // Log List // log_log_list=new Q3ListView(this); - log_log_list->setFont(default_font); log_log_list->setAllColumnsShowFocus(true); log_log_list->setSelectionMode(Q3ListView::Extended); log_log_list->setItemMargin(5); @@ -200,7 +165,7 @@ MainWidget::MainWidget(QWidget *parent) // Add Button // log_add_button=new QPushButton(this); - log_add_button->setFont(button_font); + log_add_button->setFont(buttonFont()); log_add_button->setText(tr("&Add")); connect(log_add_button,SIGNAL(clicked()),this,SLOT(addData())); @@ -208,7 +173,7 @@ MainWidget::MainWidget(QWidget *parent) // Edit Button // log_edit_button=new QPushButton(this); - log_edit_button->setFont(button_font); + log_edit_button->setFont(buttonFont()); log_edit_button->setText(tr("&Edit")); connect(log_edit_button,SIGNAL(clicked()),this,SLOT(editData())); @@ -216,7 +181,7 @@ MainWidget::MainWidget(QWidget *parent) // Delete Button // log_delete_button=new QPushButton(this); - log_delete_button->setFont(button_font); + log_delete_button->setFont(buttonFont()); log_delete_button->setText(tr("&Delete")); connect(log_delete_button,SIGNAL(clicked()),this,SLOT(deleteData())); @@ -224,7 +189,7 @@ MainWidget::MainWidget(QWidget *parent) // Tracker Button // log_track_button=new QPushButton(this); - log_track_button->setFont(button_font); + log_track_button->setFont(buttonFont()); log_track_button->setText(tr("Voice\n&Tracker")); connect(log_track_button,SIGNAL(clicked()),this,SLOT(trackData())); @@ -232,7 +197,7 @@ MainWidget::MainWidget(QWidget *parent) // Log Report Button // log_report_button=new QPushButton(this); - log_report_button->setFont(button_font); + log_report_button->setFont(buttonFont()); log_report_button->setText(tr("Log\nReport")); connect(log_report_button,SIGNAL(clicked()),this,SLOT(reportData())); @@ -240,7 +205,7 @@ MainWidget::MainWidget(QWidget *parent) // Close Button // log_close_button=new QPushButton(this); - log_close_button->setFont(button_font); + log_close_button->setFont(buttonFont()); log_close_button->setText(tr("&Close")); connect(log_close_button,SIGNAL(clicked()),this,SLOT(quitMainWidget())); @@ -902,7 +867,9 @@ int main(int argc,char *argv[]) // // Start Event Loop // - MainWidget *w=new MainWidget(); + RDConfig *config=new RDConfig(); + config->load(); + MainWidget *w=new MainWidget(config); a.setMainWidget(w); w->setGeometry(QRect(QPoint(w->geometry().x(),w->geometry().y()), w->sizeHint())); diff --git a/rdlogedit/rdlogedit.h b/rdlogedit/rdlogedit.h index 9f59040e..efb096f9 100644 --- a/rdlogedit/rdlogedit.h +++ b/rdlogedit/rdlogedit.h @@ -2,7 +2,7 @@ // // The Log Editor Utility for Rivendell. // -// (C) Copyright 2002-2018 Fred Gleason +// (C) Copyright 2002-2019 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -21,33 +21,20 @@ #ifndef RDLOGEDIT_H #define RDLOGEDIT_H -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - #include #include #include +#include #include "list_listviewitem.h" #define RDLOGEDIT_USAGE "\n" -class MainWidget : public QWidget +class MainWidget : public RDWidget { Q_OBJECT public: - MainWidget(QWidget *parent=0); + MainWidget(RDConfig *c,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogedit/rdlogedit_cs.ts b/rdlogedit/rdlogedit_cs.ts index c79ca053..c8bc1518 100644 --- a/rdlogedit/rdlogedit_cs.ts +++ b/rdlogedit/rdlogedit_cs.ts @@ -32,39 +32,39 @@ Start at: - Začít na: + Začít na: Action If Previous Event Still Playing - Činnost, když předchozí událost ještě běží + Činnost, když předchozí událost ještě běží Start Immediately - Spustit ihned + Spustit ihned Make Next - Jako další + Jako další Wait up to - Počkat až do + Počkat až do Play - Přehrát + Přehrát Segue - Přechod + Přechod Stop - Zastavit + Zastavit Transition Type: - Typ přechodu: + Typ přechodu: Log Name @@ -80,19 +80,15 @@ &OK - &OK + &OK &Cancel - Z&rušit + Z&rušit Transition If Previous Cart Ends Before - Přechod, když předchozí vozík skončí dříve - - - Transition Type - + Přechod, když předchozí vozík skončí dříve @@ -504,39 +500,39 @@ jež jsou pro vybranou službu zakázány! Start at: - Začít na: + Začít na: Action If Previous Event Still Playing - Činnost, když předchozí událost ještě běží + Činnost, když předchozí událost ještě běží Start Immediately - Spustit ihned + Spustit ihned Make Next - Jako další + Jako další Wait up to - Počkat až do + Počkat až do Play - Přehrát + Přehrát Segue - Přechod + Přechod Stop - Zastavit + Zastavit Transition Type: - Typ přechodu: + Typ přechodu: Cart @@ -558,15 +554,15 @@ vozík &OK - &OK + &OK &Cancel - Z&rušit + Z&rušit Transition If Previous Cart Ends Before - Přechod, když předchozí vozík skončí dříve + Přechod, když předchozí vozík skončí dříve Missing Cart @@ -592,15 +588,11 @@ vybrané služby! Duplicate Start Time - Zdvojený čas začátku + Zdvojený čas začátku An event is already scheduled with this start time! - Již existuje událost s tímto začátečním časem! - - - Transition Type - + Již existuje událost s tímto začátečním časem! @@ -611,35 +603,35 @@ vybrané služby! Start at: - Začít na: + Začít na: Action If Previous Event Still Playing - Činnost, když předchozí událost ještě běží + Činnost, když předchozí událost ještě běží Start Immediately - Spustit ihned + Spustit ihned Make Next - Jako další + Jako další Wait up to - Počkat až do + Počkat až do Play - Přehrát + Přehrát Segue - Přechod + Přechod Stop - Zastavit + Zastavit Comment @@ -651,24 +643,20 @@ vybrané služby! &OK - &OK + &OK &Cancel - Z&rušit + Z&rušit Transition If Previous Cart Ends Before - Přechod, když předchozí vozík skončí dříve + Přechod, když předchozí vozík skončí dříve Transition Type: Typ přechodu: - - Transition Type - - EditTrack @@ -678,35 +666,35 @@ vybrané služby! Start at: - Začít na: + Začít na: Action If Previous Event Still Playing - Činnost, když předchozí událost ještě běží + Činnost, když předchozí událost ještě běží Start Immediately - Spustit ihned + Spustit ihned Make Next - Jako další + Jako další Wait up to - Počkat až do + Počkat až do Play - Přehrát + Přehrát Segue - Přechod + Přechod Stop - Zastavit + Zastavit Comment @@ -714,19 +702,19 @@ vybrané služby! &OK - &OK + &OK &Cancel - Z&rušit + Z&rušit Transition If Previous Cart Ends Before - Přechod, když předchozí vozík skončí dříve + Přechod, když předchozí vozík skončí dříve Transition Type: - Typ přechodu: + Typ přechodu: diff --git a/rdlogedit/rdlogedit_de.ts b/rdlogedit/rdlogedit_de.ts index 82b6265f..97586573 100644 --- a/rdlogedit/rdlogedit_de.ts +++ b/rdlogedit/rdlogedit_de.ts @@ -32,39 +32,39 @@ Start at: - Starte um: + Starte um: Action If Previous Event Still Playing - Aktion wenn vorheriges Event noch läuft + Aktion wenn vorheriges Event noch läuft Start Immediately - Sofort starten + Sofort starten Make Next - Als Nächstes + Als Nächstes Wait up to - Warte bis zu + Warte bis zu Play - Abspielen + Abspielen Segue - Übergang + Übergang Stop - Stop + Stop Transition Type: - Übergangstyp: + Übergangstyp: Log Name @@ -80,19 +80,15 @@ &OK - &OK + &OK &Cancel - Abbre&chen + Abbre&chen Transition If Previous Cart Ends Before - Übergang wenn der vorheriger Cart eher aufhört - - - Transition Type - + Übergang wenn der vorheriger Cart eher aufhört @@ -504,39 +500,39 @@ die für den gewählten Service ungültig sind! Start at: - Starte um: + Starte um: Action If Previous Event Still Playing - Aktion wenn vorheriges Event noch läuft + Aktion wenn vorheriges Event noch läuft Start Immediately - Sofort starten + Sofort starten Make Next - Als Nächstes + Als Nächstes Wait up to - Warte bis zu + Warte bis zu Play - Abspielen + Abspielen Segue - Übergang + Übergang Stop - Stop + Stop Transition Type: - Übergangstyp: + Übergangstyp: Cart @@ -558,15 +554,15 @@ auswählen &OK - &OK + &OK &Cancel - Abbre&chen + Abbre&chen Transition If Previous Cart Ends Before - Übergang wenn der vorheriger Cart eher aufhört + Übergang wenn der vorheriger Cart eher aufhört Missing Cart @@ -592,15 +588,11 @@ Gruppe des ausgewählten Service! Duplicate Start Time - Doppelte Startzeit + Doppelte Startzeit An event is already scheduled with this start time! - Es existiert bereits ein Event mit dieser Startzeit! - - - Transition Type - + Es existiert bereits ein Event mit dieser Startzeit! @@ -611,35 +603,35 @@ Gruppe des ausgewählten Service! Start at: - Starte um: + Starte um: Action If Previous Event Still Playing - Aktion wenn vorheriges Event noch läuft + Aktion wenn vorheriges Event noch läuft Start Immediately - Sofort starten + Sofort starten Make Next - Als Nächstes + Als Nächstes Wait up to - Warte bis zu + Warte bis zu Play - Abspielen + Abspielen Segue - Übergang + Übergang Stop - Stop + Stop Comment @@ -651,24 +643,20 @@ Gruppe des ausgewählten Service! &OK - &OK + &OK &Cancel - Abbre&chen + Abbre&chen Transition If Previous Cart Ends Before - Übergang wenn der vorheriger Cart eher aufhört + Übergang wenn der vorheriger Cart eher aufhört Transition Type: Übergangstyp: - - Transition Type - - EditTrack @@ -678,35 +666,35 @@ Gruppe des ausgewählten Service! Start at: - Starte um: + Starte um: Action If Previous Event Still Playing - Aktion wenn vorheriges Event noch läuft + Aktion wenn vorheriges Event noch läuft Start Immediately - Sofort starten + Sofort starten Make Next - Als Nächstes + Als Nächstes Wait up to - Warte bis zu + Warte bis zu Play - Abspielen + Abspielen Segue - Übergang + Übergang Stop - Stop + Stop Comment @@ -714,19 +702,19 @@ Gruppe des ausgewählten Service! &OK - &OK + &OK &Cancel - Abbre&chen + Abbre&chen Transition If Previous Cart Ends Before - Übergang wenn der vorheriger Cart eher aufhört + Übergang wenn der vorheriger Cart eher aufhört Transition Type: - Übergangstyp: + Übergangstyp: diff --git a/rdlogedit/rdlogedit_es.ts b/rdlogedit/rdlogedit_es.ts index 1605d369..e0443638 100644 --- a/rdlogedit/rdlogedit_es.ts +++ b/rdlogedit/rdlogedit_es.ts @@ -32,39 +32,39 @@ Start at: - Inicia en: + Inicia en: Action If Previous Event Still Playing - Acción si el evento previo no ha terminado + Acción si el evento previo no ha terminado Start Immediately - Iniciar de inmediato + Iniciar de inmediato Make Next - Convertir en el siguente + Convertir en el siguente Wait up to - Espe. hasta + Espe. hasta Play - Reproducir + Reproducir Segue - Segue + Segue Stop - Parar + Parar Transition Type: - Tipo de transición: + Tipo de transición: Log Name @@ -80,19 +80,15 @@ &OK - &Aceptar + &Aceptar &Cancel - &Cancelar + &Cancelar Transition If Previous Cart Ends Before - Transic. si cart. previo termina antes de - - - Transition Type - + Transic. si cart. previo termina antes de @@ -504,39 +500,39 @@ desactivados para el servicio actual! Start at: - Inicia en: + Inicia en: Action If Previous Event Still Playing - Acción si el evento previo no ha terminado + Acción si el evento previo no ha terminado Start Immediately - Iniciar de inmediato + Iniciar de inmediato Make Next - Convertir en el siguente + Convertir en el siguente Wait up to - Esp. hasta + Esp. hasta Play - Reproducir + Reproducir Segue - Segue + Segue Stop - Parar + Parar Transition Type: - Tipo de transición: + Tipo de transición: Cart @@ -558,15 +554,15 @@ cartucho &OK - &Aceptar + &Aceptar &Cancel - &Cancelar + &Cancelar Transition If Previous Cart Ends Before - Transic. si cart. previo termina antes de + Transic. si cart. previo termina antes de Missing Cart @@ -592,15 +588,11 @@ desactivado para el servicio especificado! Duplicate Start Time - Tiempo de inicio duplicado + Tiempo de inicio duplicado An event is already scheduled with this start time! - ¡Se programó un evento para esta misma hora de inicio! - - - Transition Type - + ¡Se programó un evento para esta misma hora de inicio! @@ -611,35 +603,35 @@ desactivado para el servicio especificado! Start at: - Inicia en: + Inicia en: Action If Previous Event Still Playing - Acción si el evento previo no ha terminado + Acción si el evento previo no ha terminado Start Immediately - Iniciar de inmediato + Iniciar de inmediato Make Next - Convertir en el siguente + Convertir en el siguente Wait up to - Esp. hasta + Esp. hasta Play - Reproducir + Reproducir Segue - Segue + Segue Stop - Parar + Parar Comment @@ -651,24 +643,20 @@ desactivado para el servicio especificado! &OK - &Aceptar + &Aceptar &Cancel - &Cancelar + &Cancelar Transition If Previous Cart Ends Before - Transic. si cart. previo termina antes de + Transic. si cart. previo termina antes de Transition Type: Tipo de transición: - - Transition Type - - EditTrack @@ -678,35 +666,35 @@ desactivado para el servicio especificado! Start at: - Inicia en: + Inicia en: Action If Previous Event Still Playing - Acción si el evento previo no ha terminado + Acción si el evento previo no ha terminado Start Immediately - Iniciar de inmediato + Iniciar de inmediato Make Next - Convertir en el siguente + Convertir en el siguente Wait up to - Esp. hasta + Esp. hasta Play - Reproducir + Reproducir Segue - Segue + Segue Stop - Parar + Parar Comment @@ -714,19 +702,19 @@ desactivado para el servicio especificado! &OK - &Aceptar + &Aceptar &Cancel - &Cancelar + &Cancelar Transition If Previous Cart Ends Before - Transic. si cart. previo termina antes de + Transic. si cart. previo termina antes de Transition Type: - Tipo de transición: + Tipo de transición: diff --git a/rdlogedit/rdlogedit_fr.ts b/rdlogedit/rdlogedit_fr.ts index e25609a6..b94c5c96 100644 --- a/rdlogedit/rdlogedit_fr.ts +++ b/rdlogedit/rdlogedit_fr.ts @@ -30,42 +30,6 @@ Edit Log Chain - - Start at: - - - - Action If Previous Event Still Playing - - - - Start Immediately - - - - Make Next - - - - Wait up to - - - - Play - - - - Segue - - - - Stop - - - - Transition Type: - - Log Name @@ -78,22 +42,6 @@ Log Description - - &OK - - - - &Cancel - - - - Transition If Previous Cart Ends Before - - - - Transition Type - - EditLog @@ -424,42 +372,6 @@ for the selected service! Edit Log Entry - - Start at: - - - - Action If Previous Event Still Playing - - - - Start Immediately - - - - Make Next - - - - Wait up to - - - - Play - - - - Segue - - - - Stop - - - - Transition Type: - - Cart @@ -477,18 +389,6 @@ for the selected service! Cart - - &OK - - - - &Cancel - - - - Transition If Previous Cart Ends Before - - Missing Cart @@ -510,18 +410,6 @@ group for the specified service! No Fade on Segue Out - - Duplicate Start Time - - - - An event is already scheduled with this start time! - - - - Transition Type - - EditMarker @@ -529,38 +417,6 @@ group for the specified service! Edit Log Marker - - Start at: - - - - Action If Previous Event Still Playing - - - - Start Immediately - - - - Make Next - - - - Wait up to - - - - Play - - - - Segue - - - - Stop - - Comment @@ -569,22 +425,6 @@ group for the specified service! Label - - &OK - - - - &Cancel - - - - Transition If Previous Cart Ends Before - - - - Transition Type - - EditTrack @@ -592,58 +432,10 @@ group for the specified service! Edit Voice Track Marker - - Start at: - - - - Action If Previous Event Still Playing - - - - Start Immediately - - - - Make Next - - - - Wait up to - - - - Play - - - - Segue - - - - Stop - - Comment - - &OK - - - - &Cancel - - - - Transition If Previous Cart Ends Before - - - - Transition Type: - - ListReports diff --git a/rdlogedit/rdlogedit_nb.ts b/rdlogedit/rdlogedit_nb.ts index ad78a025..65bfa365 100644 --- a/rdlogedit/rdlogedit_nb.ts +++ b/rdlogedit/rdlogedit_nb.ts @@ -32,35 +32,35 @@ Start at: - Start på: + Start på: Action If Previous Event Still Playing - Handling viss den førre hendinga spelar enno + Handling viss den førre hendinga spelar enno Start Immediately - Start med ein gong + Start med ein gong Make Next - Gjer til neste + Gjer til neste Wait up to - Vent opp til + Vent opp til Play - Spel + Spel Segue - Krysston + Krysston Stop - Stopp + Stopp Overlap @@ -68,7 +68,7 @@ Transition Type: - Overgangstype: + Overgangstype: Log Name @@ -84,19 +84,15 @@ &OK - &OK + &OK &Cancel - &Avbryt + &Avbryt Transition If Previous Cart Ends Before - Overgang viss førre korg endar før - - - Transition Type - + Overgang viss førre korg endar før @@ -511,35 +507,35 @@ skrudd av for denne tenesta! Start at: - Start på: + Start på: Action If Previous Event Still Playing - Handling viss den førre hendinga spelar enno + Handling viss den førre hendinga spelar enno Start Immediately - Start med ein gong + Start med ein gong Make Next - Gjer til neste + Gjer til neste Wait up to - Vent opp til + Vent opp til Play - Spel + Spel Segue - Krysston + Krysston Stop - Stopp + Stopp Overlap @@ -547,7 +543,7 @@ skrudd av for denne tenesta! Transition Type: - Overgangstype: + Overgangstype: No Fade When Segueing At End @@ -572,15 +568,15 @@ Cart &OK - &OK + &OK &Cancel - &Avbryt + &Avbryt Transition If Previous Cart Ends Before - Overgang viss førre korg endar før + Overgang viss førre korg endar før Missing Cart @@ -604,18 +600,6 @@ som er skrudd av for denne tenesta! No Fade on Segue Out - - Duplicate Start Time - - - - An event is already scheduled with this start time! - - - - Transition Type - - EditMarker @@ -625,35 +609,35 @@ som er skrudd av for denne tenesta! Start at: - Start på: + Start på: Action If Previous Event Still Playing - Handling viss den førre hendinga spelar enno + Handling viss den førre hendinga spelar enno Start Immediately - Start med ein gong + Start med ein gong Make Next - Gjer til neste + Gjer til neste Wait up to - Vent opp til + Vent opp til Play - Spel + Spel Segue - Krysston + Krysston Stop - Stopp + Stopp Overlap @@ -669,24 +653,20 @@ som er skrudd av for denne tenesta! &OK - &OK + &OK &Cancel - &Avbryt + &Avbryt Transition If Previous Cart Ends Before - Overgang viss førre korg endar før + Overgang viss førre korg endar før Transition Type: Overgangstype: - - Transition Type - - EditTrack @@ -696,35 +676,35 @@ som er skrudd av for denne tenesta! Start at: - Start på: + Start på: Action If Previous Event Still Playing - Handling viss den førre hendinga spelar enno + Handling viss den førre hendinga spelar enno Start Immediately - Start med ein gong + Start med ein gong Make Next - Gjer til neste + Gjer til neste Wait up to - Vent opp til + Vent opp til Play - Spel + Spel Segue - Krysston + Krysston Stop - Stopp + Stopp Overlap @@ -736,19 +716,19 @@ som er skrudd av for denne tenesta! &OK - &OK + &OK &Cancel - &Avbryt + &Avbryt Transition If Previous Cart Ends Before - Overgang viss førre korg endar før + Overgang viss førre korg endar før Transition Type: - Overgangstype: + Overgangstype: diff --git a/rdlogedit/rdlogedit_nn.ts b/rdlogedit/rdlogedit_nn.ts index ad78a025..65bfa365 100644 --- a/rdlogedit/rdlogedit_nn.ts +++ b/rdlogedit/rdlogedit_nn.ts @@ -32,35 +32,35 @@ Start at: - Start på: + Start på: Action If Previous Event Still Playing - Handling viss den førre hendinga spelar enno + Handling viss den førre hendinga spelar enno Start Immediately - Start med ein gong + Start med ein gong Make Next - Gjer til neste + Gjer til neste Wait up to - Vent opp til + Vent opp til Play - Spel + Spel Segue - Krysston + Krysston Stop - Stopp + Stopp Overlap @@ -68,7 +68,7 @@ Transition Type: - Overgangstype: + Overgangstype: Log Name @@ -84,19 +84,15 @@ &OK - &OK + &OK &Cancel - &Avbryt + &Avbryt Transition If Previous Cart Ends Before - Overgang viss førre korg endar før - - - Transition Type - + Overgang viss førre korg endar før @@ -511,35 +507,35 @@ skrudd av for denne tenesta! Start at: - Start på: + Start på: Action If Previous Event Still Playing - Handling viss den førre hendinga spelar enno + Handling viss den førre hendinga spelar enno Start Immediately - Start med ein gong + Start med ein gong Make Next - Gjer til neste + Gjer til neste Wait up to - Vent opp til + Vent opp til Play - Spel + Spel Segue - Krysston + Krysston Stop - Stopp + Stopp Overlap @@ -547,7 +543,7 @@ skrudd av for denne tenesta! Transition Type: - Overgangstype: + Overgangstype: No Fade When Segueing At End @@ -572,15 +568,15 @@ Cart &OK - &OK + &OK &Cancel - &Avbryt + &Avbryt Transition If Previous Cart Ends Before - Overgang viss førre korg endar før + Overgang viss førre korg endar før Missing Cart @@ -604,18 +600,6 @@ som er skrudd av for denne tenesta! No Fade on Segue Out - - Duplicate Start Time - - - - An event is already scheduled with this start time! - - - - Transition Type - - EditMarker @@ -625,35 +609,35 @@ som er skrudd av for denne tenesta! Start at: - Start på: + Start på: Action If Previous Event Still Playing - Handling viss den førre hendinga spelar enno + Handling viss den førre hendinga spelar enno Start Immediately - Start med ein gong + Start med ein gong Make Next - Gjer til neste + Gjer til neste Wait up to - Vent opp til + Vent opp til Play - Spel + Spel Segue - Krysston + Krysston Stop - Stopp + Stopp Overlap @@ -669,24 +653,20 @@ som er skrudd av for denne tenesta! &OK - &OK + &OK &Cancel - &Avbryt + &Avbryt Transition If Previous Cart Ends Before - Overgang viss førre korg endar før + Overgang viss førre korg endar før Transition Type: Overgangstype: - - Transition Type - - EditTrack @@ -696,35 +676,35 @@ som er skrudd av for denne tenesta! Start at: - Start på: + Start på: Action If Previous Event Still Playing - Handling viss den førre hendinga spelar enno + Handling viss den førre hendinga spelar enno Start Immediately - Start med ein gong + Start med ein gong Make Next - Gjer til neste + Gjer til neste Wait up to - Vent opp til + Vent opp til Play - Spel + Spel Segue - Krysston + Krysston Stop - Stopp + Stopp Overlap @@ -736,19 +716,19 @@ som er skrudd av for denne tenesta! &OK - &OK + &OK &Cancel - &Avbryt + &Avbryt Transition If Previous Cart Ends Before - Overgang viss førre korg endar før + Overgang viss førre korg endar før Transition Type: - Overgangstype: + Overgangstype: diff --git a/rdlogedit/rdlogedit_pt_BR.ts b/rdlogedit/rdlogedit_pt_BR.ts index c65260a9..6d37fbd3 100644 --- a/rdlogedit/rdlogedit_pt_BR.ts +++ b/rdlogedit/rdlogedit_pt_BR.ts @@ -32,40 +32,40 @@ Start at: - Inicie às: + Inicie às: Action If Previous Event Still Playing - + Ação se Evento anterior estiver sendo executado Start Immediately - Iniciar Imediatamente + Iniciar Imediatamente Make Next - Ser Próxima + Ser Próxima Wait up to - Esperar até + Esperar até Play - Simples + Simples Segue - Sobre + Sobre Stop - Pare + Pare Transition Type: - Tipo de Transição: + Tipo de Transição: Log Name @@ -81,19 +81,15 @@ Ação se Evento anterior estiver sendo executado &OK - &OK + &OK &Cancel - &Cancelar + &Cancelar Transition If Previous Cart Ends Before - Transição de Cartão anterior terminar antes - - - Transition Type - + Transição de Cartão anterior terminar antes @@ -506,39 +502,39 @@ para o serviço selecionado! Start at: - Inicie às: + Inicie às: Action If Previous Event Still Playing - Ação se Evento anterior estiver sendo executado + Ação se Evento anterior estiver sendo executado Start Immediately - Iniciar Imediatamente + Iniciar Imediatamente Make Next - Ser Próxima + Ser Próxima Wait up to - Esperar até + Esperar até Play - Simples + Simples Segue - Sobre + Sobre Stop - Pare + Pare Transition Type: - Tipo de Transição: + Tipo de Transição: No Fade on Segue Out @@ -563,15 +559,15 @@ Cart &OK - &OK + &OK &Cancel - &Cancelar + &Cancelar Transition If Previous Cart Ends Before - Transição de Cartão anterior terminar antes + Transição de Cartão anterior terminar antes Missing Cart @@ -593,15 +589,11 @@ para o Serviço especificado! Duplicate Start Time - Duplicar Hora de Início + Duplicar Hora de Início An event is already scheduled with this start time! - Um evento já foi agendado para esta hora! - - - Transition Type - + Um evento já foi agendado para esta hora! @@ -612,35 +604,35 @@ para o Serviço especificado! Start at: - Inicie às: + Inicie às: Action If Previous Event Still Playing - Ação se Evento anterior estiver sendo executado + Ação se Evento anterior estiver sendo executado Start Immediately - Iniciar Imediatamente + Iniciar Imediatamente Make Next - Ser Próxima + Ser Próxima Wait up to - Esperar até + Esperar até Play - Simples + Simples Segue - Sobre + Sobre Stop - Pare + Pare Comment @@ -652,24 +644,20 @@ para o Serviço especificado! &OK - &OK + &OK &Cancel - &Cancelar + &Cancelar Transition If Previous Cart Ends Before - Transição se Cartão anterior terminar antes + Transição se Cartão anterior terminar antes Transition Type: Tipo de Transição: - - Transition Type - - EditTrack @@ -679,36 +667,36 @@ para o Serviço especificado! Start at: - Inicie às: + Inicie às: Action If Previous Event Still Playing - + Ação se Evento anterior estiver sendo executado Start Immediately - Iniciar Imediatamente + Iniciar Imediatamente Make Next - Ser Próxima + Ser Próxima Wait up to - Esperar até + Esperar até Play - Simples + Simples Segue - Sobre + Sobre Stop - Pare + Pare Comment @@ -716,19 +704,19 @@ Ação se Evento anterior estiver sendo executado &OK - &OK + &OK &Cancel - &Cancelar + &Cancelar Transition If Previous Cart Ends Before - Transição de Cartão anterior terminar antes + Transição de Cartão anterior terminar antes Transition Type: - Tipo de Transição: + Tipo de Transição: diff --git a/rdlogedit/voice_tracker.cpp b/rdlogedit/voice_tracker.cpp index b79ad775..ed2c5aec 100644 --- a/rdlogedit/voice_tracker.cpp +++ b/rdlogedit/voice_tracker.cpp @@ -21,27 +21,16 @@ #include #include -#include -#include -#include #include -#include -#include -#include #include -#include -#include -#include #include #include #include #include -#include #include "edit_track.h" #include "globals.h" -#include "import_track.h" #include "voice_tracker.h" // @@ -59,10 +48,9 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, QWidget *parent) - : QDialog(parent) + : RDDialog(parent) { setAttribute(Qt::WA_PaintOutsidePaintEvent); - setModal(true); edit_log_name=logname; edit_import_path=import_path; @@ -94,6 +82,8 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, menu_clicked_point=-1; edit_shift_pressed=false; + setWindowTitle("RDLogEdit - "+tr("Voice Tracker")); + // // Fix the Window Size // @@ -102,20 +92,6 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, setMaximumWidth(sizeHint().width()); setMaximumHeight(sizeHint().height()); - setWindowTitle("RDLogEdit - "+tr("Voice Tracker")); - - // - // Create Fonts - // - QFont font=QFont("Helvetica",12,QFont::Bold); - font.setPixelSize(12); - QFont label_font=QFont("Hevetica",12,QFont::Normal); - label_font.setPixelSize(12); - QFont small_font=QFont("Helvetica",10,QFont::Bold); - small_font.setPixelSize(10); - QFont timer_font=QFont("Helvetica",20,QFont::Bold); - timer_font.setPixelSize(20); - // // Create Icons // @@ -283,7 +259,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, track_track1_button=new QPushButton(this); track_track1_button->setGeometry(sizeHint().width()-90,15,70,70); track_track1_button->setPalette(track_start_palette); - track_track1_button->setFont(font); + track_track1_button->setFont(buttonFont()); track_track1_button->setText(tr("Start")); connect(track_track1_button,SIGNAL(clicked()),this,SLOT(track1Data())); @@ -293,7 +269,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, track_record_button=new QPushButton(this); track_record_button->setGeometry(sizeHint().width()-90,95,70,70); track_record_button->setPalette(track_record_palette); - track_record_button->setFont(font); + track_record_button->setFont(buttonFont()); track_record_button->setText(tr("Record")); connect(track_record_button,SIGNAL(clicked()),this,SLOT(recordData())); @@ -303,7 +279,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, track_track2_button=new QPushButton(this); track_track2_button->setGeometry(sizeHint().width()-90,175,70,70); track_track2_button->setPalette(track_start_palette); - track_track2_button->setFont(font); + track_track2_button->setFont(buttonFont()); track_track2_button->setText(tr("Start")); connect(track_track2_button,SIGNAL(clicked()),this,SLOT(track2Data())); if(!rda->logeditConf()->enableSecondStart()) { @@ -321,7 +297,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, track_finished_button->setGeometry(sizeHint().width()-90,175,70,70); } track_finished_button->setPalette(track_done_palette); - track_finished_button->setFont(font); + track_finished_button->setFont(buttonFont()); track_finished_button->setText(tr("Save")); connect(track_finished_button,SIGNAL(clicked()),this,SLOT(finishedData())); @@ -331,7 +307,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, track_previous_button=new QPushButton(this); track_previous_button-> setGeometry(sizeHint().width()-290,sizeHint().height()-60,80,50); - track_previous_button->setFont(font); + track_previous_button->setFont(buttonFont()); track_previous_button->setText(tr("&Previous\nTrack")); connect(track_previous_button,SIGNAL(clicked()),this,SLOT(previousData())); @@ -341,7 +317,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, track_next_button=new QPushButton(this); track_next_button-> setGeometry(sizeHint().width()-200,sizeHint().height()-60,80,50); - track_next_button->setFont(font); + track_next_button->setFont(buttonFont()); track_next_button->setText(tr("&Next\nTrack")); connect(track_next_button,SIGNAL(clicked()),this,SLOT(nextData())); @@ -381,24 +357,24 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, edit_length_label->setText("-:--:--.-"); edit_length_label->setGeometry(565,255,110,25); edit_length_label->setAlignment(Qt::AlignCenter); - edit_length_label->setFont(timer_font); + edit_length_label->setFont(timerFont()); // // Tracks Remaining Readout // QLabel *label=new QLabel(tr("Remaining"),this); label->setGeometry(555,288,116,14); - label->setFont(small_font); + label->setFont(subLabelFont()); label->setAlignment(Qt::AlignHCenter); label->setPalette(QPalette(backgroundColor(),colorGroup().mid())); edit_tracks_remaining_label=new QLabel(this); edit_tracks_remaining_label->setText("0"); edit_tracks_remaining_label->setGeometry(565,313,40,18); edit_tracks_remaining_label->setAlignment(Qt::AlignCenter); - edit_tracks_remaining_label->setFont(label_font); + edit_tracks_remaining_label->setFont(labelFont()); label=new QLabel(tr("Tracks"),this); label->setGeometry(565,300,40,14); - label->setFont(small_font); + label->setFont(subLabelFont()); label->setAlignment(Qt::AlignHCenter); label->setPalette(QPalette(backgroundColor(),colorGroup().mid())); @@ -406,7 +382,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, edit_time_remaining_label->setText("0:00:00.0"); edit_time_remaining_label->setGeometry(615,313,60,18); edit_time_remaining_label->setAlignment(Qt::AlignCenter); - edit_time_remaining_label->setFont(label_font); + edit_time_remaining_label->setFont(labelFont()); edit_time_remaining_palette[0]=edit_time_remaining_label->palette(); edit_time_remaining_palette[1]=edit_time_remaining_label->palette(); edit_time_remaining_palette[1]. @@ -415,7 +391,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, setColor(QPalette::Inactive,QColorGroup::Foreground,Qt::red); label=new QLabel(tr("Time"),this); label->setGeometry(615,300,60,14); - label->setFont(small_font); + label->setFont(subLabelFont()); label->setAlignment(Qt::AlignHCenter); label->setPalette(QPalette(backgroundColor(),colorGroup().mid())); @@ -461,7 +437,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, track_reset_button=new QPushButton(this); track_reset_button-> setGeometry(sizeHint().width()-90,sizeHint().height()-160,70,70); - track_reset_button->setFont(font); + track_reset_button->setFont(buttonFont()); track_reset_button->setText(tr("Do Over")); connect(track_reset_button,SIGNAL(clicked()),this,SLOT(resetData())); @@ -470,7 +446,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, // track_post_button=new QPushButton(this); track_post_button->setGeometry(sizeHint().width()-90,360,70,70); - track_post_button->setFont(font); + track_post_button->setFont(buttonFont()); track_post_button->setText(tr("Hit Post")); connect(track_post_button,SIGNAL(clicked()),this,SLOT(postData())); @@ -479,7 +455,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, // track_insert_button=new QPushButton(this); track_insert_button->setGeometry(20,sizeHint().height()-60,80,50); - track_insert_button->setFont(font); + track_insert_button->setFont(buttonFont()); track_insert_button->setText(tr("Insert\nTrack")); connect(track_insert_button,SIGNAL(clicked()),this,SLOT(insertData())); @@ -488,7 +464,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, // track_delete_button=new QPushButton(this); track_delete_button->setGeometry(110,sizeHint().height()-60,80,50); - track_delete_button->setFont(font); + track_delete_button->setFont(buttonFont()); track_delete_button->setText(tr("Delete\nTrack")); connect(track_delete_button,SIGNAL(clicked()),this,SLOT(deleteData())); @@ -498,7 +474,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, track_close_button=new QPushButton(this); track_close_button-> setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); - track_close_button->setFont(font); + track_close_button->setFont(buttonFont()); track_close_button->setText(tr("&Close")); connect(track_close_button,SIGNAL(clicked()),this,SLOT(closeData())); @@ -3077,7 +3053,7 @@ void VoiceTracker::DrawTrackMap(int trackno) } else { wpg[0]->begin(edit_wave_map[0]); - wpg[0]->setFont(QFont("Helvetica",12,QFont::Bold)); + wpg[0]->setFont(labelFont()); wpg[0]->setPen(TRACKER_TEXT_COLOR); wpg[0]->setBackgroundColor(backgroundColor()); wpg[0]->eraseRect(0,0,edit_wave_map[0]->size().width(), @@ -3159,7 +3135,7 @@ void VoiceTracker::DrawTrackMap(int trackno) p=new QPainter(edit_wave_map[1]); if(track_loaded) { p->setBackgroundColor(backgroundColor()); - p->setFont(QFont("Helvetica",12,QFont::Bold)); + p->setFont(labelFont()); p->setPen(TRACKER_TEXT_COLOR); p->eraseRect(0,0,edit_wave_map[1]->size().width(), edit_wave_map[1]->size().height()); @@ -3171,7 +3147,7 @@ void VoiceTracker::DrawTrackMap(int trackno) edit_wave_map[1]->size().height()); } if(track_start_time>QTime(0,0,0)) { - p->setFont(QFont("Helvetica",12,QFont::Bold)); + p->setFont(labelFont()); p->setPen(TRACKER_TEXT_COLOR); p->drawText(550,75,tr("Start")+" "+ track_start_time.toString("h:mm:ss")); @@ -3200,7 +3176,7 @@ void VoiceTracker::DrawTrackMap(int trackno) TRACKER_Y_HEIGHT/4, track_recording_pos/TRACKER_MSECS_PER_PIXEL, TRACKER_Y_HEIGHT/2,TRACKER_RECORD_COLOR); - p->setFont(QFont("Helvetica",12,QFont::Bold)); + p->setFont(labelFont()); if(track_start_time>QTime(0,0,0)) { p->setPen(TRACKER_TEXT_COLOR); track_time=track_start_time; @@ -3214,7 +3190,7 @@ void VoiceTracker::DrawTrackMap(int trackno) default: wpg[1]->begin(edit_wave_map[1]); - wpg[1]->setFont(QFont("Helvetica",12,QFont::Bold)); + wpg[1]->setFont(labelFont()); wpg[1]->setPen(TRACKER_TEXT_COLOR); wpg[1]->setBackgroundColor(back_color); wpg[1]->eraseRect(0,0,edit_wave_map[1]->size().width(), @@ -3325,7 +3301,7 @@ void VoiceTracker::DrawTrackMap(int trackno) back_color=Qt::lightGray; } wpg[2]->begin(edit_wave_map[2]); - wpg[2]->setFont(QFont("Helvetica",12,QFont::Bold)); + wpg[2]->setFont(labelFont()); wpg[2]->setBackgroundColor(back_color); wpg[2]->eraseRect(0,0,edit_wave_map[2]->size().width(), edit_wave_map[2]->size().height()); diff --git a/rdlogedit/voice_tracker.h b/rdlogedit/voice_tracker.h index 0265c44d..4749b437 100644 --- a/rdlogedit/voice_tracker.h +++ b/rdlogedit/voice_tracker.h @@ -2,7 +2,7 @@ // // A Rivendell Voice Tracker // -// (C) Copyright 2002-2018 Fred Gleason +// (C) Copyright 2002-2019 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -21,29 +21,12 @@ #ifndef VOICE_TRACKER_H #define VOICE_TRACKER_H -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include +#include #include #include #include -#include #include -#include #include -#include #include #include #include @@ -75,7 +58,7 @@ #define TRACKER_SCROLL_SCALE 2 #define TRACKER_FORCED_SEGUE 1000 -class VoiceTracker : public QDialog +class VoiceTracker : public RDDialog { Q_OBJECT public: