Отделил Дебаг паки от проекта и вынес их из гита

This commit is contained in:
krivoshein
2024-12-25 14:32:18 +03:00
parent bf7b0ac741
commit fc1b58e743
603 changed files with 165 additions and 259874 deletions

View File

@@ -64,9 +64,9 @@ target_link_libraries(ServerLMS PRIVATE Qt5::Xml)
target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_LMS/DataBaseLMS)
if(PROJECT_TYPE_DEBUG)
target_link_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_LMS/Debug64)
target_link_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../QT/BUILDS/LMS/DB_LMS/Debug64)
elseif()
target_link_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_LMS/Release64)
target_link_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../QT/BUILDS/LMS/DB_LMS/Release64)
endif()
target_link_libraries(ServerLMS PRIVATE libDataBaseLMS.dll)
@@ -77,5 +77,5 @@ target_compile_definitions(ServerLMS PRIVATE SERVERLMS_LIBRARY)
add_custom_command(TARGET ServerLMS
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
d:/LMS/ServerLMS/Debug64/libServerLMS.dll
d:/LMS/TestServerLMS/Debug64)
d:/QT/BUILDS/LMS/ServerLMS/Debug64/libServerLMS.dll
d:/QT/BUILDS/LMS/TestServerLMS/Debug64)

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.11.1, 2024-12-24T12:21:21. -->
<!-- Written by QtCreator 4.11.1, 2024-12-25T13:38:13. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
@@ -79,7 +79,7 @@
<value type="QString">CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX}</value>
<value type="QString">QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}</value>
</valuelist>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:/LMS/ServerLMS/Debug64</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:/QT/BUILDS/LMS/ServerLMS/Debug64</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>

View File

@@ -393,10 +393,10 @@ QByteArray DataParser::xmlAnswer_deAuthorization(bool result, QString login)
bool DataParser::loadBlankXML(QString nameFile, QDomDocument *commonDOM)
{
QFile blankFile(":/blankXML/" + nameFile);
QFile blankFile(nameFile);
if (! blankFile.open(QFile::ReadOnly | QFile::Text)) {
qDebug() << "loadBlankXML: Не удалось считать файл :/blankXML/" + nameFile;
qDebug() << "loadBlankXML: Couldn't read the file: " + nameFile;
return false;
}
@@ -411,7 +411,7 @@ bool DataParser::saveDOMtoXML(QString nameFile, QDomDocument *commonDOM)
QFile xmlOutFile(nameFile);
if (!xmlOutFile.open(QFile::WriteOnly | QFile::Text))
{
qDebug() << "saveDOMtoXML: Не удалось записать файл " + nameFile;
qDebug() << "saveDOMtoXML: Failed to write a file: " + nameFile;
return false;
}
else
@@ -426,7 +426,7 @@ bool DataParser::saveDOMtoXML(QString nameFile, QDomDocument *commonDOM)
QByteArray DataParser::xmlAnswer_ClientQueryToDB_ListInstructors(bool result, QList<Instructor> *listInstructors)
{
QDomDocument commonDOM;
if(! loadBlankXML("ListInstructors.xml", &commonDOM))
if(! loadBlankXML(":/resources/blankXML/ListInstructors.xml", &commonDOM))
return QByteArray();
QDomNode listNode = commonDOM.namedItem("ListInstructors");
@@ -453,7 +453,7 @@ QByteArray DataParser::xmlAnswer_ClientQueryToDB_ListInstructors(bool result, QL
QByteArray DataParser::xmlAnswer_ClientQueryToDB_ListGroups(bool result, QList<Group> *listGroups)
{
QDomDocument commonDOM;
if(! loadBlankXML("ListGroups.xml", &commonDOM))
if(! loadBlankXML(":/resources/blankXML/ListGroups.xml", &commonDOM))
return QByteArray();
QDomNode listNode = commonDOM.namedItem("ListGroups");
@@ -475,7 +475,7 @@ QByteArray DataParser::xmlAnswer_ClientQueryToDB_ListGroups(bool result, QList<G
QByteArray DataParser::xmlAnswer_ClientQueryToDB_ListTrainees(bool result, QList<Trainee> *listTrainees)
{
QDomDocument commonDOM;
if(! loadBlankXML("ListTrainees.xml", &commonDOM))
if(! loadBlankXML(":/resources/blankXML/ListTrainees.xml", &commonDOM))
return QByteArray();
QDomNode listNode = commonDOM.namedItem("ListTrainees");

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

View File

@@ -1,12 +1,9 @@
<RCC>
<qresource prefix="/">
<file>icons/instructor.png</file>
<file>icons/instructorAdmin.png</file>
<file>icons/trainee.png</file>
<file>icons/switchOff.png</file>
<file>icons/switchOn.png</file>
<file>blankXML/ListInstructors.xml</file>
<file>blankXML/ListGroups.xml</file>
<file>blankXML/ListTrainees.xml</file>
<file>resources/blankXML/ListGroups.xml</file>
<file>resources/blankXML/ListInstructors.xml</file>
<file>resources/blankXML/ListTrainees.xml</file>
<file>resources/icons/switchOff.png</file>
<file>resources/icons/switchOn.png</file>
</qresource>
</RCC>

View File

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -1,6 +0,0 @@
#include "serverlms.h"
ServerLMS::ServerLMS()
{
}

View File

@@ -1,13 +0,0 @@
#ifndef SERVERLMS_H
#define SERVERLMS_H
#include "ServerLMS_global.h"
class SERVERLMS_EXPORT ServerLMS
{
public:
ServerLMS();
};
#endif // SERVERLMS_H

View File

@@ -298,7 +298,7 @@ void ServerLMSWidget::on_btnStartServer_clicked()
ui->btnStartServer->setEnabled(false);
ui->btnStopServer->setEnabled(true);
ui->lblOnOff->setPixmap(QPixmap(QStringLiteral(":/icons/switchOn.png")));
ui->lblOnOff->setPixmap(QPixmap(QStringLiteral(":/resources/icons/switchOn.png")));
}
}
@@ -308,7 +308,7 @@ void ServerLMSWidget::on_btnStopServer_clicked()
{
ui->btnStopServer->setEnabled(false);
ui->btnStartServer->setEnabled(true);
ui->lblOnOff->setPixmap(QPixmap(QStringLiteral(":/icons/switchOff.png")));
ui->lblOnOff->setPixmap(QPixmap(QStringLiteral(":/resources/icons/switchOff.png")));
}
}

View File

@@ -106,7 +106,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="resources.qrc">:/icons/switchOff.png</pixmap>
<pixmap resource="resources.qrc">:/resources/icons/switchOff.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>