Отделил Дебаг паки от проекта и вынес их из гита

DB_IaT/InstructorsAndTrainees/CMakeLists.txt

@@ -93,6 +93,12 @@ add_library(InstructorsAndTrainees SHARED
   resources.qrc
 )
 
+target_link_libraries(InstructorsAndTrainees PRIVATE Qt5::Widgets)
+target_link_libraries(InstructorsAndTrainees PRIVATE Qt5::Sql)
+target_link_libraries(InstructorsAndTrainees PRIVATE Qt5::Xml)
+target_link_libraries(InstructorsAndTrainees PRIVATE Qt5::Network)
+
+
 target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/instructors)
 target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/trainees)
 target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/tasks)
@@ -101,20 +107,14 @@ target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_
 target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/connectorToServer/Core)
 target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/messanger)
 
-
-target_link_libraries(InstructorsAndTrainees PRIVATE Qt5::Widgets)
-target_link_libraries(InstructorsAndTrainees PRIVATE Qt5::Sql)
-target_link_libraries(InstructorsAndTrainees PRIVATE Qt5::Xml)
-target_link_libraries(InstructorsAndTrainees PRIVATE Qt5::Network)
-
 target_compile_definitions(InstructorsAndTrainees PRIVATE INSTRUCTORSANDTRAINEES_LIBRARY)
 
 
 target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_LMS/DataBaseLMS)
 if(PROJECT_TYPE_DEBUG)
-    target_link_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_LMS/Debug64)
+    target_link_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../QT/BUILDS/LMS/DB_LMS/Debug64)
 elseif()
-    target_link_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_LMS/Release64)
+    target_link_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../QT/BUILDS/LMS/DB_LMS/Release64)
 endif()
 target_link_libraries(InstructorsAndTrainees PRIVATE libDataBaseLMS.dll)
 
@@ -122,8 +122,8 @@ target_link_libraries(InstructorsAndTrainees PRIVATE libDataBaseLMS.dll)
 add_custom_command(TARGET InstructorsAndTrainees
                    POST_BUILD
 		   COMMAND ${CMAKE_COMMAND} -E copy_if_different
-		   d:/LMS/DB_IaT/Debug64/libInstructorsAndTrainees.dll
-		   d:/LMS/GUIdataBaseLMS/Debug64)
+		   d:/QT/BUILDS/LMS/DB_IaT/Debug64/libInstructorsAndTrainees.dll
+		   d:/QT/BUILDS/LMS/GUIdataBaseLMS/Debug64)
 
 
 #install(TARGETS InstructorsAndTrainees DESTINATION ${VEYON_LIB_DIR})

DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.1, 2024-12-24T12:21:21. -->
+<!-- Written by QtCreator 4.11.1, 2024-12-25T13:38:13. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -78,7 +78,7 @@
      <value type="QString">CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX}</value>
      <value type="QString">QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}</value>
     </valuelist>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:/LMS/DB_IaT/Debug64</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:/QT/BUILDS/LMS/DB_IaT/Debug64</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>

DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.ui

@@ -100,8 +100,8 @@
          </property>
          <property name="icon">
           <iconset resource="../resources.qrc">
-           <normaloff>:/icons/admin.png</normaloff>
-           <disabledoff>:/icons/admin.png</disabledoff>:/icons/admin.png</iconset>
+           <normaloff>:/resources/icons/admin.png</normaloff>
+           <disabledoff>:/resources/icons/admin.png</disabledoff>:/resources/icons/admin.png</iconset>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -127,8 +127,8 @@
          </property>
          <property name="icon">
           <iconset resource="../resources.qrc">
-           <normaloff>:/icons/archive.png</normaloff>
-           <disabledoff>:/icons/archive.png</disabledoff>:/icons/archive.png</iconset>
+           <normaloff>:/resources/icons/archive.png</normaloff>
+           <disabledoff>:/resources/icons/archive.png</disabledoff>:/resources/icons/archive.png</iconset>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -154,8 +154,8 @@
          </property>
          <property name="icon">
           <iconset resource="../resources.qrc">
-           <normaloff>:/icons/circleGreen.png</normaloff>
-           <disabledoff>:/icons/circleGreen.png</disabledoff>:/icons/circleGreen.png</iconset>
+           <normaloff>:/resources/icons/circleGreen.png</normaloff>
+           <disabledoff>:/resources/icons/circleGreen.png</disabledoff>:/resources/icons/circleGreen.png</iconset>
          </property>
          <property name="checkable">
           <bool>true</bool>

DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp

