From 36527a9cb57e139cc676626b255d7671261a38d4 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Mon, 12 Jan 2026 15:27:12 +0300 Subject: [PATCH] MPS->MTD --- CMakeLists.txt | 12 ++-- .../settings.xml | 0 .../settings.xml | 0 FILES/translations/RRJServer_ru_RU.qm | Bin 32622 -> 32612 bytes LibDataBaseInterface/CMakeLists.txt | 8 +-- LibInstructorsAndTrainees/CMakeLists.txt | 8 +-- LibServer/CMakeLists.txt | 4 +- ProgramAWSinstructorMPS/CMakeLists.txt | 55 ------------------ ProgramAWSinstructorMTD/CMakeLists.txt | 55 ++++++++++++++++++ .../CMakeLists.txt.user.00ce76f | 0 .../CMakeLists.txt.user.15ef247 | 0 .../ProgramAWSinstructorMTD.qrc | 0 .../app.rc | 0 .../main.cpp | 0 .../mainwindow.cpp | 0 .../mainwindow.h | 0 .../mainwindow.ui | 6 +- .../resources/IcoGUIRRJ.ico | Bin .../resources/PngGUIRRJ.png | Bin .../resources/old/IcoGUIRRJ.ico | Bin .../resources/old/PngGUIRRJ.png | Bin .../ProgramAWSinstructorMPS_ru_RU.qm | Bin .../ProgramAWSinstructorMPS_ru_RU.ts | 0 ProgramServerMPS/CMakeLists.txt | 52 ----------------- ProgramServerMTD/CMakeLists.txt | 52 +++++++++++++++++ .../CMakeLists.txt.user.00ce76f | 0 .../CMakeLists.txt.user.15ef247 | 0 .../ProgramServerMTD.qrc | 0 {ProgramServerMPS => ProgramServerMTD}/app.rc | 0 .../main.cpp | 0 .../mainwindow.cpp | 4 +- .../mainwindow.h | 0 .../mainwindow.ui | 6 +- .../resources/IcoServerRRJ.ico | Bin .../resources/PngServerRRJ.png | Bin .../resources/PngServerRRJ_lock.png | Bin .../resources/PngServerRRJ_start.png | Bin .../resources/PngServerRRJ_stop.png | Bin .../resources/old/IcoServerRRJ.ico | Bin .../resources/old/PngServerRRJ.png | Bin .../translations/ProgramServerMPS_ru_RU.qm | Bin .../translations/ProgramServerMPS_ru_RU.ts | 0 translations/RRJServer_ru_RU.qm | Bin 32622 -> 32612 bytes translations/RRJServer_ru_RU.ts | 32 +++++----- 44 files changed, 148 insertions(+), 146 deletions(-) rename FILES/{config_ProgramAWSinstructorMPS => config_ProgramAWSinstructorMTD}/settings.xml (100%) rename FILES/{config_ProgramServerMPS => config_ProgramServerMTD}/settings.xml (100%) delete mode 100644 ProgramAWSinstructorMPS/CMakeLists.txt create mode 100644 ProgramAWSinstructorMTD/CMakeLists.txt rename {ProgramAWSinstructorMPS => ProgramAWSinstructorMTD}/CMakeLists.txt.user.00ce76f (100%) rename {ProgramAWSinstructorMPS => ProgramAWSinstructorMTD}/CMakeLists.txt.user.15ef247 (100%) rename ProgramAWSinstructorMPS/ProgramAWSinstructorMPS.qrc => ProgramAWSinstructorMTD/ProgramAWSinstructorMTD.qrc (100%) rename {ProgramAWSinstructorMPS => ProgramAWSinstructorMTD}/app.rc (100%) rename {ProgramAWSinstructorMPS => ProgramAWSinstructorMTD}/main.cpp (100%) rename {ProgramAWSinstructorMPS => ProgramAWSinstructorMTD}/mainwindow.cpp (100%) rename {ProgramAWSinstructorMPS => ProgramAWSinstructorMTD}/mainwindow.h (100%) rename {ProgramAWSinstructorMPS => ProgramAWSinstructorMTD}/mainwindow.ui (86%) rename {ProgramAWSinstructorMPS => ProgramAWSinstructorMTD}/resources/IcoGUIRRJ.ico (100%) rename {ProgramAWSinstructorMPS => ProgramAWSinstructorMTD}/resources/PngGUIRRJ.png (100%) rename {ProgramAWSinstructorMPS => ProgramAWSinstructorMTD}/resources/old/IcoGUIRRJ.ico (100%) rename {ProgramAWSinstructorMPS => ProgramAWSinstructorMTD}/resources/old/PngGUIRRJ.png (100%) rename {ProgramAWSinstructorMPS => ProgramAWSinstructorMTD}/translations/ProgramAWSinstructorMPS_ru_RU.qm (100%) rename {ProgramAWSinstructorMPS => ProgramAWSinstructorMTD}/translations/ProgramAWSinstructorMPS_ru_RU.ts (100%) delete mode 100644 ProgramServerMPS/CMakeLists.txt create mode 100644 ProgramServerMTD/CMakeLists.txt rename {ProgramServerMPS => ProgramServerMTD}/CMakeLists.txt.user.00ce76f (100%) rename {ProgramServerMPS => ProgramServerMTD}/CMakeLists.txt.user.15ef247 (100%) rename ProgramServerMPS/ProgramServerMPS.qrc => ProgramServerMTD/ProgramServerMTD.qrc (100%) rename {ProgramServerMPS => ProgramServerMTD}/app.rc (100%) rename {ProgramServerMPS => ProgramServerMTD}/main.cpp (100%) rename {ProgramServerMPS => ProgramServerMTD}/mainwindow.cpp (98%) rename {ProgramServerMPS => ProgramServerMTD}/mainwindow.h (100%) rename {ProgramServerMPS => ProgramServerMTD}/mainwindow.ui (85%) rename {ProgramServerMPS => ProgramServerMTD}/resources/IcoServerRRJ.ico (100%) rename {ProgramServerMPS => ProgramServerMTD}/resources/PngServerRRJ.png (100%) rename {ProgramServerMPS => ProgramServerMTD}/resources/PngServerRRJ_lock.png (100%) rename {ProgramServerMPS => ProgramServerMTD}/resources/PngServerRRJ_start.png (100%) rename {ProgramServerMPS => ProgramServerMTD}/resources/PngServerRRJ_stop.png (100%) rename {ProgramServerMPS => ProgramServerMTD}/resources/old/IcoServerRRJ.ico (100%) rename {ProgramServerMPS => ProgramServerMTD}/resources/old/PngServerRRJ.png (100%) rename {ProgramServerMPS => ProgramServerMTD}/translations/ProgramServerMPS_ru_RU.qm (100%) rename {ProgramServerMPS => ProgramServerMTD}/translations/ProgramServerMPS_ru_RU.ts (100%) 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 d9b149529b1352740e19543ffd701a87791f93a1..24daaea35a116965d6fe3143f3f08b960d457a70 100644 GIT binary patch delta 928 zcmaLVYfMx}6bJDCT<*Q>4(fJOb=5#GXes#I^%Y`VP*K5Hag$ahf(yH@m(5jJ$nJ`b zp+&6tikQ-4G{LAzW6QSng9)`UQd)d#Qy=(jQUPOp;p>B1LqC8{GJfu-UuNda%$YOi z#UQ&s$i7KsOPkZOM*j+Er9ibGNcI869nxq+vp>f=4iuyT}nqH&Dst1RufQmT^i_< zS`E^g+0ximX}krR=P(fbjT%`VFMA7Z(M&Pyr%SBRsX$BY7n%J9?dJecIhisQBf|;L zkO6VU5AaMJ0j%tY_hzoh`8B-%i23sGs7i6M6V#~q>=RIu*aNJ4N!>~zyGEHw;i-Qp zMMdK6Q}UG~?Nfp9pUUkK4Z@&u$L#`E9aVZiz6_*)lvH+NEl^WU9ZB0*J1tb_u-(+C zy4g-Tre?8c)UCRlZQ7@uH-Hs)rB!*PX@#tSmTSe%h`zDC4oI4y?``b@*8WHxn&BL! zUr>GlhMkp0ReG+u*_V{2yVyLMspsp7DL}~+TCW=!A=?)h6@X{jHZ6^bYqF(rzpXLA z#F5MCm~JqYZtDA(K~>2^zhP$qCvdJdBp+oxj}>1E*=z()5$kI%>(>7eCvizkw;8g*~6P_GsOOE zp4coJX5?O;XgMSDjoA3Pe|vz?8}i%cu&s2!W{kH|wyO_-)qkh#9GDBZC#4)bdI}h` zM(XcOX>FMyI`+GoQg17Bq5~eA*BPS_nv-m&Ucn?=^JJP!>n#HTUQ@7 zb3!K|ZvcEAAj}Emb_o47_4z5@yFgkL;5r}-90jsMfcv2^a1B`f08r2Kn0vsyeL~*= zP|4TL^M(E#U?1Pl{VMd|fbra6U`0^qZm1t}E<6R}t6HESByve*499^DeMkr&;!j;g z!tAlY`rlae($4=rj74wxx~m15{rq%h4YFb{0i#YMYr#pNyo>fqPBjU6!4triKlD;c zXT20<@FYHxva@dkbC*di?TLWrh4gwXubO9z)EjRBHr|rnPkRQ~rWgutZ3ZfK(M>}& z>n6K#2|Go5jq&URwHjx}{W69gRRchjAnzNc%DIs{mEG-o0K+V$p}7ax+(xakH8NUxDBS=ex`qA-3d!-Tnno%Xww$Ib z%gCohu`;SvEUL#;`!DY2qfy1Zz;9E9TX$>Y7utYT z&xJ)X!qR{i`#uJkGg*u89t29hY6*KHc^-o_6lQV6Y1^}Sc4?j3{{F>4zC$~*qmySB z5SD(?>bFnj(et$6!9HMIgBEP+;`JY`-T(OxC_TsO zrCwfGUZmS9{JtW+c$;4j*aF_NZKZ{kK0nPWIrc9$`M - 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 d9b149529b1352740e19543ffd701a87791f93a1..24daaea35a116965d6fe3143f3f08b960d457a70 100644 GIT binary patch delta 928 zcmaLVYfMx}6bJDCT<*Q>4(fJOb=5#GXes#I^%Y`VP*K5Hag$ahf(yH@m(5jJ$nJ`b zp+&6tikQ-4G{LAzW6QSng9)`UQd)d#Qy=(jQUPOp;p>B1LqC8{GJfu-UuNda%$YOi z#UQ&s$i7KsOPkZOM*j+Er9ibGNcI869nxq+vp>f=4iuyT}nqH&Dst1RufQmT^i_< zS`E^g+0ximX}krR=P(fbjT%`VFMA7Z(M&Pyr%SBRsX$BY7n%J9?dJecIhisQBf|;L zkO6VU5AaMJ0j%tY_hzoh`8B-%i23sGs7i6M6V#~q>=RIu*aNJ4N!>~zyGEHw;i-Qp zMMdK6Q}UG~?Nfp9pUUkK4Z@&u$L#`E9aVZiz6_*)lvH+NEl^WU9ZB0*J1tb_u-(+C zy4g-Tre?8c)UCRlZQ7@uH-Hs)rB!*PX@#tSmTSe%h`zDC4oI4y?``b@*8WHxn&BL! zUr>GlhMkp0ReG+u*_V{2yVyLMspsp7DL}~+TCW=!A=?)h6@X{jHZ6^bYqF(rzpXLA z#F5MCm~JqYZtDA(K~>2^zhP$qCvdJdBp+oxj}>1E*=z()5$kI%>(>7eCvizkw;8g*~6P_GsOOE zp4coJX5?O;XgMSDjoA3Pe|vz?8}i%cu&s2!W{kH|wyO_-)qkh#9GDBZC#4)bdI}h` zM(XcOX>FMyI`+GoQg17Bq5~eA*BPS_nv-m&Ucn?=^JJP!>n#HTUQ@7 zb3!K|ZvcEAAj}Emb_o47_4z5@yFgkL;5r}-90jsMfcv2^a1B`f08r2Kn0vsyeL~*= zP|4TL^M(E#U?1Pl{VMd|fbra6U`0^qZm1t}E<6R}t6HESByve*499^DeMkr&;!j;g z!tAlY`rlae($4=rj74wxx~m15{rq%h4YFb{0i#YMYr#pNyo>fqPBjU6!4triKlD;c zXT20<@FYHxva@dkbC*di?TLWrh4gwXubO9z)EjRBHr|rnPkRQ~rWgutZ3ZfK(M>}& z>n6K#2|Go5jq&URwHjx}{W69gRRchjAnzNc%DIs{mEG-o0K+V$p}7ax+(xakH8NUxDBS=ex`qA-3d!-Tnno%Xww$Ib z%gCohu`;SvEUL#;`!DY2qfy1Zz;9E9TX$>Y7utYT z&xJ)X!qR{i`#uJkGg*u89t29hY6*KHc^-o_6lQV6Y1^}Sc4?j3{{F>4zC$~*qmySB z5SD(?>bFnj(et$6!9HMIgBEP+;`JY`-T(OxC_TsO zrCwfGUZmS9{JtW+c$;4j*aF_NZKZ{kK0nPWIrc9$`M 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