Рефакт а1

InstructorsAndTrainees/messanger/messangerwidget.cpp

@@ -89,7 +89,7 @@ void MessangerWidget::addTabDialogMessenger(User user)
     else
     {//Диалог уже существует
 
-        //Проверяем наличие диалога с этим клиентом
+        //Проверяем наличие диалога именно с этим клиентом
         if(tabDialogMessenger->getUserLogin() == user.getLogin())
         {
             //Обновляем статус залогинивания

InstructorsAndTrainees/messanger/tabdialogmessenger.cpp

@@ -22,43 +22,39 @@ OneDialogMessenger::~OneDialogMessenger()
 
 void OneDialogMessenger::addMsgWidgetLocal(QString text, QString timeStr)
 {
-    QListWidgetItem *listWidgetItem = new QListWidgetItem();
+    addMsgWidget(text, timeStr, MsgWidget::DirectionMsg::Outgoing);
-    QString avatar = ":/resources/icons/instructor.png";
-
-    int widthW = width();
-    int widthSB = verticalScrollBar()->size().width();
-    //TODO Времянка
-    widthW = 450;
-    widthSB = 17;
-
-    MsgWidget *msgWidget = new MsgWidget(avatar, MsgWidget::AligneAvatar::Left,
-                                      widthW - widthSB);
-
-    addItem(listWidgetItem);
-    setItemWidget(listWidgetItem, msgWidget);
-
-    msgWidget->setText(text);
-    msgWidget->setTime(timeStr);
-
-    //Корректировка высоты item
-    listWidgetItem->setSizeHint (QSize(10, msgWidget->height()));
-
-    scrollToItem(listWidgetItem);
 }
 
 void OneDialogMessenger::addMsgWidgetRemote(QString text, QString timeStr)
+{
+    addMsgWidget(text, timeStr, MsgWidget::DirectionMsg::Incoming);
+}
+
+void OneDialogMessenger::addMsgWidget(QString text, QString timeStr, MsgWidget::DirectionMsg direction)
 {
     QListWidgetItem *listWidgetItem = new QListWidgetItem();
-    QString avatar = ":/resources/icons/trainee.png";
+
+    QString avatar = "";
+    MsgWidget::AligneAvatar aligneAvatar = MsgWidget::AligneAvatar::Left;
+
+    //TODO уточнить аватарки!
+    if(direction == MsgWidget::DirectionMsg::Outgoing)
+    {
+        avatar = ":/resources/icons/instructor.png";
+        aligneAvatar = MsgWidget::AligneAvatar::Left;
+    }
+    else
+    {
+        avatar = ":/resources/icons/trainee.png";
+        aligneAvatar = MsgWidget::AligneAvatar::Right;
+    }
 
     int widthW = width();
     int widthSB = verticalScrollBar()->size().width();
     //TODO Времянка
     widthW = 450;
-    widthSB = 17;
 
-    MsgWidget *msgWidget = new MsgWidget(avatar, MsgWidget::AligneAvatar::Right,
+    MsgWidget *msgWidget = new MsgWidget(avatar, aligneAvatar, widthW - widthSB);
-                                      widthW - widthSB);
 
     addItem(listWidgetItem);
     setItemWidget(listWidgetItem, msgWidget);

InstructorsAndTrainees/messanger/tabdialogmessenger.h

@@ -2,6 +2,7 @@
 #define TABDIALOGMESSENGER_H
 
 #include <QListWidget>
+#include "msgwidget.h"
 
 //Закладка ведения диалога с одним клиентом
 
@@ -21,6 +22,9 @@ public:
     void addMsgWidgetLocal(QString text, QString timeStr = "");
     void addMsgWidgetRemote(QString text, QString timeStr = "");
 
+private:
+    void addMsgWidget(QString text, QString timeStr, MsgWidget::DirectionMsg direction);
+
 private:
     QString login;
     QString userId;