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

* Adjusted layout in 'RDLogEventDialog' to be compatible with
	12 hour time format.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>

ChangeLog

@@ -22203,3 +22203,6 @@
 2021-08-11 Fred Gleason <fredg@paravelsystems.com>
 	* Tweaked layout of elements in the 'Editing Event' dialog
 	in rdlogmanager(1).
+2021-08-11 Fred Gleason <fredg@paravelsystems.com>
+	* Adjusted layout in 'RDLogEventDialog' to be compatible with
+	12 hour time format.

lib/rdlogeventdialog.cpp

@@ -24,8 +24,6 @@
 #include "rdlist_logs.h"
 #include "rdlogeventdialog.h"
 
-//#include "globals.h"
-
 RDLogEventDialog::RDLogEventDialog(RDLogLine *line,QWidget *parent)
   : RDDialog(parent)
 {
@@ -36,7 +34,6 @@ RDLogEventDialog::RDLogEventDialog(RDLogLine *line,QWidget *parent)
   //
   edit_timetype_box=new QCheckBox(this);
   edit_timetype_label=new QLabel(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);
 
@@ -81,10 +78,9 @@ RDLogEventDialog::RDLogEventDialog(RDLogLine *line,QWidget *parent)
   edit_transtype_box->insertItem(0,tr("Play"));
   edit_transtype_box->insertItem(1,tr("Segue"));
   edit_transtype_box->insertItem(2,tr("Stop"));  
-  edit_time_label=new QLabel(tr("Transition Type:"),this);
+  edit_transtype_label=new QLabel(tr("Transition Type:"),this);
-  edit_time_label->setGeometry(10,68,370,26);
+  edit_transtype_label->setFont(labelFont());
-  edit_time_label->setFont(labelFont());
+  edit_transtype_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
-  edit_time_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
 
   //
   //  Ok Button
@@ -139,7 +135,7 @@ RDLogEventDialog::RDLogEventDialog(RDLogLine *line,QWidget *parent)
 void RDLogEventDialog::timeChangedData(const QTime &time)
 {
   if(edit_timetype_box->isChecked()) {
-    edit_time_label->
+    edit_transtype_label->
       setText(tr("Transition If Previous Cart Ends Before")+" "+
 	      edit_time_edit->time().toString("hh:mm:ss.zzz").left(10)+":");
   }
@@ -155,13 +151,13 @@ void RDLogEventDialog::timeToggledData(bool state)
   edit_grace_bgroup->button(2)->setEnabled(state);
   if(state) {
     graceClickedData(edit_grace_bgroup->checkedId());
-    edit_time_label->
+    edit_transtype_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")+":");
+    edit_transtype_label->setText(tr("Transition Type")+":");
   }
 }
 
@@ -188,12 +184,12 @@ void RDLogEventDialog::selectTimeData(int id)
 {
   if(id==RDLogLine::Relative) {
     edit_time_edit->setDisabled(true);
-    edit_time_label->setDisabled(true);
+    edit_transtype_label->setDisabled(true);
     edit_grace_timeedit->setDisabled(true);
   }
   else {
     edit_time_edit->setEnabled(true);
-    edit_time_label->setEnabled(true);
+    edit_transtype_label->setEnabled(true);
   }
 }
 
@@ -244,14 +240,17 @@ RDLogLine *RDLogEventDialog::logLine()
 
 void RDLogEventDialog::resizeEvent(QResizeEvent *e)
 {
+  edit_timetype_label->setGeometry(30,21,85,17);
   edit_timetype_box->setGeometry(10,22,15,15);
-  edit_time_edit->setGeometry(85,19,85,20);
+  edit_time_edit->setGeometry(85,19,120,20);
-  edit_grace_group->setGeometry(175,11,435,50);
+  edit_grace_group->setGeometry(210,11,435,43);
   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_grace_timeedit->setGeometry(578,31,60,20);
-  edit_transtype_box->setGeometry(385,68,110,26);
+
+  edit_transtype_label->setGeometry(10,63,370,26);
+  edit_transtype_box->setGeometry(420,63,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);

lib/rdlogeventdialog.h

@@ -56,10 +56,10 @@ class RDLogEventDialog : public RDDialog
  private:
   RDLogLine *edit_logline;
   RDTimeEdit *edit_time_edit;
-  QLabel *edit_time_label;
   QCheckBox *edit_timetype_box;
   QLabel *edit_timetype_label;
   QCheckBox *edit_time_box;
+  QLabel *edit_transtype_label;
   QComboBox *edit_transtype_box;
   QButtonGroup *edit_grace_bgroup;
   QGroupBox *edit_grace_group;

lib/rdtrackereditdialog.cpp

@@ -50,10 +50,11 @@ RDTrackerEditDialog::RDTrackerEditDialog(RDLogLine *line,QWidget *parent)
 
 QSize RDTrackerEditDialog::sizeHint() const
 {
-  return QSize(625,230);
+  return QSize(660,230);
 }
  
 
+
 QSizePolicy RDTrackerEditDialog::sizePolicy() const
 {
   return QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);