Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

BIN
TestServerLMS/Debug64/.ninja_deps
View File

Binary file not shown.

79
TestServerLMS/Debug64/.ninja_log
View File

@@ -28,3 +28,82 @@
624 2853 7548373552333401 CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/mocs_compilation.cpp.obj a8ae454d9a3f2886
629 3023 7548373554026019 CMakeFiles/TestServerLMS.dir/mainwindow.cpp.obj 69b92e862cb78488
3023 3191 7548373555710033 TestServerLMS.exe f29964b1ddd9392d
9 41 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0
9 41 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0
9 41 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0
9 41 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0
9 41 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0
9 41 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0
41 2271 7548525869375314 CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/mocs_compilation.cpp.obj a8ae454d9a3f2886
44 2272 7548525869385288 CMakeFiles/TestServerLMS.dir/main.cpp.obj 2b54652358b13813
20 539 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0
20 539 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0
20 539 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0
20 539 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0
20 539 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0
20 539 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0
542 2753 7548526621991494 CMakeFiles/TestServerLMS.dir/main.cpp.obj 2b54652358b13813
539 2777 7548526622212520 CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/mocs_compilation.cpp.obj a8ae454d9a3f2886
20 55 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0
20 55 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0
20 55 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0
20 55 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0
20 55 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0
20 55 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0
55 2246 7548526874915051 CMakeFiles/TestServerLMS.dir/mainwindow.cpp.obj 69b92e862cb78488
20 541 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0
20 541 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0
20 541 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0
20 541 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0
20 541 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0
20 541 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0
544 2745 7548527295061857 CMakeFiles/TestServerLMS.dir/main.cpp.obj 2b54652358b13813
541 2788 7548527295500682 CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/mocs_compilation.cpp.obj a8ae454d9a3f2886
20 53 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0
20 53 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0
20 53 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0
20 53 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0
20 53 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0
20 53 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0
53 2234 7548527428334545 CMakeFiles/TestServerLMS.dir/mainwindow.cpp.obj 69b92e862cb78488
2234 2391 7548527429900556 TestServerLMS.exe f29964b1ddd9392d
20 52 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0
20 52 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0
20 52 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0
20 52 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0
20 52 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0
20 52 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0
15 46 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0
15 46 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0
15 46 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0
15 46 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0
15 46 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0
15 46 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0
16 47 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0
16 47 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0
16 47 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0
16 47 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0
16 47 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0
16 47 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0
15 46 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0
15 46 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0
15 46 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0
15 46 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0
15 46 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0
15 46 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0
17 48 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0
17 48 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0
17 48 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0
17 48 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0
17 48 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0
17 48 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0
16 47 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0
16 47 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0
16 47 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0
16 47 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0
16 47 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0
16 47 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0
47 2274 7548535219347124 CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/mocs_compilation.cpp.obj a8ae454d9a3f2886
50 2284 7548535219436886 CMakeFiles/TestServerLMS.dir/main.cpp.obj 2b54652358b13813
52 2341 7548535219995680 CMakeFiles/TestServerLMS.dir/mainwindow.cpp.obj 69b92e862cb78488
2341 2499 7548535221585152 TestServerLMS.exe f29964b1ddd9392d

BIN
TestServerLMS/Debug64/CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/mocs_compilation.cpp.obj
View File

Binary file not shown.

BIN
TestServerLMS/Debug64/CMakeFiles/TestServerLMS.dir/main.cpp.obj
View File

Binary file not shown.

BIN
TestServerLMS/Debug64/CMakeFiles/TestServerLMS.dir/mainwindow.cpp.obj
View File

Binary file not shown.

BIN
TestServerLMS/Debug64/TestServerLMS.exe
View File

Binary file not shown.

BIN
TestServerLMS/Debug64/libInstructorsAndTrainees.dll
View File

Binary file not shown.

BIN
TestServerLMS/Debug64/libServerLMS.dll
View File

Binary file not shown.

34
TestServerLMS/TestServerLMS/mainwindow.cpp
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;
}

6
TestServerLMS/TestServerLMS/mainwindow.h
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;
};