Стабильная

ProgramServerMPS/CMakeLists.txt

@@ -8,7 +8,7 @@ if(WIN32)
     set(RC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/app.rc)
 endif()
 
-add_executable(ProgramServerMPS WIN32
+add_executable(ServerMPS WIN32
 main.cpp
 mainwindow.cpp
 mainwindow.h
@@ -18,35 +18,35 @@ ProgramServerMPS.qrc
 
 # Подключаем RC-файл к цели
 if(RC_FILE)
-    target_sources(ProgramServerMPS PRIVATE ${RC_FILE})
+    target_sources(ServerMPS PRIVATE ${RC_FILE})
 endif()
 
-target_link_libraries(ProgramServerMPS PRIVATE Qt5::Widgets)
-target_link_libraries(ProgramServerMPS PRIVATE Qt5::Network)
-target_link_libraries(ProgramServerMPS PRIVATE Qt5::Sql)
-target_link_libraries(ProgramServerMPS PRIVATE Qt5::Xml)
+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(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibDataBaseInterface)
+target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibDataBaseInterface)
 if(PROJECT_TYPE_DEBUG)
-    target_link_directories(ProgramServerMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface)
+    target_link_directories(ServerMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface)
 else()
-    target_link_directories(ProgramServerMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface)
+    target_link_directories(ServerMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface)
 endif()
-target_link_libraries(ProgramServerMPS PRIVATE libDataBaseInterface.dll)
+target_link_libraries(ServerMPS PRIVATE libDataBaseInterface.dll)
 
-target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer)
-target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/clienthandler)
-target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/multithreadserver)
-target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/providerdblms)
-target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/Systems)
+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(ProgramServerMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibServer)
+    target_link_directories(ServerMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibServer)
 else()
-    target_link_directories(ProgramServerMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibServer)
+    target_link_directories(ServerMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibServer)
 endif()
-target_link_libraries(ProgramServerMPS PRIVATE libServer.dll)
+target_link_libraries(ServerMPS PRIVATE libServer.dll)
 
-target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees)
-target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/tasks)
-target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/widgets)
-target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/specialmessagebox)
+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)

ProgramServerMPS/mainwindow.cpp

@@ -30,7 +30,7 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(serverLMSWidget, &ServerLMSWidget::signal_Menu_ShowWindow, this, &MainWindow::slot_TrayMenu_ShowWindow);
     connect(serverLMSWidget, &ServerLMSWidget::signal_Menu_HideWindow, this, &MainWindow::slot_TrayMenu_HideWindow);
 
-    qtLanguageTranslator.load(QString("translations/TrayServerLMS_") + serverLMSWidget->getLanguage(), ".");
+    qtLanguageTranslator.load(QString("translations/ProgramServerMPS_") + serverLMSWidget->getLanguage(), ".");
     qApp->installTranslator(&qtLanguageTranslator);
 
     /* Инициализируем иконку трея, устанавливаем иконку,
@@ -193,7 +193,7 @@ void MainWindow::slot_hasError(int code)
 
 void MainWindow::slot_LanguageChanged(QString language)
 {
-    qtLanguageTranslator.load(QString(QStringLiteral("translations/TrayServerLMS_")) + language, QStringLiteral("."));
+    qtLanguageTranslator.load(QString(QStringLiteral("translations/ProgramServerMPS_")) + language, QStringLiteral("."));
     qApp->installTranslator(&qtLanguageTranslator);
 }