Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-27 19:45:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

refact

Browse Source
This commit is contained in:
Кривошеин Андрей
2026-01-22 18:49:06 +03:00
parent 455b3f384e
commit d1d259a854
8 changed files with 114 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
FILES/CSS/styleSheetMain.css
View File

@@ -92,13 +92,13 @@ QToolButton {
}
QToolButton#btnSend, QToolButton#btnDelete, QToolButton#btnCheck, QToolButton#btnOnlyActive, QToolButton#btnStatus,
QToolButton#btnUpdateStyle, QToolButton#btnSetVersion, QToolButton#btnDocsUpdating,
QToolButton#btnDocsUpdating,
QToolButton#btnAssignTask,
QToolButton#btnAssign {
width: 100px;
height: 55px;
}
QToolButton#btnCheckDB, QToolButton#btnUpdateDocs, QToolButton#btnRepare, QToolButton#btnSave {
QToolButton#btnCheckDB, QToolButton#btnUpdateDocs, QToolButton#btnRepare, QToolButton#btnSave, QToolButton#btnUpdateStyle, QToolButton#btnSetVersion {
width: 150px;
height: 55px;
}

BIN
FILES/translations/RRJServer_ru_RU.qm
View File

Binary file not shown.

4
LibInstructorsAndTrainees/instructorsandtraineeswidget.ui
View File

@@ -108,7 +108,7 @@
</size>
</property>
<property name="text">
<string>Trainee editor</string>
<string>Editor of trainees</string>
</property>
<property name="icon">
<iconset resource="InstructorsAndTrainees.qrc">
@@ -134,7 +134,7 @@
</size>
</property>
<property name="text">
<string>Instructor editor</string>
<string>Editor of instructors</string>
</property>
<property name="icon">
<iconset resource="InstructorsAndTrainees.qrc">

5
LibInstructorsAndTrainees/settings/dialogsettings.ui
View File

@@ -209,7 +209,7 @@
<string>Save</string>
</property>
<property name="icon">
<iconset resource="../../LibServer/Server.qrc">
<iconset resource="../InstructorsAndTrainees.qrc">
<normaloff>:/resources/icons/save.png</normaloff>:/resources/icons/save.png</iconset>
</property>
<property name="iconSize">
@@ -265,7 +265,7 @@
</font>
</property>
<property name="text">
<string>Version</string>
<string>Editor of versions</string>
</property>
<property name="icon">
<iconset resource="../InstructorsAndTrainees.qrc">
@@ -338,7 +338,6 @@
</widget>
<resources>
<include location="../InstructorsAndTrainees.qrc"/>
<include location="../../LibServer/Server.qrc"/>
</resources>
<connections/>
</ui>

2
LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp
View File

@@ -25,7 +25,7 @@ DialogVersionControl::DialogVersionControl(ConnectorToServer* connectorToServer,
setMinimumSize(600, 300);
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
setWindowTitle(tr("Version control"));
setWindowTitle(tr("Editor of versions"));
versionContainer = new VersionContainer;

6
LibServer/multithreadserver/multithreadserver.cpp
View File

@@ -26,6 +26,12 @@ void MultiThreadServer::incomingConnection(qintptr socketDesriptor)
addClient(socketDesriptor,newClient);
Logger::instance().log("To Client: " + QString(SERVER_HELLO));
//Отправляем состояние блокировки
if(getStateBlockAutorization() == EStateBlockAutorization::blocked)
newClient->sendPacketType(PacketType::BUSY);
else
newClient->sendPacketType(PacketType::FREE);
}
bool MultiThreadServer::startServer()

BIN
translations/RRJServer_ru_RU.qm
View File

Binary file not shown.

174
translations/RRJServer_ru_RU.ts
View File

