From 874ca7e806e5c5c3dad28f4b8166f6f6223b0902 Mon Sep 17 00:00:00 2001
From: krivoshein <krivoshein@msk.constanta-design.ru>
Date: Thu, 11 Sep 2025 15:05:11 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 InstructorsAndTrainees/messanger/messangerwidget.cpp    | 2 +-
 InstructorsAndTrainees/messanger/messangerwidget.h      | 5 +----
 InstructorsAndTrainees/messanger/msgwidget.h            | 5 +++++
 InstructorsAndTrainees/messanger/tabdialogmessenger.cpp | 8 ++++----
 InstructorsAndTrainees/messanger/tabdialogmessenger.h   | 6 +++---
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/InstructorsAndTrainees/messanger/messangerwidget.cpp b/InstructorsAndTrainees/messanger/messangerwidget.cpp
index 10ec1b9..61e24d2 100644
--- a/InstructorsAndTrainees/messanger/messangerwidget.cpp
+++ b/InstructorsAndTrainees/messanger/messangerwidget.cpp
@@ -73,7 +73,7 @@ void MessangerWidget::addTabDialogMessenger(User user)
     if(!tabDialogMessenger)
     {//Диалога еще не существует
 
-        tabDialogMessenger = new TabDialogMessenger(user.getLogin(), QString::number(user.getID()), this);
+        tabDialogMessenger = new OneDialogMessenger(user.getLogin(), QString::number(user.getID()), this);
 
         //Добавляем новую вкладку диалога
         QString typeUserStr = "";
diff --git a/InstructorsAndTrainees/messanger/messangerwidget.h b/InstructorsAndTrainees/messanger/messangerwidget.h
index 57e170a..4e347b2 100644
--- a/InstructorsAndTrainees/messanger/messangerwidget.h
+++ b/InstructorsAndTrainees/messanger/messangerwidget.h
@@ -16,9 +16,6 @@ class MessangerWidget : public QWidget
 {
     Q_OBJECT
 
-public:
-    enum ETypeMsg{fromClient, toClient};
-
 public:
     explicit MessangerWidget(QWidget *parent = nullptr);
     ~MessangerWidget();
@@ -50,7 +47,7 @@ protected:
     void changeEvent(QEvent * event) override;
 
 private:    
-    TabDialogMessenger* tabDialogMessenger;
+    OneDialogMessenger* tabDialogMessenger;
     User userRemote;
     QString currGUIclientId;   //id этого клиента
 
diff --git a/InstructorsAndTrainees/messanger/msgwidget.h b/InstructorsAndTrainees/messanger/msgwidget.h
index 08b27d4..b306aa9 100644
--- a/InstructorsAndTrainees/messanger/msgwidget.h
+++ b/InstructorsAndTrainees/messanger/msgwidget.h
@@ -13,6 +13,11 @@ class MsgWidget : public QWidget
 {
     Q_OBJECT
 public:
+    enum DirectionMsg
+    {
+        Incoming, //Входящее
+        Outgoing  //Исходящее
+    };
     enum AligneAvatar
     {
         Left,
diff --git a/InstructorsAndTrainees/messanger/tabdialogmessenger.cpp b/InstructorsAndTrainees/messanger/tabdialogmessenger.cpp
index 660b37f..26aa074 100644
--- a/InstructorsAndTrainees/messanger/tabdialogmessenger.cpp
+++ b/InstructorsAndTrainees/messanger/tabdialogmessenger.cpp
@@ -3,7 +3,7 @@
 #include "msgwidget.h"
 
 
-TabDialogMessenger::TabDialogMessenger(QString login , QString userId, QWidget *parent):
+OneDialogMessenger::OneDialogMessenger(QString login , QString userId, QWidget *parent):
     QListWidget(parent),
     login(""),
     userId("")
@@ -15,12 +15,12 @@ TabDialogMessenger::TabDialogMessenger(QString login , QString userId, QWidget *
     setVerticalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAlwaysOn);
 }
 
-TabDialogMessenger::~TabDialogMessenger()
+OneDialogMessenger::~OneDialogMessenger()
 {
 
 }
 
-void TabDialogMessenger::addMsgWidgetLocal(QString text, QString timeStr)
+void OneDialogMessenger::addMsgWidgetLocal(QString text, QString timeStr)
 {
     QListWidgetItem *listWidgetItem = new QListWidgetItem();
     QString avatar = ":/resources/icons/instructor.png";
@@ -46,7 +46,7 @@ void TabDialogMessenger::addMsgWidgetLocal(QString text, QString timeStr)
     scrollToItem(listWidgetItem);
 }
 
-void TabDialogMessenger::addMsgWidgetRemote(QString text, QString timeStr)
+void OneDialogMessenger::addMsgWidgetRemote(QString text, QString timeStr)
 {
     QListWidgetItem *listWidgetItem = new QListWidgetItem();
     QString avatar = ":/resources/icons/trainee.png";
diff --git a/InstructorsAndTrainees/messanger/tabdialogmessenger.h b/InstructorsAndTrainees/messanger/tabdialogmessenger.h
index 9d68a28..eecfc59 100644
--- a/InstructorsAndTrainees/messanger/tabdialogmessenger.h
+++ b/InstructorsAndTrainees/messanger/tabdialogmessenger.h
@@ -7,13 +7,13 @@
 
 //TODO сделать идентификацию по ID
 
-class TabDialogMessenger : public QListWidget
+class OneDialogMessenger : public QListWidget
 {
     Q_OBJECT
 
 public:
-    TabDialogMessenger(QString userLogin, QString userId, QWidget *parent = nullptr);
-    ~TabDialogMessenger();
+    OneDialogMessenger(QString userLogin, QString userId, QWidget *parent = nullptr);
+    ~OneDialogMessenger();
 
     QString getUserLogin() {return login;};
     QString getUserId() {return userId;}