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

* Added 'RDMainWindow' to rdlogin(1).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-06-21 10:57:45 -04:00
parent 37d3a55965
commit d0fc2313f0
3 changed files with 17 additions and 4 deletions

View File

@ -21940,3 +21940,5 @@
* Added 'RDMainWindow' to rdadmin(1). * Added 'RDMainWindow' to rdadmin(1).
2021-06-21 Fred Gleason <fredg@paravelsystems.com> 2021-06-21 Fred Gleason <fredg@paravelsystems.com>
* Added 'RDMainWindow' to rdcartslots(1). * Added 'RDMainWindow' to rdcartslots(1).
2021-06-21 Fred Gleason <fredg@paravelsystems.com>
* Added 'RDMainWindow' to rdlogin(1).

View File

@ -28,7 +28,7 @@
#include "rdlogin.h" #include "rdlogin.h"
MainWidget::MainWidget(RDConfig *c,QWidget *parent) MainWidget::MainWidget(RDConfig *c,QWidget *parent)
: RDWidget(c,parent) : RDMainWindow("rdlogin",c)
{ {
login_resize=false; login_resize=false;
login_user_width=160; login_user_width=160;
@ -154,7 +154,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
login_resize=true; login_resize=true;
resizeEvent(NULL); loadSettings(true);
} }
@ -178,6 +178,12 @@ QSizePolicy MainWidget::sizePolicy() const
} }
void MainWidget::closeEvent(QCloseEvent *e)
{
quitMainWidget();
}
void MainWidget::connectedData(bool state) void MainWidget::connectedData(bool state)
{ {
} }
@ -237,12 +243,14 @@ void MainWidget::logoutData()
void MainWidget::cancelData() void MainWidget::cancelData()
{ {
saveSettings();
exit(0); exit(0);
} }
void MainWidget::quitMainWidget() void MainWidget::quitMainWidget()
{ {
saveSettings();
qApp->quit(); qApp->quit();
} }
@ -296,7 +304,6 @@ int main(int argc,char *argv[])
RDConfig *config=new RDConfig(); RDConfig *config=new RDConfig();
config->load(); config->load();
MainWidget *w=new MainWidget(config); MainWidget *w=new MainWidget(config);
w->setGeometry(QRect(QPoint(0,0),w->sizeHint()));
w->show(); w->show();
return a.exec(); return a.exec();
} }

View File

@ -26,12 +26,13 @@
#include <QLineEdit> #include <QLineEdit>
#include <QPushButton> #include <QPushButton>
#include <rdmainwindow.h>
#include <rduserlistmodel.h> #include <rduserlistmodel.h>
#include <rdwidget.h> #include <rdwidget.h>
#define RDLOGIN_USAGE "\n" #define RDLOGIN_USAGE "\n"
class MainWidget : public RDWidget class MainWidget : public RDMainWindow
{ {
Q_OBJECT Q_OBJECT
public: public:
@ -40,6 +41,9 @@ class MainWidget : public RDWidget
QSize sizeHint() const; QSize sizeHint() const;
QSizePolicy sizePolicy() const; QSizePolicy sizePolicy() const;
protected:
void closeEvent(QCloseEvent *e);
private slots: private slots:
void connectedData(bool state); void connectedData(bool state);
void userData(); void userData();