From 44b6299e59b8fef581c6f110791fd736bc00f038 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Wed, 26 Nov 2025 11:19:11 +0300 Subject: [PATCH] notifyController -> specialWB --- DOCS/Андрей/Board.md | 5 ++--- GUIdataBaseLMS/CMakeLists.txt | 1 + InstructorsAndTrainees/CMakeLists.txt | 4 ++-- .../Core/notifycontroller.cpp | 12 ----------- .../connectorToServer/Core/notifycontroller.h | 18 ----------------- .../connectorToServer/Core/recognizesystem.h | 2 +- .../connectorToServer/connectortoserver.cpp | 2 +- .../specialmessagebox/notifycontroller.cpp | 19 ++++++++++++++++++ .../specialmessagebox/notifycontroller.h | 20 +++++++++++++++++++ .../widgets/dialognewversion.h | 1 + .../widgets/versionselectwidget.cpp | 8 ++++---- .../widgets/versionselectwidget.h | 4 ++-- 12 files changed, 53 insertions(+), 43 deletions(-) delete mode 100644 InstructorsAndTrainees/connectorToServer/Core/notifycontroller.cpp delete mode 100644 InstructorsAndTrainees/connectorToServer/Core/notifycontroller.h create mode 100644 InstructorsAndTrainees/specialmessagebox/notifycontroller.cpp create mode 100644 InstructorsAndTrainees/specialmessagebox/notifycontroller.h diff --git a/DOCS/Андрей/Board.md b/DOCS/Андрей/Board.md index 51098d2..dbf485e 100644 --- a/DOCS/Андрей/Board.md +++ b/DOCS/Андрей/Board.md @@ -12,6 +12,7 @@ kanban-plugin: board ## Completed +- [ ] Сделать крутилку на начальную загрузку Сервера - [ ] Логин суперпользователя PostgreSQL предлагать по умолчанию postgres - [ ] Сделать несколько попыток подключения к серверу - [ ] Переобновление docs.xml в пределах версии (если инструктор изменяет процедуры) @@ -59,9 +60,6 @@ kanban-plugin: board (Так как сейчас может вызвать проблемы при смене логина юзера!!!) - [ ] Зарефакторить databaselms_PostgreSQL.cpp (возможно, нужно использовать транзакции при восстановлении БД!) -- [ ] Отображать текущую версию data в статус баре -- [ ] Сделать крутилку на начальную загрузку Сервера -- [ ] Не блочится Сервер при смене версии ## GUI Messenger @@ -74,6 +72,7 @@ kanban-plugin: board ## GUI общие +- [ ] Отображать текущую версию data в статус баре - [ ] Текстовый поиск в задачах diff --git a/GUIdataBaseLMS/CMakeLists.txt b/GUIdataBaseLMS/CMakeLists.txt index d10d57b..04430c9 100644 --- a/GUIdataBaseLMS/CMakeLists.txt +++ b/GUIdataBaseLMS/CMakeLists.txt @@ -24,6 +24,7 @@ target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/connectorToServer/Core) target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/messanger) target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/widgets) +target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/specialmessagebox) if(PROJECT_TYPE_DEBUG) target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/Debug64/InstructorsAndTrainees) else() diff --git a/InstructorsAndTrainees/CMakeLists.txt b/InstructorsAndTrainees/CMakeLists.txt index 2d57e00..a8a8775 100644 --- a/InstructorsAndTrainees/CMakeLists.txt +++ b/InstructorsAndTrainees/CMakeLists.txt @@ -21,6 +21,8 @@ add_library(InstructorsAndTrainees SHARED specialmessagebox/specialmessagebox.cpp specialmessagebox/specialmessagebox.h specialmessagebox/specialmessagebox.ui + specialmessagebox/notifycontroller.cpp + specialmessagebox/notifycontroller.h authorization/dialogauthorization.cpp authorization/dialogauthorization.h @@ -80,8 +82,6 @@ add_library(InstructorsAndTrainees SHARED connectorToServer/Core/tools.cpp connectorToServer/Core/tools.h connectorToServer/Core/FileData.h - connectorToServer/Core/notifycontroller.cpp - connectorToServer/Core/notifycontroller.h connectorToServer/Core/versioncontainer.cpp connectorToServer/Core/versioncontainer.h connectorToServer/Datas.h diff --git a/InstructorsAndTrainees/connectorToServer/Core/notifycontroller.cpp b/InstructorsAndTrainees/connectorToServer/Core/notifycontroller.cpp deleted file mode 100644 index 152e1cb..0000000 --- a/InstructorsAndTrainees/connectorToServer/Core/notifycontroller.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include "notifycontroller.h" -#include "specialmessagebox.h" - -NotifyController::NotifyController(QObject *parent) : QObject(parent) -{ - -} - -void NotifyController::showWarning(QString text) -{ - SpecialMessageBox(nullptr, SpecialMessageBox::TypeSpecMsgBox::warningClose, text).exec(); -} diff --git a/InstructorsAndTrainees/connectorToServer/Core/notifycontroller.h b/InstructorsAndTrainees/connectorToServer/Core/notifycontroller.h deleted file mode 100644 index 1b08ef9..0000000 --- a/InstructorsAndTrainees/connectorToServer/Core/notifycontroller.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef NOTIFYCONTROLLER_H -#define NOTIFYCONTROLLER_H - -#include -#include - -class NotifyController : public QObject -{ - Q_OBJECT -public: - explicit NotifyController(QObject *parent = nullptr); - - void showWarning(QString text); -signals: - -}; - -#endif // NOTIFYCONTROLLER_H diff --git a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h index 5989cef..60f232c 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h +++ b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h @@ -55,7 +55,7 @@ signals: void sigAnswerQueryTasksXML_AMM(QByteArray array); void sigShowServerDataList(QList *versions); void sigSetVersion(StreamingVersionData* serverVersion); - void sigNotify(QString text); + void sigNotify(QString text, QWidget *parentWidget = nullptr); void sigAnimationActivated(bool flag); void sigHashReady(); void sigAnswerQuerySubProc(QList listSubProc, QString parentTask_dmCode); diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp index 805108b..775e287 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp @@ -144,7 +144,7 @@ void ConnectorToServer::createObjects() recognizeSystem = new RecognizeSystem; recognizeSystem->moveToThread(connectionThread); - notifyController = new NotifyController; + notifyController = new NotifyController(parentWidget); versionContainer = new VersionContainer; versionSelectWidget = new VersionSelectWidget(parentWidget); versionSelectWidget->initialize(sendSystem,versionContainer,notifyController, recognizeSystem); diff --git a/InstructorsAndTrainees/specialmessagebox/notifycontroller.cpp b/InstructorsAndTrainees/specialmessagebox/notifycontroller.cpp new file mode 100644 index 0000000..659ae1c --- /dev/null +++ b/InstructorsAndTrainees/specialmessagebox/notifycontroller.cpp @@ -0,0 +1,19 @@ +#include + +#include "notifycontroller.h" +#include "specialmessagebox.h" + +NotifyController::NotifyController(QWidget *parentWidget, QObject *parent) : + QObject(parent), + parentWidget(parentWidget) +{ + +} + +void NotifyController::showWarning(QString text, QWidget *parentWidget) +{ + if(parentWidget) + SpecialMessageBox(parentWidget, SpecialMessageBox::TypeSpecMsgBox::warningClose, text).exec(); + else + SpecialMessageBox(this->parentWidget, SpecialMessageBox::TypeSpecMsgBox::warningClose, text).exec(); +} diff --git a/InstructorsAndTrainees/specialmessagebox/notifycontroller.h b/InstructorsAndTrainees/specialmessagebox/notifycontroller.h new file mode 100644 index 0000000..638e30b --- /dev/null +++ b/InstructorsAndTrainees/specialmessagebox/notifycontroller.h @@ -0,0 +1,20 @@ +#ifndef NOTIFYCONTROLLER_H +#define NOTIFYCONTROLLER_H + +#include +#include + +class NotifyController : public QObject +{ + Q_OBJECT +public: + explicit NotifyController(QWidget *parentWidget = nullptr, QObject *parent = nullptr); + + void showWarning(QString text, QWidget *parentWidget = nullptr); + +private: + QWidget *parentWidget; + +}; + +#endif // NOTIFYCONTROLLER_H diff --git a/InstructorsAndTrainees/widgets/dialognewversion.h b/InstructorsAndTrainees/widgets/dialognewversion.h index d2261a3..14938c4 100644 --- a/InstructorsAndTrainees/widgets/dialognewversion.h +++ b/InstructorsAndTrainees/widgets/dialognewversion.h @@ -1,6 +1,7 @@ #ifndef DIALOGNEWVERSION_H #define DIALOGNEWVERSION_H +#include #include #include #include diff --git a/InstructorsAndTrainees/widgets/versionselectwidget.cpp b/InstructorsAndTrainees/widgets/versionselectwidget.cpp index a02b13e..7491497 100644 --- a/InstructorsAndTrainees/widgets/versionselectwidget.cpp +++ b/InstructorsAndTrainees/widgets/versionselectwidget.cpp @@ -79,7 +79,7 @@ void VersionSelectWidget::on_createDuplicateButton_clicked() if (selectedVersion == nullptr) { - emit sigSendNotify(tr("Version not selected")); + emit sigSendNotify(tr("Version not selected"), this); return; } @@ -95,7 +95,7 @@ void VersionSelectWidget::sendCopyEmit(QString newName) if (selectedVersion == nullptr) { - emit sigSendNotify(tr("Version not selected")); + emit sigSendNotify(tr("Version not selected"), this); return; } @@ -107,7 +107,7 @@ void VersionSelectWidget::on_DeleteVersionButton_clicked() { if (selectedVersion == nullptr) { - emit sigSendNotify(tr("Version not selected")); + emit sigSendNotify(tr("Version not selected"), this); return; } @@ -118,7 +118,7 @@ void VersionSelectWidget::on_switchServerVersionButton_clicked() { if (selectedVersion == nullptr) { - emit sigSendNotify(tr("Version not selected")); + emit sigSendNotify(tr("Version not selected"), this); return; } diff --git a/InstructorsAndTrainees/widgets/versionselectwidget.h b/InstructorsAndTrainees/widgets/versionselectwidget.h index 9742edc..cee6e9a 100644 --- a/InstructorsAndTrainees/widgets/versionselectwidget.h +++ b/InstructorsAndTrainees/widgets/versionselectwidget.h @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include @@ -44,7 +44,7 @@ signals: void sigSendDeleteVersion(StreamingVersionData *streaming); void sigSendSwitchVersion(StreamingVersionData *selectVersion); void sigSendCopyVersion(QString versionPair); - void sigSendNotify(QString message); + void sigSendNotify(QString message, QWidget *parentWidget = nullptr); private: