Стабильная

ProgramAWSinstructorMPS/CMakeLists.txt

@@ -8,7 +8,7 @@ if(WIN32)
     set(RC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/app.rc)
 endif()
 
-add_executable(ProgramAWSinstructorMPS WIN32
+add_executable(AWSinstructorMPS WIN32
 main.cpp
 mainwindow.cpp
 mainwindow.h
@@ -18,38 +18,38 @@ ProgramAWSinstructorMPS.qrc
 
 # Подключаем RC-файл к цели
 if(RC_FILE)
-    target_sources(ProgramAWSinstructorMPS PRIVATE ${RC_FILE})
+    target_sources(AWSinstructorMPS PRIVATE ${RC_FILE})
 endif()
 
-target_link_libraries(ProgramAWSinstructorMPS PRIVATE Qt5::Widgets)
-target_link_libraries(ProgramAWSinstructorMPS PRIVATE Qt5::Sql)
-target_link_libraries(ProgramAWSinstructorMPS PRIVATE Qt5::Xml)
-target_link_libraries(ProgramAWSinstructorMPS PRIVATE Qt5::Network)
+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(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees)
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/instructors)
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/trainees)
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/tasks)
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/docTasks)
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/connectorToServer)
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/connectorToServer/Core)
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/messanger)
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/widgets)
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/specialmessagebox)
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/settings)
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/authorization)
+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(ProgramAWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibInstructorsAndTrainees)
+    target_link_directories(AWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibInstructorsAndTrainees)
 else()
-    target_link_directories(ProgramAWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibInstructorsAndTrainees)
+    target_link_directories(AWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibInstructorsAndTrainees)
 endif()
-target_link_libraries(ProgramAWSinstructorMPS PRIVATE libInstructorsAndTrainees.dll)
+target_link_libraries(AWSinstructorMPS PRIVATE libInstructorsAndTrainees.dll)
 
 
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibDataBaseInterface)
+target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibDataBaseInterface)
 if(PROJECT_TYPE_DEBUG)
-    target_link_directories(ProgramAWSinstructorMPS PUBLIC  ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface)
+    target_link_directories(AWSinstructorMPS PUBLIC  ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface)
 else()
-    target_link_directories(ProgramAWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface)
+    target_link_directories(AWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface)
 endif()
-target_link_libraries(ProgramAWSinstructorMPS PRIVATE libDataBaseInterface.dll)
+target_link_libraries(AWSinstructorMPS PRIVATE libDataBaseInterface.dll)

ProgramAWSinstructorMPS/mainwindow.cpp

@@ -21,7 +21,7 @@ MainWindow::MainWindow(QWidget *parent)
     //this->showNormal();
     this->showMaximized();
 
-    qtLanguageTranslator.load(QString("translations/GUIdataBaseLMS_") + instructorsAndTraineesWidget->getLanguage(), ".");
+    qtLanguageTranslator.load(QString("translations/ProgramAWSinstructorMPS_") + instructorsAndTraineesWidget->getLanguage(), ".");
     qApp->installTranslator(&qtLanguageTranslator);
 }
 
@@ -42,6 +42,6 @@ void MainWindow::changeEvent(QEvent *event)
 
 void MainWindow::slot_LanguageChanged(QString language)
 {
-    qtLanguageTranslator.load(QString(QStringLiteral("translations/GUIdataBaseLMS_")) + language, QStringLiteral("."));
+    qtLanguageTranslator.load(QString(QStringLiteral("translations/ProgramAWSinstructorMPS_")) + language, QStringLiteral("."));
     qApp->installTranslator(&qtLanguageTranslator);
 }