refact2

InstructorsAndTrainees/tasks/fimtaskswidget.cpp

@@ -20,6 +20,7 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre
     threadPreparation(nullptr),
     taskTreePreparation(nullptr),
     waitAnimationWidget(nullptr),
+    dlgCheckTask(nullptr),
     userName("")
 {
     ui->setupUi(this);
@@ -96,6 +97,11 @@ FIMtasksWidget::~FIMtasksWidget()
     delete waitAnimationWidget;
     delete treeWidget;
 
+    if(dlgCheckTask)
+    {
+        dlgCheckTask->close();
+    }
+
     delete ui;
 }
 
@@ -127,11 +133,23 @@ void FIMtasksWidget::resizeEvent(QResizeEvent *event)
     if(type == TypeListTreeAMMFIM::listCommon)
         widthTitle = width - (20 + 10);
     else
+    {
+#ifdef PROJECT_TYPE_DEBUG
         widthTitle = width - (180 + 10);
+#else
+        widthTitle = width - (130 + 10);
+#endif
+    }
 
     treeWidget->setColumnWidth(ColumnsTreeFIM::clmnFIM_Title, widthTitle);
 }
 
+void FIMtasksWidget::closeDlgCheckTask()
+{
+    if(dlgCheckTask)
+        dlgCheckTask->close();
+}
+
 void FIMtasksWidget::changeEvent(QEvent *event)
 {
     // В случае получения события изменения языка приложения
@@ -278,6 +296,14 @@ void FIMtasksWidget::preparationTreeWidget()
         treeWidget->setColumnHidden(ColumnsTreeFIM::clmnFIM_ID, true);
         treeWidget->setColumnHidden(ColumnsTreeFIM::clmnFIM_status, true);
     }
+    else
+    {
+#ifdef PROJECT_TYPE_DEBUG
+        treeWidget->setColumnHidden(ColumnsTreeFIM::clmnFIM_ID, false);
+#else
+        treeWidget->setColumnHidden(ColumnsTreeFIM::clmnFIM_ID, true);
+#endif
+    }
 }
 
 void FIMtasksWidget::reSetHeadTreeWidget()
@@ -365,21 +391,32 @@ void FIMtasksWidget::on_btnCheck_clicked()
             if(!task.getID())
                 return;
 
-            DialogCheckTask dlg(connectorToServer, "fim", this);
+            DialogCheckTask* checkTask = new DialogCheckTask(connectorToServer, "fim", this);
 
-            dlg.setTask(&task);
+            checkTask->setTask(&task);
 
-            QDialog* dialog = new QDialog(this);
-            QHBoxLayout *layout = new QHBoxLayout(dialog);
-            layout->addWidget(&dlg);
-            dialog->setWindowTitle(tr("Check Task"));
-            dialog->setMinimumSize(1600, 800);
-            dialog->setWindowFlags(dialog->windowFlags() & ~Qt::WindowContextHelpButtonHint);
-            //dialog->setStyleSheet(this->styleSheet());
-            dialog->exec();
+            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(dlg.getFlChanged())
+            if(checkTask->getFlChanged())
                 waitAnimationWidget->showWithPlay();
+
+            if(dlgCheckTask)
+            {
+                delete dlgCheckTask;
+                dlgCheckTask = nullptr;
+            }
         }
     }
 }