diff --git a/CMakeLists.txt b/CMakeLists.txt index 914990a..6936560 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5) message("Using CMake ${CMAKE_VERSION}\n") -project(MPS LANGUAGES CXX) +project(MTD LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOUIC ON) @@ -21,7 +21,7 @@ endif() include(cmake/CommonInfoForProject.cmake) -common_info_for_project(MPS) +common_info_for_project(MTD) find_package(Qt5 COMPONENTS Widgets REQUIRED) find_package(Qt5 COMPONENTS Network REQUIRED) @@ -33,11 +33,11 @@ find_package(Qt5 COMPONENTS Concurrent REQUIRED) add_subdirectory(LibDataBaseInterface) add_subdirectory(LibInstructorsAndTrainees) add_subdirectory(LibServer) -add_subdirectory(ProgramAWSinstructorMPS) -add_subdirectory(ProgramServerMPS) +add_subdirectory(ProgramAWSinstructorMTD) +add_subdirectory(ProgramServerMTD) add_dependencies(InstructorsAndTrainees DataBaseInterface) add_dependencies(Server DataBaseInterface) add_dependencies(Server InstructorsAndTrainees) -add_dependencies(AWSinstructorMPS InstructorsAndTrainees) -add_dependencies(ServerMPS Server) +add_dependencies(AWSinstructorMTD InstructorsAndTrainees) +add_dependencies(ServerMTD Server) diff --git a/FILES/config_ProgramAWSinstructorMPS/settings.xml b/FILES/config_ProgramAWSinstructorMTD/settings.xml similarity index 100% rename from FILES/config_ProgramAWSinstructorMPS/settings.xml rename to FILES/config_ProgramAWSinstructorMTD/settings.xml diff --git a/FILES/config_ProgramServerMPS/settings.xml b/FILES/config_ProgramServerMTD/settings.xml similarity index 100% rename from FILES/config_ProgramServerMPS/settings.xml rename to FILES/config_ProgramServerMTD/settings.xml diff --git a/FILES/translations/RRJServer_ru_RU.qm b/FILES/translations/RRJServer_ru_RU.qm index d9b1495..24daaea 100644 Binary files a/FILES/translations/RRJServer_ru_RU.qm and b/FILES/translations/RRJServer_ru_RU.qm differ diff --git a/LibDataBaseInterface/CMakeLists.txt b/LibDataBaseInterface/CMakeLists.txt index 89fdc0e..631f6a0b 100644 --- a/LibDataBaseInterface/CMakeLists.txt +++ b/LibDataBaseInterface/CMakeLists.txt @@ -52,26 +52,26 @@ if(PROJECT_TYPE_DEBUG) POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface/libDataBaseInterface.dll - ${REPO_PATH}/BUILDS/Debug64/ProgramServerMPS) + ${REPO_PATH}/BUILDS/Debug64/ProgramServerMTD) add_custom_command(TARGET DataBaseInterface POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface/libDataBaseInterface.dll - ${REPO_PATH}/BUILDS/Debug64/ProgramAWSinstructorMPS) + ${REPO_PATH}/BUILDS/Debug64/ProgramAWSinstructorMTD) else() add_custom_command(TARGET DataBaseInterface POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface/libDataBaseInterface.dll - ${REPO_PATH}/BUILDS/Release64/ProgramServerMPS) + ${REPO_PATH}/BUILDS/Release64/ProgramServerMTD) add_custom_command(TARGET DataBaseInterface POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface/libDataBaseInterface.dll - ${REPO_PATH}/BUILDS/Release64/ProgramAWSinstructorMPS) + ${REPO_PATH}/BUILDS/Release64/ProgramAWSinstructorMTD) endif() diff --git a/LibInstructorsAndTrainees/CMakeLists.txt b/LibInstructorsAndTrainees/CMakeLists.txt index 0153d48..20d86ea 100644 --- a/LibInstructorsAndTrainees/CMakeLists.txt +++ b/LibInstructorsAndTrainees/CMakeLists.txt @@ -176,24 +176,24 @@ if(PROJECT_TYPE_DEBUG) POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REPO_PATH}/BUILDS/Debug64/LibInstructorsAndTrainees/libInstructorsAndTrainees.dll - ${REPO_PATH}/BUILDS/Debug64/ProgramAWSinstructorMPS) + ${REPO_PATH}/BUILDS/Debug64/ProgramAWSinstructorMTD) add_custom_command(TARGET InstructorsAndTrainees POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REPO_PATH}/BUILDS/Debug64/LibInstructorsAndTrainees/libInstructorsAndTrainees.dll - ${REPO_PATH}/BUILDS/Debug64/ProgramServerMPS) + ${REPO_PATH}/BUILDS/Debug64/ProgramServerMTD) else() add_custom_command(TARGET InstructorsAndTrainees POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REPO_PATH}/BUILDS/Release64/LibInstructorsAndTrainees/libInstructorsAndTrainees.dll - ${REPO_PATH}/BUILDS/Release64/ProgramAWSinstructorMPS) + ${REPO_PATH}/BUILDS/Release64/ProgramAWSinstructorMTD) add_custom_command(TARGET InstructorsAndTrainees POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REPO_PATH}/BUILDS/Release64/LibInstructorsAndTrainees/libInstructorsAndTrainees.dll - ${REPO_PATH}/BUILDS/Release64/ProgramServerMPS) + ${REPO_PATH}/BUILDS/Release64/ProgramServerMTD) endif() #Только для TSMP! diff --git a/LibServer/CMakeLists.txt b/LibServer/CMakeLists.txt index e6ad624..f95621d 100644 --- a/LibServer/CMakeLists.txt +++ b/LibServer/CMakeLists.txt @@ -102,11 +102,11 @@ if(PROJECT_TYPE_DEBUG) POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REPO_PATH}/BUILDS/Debug64/LibServer/libServer.dll - ${REPO_PATH}/BUILDS/Debug64/ProgramServerMPS) + ${REPO_PATH}/BUILDS/Debug64/ProgramServerMTD) else() add_custom_command(TARGET Server POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REPO_PATH}/BUILDS/Release64/LibServer/libServer.dll - ${REPO_PATH}/BUILDS/Release64/ProgramServerMPS) + ${REPO_PATH}/BUILDS/Release64/ProgramServerMTD) endif() diff --git a/ProgramAWSinstructorMPS/CMakeLists.txt b/ProgramAWSinstructorMPS/CMakeLists.txt deleted file mode 100644 index 348271a..0000000 --- a/ProgramAWSinstructorMPS/CMakeLists.txt +++ /dev/null @@ -1,55 +0,0 @@ -project(ProgramAWSinstructorMPS LANGUAGES CXX) - -common_info_for_project(ProgramAWSinstructorMPS) - -# Подключаем RC-файл (только для Windows) -if(WIN32) - # Предполагая, что файл app.rc расположен в корневом каталоге проекта - set(RC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/app.rc) -endif() - -add_executable(AWSinstructorMPS WIN32 -main.cpp -mainwindow.cpp -mainwindow.h -mainwindow.ui -ProgramAWSinstructorMPS.qrc -) - -# Подключаем RC-файл к цели -if(RC_FILE) - target_sources(AWSinstructorMPS PRIVATE ${RC_FILE}) -endif() - -target_link_libraries(AWSinstructorMPS PRIVATE Qt5::Widgets) -target_link_libraries(AWSinstructorMPS PRIVATE Qt5::Sql) -target_link_libraries(AWSinstructorMPS PRIVATE Qt5::Xml) -target_link_libraries(AWSinstructorMPS PRIVATE Qt5::Network) - -target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees) -target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/instructors) -target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/trainees) -target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/tasks) -target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/docTasks) -target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/connectorToServer) -target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/connectorToServer/Core) -target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/messanger) -target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/widgets) -target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/specialmessagebox) -target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/settings) -target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/authorization) -if(PROJECT_TYPE_DEBUG) - target_link_directories(AWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibInstructorsAndTrainees) -else() - target_link_directories(AWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibInstructorsAndTrainees) -endif() -target_link_libraries(AWSinstructorMPS PRIVATE libInstructorsAndTrainees.dll) - - -target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibDataBaseInterface) -if(PROJECT_TYPE_DEBUG) - target_link_directories(AWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface) -else() - target_link_directories(AWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface) -endif() -target_link_libraries(AWSinstructorMPS PRIVATE libDataBaseInterface.dll) diff --git a/ProgramAWSinstructorMTD/CMakeLists.txt b/ProgramAWSinstructorMTD/CMakeLists.txt new file mode 100644 index 0000000..b296e89 --- /dev/null +++ b/ProgramAWSinstructorMTD/CMakeLists.txt @@ -0,0 +1,55 @@ +project(ProgramAWSinstructorMTD LANGUAGES CXX) + +common_info_for_project(ProgramAWSinstructorMTD) + +# Подключаем RC-файл (только для Windows) +if(WIN32) + # Предполагая, что файл app.rc расположен в корневом каталоге проекта + set(RC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/app.rc) +endif() + +add_executable(AWSinstructorMTD WIN32 +main.cpp +mainwindow.cpp +mainwindow.h +mainwindow.ui +ProgramAWSinstructorMTD.qrc +) + +# Подключаем RC-файл к цели +if(RC_FILE) + target_sources(AWSinstructorMTD PRIVATE ${RC_FILE}) +endif() + +target_link_libraries(AWSinstructorMTD PRIVATE Qt5::Widgets) +target_link_libraries(AWSinstructorMTD PRIVATE Qt5::Sql) +target_link_libraries(AWSinstructorMTD PRIVATE Qt5::Xml) +target_link_libraries(AWSinstructorMTD PRIVATE Qt5::Network) + +target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees) +target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/instructors) +target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/trainees) +target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/tasks) +target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/docTasks) +target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/connectorToServer) +target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/connectorToServer/Core) +target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/messanger) +target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/widgets) +target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/specialmessagebox) +target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/settings) +target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/authorization) +if(PROJECT_TYPE_DEBUG) + target_link_directories(AWSinstructorMTD PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibInstructorsAndTrainees) +else() + target_link_directories(AWSinstructorMTD PUBLIC ${REPO_PATH}/BUILDS/Release64/LibInstructorsAndTrainees) +endif() +target_link_libraries(AWSinstructorMTD PRIVATE libInstructorsAndTrainees.dll) + + +target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibDataBaseInterface) +if(PROJECT_TYPE_DEBUG) + target_link_directories(AWSinstructorMTD PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface) +else() + target_link_directories(AWSinstructorMTD PUBLIC ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface) +endif() +target_link_libraries(AWSinstructorMTD PRIVATE libDataBaseInterface.dll) diff --git a/ProgramAWSinstructorMPS/CMakeLists.txt.user.00ce76f b/ProgramAWSinstructorMTD/CMakeLists.txt.user.00ce76f similarity index 100% rename from ProgramAWSinstructorMPS/CMakeLists.txt.user.00ce76f rename to ProgramAWSinstructorMTD/CMakeLists.txt.user.00ce76f diff --git a/ProgramAWSinstructorMPS/CMakeLists.txt.user.15ef247 b/ProgramAWSinstructorMTD/CMakeLists.txt.user.15ef247 similarity index 100% rename from ProgramAWSinstructorMPS/CMakeLists.txt.user.15ef247 rename to ProgramAWSinstructorMTD/CMakeLists.txt.user.15ef247 diff --git a/ProgramAWSinstructorMPS/ProgramAWSinstructorMPS.qrc b/ProgramAWSinstructorMTD/ProgramAWSinstructorMTD.qrc similarity index 100% rename from ProgramAWSinstructorMPS/ProgramAWSinstructorMPS.qrc rename to ProgramAWSinstructorMTD/ProgramAWSinstructorMTD.qrc diff --git a/ProgramAWSinstructorMPS/app.rc b/ProgramAWSinstructorMTD/app.rc similarity index 100% rename from ProgramAWSinstructorMPS/app.rc rename to ProgramAWSinstructorMTD/app.rc diff --git a/ProgramAWSinstructorMPS/main.cpp b/ProgramAWSinstructorMTD/main.cpp similarity index 100% rename from ProgramAWSinstructorMPS/main.cpp rename to ProgramAWSinstructorMTD/main.cpp diff --git a/ProgramAWSinstructorMPS/mainwindow.cpp b/ProgramAWSinstructorMTD/mainwindow.cpp similarity index 100% rename from ProgramAWSinstructorMPS/mainwindow.cpp rename to ProgramAWSinstructorMTD/mainwindow.cpp diff --git a/ProgramAWSinstructorMPS/mainwindow.h b/ProgramAWSinstructorMTD/mainwindow.h similarity index 100% rename from ProgramAWSinstructorMPS/mainwindow.h rename to ProgramAWSinstructorMTD/mainwindow.h diff --git a/ProgramAWSinstructorMPS/mainwindow.ui b/ProgramAWSinstructorMTD/mainwindow.ui similarity index 86% rename from ProgramAWSinstructorMPS/mainwindow.ui rename to ProgramAWSinstructorMTD/mainwindow.ui index 4eee030..7f8f6d9 100644 --- a/ProgramAWSinstructorMPS/mainwindow.ui +++ b/ProgramAWSinstructorMTD/mainwindow.ui @@ -16,10 +16,10 @@ - Maintenance procedures simulator RRJ-95NEW-100 Instructor's workstation + Maintenance training device RRJ-95NEW-100 Instructor's workstation - + :/resources/PngGUIRRJ.png:/resources/PngGUIRRJ.png @@ -47,7 +47,7 @@ - + diff --git a/ProgramAWSinstructorMPS/resources/IcoGUIRRJ.ico b/ProgramAWSinstructorMTD/resources/IcoGUIRRJ.ico similarity index 100% rename from ProgramAWSinstructorMPS/resources/IcoGUIRRJ.ico rename to ProgramAWSinstructorMTD/resources/IcoGUIRRJ.ico diff --git a/ProgramAWSinstructorMPS/resources/PngGUIRRJ.png b/ProgramAWSinstructorMTD/resources/PngGUIRRJ.png similarity index 100% rename from ProgramAWSinstructorMPS/resources/PngGUIRRJ.png rename to ProgramAWSinstructorMTD/resources/PngGUIRRJ.png diff --git a/ProgramAWSinstructorMPS/resources/old/IcoGUIRRJ.ico b/ProgramAWSinstructorMTD/resources/old/IcoGUIRRJ.ico similarity index 100% rename from ProgramAWSinstructorMPS/resources/old/IcoGUIRRJ.ico rename to ProgramAWSinstructorMTD/resources/old/IcoGUIRRJ.ico diff --git a/ProgramAWSinstructorMPS/resources/old/PngGUIRRJ.png b/ProgramAWSinstructorMTD/resources/old/PngGUIRRJ.png similarity index 100% rename from ProgramAWSinstructorMPS/resources/old/PngGUIRRJ.png rename to ProgramAWSinstructorMTD/resources/old/PngGUIRRJ.png diff --git a/ProgramAWSinstructorMPS/translations/ProgramAWSinstructorMPS_ru_RU.qm b/ProgramAWSinstructorMTD/translations/ProgramAWSinstructorMPS_ru_RU.qm similarity index 100% rename from ProgramAWSinstructorMPS/translations/ProgramAWSinstructorMPS_ru_RU.qm rename to ProgramAWSinstructorMTD/translations/ProgramAWSinstructorMPS_ru_RU.qm diff --git a/ProgramAWSinstructorMPS/translations/ProgramAWSinstructorMPS_ru_RU.ts b/ProgramAWSinstructorMTD/translations/ProgramAWSinstructorMPS_ru_RU.ts similarity index 100% rename from ProgramAWSinstructorMPS/translations/ProgramAWSinstructorMPS_ru_RU.ts rename to ProgramAWSinstructorMTD/translations/ProgramAWSinstructorMPS_ru_RU.ts diff --git a/ProgramServerMPS/CMakeLists.txt b/ProgramServerMPS/CMakeLists.txt deleted file mode 100644 index 72d8726..0000000 --- a/ProgramServerMPS/CMakeLists.txt +++ /dev/null @@ -1,52 +0,0 @@ -project(ProgramServerMPS LANGUAGES CXX) - -common_info_for_project(ProgramServerMPS) - -# Подключаем RC-файл (только для Windows) -if(WIN32) - # Предполагая, что файл app.rc расположен в корневом каталоге проекта - set(RC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/app.rc) -endif() - -add_executable(ServerMPS WIN32 -main.cpp -mainwindow.cpp -mainwindow.h -mainwindow.ui -ProgramServerMPS.qrc -) - -# Подключаем RC-файл к цели -if(RC_FILE) - target_sources(ServerMPS PRIVATE ${RC_FILE}) -endif() - -target_link_libraries(ServerMPS PRIVATE Qt5::Widgets) -target_link_libraries(ServerMPS PRIVATE Qt5::Network) -target_link_libraries(ServerMPS PRIVATE Qt5::Sql) -target_link_libraries(ServerMPS PRIVATE Qt5::Xml) - -target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibDataBaseInterface) -if(PROJECT_TYPE_DEBUG) - target_link_directories(ServerMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface) -else() - target_link_directories(ServerMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface) -endif() -target_link_libraries(ServerMPS PRIVATE libDataBaseInterface.dll) - -target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer) -target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/clienthandler) -target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/multithreadserver) -target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/providerdblms) -target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/Systems) -if(PROJECT_TYPE_DEBUG) - target_link_directories(ServerMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibServer) -else() - target_link_directories(ServerMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibServer) -endif() -target_link_libraries(ServerMPS PRIVATE libServer.dll) - -target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees) -target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/tasks) -target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/widgets) -target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/specialmessagebox) diff --git a/ProgramServerMTD/CMakeLists.txt b/ProgramServerMTD/CMakeLists.txt new file mode 100644 index 0000000..7e966fe --- /dev/null +++ b/ProgramServerMTD/CMakeLists.txt @@ -0,0 +1,52 @@ +project(ProgramServerMTD LANGUAGES CXX) + +common_info_for_project(ProgramServerMTD) + +# Подключаем RC-файл (только для Windows) +if(WIN32) + # Предполагая, что файл app.rc расположен в корневом каталоге проекта + set(RC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/app.rc) +endif() + +add_executable(ServerMTD WIN32 +main.cpp +mainwindow.cpp +mainwindow.h +mainwindow.ui +ProgramServerMTD.qrc +) + +# Подключаем RC-файл к цели +if(RC_FILE) + target_sources(ServerMTD PRIVATE ${RC_FILE}) +endif() + +target_link_libraries(ServerMTD PRIVATE Qt5::Widgets) +target_link_libraries(ServerMTD PRIVATE Qt5::Network) +target_link_libraries(ServerMTD PRIVATE Qt5::Sql) +target_link_libraries(ServerMTD PRIVATE Qt5::Xml) + +target_include_directories(ServerMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibDataBaseInterface) +if(PROJECT_TYPE_DEBUG) + target_link_directories(ServerMTD PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface) +else() + target_link_directories(ServerMTD PUBLIC ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface) +endif() +target_link_libraries(ServerMTD PRIVATE libDataBaseInterface.dll) + +target_include_directories(ServerMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer) +target_include_directories(ServerMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/clienthandler) +target_include_directories(ServerMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/multithreadserver) +target_include_directories(ServerMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/providerdblms) +target_include_directories(ServerMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/Systems) +if(PROJECT_TYPE_DEBUG) + target_link_directories(ServerMTD PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibServer) +else() + target_link_directories(ServerMTD PUBLIC ${REPO_PATH}/BUILDS/Release64/LibServer) +endif() +target_link_libraries(ServerMTD PRIVATE libServer.dll) + +target_include_directories(ServerMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees) +target_include_directories(ServerMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/tasks) +target_include_directories(ServerMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/widgets) +target_include_directories(ServerMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/specialmessagebox) diff --git a/ProgramServerMPS/CMakeLists.txt.user.00ce76f b/ProgramServerMTD/CMakeLists.txt.user.00ce76f similarity index 100% rename from ProgramServerMPS/CMakeLists.txt.user.00ce76f rename to ProgramServerMTD/CMakeLists.txt.user.00ce76f diff --git a/ProgramServerMPS/CMakeLists.txt.user.15ef247 b/ProgramServerMTD/CMakeLists.txt.user.15ef247 similarity index 100% rename from ProgramServerMPS/CMakeLists.txt.user.15ef247 rename to ProgramServerMTD/CMakeLists.txt.user.15ef247 diff --git a/ProgramServerMPS/ProgramServerMPS.qrc b/ProgramServerMTD/ProgramServerMTD.qrc similarity index 100% rename from ProgramServerMPS/ProgramServerMPS.qrc rename to ProgramServerMTD/ProgramServerMTD.qrc diff --git a/ProgramServerMPS/app.rc b/ProgramServerMTD/app.rc similarity index 100% rename from ProgramServerMPS/app.rc rename to ProgramServerMTD/app.rc diff --git a/ProgramServerMPS/main.cpp b/ProgramServerMTD/main.cpp similarity index 100% rename from ProgramServerMPS/main.cpp rename to ProgramServerMTD/main.cpp diff --git a/ProgramServerMPS/mainwindow.cpp b/ProgramServerMTD/mainwindow.cpp similarity index 98% rename from ProgramServerMPS/mainwindow.cpp rename to ProgramServerMTD/mainwindow.cpp index 9f2c547..dd8c82c 100644 --- a/ProgramServerMPS/mainwindow.cpp +++ b/ProgramServerMTD/mainwindow.cpp @@ -163,7 +163,7 @@ void MainWindow::slot_TrayMenu_Exit() void MainWindow::slot_Tray_ShowMessage(QString textMsg, QSystemTrayIcon::MessageIcon iconMsg) { QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::MessageIcon(iconMsg); - trayIcon->showMessage(tr("Server MPS"), textMsg, icon, 100); + trayIcon->showMessage(tr("Server MTD"), textMsg, icon, 100); } void MainWindow::slot_updateStateServer(EStateServer stateServer, EStateBlockAutorization stateBlockAutorization) @@ -228,7 +228,7 @@ void MainWindow::errorCheck() void MainWindow::updateTrayTitles() { - trayIcon->setToolTip(tr("Server MPS")); + trayIcon->setToolTip(tr("Server MTD")); action_ShowWindow->setText(tr("Expand window")); action_HideWindow->setText(tr("Minimize window")); action_Exit->setText(tr("Exit")); diff --git a/ProgramServerMPS/mainwindow.h b/ProgramServerMTD/mainwindow.h similarity index 100% rename from ProgramServerMPS/mainwindow.h rename to ProgramServerMTD/mainwindow.h diff --git a/ProgramServerMPS/mainwindow.ui b/ProgramServerMTD/mainwindow.ui similarity index 85% rename from ProgramServerMPS/mainwindow.ui rename to ProgramServerMTD/mainwindow.ui index 7a15d33..eb50439 100644 --- a/ProgramServerMPS/mainwindow.ui +++ b/ProgramServerMTD/mainwindow.ui @@ -17,10 +17,10 @@ - Maintenance procedures simulator RRJ-95NEW-100 Server + Maintenance training device RRJ-95NEW-100 Server - + :/resources/PngServerRRJ.png:/resources/PngServerRRJ.png @@ -36,7 +36,7 @@ - + diff --git a/ProgramServerMPS/resources/IcoServerRRJ.ico b/ProgramServerMTD/resources/IcoServerRRJ.ico similarity index 100% rename from ProgramServerMPS/resources/IcoServerRRJ.ico rename to ProgramServerMTD/resources/IcoServerRRJ.ico diff --git a/ProgramServerMPS/resources/PngServerRRJ.png b/ProgramServerMTD/resources/PngServerRRJ.png similarity index 100% rename from ProgramServerMPS/resources/PngServerRRJ.png rename to ProgramServerMTD/resources/PngServerRRJ.png diff --git a/ProgramServerMPS/resources/PngServerRRJ_lock.png b/ProgramServerMTD/resources/PngServerRRJ_lock.png similarity index 100% rename from ProgramServerMPS/resources/PngServerRRJ_lock.png rename to ProgramServerMTD/resources/PngServerRRJ_lock.png diff --git a/ProgramServerMPS/resources/PngServerRRJ_start.png b/ProgramServerMTD/resources/PngServerRRJ_start.png similarity index 100% rename from ProgramServerMPS/resources/PngServerRRJ_start.png rename to ProgramServerMTD/resources/PngServerRRJ_start.png diff --git a/ProgramServerMPS/resources/PngServerRRJ_stop.png b/ProgramServerMTD/resources/PngServerRRJ_stop.png similarity index 100% rename from ProgramServerMPS/resources/PngServerRRJ_stop.png rename to ProgramServerMTD/resources/PngServerRRJ_stop.png diff --git a/ProgramServerMPS/resources/old/IcoServerRRJ.ico b/ProgramServerMTD/resources/old/IcoServerRRJ.ico similarity index 100% rename from ProgramServerMPS/resources/old/IcoServerRRJ.ico rename to ProgramServerMTD/resources/old/IcoServerRRJ.ico diff --git a/ProgramServerMPS/resources/old/PngServerRRJ.png b/ProgramServerMTD/resources/old/PngServerRRJ.png similarity index 100% rename from ProgramServerMPS/resources/old/PngServerRRJ.png rename to ProgramServerMTD/resources/old/PngServerRRJ.png diff --git a/ProgramServerMPS/translations/ProgramServerMPS_ru_RU.qm b/ProgramServerMTD/translations/ProgramServerMPS_ru_RU.qm similarity index 100% rename from ProgramServerMPS/translations/ProgramServerMPS_ru_RU.qm rename to ProgramServerMTD/translations/ProgramServerMPS_ru_RU.qm diff --git a/ProgramServerMPS/translations/ProgramServerMPS_ru_RU.ts b/ProgramServerMTD/translations/ProgramServerMPS_ru_RU.ts similarity index 100% rename from ProgramServerMPS/translations/ProgramServerMPS_ru_RU.ts rename to ProgramServerMTD/translations/ProgramServerMPS_ru_RU.ts diff --git a/translations/RRJServer_ru_RU.qm b/translations/RRJServer_ru_RU.qm index d9b1495..24daaea 100644 Binary files a/translations/RRJServer_ru_RU.qm and b/translations/RRJServer_ru_RU.qm differ diff --git a/translations/RRJServer_ru_RU.ts b/translations/RRJServer_ru_RU.ts index 28c8607..d460c4a 100644 --- a/translations/RRJServer_ru_RU.ts +++ b/translations/RRJServer_ru_RU.ts @@ -1406,40 +1406,42 @@ Please reconnect to the server. MainWindow - - Maintenance procedures simulator RRJ-95NEW-100 Instructor's workstation - АРМ инструктора Тренажёра процедур технического обслуживания RRJ-95NEW-100 - - - - - Server MPS + + + Server MTD Сервер ТПТО - + Expand window Развернуть окно - + Minimize window Свернуть окно - + Exit Выход - + Starting the server... Запуск сервера... - - Maintenance procedures simulator RRJ-95NEW-100 Server - Сервер Тренажёра процедур технического обслуживания RRJ-95NEW-100 + + Maintenance training device RRJ-95NEW-100 Instructor's workstation + АРМ Инструктора Тренажёра процедур технического +обслуживания RRJ-95NEW-100 + + + + Maintenance training device RRJ-95NEW-100 Server + Сервер Тренажёра процедур технического +обслуживания RRJ-95NEW-100