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

* Fixed regressions in rdlogmanager(1) that caused the 'Color'
	setting for Events and Clocks to fail to be saved.

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

ChangeLog

@@ -22271,3 +22271,6 @@
 	'RDCoreApplication::timeString()' and
 	'RDCoreApplication::tenthsTimeString()' to allow specification
 	of the character used for padding.
+2021-08-15 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed regressions in rdlogmanager(1) that caused the 'Color'
+	setting for Events and Clocks to fail to be saved.

rdlogmanager/clocklistmodel.cpp

@@ -310,7 +310,12 @@ QPixmap ClockListModel::MakeIcon(const QString &color) const
   QPixmap pix(QSize(15,15));
   QPainter *p=new QPainter();
   p->begin(&pix);
+  if(QColor(color).isValid()) {
     p->fillRect(0,0,15,15,QColor(color));
+  }
+  else {
+    p->fillRect(0,0,15,15,d_palette.color(QPalette::Background));
+  }
   p->end();
   delete p;
 

rdlogmanager/edit_clock.cpp

@@ -190,6 +190,7 @@ EditClock::EditClock(QString clockname,bool new_clock,
   edit_color_button->setFont(buttonFont());
   edit_color_button->setText(tr("Color"));
   connect(edit_color_button,SIGNAL(clicked()),this,SLOT(colorData()));
+  edit_color=palette().color(QPalette::Background);
   
   //
   // Clock Display
@@ -226,6 +227,7 @@ EditClock::EditClock(QString clockname,bool new_clock,
   edit_clocks_model->load();
   edit_shortname_edit->setText(edit_clocks_model->shortName());
   if(edit_clocks_model->color().isValid()) {
+    edit_color=edit_clocks_model->color();
     edit_color_button->
       setPalette(QPalette(edit_clocks_model->color(),palette().color(QPalette::Background)));
   }
@@ -501,6 +503,7 @@ void EditClock::colorData()
   QColor color=
     QColorDialog::getColor(edit_color_button->palette().color(QPalette::Background),this);
   if(color.isValid()) {
+    edit_color=color;
     edit_color_button->setPalette(QPalette(color,palette().color(QPalette::Background)));
   }
 }
@@ -576,7 +579,7 @@ void EditClock::closeEvent(QCloseEvent *e)
 
 void EditClock::Save()
 {
-  edit_clocks_model->setColor(edit_color_button->palette().color(QPalette::Background));
+  edit_clocks_model->setColor(edit_color);
   edit_clocks_model->setShortName(edit_shortname_edit->text());
   edit_clocks_model->setRemarks(edit_remarks_edit->toPlainText());
   edit_clocks_model->save();

rdlogmanager/edit_clock.h

@@ -79,6 +79,7 @@ class EditClock : public RDDialog
   QPushButton *edit_edit_button;
   QPushButton *edit_delete_button;
   QPushButton *edit_color_button;
+  QColor edit_color;
   QLabel *edit_clockname_label;
   QLineEdit *edit_shortname_edit;
   QLabel *edit_clock_label;

rdlogmanager/edit_event.cpp

@@ -715,6 +715,7 @@ EditEvent::EditEvent(QString eventname,bool new_event,
   event_color_button->setFont(buttonFont());
   event_color_button->setText(tr("Color"));
   connect(event_color_button,SIGNAL(clicked()),this,SLOT(colorData()));
+  event_color=palette().color(QPalette::Background);
   
   //
   //  OK Button
@@ -809,9 +810,9 @@ EditEvent::EditEvent(QString eventname,bool new_event,
   if(event_have_code2_box->findText(event_event->HaveCode2())!=-1) {
     event_have_code2_box->setCurrentText(event_event->HaveCode2());
   }
-  QColor color=event_event->color();
+  event_color=event_event->color();
-  if(color.isValid()) {
+  if(event_color.isValid()) {
-    event_color_button->setPalette(QPalette(color,palette().color(QPalette::Background)));
+    event_color_button->setPalette(QPalette(event_color,palette().color(QPalette::Background)));
   }
   QString str=event_event->nestedEvent();
   sql=QString("select `NAME` from `EVENTS` where ")+
@@ -1204,6 +1205,7 @@ void EditEvent::colorData()
   QColor color=
     QColorDialog::getColor(event_color_button->palette().color(QPalette::Background),this);
   if(color.isValid()) {
+    event_color=color;
     event_color_button->setPalette(QPalette(color,palette().color(QPalette::Background)));
   }
 }
@@ -1322,7 +1324,7 @@ void EditEvent::Save()
   event_event->
     setDefaultTransType((RDLogLine::TransType)event_defaulttrans_box->
   			currentIndex());
-  event_event->setColor(event_color_button->palette().color(QPalette::Background));
+  event_event->setColor(event_color);
   if(event_nestevent_box->currentIndex()==0) {
     event_event->setNestedEvent("");
   }

rdlogmanager/edit_event.h

@@ -166,6 +166,7 @@ class EditEvent : public RDDialog
   RDTransportButton *event_postimport_up_button;
   RDTransportButton *event_postimport_down_button;
   QPushButton *event_color_button;
+  QColor event_color;
   bool event_saved;
   bool event_new_event;
   std::vector<QString> *event_new_events;

rdlogmanager/eventlistmodel.cpp

@@ -319,7 +319,12 @@ QPixmap EventListModel::MakeIcon(const QString &color) const
   QPixmap pix(QSize(15,15));
   QPainter *p=new QPainter();
   p->begin(&pix);
+  if(QColor(color).isValid()) {
     p->fillRect(0,0,15,15,QColor(color));
+  }
+  else {
+    p->fillRect(0,0,15,15,d_palette.color(QPalette::Background));
+  }
   p->end();
   delete p;