TrayServerLMS переименовал

.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

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)

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

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)

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()

ServerLMS/translations/ServerLMS_ru_RU.ts

@@ -17,42 +17,37 @@
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.ui" line="34"/>
+        <location filename="../serverlmswidget.ui" line="238"/>
-        <source>List of clients</source>
-        <translation>Список клиентов</translation>
-    </message>
-    <message>
-        <location filename="../serverlmswidget.ui" line="155"/>
         <source>Block Authorization</source>
         <translation>Блокировка авторизации</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.ui" line="203"/>
+        <location filename="../serverlmswidget.ui" line="181"/>
         <source>Logger</source>
         <translation>Логгер</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.ui" line="231"/>
+        <location filename="../serverlmswidget.ui" line="146"/>
+        <source>Clients</source>
+        <translation>Клиенты</translation>
+    </message>
+    <message>
+        <location filename="../serverlmswidget.ui" line="209"/>
         <source>Data base: </source>
         <translation>База данных: </translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.ui" line="238"/>
+        <location filename="../serverlmswidget.ui" line="216"/>
         <source>...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.ui" line="28"/>
+        <location filename="../serverlmswidget.ui" line="51"/>
-        <source>Server LMS</source>
-        <translation>Сервер СУО</translation>
-    </message>
-    <message>
-        <location filename="../serverlmswidget.ui" line="105"/>
         <source>Start</source>
         <translation>Запустить</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.ui" line="133"/>
+        <location filename="../serverlmswidget.ui" line="92"/>
         <source>Stop</source>
         <translation>Остановить</translation>
     </message>

TestServerLMS/CMakeLists.txt

@@ -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)

TestServerLMS/translations/testServerLMS_ru_RU.ts

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="ru_RU">
-<context>
-    <name>MainWindow</name>
-    <message>
-        <location filename="../mainwindow.ui" line="20"/>
-        <source>MainWindow</source>
-        <translation>Главное окно</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="59"/>
-        <source>Language</source>
-        <translation>Язык</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="72"/>
-        <source>No Client files found!</source>
-        <translation>Файлы Клиента не найдены!</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="73"/>
-        <source>* check Application for the presence of a folder with a build 
-* check SharedData for a folder with the base version and the name base</source>
-        <translation>* проверьте Application на наличие папки со сборкой 
-* проверьте SharedData на наличие папки с базовой версией и именем base</translation>
-    </message>
-</context>
-</TS>

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)

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);

TrayServerLMS/translations/TrayServerLMS_ru_RU.ts

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ru_RU">
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../mainwindow.ui" line="20"/>
+        <source>Server Learning management system (LMS)</source>
+        <translation>Сервер Системы управления обучением (СУО)</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="63"/>
+        <source>Language</source>
+        <translation>Язык</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="39"/>
+        <location filename="../mainwindow.cpp" line="184"/>
+        <source>Server LMS</source>
+        <translation>Сервер СУО</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="43"/>
+        <source>Expand window</source>
+        <translation>Развернуть окно</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="44"/>
+        <source>Minimize window</source>
+        <translation>Свернуть окно</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="45"/>
+        <source>Exit</source>
+        <translation>Выход</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="155"/>
+        <source>No Client files found!</source>
+        <translation>Файлы Клиента не найдены!</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="156"/>
+        <source>* check Application for the presence of a folder with a build 
+* check SharedData for a folder with the base version and the name base</source>
+        <translation>* проверьте Application на наличие папки со сборкой 
+* проверьте SharedData на наличие папки с базовой версией и именем base</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="185"/>
+        <source>The application is minimized to the tray. To maximize the application window, click the application icon in the tray.</source>
+        <translation>Приложение свернуто в трей. Чтобы развернуть окно приложения, щелкните по иконке приложения в трее.</translation>
+    </message>
+</context>
+</TS>