diff --git a/InstructorsAndTrainees/CMakeLists.txt b/InstructorsAndTrainees/CMakeLists.txt index 2a3d138..ea3fc97 100644 --- a/InstructorsAndTrainees/CMakeLists.txt +++ b/InstructorsAndTrainees/CMakeLists.txt @@ -5,15 +5,22 @@ common_info_for_project(InstructorsAndTrainees) add_library(InstructorsAndTrainees SHARED metatypes.h metatypes.cpp + instructorsAndTrainees_global.h instructorsandtraineeswidget.cpp instructorsandtraineeswidget.h instructorsandtraineeswidget.ui + dialogsettings.cpp dialogsettings.h dialogsettings.ui + commonview.cpp - commonview.h + commonview.h + + specialmessagebox.cpp + specialmessagebox.h + specialmessagebox.ui trainees/editortrainees.cpp trainees/editortrainees.h @@ -34,6 +41,8 @@ add_library(InstructorsAndTrainees SHARED trainees/personalcardtrainee.cpp trainees/personalcardtrainee.h trainees/personalcardtrainee.ui + trainees/dialogcardtrainee.cpp + trainees/dialogcardtrainee.h instructors/viewerinstructors.cpp instructors/viewerinstructors.h @@ -69,6 +78,7 @@ add_library(InstructorsAndTrainees SHARED connectorToServer/Core/versioncontainer.h connectorToServer/Datas.h connectorToServer/streamingversiondata.h + messanger/messangerwidget.cpp messanger/messangerwidget.h messanger/messangerwidget.ui @@ -93,6 +103,9 @@ add_library(InstructorsAndTrainees SHARED tasks/checkertask.cpp tasks/checkertask.h tasks/checkertask.ui + tasks/dialogchekertask.cpp + tasks/dialogchekertask.h + widgets/newversionwidget.cpp widgets/newversionwidget.h widgets/newversionwidget.ui @@ -103,13 +116,6 @@ add_library(InstructorsAndTrainees SHARED widgets/waitanimationwidget.h widgets/waitanimationwidget.ui - specialmessagebox.cpp - specialmessagebox.h - specialmessagebox.ui - - trainees/dialogcardtrainee.cpp - trainees/dialogcardtrainee.h - resources.qrc ) diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp index 3b1b9f9..e22c10e 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp @@ -19,6 +19,7 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre threadPreparation(nullptr), taskTreePreparation(nullptr), waitAnimationWidget(nullptr), + dlgCheckerTask(nullptr), flOnlyActive(false) { ui->setupUi(this); @@ -329,21 +330,18 @@ void AMMtasksWidget::on_btnCheck_clicked() if(!task.getID()) return; - CheckerTask dlg(connectorToServer, "amm", this); + dlgCheckerTask = new DialogChekerTask(connectorToServer, "amm", this); + dlgCheckerTask->setTask(&task); + dlgCheckerTask->exec(); - dlg.setTask(&task); - - QDialog* dialog = new QDialog(this); - QHBoxLayout *layout = new QHBoxLayout(dialog); - layout->addWidget(&dlg); - dialog->setWindowTitle(tr("Status Task")); - dialog->setMinimumSize(200, 100); - dialog->setWindowFlags(dialog->windowFlags() & ~Qt::WindowContextHelpButtonHint); - //dialog->setStyleSheet(this->styleSheet()); - dialog->exec(); - - if(dlg.getFlChanged()) + if(dlgCheckerTask->getFlChanged()) waitAnimationWidget->showWithPlay(); + + if(dlgCheckerTask) + { + delete dlgCheckerTask; + dlgCheckerTask = nullptr; + } } } diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.h b/InstructorsAndTrainees/tasks/ammtaskswidget.h index 9f4222f..920ed1d 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.h +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.h @@ -7,6 +7,7 @@ #include "module.h" #include "connectortoserver.h" #include "tasktreepreparation.h" +#include "dialogchekertask.h" namespace Ui { class AMMtasksWidget; @@ -76,6 +77,8 @@ private: TaskAMMFIMTreePreparation* taskTreePreparation; WaitAnimationWidget *waitAnimationWidget; + DialogChekerTask* dlgCheckerTask; + bool flOnlyActive; //AMM }; diff --git a/InstructorsAndTrainees/tasks/checkertask.cpp b/InstructorsAndTrainees/tasks/checkertask.cpp index f741006..967297c 100644 --- a/InstructorsAndTrainees/tasks/checkertask.cpp +++ b/InstructorsAndTrainees/tasks/checkertask.cpp @@ -1,6 +1,7 @@ #include "checkertask.h" #include "specialmessagebox.h" #include "ui_checkertask.h" +#include "fimtaskswidget.h" CheckerTask::CheckerTask(ConnectorToServer* connectorToServer, QString type, QWidget *parent) : QWidget(parent), @@ -48,6 +49,11 @@ CheckerTask::~CheckerTask() delete ui; } +void CheckerTask::closeEvent(QCloseEvent *event) +{ + +} + void CheckerTask::setTask(TaskAmmFim* task) { this->task = *task; diff --git a/InstructorsAndTrainees/tasks/checkertask.h b/InstructorsAndTrainees/tasks/checkertask.h index 2908ca0..f08edeb 100644 --- a/InstructorsAndTrainees/tasks/checkertask.h +++ b/InstructorsAndTrainees/tasks/checkertask.h @@ -3,12 +3,16 @@ #include #include "tasksAmmFim.h" -#include "fimtaskswidget.h" +//#include "fimtaskswidget.h" +#include "module.h" +#include "connectortoserver.h" namespace Ui { class CheckerTask; } +class FIMtasksWidget; + class CheckerTask : public QWidget { Q_OBJECT @@ -17,6 +21,8 @@ public: explicit CheckerTask(ConnectorToServer* connectorToServer, QString type, QWidget *parent = nullptr); ~CheckerTask(); + void closeEvent(QCloseEvent *event) override; + public: void setTask(TaskAmmFim* task); TaskAmmFim getTask(); diff --git a/InstructorsAndTrainees/tasks/dialogchekertask.cpp b/InstructorsAndTrainees/tasks/dialogchekertask.cpp new file mode 100644 index 0000000..8cd08d2 --- /dev/null +++ b/InstructorsAndTrainees/tasks/dialogchekertask.cpp @@ -0,0 +1,40 @@ +#include +#include "dialogchekertask.h" + +DialogChekerTask::DialogChekerTask(ConnectorToServer* connectorToServer, QString type, QWidget *parent) : + QDialog(parent, + Qt::WindowSystemMenuHint + | Qt::WindowMaximizeButtonHint + | Qt::WindowMinimizeButtonHint + | Qt::WindowCloseButtonHint), + checkerTask(nullptr) +{ + checkerTask = new CheckerTask(connectorToServer, type, this); + + QHBoxLayout *layout = new QHBoxLayout(this); + layout->addWidget(checkerTask); + this->setWindowTitle(tr("Check Task")); + this->setMinimumSize(1400, 700); + this->setWindowState(Qt::WindowMaximized); + this->setModal(true); +} + +DialogChekerTask::~DialogChekerTask() +{ + delete checkerTask; +} + +void DialogChekerTask::closeEvent(QCloseEvent *event) +{ + checkerTask->close(); +} + +void DialogChekerTask::setTask(TaskAmmFim *task) +{ + checkerTask->setTask(task); +} + +bool DialogChekerTask::getFlChanged() +{ + return checkerTask->getFlChanged(); +} diff --git a/InstructorsAndTrainees/tasks/dialogchekertask.h b/InstructorsAndTrainees/tasks/dialogchekertask.h new file mode 100644 index 0000000..282ffed --- /dev/null +++ b/InstructorsAndTrainees/tasks/dialogchekertask.h @@ -0,0 +1,25 @@ +#ifndef DIALOGCHEKERTASK_H +#define DIALOGCHEKERTASK_H + +#include +#include +#include "checkertask.h" + +class DialogChekerTask : public QDialog +{ + Q_OBJECT +public: + DialogChekerTask(ConnectorToServer* connectorToServer, QString type, QWidget *parent = nullptr); + ~DialogChekerTask(); + + void closeEvent(QCloseEvent *event) override; + +public: + void setTask(TaskAmmFim* task); + bool getFlChanged(); + +private: + CheckerTask* checkerTask; +}; + +#endif // DIALOGCHEKERTASK_H diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp index ce16ca6..e588013 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp @@ -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; } } } diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.h b/InstructorsAndTrainees/tasks/fimtaskswidget.h index 60d222c..73136e1 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.h +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.h @@ -6,6 +6,7 @@ #include "tasksAmmFim.h" #include "connectortoserver.h" #include "tasktreepreparation.h" +#include "dialogchekertask.h" namespace Ui { class FIMtasksWidget; @@ -79,7 +80,7 @@ private: TaskAMMFIMTreePreparation* taskTreePreparation; WaitAnimationWidget *waitAnimationWidget; - QDialog* dlgCheckTask; + DialogChekerTask* dlgCheckerTask; QString userName; //FIM }; diff --git a/InstructorsAndTrainees/trainees/dialogcardtrainee.cpp b/InstructorsAndTrainees/trainees/dialogcardtrainee.cpp index 14b382b..3d5d066 100644 --- a/InstructorsAndTrainees/trainees/dialogcardtrainee.cpp +++ b/InstructorsAndTrainees/trainees/dialogcardtrainee.cpp @@ -18,10 +18,6 @@ DialogCardTrainee::DialogCardTrainee(ConnectorToServer* connectorToServer, Messa this->setWindowTitle(tr("Personal card trainee")); this->setMinimumSize(1400, 700); this->setWindowState(Qt::WindowMaximized); - /*this->setWindowFlags(Qt::WindowSystemMenuHint - | Qt::WindowMaximizeButtonHint - | Qt::WindowMinimizeButtonHint - | Qt::WindowCloseButtonHint);*/ this->setModal(true); }