Сделал первый этап разделения Сервера и GUI

This commit is contained in:
krivoshein
2024-12-02 17:45:06 +03:00
parent 927b789486
commit b86717d212
48 changed files with 813 additions and 1182 deletions

View File

@@ -6,36 +6,36 @@
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::MainWindow),
m_serverLMSWidget(nullptr),
m_messangerWidget(nullptr),
m_instructorsAndTrainees(nullptr)
m_serverLMSWidget(nullptr)//,
//m_messangerWidget(nullptr)//,
//m_instructorsAndTrainees(nullptr)
{
ui->setupUi(this);
m_instructorsAndTrainees = new InstructorsAndTraineesWidget(this);
m_messangerWidget = new MessangerWidget();
m_serverLMSWidget = new ServerLMSWidget(m_instructorsAndTrainees, m_messangerWidget);
//m_instructorsAndTrainees = new InstructorsAndTraineesWidget(this);
//m_messangerWidget = new MessangerWidget();
m_serverLMSWidget = new ServerLMSWidget(/*m_instructorsAndTrainees, m_messangerWidget*/);
ui->verticalLayout_1->addWidget(m_serverLMSWidget);
ui->verticalLayout_2->addWidget(m_instructorsAndTrainees);
//ui->verticalLayout_2->addWidget(m_instructorsAndTrainees);
QHBoxLayout *layout = new QHBoxLayout(this);
ui->verticalLayout_2->addLayout(layout);
layout->addWidget(m_messangerWidget);
//layout->addWidget(m_messangerWidget);
m_messangerWidget->setMaximumHeight(200);
//m_messangerWidget->setMaximumHeight(200);
connect(m_instructorsAndTrainees, &InstructorsAndTraineesWidget::signal_BlockAutorization, m_serverLMSWidget, &ServerLMSWidget::slot_BlockAutorization);
connect(m_instructorsAndTrainees, &InstructorsAndTraineesWidget::signal_InitMessanger, m_messangerWidget, &MessangerWidget::slot_InitMessanger);
connect(m_instructorsAndTrainees, &InstructorsAndTraineesWidget::signal_traineeSelected, m_messangerWidget, &MessangerWidget::slot_traineeSelected);
//connect(m_instructorsAndTrainees, &InstructorsAndTraineesWidget::signal_BlockAutorization, m_serverLMSWidget, &ServerLMSWidget::slot_BlockAutorization);
//connect(m_instructorsAndTrainees, &InstructorsAndTraineesWidget::signal_InitMessanger, m_messangerWidget, &MessangerWidget::slot_InitMessanger);
//connect(m_instructorsAndTrainees, &InstructorsAndTraineesWidget::signal_traineeSelected, m_messangerWidget, &MessangerWidget::slot_traineeSelected);
connect(m_messangerWidget, &MessangerWidget::signal_tabMessengerChanged, m_instructorsAndTrainees, &InstructorsAndTraineesWidget::signal_tabMessengerChanged);
//connect(m_messangerWidget, &MessangerWidget::signal_tabMessengerChanged, m_instructorsAndTrainees, &InstructorsAndTraineesWidget::signal_tabMessengerChanged);
connect(this, &MainWindow::signal_LanguageChanged, m_serverLMSWidget, &ServerLMSWidget::slot_LanguageChanged);
connect(this, &MainWindow::signal_LanguageChanged, m_messangerWidget, &MessangerWidget::slot_LanguageChanged);
connect(this, &MainWindow::signal_LanguageChanged, m_instructorsAndTrainees, &InstructorsAndTraineesWidget::slot_LanguageChanged);
//connect(this, &MainWindow::signal_LanguageChanged, m_messangerWidget, &MessangerWidget::slot_LanguageChanged);
//connect(this, &MainWindow::signal_LanguageChanged, m_instructorsAndTrainees, &InstructorsAndTraineesWidget::slot_LanguageChanged);
//connect(m_serverLMSWidget, &ServerLMSWidget::signal_authorizationChanged, this, &MainWindow::slot_authorizationChanged); //Уже не требуется!
@@ -49,8 +49,8 @@ MainWindow::MainWindow(QWidget *parent) :
MainWindow::~MainWindow()
{
delete m_serverLMSWidget;
delete m_messangerWidget;
delete m_instructorsAndTrainees;
//delete m_messangerWidget;
//delete m_instructorsAndTrainees;
delete ui;
}

View File

@@ -7,7 +7,7 @@
#include "serverlmswidget.h"
#include "messangerwidget.h"
#include "instructorsandtraineeswidget.h"
//#include "instructorsandtraineeswidget.h"
QT_BEGIN_NAMESPACE
@@ -41,8 +41,8 @@ private:
Ui::MainWindow *ui;
ServerLMSWidget* m_serverLMSWidget;
MessangerWidget* m_messangerWidget;
InstructorsAndTraineesWidget* m_instructorsAndTrainees;
//MessangerWidget* m_messangerWidget;
//InstructorsAndTraineesWidget* m_instructorsAndTrainees;
QTranslator qtLanguageTranslator;
};