diff --git a/applications/emsConfigurer/emsConfigurer.pro b/applications/emsConfigurer/emsConfigurer.pro index edff9be..8db1d60 100644 --- a/applications/emsConfigurer/emsConfigurer.pro +++ b/applications/emsConfigurer/emsConfigurer.pro @@ -40,12 +40,15 @@ win32:LIBS += Ws2_32.lib SOURCES += \ main.cpp \ + maindialog.cpp \ mainwindow.cpp HEADERS += \ + maindialog.h \ mainwindow.h FORMS += \ + maindialog.ui \ mainwindow.ui # Default rules for deployment. diff --git a/applications/emsConfigurer/maindialog.cpp b/applications/emsConfigurer/maindialog.cpp new file mode 100644 index 0000000..0eb97d8 --- /dev/null +++ b/applications/emsConfigurer/maindialog.cpp @@ -0,0 +1,14 @@ +#include "maindialog.h" +#include "ui_maindialog.h" + +MainDialog::MainDialog(QWidget *parent) : + QDialog(parent), + ui(new Ui::MainDialog) +{ + ui->setupUi(this); +} + +MainDialog::~MainDialog() +{ + delete ui; +} diff --git a/applications/emsConfigurer/maindialog.h b/applications/emsConfigurer/maindialog.h new file mode 100644 index 0000000..b969429 --- /dev/null +++ b/applications/emsConfigurer/maindialog.h @@ -0,0 +1,22 @@ +#ifndef MAINDIALOG_H +#define MAINDIALOG_H + +#include + +namespace Ui { +class MainDialog; +} + +class MainDialog : public QDialog +{ + Q_OBJECT + +public: + explicit MainDialog(QWidget *parent = nullptr); + ~MainDialog(); + +private: + Ui::MainDialog *ui; +}; + +#endif // MAINDIALOG_H diff --git a/applications/emsConfigurer/maindialog.ui b/applications/emsConfigurer/maindialog.ui new file mode 100644 index 0000000..0a83fd3 --- /dev/null +++ b/applications/emsConfigurer/maindialog.ui @@ -0,0 +1,19 @@ + + + MainDialog + + + + 0 + 0 + 867 + 665 + + + + Dialog + + + + + diff --git a/applications/emsConfigurer/mainwindow.cpp b/applications/emsConfigurer/mainwindow.cpp index 4b72efa..cb9e0e1 100644 --- a/applications/emsConfigurer/mainwindow.cpp +++ b/applications/emsConfigurer/mainwindow.cpp @@ -5,9 +5,12 @@ #include #include +#include "MainDialog.h" + MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) , ui(new Ui::MainWindow) + , m_pMainDialog(nullptr) { ui->setupUi(this); this->setWindowIcon(QIcon(":/images/icon.png")); @@ -29,9 +32,22 @@ MainWindow::MainWindow(QWidget *parent) MainWindow::~MainWindow() { delete ui; + if (m_pMainDialog) + { + delete m_pMainDialog; + m_pMainDialog = nullptr; + } } void MainWindow::setIp(const QString &ip) { ui->serverIp->setText(ip); } + +void MainWindow::on_pb_Logon_clicked() +{ + m_pMainDialog = new MainDialog(); + m_pMainDialog->show(); + this->close(); +} + diff --git a/applications/emsConfigurer/mainwindow.h b/applications/emsConfigurer/mainwindow.h index 59185cd..3a90aaf 100644 --- a/applications/emsConfigurer/mainwindow.h +++ b/applications/emsConfigurer/mainwindow.h @@ -3,6 +3,8 @@ #include +class MainDialog; + QT_BEGIN_NAMESPACE namespace Ui { class MainWindow; } QT_END_NAMESPACE @@ -18,7 +20,11 @@ public: protected: void setIp(const QString &ip); +private slots: + void on_pb_Logon_clicked(); + private: Ui::MainWindow *ui; + MainDialog* m_pMainDialog; }; #endif // MAINWINDOW_H