diff --git a/ChangeLog b/ChangeLog index 888b457f..95b712a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21938,3 +21938,5 @@ * Added 'RDMainWindow' to rdlogedit(1). 2021-06-21 Fred Gleason * Added 'RDMainWindow' to rdadmin(1). +2021-06-21 Fred Gleason + * Added 'RDMainWindow' to rdcartslots(1). diff --git a/rdcartslots/rdcartslots.cpp b/rdcartslots/rdcartslots.cpp index 16903c81..e5e6d53b 100644 --- a/rdcartslots/rdcartslots.cpp +++ b/rdcartslots/rdcartslots.cpp @@ -27,7 +27,7 @@ #include "rdcartslots.h" MainWidget::MainWidget(RDConfig *c,QWidget *parent) - : RDWidget(c,parent) + : RDMainWindow("rdcartslots",c) { QString err_msg; @@ -120,11 +120,11 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent) // Fix the Window Size // #ifndef RESIZABLE - setMinimumWidth(sizeHint().width()); - setMaximumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); - setMaximumHeight(sizeHint().height()); + setMinimumSize(sizeHint()); + setMaximumSize(sizeHint()); #endif // RESIZABLE + + loadSettings(true); } @@ -193,6 +193,7 @@ void MainWidget::closeEvent(QCloseEvent *e) for(unsigned i=0;iload(); MainWidget *w=new MainWidget(config); - w->setGeometry(QRect(QPoint(0,0),w->sizeHint())); w->show(); return a.exec(); } diff --git a/rdcartslots/rdcartslots.h b/rdcartslots/rdcartslots.h index 460092e3..333b9594 100644 --- a/rdcartslots/rdcartslots.h +++ b/rdcartslots/rdcartslots.h @@ -22,6 +22,7 @@ #define RDCARTSLOTS_H #include +#include #include // @@ -31,7 +32,7 @@ #define METER_INTERVAL 50 #define RDCARTSLOTS_USAGE "\n" -class MainWidget : public RDWidget +class MainWidget : public RDMainWindow { Q_OBJECT public: