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 0000000..c3c244e Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/lms.png differ diff --git a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm index 3a5b2b2..4832b93 100644 Binary files a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm and b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm differ 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(); }