Перекомпоновал ГУИ

This commit is contained in:
2025-09-02 12:24:31 +03:00
parent eaf5668528
commit 0da66544f0
7 changed files with 84 additions and 132 deletions

View File

@@ -12,8 +12,8 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
viewerTrainees(nullptr),
viewerInstructors(nullptr),
messangerWidget(nullptr),
ammTasksWidget(nullptr),
fimTasksWidget(nullptr),
//ammTasksWidget(nullptr),
//fimTasksWidget(nullptr),
adminMode(false),
loginInstructorLoggedInLocal(QStringLiteral("")),
nameInstructorLoggedInLocal(QStringLiteral("")),
@@ -22,7 +22,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
ui->setupUi(this);
ui->btnSettings->setObjectName("btnSettings");
ui->tabWidget_Tasks->setObjectName("tabWidgetTasks");
//ui->tabWidget_Tasks->setObjectName("tabWidgetTasks");
ui->widget_Top->setObjectName("widgetTop");
ui->groupBox_Trainees->setObjectName("groupBox_Trainees");
@@ -64,6 +64,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
connect(connectorToServer,&ConnectorToServer::signal_ConnectedToServer,this,&InstructorsAndTraineesWidget::slot_ConnectedToServer);
/*
ammTasksWidget = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, this);
fimTasksWidget = new FIMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, this);
@@ -71,6 +72,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMM, ammTasksWidget, &AMMtasksWidget::slot_NeedUpdateUI);
connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, fimTasksWidget, &FIMtasksWidget::slot_traineeSelected);
connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, ammTasksWidget, &AMMtasksWidget::slot_traineeSelected);
*/
messangerWidget = new MessangerWidget(this);
//connect(connectorToServer,&ConnectorToServer::signal_InitMessanger,messangerWidget,&MessangerWidget::slot_InitMessanger);
@@ -79,33 +81,38 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
connect(messangerWidget, &MessangerWidget::signal_sendMessage, connectorToServer, &ConnectorToServer::slot_sendMessage);
connect(connectorToServer,&ConnectorToServer::signal_receiveMessage,messangerWidget,&MessangerWidget::slot_showMessage);
connect(fimTasksWidget, &FIMtasksWidget::signal_AssignedTask, viewerTrainees, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM);
connect(ammTasksWidget, &AMMtasksWidget::signal_AssignedTask, viewerTrainees, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayAMM);
//connect(fimTasksWidget, &FIMtasksWidget::signal_AssignedTask, viewerTrainees, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM);
//connect(ammTasksWidget, &AMMtasksWidget::signal_AssignedTask, viewerTrainees, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayAMM);
//Размещение
ui->verticalLayout_Trainees->addWidget(viewerTrainees);
ui->verticalLayout_AMM->addWidget(ammTasksWidget);
ui->verticalLayout_FIM->addWidget(fimTasksWidget);
//ui->verticalLayout_AMM->addWidget(ammTasksWidget);
//ui->verticalLayout_FIM->addWidget(fimTasksWidget);
ui->verticalLayout_Messenger->addWidget(messangerWidget);
ui->verticalLayout_Instructors->addWidget(viewerInstructors);
ui->groupBox_Messenger->setMaximumWidth(500);
ui->groupBox_Instructors->setMaximumWidth(500);
ui->groupBox_Messenger->setMaximumWidth(600);
//ui->groupBox_Instructors->setMaximumWidth(500);
ui->groupBox_Messenger->setMinimumWidth(600);
ui->groupBox_Messenger->setMinimumWidth(490);
ui->groupBox_Instructors->setMinimumWidth(490);
ui->groupBox_Messenger->setMinimumHeight(500);
ui->groupBox_Instructors->setMinimumHeight(300);
ui->groupBox_Instructors->setMaximumHeight(300);
ui->groupBox_Instructors->setMinimumHeight(400);
ui->groupBox_Instructors->setMaximumHeight(400);
ui->groupBox_Trainees->setMinimumHeight(500);
//ui->groupBox_Trainees->setMaximumHeight(500);
ui->groupBox_Trainees->setMinimumWidth(700);
ui->groupBox_Tasks->setMinimumWidth(600);
ui->groupBox_Instructors->setMinimumWidth(700);
//ui->groupBox_Tasks->setMinimumWidth(600);
ui->btnAuthorizationInstructor->setEnabled(false);
@@ -121,8 +128,8 @@ InstructorsAndTraineesWidget::~InstructorsAndTraineesWidget()
if(authorizationIsCompleted())
deAuthorizationInstructor(loginInstructorLoggedInLocal);
delete ammTasksWidget;
delete fimTasksWidget;
//delete ammTasksWidget;
//delete fimTasksWidget;
delete messangerWidget;
delete viewerInstructors;
delete viewerTrainees;
@@ -293,8 +300,8 @@ void InstructorsAndTraineesWidget::slot_ConnectedToServer(bool state)
viewerTrainees->deactivate();
viewerInstructors->deactivate();
ammTasksWidget->deactivate();
fimTasksWidget->deactivate();
//ammTasksWidget->deactivate();
//fimTasksWidget->deactivate();
messangerWidget->clear();
@@ -384,8 +391,8 @@ void InstructorsAndTraineesWidget::on_btnAuthorizationInstructor_clicked()
viewerTrainees->deactivate();
viewerInstructors->deactivate();
ammTasksWidget->deactivate();
fimTasksWidget->deactivate();
//ammTasksWidget->deactivate();
//fimTasksWidget->deactivate();
messangerWidget->clear();
}