2021-06-21 Fred Gleason <fredg@paravelsystems.com>

* Added 'RDMainWindow' to rdgpimon(1).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-06-21 11:23:33 -04:00
parent ab127609f8
commit d19a16a8dd
3 changed files with 22 additions and 8 deletions

View File

@ -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).

View File

@ -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();
}

View File

@ -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);