@@ -222,12 +222,12 @@ void EditorInstructors::on_treeWidget_currentItemChanged(QTreeWidgetItem *curren
         if(connectorToServer->isArchivedInstructor(id))
         {//Архивный
             ui->btnToOrFromArchive->setText(tr("From archive"));
-            ui->btnToOrFromArchive->setIcon(QIcon(QStringLiteral(":/icons/instructorFromArchive.png")));
+            ui->btnToOrFromArchive->setIcon(QIcon(QStringLiteral(":/resources/icons/instructorFromArchive.png")));
         }
         else
         {//Не Архивный
             ui->btnToOrFromArchive->setText(tr("To archive"));
-            ui->btnToOrFromArchive->setIcon(QIcon(QStringLiteral(":/icons/instructorArchive.png")));
+            ui->btnToOrFromArchive->setIcon(QIcon(QStringLiteral(":/resources/icons/instructorArchive.png")));
         }
 
         ui->btnNewInstructor->setEnabled(true);        

DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.ui

@@ -52,7 +52,7 @@
          </property>
          <property name="icon">
           <iconset resource="../resources.qrc">
-           <normaloff>:/icons/addInstructor.png</normaloff>:/icons/addInstructor.png</iconset>
+           <normaloff>:/resources/icons/addInstructor.png</normaloff>:/resources/icons/addInstructor.png</iconset>
          </property>
          <property name="iconSize">
           <size>
@@ -90,7 +90,7 @@
          </property>
          <property name="icon">
           <iconset resource="../resources.qrc">
-           <normaloff>:/icons/deleteInstructor.png</normaloff>:/icons/deleteInstructor.png</iconset>
+           <normaloff>:/resources/icons/deleteInstructor.png</normaloff>:/resources/icons/deleteInstructor.png</iconset>
          </property>
          <property name="iconSize">
           <size>
@@ -122,7 +122,7 @@
          </property>
          <property name="icon">
           <iconset resource="../resources.qrc">
-           <normaloff>:/icons/instructorArchive.png</normaloff>:/icons/instructorArchive.png</iconset>
+           <normaloff>:/resources/icons/instructorArchive.png</normaloff>:/resources/icons/instructorArchive.png</iconset>
          </property>
          <property name="iconSize">
           <size>
@@ -160,7 +160,7 @@
          </property>
          <property name="icon">
           <iconset resource="../resources.qrc">
-           <normaloff>:/icons/edit.png</normaloff>:/icons/edit.png</iconset>
+           <normaloff>:/resources/icons/edit.png</normaloff>:/resources/icons/edit.png</iconset>
          </property>
          <property name="iconSize">
           <size>
@@ -211,7 +211,7 @@
          </property>
          <property name="icon">
           <iconset resource="../resources.qrc">
-           <normaloff>:/icons/archive.png</normaloff>:/icons/archive.png</iconset>
+           <normaloff>:/resources/icons/archive.png</normaloff>:/resources/icons/archive.png</iconset>
          </property>
          <property name="iconSize">
           <size>

DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp

@@ -120,20 +120,20 @@ void InstructorsView::loadInstructorsFromDB()
         if(instructor.getArchived())
         {//Архивный
             ItemInstructor->setText(ColumnsTreeInsructors::clmn_Archived, tr("yes"));
-            ItemInstructor->setIcon(ColumnsTreeInsructors::clmn_Instructor, QIcon(QStringLiteral(":/icons/archive.png")));
+            ItemInstructor->setIcon(ColumnsTreeInsructors::clmn_Instructor, QIcon(QStringLiteral(":/resources/icons/archive.png")));
             setItemColorArchive(ItemInstructor);
         }
         else
         {//Не Архивный
             ItemInstructor->setText(ColumnsTreeInsructors::clmn_Archived, tr("no"));
-            ItemInstructor->setIcon(ColumnsTreeInsructors::clmn_Instructor, QIcon(QStringLiteral(":/icons/instructor.png")));
+            ItemInstructor->setIcon(ColumnsTreeInsructors::clmn_Instructor, QIcon(QStringLiteral(":/resources/icons/instructor.png")));
             setItemColorNoArchive(ItemInstructor);
         }
 
         if(instructor.getIsAdmin())
         {//Админ
             ItemInstructor->setText(ColumnsTreeInsructors::clmn_Administrator, tr("yes"));
-            ItemInstructor->setIcon(ColumnsTreeInsructors::clmn_Instructor, QIcon(QStringLiteral(":/icons/admin.png")));
+            ItemInstructor->setIcon(ColumnsTreeInsructors::clmn_Instructor, QIcon(QStringLiteral(":/resources/icons/admin.png")));
         }
         else
         {//Не Админ
@@ -143,12 +143,12 @@ void InstructorsView::loadInstructorsFromDB()
         if(instructor.getLoggedIn())
         {//Залогинен
             ItemInstructor->setText(ColumnsTreeInsructors::clmn_Logged, tr("yes"));
-            ItemInstructor->setIcon(ColumnsTreeInsructors::clmn_Logged, QIcon(QStringLiteral(":/icons/circleGreen.png")));
+            ItemInstructor->setIcon(ColumnsTreeInsructors::clmn_Logged, QIcon(QStringLiteral(":/resources/icons/circleGreen.png")));
         }
         else
         {//Не Залогинен
             ItemInstructor->setText(ColumnsTreeInsructors::clmn_Logged, tr("no"));
-            ItemInstructor->setIcon(ColumnsTreeInsructors::clmn_Logged, QIcon(QStringLiteral(":/icons/circleGray.png")));
+            ItemInstructor->setIcon(ColumnsTreeInsructors::clmn_Logged, QIcon(QStringLiteral(":/resources/icons/circleGray.png")));
         }
 
         //Скрываем архивных (при необходимости)

DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.ui

@@ -69,7 +69,7 @@
               </property>
               <property name="icon">
                <iconset resource="../resources.qrc">
-                <normaloff>:/icons/DB-instructors.png</normaloff>:/icons/DB-instructors.png</iconset>
+                <normaloff>:/resources/icons/DB-instructors.png</normaloff>:/resources/icons/DB-instructors.png</iconset>
               </property>
               <property name="iconSize">
                <size>

DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp

@@ -117,7 +117,7 @@ void InstructorsAndTraineesWidget::updateMyStyleSheet()
 
 QString InstructorsAndTraineesWidget::loadStyleSheet()
 {
-    QString fileName = "./styleSheetMain.css";
+    QString fileName = ":/resources/css/styleSheetMain.css";
     QFile styleSheetFile(fileName);
     if (!styleSheetFile.open(QFile::ReadOnly | QFile::Text))
     {
@@ -211,7 +211,7 @@ void InstructorsAndTraineesWidget::slot_ConnectedToServer(bool state)
         ui->btnConnectionToServer->setEnabled(false);
         ui->btnAuthorizationInstructor->setEnabled(true);
 
-        ui->lblDBisConnected->setPixmap(QPixmap(QStringLiteral(":/icons/circleGreen.png")));
+        ui->lblDBisConnected->setPixmap(QPixmap(QStringLiteral(":/resources/icons/circleGreen.png")));
     }
     else
     {//Сервер отключен
@@ -220,7 +220,7 @@ void InstructorsAndTraineesWidget::slot_ConnectedToServer(bool state)
         ui->btnConnectionToServer->setEnabled(true);
         ui->btnAuthorizationInstructor->setEnabled(false);
 
-        ui->lblDBisConnected->setPixmap(QPixmap(QStringLiteral(":/icons/circleGray.png")));
+        ui->lblDBisConnected->setPixmap(QPixmap(QStringLiteral(":/resources/icons/circleGray.png")));
     }
 }
 
@@ -349,14 +349,14 @@ void InstructorsAndTraineesWidget::updateLabelLoggedInInstructor(QString login,
         QString nameLoggedInInstructor = QString("%1 (%2)").arg(name, login);
         ui->lblLoggedInInstructor->setText(nameLoggedInInstructor);
         if(loginInstructorLoggedInLocal == QStringLiteral("admin"))
-            ui->lblLoggedIn->setPixmap(QPixmap(QStringLiteral(":/icons/admin.png")));
+            ui->lblLoggedIn->setPixmap(QPixmap(QStringLiteral(":/resources/icons/admin.png")));
         else
-            ui->lblLoggedIn->setPixmap(QPixmap(QStringLiteral(":/icons/instructor.png")));
+            ui->lblLoggedIn->setPixmap(QPixmap(QStringLiteral(":/resources/icons/instructor.png")));
     }
     else
     {
         ui->lblLoggedInInstructor->setText(tr("none"));
-        ui->lblLoggedIn->setPixmap(QPixmap(QStringLiteral(":/icons/circleGray.png")));
+        ui->lblLoggedIn->setPixmap(QPixmap(QStringLiteral(":/resources/icons/circleGray.png")));
     }
 }
 

DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.ui

@@ -63,7 +63,7 @@
             </property>
             <property name="icon">
              <iconset resource="resources.qrc">
-              <normaloff>:/icons/connectDB.png</normaloff>:/icons/connectDB.png</iconset>
+              <normaloff>:/resources/icons/connectDB.png</normaloff>:/resources/icons/connectDB.png</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -97,7 +97,7 @@
              <string/>
             </property>
             <property name="pixmap">
-             <pixmap resource="resources.qrc">:/icons/circleGray.png</pixmap>
+             <pixmap resource="resources.qrc">:/resources/icons/circleGray.png</pixmap>
             </property>
             <property name="scaledContents">
              <bool>true</bool>
@@ -117,7 +117,7 @@
             </property>
             <property name="icon">
              <iconset resource="resources.qrc">
-              <normaloff>:/icons/login-user.png</normaloff>:/icons/login-user.png</iconset>
+              <normaloff>:/resources/icons/login-user.png</normaloff>:/resources/icons/login-user.png</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -151,7 +151,7 @@
              <string/>
             </property>
             <property name="pixmap">
-             <pixmap resource="resources.qrc">:/icons/circleGray.png</pixmap>
+             <pixmap resource="resources.qrc">:/resources/icons/circleGray.png</pixmap>
             </property>
             <property name="scaledContents">
              <bool>true</bool>

DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.cpp

@@ -64,9 +64,9 @@ void MessangerWidget::addTabDialogMessenger(Trainee trainee)
         {//Диалог для этого клиента уже существует
             //Обновляем статус залогинивания
             if(trainee.getLoggedIn())
-                ui->tabWidget->setTabIcon(getIndexTab(trainee.getLogin()), QIcon(":/icons/circleGreen.png"));
+                ui->tabWidget->setTabIcon(getIndexTab(trainee.getLogin()), QIcon(":/resources/icons/circleGreen.png"));
             else
-                ui->tabWidget->setTabIcon(getIndexTab(trainee.getLogin()), QIcon(":/icons/circleGray.png"));
+                ui->tabWidget->setTabIcon(getIndexTab(trainee.getLogin()), QIcon(":/resources/icons/circleGray.png"));
             return;
         }
     }    
