From cbc1c1d516aa781b07ef4f50090cdcd3f03ba1bf Mon Sep 17 00:00:00 2001 From: krivoshein Date: Wed, 4 Jun 2025 14:35:01 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D1=82=D0=B8=D0=BB=D0=B8=D0=B7=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D0=BE=D0=BA=D0=BD=D0=B0=20=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D1=81=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../connectorToServer/connectortoserver.cpp | 5 +- .../connectorToServer/connectortoserver.h | 3 +- InstructorsAndTrainees/dialogsettings.ui | 2 +- .../dialogauthorizationinstructor.ui | 2 +- InstructorsAndTrainees/resources.qrc | 1 + .../resources/icons/lms.png | Bin 0 -> 35309 bytes .../InstructorsAndTraineesWidget_ru_RU.qm | Bin 16836 -> 19420 bytes .../InstructorsAndTraineesWidget_ru_RU.ts | 168 ++++---- .../widgets/newversionwidget.ui | 10 +- .../widgets/versionselectwidget.cpp | 14 +- .../widgets/versionselectwidget.ui | 401 ++++++++---------- ServerLMS/Systems/sendsystem.cpp | 1 + 12 files changed, 304 insertions(+), 303 deletions(-) create mode 100644 InstructorsAndTrainees/resources/icons/lms.png diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp index fa413dc..9d43a29 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp @@ -1,8 +1,9 @@ #include "connectortoserver.h" #include -ConnectorToServer::ConnectorToServer(QObject *parent) : +ConnectorToServer::ConnectorToServer(QWidget* parentWidget, QObject *parent) : QObject(parent), + parentWidget(parentWidget), connectionThread(nullptr), client(nullptr), dataParser(nullptr), @@ -453,7 +454,7 @@ void ConnectorToServer::createObjects() notifyController = new NotifyController; versionContainer = new VersionContainer; - versionSelectWidget = new VersionSelectWidget; + versionSelectWidget = new VersionSelectWidget(parentWidget); versionSelectWidget->initialize(sendSystem,versionContainer,notifyController); QMovie *movie = new QMovie(":/resources/icons/762.gif"); diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.h b/InstructorsAndTrainees/connectorToServer/connectortoserver.h index bda85da..400eafe 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.h +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.h @@ -21,7 +21,7 @@ class ConnectorToServer : public QObject { Q_OBJECT public: - explicit ConnectorToServer(QObject *parent = nullptr); + explicit ConnectorToServer(QWidget* parentWidget, QObject *parent = nullptr); bool authorizationInstructorLocal(QString login, QString password); bool deAuthorizationInstructorLocal(QString login); @@ -117,6 +117,7 @@ private: void createObjects(); private: + QWidget* parentWidget; QThread *connectionThread; TCPClient *client; DataParser *dataParser; diff --git a/InstructorsAndTrainees/dialogsettings.ui b/InstructorsAndTrainees/dialogsettings.ui index 6ccc348..01a1fca 100644 --- a/InstructorsAndTrainees/dialogsettings.ui +++ b/InstructorsAndTrainees/dialogsettings.ui @@ -27,7 +27,7 @@ - :/resources/icons/settings.png:/resources/icons/settings.png + :/resources/icons/lms.png:/resources/icons/lms.png false diff --git a/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.ui b/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.ui index 055ba53..c3b4e91 100644 --- a/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.ui +++ b/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.ui @@ -21,7 +21,7 @@ - :/icons/login-user.png:/icons/login-user.png + :/resources/icons/lms.png:/resources/icons/lms.png diff --git a/InstructorsAndTrainees/resources.qrc b/InstructorsAndTrainees/resources.qrc index dc5c23a..b9fa69d 100644 --- a/InstructorsAndTrainees/resources.qrc +++ b/InstructorsAndTrainees/resources.qrc @@ -51,5 +51,6 @@ resources/icons/style.png resources/icons/updateVersion.png resources/icons/editorDB.png + resources/icons/lms.png diff --git a/InstructorsAndTrainees/resources/icons/lms.png b/InstructorsAndTrainees/resources/icons/lms.png new file mode 100644 index 0000000000000000000000000000000000000000..c3c244eb7b0f76dc299974a28903ae7c6b8f2c53 GIT binary patch literal 35309 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 delta 822 zcmXBQZAep590u^`-rc#oyOpWW#6^D%ReGmS$`>o}mO1&St_wr@a%7RY-FR7ZgPCZH`$ zzx$b%6~Om|-ha=uCqM`U08B#Y={9Rr5LWzvSz_8RFdgeX5lgbk3;D~c zEz>?h@;RN`S`JtL96jE_G0$H>7Gf$pm{NdQRK>Kpa6(3haU(dn^NYSqguAT}Filg9 z)HS%TWC8`PWQuc^+1I&do<=XOt*4v;yA6jD5(=-Qsf>s`AAtz}gn|jHhRLjZDi;(jjxYtt*O`OZ2y5MvVTsL2D4il2-aG>h diff --git a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts index 45ae558..93826ae 100644 --- a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts +++ b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts @@ -4,27 +4,27 @@ AMMtasksWidget - + Form Форма - + Assign Назначить - + Аvailable Доступные - + Check Проверить - + Delete Удалить @@ -189,17 +189,17 @@ The status will be set: 'completed' Пароль - + Administrator Администратор - + Archived Архивный - + Logged Залогирован @@ -227,12 +227,12 @@ The status will be set: 'completed' Пароль - + Archived Архивный - + Logged Залогирован @@ -569,22 +569,22 @@ The changes will not be accepted. FIMtasksWidget - + Form Форма - + Assign Назначить - + Check Проверить - + Delete Удалить @@ -651,112 +651,127 @@ Delete it anyway? InstructorsAndTraineesWidget - + Form Форма - + Connection Подключение - + Authorization Авторизация - + Server: Сервер: - + Logged in Instructor: Вошедший в систему инструктор: - + ChangeVersion Изменение версии - + Editor Trainees Редактор Обучаемых - + Editor Instructors Редактор Инструкторов - + Settings Настройки + Trainees + Обучаемые + + + Tasks Задачи - + AMM - + FIM - - - - - + + Messenger + Мессенджер + + + + Instructors + Инструкторы + + + + + + + none нет - + Attention! Внимание! - + The file could not be opened Файл не может быть открыт - + Instructor deauthorization Деавторизация инструктора - + Error! Ошибка! - + Warning! Внимание! - + The server is disabled Сервер отключен - - + + Instructor authorization Авторизация инструктора - + Invalid login or password! Неправильный логин или пароль! @@ -821,22 +836,17 @@ Delete it anyway? Форма - - Messenger - Мессенджер - - - + Send Отправить - + Tab 1 - + Tab 2 @@ -858,38 +868,38 @@ Delete it anyway? NewVersionWidget - Создать копию... - + Create copy... + Создать копию... Basic version: - + Базовая версия: TextLabel - + New name version: - + Имя копии: Create - + Создать Cancel - + Отменить Only Latin letters and numbers - + Только латинские буквы и цифры @@ -897,7 +907,7 @@ Delete it anyway? Error - + Ошибка @@ -915,17 +925,17 @@ Delete it anyway? You cannot delete the basic version! - + Вы не можете удалить базовую версию! You cannot delete the active version - + Вы не можете удалить активную версию This name already exists - + Это имя уже существует @@ -1016,82 +1026,82 @@ Delete it anyway? Form - Форма + Форма Available versions on the server: - + Доступные версии на сервере: Create copy - + Создать копию Delete - Удалить + Удалить Change server version - + Изменить версию на сервере Info: - + Информация: Double click on the version to see information... - + Двойной клик на версии для просмотра информации... Current server version: - + Текущая версия: none - нет + нет Version control - + Управление версиями Version name: - + Имя версии: Created: - + Создан: Changeable: - + Изменен: Author: - + Автор: Yes - + Да No - + Нет @@ -1099,19 +1109,18 @@ Delete it anyway? Version not selected - + Версия не выбрана ViewerInstructors - Instructors Инструкторы - + Editor of Instructors Редактор инструкторов @@ -1125,12 +1134,11 @@ Delete it anyway? ViewerTrainees - Trainees Обучаемые - + Editor of Trainees Редактор обучаемых diff --git a/InstructorsAndTrainees/widgets/newversionwidget.ui b/InstructorsAndTrainees/widgets/newversionwidget.ui index 928f73b..3957da2 100644 --- a/InstructorsAndTrainees/widgets/newversionwidget.ui +++ b/InstructorsAndTrainees/widgets/newversionwidget.ui @@ -17,7 +17,11 @@ - Создать копию... + Create copy... + + + + :/resources/icons/lms.png:/resources/icons/lms.png true @@ -248,6 +252,8 @@ - + + + diff --git a/InstructorsAndTrainees/widgets/versionselectwidget.cpp b/InstructorsAndTrainees/widgets/versionselectwidget.cpp index 93ea715..e040c49 100644 --- a/InstructorsAndTrainees/widgets/versionselectwidget.cpp +++ b/InstructorsAndTrainees/widgets/versionselectwidget.cpp @@ -70,8 +70,20 @@ void VersionSelectWidget::on_createDuplicateButton_clicked() return; } - NewVersionWidget *newVersionWidget = new NewVersionWidget; + NewVersionWidget *newVersionWidget = new NewVersionWidget(); newVersionWidget->initialize(this,selectedVersion->getViewName()); + + /* + QDialog* dialog = new QDialog(this); + QHBoxLayout *layout = new QHBoxLayout(dialog); + layout->addWidget(newVersionWidget); + dialog->setWindowTitle(tr("Editor of instructors")); + dialog->setMinimumSize(200, 100); + dialog->setStyleSheet(this->styleSheet()); + dialog->exec(); + delete newVersionWidget; + */ + newVersionWidget->show(); } diff --git a/InstructorsAndTrainees/widgets/versionselectwidget.ui b/InstructorsAndTrainees/widgets/versionselectwidget.ui index af13a94..b657e75 100644 --- a/InstructorsAndTrainees/widgets/versionselectwidget.ui +++ b/InstructorsAndTrainees/widgets/versionselectwidget.ui @@ -6,12 +6,12 @@ 0 0 - 606 - 229 + 580 + 277 - + 0 0 @@ -19,221 +19,192 @@ Form + + + :/resources/icons/lms.png:/resources/icons/lms.png + false - - - - 0 - 0 - 301 - 171 - - - - - 5 - - - 5 - - - 5 - - - 5 - - - - - - MS Shell Dlg 2 - 8 - - - - Qt::PreventContextMenu - - - Available versions on the server: - - - - - - - - - - - - 0 - 180 - 601 - 41 - - - - - 6 - - - - - QLayout::SetMinimumSize - - - 5 - - - 0 - - - - - - 0 - 0 - - - - - 9 - - - - Create copy - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9 - - - - Delete - - - - - - - - - - 0 - 0 - - - - - 9 - - - - Change server version - - - - - - - - - 310 - 0 - 291 - 131 - - - - - QLayout::SetDefaultConstraint - - - - - - 0 - 0 - - - - Info: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - Double click on the version to see information... - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - 310 - 140 - 291 - 31 - - - - - - - Current server version: - - - - - - - none - - - - - + + + + + + + + + 5 + + + 5 + + + 5 + + + 5 + + + + + + MS Shell Dlg 2 + 8 + + + + Qt::PreventContextMenu + + + Available versions on the server: + + + + + + + + + + + + QLayout::SetDefaultConstraint + + + + + + 0 + 0 + + + + Info: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + Double click on the version to see information... + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + Current server version: + + + + + + + none + + + + + + + + + + + + + 6 + + + + + + 0 + 0 + + + + + 9 + + + + Create copy + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9 + + + + Delete + + + + + + + + 0 + 0 + + + + + 9 + + + + Change server version + + + + + + + + - + + + diff --git a/ServerLMS/Systems/sendsystem.cpp b/ServerLMS/Systems/sendsystem.cpp index 7d2140b..45335a7 100644 --- a/ServerLMS/Systems/sendsystem.cpp +++ b/ServerLMS/Systems/sendsystem.cpp @@ -198,6 +198,7 @@ void SendSystem::sendXmlAnswer(QByteArray array, PacketType packetType) else { socket->write(array); + socket->waitForBytesWritten(); }