diff --git a/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp b/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp index 7260406..61d559d 100644 --- a/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp +++ b/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp @@ -73,7 +73,12 @@ void DialogEditInstructor::verify() if(ui->editName->text().trimmed() == QStringLiteral("") || ui->editLogin->text().trimmed() == QStringLiteral("") || ui->editPassword->text().trimmed() == QStringLiteral("")) - ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); + ui->btnOK->setEnabled(false); else - ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true); + ui->btnOK->setEnabled(true); +} + +void DialogEditInstructor::on_btnOK_clicked() +{ + this->accept(); } diff --git a/InstructorsAndTrainees/instructors/dialogeditinstructor.h b/InstructorsAndTrainees/instructors/dialogeditinstructor.h index 76a19ba..9cdadfc 100644 --- a/InstructorsAndTrainees/instructors/dialogeditinstructor.h +++ b/InstructorsAndTrainees/instructors/dialogeditinstructor.h @@ -27,6 +27,8 @@ private slots: void on_editPassword_textChanged(const QString &arg1); + void on_btnOK_clicked(); + private: void verify(); diff --git a/InstructorsAndTrainees/instructors/dialogeditinstructor.ui b/InstructorsAndTrainees/instructors/dialogeditinstructor.ui index 52abe9a..4f7c22a 100644 --- a/InstructorsAndTrainees/instructors/dialogeditinstructor.ui +++ b/InstructorsAndTrainees/instructors/dialogeditinstructor.ui @@ -174,63 +174,42 @@ + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + 0 + 0 + + + + Save + + + + + - - - - - 10 - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - buttonBox - accepted() - DialogEditInstructor - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - DialogEditInstructor - reject() - - - 316 - 260 - - - 286 - 274 - - - - + diff --git a/InstructorsAndTrainees/resources/css/styleSheetMain.css b/InstructorsAndTrainees/resources/css/styleSheetMain.css index 89279cf..8013ae5 100644 --- a/InstructorsAndTrainees/resources/css/styleSheetMain.css +++ b/InstructorsAndTrainees/resources/css/styleSheetMain.css @@ -73,6 +73,7 @@ QPushButton, QToolButton { } QPushButton { height: 25px; + width: 75px; } QToolButton { width: 180px; @@ -89,7 +90,7 @@ QPushButton:flat, QToolButton:flat { border: none; /* no border for a flat push button */ } QPushButton:default, QToolButton:default { - border-color: navy; /* make the default button prominent */ + border-color: darkblue; /*make the default button prominent */ } QPushButton:hover , QToolButton:hover { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, @@ -106,6 +107,15 @@ QPushButton:checked, QToolButton:checked { stop: 0 #dadbde, stop: 1 #f6f7fa); border-style: inset; } +/* +QDialogButtonBox { + border: 2px solid #8f8f91; + border-style: outset; + border-radius: 5px; + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #f6f7fa, stop: 1 #dadbde); +} +*/ QCheckBox { diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp index 3d3de61..cb5ca0e 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp @@ -117,13 +117,13 @@ void AMMtasksWidget::resizeEvent(QResizeEvent *event) treeWidget->setColumnWidth(ColumnsTreeAMM::clmnAMM_ID, 50); treeWidget->setColumnWidth(ColumnsTreeAMM::clmnAMM_code, 250); - treeWidget->setColumnWidth(ColumnsTreeAMM::clmnAMM_status, 110); + treeWidget->setColumnWidth(ColumnsTreeAMM::clmnAMM_status, 130); int widthPMorDM; if(type == TypeListTreeAMMFIM::listCommon) - widthPMorDM = width - (250 + 10); + widthPMorDM = width - (270 + 10); else - widthPMorDM = width - (410 + 10); + widthPMorDM = width - (430 + 10); treeWidget->setColumnWidth(ColumnsTreeAMM::clmnAMM_PMorDM, widthPMorDM); } diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp index 6fd3ad8..2557cb3 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp @@ -120,13 +120,13 @@ void FIMtasksWidget::resizeEvent(QResizeEvent *event) int width = treeWidget->width(); treeWidget->setColumnWidth(ColumnsTreeFIM::clmnFIM_ID, 50); - treeWidget->setColumnWidth(ColumnsTreeFIM::clmnFIM_status, 110); + treeWidget->setColumnWidth(ColumnsTreeFIM::clmnFIM_status, 130); int widthTitle; if(type == TypeListTreeAMMFIM::listCommon) - widthTitle = width - (0 + 10); + widthTitle = width - (20 + 10); else - widthTitle = width - (160 + 10); + widthTitle = width - (180 + 10); treeWidget->setColumnWidth(ColumnsTreeFIM::clmnFIM_Title, widthTitle); } diff --git a/InstructorsAndTrainees/trainees/dialogeditgroup.cpp b/InstructorsAndTrainees/trainees/dialogeditgroup.cpp index 6f4240f..b13fc8f 100644 --- a/InstructorsAndTrainees/trainees/dialogeditgroup.cpp +++ b/InstructorsAndTrainees/trainees/dialogeditgroup.cpp @@ -42,7 +42,12 @@ void DialogEditGroup::on_editName_textChanged(const QString &arg1) void DialogEditGroup::verify() { if(ui->editName->text().trimmed() == QStringLiteral("")) - ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); + ui->btnOK->setEnabled(false); else - ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true); + ui->btnOK->setEnabled(true); +} + +void DialogEditGroup::on_btnOK_clicked() +{ + this->accept(); } diff --git a/InstructorsAndTrainees/trainees/dialogeditgroup.h b/InstructorsAndTrainees/trainees/dialogeditgroup.h index 1cfb197..6ca8396 100644 --- a/InstructorsAndTrainees/trainees/dialogeditgroup.h +++ b/InstructorsAndTrainees/trainees/dialogeditgroup.h @@ -24,6 +24,8 @@ public: private slots: void on_editName_textChanged(const QString &arg1); + void on_btnOK_clicked(); + private: void verify(); diff --git a/InstructorsAndTrainees/trainees/dialogeditgroup.ui b/InstructorsAndTrainees/trainees/dialogeditgroup.ui index 3e82003..5bb221e 100644 --- a/InstructorsAndTrainees/trainees/dialogeditgroup.ui +++ b/InstructorsAndTrainees/trainees/dialogeditgroup.ui @@ -20,7 +20,7 @@ Group - + :/icons/group.png:/icons/group.png @@ -51,63 +51,40 @@ + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + 0 + 0 + + + + Save + + + + + - - - - - 10 - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - DialogEditGroup - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - DialogEditGroup - reject() - - - 316 - 260 - - - 286 - 274 - - - - + + diff --git a/InstructorsAndTrainees/trainees/dialogedittrainee.cpp b/InstructorsAndTrainees/trainees/dialogedittrainee.cpp index e240fcb..1774b41 100644 --- a/InstructorsAndTrainees/trainees/dialogedittrainee.cpp +++ b/InstructorsAndTrainees/trainees/dialogedittrainee.cpp @@ -66,7 +66,12 @@ void DialogEditTrainee::verify() if(ui->editName->text().trimmed() == QStringLiteral("") || ui->editLogin->text().trimmed() == QStringLiteral("") || ui->editPassword->text().trimmed() == QStringLiteral("")) - ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); + ui->btnOK->setEnabled(false); else - ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true); + ui->btnOK->setEnabled(true); +} + +void DialogEditTrainee::on_btnOK_clicked() +{ + this->accept(); } diff --git a/InstructorsAndTrainees/trainees/dialogedittrainee.h b/InstructorsAndTrainees/trainees/dialogedittrainee.h index 8092bc0..3227b60 100644 --- a/InstructorsAndTrainees/trainees/dialogedittrainee.h +++ b/InstructorsAndTrainees/trainees/dialogedittrainee.h @@ -26,6 +26,8 @@ private slots: void on_editPassword_textChanged(const QString &arg1); + void on_btnOK_clicked(); + private: void verify(); diff --git a/InstructorsAndTrainees/trainees/dialogedittrainee.ui b/InstructorsAndTrainees/trainees/dialogedittrainee.ui index a85f0db..af10f6b 100644 --- a/InstructorsAndTrainees/trainees/dialogedittrainee.ui +++ b/InstructorsAndTrainees/trainees/dialogedittrainee.ui @@ -24,24 +24,6 @@ :/icons/trainee.png:/icons/trainee.png - - - - - 10 - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - @@ -183,6 +165,36 @@ + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + 0 + 0 + + + + Save + + + + + @@ -190,38 +202,5 @@ - - - buttonBox - accepted() - DialogEditTrainee - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - DialogEditTrainee - reject() - - - 316 - 260 - - - 286 - 274 - - - - + diff --git a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm index 046b5a2..c1be31f 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 84f4f80..96c8f5f 100644 --- a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts +++ b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts @@ -66,12 +66,12 @@ Delete it anyway? Статус задачи - + New task Новая задача - + Assign this task? Назначить эту задачу? @@ -94,6 +94,11 @@ Delete it anyway? admin + + + Login in + Войти + Password @@ -194,6 +199,11 @@ The status will be set: Name Имя + + + Save + Сохранить + DialogEditInstructor @@ -232,6 +242,11 @@ The status will be set: Logged Залогирован + + + Save + Сохранить + DialogEditTrainee @@ -241,30 +256,35 @@ The status will be set: Обучаемый - + Name Имя - + Login Логин - + Password Пароль - + Archived Архивный - + Logged Залогирован + + + Save + Сохранить + DialogSettings @@ -274,52 +294,52 @@ The status will be set: Настройки - + Main Основные - + Language Язык - + Server Сервер - + Address Адрес - + Port Порт - + Auto start Авто старт - + Save Сохранить - + Additional Расширенные - + Version Версия - + Style Стиль @@ -343,7 +363,7 @@ The status will be set: - + To archive Архивировать @@ -358,81 +378,81 @@ The status will be set: Показать архив - - - - + + + + Error! Ошибка! - + You cannot delete the Administrator. Нельзя удалить администратора. - + You cannot delete a logged-in instructor. Вы не можете удалить инструктора, вошедшего в систему. - + Attention! Внимание! - + The deletion will be irrevocable. Delete it anyway? Удаление будет безвозвратным. Всё равно удалить? - + You cannot archive a logged-in instructor. Вы не можете заархивировать инструктора, вошедшего в систему. - + You cannot edit a logged-in instructor. Вы не можете редактировать инструктора, вошедшего в систему. - + From archive Разархивировать - - - - + + + + Editing error! Ошибка редактирования! - + Unacceptable instructor name has been entered. The changes will not be accepted. Введено неприемлемое имя инструктора. Изменения приняты не будут. - + Unacceptable instructor login has been entered. The changes will not be accepted. Введен неприемлемый логин инструктора. Изменения приняты не будут. - + Unacceptable instructor password has been entered. The changes will not be accepted. Введен неприемлемый пароль инструктора. Изменения приняты не будут. - + An existing instructor or trainee login has been entered. The changes will not be accepted. Введен существующий логин инструктора или обучаемого. @@ -641,12 +661,12 @@ Delete it anyway? Проверка задачи - + New task Новая задача - + Assign this task? Назначить эту задачу? @@ -711,14 +731,14 @@ Delete it anyway? - - + + none нет - + Attention! Внимание! @@ -748,7 +768,7 @@ Delete it anyway? Сервер не доступен - + Server settings have been changed. Please reconnect to the server. Настройки сервера изменены. Выполните переподключение к серверу. @@ -822,27 +842,23 @@ Delete it anyway? Форма - + + + TextLabel + + + + Send Отправить - - Tab 1 - - - - - Tab 2 - - - - + Trainee Обучаемый - + Instructor Инструктор @@ -855,12 +871,17 @@ Delete it anyway? Форма - + TextLabel - + + Name + Имя + + + --:-- --:-- @@ -919,51 +940,51 @@ Delete it anyway? Форма - + Trainee Обучаемый - + Name Имя - + Last login time Время последнего входа - - - - - + + + + + 0 - + Assigned FIM Назначенные FIM - + Assigned AMM Назначенные AMM - + Time of operation Время работы - + Last time of exit Время последнего выхода - + Chat Чат @@ -1026,30 +1047,30 @@ Delete it anyway? TaskAMMFIMTreePreparation - - - + + + completed выполнена - - - + + + failed неверно - - - + + + checkup на проверке - - - + + + new новая @@ -1234,12 +1255,12 @@ Delete it anyway? Редактор обучаемых - + Editor of trainees Редактор обучаемых - + Personal card trainee Персональная карта обучаемого