From d1d259a8549c5d60472ff41aaa5a244e90e702a2 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Thu, 22 Jan 2026 18:49:06 +0300 Subject: [PATCH] refact --- FILES/CSS/styleSheetMain.css | 4 +- FILES/translations/RRJServer_ru_RU.qm | Bin 32820 -> 34061 bytes .../instructorsandtraineeswidget.ui | 4 +- .../settings/dialogsettings.ui | 5 +- .../settings/dialogversioncontrol.cpp | 2 +- .../multithreadserver/multithreadserver.cpp | 6 + translations/RRJServer_ru_RU.qm | Bin 32820 -> 34061 bytes translations/RRJServer_ru_RU.ts | 174 ++++++++++-------- 8 files changed, 114 insertions(+), 81 deletions(-) diff --git a/FILES/CSS/styleSheetMain.css b/FILES/CSS/styleSheetMain.css index 13b63c0..59f6277 100644 --- a/FILES/CSS/styleSheetMain.css +++ b/FILES/CSS/styleSheetMain.css @@ -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; } diff --git a/FILES/translations/RRJServer_ru_RU.qm b/FILES/translations/RRJServer_ru_RU.qm index fd3b66d7a7dc18ffd1205598e7cb80c9bb7f0433..67ba42702a1ea6013696e6b19062dac2ed89bb89 100644 GIT binary patch delta 3601 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 delta 2602 zcmYk8c~n%_9ml_K=Du0pdozQ8%W(l@8Bt^v6cxxoRTkM?SY#PML`7xE%s@?!bpSQ- z7-J%1iFK={60ne{MdR88v2Kk@Bs6I~K@)94qt#%n+IlMK4{lG|zdrZfckg?@`}=-> zzxUqUqB>TmdfPMkGJr6k;5xv10l~$o#Be6w1H=pCgJ4eH{itNO~R$CeU1%0k+KNAkDj8=UyvYss4 zt@<*QY?&9Py6sQJFyV~a*VoNSp7mE-Pp_iP-d2~UT7j8%_40Qp5D%-ma$Xz|S);a< zKL?iHRB!P0BrhIUcbz81ViMK;IWGhLVd{Y`GXTv*^$W`rz;7YboX7*lKV_lITWEfO zO+Ro92rOW$Tr^*1W)-=wk^p~ZwmMfa8|SnIvD$tLdG2wxd2<4Vp2N2M`WDD6obzm) zSv%N{8S(UngKTH=Svo=@YdzUaY+%1tc>pB~S^HGF7J@i~i#ZeLvi5HBLgG4hctZ|F z*1%cyoSm|NgZUV-j(sFiS*Mh;%PI<0U%{?4(TnESb5<3wzALX&BRDBWH4Or88Ddl) znRL}eaeikn<-VA+qTQ7yh6>HDUx;4rNrmFYR*FXTNbG6#A|Z~s-WNkuKeM>{L@%ec zRrBf@vY~p4rm5uyuzIxS;7gQ)u%(={CuxoxA>XDP({#BHkbJLchC`E{aoQZ3%jZv# z8qYQTAH(>LR>$Fir*{^t@wY_r-Fnv8tCsIXi+j6>5 zc~slBqKxEh)V6KCO9r)S4_A_Ll@d<>W7_U(w2mFunFhY0fIrqnZazRp57))47zE-A zb?L1kK<+AC`tL}7pU*h`pXf5Y(@9j7E+-=bD4wLNOSc1yT89`({qLG?Q?WovJg?hY zLV1b|=ClOr8ZVHV4u`Js64Cp#ZdVJ5V~%u1Y0WA>gR4**=gj(1Z`gL7&i7RB*0~Ru zzEYp;u?q-R=~v#3qq=`fUwMZt6njCx$##VXA9H41)t~sg6_~M7-<7uwNbc3&m`>ez zl$-v(;s>PN=Crry@4s6|d3=SqpZb)O^X0FkF*ALrZWm+>4^Z64x#kNgz^xE4{E@Th zjuhatm#(*Q7VVV+Z_^7VbxNTZ9+RMHQrNl?bo?ACCYU}GQ*BcIx9fpf(bDq0RL|BW zQfieU9oq zMK0S{NdZriYo}7+u{H8$Mg|zyPju2C|2sZWyhq;h!a^tLl=mH>su&}1=3C^JT_kj2 zoqVV)9$0uz{$PL_g_tRy==}tk{FVG!+65p^FW;I;afB{VOc;`)P#N_soYp5OvrGT;k2aQpVW*wz6AE%rV?DWOD$!Y$UGqa0xb-Qxzp(jbOR=Kj@ zNZ*EJ#d+8C5QvU2C~y1H$0nC^bhTmBuPCr-X3n@Q!|WysaHPc$`!%(^zz+>`V#t+C ziVUgKs8)h|4IBSfMlErpp=Z4pFy)ZpyOqS~2S&}UDL{6yarWGIN%OhJq_qOD;D&Mc z^+DjJ>_X#_>(%7mB;%=1-6^7r#%u43$=~pV!Nr)m%59T&FSsUnSYkEpvBa+ zl#1H(gz3hY8z`lC3FcNRs<;#oAy_-Uy&yUb=Uuc{ng*AwC;cO=is z7Sv|u=gQbHGBDzQTUZQ>{%M=(zuSCDt12C~sx=+;v(v|SyqEif;OfqabRUsiX?NIa zN*z@;pR#4;1lNIlbH~oS<)Z7Q+z^v-v8|-MvaIa?Zn_4GPIhQY-tcw>Hr#P--B|x0 DleEW3 diff --git a/LibInstructorsAndTrainees/instructorsandtraineeswidget.ui b/LibInstructorsAndTrainees/instructorsandtraineeswidget.ui index ed5730c..68893d5 100644 --- a/LibInstructorsAndTrainees/instructorsandtraineeswidget.ui +++ b/LibInstructorsAndTrainees/instructorsandtraineeswidget.ui @@ -108,7 +108,7 @@ - Trainee editor + Editor of trainees @@ -134,7 +134,7 @@ - Instructor editor + Editor of instructors diff --git a/LibInstructorsAndTrainees/settings/dialogsettings.ui b/LibInstructorsAndTrainees/settings/dialogsettings.ui index 07e5218..b0c1869 100644 --- a/LibInstructorsAndTrainees/settings/dialogsettings.ui +++ b/LibInstructorsAndTrainees/settings/dialogsettings.ui @@ -209,7 +209,7 @@ Save - + :/resources/icons/save.png:/resources/icons/save.png @@ -265,7 +265,7 @@ - Version + Editor of versions @@ -338,7 +338,6 @@ - diff --git a/LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp b/LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp index 3cf58a8..45be8b5 100644 --- a/LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp +++ b/LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp @@ -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; diff --git a/LibServer/multithreadserver/multithreadserver.cpp b/LibServer/multithreadserver/multithreadserver.cpp index 164e1e4..cbe241e 100644 --- a/LibServer/multithreadserver/multithreadserver.cpp +++ b/LibServer/multithreadserver/multithreadserver.cpp @@ -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() diff --git a/translations/RRJServer_ru_RU.qm b/translations/RRJServer_ru_RU.qm index fd3b66d7a7dc18ffd1205598e7cb80c9bb7f0433..67ba42702a1ea6013696e6b19062dac2ed89bb89 100644 GIT binary patch delta 3601 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 delta 2602 zcmYk8c~n%_9ml_K=Du0pdozQ8%W(l@8Bt^v6cxxoRTkM?SY#PML`7xE%s@?!bpSQ- z7-J%1iFK={60ne{MdR88v2Kk@Bs6I~K@)94qt#%n+IlMK4{lG|zdrZfckg?@`}=-> zzxUqUqB>TmdfPMkGJr6k;5xv10l~$o#Be6w1H=pCgJ4eH{itNO~R$CeU1%0k+KNAkDj8=UyvYss4 zt@<*QY?&9Py6sQJFyV~a*VoNSp7mE-Pp_iP-d2~UT7j8%_40Qp5D%-ma$Xz|S);a< zKL?iHRB!P0BrhIUcbz81ViMK;IWGhLVd{Y`GXTv*^$W`rz;7YboX7*lKV_lITWEfO zO+Ro92rOW$Tr^*1W)-=wk^p~ZwmMfa8|SnIvD$tLdG2wxd2<4Vp2N2M`WDD6obzm) zSv%N{8S(UngKTH=Svo=@YdzUaY+%1tc>pB~S^HGF7J@i~i#ZeLvi5HBLgG4hctZ|F z*1%cyoSm|NgZUV-j(sFiS*Mh;%PI<0U%{?4(TnESb5<3wzALX&BRDBWH4Or88Ddl) znRL}eaeikn<-VA+qTQ7yh6>HDUx;4rNrmFYR*FXTNbG6#A|Z~s-WNkuKeM>{L@%ec zRrBf@vY~p4rm5uyuzIxS;7gQ)u%(={CuxoxA>XDP({#BHkbJLchC`E{aoQZ3%jZv# z8qYQTAH(>LR>$Fir*{^t@wY_r-Fnv8tCsIXi+j6>5 zc~slBqKxEh)V6KCO9r)S4_A_Ll@d<>W7_U(w2mFunFhY0fIrqnZazRp57))47zE-A zb?L1kK<+AC`tL}7pU*h`pXf5Y(@9j7E+-=bD4wLNOSc1yT89`({qLG?Q?WovJg?hY zLV1b|=ClOr8ZVHV4u`Js64Cp#ZdVJ5V~%u1Y0WA>gR4**=gj(1Z`gL7&i7RB*0~Ru zzEYp;u?q-R=~v#3qq=`fUwMZt6njCx$##VXA9H41)t~sg6_~M7-<7uwNbc3&m`>ez zl$-v(;s>PN=Crry@4s6|d3=SqpZb)O^X0FkF*ALrZWm+>4^Z64x#kNgz^xE4{E@Th zjuhatm#(*Q7VVV+Z_^7VbxNTZ9+RMHQrNl?bo?ACCYU}GQ*BcIx9fpf(bDq0RL|BW zQfieU9oq zMK0S{NdZriYo}7+u{H8$Mg|zyPju2C|2sZWyhq;h!a^tLl=mH>su&}1=3C^JT_kj2 zoqVV)9$0uz{$PL_g_tRy==}tk{FVG!+65p^FW;I;afB{VOc;`)P#N_soYp5OvrGT;k2aQpVW*wz6AE%rV?DWOD$!Y$UGqa0xb-Qxzp(jbOR=Kj@ zNZ*EJ#d+8C5QvU2C~y1H$0nC^bhTmBuPCr-X3n@Q!|WysaHPc$`!%(^zz+>`V#t+C ziVUgKs8)h|4IBSfMlErpp=Z4pFy)ZpyOqS~2S&}UDL{6yarWGIN%OhJq_qOD;D&Mc z^+DjJ>_X#_>(%7mB;%=1-6^7r#%u43$=~pV!Nr)m%59T&FSsUnSYkEpvBa+ zl#1H(gz3hY8z`lC3FcNRs<;#oAy_-Uy&yUb=Uuc{ng*AwC;cO=is z7Sv|u=gQbHGBDzQTUZQ>{%M=(zuSCDt12C~sx=+;v(v|SyqEif;OfqabRUsiX?NIa zN*z@;pR#4;1lNIlbH~oS<)Z7Q+z^v-v8|-MvaIa?Zn_4GPIhQY-tcw>Hr#P--B|x0 DleEW3 diff --git a/translations/RRJServer_ru_RU.ts b/translations/RRJServer_ru_RU.ts index 041a488..81caad7 100644 --- a/translations/RRJServer_ru_RU.ts +++ b/translations/RRJServer_ru_RU.ts @@ -702,30 +702,34 @@ The status will be set: Порт - - Auto start - Авто старт - - - + Save Сохранить - + Additional Расширенные - - Version - Версия + + Editor of versions + Редактор версий - + Style Стиль + + + The server rejected your request to access version control. +Another instructor is managing versions. +Please try again later. + Сервер отклонил запрос на вход в управление версиями. +Другой инструктор управляет версиями. +Попробуйте позже. + DialogSettingsTray @@ -800,47 +804,47 @@ The status will be set: Обновить Docs - + Driver PostgreSQL is not installed! Драйвер PostgreSQL не установлен! - + Superuser PostgreSQL authorization Авторизация суперпользователя PostgreSQL - - + + Error connecting to PostgreSQL! Ошибка соединения с PostgreSQL! - - + + Possible reasons: Возможные причины: - - + + superuser PostgreSQL login or password is incorrect; неверный логин или пароль суперпользователя PostgreSQL; - - + + port is incorrect; порт некорректен; - - + + PostgreSQL is not installed. PostgreSQL не установлен. - + file 'pg_hba.conf' does not contain an entry for the IP address: файл 'pg_hba.conf' не содержит запись для IP-адреса: @@ -897,8 +901,8 @@ The status will be set: - Version control - Управление версиями + Editor of versions + Редактор версий @@ -932,14 +936,14 @@ The status will be set: - - - + + + Version not selected Версия не выбрана - + The deletion will be irrevocable. Delete it anyway? Удаление будет безвозвратным. @@ -1237,16 +1241,6 @@ Delete it anyway? Authorization Авторизация - - - Trainee editor - Редактор обучаемых - - - - Instructor editor - Редактор инструкторов - Tasks @@ -1287,6 +1281,16 @@ Delete it anyway? Settings Настройки + + + Editor of trainees + Редактор обучаемых + + + + Editor of instructors + Редактор инструкторов + Trainees @@ -1300,85 +1304,91 @@ Delete it anyway? - + none нет - + The file could not be opened Файл не может быть открыт - - + + Instructor authorization. Авторизация инструктора. - + Instructor deauthorization Деавторизация инструктора - + Error! Ошибка! - + Server blocked! Сервер заблокирован! - + Database error! Ошибка базы данных! - + The user is archived! Пользователь является архивным! - + The user is already logged in! Пользователь уже в сети! - + Login or password error! Ошибка логина или пароля! - + The server is not available! Сервер недоступен! - + Connection attempt Попытка соединения - + + connected подключен - + + blocked + заблокирован + + + not connected не подключен - + Server settings have been changed. Please reconnect to the server. Настройки сервера были изменены. Пожалуйста, переподключитесь к серверу. - + Instructor authorization Авторизация инструктора @@ -1733,76 +1743,76 @@ Please reconnect to the server. Ошибка PostgreSQL! - + Server is started! Сервер запущен! - + Server is stoped! Сервер остановлен! - + Settings file could not be opened: Файл настроек не открыт: - + Database settings have been changed. The server will be restarted. Настройки Базы Данных были изменены. Сервер будет перезапущен. - + The file could not be opened Файл не может быть открыт - - + + Database connection error! Ошибка подключения Базы данных! - + Database connection OK! База данных подключена! - - + + started запущен - + locked заблокирован - + stoped остановлен - + connected подключена - + not connected не подключен - + No Client files found! Файлы клиента не найдены! - + * check Application for the presence of a folder with a build * check SharedData for a folder with the base version and the name base * проверьте Application на наличие папки со сборкой @@ -1931,6 +1941,15 @@ The server will be restarted. Editor of Instructors Редактор инструкторов + + + The server rejected your request to access instructors control. +Another instructor is managing instructors. +Please try again later. + Сервер отклонил запрос на вход в управление инструкторами. +Другой инструктор управляет инструкторами. +Попробуйте позже. + ViewerTasksCommon @@ -1962,6 +1981,15 @@ The server will be restarted. Editor of Trainees Редактор обучаемых + + + The server rejected your request to access trainees control. +Another instructor is managing trainees. +Please try again later. + Сервер отклонил запрос на вход в управление обучаемыми. +Другой инструктор управляет обучаемыми. +Попробуйте позже. + WaitAnimationWidget