@@ -702,30 +702,34 @@ The status will be set:
<translation>Порт</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="195"/>
<source>Auto start</source>
<translation>Авто старт</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="246"/>
<location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="209"/>
<source>Save</source>
<translation>Сохранить</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="285"/>
<location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="248"/>
<source>Additional</source>
<translation>Расширенные</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="305"/>
<source>Version</source>
<translation>Версия</translation>
<location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="268"/>
<source>Editor of versions</source>
<translation>Редактор версий</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="337"/>
<location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="300"/>
<source>Style</source>
<translation>Стиль</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/settings/dialogsettings.cpp" line="283"/>
<source>The server rejected your request to access version control.
Another instructor is managing versions.
Please try again later.</source>
<translation>Сервер отклонил запрос на вход в управление версиями.
Другой инструктор управляет версиями.
Попробуйте позже.</translation>
</message>
</context>
<context>
<name>DialogSettingsTray</name>
@@ -800,47 +804,47 @@ The status will be set:
<translation>Обновить Docs</translation>
</message>
<message>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="294"/>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="295"/>
<source>Driver PostgreSQL is not installed!</source>
<translation>Драйвер PostgreSQL не установлен!</translation>
</message>
<message>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="304"/>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="305"/>
<source>Superuser PostgreSQL authorization</source>
<translation>Авторизация суперпользователя PostgreSQL</translation>
</message>
<message>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="345"/>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="352"/>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="348"/>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="355"/>
<source>Error connecting to PostgreSQL!</source>
<translation>Ошибка соединения с PostgreSQL!</translation>
</message>
<message>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="346"/>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="353"/>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="349"/>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="356"/>
<source>Possible reasons:</source>
<translation>Возможные причины:</translation>
</message>
<message>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="347"/>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="354"/>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="350"/>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="357"/>
<source>superuser PostgreSQL login or password is incorrect;</source>
<translation>неверный логин или пароль суперпользователя PostgreSQL;</translation>
</message>
<message>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="348"/>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="355"/>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="351"/>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="358"/>
<source>port is incorrect;</source>
<translation>порт некорректен;</translation>
</message>
<message>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="349"/>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="357"/>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="352"/>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="360"/>
<source>PostgreSQL is not installed.</source>
<translation>PostgreSQL не установлен.</translation>
</message>
<message>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="356"/>
<location filename="../LibServer/settings/dialogsettingstray.cpp" line="359"/>
<source>file &apos;pg_hba.conf&apos; does not contain an entry for the IP address:</source>
<translation>файл &apos;pg_hba.conf&apos; не содержит запись для IP-адреса:</translation>
</message>
@@ -897,8 +901,8 @@ The status will be set:
</message>
<message>
<location filename="../LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp" line="28"/>
<source>Version control</source>
<translation>Управление версиями</translation>
<source>Editor of versions</source>
<translation>Редактор версий</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp" line="95"/>
@@ -932,14 +936,14 @@ The status will be set:
</message>
<message>
<location filename="../LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp" line="121"/>
<location filename="../LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp" line="134"/>
<location filename="../LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp" line="167"/>
<location filename="../LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp" line="182"/>
<location filename="../LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp" line="135"/>
<location filename="../LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp" line="169"/>
<location filename="../LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp" line="185"/>
<source>Version not selected</source>
<translation>Версия не выбрана</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp" line="172"/>
<location filename="../LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp" line="174"/>
<source>The deletion will be irrevocable.
Delete it anyway?</source>
<translation>Удаление будет безвозвратным.
@@ -1237,16 +1241,6 @@ Delete it anyway?</source>
<source>Authorization</source>
<translation>Авторизация</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.ui" line="111"/>
<source>Trainee editor</source>
<translation>Редактор обучаемых</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.ui" line="137"/>
<source>Instructor editor</source>
<translation>Редактор инструкторов</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.ui" line="163"/>
<source>Tasks</source>
@@ -1287,6 +1281,16 @@ Delete it anyway?</source>
<source>Settings</source>
<translation>Настройки</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.ui" line="111"/>
<source>Editor of trainees</source>
<translation>Редактор обучаемых</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.ui" line="137"/>
<source>Editor of instructors</source>
<translation>Редактор инструкторов</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.ui" line="269"/>
<source>Trainees</source>
@@ -1300,85 +1304,91 @@ Delete it anyway?</source>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.ui" line="375"/>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.ui" line="467"/>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="607"/>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="623"/>
<source>none</source>
<translation>нет</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="184"/>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="186"/>
<source>The file could not be opened </source>
<translation>Файл не может быть открыт </translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="291"/>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="323"/>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="301"/>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="333"/>
<source>Instructor authorization.</source>
<translation>Авторизация инструктора.</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="279"/>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="289"/>
<source>Instructor deauthorization</source>
<translation>Деавторизация инструктора</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="279"/>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="289"/>
<source>Error!</source>
<translation>Ошибка!</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="291"/>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="301"/>
<source>Server blocked!</source>
<translation>Сервер заблокирован!</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="308"/>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="318"/>
<source>Database error!</source>
<translation>Ошибка базы данных!</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="312"/>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="322"/>
<source>The user is archived!</source>
<translation>Пользователь является архивным!</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="316"/>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="326"/>
<source>The user is already logged in!</source>
<translation>Пользователь уже в сети!</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="320"/>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="330"/>
<source>Login or password error!</source>
<translation>Ошибка логина или пароля!</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="421"/>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="428"/>
<source>The server is not available!</source>
<translation>Сервер недоступен!</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="619"/>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="635"/>
<source>Connection attempt</source>
<translation>Попытка соединения</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="626"/>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="644"/>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="651"/>
<source>connected</source>
<translation>подключен</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="629"/>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="644"/>
<source>blocked</source>
<translation>заблокирован</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="658"/>
<source>not connected</source>
<translation>не подключен</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="675"/>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="707"/>
<source>Server settings have been changed.
Please reconnect to the server.</source>
<translation>Настройки сервера были изменены.
Пожалуйста, переподключитесь к серверу.</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="482"/>
<location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="494"/>
<source>Instructor authorization</source>
<translation>Авторизация инструктора</translation>
</message>
@@ -1733,76 +1743,76 @@ Please reconnect to the server.</source>
<translation>Ошибка PostgreSQL!</translation>
</message>
<message>
<location filename="../LibServer/serverlmswidget.cpp" line="229"/>
<location filename="../LibServer/serverlmswidget.cpp" line="233"/>
<source>Server is started!</source>
<translation>Сервер запущен!</translation>
</message>
<message>
<location filename="../LibServer/serverlmswidget.cpp" line="247"/>
<location filename="../LibServer/serverlmswidget.cpp" line="251"/>
<source>Server is stoped!</source>
<translation>Сервер остановлен!</translation>
</message>
<message>
<location filename="../LibServer/serverlmswidget.cpp" line="258"/>
<location filename="../LibServer/serverlmswidget.cpp" line="262"/>
<source>Settings file could not be opened:</source>
<translation>Файл настроек не открыт:</translation>
</message>
<message>
<location filename="../LibServer/serverlmswidget.cpp" line="287"/>
<location filename="../LibServer/serverlmswidget.cpp" line="291"/>
<source>Database settings have been changed.
The server will be restarted.</source>
<translation>Настройки Базы Данных были изменены.
Сервер будет перезапущен.</translation>
</message>
<message>
<location filename="../LibServer/serverlmswidget.cpp" line="350"/>
<location filename="../LibServer/serverlmswidget.cpp" line="340"/>
<source>The file could not be opened </source>
<translation>Файл не может быть открыт </translation>
</message>
<message>
<location filename="../LibServer/serverlmswidget.cpp" line="426"/>
<location filename="../LibServer/serverlmswidget.cpp" line="430"/>
<location filename="../LibServer/serverlmswidget.cpp" line="420"/>
<location filename="../LibServer/serverlmswidget.cpp" line="424"/>
<source>Database connection error!</source>
<translation>Ошибка подключения Базы данных!</translation>
</message>
<message>
<location filename="../LibServer/serverlmswidget.cpp" line="447"/>
<location filename="../LibServer/serverlmswidget.cpp" line="441"/>
<source>Database connection OK!</source>
<translation>База данных подключена!</translation>
</message>
<message>
<location filename="../LibServer/serverlmswidget.cpp" line="463"/>
<location filename="../LibServer/serverlmswidget.cpp" line="468"/>
<location filename="../LibServer/serverlmswidget.cpp" line="457"/>
<location filename="../LibServer/serverlmswidget.cpp" line="462"/>
<source>started</source>
<translation>запущен</translation>
</message>
<message>
<location filename="../LibServer/serverlmswidget.cpp" line="468"/>
<location filename="../LibServer/serverlmswidget.cpp" line="462"/>
<source>locked</source>
<translation>заблокирован</translation>
</message>
<message>
<location filename="../LibServer/serverlmswidget.cpp" line="474"/>
<location filename="../LibServer/serverlmswidget.cpp" line="468"/>
<source>stoped</source>
<translation>остановлен</translation>
</message>
<message>
<location filename="../LibServer/serverlmswidget.cpp" line="490"/>
<location filename="../LibServer/serverlmswidget.cpp" line="484"/>
<source>connected</source>
<translation>подключена</translation>
</message>
<message>
<location filename="../LibServer/serverlmswidget.cpp" line="499"/>
<location filename="../LibServer/serverlmswidget.cpp" line="493"/>
<source>not connected</source>
<translation>не подключен</translation>
</message>
<message>
<location filename="../LibServer/serverlmswidget.h" line="117"/>
<location filename="../LibServer/serverlmswidget.h" line="115"/>
<source>No Client files found!</source>
<translation>Файлы клиента не найдены!</translation>
</message>
<message>
<location filename="../LibServer/serverlmswidget.h" line="118"/>
<location filename="../LibServer/serverlmswidget.h" line="116"/>
<source>* check Application for the presence of a folder with a build
* check SharedData for a folder with the base version and the name base</source>
<translation>* проверьте Application на наличие папки со сборкой
@@ -1931,6 +1941,15 @@ The server will be restarted.</source>
<source>Editor of Instructors</source>
<translation>Редактор инструкторов</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/instructors/viewerinstructors.cpp" line="95"/>
<source>The server rejected your request to access instructors control.
Another instructor is managing instructors.
Please try again later.</source>
<translation>Сервер отклонил запрос на вход в управление инструкторами.
Другой инструктор управляет инструкторами.
Попробуйте позже.</translation>
</message>
</context>
<context>
<name>ViewerTasksCommon</name>
@@ -1962,6 +1981,15 @@ The server will be restarted.</source>
<source>Editor of Trainees</source>
<translation>Редактор обучаемых</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/trainees/viewertrainees.cpp" line="129"/>
<source>The server rejected your request to access trainees control.
Another instructor is managing trainees.
Please try again later.</source>
<translation>Сервер отклонил запрос на вход в управление обучаемыми.
Другой инструктор управляет обучаемыми.
Попробуйте позже.</translation>
</message>
</context>
<context>
<name>WaitAnimationWidget</name>