From d19a16a8dd495ad0ad32b5c05552201cb2265cb5 Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paravelsystems.com>
Date: Mon, 21 Jun 2021 11:23:33 -0400
Subject: [PATCH] 2021-06-21 Fred Gleason <fredg@paravelsystems.com> 	*
 Added 'RDMainWindow' to rdgpimon(1).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
---
 ChangeLog                   |  2 ++
 utils/rdgpimon/rdgpimon.cpp | 12 ++++++++++--
 utils/rdgpimon/rdgpimon.h   | 16 ++++++++++------
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1af6ff7f..a71cb785 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21946,3 +21946,5 @@
 	* Added 'RDMainWindow' to rdlogmanager(1).
 2021-06-21 Fred Gleason <fredg@paravelsystems.com>
 	* Added 'RDMainWindow' to rdselect(1).
+2021-06-21 Fred Gleason <fredg@paravelsystems.com>
+	* Added 'RDMainWindow' to rdgpimon(1).
diff --git a/utils/rdgpimon/rdgpimon.cpp b/utils/rdgpimon/rdgpimon.cpp
index f883ff2f..bdf08c23 100644
--- a/utils/rdgpimon/rdgpimon.cpp
+++ b/utils/rdgpimon/rdgpimon.cpp
@@ -29,7 +29,7 @@
 #include "rdgpimon.h"
 
 MainWidget::MainWidget(RDConfig *c,QWidget *parent)
-  : RDWidget(c,parent)
+  : RDMainWindow("rdgpimon",c)
 {
   QString err_msg;
 
@@ -244,6 +244,8 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
   gpi_events_startup_timer->setSingleShot(true);
   connect(gpi_events_startup_timer,SIGNAL(timeout()),this,SLOT(startUpData()));
   gpi_events_startup_timer->start(GPIMON_START_UP_DELAY);
+
+  loadSettings(true);
 }
 
 
@@ -516,10 +518,17 @@ void MainWidget::downData()
 
 void MainWidget::quitMainWidget()
 {
+  saveSettings();
   exit(0);
 }
 
 
+void MainWidget::closeEvent(QCloseEvent *e)
+{
+  quitMainWidget();
+}
+
+
 void MainWidget::UpdateLabelsUp(int last_line)
 {
   QString sql;
@@ -698,7 +707,6 @@ int main(int argc,char *argv[])
   RDConfig *config=new RDConfig();
   config->load();
   MainWidget *w=new MainWidget(config);
-  w->setGeometry(QRect(QPoint(0,0),w->sizeHint()));
   w->show();
   return a.exec();
 }
diff --git a/utils/rdgpimon/rdgpimon.h b/utils/rdgpimon/rdgpimon.h
index fab0c37e..0c4a46f5 100644
--- a/utils/rdgpimon/rdgpimon.h
+++ b/utils/rdgpimon/rdgpimon.h
@@ -24,10 +24,11 @@
 #include <QComboBox>
 #include <QDateTimeEdit>
 
-#include <rdmatrix.h>
-#include <rdtransportbutton.h>
 #include <rdgpiologmodel.h>
+#include <rdmainwindow.h>
+#include <rdmatrix.h>
 #include <rdtableview.h>
+#include <rdtransportbutton.h>
 #include <rdwidget.h>
 
 #include "gpi_label.h"
@@ -37,14 +38,14 @@
 #define GPIMON_COLS 8
 #define RDGPIMON_USAGE "\n"
 
-class MainWidget : public RDWidget
+class MainWidget : public RDMainWindow
 {
   Q_OBJECT
  public:
   MainWidget(RDConfig *c,QWidget *parent=0);
-   ~MainWidget();
-   QSize sizeHint() const;
-   QSizePolicy sizePolicy() const;
+  ~MainWidget();
+  QSize sizeHint() const;
+  QSizePolicy sizePolicy() const;
 
  private slots:
   void userData();
@@ -64,6 +65,9 @@ class MainWidget : public RDWidget
   void downData();
   void quitMainWidget();
 
+ protected:
+  void closeEvent(QCloseEvent *e);
+  
  private:
   void UpdateLabelsUp(int last_line);
   void UpdateLabelsDown(int first_line);