Рефакт5 Мессенджера

InstructorsAndTrainees/messanger/messangerwidget.cpp

@@ -12,8 +12,7 @@ MessangerWidget::MessangerWidget(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::MessangerWidget),
     selectedUserLogin(""),
-    selectedUserId(""),
+    selectedUserId("")
-    flOneTrainee(false)
 {
     ui->setupUi(this);
 
@@ -76,10 +75,7 @@ void MessangerWidget::addTabDialogMessenger(Trainee trainee)
         if(dialogMsg->getUserLogin() == trainee.getLogin())
         {//Диалог для этого клиента уже существует
             //Обновляем статус залогинивания          
-            if(trainee.getLoggedIn())
+            updateLoggedIn(trainee.getLoggedIn());
-                ui->tabWidget->setTabIcon(getIndexTab(trainee.getLogin()), QIcon(":/resources/icons/circleGreen.png"));
-            else
-                ui->tabWidget->setTabIcon(getIndexTab(trainee.getLogin()), QIcon(":/resources/icons/circleGray.png"));
             return;
         }
     }    
@@ -91,13 +87,10 @@ void MessangerWidget::addTabDialogMessenger(Trainee trainee)
     listTabDialogMessenger.append(tabDialog);
 
     //Добавляем новую вкладку диалога
-    int index = ui->tabWidget->addTab(tabDialog, /*login + ": " +*/ trainee.getName());
+    int index = ui->tabWidget->addTab(tabDialog, tr("Trainee") + ": " + trainee.getName() + " (" + trainee.getLogin() + ")");
 
     //Обновляем статус залогинивания
-    if(trainee.getLoggedIn())
+    updateLoggedIn(trainee.getLoggedIn());
-        ui->tabWidget->setTabIcon(index, QIcon(":/resources/icons/circleGreen.png"));
-    else
-        ui->tabWidget->setTabIcon(index, QIcon(":/resources/icons/circleGray.png"));
 }
 
 int MessangerWidget::getIndexTab(QString login)
@@ -130,9 +123,10 @@ void MessangerWidget::showSendedMessage(QString text)
 
 void MessangerWidget::setOneTrainee(Trainee trainee)
 {
-    flOneTrainee = true;
+    this->trainee = trainee;
+
+    QList<Trainee> listTrainees;
 
-    listTrainees.clear();
     listTrainees.append(trainee);
 
     initMessangerWidget(listTrainees);
@@ -169,40 +163,22 @@ void MessangerWidget::slot_LanguageChanged(QString language)
 
 void MessangerWidget::initMessangerWidget(QList<Trainee> listTrainees)
 {
-    if(flOneTrainee)
+    for(Trainee traineeUpdate: listTrainees)
     {
-        Trainee traineeOne = this->listTrainees.first();
+        if(trainee.getID() == traineeUpdate.getID())
-        for(Trainee trainee: listTrainees)
         {
-            if(traineeOne.getID() == trainee.getID())
+            trainee = traineeUpdate;
-            {
-                this->listTrainees.replace(0, trainee);
             break;
         }
     }
-    }
-    else
-    {
-        this->listTrainees = listTrainees;
-    }
 
-    for(Trainee trainee: this->listTrainees)
-    {
-        if(! trainee.getArchived())
     addTabDialogMessenger(trainee);
 }
-}
 
 void MessangerWidget::showReceivedMessage(ClientMessage clientMessage)
-{
-    for(Trainee trainee: listTrainees)
 {
     if(QString::number(trainee.getID()) == clientMessage.fromId)
-        {
         addMsgFromClient(trainee, clientMessage.Text);
-            break;
-        }
-    }
 }
 
 void MessangerWidget::keyPressEvent(QKeyEvent *event)
@@ -213,6 +189,15 @@ void MessangerWidget::keyPressEvent(QKeyEvent *event)
     }
 }
 
+void MessangerWidget::updateLoggedIn(bool loggedIn)
+{
+    //Обновляем статус залогинивания
+    if(loggedIn)
+        ui->tabWidget->setTabIcon(0, QIcon(":/resources/icons/circleGreen.png"));
+    else
+        ui->tabWidget->setTabIcon(0, QIcon(":/resources/icons/circleGray.png"));
+}
+
 void MessangerWidget::changeEvent(QEvent *event)
 {
     // В случае получения события изменения языка приложения

InstructorsAndTrainees/messanger/messangerwidget.h

@@ -61,17 +61,17 @@ public:
 private:
     virtual void keyPressEvent(QKeyEvent *event) override;
 
+    void updateLoggedIn(bool loggedIn);
+
 private:    
     Ui::MessangerWidget *ui;
     QList <TabDialogMessenger*> listTabDialogMessenger;
-    QList<Trainee> listTrainees; //?
+    //QList<Trainee> listTrainees; //?
     Trainee trainee;
     QString selectedUserLogin; //Логин клиента текущего диалога
     QString selectedUserId;     //id клиента текущего диалога
     QString currClientId;   //id этого клиента
     QTranslator qtLanguageTranslator;
-
-    bool flOneTrainee; //?
 };
 
 #endif // MESSANGERWIDGET_H