From d0b3fe29cdcea643e8155037a5f0eb1530f97ea5 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 11 Aug 2021 16:30:18 -0400 Subject: [PATCH] 2021-08-11 Fred Gleason * Adjusted layout in the event dialogs in rdcatch(1) to be compatible with 12 hour time format. Signed-off-by: Fred Gleason --- ChangeLog | 3 ++ rdcatch/edit_cartevent.cpp | 14 +++---- rdcatch/edit_download.cpp | 14 +++---- rdcatch/edit_recording.cpp | 81 ++++++++++++++++++-------------------- rdcatch/edit_recording.h | 14 +++---- rdcatch/edit_upload.cpp | 14 +++---- rdcatch/edit_upload.h | 9 ----- rdcatch/eventwidget.cpp | 9 ++--- rdcatch/eventwidget.h | 4 +- 9 files changed, 75 insertions(+), 87 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3086ac94..d97c8156 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22221,3 +22221,6 @@ 2021-08-11 Fred Gleason * Adjusted layout in the 'Log Render Options' dialog in rdcastmanager(1) to be compatible with 12 hour time format. +2021-08-11 Fred Gleason + * Adjusted layout in the event dialogs in rdcatch(1) to be + compatible with 12 hour time format. diff --git a/rdcatch/edit_cartevent.cpp b/rdcatch/edit_cartevent.cpp index a925c6eb..11019dd7 100644 --- a/rdcatch/edit_cartevent.cpp +++ b/rdcatch/edit_cartevent.cpp @@ -38,12 +38,6 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds,QWidget *parent) setWindowTitle("RDCatch - "+tr("Edit Cart Event")); - // - // Fix the Window Size - // - setMinimumSize(sizeHint()); - setMaximumSize(sizeHint()); - // // Text Validator // @@ -128,6 +122,12 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds,QWidget *parent) edit_cancel_button->setText(tr("Cancel")); connect(edit_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); + // + // Fix the Window Size + // + setMinimumSize(sizeHint()); + setMaximumSize(sizeHint()); + // // Populate Data // @@ -154,7 +154,7 @@ EditCartEvent::~EditCartEvent() QSize EditCartEvent::sizeHint() const { - return QSize(520,255); + return QSize(edit_event_widget->sizeHint().width(),255); } diff --git a/rdcatch/edit_download.cpp b/rdcatch/edit_download.cpp index 2eb35624..3a188415 100644 --- a/rdcatch/edit_download.cpp +++ b/rdcatch/edit_download.cpp @@ -41,12 +41,6 @@ EditDownload::EditDownload(int record_id,std::vector *adds,QString *filter, setWindowTitle("RDCatch - "+tr("Edit Download")); - // - // Fix the Window Size - // - setMinimumSize(sizeHint()); - setMaximumSize(sizeHint()); - // // Text Validator // @@ -230,6 +224,12 @@ EditDownload::EditDownload(int record_id,std::vector *adds,QString *filter, edit_cancel_button->setText(tr("Cancel")); connect(edit_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); + // + // Fix the Window Size + // + setMinimumSize(sizeHint()); + setMaximumSize(sizeHint()); + // // Populate Data // @@ -277,7 +277,7 @@ EditDownload::~EditDownload() QSize EditDownload::sizeHint() const { - return QSize(520,432); + return QSize(edit_event_widget->sizeHint().width(),432); } diff --git a/rdcatch/edit_recording.cpp b/rdcatch/edit_recording.cpp index af58289e..43e85368 100644 --- a/rdcatch/edit_recording.cpp +++ b/rdcatch/edit_recording.cpp @@ -85,8 +85,7 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, addButton(edit_start_hardtime_radio,RDRecording::HardStart); edit_start_hardtime_radio->setFont(subLabelFont()); - edit_starttime_edit=new QTimeEdit(this); - edit_starttime_edit->setDisplayFormat("hh:mm:ss"); + edit_starttime_edit=new RDTimeEdit(this); edit_starttime_label=new QLabel(tr("Record Start Time:"),this); edit_starttime_label->setFont(subLabelFont()); edit_starttime_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); @@ -94,15 +93,13 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, edit_start_gpi_radio=new QRadioButton(tr("Use GPI"),this); edit_start_gpi_radio->setFont(subLabelFont()); - edit_start_startwindow_edit=new QTimeEdit(this); - edit_start_startwindow_edit->setDisplayFormat("hh:mm:ss"); + edit_start_startwindow_edit=new RDTimeEdit(this); edit_start_startwindow_label=new QLabel(tr("Window Start Time:"),this); edit_start_startwindow_label->setFont(subLabelFont()); edit_start_startwindow_label-> setAlignment(Qt::AlignRight|Qt::AlignVCenter); - edit_start_endwindow_edit=new QTimeEdit(this); - edit_start_endwindow_edit->setDisplayFormat("hh:mm:ss"); + edit_start_endwindow_edit=new RDTimeEdit(this); edit_start_endwindow_label=new QLabel(tr("Window End Time:"),this); edit_start_endwindow_label->setFont(subLabelFont()); edit_start_endwindow_label-> @@ -154,23 +151,20 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, edit_end_hardtime_radio=new QRadioButton(tr("Use Hard Time"),this); edit_endtype_group->addButton(edit_end_hardtime_radio,RDRecording::HardEnd); edit_end_hardtime_radio->setFont(subLabelFont()); - edit_endtime_edit=new QTimeEdit(this); - edit_endtime_edit->setDisplayFormat("hh:mm:ss"); + edit_endtime_edit=new RDTimeEdit(this); edit_endtime_label=new QLabel(tr("Record End Time:"),this); edit_endtime_label->setFont(subLabelFont()); edit_endtime_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); edit_end_gpi_radio=new QRadioButton(tr("Use GPI"),this); edit_end_gpi_radio->setFont(subLabelFont()); - edit_end_startwindow_edit=new QTimeEdit(this); - edit_end_startwindow_edit->setDisplayFormat("hh:mm:ss"); + edit_end_startwindow_edit=new RDTimeEdit(this); edit_end_startwindow_label=new QLabel(tr("Window Start Time:"),this); edit_end_startwindow_label->setFont(subLabelFont()); edit_end_startwindow_label-> setAlignment(Qt::AlignRight|Qt::AlignVCenter); - edit_end_endwindow_edit=new QTimeEdit(this); - edit_end_endwindow_edit->setDisplayFormat("hh:mm:ss"); + edit_end_endwindow_edit=new RDTimeEdit(this); edit_end_endwindow_label=new QLabel(tr("Window End Time:"),this); edit_end_endwindow_label->setFont(subLabelFont()); edit_end_endwindow_label-> @@ -436,7 +430,8 @@ EditRecording::~EditRecording() QSize EditRecording::sizeHint() const { - return QSize(560,619); + // return QSize(560,619); + return QSize(640,619); } @@ -605,43 +600,43 @@ void EditRecording::resizeEvent(QResizeEvent *e) // Start Parameters // edit_start_groupbox->setGeometry(10,37,size().width()-20,105); - edit_start_hardtime_radio->setGeometry(20,57,110,15); - edit_starttime_edit->setGeometry(255,53,80,20); - edit_starttime_label->setGeometry(135,57,115,15); - edit_start_gpi_radio->setGeometry(20,81,100,15); - edit_start_startwindow_edit->setGeometry(255,77,80,20); - edit_start_startwindow_label->setGeometry(135,81,115,15); - edit_start_endwindow_edit->setGeometry(455,77,80,20); - edit_start_endwindow_label->setGeometry(345,81,105,15); - edit_startmatrix_spin->setGeometry(185,99,35,20); - edit_startmatrix_label->setGeometry(100,100,80,20); - edit_startline_spin->setGeometry(305,99,35,20); - edit_startline_label->setGeometry(240,100,60,20); - edit_startoffset_edit->setGeometry(455,99,80,20); - edit_startoffset_time_label->setGeometry(345,100,105,20); + edit_start_hardtime_radio->setGeometry(20,59,110,15); + edit_starttime_edit->setGeometry(255,57,120,20); + edit_starttime_label->setGeometry(135,57,115,20); + edit_start_gpi_radio->setGeometry(20,80,100,15); + edit_start_startwindow_edit->setGeometry(255,79,120,20); + edit_start_startwindow_label->setGeometry(135,79,115,20); + edit_start_endwindow_edit->setGeometry(495,79,120,20); + edit_start_endwindow_label->setGeometry(385,79,105,20); + edit_startmatrix_spin->setGeometry(185,101,35,20); + edit_startmatrix_label->setGeometry(100,101,80,20); + edit_startline_spin->setGeometry(305,101,35,20); + edit_startline_label->setGeometry(240,101,60,20); + edit_startoffset_edit->setGeometry(455,101,80,20); + edit_startoffset_time_label->setGeometry(345,101,105,20); edit_multirec_box->setGeometry(140,124,size().width()-170,15); // // End Parameters // edit_end_groupbox->setGeometry(10,160,size().width()-20,112); - edit_end_length_radio->setGeometry(20,205,100,15); - edit_endlength_edit->setGeometry(245,201,80,20); - edit_endlength_label->setGeometry(125,205,115,15); - edit_end_hardtime_radio->setGeometry(20,181,1100,15); - edit_endtime_edit->setGeometry(245,177,80,20); - edit_endtime_label->setGeometry(125,181,115,15); + edit_end_length_radio->setGeometry(20,206,100,15); + edit_endlength_edit->setGeometry(245,204,80,20); + edit_endlength_label->setGeometry(125,204,115,20); + edit_end_hardtime_radio->setGeometry(20,183,1100,15); + edit_endtime_edit->setGeometry(245,181,120,20); + edit_endtime_label->setGeometry(125,181,115,20); edit_end_gpi_radio->setGeometry(20,229,100,15); - edit_end_startwindow_edit->setGeometry(245,225,80,20); - edit_end_startwindow_label->setGeometry(125,229,115,15); - edit_end_endwindow_edit->setGeometry(455,225,80,20); - edit_end_endwindow_label->setGeometry(345,229,105,15); - edit_endmatrix_spin->setGeometry(185,247,35,20); - edit_endmatrix_label->setGeometry(100,248,80,20); - edit_endline_spin->setGeometry(295,247,35,20); - edit_endline_label->setGeometry(230,248,60,20); - edit_maxlength_edit->setGeometry(455,247,80,20); - edit_maxlength_label->setGeometry(325,248,125,20); + edit_end_startwindow_edit->setGeometry(245,227,120,20); + edit_end_startwindow_label->setGeometry(125,227,115,20); + edit_end_endwindow_edit->setGeometry(495,227,120,20); + edit_end_endwindow_label->setGeometry(385,227,105,20); + edit_endmatrix_spin->setGeometry(185,249,35,20); + edit_endmatrix_label->setGeometry(100,249,80,20); + edit_endline_spin->setGeometry(295,249,35,20); + edit_endline_label->setGeometry(230,249,60,20); + edit_maxlength_edit->setGeometry(455,249,80,20); + edit_maxlength_label->setGeometry(325,249,125,20); edit_description_edit->setGeometry(105,291,size().width()-115,20); edit_description_label->setGeometry(10,291,90,20); diff --git a/rdcatch/edit_recording.h b/rdcatch/edit_recording.h index a7890572..9548f970 100644 --- a/rdcatch/edit_recording.h +++ b/rdcatch/edit_recording.h @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -33,6 +32,7 @@ #include #include #include +#include #include "eventwidget.h" #include "dowselector.h" @@ -98,22 +98,22 @@ class EditRecording : public RDDialog QRadioButton *edit_end_gpi_radio; QLabel *edit_endtime_label; QLabel *edit_starttime_label; - QTimeEdit *edit_starttime_edit; - QTimeEdit *edit_endtime_edit; + RDTimeEdit *edit_starttime_edit; + RDTimeEdit *edit_endtime_edit; QLabel *edit_endlength_label; QTimeEdit *edit_endlength_edit; QLabel *edit_start_startwindow_label; - QTimeEdit *edit_start_startwindow_edit; + RDTimeEdit *edit_start_startwindow_edit; QLabel *edit_start_endwindow_label; - QTimeEdit *edit_start_endwindow_edit; + RDTimeEdit *edit_start_endwindow_edit; QCheckBox *edit_multirec_box; QLabel *edit_multirec_label; QLabel *edit_maxlength_label; QTimeEdit *edit_maxlength_edit; QLabel *edit_end_startwindow_label; - QTimeEdit *edit_end_startwindow_edit; + RDTimeEdit *edit_end_startwindow_edit; QLabel *edit_end_endwindow_label; - QTimeEdit *edit_end_endwindow_edit; + RDTimeEdit *edit_end_endwindow_edit; QLabel *edit_startmatrix_label; QSpinBox *edit_startmatrix_spin; QLabel *edit_startline_label; diff --git a/rdcatch/edit_upload.cpp b/rdcatch/edit_upload.cpp index 249fe8ae..babc966c 100644 --- a/rdcatch/edit_upload.cpp +++ b/rdcatch/edit_upload.cpp @@ -39,12 +39,6 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, setWindowTitle("RDCatch - "+tr("Edit Upload")); - // - // Fix the Window Size - // - setMinimumSize(sizeHint()); - setMaximumSize(sizeHint()); - // // The Recording Record // @@ -230,6 +224,12 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, event_cancel_button->setText(tr("Cancel")); connect(event_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); + // + // Fix the Window Size + // + setMinimumSize(sizeHint()); + setMaximumSize(sizeHint()); + // // Populate Data // @@ -278,7 +278,7 @@ EditUpload::~EditUpload() QSize EditUpload::sizeHint() const { - return QSize(520,451); + return QSize(edit_event_widget->sizeHint().width(),451); } diff --git a/rdcatch/edit_upload.h b/rdcatch/edit_upload.h index 7b3396d7..86e92f97 100644 --- a/rdcatch/edit_upload.h +++ b/rdcatch/edit_upload.h @@ -22,7 +22,6 @@ #define EDIT_UPLOAD_H #include -#include #include #include #include @@ -71,14 +70,6 @@ class EditUpload : public RDDialog RDRecording *edit_recording; RDSettings edit_settings; EventWidget *edit_event_widget; - /* - QCheckBox *edit_active_button; - QLabel *edit_active_label; - QLabel *edit_station_label; - RDComboBox *edit_station_box; - QLabel *edit_starttime_label; - QTimeEdit *edit_starttime_edit; - */ QLabel *edit_feed_label; QComboBox *edit_feed_box; RDFeedListModel *edit_feed_model; diff --git a/rdcatch/eventwidget.cpp b/rdcatch/eventwidget.cpp index ea3b17c1..9e4b92eb 100644 --- a/rdcatch/eventwidget.cpp +++ b/rdcatch/eventwidget.cpp @@ -59,8 +59,7 @@ EventWidget::EventWidget(EventWidget::EventType type,QWidget *parent) d_time_label=new QLabel(tr("Start Time")+":",this); d_time_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); d_time_label->setFont(labelFont()); - d_time_edit=new QTimeEdit(this); - d_time_edit->setDisplayFormat("hh:mm:ss"); + d_time_edit=new RDTimeEdit(this); if(d_event_type==EventWidget::RecordEvent) { d_time_label->hide(); d_time_edit->hide(); @@ -140,7 +139,7 @@ EventWidget::EventWidget(EventWidget::EventType type,QWidget *parent) QSize EventWidget::sizeHint() const { - return QSize(510,23); + return QSize(550,23); } @@ -268,6 +267,6 @@ void EventWidget::resizeEvent(QResizeEvent *e) d_state_label->setGeometry(20,1,125,20); d_location_box->setGeometry(190,0,140,23); d_location_label->setGeometry(115,0,70,23); - d_time_edit->setGeometry(size().width()-90,2,80,20); - d_time_label->setGeometry(size().width()-175,2,80,20); + d_time_edit->setGeometry(size().width()-130,2,100,20); + d_time_label->setGeometry(size().width()-215,2,80,20); } diff --git a/rdcatch/eventwidget.h b/rdcatch/eventwidget.h index 9ca84c85..94c4ae69 100644 --- a/rdcatch/eventwidget.h +++ b/rdcatch/eventwidget.h @@ -23,9 +23,9 @@ #include #include -#include #include +#include #include class EventWidget : public RDWidget @@ -61,7 +61,7 @@ class EventWidget : public RDWidget QLabel *d_location_label; QComboBox *d_location_box; QLabel *d_time_label; - QTimeEdit *d_time_edit; + RDTimeEdit *d_time_edit; EventType d_event_type; QString d_current_station_name; int d_current_deck_number;