From 1782f15603b4804408b51821baf4a6607ac3e5a3 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Fri, 30 May 2025 15:55:14 +0300 Subject: [PATCH] Style3 --- InstructorsAndTrainees/dialogsettings.ui | 509 ++++++++---------- .../instructors/dialogeditinstructor.ui | 10 + .../instructorsandtraineeswidget.cpp | 8 +- .../instructorsandtraineeswidget.ui | 10 +- .../tasks/ammtaskswidget.cpp | 6 +- .../trainees/dialogedittrainee.ui | 10 + .../InstructorsAndTraineesWidget_ru_RU.qm | Bin 17034 -> 16836 bytes .../InstructorsAndTraineesWidget_ru_RU.ts | 141 +++-- 8 files changed, 331 insertions(+), 363 deletions(-) diff --git a/InstructorsAndTrainees/dialogsettings.ui b/InstructorsAndTrainees/dialogsettings.ui index 93c5268..19690f7 100644 --- a/InstructorsAndTrainees/dialogsettings.ui +++ b/InstructorsAndTrainees/dialogsettings.ui @@ -6,8 +6,8 @@ 0 0 - 400 - 377 + 500 + 300 @@ -16,6 +16,12 @@ 0 + + + 500 + 300 + + Learning management system - Settings @@ -28,90 +34,26 @@ - + - - - - - - 0 - 0 - - - - Main - - - - - - - Qt::Horizontal - - - - - - - - - - - Language - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - + - Server + Main - + - + - + - + - Address + Language - + Qt::Horizontal @@ -124,89 +66,159 @@ - - - - 150 - 16777215 - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + - + + + Server + + + + + + + + + + Address + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 150 + 16777215 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + Port + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 70 + 16777215 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + Auto start + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + + + + + + - - - Port - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + - 0 - 0 + 58 + 58 - - - 70 - 16777215 - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - Auto start + Save - - - - - - Qt::Horizontal + + + :/resources/icons/circleGreen.png:/resources/icons/circleGreen.png - + - 40 - 20 + 32 + 32 - - - - - - + + Qt::ToolButtonTextUnderIcon @@ -218,143 +230,82 @@ - - - - - - 58 - 58 - - - - Save - - - - :/resources/icons/circleGreen.png:/resources/icons/circleGreen.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - - - Qt::Vertical + + + Additional - - - 20 - 40 - - - - - - - - - - - 0 - 0 - - - - Additional - - - - - - - 2 - - - Qt::Horizontal - - - - - - - - - - - - 58 - 58 - - - - Version - - - - :/resources/icons/updateVersion.png:/resources/icons/updateVersion.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 58 - 58 - - - - Style - - - - :/resources/icons/style.png:/resources/icons/style.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - + + + + + + + + 58 + 58 + + + + Version + + + + :/resources/icons/updateVersion.png:/resources/icons/updateVersion.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 58 + 58 + + + + Style + + + + :/resources/icons/style.png:/resources/icons/style.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + diff --git a/InstructorsAndTrainees/instructors/dialogeditinstructor.ui b/InstructorsAndTrainees/instructors/dialogeditinstructor.ui index fe39d99..52abe9a 100644 --- a/InstructorsAndTrainees/instructors/dialogeditinstructor.ui +++ b/InstructorsAndTrainees/instructors/dialogeditinstructor.ui @@ -83,6 +83,16 @@ + + + + 2 + + + Qt::Horizontal + + + diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index d119483..1464ea2 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -134,10 +134,12 @@ void InstructorsAndTraineesWidget::changeEvent(QEvent *event) {// переведём окно заново ui->retranslateUi(this); + /* if(ui->btnAuthorizationInstructor->isChecked()) ui->btnAuthorizationInstructor->setText(tr("Deauthorization Instructor")); else ui->btnAuthorizationInstructor->setText(tr("Authorization Instructor")); + */ /* if(ui->btnConnectionToDB->isChecked()) @@ -220,7 +222,7 @@ void InstructorsAndTraineesWidget::checkLoginResult(ServerAuthorization *serverA Q_EMIT signal_NeedUpdateUI(true, true); //ui->btnSetVersion->show(); - ui->btnAuthorizationInstructor->setText(tr("Deauthorization Instructor")); + //ui->btnAuthorizationInstructor->setText(tr("Deauthorization Instructor")); updateLabelLoggedInInstructor(serverAuth->Login, serverAuth->ClientName); connectorToServer->setLoginName(nameInstructorLoggedInLocal); @@ -255,7 +257,7 @@ void InstructorsAndTraineesWidget::checkDeLoginResult(ServerDeAuthorization *ser //Q_EMIT signal_NeedUpdateUI(true, false); - ui->btnAuthorizationInstructor->setText(tr("Authorization Instructor")); + //ui->btnAuthorizationInstructor->setText(tr("Authorization Instructor")); updateLabelLoggedInInstructor("",""); //QMessageBox::information(this, tr("Instructor deauthorization"), tr("Successfully!")); @@ -283,7 +285,7 @@ void InstructorsAndTraineesWidget::slot_ConnectedToServer(bool state) {//Сервер отключен ui->btnConnectionToServer->setEnabled(true); ui->btnAuthorizationInstructor->setEnabled(false); - ui->btnAuthorizationInstructor->setText(tr("Authorization Instructor")); + //ui->btnAuthorizationInstructor->setText(tr("Authorization Instructor")); ui->btnAuthorizationInstructor->setChecked(false); //ui->btnSetVersion->hide(); ui->lblDBisConnected->setPixmap(QPixmap(QStringLiteral(":/resources/icons/circleGray.png"))); diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.ui b/InstructorsAndTrainees/instructorsandtraineeswidget.ui index 7ae5f45..85fb427 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.ui +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.ui @@ -6,8 +6,8 @@ 0 0 - 1000 - 800 + 1314 + 901 @@ -40,7 +40,7 @@ - Connection to Server + Connection @@ -64,12 +64,12 @@ - 170 + 130 58 - Authorization Instructor + Authorization diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp index 639fe5d..e3f9a41 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp @@ -54,8 +54,9 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeList ty ui->btnCheck->setObjectName("btnCheck"); ui->btnCheck->setEnabled(false); ui->btnOnlyActive->setObjectName("btnOnlyActive"); + ui->btnOnlyActive->setEnabled(false); ui->btnAssignTask->setObjectName("btnAssignTask"); - ui->btnAssignTask->setEnabled(false); + ui->btnAssignTask->setEnabled(false); if(type == TypeList::listCommon) { @@ -101,6 +102,7 @@ AMMtasksWidget::~AMMtasksWidget() void AMMtasksWidget::deactivate() { ui->btnAssignTask->setEnabled(false); + ui->btnOnlyActive->setEnabled(false); //taskTreePreparation->stopParser(); treeWidget->clear(); loginTraineeSelected = ""; @@ -248,6 +250,8 @@ void AMMtasksWidget::slot_listItemsReady(QList listItems) treeWidget->setCurrentItem(item); waitAnimationWidget->hideWithStop(); + + ui->btnOnlyActive->setEnabled(true); } Module *AMMtasksWidget::searchModuleByID(int id) diff --git a/InstructorsAndTrainees/trainees/dialogedittrainee.ui b/InstructorsAndTrainees/trainees/dialogedittrainee.ui index 0fc1ec1..a85f0db 100644 --- a/InstructorsAndTrainees/trainees/dialogedittrainee.ui +++ b/InstructorsAndTrainees/trainees/dialogedittrainee.ui @@ -119,6 +119,16 @@ + + + + 2 + + + Qt::Horizontal + + + diff --git a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm index 5af127459946ad845de8af2f3058308e4bd7c67f..3a5b2b206311c5de0fd5ff3089f5a3422ee0844b 100644 GIT binary patch delta 859 zcmX}pZAg<*6bJDC^X$$&FDuJz_TpStXl=9H-1BU6DTtah%7n7Q&>9uemjz{gh@nM9 z5xwcnK2%y6f|ZqEQ4ok&x(E`)5F&-tjGz~YA_!7CaG?*E9~aKK=iGD7ot9pnk}jvm zP5|sJATSY;*$dAs{*dp3uO{ojJW`9vu25K67RO1=xCnr&JZWWMU&s(KpEj%T~WNNIif=@_mQ`@@w zfaSa8*;X3B`bzGUP1)SZt7TWVhjn{9>D>%r?pI;BnDuG%0nZ-gl zN5Jw|sD2jeny?@t3^gjR%c+|8sq(vX2Ee2`@8U49E~+l*ZwD54sK)1$bWf^Pwo;0V zs_`ib%PLi$eysx>9qK^MMVd#2I%0azgxuTe7yByeuUq}naSK>GDKyixCE*pch`U0g zP22sc5mm`y}f4uP<{ygNquz7AT@Hv zo;gnWsb%)U&BOd1i>4X1_8a|Gw9rxebLj|`%;bjEB{_Jt)tBC~G65K7>d5#hU}4We zV8arA$?NSMwz@nN^F808EA&C6(3w}l69GTp@2ksoFc&Lk0anN&tddnQgB7t5GyaEa TrHA721N*pSxO*S^$5a0SDYoPe delta 925 zcmaLVTS!zv7zgnGIXml~v%6t8TQe`)ZOcp6UftbRNz@|CjLI;@Vp|q7a2MCrhmfp9 z63a+OgUZT`K$6I?=pl&cW(8d=5e$7WD~x)Hq?auEaNc{E^E-3+zM1cQGf$eN)@JGK zVt)(3MgXZ%xOR`wUM_T31G-|s5fOU&fz3%k+B2YV0?14TqC+%4C(P;u8Xr^qWua%J zz0S2Fa~IfX8-0BtbUqh)-9lea`zu$1(+6$eMcStjy1fN}?Yz(%;z?4n?3Q`9WU)DP z*j@1#@EB2|p*5vGl>V8aEECG2R=`CqX_mLq`xw6|o0dP&Iw$S`s#~ZJ z2<<~c_Z$9Mwk&kpVxG$smUcjxRmzhzmW0f9U4LZ|NNmvcpPm8?&vds!RFJ!qS75_7(DLeRGjiu3^qFhlNK-LT8#?&W3Gb>c5 zg$BLQ;T3v(%F6=UZC#!6>-uK^ld7ip1dwq`ops6i8$7$ZI?$qT` zyrPCaQh0Kndhh#wU`ek!>`F%?)?8J;8COz$ht+SrJwWQD(Dhay?=e%`D}}CdefgK8 zz|x4mzVI)w>b|}^S*EM-+fbiD`AI(wEsP2>cl&ET#tIj@mKnPr?xbUDH{O?O$q(GAO_4@;iPoCfvhN-JU1DsO|U|?>^XxO|v7^x466{qdl Q3Hd?)e>NSQwvNaC15{i6l>h($ diff --git a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts index efca18a..45ae558 100644 --- a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts +++ b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts @@ -29,44 +29,44 @@ Удалить - + Task AMM Задача AMM - + DM code DM код - - + + ID ID - - + + Status Статус - + PM/DM PM/DM - + Code Код - + Attention! Внимание! - + The deletion will be irrevocable. Delete it anyway? Удаление будет безвозвратным. @@ -240,57 +240,57 @@ The status will be set: 'completed' DialogSettings - + Learning management system - Settings Система управления обучением - Настройки - + Main Основные - + Language Язык - + Server Сервер - + Address Адрес - + Port Порт - + Auto start Авто старт - + Save Сохранить - + Additional Расширенные - + Version Версия - + Style Стиль @@ -589,61 +589,61 @@ The changes will not be accepted. Удалить - + completed выполнена - + failed неверно - + checkup на проверке - + new новая - + Task FIM Задача FIM - - + + ID ID - - + + Status Статус - + Title Заголовок - + Attention! Внимание! - + The deletion will be irrevocable. Delete it anyway? Удаление будет безвозвратным. Всё равно удалить? - + Check Task Проверка задачи @@ -657,8 +657,13 @@ Delete it anyway? - Connection to Server - Подключение к серверу + Connection + Подключение + + + + Authorization + Авторизация @@ -705,67 +710,53 @@ Delete it anyway? FIM - - - - - - 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! Неправильный логин или пароль! @@ -963,59 +954,59 @@ Delete it anyway? TraineesView - - + + yes да - - + + no нет - + Trainee Обучаемый - + Login Логин - + Password Пароль - + Class Класс - + Computer Компьютер - + IP address IP адрес - + Archived Архивный - + Logged Залогирован - + ID ID