Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

18
InstructorsAndTrainees/trainees/viewertrainees.cpp
View File

@@ -5,8 +5,8 @@
ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *parent) :
TraineesView(connectorToServer, CommonView::TypeView::onlyView, parent),
ammTasksWidget_pers0(nullptr),
fimTasksWidget_pers0(nullptr),
//ammTasksWidget_pers0(nullptr),
//fimTasksWidget_pers0(nullptr),
ammTasksWidgetCommon(nullptr),
fimTasksWidgetCommon(nullptr),
ui(new Ui::ViewerTrainees)
@@ -18,7 +18,7 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *pa
ui->horizontalLayout_11->addWidget(treeWidget);
//------
/*
ammTasksWidget_pers0 = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listForTrainee, this);
fimTasksWidget_pers0 = new FIMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listForTrainee, this);
@@ -30,7 +30,7 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *pa
ui->verticalLayout_2->addWidget(ammTasksWidget_pers0);
ui->verticalLayout_2->addWidget(fimTasksWidget_pers0);
//------
*/
//------
ammTasksWidgetCommon = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, /*this*/nullptr);
@@ -41,8 +41,8 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *pa
connect(this, &ViewerTrainees::signal_traineeSelected, fimTasksWidgetCommon, &FIMtasksWidget::slot_traineeSelected);
connect(this, &ViewerTrainees::signal_traineeSelected, ammTasksWidgetCommon, &AMMtasksWidget::slot_traineeSelected);
connect(fimTasksWidgetCommon, &FIMtasksWidget::signal_AssignedTask, this, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM);
connect(ammTasksWidgetCommon, &AMMtasksWidget::signal_AssignedTask, this, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayAMM);
//connect(fimTasksWidgetCommon, &FIMtasksWidget::signal_AssignedTask, this, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM);
//connect(ammTasksWidgetCommon, &AMMtasksWidget::signal_AssignedTask, this, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayAMM);
//ammTasksWidgetCommon->setParent(this);
//fimTasksWidgetCommon->setParent(this);
@@ -71,8 +71,8 @@ void ViewerTrainees::setAuthComplited(bool authComplited)
void ViewerTrainees::deactivate()
{
CommonView::deactivate();
ammTasksWidget_pers0->deactivate();
fimTasksWidget_pers0->deactivate();
//ammTasksWidget_pers0->deactivate();
//fimTasksWidget_pers0->deactivate();
ammTasksWidgetCommon->deactivate();
fimTasksWidgetCommon->deactivate();
@@ -118,6 +118,7 @@ void ViewerTrainees::slot_tabMessengerChanged(QString login)
}
}
/*
void ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM()
{
fimTasksWidget_pers0->waitAnimationWidgetShowWithPlay();
@@ -127,6 +128,7 @@ void ViewerTrainees::slot_waitAnimationWidgetShowWithPlayAMM()
{
ammTasksWidget_pers0->waitAnimationWidgetShowWithPlay();
}
*/
void ViewerTrainees::changeEvent(QEvent *event)
{

8
InstructorsAndTrainees/trainees/viewertrainees.h
View File

@@ -42,8 +42,8 @@ public Q_SLOTS:
//слот обработки сигнала об изменении вкладки диалога в мессенджере
void slot_tabMessengerChanged(QString login);
void slot_waitAnimationWidgetShowWithPlayFIM();
void slot_waitAnimationWidgetShowWithPlayAMM();
//void slot_waitAnimationWidgetShowWithPlayFIM();
//void slot_waitAnimationWidgetShowWithPlayAMM();
Q_SIGNALS:
//сигнал о выборе обучаемого
@@ -53,8 +53,8 @@ private:
void updateButtons() override;
private:
AMMtasksWidget* ammTasksWidget_pers0;
FIMtasksWidget* fimTasksWidget_pers0;
//AMMtasksWidget* ammTasksWidget_pers0;
//FIMtasksWidget* fimTasksWidget_pers0;
AMMtasksWidget* ammTasksWidgetCommon;
FIMtasksWidget* fimTasksWidgetCommon;

3
InstructorsAndTrainees/trainees/viewertrainees.ui
View File

@@ -35,9 +35,6 @@
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>