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

Прочистил TestServerLMS

Browse Source
This commit is contained in:
krivoshein
2024-12-03 09:20:04 +03:00
parent b86717d212
commit 27eda63932
25 changed files with 116 additions and 731 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
TestServerLMS/TestServerLMS/CMakeLists.txt
View File

@@ -39,19 +39,6 @@ target_link_libraries(TestServerLMS PRIVATE Qt5::Sql)
target_link_libraries(TestServerLMS PRIVATE Qt5::Xml)
target_include_directories(TestServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees)
target_include_directories(TestServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/instructors)
target_include_directories(TestServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/trainees)
target_include_directories(TestServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/tasks)
target_include_directories(TestServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/docTasks)
if(PROJECT_TYPE_DEBUG)
target_link_directories(TestServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/Debug64)
elseif()
target_link_directories(TestServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/Release64)
endif()
target_link_libraries(TestServerLMS PRIVATE libInstructorsAndTrainees.dll)
target_include_directories(TestServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_LMS/DataBaseLMS)
if(PROJECT_TYPE_DEBUG)
target_link_directories(TestServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_LMS/Debug64)

2
TestServerLMS/TestServerLMS/CMakeLists.txt.user
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.11.1, 2024-12-02T13:06:50. -->
<!-- Written by QtCreator 4.11.1, 2024-12-02T17:48:00. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>

30
TestServerLMS/TestServerLMS/mainwindow.cpp
View File

@@ -6,39 +6,15 @@
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::MainWindow),
m_serverLMSWidget(nullptr)//,
//m_messangerWidget(nullptr)//,
//m_instructorsAndTrainees(nullptr)
m_serverLMSWidget(nullptr)
{
ui->setupUi(this);
//m_instructorsAndTrainees = new InstructorsAndTraineesWidget(this);
//m_messangerWidget = new MessangerWidget();
m_serverLMSWidget = new ServerLMSWidget(/*m_instructorsAndTrainees, m_messangerWidget*/);
m_serverLMSWidget = new ServerLMSWidget();
ui->verticalLayout_1->addWidget(m_serverLMSWidget);
//ui->verticalLayout_2->addWidget(m_instructorsAndTrainees);
QHBoxLayout *layout = new QHBoxLayout(this);
ui->verticalLayout_2->addLayout(layout);
//layout->addWidget(m_messangerWidget);
//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_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(m_serverLMSWidget, &ServerLMSWidget::signal_authorizationChanged, this, &MainWindow::slot_authorizationChanged); //Уже не требуется!
//Задаём два пункта с текстом локалей в комбобоксе
ui->cmbLanguage->addItems(QStringList() << "English" << "Русский");
@@ -49,8 +25,6 @@ MainWindow::MainWindow(QWidget *parent) :
MainWindow::~MainWindow()
{
delete m_serverLMSWidget;
//delete m_messangerWidget;
//delete m_instructorsAndTrainees;
delete ui;
}

10
TestServerLMS/TestServerLMS/mainwindow.h
View File

@@ -7,7 +7,6 @@
#include "serverlmswidget.h"
#include "messangerwidget.h"
//#include "instructorsandtraineeswidget.h"
QT_BEGIN_NAMESPACE
@@ -34,16 +33,9 @@ signals:
private slots:
void on_cmbLanguage_currentIndexChanged(const QString &arg1);
private slots:
//void slot_authorizationChanged(); //Уже не требуется!
private:
Ui::MainWindow *ui;
Ui::MainWindow *ui;
ServerLMSWidget* m_serverLMSWidget;
//MessangerWidget* m_messangerWidget;
//InstructorsAndTraineesWidget* m_instructorsAndTrainees;
QTranslator qtLanguageTranslator;
};
#endif // MAINWINDOW_H

3
TestServerLMS/TestServerLMS/mainwindow.ui
View File

@@ -27,9 +27,6 @@
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<layout class="QVBoxLayout" name="verticalLayout_2"/>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_1"/>
</item>