@@ -82,9 +82,9 @@ void MessangerWidget::addTabDialogMessenger(Trainee trainee)
 
     //Обновляем статус залогинивания
     if(trainee.getLoggedIn())
-        ui->tabWidget->setTabIcon(index, QIcon(":/icons/circleGreen.png"));
+        ui->tabWidget->setTabIcon(index, QIcon(":/resources/icons/circleGreen.png"));
     else
-        ui->tabWidget->setTabIcon(index, QIcon(":/icons/circleGray.png"));
+        ui->tabWidget->setTabIcon(index, QIcon(":/resources/icons/circleGray.png"));
 }
 
 void MessangerWidget::actualizationTabsDialogMessenger()

DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.ui

@@ -82,7 +82,7 @@
               </property>
               <property name="icon">
                <iconset resource="../resources.qrc">
-                <normaloff>:/icons/sendMsg.png</normaloff>:/icons/sendMsg.png</iconset>
+                <normaloff>:/resources/icons/sendMsg.png</normaloff>:/resources/icons/sendMsg.png</iconset>
               </property>
               <property name="iconSize">
                <size>

DB_IaT/InstructorsAndTrainees/messanger/tabdialogmessenger.cpp

@@ -23,7 +23,7 @@ TabDialogMessenger::~TabDialogMessenger()
 void TabDialogMessenger::addMsgWidgetLocal(QString text)
 {
     QListWidgetItem *listWidgetItem = new QListWidgetItem();
-    QString avatar = ":/icons/instructor.png";
+    QString avatar = ":/resources/icons/instructor.png";
     MsgWidget *msgWidget = new MsgWidget(avatar, MsgWidget::AligneAvatar::Left,
                                       width() - verticalScrollBar()->size().width());
 
@@ -41,7 +41,7 @@ void TabDialogMessenger::addMsgWidgetLocal(QString text)
 void TabDialogMessenger::addMsgWidgetRemote(QString text)
 {
     QListWidgetItem *listWidgetItem = new QListWidgetItem();
-    QString avatar = ":/icons/trainee.png";
+    QString avatar = ":/resources/icons/trainee.png";
     MsgWidget *msgWidget = new MsgWidget(avatar, MsgWidget::AligneAvatar::Right,
                                       width() - verticalScrollBar()->size().width());
 

DB_IaT/InstructorsAndTrainees/resources.qrc

@@ -1,29 +1,40 @@
 <RCC>
     <qresource prefix="/">
-        <file>icons/addTrainee.png</file>
-        <file>icons/deleteGroup.png</file>
-        <file>icons/deleteTrainee.png</file>
-        <file>icons/edit.png</file>
-        <file>icons/group.png</file>
-        <file>icons/newGroup.png</file>
-        <file>icons/trainee.png</file>
-        <file>icons/archive.png</file>
-        <file>icons/traineeArchive.png</file>
-        <file>icons/circleGray.png</file>
-        <file>icons/circleGreen.png</file>
-        <file>icons/instructor.png</file>
-        <file>icons/instructorArchive.png</file>
-        <file>icons/addInstructor.png</file>
-        <file>icons/deleteInstructor.png</file>
-        <file>icons/instructorAdmin.png</file>
-        <file>icons/instructorFromArchive.png</file>
-        <file>icons/traineeFromArchive.png</file>
-        <file>icons/admin.png</file>
-        <file>icons/DB-instructors.png</file>
-        <file>icons/DB-trainees.png</file>
-        <file>icons/connectDB.png</file>
-        <file>icons/login-user.png</file>
-        <file>icons/docTasks.png</file>
-        <file>icons/sendMsg.png</file>
+        <file>resources/css/styleSheetMain.css</file>
+        <file>resources/icons/addInstructor.png</file>
+        <file>resources/icons/addTrainee.png</file>
+        <file>resources/icons/admin.png</file>
+        <file>resources/icons/archive.png</file>
+        <file>resources/icons/branch-closed.png</file>
+        <file>resources/icons/branch-end.png</file>
+        <file>resources/icons/branch-more.png</file>
+        <file>resources/icons/branch-open.png</file>
+        <file>resources/icons/chekNo.png</file>
+        <file>resources/icons/chekYes.png</file>
+        <file>resources/icons/circleGray.png</file>
+        <file>resources/icons/circleGreen.png</file>
+        <file>resources/icons/connectDB.png</file>
+        <file>resources/icons/DB-instructors.png</file>
+        <file>resources/icons/DB-trainees.png</file>
+        <file>resources/icons/deleteGroup.png</file>
+        <file>resources/icons/deleteInstructor.png</file>
+        <file>resources/icons/deleteTrainee.png</file>
+        <file>resources/icons/docTasks.png</file>
+        <file>resources/icons/edit.png</file>
+        <file>resources/icons/group.png</file>
+        <file>resources/icons/instructor.png</file>
+        <file>resources/icons/instructorAdmin.png</file>
+        <file>resources/icons/instructorArchive.png</file>
+        <file>resources/icons/instructorFromArchive.png</file>
+        <file>resources/icons/login-user.png</file>
+        <file>resources/icons/messengerPrint.png</file>
+        <file>resources/icons/newGroup.png</file>
+        <file>resources/icons/rectGray.png</file>
+        <file>resources/icons/rectGreen.png</file>
+        <file>resources/icons/sendMsg.png</file>
+        <file>resources/icons/trainee.png</file>
+        <file>resources/icons/traineeArchive.png</file>
+        <file>resources/icons/traineeFromArchive.png</file>
+        <file>resources/icons/vline.png</file>
     </qresource>
 </RCC>

DB_IaT/InstructorsAndTrainees/resources/css/styleSheetMain.css

@@ -0,0 +1,230 @@
+/*Обязательные поля*/
+*[mandatoryField="true"] { 
+	background-color: #fff2fb 
+}
+
+
+/*Общие настройки виджетов*/
+QWidget {
+	font-family: Tahoma;
+	font-size: 14pt;
+	icon-size: 24px;
+}
+
+
+QLineEdit, QTextEdit {
+    border: 1px solid gray;
+    border-radius: 4px;
+    padding: 0px 8px;
+    background: white;
+    selection-background-color: darkgray;	
+}
+QLineEdit[echoMode="2"] {
+    lineedit-password-character: 9679; /*Сокрытие пароля*/
+}
+QLineEdit:read-only {
+    background: lightblue;
+}
+
+
+QGroupBox {
+    background: #E0E0E0;
+    border: 1px solid gray;
+    border-radius: 5px;
+    margin-top: 5ex; /* leave space at the top for the title */
+}
+QGroupBox::title {
+	border: 1px solid gray;
+	border-bottom: none;
+    border-radius: 5px;
+    subcontrol-origin: margin;
+    subcontrol-position: top left;
+    padding-left: 10px;
+	padding-right: 10px;
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                                      stop: 0 #A0CECE, stop: 1 #FFFFFF);
+}
+
+
+QPushButton, QToolButton {
+    border: 2px solid #8f8f91;
+	border-style: outset;
+    border-radius: 5px;
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                                      stop: 0 #f6f7fa, stop: 1 #dadbde);
+    min-width: 80px;
+	height: 60px;
+	padding: 1px;
+}
+QPushButton {
+	height: 25px;
+}
+QToolButton {
+	width: 200px;
+}
+QToolButton#btnSend { /*Кнопка Send Мессенджера*/
+	width: 60px;
+}
+QPushButton:flat, QToolButton:flat {
+    border: none; /* no border for a flat push button */
+}
+QPushButton:default, QToolButton:default {
+    border-color: navy; /* make the default button prominent */
+}
+QPushButton:hover , QToolButton:hover {
+	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+							stop: 0 #fafafa, stop: 0.4 #f4f4f4,
+							stop: 0.5 #e7e7e7, stop: 1.0 #fafafa);
+}
+QPushButton:pressed, QToolButton:pressed {
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                                      stop: 0 #dadbde, stop: 1 #f6f7fa);
+	border-style: inset;
+}
+QPushButton:checked, QToolButton:checked {
+	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+									  stop: 0 #dadbde, stop: 1 #f6f7fa);
+	border-style: inset;
+}
+
+
+QCheckBox {
+    spacing: 20px;
+}
+QCheckBox::indicator:checked {
+    width: 24px;
+    height: 24px;
+	image: url(:/resources/icons/chekYes.png);
+}
+QCheckBox::indicator:!checked {
+    width: 24px;
+    height: 24px;
+	image: url(:/resources/icons/chekNo.png);
+}
+
+
+QTreeWidget {
+	font-size: 12pt; 
+	font-family: Tahoma;
+	icon-size: 24px;
+}
+QTreeWidget::item {
+	height: 30px;
+}
+/*Бранчи*/
+QTreeWidget::branch:has-siblings:!adjoins-item {
+    border-image: url(:/resources/icons/vline.png) 0;
+	
+}
+QTreeWidget::branch:has-siblings:adjoins-item {
+    border-image: url(:/resources/icons/branch-more.png) 0;
+	
+}
+QTreeWidget::branch:!has-children:!has-siblings:adjoins-item {
+    border-image: url(:/resources/icons/branch-end.png) 0;
+}
+QTreeWidget::branch:closed:has-children:!has-siblings,
+QTreeWidget::branch:closed:has-children:has-siblings {
+        border-image: none;
+        image: url(:/resources/icons/branch-closed.png);
+}
+QTreeWidget::branch:open:has-children:!has-siblings,
+QTreeWidget::branch:open:has-children:has-siblings  {
+        border-image: none;
+        image: url(:/resources/icons/branch-open.png);
+}
+
+QTreeWidget::item:hover,
+QTreeWidget::branch:hover {
+    background: #aee1ff;
+}
+
+QTreeWidget::item:selected {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6ea1f1, stop: 1 #567dbc);
+	color: #ffff00;
+}
+
+
+QHeaderView::section {
+    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+                                      stop:0 #c1c1c1, stop: 0.5 #505050,
+                                      stop: 0.6 #434343, stop:1 #656565);
+    color: white;
+    padding-left: 4px;
+    border: 1px solid #6c6c6c;
+}
+
+
+QTabWidget::pane { /* The tab widget frame */
+    border-top: 1px solid #C2C7CB;	
+	background-image: url(:/resources/icons/messengerPrint.png);
+	
+}
+QTabWidget::tab-bar {
+    left: 0px; /* move to the right by 0px */	
+}
+QTabBar::tab {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                                stop: 0 #E1E1E1, stop: 0.4 #DDDDDD,
+                                stop: 0.5 #D8D8D8, stop: 1.0 #D3D3D3);
+    border: 2px solid #C4C4C3;
+    border-bottom-color: #C2C7CB; /* same as the pane color */
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+    min-width: 8ex;
+    padding: 2px;
+	
+	
+}
+
+
+QTabBar::tab:selected {
+    border-color: #9B9B9B;
+    border-bottom-color: #C2C7CB; /* same as pane color */
+	/* expand/overlap to the left and right by 4px */
+    margin-left: -4px;
+    margin-right: -4px;
+	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6ea1f1, stop: 1 #567dbc);
+    color: #ffffff;
+}
+QTabBar::tab:!selected {
+    margin-top: 5px; /* make non-selected tabs look smaller */
+	background: #ffffff;
+}
+QTabBar::tab:hover {
+	background: #aee1ff;
+}
+
+QTabBar::scroller { /* the width of the scroll buttons */
+    width: 80px;
+}
+QTabBar QToolButton { /* the scroll buttons are tool buttons */
+	min-width: 30px;
+	width: 30px;
+	padding: 0px;
+}
+
+QListWidget::item {
+	padding: -5px;	
+}
+QListWidget {
+	/*background: pink;*/
+	background: transparent;
+	background: #f0ffff;	
+}
+
+QTextEdit {
+	padding: -20px;
+	font-size: 12pt;
+	
+}
+QTextEdit#MsgWidgetLocal {
+	background: lightgreen;
+}
+QTextEdit#MsgWidgetRemote {
+	background: lightblue;
+}
+
+QWidget {
+
+}

DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.cpp.bak

@@ -1,64 +0,0 @@
-#include "dialogedittrainee.h"
-#include "ui_dialogedittrainee.h"
-#include "computersLocations.h"
-
-DialogEditTrainee::DialogEditTrainee(ComputersLocations* computersLocations, QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::DialogEditTrainee),
-    computersLocations(computersLocations),
-    nameGroup()
-{
-    ui->setupUi(this);
-    ui->comboLocation->clear();
-    ui->comboLocation->addItems(computersLocations->getAllLocations());
-    ui->comboLocation->setCurrentIndex(0);
-    //setLocation(getLocation());
-    ui->comboComputer->clear();
-    ui->comboComputer->addItems(computersLocations->getAllComputersOfLocation(ui->comboLocation->currentText()));
-}
-
-DialogEditTrainee::~DialogEditTrainee()
-{
-    delete ui;
-}
-
-void DialogEditTrainee::setTrainee(Trainee trainee)
-{
-    ui->editName->setText(trainee.getName());
-    ui->editLogin->setText(trainee.getLogin());
-    ui->editPassword->setText(trainee.getPassword());
-
-    ui->comboLocation->setCurrentText(trainee.getLearnClass());
-    ui->comboComputer->clear();
-    ui->comboComputer->addItems(computersLocations->getAllComputersOfLocation(ui->comboLocation->currentText()));
-
-    ui->comboComputer->setCurrentText(trainee.getComputer());
-    ui->checkArchived->setChecked(trainee.getArchived());
-    ui->checkLoggedIn->setChecked(trainee.getLoggedIn());
-    ui->editWhatItDoes->setText(trainee.getWhatItDoes());
-
-    nameGroup = trainee.getGroup();
-}
-
-Trainee DialogEditTrainee::getTrainee()
-{
-    Trainee trainee;
-    trainee.setName(ui->editName->text());
-    trainee.setLogin(ui->editLogin->text());
-    trainee.setPassword(ui->editPassword->text());
-    trainee.setLearnClass(ui->comboLocation->currentText());
-    trainee.setComputer(ui->comboComputer->currentText());
-    trainee.setArchived(ui->checkArchived->isChecked());
-    trainee.setLoggedIn(ui->checkLoggedIn->isChecked());
-    trainee.setWhatItDoes(ui->editWhatItDoes->text());
-
-    trainee.setGroup(nameGroup);
-
-    return trainee;
-}
-
-void DialogEditTrainee::on_comboLocation_currentIndexChanged(const QString &arg1)
-{
-    ui->comboComputer->clear();
-    ui->comboComputer->addItems(computersLocations->getAllComputersOfLocation(arg1));
-}

DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.h.bak

@@ -1,33 +0,0 @@
-#ifndef DIALOGEDITTRAINEE_H
-#define DIALOGEDITTRAINEE_H
-
-#include <QDialog>
-#include "trainee.h"
-#include "computersLocations.h"
-
-namespace Ui {
-class DialogEditTrainee;
-}
-
-class DialogEditTrainee : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit DialogEditTrainee(ComputersLocations* computersLocations, QWidget *parent = nullptr);
-    ~DialogEditTrainee();
-
-    void setTrainee(Trainee trainee);
-    Trainee getTrainee();
-
-private slots:
-    void on_comboLocation_currentIndexChanged(const QString &arg1);
-
-private:
-    Ui::DialogEditTrainee *ui;
-    ComputersLocations* computersLocations;
-
-    QString nameGroup;
-};
-
-#endif // DIALOGEDITTRAINEE_H

DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.ui

@@ -20,7 +20,7 @@
    <string>Trainee</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../resources.qrc">
+   <iconset>
     <normaloff>:/icons/trainee.png</normaloff>:/icons/trainee.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -136,8 +136,8 @@
          </property>
          <property name="icon">
           <iconset resource="../resources.qrc">
-           <normaloff>:/icons/archive.png</normaloff>
-           <disabledoff>:/icons/archive.png</disabledoff>:/icons/archive.png</iconset>
+           <normaloff>:/resources/icons/archive.png</normaloff>
+           <disabledoff>:/resources/icons/archive.png</disabledoff>:/resources/icons/archive.png</iconset>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -163,8 +163,11 @@
          </property>
          <property name="icon">
           <iconset resource="../resources.qrc">
