mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git
synced 2026-03-27 19:45:43 +03:00
вынес DialogChekerTask
This commit is contained in:
@@ -20,7 +20,7 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre
|
||||
threadPreparation(nullptr),
|
||||
taskTreePreparation(nullptr),
|
||||
waitAnimationWidget(nullptr),
|
||||
dlgCheckTask(nullptr),
|
||||
dlgCheckerTask(nullptr),
|
||||
userName("")
|
||||
{
|
||||
ui->setupUi(this);
|
||||
@@ -97,9 +97,9 @@ FIMtasksWidget::~FIMtasksWidget()
|
||||
delete waitAnimationWidget;
|
||||
delete treeWidget;
|
||||
|
||||
if(dlgCheckTask)
|
||||
if(dlgCheckerTask)
|
||||
{
|
||||
dlgCheckTask->close();
|
||||
dlgCheckerTask->close();
|
||||
}
|
||||
|
||||
delete ui;
|
||||
@@ -146,8 +146,8 @@ void FIMtasksWidget::resizeEvent(QResizeEvent *event)
|
||||
|
||||
void FIMtasksWidget::closeDlgCheckTask()
|
||||
{
|
||||
if(dlgCheckTask)
|
||||
dlgCheckTask->close();
|
||||
if(dlgCheckerTask)
|
||||
dlgCheckerTask->close();
|
||||
}
|
||||
|
||||
void FIMtasksWidget::changeEvent(QEvent *event)
|
||||
@@ -391,31 +391,17 @@ void FIMtasksWidget::on_btnCheck_clicked()
|
||||
if(!task.getID())
|
||||
return;
|
||||
|
||||
CheckerTask* checkTask = new CheckerTask(connectorToServer, "fim", this);
|
||||
dlgCheckerTask = new DialogChekerTask(connectorToServer, "fim", this);
|
||||
dlgCheckerTask->setTask(&task);
|
||||
dlgCheckerTask->exec();
|
||||
|
||||
checkTask->setTask(&task);
|
||||
|
||||
dlgCheckTask = new QDialog(this,
|
||||
Qt::WindowSystemMenuHint
|
||||
| Qt::WindowMaximizeButtonHint
|
||||
| Qt::WindowMinimizeButtonHint
|
||||
| Qt::WindowCloseButtonHint);
|
||||
QHBoxLayout *layout = new QHBoxLayout(dlgCheckTask);
|
||||
layout->addWidget(checkTask);
|
||||
dlgCheckTask->setWindowTitle(tr("Check Task"));
|
||||
dlgCheckTask->setMinimumSize(1400, 700);
|
||||
dlgCheckTask->setWindowState(Qt::WindowMaximized);
|
||||
dlgCheckTask->setModal(true);
|
||||
dlgCheckTask->showMaximized();
|
||||
dlgCheckTask->exec();
|
||||
|
||||
if(checkTask->getFlChanged())
|
||||
if(dlgCheckerTask->getFlChanged())
|
||||
waitAnimationWidget->showWithPlay();
|
||||
|
||||
if(dlgCheckTask)
|
||||
if(dlgCheckerTask)
|
||||
{
|
||||
delete dlgCheckTask;
|
||||
dlgCheckTask = nullptr;
|
||||
delete dlgCheckerTask;
|
||||
dlgCheckerTask = nullptr;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user