diff --git a/InstructorsAndTrainees/dialogsettings.ui b/InstructorsAndTrainees/dialogsettings.ui index b9040a0..a4837a2 100644 --- a/InstructorsAndTrainees/dialogsettings.ui +++ b/InstructorsAndTrainees/dialogsettings.ui @@ -23,7 +23,7 @@ - Learning management system - Settings + Settings diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index ffdba4b..bd20407 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -72,8 +72,8 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : ui->groupBox_Trainees->setMinimumHeight(600); - ui->groupBox_Trainees->setMinimumWidth(800); - ui->groupBox_Instructors->setMinimumWidth(800); + ui->groupBox_Trainees->setMinimumWidth(600); + ui->groupBox_Instructors->setMinimumWidth(600); //Доступность кнопок diff --git a/InstructorsAndTrainees/messanger/messangerwidget.cpp b/InstructorsAndTrainees/messanger/messangerwidget.cpp index 660f792..034b78e 100644 --- a/InstructorsAndTrainees/messanger/messangerwidget.cpp +++ b/InstructorsAndTrainees/messanger/messangerwidget.cpp @@ -118,7 +118,9 @@ void MessangerWidget::actualizationTabsDialogMessenger() listTabDialogMessenger.removeOne(tabDialog); } else + { exist = true; + } break; } @@ -233,10 +235,25 @@ void MessangerWidget::traineeSelected(QString login) ui->btnSend->setEnabled(true); ui->editMsg->setEnabled(true); return; + //break; + } + else + { + } } ui->btnSend->setEnabled(false); ui->editMsg->setEnabled(false); + + /* + for(Trainee trainee : this->listTrainees) + { + if(trainee.getLogin() != selectedUserLogin) + { + ui->tabWidget->removeTab(getIndexTab(trainee.getLogin())); + } + } + */ } void MessangerWidget::getTabDialogMessengerByID(QString id_user) @@ -281,7 +298,7 @@ void MessangerWidget::initMessangerWidget(QList listTrainees) { if(! trainee.getArchived()) addTabDialogMessenger(trainee); - } + } } void MessangerWidget::showReceivedMessage(ClientMessage clientMessage)