diff --git a/FILES/CSS/styleSheetMain.css b/FILES/CSS/styleSheetMain.css index e7b1794..5bb314a 100644 --- a/FILES/CSS/styleSheetMain.css +++ b/FILES/CSS/styleSheetMain.css @@ -67,8 +67,9 @@ QGroupBox::title { QPushButton, QToolButton { - border: 3px solid #8f8f91; - border-style: outset; + border: 3px outset /*#2d5585*/gray; + /*border: 3px solid #8f8f91; + border-style: outset;*/ border-radius: 5px; background-color: #5d85B5; min-width: 75px; @@ -113,11 +114,10 @@ QPushButton:flat, QToolButton:flat { } QPushButton:disabled, QToolButton:disabled { background-color: #777777; + /*border-color: gray;*/ } QPushButton:default, QToolButton:default { - border-color: white; /*make the default button prominent */ - border-width: 4px; - border: 3px outset #2d5585; + border-color: #2d5585; } QPushButton:hover , QToolButton:hover { background-color: #9dc5f5; @@ -127,9 +127,6 @@ QPushButton:pressed, QToolButton:pressed { border-style: inset; } QPushButton:checked, QToolButton:checked { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #dadbde, stop: 1 #f6f7fa); - background-color: #9dc5f5; background-color: #8db5e5; border-style: inset; } @@ -161,7 +158,7 @@ QTreeWidget { border: 2px solid white; } QTreeWidget::item { - height: 34px; + height: 34px; } /*Бранчи*/ @@ -189,6 +186,8 @@ QTreeWidget::branch:open:has-children:has-siblings { QTreeWidget::item:hover, QTreeWidget::branch:hover { background: #EEEEEE; + /*border: 1px solid #6c6c6c;*/ + /*border-radius: 3px;*/ } QTreeWidget::item:selected { diff --git a/FILES/translations/RRJServer_ru_RU.qm b/FILES/translations/RRJServer_ru_RU.qm index 9776551..b2fe020 100644 Binary files a/FILES/translations/RRJServer_ru_RU.qm and b/FILES/translations/RRJServer_ru_RU.qm differ diff --git a/LibInstructorsAndTrainees/resources/icons/delete.png b/LibInstructorsAndTrainees/resources/icons/delete.png index 12329f3..7e9d848 100644 Binary files a/LibInstructorsAndTrainees/resources/icons/delete.png and b/LibInstructorsAndTrainees/resources/icons/delete.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/exchange.png b/LibInstructorsAndTrainees/resources/icons/exchange.png index 5293068..fcaec47 100644 Binary files a/LibInstructorsAndTrainees/resources/icons/exchange.png and b/LibInstructorsAndTrainees/resources/icons/exchange.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/eye.png b/LibInstructorsAndTrainees/resources/icons/eye.png index 78d9960..6017f74 100644 Binary files a/LibInstructorsAndTrainees/resources/icons/eye.png and b/LibInstructorsAndTrainees/resources/icons/eye.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/filter.png b/LibInstructorsAndTrainees/resources/icons/filter.png index 0efea9e..c78e44f 100644 Binary files a/LibInstructorsAndTrainees/resources/icons/filter.png and b/LibInstructorsAndTrainees/resources/icons/filter.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/lms.png b/LibInstructorsAndTrainees/resources/icons/lms.png index 242868e..941413e 100644 Binary files a/LibInstructorsAndTrainees/resources/icons/lms.png and b/LibInstructorsAndTrainees/resources/icons/lms.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/login-user.png b/LibInstructorsAndTrainees/resources/icons/login-user.png index 05b2207..d8f0237 100644 Binary files a/LibInstructorsAndTrainees/resources/icons/login-user.png and b/LibInstructorsAndTrainees/resources/icons/login-user.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/new — копия (2).png b/LibInstructorsAndTrainees/resources/icons/new — копия (2).png deleted file mode 100644 index 3504131..0000000 Binary files a/LibInstructorsAndTrainees/resources/icons/new — копия (2).png and /dev/null differ diff --git a/LibInstructorsAndTrainees/resources/icons/new.png b/LibInstructorsAndTrainees/resources/icons/new.png index 8b621e3..3504131 100644 Binary files a/LibInstructorsAndTrainees/resources/icons/new.png and b/LibInstructorsAndTrainees/resources/icons/new.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/delete.png b/LibInstructorsAndTrainees/resources/icons/old/delete.png new file mode 100644 index 0000000..12329f3 Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/delete.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/exchange.png b/LibInstructorsAndTrainees/resources/icons/old/exchange.png new file mode 100644 index 0000000..013dad5 Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/exchange.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/exchange_.png b/LibInstructorsAndTrainees/resources/icons/old/exchange_.png new file mode 100644 index 0000000..5293068 Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/exchange_.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/eye.png b/LibInstructorsAndTrainees/resources/icons/old/eye.png new file mode 100644 index 0000000..78d9960 Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/eye.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/filter.png b/LibInstructorsAndTrainees/resources/icons/old/filter.png new file mode 100644 index 0000000..0efea9e Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/filter.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/lms.png b/LibInstructorsAndTrainees/resources/icons/old/lms.png new file mode 100644 index 0000000..242868e Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/lms.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/lms_.png b/LibInstructorsAndTrainees/resources/icons/old/lms_.png new file mode 100644 index 0000000..941413e Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/lms_.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/login-user.png b/LibInstructorsAndTrainees/resources/icons/old/login-user.png new file mode 100644 index 0000000..05b2207 Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/login-user.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/login-user_.png b/LibInstructorsAndTrainees/resources/icons/old/login-user_.png new file mode 100644 index 0000000..1ab4081 Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/login-user_.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/login-user__.png b/LibInstructorsAndTrainees/resources/icons/old/login-user__.png new file mode 100644 index 0000000..01f3b2e Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/login-user__.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/new.png b/LibInstructorsAndTrainees/resources/icons/old/new.png new file mode 100644 index 0000000..8b621e3 Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/new.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/new — копия.png b/LibInstructorsAndTrainees/resources/icons/old/new_.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/new — копия.png rename to LibInstructorsAndTrainees/resources/icons/old/new_.png diff --git a/LibInstructorsAndTrainees/resources/icons/personalCard_2.png b/LibInstructorsAndTrainees/resources/icons/old/personalCard_2.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/personalCard_2.png rename to LibInstructorsAndTrainees/resources/icons/old/personalCard_2.png diff --git a/LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp b/LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp index 070e5d0..0cbcc98 100644 --- a/LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp +++ b/LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp @@ -19,6 +19,10 @@ DialogVersionControl::DialogVersionControl(ConnectorToServer* connectorToServer, { ui->setupUi(this); + ui->createDuplicateButton->setObjectName("createDuplicateButton"); + ui->deleteVersionButton->setObjectName("deleteVersionButton"); + ui->switchServerVersionButton->setObjectName("switchServerVersionButton"); + setMinimumSize(500, 300); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowTitle(tr("Version control")); diff --git a/LibInstructorsAndTrainees/settings/dialogversioncontrol.ui b/LibInstructorsAndTrainees/settings/dialogversioncontrol.ui index b4a113a..0d5072a 100644 --- a/LibInstructorsAndTrainees/settings/dialogversioncontrol.ui +++ b/LibInstructorsAndTrainees/settings/dialogversioncontrol.ui @@ -34,19 +34,25 @@ - 5 + 0 - 5 + 0 - 5 + 0 - 5 + 0 + + + 0 + 0 + + MS Shell Dlg 2 @@ -59,10 +65,26 @@ Available versions on the server: + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + - + + + + 0 + 0 + + + + + 250 + 0 + + + @@ -90,26 +112,13 @@ - Double click on the version to see information... + InfoValue Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -117,6 +126,9 @@ Current server version: + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + @@ -124,6 +136,9 @@ none + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + @@ -133,10 +148,23 @@ - + 6 + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -197,6 +225,19 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + diff --git a/LibInstructorsAndTrainees/specialmessagebox/specialmessagebox.ui b/LibInstructorsAndTrainees/specialmessagebox/specialmessagebox.ui index 32c879a..cd3c148 100644 --- a/LibInstructorsAndTrainees/specialmessagebox/specialmessagebox.ui +++ b/LibInstructorsAndTrainees/specialmessagebox/specialmessagebox.ui @@ -36,7 +36,7 @@ - :/resources/icons/circleGray.png + :/resources/icons/circleGray.png @@ -110,7 +110,7 @@ - + diff --git a/LibServer/Server.qrc b/LibServer/Server.qrc index a0df3d0..8a65201 100644 --- a/LibServer/Server.qrc +++ b/LibServer/Server.qrc @@ -21,5 +21,6 @@ resources/icons/procedure.png resources/icons/exchange.png resources/blankXML/ListSubProc.xml + resources/icons/PngServerRRJ.png diff --git a/LibServer/Systems/assetsmanager.cpp b/LibServer/Systems/assetsmanager.cpp index e7737d3..ca5afba 100644 --- a/LibServer/Systems/assetsmanager.cpp +++ b/LibServer/Systems/assetsmanager.cpp @@ -287,11 +287,16 @@ void AssetsManager::writeVersionsToFile(QList version,boo SAttribute attribute4; if(isFirst) - { - attribute3 = {"isChangeable",QString::number(false)}; + { QString author = tr("LLC Constanta-Design"); attribute4 = {"author",author}; ver->setAuthor(author); + + if(ver->getViewName() == "base") + attribute3 = {"isChangeable",QString::number(false)}; + else + attribute3 = {"isChangeable",QString::number(true)}; + }else { attribute3 ={"isChangeable",QString::number(ver->getIsChangeable())}; diff --git a/LibServer/resources/icons/PngServerRRJ.png b/LibServer/resources/icons/PngServerRRJ.png new file mode 100644 index 0000000..10686a6 Binary files /dev/null and b/LibServer/resources/icons/PngServerRRJ.png differ diff --git a/LibServer/resources/icons/exchange.png b/LibServer/resources/icons/exchange.png index 5293068..013dad5 100644 Binary files a/LibServer/resources/icons/exchange.png and b/LibServer/resources/icons/exchange.png differ diff --git a/LibServer/settings/dialogsettingstray.cpp b/LibServer/settings/dialogsettingstray.cpp index 946b613..f8dcff7 100644 --- a/LibServer/settings/dialogsettingstray.cpp +++ b/LibServer/settings/dialogsettingstray.cpp @@ -300,6 +300,7 @@ void DialogSettingsTray::on_btnCheckDB_clicked() QString PasswordPostgres; DialogAuthorization dlg(this); + dlg.setWindowIcon(QIcon(QStringLiteral(":/resources/icons/PngServerRRJ.png"))); dlg.setWindowTitle(tr("Superuser PostgreSQL authorization")); dlg.setWindowFlags(dlg.windowFlags() & ~Qt::WindowContextHelpButtonHint); dlg.setStyleSheet(this->styleSheet()); @@ -343,14 +344,18 @@ void DialogSettingsTray::on_btnCheckDB_clicked() if(settings->HostName == "localhost") SpecMsgBox::CriticalClose(this, tr("Error connecting to PostgreSQL!") + "\n\n" + tr("Possible reasons:") + "\n" + - tr("*superuser PostgreSQL login or password is incorrect;") + "\n" + - tr("*Port is incorrect.")); + tr("superuser PostgreSQL login or password is incorrect;") + "\n" + + tr("port is incorrect;") + "\n" + + tr("PostgreSQL is not installed.") + ); else SpecMsgBox::CriticalClose(this, tr("Error connecting to PostgreSQL!") + "\n\n" + tr("Possible reasons:") + "\n" + - tr("*superuser PostgreSQL login or password is incorrect;") + "\n" + - tr("*Port is incorrect;") + "\n" + - tr("*file 'pg_hba.conf' does not contain an entry for the IP address:") + settings->HostName + "."); + tr("superuser PostgreSQL login or password is incorrect;") + "\n" + + tr("port is incorrect;") + "\n" + + tr("file 'pg_hba.conf' does not contain an entry for the IP address:") + settings->HostName + ";" + "\n" + + tr("PostgreSQL is not installed.") + ); return; } } diff --git a/LibServer/settings/dialogsettingstray.ui b/LibServer/settings/dialogsettingstray.ui index b6f3ea7..387e726 100644 --- a/LibServer/settings/dialogsettingstray.ui +++ b/LibServer/settings/dialogsettingstray.ui @@ -301,8 +301,8 @@ Check DB - - :/resources/icons/checkDB.png:/resources/icons/checkDB.png + + :/resources/icons/editorDB.png:/resources/icons/editorDB.png @@ -365,7 +365,6 @@ - diff --git a/readMy.txt b/readMy.txt new file mode 100644 index 0000000..229138a --- /dev/null +++ b/readMy.txt @@ -0,0 +1,3 @@ +Для обновления переводов в PS от Администратора: + +lupdate -no-obsolete -recursive .\LibInstructorsAndTrainees .\LibServer .\ProgramAWSinstructorMTD .\ProgramServerMTD -ts .\translations\RRJServer_ru_RU.ts \ No newline at end of file diff --git a/translations/RRJServer_ru_RU.qm b/translations/RRJServer_ru_RU.qm index 9776551..b2fe020 100644 Binary files a/translations/RRJServer_ru_RU.qm and b/translations/RRJServer_ru_RU.qm differ diff --git a/translations/RRJServer_ru_RU.ts b/translations/RRJServer_ru_RU.ts index 0663947..6f06198 100644 --- a/translations/RRJServer_ru_RU.ts +++ b/translations/RRJServer_ru_RU.ts @@ -177,27 +177,27 @@ Delete it anyway? Новая - + completed выполнена - + failed неверно - + checkup на проверке - + new новая - + Change task status? The status will be set: 'failed' @@ -206,8 +206,8 @@ The status will be set: 'неверно' - - + + Change task status? The status will be set: 'new' @@ -216,7 +216,7 @@ The status will be set: 'новая' - + Change task status? The status will be set: 'checkup' @@ -225,8 +225,8 @@ The status will be set: 'на проверке' - - + + Change task status? The status will be set: 'completed' @@ -238,55 +238,60 @@ The status will be set: CommonView - + Name Имя - + Login Логин - + Password Пароль - + Class Класс - + Computer Компьютер - + IP address IP адрес - + Administrator Администратор - + Archived Архивный - + Online В сети - + ID ID + + + Messages + Сообщения + DeviceWidget @@ -301,12 +306,12 @@ The status will be set: Статус - + ObjName - + Code @@ -672,42 +677,42 @@ The status will be set: Язык - + Server Сервер - + Address Адрес - + Port Порт - + Auto start Авто старт - + Save Сохранить - + Additional Расширенные - + Version Версия - + Style Стиль @@ -715,72 +720,72 @@ The status will be set: DialogSettingsTray - + Settings Настройки - + Main Основные - + Language Язык - + Database База данных - + Local Локальная - + IP address IP адрес - + Port Порт - + Database name Имя базы данных - + User name Имя пользователя - + User password Пароль пользователя - + Save Сохранить - + Additional Расширенные - + Check DB Проверить БД - + Update Docs Обновить Docs @@ -790,42 +795,44 @@ The status will be set: Драйвер PostgreSQL не установлен! - + Superuser PostgreSQL authorization Авторизация суперпользователя PostgreSQL - - + + Error connecting to PostgreSQL! Ошибка соединения с PostgreSQL! - - + + Possible reasons: Возможные причины: - - - - *superuser PostgreSQL login or password is incorrect; - *логин или пароль суперпользователя PostgreSQL некорректен; - - *Port is incorrect. - *Порт некорректен. + + superuser PostgreSQL login or password is incorrect; + неверный логин или пароль суперпользователя PostgreSQL; - - *Port is incorrect; - *Порт некорректен; + + + port is incorrect; + порт некорректен; - - *file 'pg_hba.conf' does not contain an entry for the IP address: - *файл 'pg_hba.conf не содержит записи доступа для IP адреса: + + + PostgreSQL is not installed. + PostgreSQL не установлен. + + + + file 'pg_hba.conf' does not contain an entry for the IP address: + файл 'pg_hba.conf' не содержит запись для IP-адреса: @@ -1506,7 +1513,7 @@ Please reconnect to the server. Имя - + --:-- --:-- @@ -1762,7 +1769,7 @@ The server will be restarted. connected - подключен + подключена