diff --git a/GUIdataBaseLMS/mainwindow.cpp b/GUIdataBaseLMS/mainwindow.cpp index 99a0b30..d201e97 100644 --- a/GUIdataBaseLMS/mainwindow.cpp +++ b/GUIdataBaseLMS/mainwindow.cpp @@ -22,8 +22,16 @@ MainWindow::MainWindow(QWidget *parent) //this->showNormal(); this->showMaximized(); - qtLanguageTranslator.load(QString("translations/GUIdataBaseLMS_") + "en_EN", "."); - qApp->installTranslator(&qtLanguageTranslator); + if(m_instructorsAndTraineesWidget->getLanguage() == "ENG") + { + qtLanguageTranslator.load(QString("translations/GUIdataBaseLMS_") + "en_EN", "."); + qApp->installTranslator(&qtLanguageTranslator); + } + else + { + qtLanguageTranslator.load(QString("translations/GUIdataBaseLMS_") + "ru_RU", "."); + qApp->installTranslator(&qtLanguageTranslator); + } } MainWindow::~MainWindow() diff --git a/GUIdataBaseLMS/mainwindow.ui b/GUIdataBaseLMS/mainwindow.ui index ccc1a91..0d66ace 100644 --- a/GUIdataBaseLMS/mainwindow.ui +++ b/GUIdataBaseLMS/mainwindow.ui @@ -40,17 +40,6 @@ - - - - 0 - 0 - 800 - 21 - - - - diff --git a/InstructorsAndTrainees/dialogsettings.cpp b/InstructorsAndTrainees/dialogsettings.cpp index ee0cab2..a08919c 100644 --- a/InstructorsAndTrainees/dialogsettings.cpp +++ b/InstructorsAndTrainees/dialogsettings.cpp @@ -78,6 +78,11 @@ DialogSettings::~DialogSettings() delete settings; } +ServerSettings DialogSettings::getSettings() +{ + return *settings; +} + void DialogSettings::changeEvent(QEvent *event) { // В случае получения события изменения языка приложения diff --git a/InstructorsAndTrainees/dialogsettings.h b/InstructorsAndTrainees/dialogsettings.h index 0a80512..c9a5280 100644 --- a/InstructorsAndTrainees/dialogsettings.h +++ b/InstructorsAndTrainees/dialogsettings.h @@ -19,6 +19,8 @@ public: explicit DialogSettings(ConnectorToServer* connectorToServer, bool instructorIsLogged, QWidget *parent = nullptr); ~DialogSettings(); + ServerSettings getSettings(); + protected: void changeEvent(QEvent * event) override; diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index 8b44103..d119483 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -16,12 +16,15 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : fimTasksWidget(nullptr), adminMode(false), loginInstructorLoggedInLocal(QStringLiteral("")), - nameInstructorLoggedInLocal(QStringLiteral("")) + nameInstructorLoggedInLocal(QStringLiteral("")), + language("ENG") { ui->setupUi(this); ui->btnSettings->setObjectName("btnSettings"); ui->tabWidgetTasks->setObjectName("tabWidgetTasks"); + ui->widgetTop->setObjectName("widgetTop"); + #ifndef PROJECT_TYPE_DEBUG ui->btnUpdateStyleSheet->setVisible(false); #endif @@ -156,6 +159,11 @@ void InstructorsAndTraineesWidget::updateMyStyleSheet() this->setStyleSheet(styleSheet); } +QString InstructorsAndTraineesWidget::getLanguage() +{ + return language; +} + QString InstructorsAndTraineesWidget::loadStyleSheet() { //QString fileName = ":/resources/css/styleSheetMain.css"; @@ -412,7 +420,7 @@ void InstructorsAndTraineesWidget::updateLabelServer() if(connectorToServer->getIsConnected()) { ServerSettings serverSettings = connectorToServer->getServerSettings(); - ui->lblServer->setText(serverSettings.Address + ":" +serverSettings.Port); + ui->lblServer->setText(serverSettings.Address + " : " +serverSettings.Port); } else ui->lblServer->setText(tr("none")); @@ -435,6 +443,7 @@ void InstructorsAndTraineesWidget::on_btnSettings_clicked() { case QDialog::Accepted: { + language = dlg.getSettings().Language; break; } case QDialog::Rejected: @@ -442,6 +451,8 @@ void InstructorsAndTraineesWidget::on_btnSettings_clicked() default: break; } + + language = dlg.getSettings().Language; } void InstructorsAndTraineesWidget::on_btnEditorTrainees_clicked() diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.h b/InstructorsAndTrainees/instructorsandtraineeswidget.h index 9433a06..8b1eab9 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.h +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.h @@ -39,6 +39,7 @@ private: public: void updateMyStyleSheet(); + QString getLanguage(); private: QString loadStyleSheet(); @@ -100,6 +101,7 @@ private: QString nameInstructorLoggedInLocal; QTranslator qtLanguageTranslator; + QString language; }; #endif // INSTRUCTORSANDTRAINEESWIDGET_H diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.ui b/InstructorsAndTrainees/instructorsandtraineeswidget.ui index e0a9850..7ae5f45 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.ui +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.ui @@ -25,276 +25,271 @@ - - - - Tahoma - 10 - - - - - - + + - + - - - - 130 - 58 - - - - Connection to Server - - - - :/resources/icons/connectDB.png:/resources/icons/connectDB.png - - - - 32 - 32 - - - - false - - - Qt::ToolButtonTextUnderIcon - - - - - - - - 170 - 58 - - - - Authorization Instructor - - - - :/resources/icons/login-user.png:/resources/icons/login-user.png - - - - 32 - 32 - - - - true - - - Qt::ToolButtonTextUnderIcon - - - - - - - - 32 - 32 - - - - - 32 - 32 - - - - - - - :/resources/icons/circleGray.png - - - true - - - - - - - Server: - - - - - - - none - - - - - - - - 32 - 32 - - - - - 32 - 32 - - - - - - - :/resources/icons/circleGray.png - - - true - - - - - - - - 16777215 - 40 - - - - Logged in Instructor: - - - Qt::AutoText - - - false - - - - - - - - 16777215 - 40 - - - - none - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 58 - 58 - - - - ChangeVersion - - - - - - - - 58 - 58 - - - - Editor Trainees - - - - :/resources/icons/DB-trainees.png:/resources/icons/DB-trainees.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - - 58 - 58 - - - - Editor Instructors - - - - :/resources/icons/DB-instructors.png:/resources/icons/DB-instructors.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - - 58 - 58 - - - - Settings - - - - :/resources/icons/settings.png:/resources/icons/settings.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - + + + + + + 130 + 58 + + + + Connection to Server + + + + :/resources/icons/connectDB.png:/resources/icons/connectDB.png + + + + 32 + 32 + + + + false + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 170 + 58 + + + + Authorization Instructor + + + + :/resources/icons/login-user.png:/resources/icons/login-user.png + + + + 32 + 32 + + + + true + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 32 + 32 + + + + + 32 + 32 + + + + + + + :/resources/icons/circleGray.png + + + true + + + + + + + Server: + + + + + + + none + + + + + + + + 32 + 32 + + + + + 32 + 32 + + + + + + + :/resources/icons/circleGray.png + + + true + + + + + + + + 16777215 + 40 + + + + Logged in Instructor: + + + Qt::AutoText + + + false + + + + + + + + 16777215 + 40 + + + + none + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 58 + 58 + + + + ChangeVersion + + + + + + + + 58 + 58 + + + + Editor Trainees + + + + :/resources/icons/DB-trainees.png:/resources/icons/DB-trainees.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 58 + 58 + + + + Editor Instructors + + + + :/resources/icons/DB-instructors.png:/resources/icons/DB-instructors.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 58 + 58 + + + + Settings + + + + :/resources/icons/settings.png:/resources/icons/settings.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp index 6a5cd3b..639fe5d 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp @@ -56,13 +56,13 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeList ty ui->btnOnlyActive->setObjectName("btnOnlyActive"); ui->btnAssignTask->setObjectName("btnAssignTask"); ui->btnAssignTask->setEnabled(false); + if(type == TypeList::listCommon) { ui->horizontalLayout_3->addWidget(ui->btnAssignTask); ui->horizontalLayout_3->addWidget(ui->btnOnlyActive); ui->horizontalLayout_3->addWidget(ui->btnCheck); ui->horizontalLayout_3->addWidget(ui->btnDelete); - ui->horizontalLayout_3->setAlignment(Qt::AlignmentFlag::AlignLeft); ui->btnDelete->setVisible(false); diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp index f439f30..06dc502 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp @@ -53,7 +53,6 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeList ty ui->horizontalLayout_3->addWidget(ui->btnAssignTask); ui->horizontalLayout_3->addWidget(ui->btnCheck); ui->horizontalLayout_3->addWidget(ui->btnDelete); - ui->horizontalLayout_3->setAlignment(Qt::AlignmentFlag::AlignLeft); ui->btnDelete->setVisible(false); diff --git a/InstructorsAndTrainees/trainees/traineesview.cpp b/InstructorsAndTrainees/trainees/traineesview.cpp index 263ab02..96f8867 100644 --- a/InstructorsAndTrainees/trainees/traineesview.cpp +++ b/InstructorsAndTrainees/trainees/traineesview.cpp @@ -24,7 +24,7 @@ void TraineesView::resizeEvent(QResizeEvent *event) if(typeView == TypeView::onlyView) {//onlyView - widthTrainee = width - (530 + 10); + widthTrainee = width - (230 + 10); } else {//control @@ -62,6 +62,10 @@ void TraineesView::preparationTreeWidget() treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_ID, true); treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Password, true); treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Archived, true); + + treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Class, true); + treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Computer, true); + treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_IP_address, true); } else {//control diff --git a/InstructorsAndTrainees/trainees/viewertrainees.cpp b/InstructorsAndTrainees/trainees/viewertrainees.cpp index 27ae4c8..a919418 100644 --- a/InstructorsAndTrainees/trainees/viewertrainees.cpp +++ b/InstructorsAndTrainees/trainees/viewertrainees.cpp @@ -8,7 +8,7 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *pa ammTasksWidget(nullptr), fimTasksWidget(nullptr) { - ui->setupUi(this); + ui->setupUi(this); connect(treeWidget, &QTreeWidget::currentItemChanged, this, &ViewerTrainees::on_treeWidget_currentItemChanged); diff --git a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm index e6424dd..5af1274 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 600f3bb..efca18a 100644 --- a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts +++ b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts @@ -9,59 +9,64 @@ Форма - + + Assign + Назначить + + + Аvailable Доступные - + Check Проверить - + Delete Удалить - + Task AMM Задача AMM - + DM code DM код - - + + ID ID - - + + Status Статус - + PM/DM PM/DM - + Code Код - + Attention! Внимание! - + The deletion will be irrevocable. Delete it anyway? Удаление будет безвозвратным. @@ -110,14 +115,14 @@ Delete it anyway? Отчет о выполнении - + Failed Неверно - - Completed - Выполнена + + Right + Верно @@ -235,15 +240,60 @@ The status will be set: 'completed' DialogSettings - - Settings - Настройки + + Learning management system - Settings + Система управления обучением - Настройки - + + Main + Основные + + + Language Язык + + + Server + Сервер + + + + Address + Адрес + + + + Port + Порт + + + + Auto start + Авто старт + + + + Save + Сохранить + + + + Additional + Расширенные + + + + Version + Версия + + + + Style + Стиль + EditorInstructors @@ -524,71 +574,76 @@ The changes will not be accepted. Форма - + + Assign + Назначить + + + Check Проверить - + Delete Удалить - + completed выполнена - + failed неверно - + checkup на проверке - + new новая - + Task FIM Задача FIM - - + + ID ID - - + + Status Статус - + Title Заголовок - + Attention! Внимание! - + The deletion will be irrevocable. Delete it anyway? Удаление будет безвозвратным. Всё равно удалить? - + Check Task Проверка задачи @@ -601,113 +656,116 @@ Delete it anyway? Форма - - Database LMS - База данных СУО - - - + Connection to Server Подключение к серверу - + + Server: + Сервер: + + + Logged in Instructor: Вошедший в систему инструктор: - + ChangeVersion Изменение версии - - Update StyleSheet - Обновить стиль + + Editor Trainees + Редактор Обучаемых - + + Editor Instructors + Редактор Инструкторов + + + Settings Настройки - + Tasks Задачи - + AMM - + FIM - - Assign task - Назначить задачу - - - - - - + + + + Authorization Instructor Авторизация инструктора - - + + + + + none нет - - + + Deauthorization Instructor Деавторизация инструктора - + Attention! Внимание! - + The file could not be opened Файл не может быть открыт - + Instructor deauthorization Деавторизация инструктора - + Error! Ошибка! - + Warning! Внимание! - + The server is disabled Сервер отключен - - + + Instructor authorization Авторизация инструктора - + Invalid login or password! Неправильный логин или пароль! @@ -1067,7 +1125,7 @@ Delete it anyway? Редактор инструкторов - + Editor of instructors Редактор инструкторов @@ -1086,7 +1144,7 @@ Delete it anyway? Редактор обучаемых - + Editor of trainees Редактор обучаемых