From 17dcf18da6d2653e5bbd1a1a51cc79c2f5872d17 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Thu, 23 Jan 2025 12:32:31 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=BE?= =?UTF-8?q?=D1=87=D0=B8=D1=89=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=9C=D0=B5=D1=81?= =?UTF-8?q?=D1=81=D0=B5=D0=BD=D0=B4=D0=B6=D0=B5=D1=80=D0=B0=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B8=20=D0=B4=D0=B5=D0=B0=D0=B2=D1=82=D0=BE=D1=80=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- InstructorsAndTrainees/instructorsandtraineeswidget.cpp | 8 +++++++- InstructorsAndTrainees/messanger/messangerwidget.cpp | 6 ++++++ InstructorsAndTrainees/messanger/messangerwidget.h | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index 03b4e84..62fa036 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -52,7 +52,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, ammTasksWidget, &AMMtasksWidget::slot_traineeSelected); messangerWidget = new MessangerWidget(this); - connect(connectorToServer,&ConnectorToServer::signal_InitMessanger,messangerWidget,&MessangerWidget::slot_InitMessanger); + //connect(connectorToServer,&ConnectorToServer::signal_InitMessanger,messangerWidget,&MessangerWidget::slot_InitMessanger); connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, messangerWidget, &MessangerWidget::slot_traineeSelected); connect(messangerWidget, &MessangerWidget::signal_tabMessengerChanged, viewerTrainees, &ViewerTrainees::slot_tabMessengerChanged); connect(messangerWidget, &MessangerWidget::signal_msgToClientReady, connectorToServer, &ConnectorToServer::slot_msgToClientReady); @@ -231,6 +231,8 @@ void InstructorsAndTraineesWidget::slot_ConnectedToServer(bool state) ammTasksWidget->clearTree(); fimTasksWidget->clearTree(); + + messangerWidget->clear(); } } @@ -292,6 +294,7 @@ void InstructorsAndTraineesWidget::on_btnAuthorizationInstructor_clicked() { connect(connectorToServer,&ConnectorToServer::signal_UpdateDB,viewerInstructors,&ViewerInstructors::slot_NeedUpdateUI); connect(connectorToServer,&ConnectorToServer::signal_UpdateDB,viewerTrainees,&ViewerTrainees::slot_NeedUpdateUI); + connect(connectorToServer,&ConnectorToServer::signal_InitMessanger,messangerWidget,&MessangerWidget::slot_InitMessanger); } else ui->btnAuthorizationInstructor->setChecked(false); @@ -304,12 +307,15 @@ void InstructorsAndTraineesWidget::on_btnAuthorizationInstructor_clicked() { disconnect(connectorToServer,&ConnectorToServer::signal_UpdateDB,viewerInstructors,&ViewerInstructors::slot_NeedUpdateUI); disconnect(connectorToServer,&ConnectorToServer::signal_UpdateDB,viewerTrainees,&ViewerTrainees::slot_NeedUpdateUI); + disconnect(connectorToServer,&ConnectorToServer::signal_InitMessanger,messangerWidget,&MessangerWidget::slot_InitMessanger); viewerTrainees->clearTree(); viewerInstructors->clearTree(); ammTasksWidget->clearTree(); fimTasksWidget->clearTree(); + + messangerWidget->clear(); } else ui->btnAuthorizationInstructor->setChecked(true); diff --git a/InstructorsAndTrainees/messanger/messangerwidget.cpp b/InstructorsAndTrainees/messanger/messangerwidget.cpp index da36b37..6fe6fdd 100644 --- a/InstructorsAndTrainees/messanger/messangerwidget.cpp +++ b/InstructorsAndTrainees/messanger/messangerwidget.cpp @@ -130,6 +130,12 @@ int MessangerWidget::getIndexTab(QString login) return -1; } +void MessangerWidget::clear() +{ + listTrainees.clear(); + actualizationTabsDialogMessenger(); +} + void MessangerWidget::on_btnSend_clicked() { QString text = ui->editMsg->toPlainText(); diff --git a/InstructorsAndTrainees/messanger/messangerwidget.h b/InstructorsAndTrainees/messanger/messangerwidget.h index 48b4c66..b4438e7 100644 --- a/InstructorsAndTrainees/messanger/messangerwidget.h +++ b/InstructorsAndTrainees/messanger/messangerwidget.h @@ -37,6 +37,8 @@ public: int getIndexTab(QString login); + void clear(); + private slots: void on_btnSend_clicked(); void on_tabWidget_currentChanged(int index);