diff --git a/.gitignore b/.gitignore index 2c69128..57dc83a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,7 @@ compile_commands.json CTestTestfile.cmake _deps CMakeUserPresets.json -TestServerLMS/TestServerLMS/CMakeLists.txt.user +TrayServerLMS/TestServerLMS/CMakeLists.txt.user ServerLMS/ServerLMS/CMakeLists.txt.user InstructorsAndTrainees/CMakeLists.txt.user GUIdataBaseLMS/CMakeLists.txt.user diff --git a/CMakeLists.txt b/CMakeLists.txt index c698146..c27a0aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,9 +34,9 @@ add_subdirectory(DataBaseLMS) add_subdirectory(InstructorsAndTrainees) add_subdirectory(GUIdataBaseLMS) add_subdirectory(ServerLMS) -add_subdirectory(TestServerLMS) +add_subdirectory(TrayServerLMS) add_dependencies(InstructorsAndTrainees DataBaseLMS) add_dependencies(GUIdataBaseLMS InstructorsAndTrainees) add_dependencies(ServerLMS DataBaseLMS) -add_dependencies(TestServerLMS ServerLMS) +add_dependencies(TrayServerLMS ServerLMS) diff --git a/DataBaseLMS/CMakeLists.txt b/DataBaseLMS/CMakeLists.txt index 1497cf9..1c0ff5a 100644 --- a/DataBaseLMS/CMakeLists.txt +++ b/DataBaseLMS/CMakeLists.txt @@ -35,7 +35,7 @@ add_library(DataBaseLMS SHARED contactModel.h hashtools.cpp hashtools.h - resources.qrc + DataBaseLMS.qrc ) target_link_libraries(DataBaseLMS PRIVATE Qt5::Widgets) @@ -50,7 +50,7 @@ if(PROJECT_TYPE_DEBUG) POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REPO_PATH}/BUILDS/Debug64/DataBaseLMS/libDataBaseLMS.dll - ${REPO_PATH}/BUILDS/Debug64/TestServerLMS) + ${REPO_PATH}/BUILDS/Debug64/TrayServerLMS) add_custom_command(TARGET DataBaseLMS POST_BUILD @@ -63,7 +63,7 @@ else() POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REPO_PATH}/BUILDS/Release64/DataBaseLMS/libDataBaseLMS.dll - ${REPO_PATH}/BUILDS/Release64/TestServerLMS) + ${REPO_PATH}/BUILDS/Release64/TrayServerLMS) add_custom_command(TARGET DataBaseLMS POST_BUILD diff --git a/DataBaseLMS/resources.qrc b/DataBaseLMS/DataBaseLMS.qrc similarity index 100% rename from DataBaseLMS/resources.qrc rename to DataBaseLMS/DataBaseLMS.qrc diff --git a/InstructorsAndTrainees/CMakeLists.txt b/InstructorsAndTrainees/CMakeLists.txt index 955cebc..4621017 100644 --- a/InstructorsAndTrainees/CMakeLists.txt +++ b/InstructorsAndTrainees/CMakeLists.txt @@ -123,7 +123,7 @@ add_library(InstructorsAndTrainees SHARED widgets/waitanimationwidget.h widgets/waitanimationwidget.ui - resources.qrc + InstructorsAndTrainees.qrc ) target_link_libraries(InstructorsAndTrainees PRIVATE Qt5::Widgets) diff --git a/InstructorsAndTrainees/resources.qrc b/InstructorsAndTrainees/InstructorsAndTrainees.qrc similarity index 100% rename from InstructorsAndTrainees/resources.qrc rename to InstructorsAndTrainees/InstructorsAndTrainees.qrc diff --git a/ServerLMS/CMakeLists.txt b/ServerLMS/CMakeLists.txt index 9a22b20..e35e17e 100644 --- a/ServerLMS/CMakeLists.txt +++ b/ServerLMS/CMakeLists.txt @@ -46,7 +46,7 @@ add_library(ServerLMS SHARED Data/usertype.h providerdblms.cpp providerdblms.h - resources.qrc + ServerLMS.qrc ) target_link_libraries(ServerLMS PRIVATE Qt5::Widgets) @@ -70,11 +70,11 @@ if(PROJECT_TYPE_DEBUG) POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REPO_PATH}/BUILDS/Debug64/ServerLMS/libServerLMS.dll - ${REPO_PATH}/BUILDS/Debug64/TestServerLMS) + ${REPO_PATH}/BUILDS/Debug64/TrayServerLMS) else() add_custom_command(TARGET ServerLMS POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REPO_PATH}/BUILDS/Release64/ServerLMS/libServerLMS.dll - ${REPO_PATH}/BUILDS/Release64/TestServerLMS) + ${REPO_PATH}/BUILDS/Release64/TrayServerLMS) endif() diff --git a/ServerLMS/resources.qrc b/ServerLMS/ServerLMS.qrc similarity index 100% rename from ServerLMS/resources.qrc rename to ServerLMS/ServerLMS.qrc diff --git a/ServerLMS/translations/ServerLMS_ru_RU.qm b/ServerLMS/translations/ServerLMS_ru_RU.qm index fe88259..939a831 100644 Binary files a/ServerLMS/translations/ServerLMS_ru_RU.qm and b/ServerLMS/translations/ServerLMS_ru_RU.qm differ diff --git a/ServerLMS/translations/ServerLMS_ru_RU.ts b/ServerLMS/translations/ServerLMS_ru_RU.ts index afb00ac..c87419c 100644 --- a/ServerLMS/translations/ServerLMS_ru_RU.ts +++ b/ServerLMS/translations/ServerLMS_ru_RU.ts @@ -17,42 +17,37 @@ Форма - - List of clients - Список клиентов - - - + Block Authorization Блокировка авторизации - + Logger Логгер - + + Clients + Клиенты + + + Data base: База данных: - + ... - - Server LMS - Сервер СУО - - - + Start Запустить - + Stop Остановить diff --git a/TestServerLMS/CMakeLists.txt b/TestServerLMS/CMakeLists.txt deleted file mode 100644 index 125bdb8..0000000 --- a/TestServerLMS/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -project(TestServerLMS LANGUAGES CXX) - -common_info_for_project(TestServerLMS) - -add_executable(TestServerLMS WIN32 -main.cpp -mainwindow.cpp -mainwindow.h -mainwindow.ui -testServerLMS.qrc -) - -target_link_libraries(TestServerLMS PRIVATE Qt5::Widgets) -target_link_libraries(TestServerLMS PRIVATE Qt5::Network) -target_link_libraries(TestServerLMS PRIVATE Qt5::Sql) -target_link_libraries(TestServerLMS PRIVATE Qt5::Xml) - -target_include_directories(TestServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../DataBaseLMS) -if(PROJECT_TYPE_DEBUG) - target_link_directories(TestServerLMS PUBLIC ${REPO_PATH}/BUILDS/Debug64/DataBaseLMS) -else() - target_link_directories(TestServerLMS PUBLIC ${REPO_PATH}/BUILDS/Release64/DataBaseLMS) -endif() -target_link_libraries(TestServerLMS PRIVATE libDataBaseLMS.dll) - -target_include_directories(TestServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ServerLMS) -if(PROJECT_TYPE_DEBUG) - target_link_directories(TestServerLMS PUBLIC ${REPO_PATH}/BUILDS/Debug64/ServerLMS) -else() - target_link_directories(TestServerLMS PUBLIC ${REPO_PATH}/BUILDS/Release64/ServerLMS) -endif() -target_link_libraries(TestServerLMS PRIVATE libServerLMS.dll) diff --git a/TestServerLMS/translations/testServerLMS_ru_RU.qm b/TestServerLMS/translations/testServerLMS_ru_RU.qm deleted file mode 100644 index b5f9891..0000000 Binary files a/TestServerLMS/translations/testServerLMS_ru_RU.qm and /dev/null differ diff --git a/TestServerLMS/translations/testServerLMS_ru_RU.ts b/TestServerLMS/translations/testServerLMS_ru_RU.ts deleted file mode 100644 index ba4f8d3..0000000 --- a/TestServerLMS/translations/testServerLMS_ru_RU.ts +++ /dev/null @@ -1,29 +0,0 @@ - - - - - MainWindow - - - MainWindow - Главное окно - - - - Language - Язык - - - - No Client files found! - Файлы Клиента не найдены! - - - - * check Application for the presence of a folder with a build -* check SharedData for a folder with the base version and the name base - * проверьте Application на наличие папки со сборкой -* проверьте SharedData на наличие папки с базовой версией и именем base - - - diff --git a/TrayServerLMS/CMakeLists.txt b/TrayServerLMS/CMakeLists.txt new file mode 100644 index 0000000..2a7f05f --- /dev/null +++ b/TrayServerLMS/CMakeLists.txt @@ -0,0 +1,32 @@ +project(TrayServerLMS LANGUAGES CXX) + +common_info_for_project(TrayServerLMS) + +add_executable(TrayServerLMS WIN32 +main.cpp +mainwindow.cpp +mainwindow.h +mainwindow.ui +TrayServerLMS.qrc +) + +target_link_libraries(TrayServerLMS PRIVATE Qt5::Widgets) +target_link_libraries(TrayServerLMS PRIVATE Qt5::Network) +target_link_libraries(TrayServerLMS PRIVATE Qt5::Sql) +target_link_libraries(TrayServerLMS PRIVATE Qt5::Xml) + +target_include_directories(TrayServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../DataBaseLMS) +if(PROJECT_TYPE_DEBUG) + target_link_directories(TrayServerLMS PUBLIC ${REPO_PATH}/BUILDS/Debug64/DataBaseLMS) +else() + target_link_directories(TrayServerLMS PUBLIC ${REPO_PATH}/BUILDS/Release64/DataBaseLMS) +endif() +target_link_libraries(TrayServerLMS PRIVATE libDataBaseLMS.dll) + +target_include_directories(TrayServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ServerLMS) +if(PROJECT_TYPE_DEBUG) + target_link_directories(TrayServerLMS PUBLIC ${REPO_PATH}/BUILDS/Debug64/ServerLMS) +else() + target_link_directories(TrayServerLMS PUBLIC ${REPO_PATH}/BUILDS/Release64/ServerLMS) +endif() +target_link_libraries(TrayServerLMS PRIVATE libServerLMS.dll) diff --git a/TestServerLMS/CMakeLists.txt.user.00ce76f b/TrayServerLMS/CMakeLists.txt.user.00ce76f similarity index 100% rename from TestServerLMS/CMakeLists.txt.user.00ce76f rename to TrayServerLMS/CMakeLists.txt.user.00ce76f diff --git a/TestServerLMS/CMakeLists.txt.user.15ef247 b/TrayServerLMS/CMakeLists.txt.user.15ef247 similarity index 100% rename from TestServerLMS/CMakeLists.txt.user.15ef247 rename to TrayServerLMS/CMakeLists.txt.user.15ef247 diff --git a/TestServerLMS/testServerLMS.qrc b/TrayServerLMS/TrayServerLMS.qrc similarity index 100% rename from TestServerLMS/testServerLMS.qrc rename to TrayServerLMS/TrayServerLMS.qrc diff --git a/TestServerLMS/main.cpp b/TrayServerLMS/main.cpp similarity index 100% rename from TestServerLMS/main.cpp rename to TrayServerLMS/main.cpp diff --git a/TestServerLMS/mainwindow.cpp b/TrayServerLMS/mainwindow.cpp similarity index 99% rename from TestServerLMS/mainwindow.cpp rename to TrayServerLMS/mainwindow.cpp index 93acd1e..1d502f1 100644 --- a/TestServerLMS/mainwindow.cpp +++ b/TrayServerLMS/mainwindow.cpp @@ -138,7 +138,7 @@ void MainWindow::on_cmbLanguage_currentIndexChanged(const QString &arg1) else language = QString("ru_RU"); - qtLanguageTranslator.load(QString("translations/testServerLMS_") + language, "."); + qtLanguageTranslator.load(QString("translations/TrayServerLMS_") + language, "."); qApp->installTranslator(&qtLanguageTranslator); emit signal_LanguageChanged(language); diff --git a/TestServerLMS/mainwindow.h b/TrayServerLMS/mainwindow.h similarity index 100% rename from TestServerLMS/mainwindow.h rename to TrayServerLMS/mainwindow.h diff --git a/TestServerLMS/mainwindow.ui b/TrayServerLMS/mainwindow.ui similarity index 100% rename from TestServerLMS/mainwindow.ui rename to TrayServerLMS/mainwindow.ui diff --git a/TestServerLMS/resources/IcoServerRRJ.ico b/TrayServerLMS/resources/IcoServerRRJ.ico similarity index 100% rename from TestServerLMS/resources/IcoServerRRJ.ico rename to TrayServerLMS/resources/IcoServerRRJ.ico diff --git a/TrayServerLMS/translations/TrayServerLMS_ru_RU.qm b/TrayServerLMS/translations/TrayServerLMS_ru_RU.qm new file mode 100644 index 0000000..7ccf127 Binary files /dev/null and b/TrayServerLMS/translations/TrayServerLMS_ru_RU.qm differ diff --git a/TrayServerLMS/translations/TrayServerLMS_ru_RU.ts b/TrayServerLMS/translations/TrayServerLMS_ru_RU.ts new file mode 100644 index 0000000..decb696 --- /dev/null +++ b/TrayServerLMS/translations/TrayServerLMS_ru_RU.ts @@ -0,0 +1,55 @@ + + + + + MainWindow + + + Server Learning management system (LMS) + Сервер Системы управления обучением (СУО) + + + + Language + Язык + + + + + Server LMS + Сервер СУО + + + + Expand window + Развернуть окно + + + + Minimize window + Свернуть окно + + + + Exit + Выход + + + + No Client files found! + Файлы Клиента не найдены! + + + + * check Application for the presence of a folder with a build +* check SharedData for a folder with the base version and the name base + * проверьте Application на наличие папки со сборкой +* проверьте SharedData на наличие папки с базовой версией и именем base + + + + The application is minimized to the tray. To maximize the application window, click the application icon in the tray. + Приложение свернуто в трей. Чтобы развернуть окно приложения, щелкните по иконке приложения в трее. + + +