-           <normaloff>:/icons/circleGreen.png</normaloff>
-           <disabledoff>:/icons/circleGreen.png</disabledoff>:/icons/circleGreen.png</iconset>
+           <normaloff>:/resources/icons/circleGreen.png</normaloff>
+           <disabledoff>:/resources/icons/circleGreen.png</disabledoff>:/resources/icons/circleGreen.png</iconset>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
          </property>
         </widget>
        </item>

DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp

@@ -348,7 +348,7 @@ void EditorTrainees::on_treeWidget_currentItemChanged(QTreeWidgetItem *current,
         ui->btnArchive->setEnabled(true);
 
         ui->btnToOrFromArchiveTrainee->setText(tr("To archive"));
-        ui->btnToOrFromArchiveTrainee->setIcon(QIcon(QStringLiteral(":/icons/traineeArchive.png")));
+        ui->btnToOrFromArchiveTrainee->setIcon(QIcon(QStringLiteral(":/resources/icons/traineeArchive.png")));
     }
     else
     {//Выбран обучаемый
@@ -366,14 +366,14 @@ void EditorTrainees::on_treeWidget_currentItemChanged(QTreeWidgetItem *current,
             //ui->btnDeleteTrainee->setEnabled(true);
 
             ui->btnToOrFromArchiveTrainee->setText(tr("From archive"));
-            ui->btnToOrFromArchiveTrainee->setIcon(QIcon(QStringLiteral(":/icons/traineeFromArchive.png")));
+            ui->btnToOrFromArchiveTrainee->setIcon(QIcon(QStringLiteral(":/resources/icons/traineeFromArchive.png")));
         }
         else
         {//Не Архивный
             //ui->btnDeleteTrainee->setEnabled(false);
 
             ui->btnToOrFromArchiveTrainee->setText(tr("To archive"));
-            ui->btnToOrFromArchiveTrainee->setIcon(QIcon(QStringLiteral(":/icons/traineeArchive.png")));
+            ui->btnToOrFromArchiveTrainee->setIcon(QIcon(QStringLiteral(":/resources/icons/traineeArchive.png")));
         }
 
         if(connectorToServer->isLoggedInTrainee(id_trainee))

DB_IaT/InstructorsAndTrainees/trainees/editortrainees.ui

@@ -55,7 +55,7 @@
          </property>
          <property name="icon">
           <iconset resource="../resources.qrc">
-           <normaloff>:/icons/newGroup.png</normaloff>:/icons/newGroup.png</iconset>
+           <normaloff>:/resources/icons/newGroup.png</normaloff>:/resources/icons/newGroup.png</iconset>
          </property>
          <property name="iconSize">
           <size>
@@ -93,7 +93,7 @@
          </property>
          <property name="icon">
           <iconset resource="../resources.qrc">
-           <normaloff>:/icons/deleteGroup.png</normaloff>:/icons/deleteGroup.png</iconset>
+           <normaloff>:/resources/icons/deleteGroup.png</normaloff>:/resources/icons/deleteGroup.png</iconset>
          </property>
          <property name="iconSize">
           <size>
@@ -131,7 +131,7 @@
          </property>
          <property name="icon">
           <iconset resource="../resources.qrc">
-           <normaloff>:/icons/addTrainee.png</normaloff>:/icons/addTrainee.png</iconset>
+           <normaloff>:/resources/icons/addTrainee.png</normaloff>:/resources/icons/addTrainee.png</iconset>
          </property>
          <property name="iconSize">
           <size>
@@ -169,7 +169,7 @@
          </property>
          <property name="icon">
           <iconset resource="../resources.qrc">
-           <normaloff>:/icons/deleteTrainee.png</normaloff>:/icons/deleteTrainee.png</iconset>
+           <normaloff>:/resources/icons/deleteTrainee.png</normaloff>:/resources/icons/deleteTrainee.png</iconset>
          </property>
          <property name="iconSize">
           <size>
@@ -207,7 +207,7 @@
          </property>
          <property name="icon">
           <iconset resource="../resources.qrc">
-           <normaloff>:/icons/traineeArchive.png</normaloff>:/icons/traineeArchive.png</iconset>
+           <normaloff>:/resources/icons/traineeArchive.png</normaloff>:/resources/icons/traineeArchive.png</iconset>
          </property>
          <property name="iconSize">
           <size>
@@ -245,7 +245,7 @@
          </property>
          <property name="icon">
           <iconset resource="../resources.qrc">
-           <normaloff>:/icons/edit.png</normaloff>:/icons/edit.png</iconset>
+           <normaloff>:/resources/icons/edit.png</normaloff>:/resources/icons/edit.png</iconset>
          </property>
          <property name="iconSize">
           <size>
@@ -296,7 +296,7 @@
          </property>
          <property name="icon">
           <iconset resource="../resources.qrc">
-           <normaloff>:/icons/archive.png</normaloff>:/icons/archive.png</iconset>
+           <normaloff>:/resources/icons/archive.png</normaloff>:/resources/icons/archive.png</iconset>
          </property>
          <property name="iconSize">
           <size>

DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp

@@ -115,7 +115,7 @@ void TraineesView::loadTraineesFromDB()
         QTreeWidgetItem *ItemGroup = new QTreeWidgetItem(treeWidget);
         ItemGroup->setText(ColumnsTreeTrainees::clmn_ID, QString::number(group.getID()));
         ItemGroup->setText(ColumnsTreeTrainees::clmn_Trainee, group.getName());
-        ItemGroup->setIcon(ColumnsTreeTrainees::clmn_Trainee, QIcon(QStringLiteral(":/icons/group.png")));
+        ItemGroup->setIcon(ColumnsTreeTrainees::clmn_Trainee, QIcon(QStringLiteral(":/resources/icons/group.png")));
         setItemColor(ItemGroup, QColor(170, 190, 170));
 
         //ItemGroup->set Property("greenButton", QVariant(true));
@@ -144,13 +144,13 @@ void TraineesView::loadTraineesFromDB()
             if(trainee.getArchived())
             {//Архивный
                 ItemTrainee->setText(ColumnsTreeTrainees::clmn_Archived, tr("yes"));
-                ItemTrainee->setIcon(ColumnsTreeTrainees::clmn_Trainee, QIcon(QStringLiteral(":/icons/archive.png")));
+                ItemTrainee->setIcon(ColumnsTreeTrainees::clmn_Trainee, QIcon(QStringLiteral(":/resources/icons/archive.png")));
                 setItemColorArchive(ItemTrainee);
             }
             else
             {//Не Архивный
                 ItemTrainee->setText(ColumnsTreeTrainees::clmn_Archived, tr("no"));
-                ItemTrainee->setIcon(ColumnsTreeTrainees::clmn_Trainee, QIcon(QStringLiteral(":/icons/trainee.png")));
+                ItemTrainee->setIcon(ColumnsTreeTrainees::clmn_Trainee, QIcon(QStringLiteral(":/resources/icons/trainee.png")));
                 setItemColorNoArchive(ItemTrainee);
                 cntChildsNotArchived++;
             }
@@ -158,12 +158,12 @@ void TraineesView::loadTraineesFromDB()
             if(trainee.getLoggedIn())
             {//Залогинен
                 ItemTrainee->setText(ColumnsTreeTrainees::clmn_Logged, tr("yes"));
-                ItemTrainee->setIcon(ColumnsTreeTrainees::clmn_Logged, QIcon(QStringLiteral(":/icons/circleGreen.png")));
+                ItemTrainee->setIcon(ColumnsTreeTrainees::clmn_Logged, QIcon(QStringLiteral(":/resources/icons/circleGreen.png")));
             }
             else
             {//Не Залогинен
                 ItemTrainee->setText(ColumnsTreeTrainees::clmn_Logged, tr("no"));
-                ItemTrainee->setIcon(ColumnsTreeTrainees::clmn_Logged, QIcon(QStringLiteral(":/icons/circleGray.png")));
+                ItemTrainee->setIcon(ColumnsTreeTrainees::clmn_Logged, QIcon(QStringLiteral(":/resources/icons/circleGray.png")));
             }
 
             QString tasksStr;

DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.ui

@@ -69,7 +69,7 @@
               </property>
               <property name="icon">
                <iconset resource="../resources.qrc">
-                <normaloff>:/icons/DB-trainees.png</normaloff>:/icons/DB-trainees.png</iconset>
+                <normaloff>:/resources/icons/DB-trainees.png</normaloff>:/resources/icons/DB-trainees.png</iconset>
               </property>
               <property name="iconSize">
                <size>