From 612fcc8aa7ef781f909951686f41188987e960a5 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Fri, 28 Nov 2025 11:28:39 +0300 Subject: [PATCH] refact --- .../instructors/dialogeditinstructor.h | 2 +- .../instructors/editorinstructors.cpp | 51 ++++++-- .../instructors/editorinstructors.h | 7 +- .../instructors/editorinstructors.ui | 12 +- .../instructors/viewerinstructors.cpp | 8 ++ .../instructors/viewerinstructors.ui | 4 +- .../trainees/dialogeditgroup.cpp | 5 +- .../trainees/dialogeditgroup.h | 2 +- .../trainees/editortrainees.cpp | 96 +++++++++++---- .../trainees/editortrainees.h | 5 + .../trainees/viewertrainees.cpp | 8 ++ .../InstructorsAndTraineesWidget_ru_RU.qm | Bin 23603 -> 23780 bytes .../InstructorsAndTraineesWidget_ru_RU.ts | 50 ++++---- ServerLMS/Data/Client.h | 6 +- ServerLMS/Systems/logger.cpp | 51 ++++++-- ServerLMS/serverlmswidget.cpp | 10 +- ServerLMS/serverlmswidget.h | 2 + ServerLMS/serverlmswidget.ui | 28 +++-- ServerLMS/settings/dialogsettingstray.cpp | 1 + ServerLMS/settings/dialogsettingstray.ui | 111 ++++++++---------- ServerLMS/translations/ServerLMS_ru_RU.qm | Bin 5852 -> 5956 bytes ServerLMS/translations/ServerLMS_ru_RU.ts | 84 +++++++------ TrayServerLMS/mainwindow.cpp | 1 + 23 files changed, 351 insertions(+), 193 deletions(-) diff --git a/InstructorsAndTrainees/instructors/dialogeditinstructor.h b/InstructorsAndTrainees/instructors/dialogeditinstructor.h index 567191b..398a787 100644 --- a/InstructorsAndTrainees/instructors/dialogeditinstructor.h +++ b/InstructorsAndTrainees/instructors/dialogeditinstructor.h @@ -3,7 +3,7 @@ #include #include "instructor.h" -#include "ui_dialogeditinstructor.h" +//#include "ui_dialogeditinstructor.h" namespace Ui { class DialogEditInstructor; diff --git a/InstructorsAndTrainees/instructors/editorinstructors.cpp b/InstructorsAndTrainees/instructors/editorinstructors.cpp index c3b2712..8f0a7d4 100644 --- a/InstructorsAndTrainees/instructors/editorinstructors.cpp +++ b/InstructorsAndTrainees/instructors/editorinstructors.cpp @@ -1,12 +1,12 @@ #include #include "editorinstructors.h" -#include "dialogeditinstructor.h" #include "specialmessagebox.h" #include "ui_editorinstructors.h" EditorInstructors::EditorInstructors(ConnectorToServer* connectorToServer, bool adminMode, QWidget *parent) : InstructorsView(connectorToServer, CommonView::TypeView::control, parent), - ui(new Ui::EditorInstructors) + ui(new Ui::EditorInstructors), + dlgEditInstructor(nullptr) { ui->setupUi(this); @@ -34,12 +34,20 @@ EditorInstructors::EditorInstructors(ConnectorToServer* connectorToServer, bool EditorInstructors::~EditorInstructors() { + if(dlgEditInstructor) + { + dlgEditInstructor->close(); + delete dlgEditInstructor; + dlgEditInstructor = nullptr; + } + delete ui; } void EditorInstructors::closeEvent(QCloseEvent *event) { - + if(dlgEditInstructor) + dlgEditInstructor->close(); } void EditorInstructors::on_btnNewInstructor_clicked() @@ -292,22 +300,25 @@ bool EditorInstructors::verifyInstructor(Instructor instructor) bool EditorInstructors::editInstructor(Instructor instructor, Instructor* instructor_edit) { - DialogEditInstructor dlg(adminMode, this); - dlg.setWindowFlags(dlg.windowFlags() & ~Qt::WindowContextHelpButtonHint); + dlgEditInstructor = new DialogEditInstructor(adminMode, this); + dlgEditInstructor->setWindowFlags(dlgEditInstructor->windowFlags() & ~Qt::WindowContextHelpButtonHint); - dlg.setInstructor(instructor); + dlgEditInstructor->setInstructor(instructor); - while (true) + bool flStop = false; + bool res = false; + + while (!flStop) { - switch( dlg.exec() ) + switch( dlgEditInstructor->exec() ) { case QDialog::Accepted: { - *instructor_edit = dlg.getInstructor(); + *instructor_edit = dlgEditInstructor->getInstructor(); if(! verifyInstructor(*instructor_edit)) { - dlg.setInstructor(*instructor_edit); + dlgEditInstructor->setInstructor(*instructor_edit); continue; } @@ -318,14 +329,28 @@ bool EditorInstructors::editInstructor(Instructor instructor, Instructor* instru instructor_edit->setNeedSetPassword(false); } - return true; + flStop = true; + res = true; + break; } case QDialog::Rejected: - return false; + flStop = true; + res = false; + break; default: - return false; + flStop = true; + res = false; + break; } } + + if(dlgEditInstructor) + { + delete dlgEditInstructor; + dlgEditInstructor = nullptr; + } + + return res; } diff --git a/InstructorsAndTrainees/instructors/editorinstructors.h b/InstructorsAndTrainees/instructors/editorinstructors.h index 94cfe24..02e9e14 100644 --- a/InstructorsAndTrainees/instructors/editorinstructors.h +++ b/InstructorsAndTrainees/instructors/editorinstructors.h @@ -4,6 +4,9 @@ #include #include #include "instructorsview.h" +#include "dialogeditinstructor.h" + +class DialogEditInstructor; namespace Ui { class EditorInstructors; @@ -35,8 +38,10 @@ private: bool editInstructor(Instructor instructor, Instructor* instructor_edit); -private: +private: Ui::EditorInstructors *ui; + + DialogEditInstructor* dlgEditInstructor; }; #endif // DIALOGINSTRUCTORS_H diff --git a/InstructorsAndTrainees/instructors/editorinstructors.ui b/InstructorsAndTrainees/instructors/editorinstructors.ui index 1f1de14..0f9f1b9 100644 --- a/InstructorsAndTrainees/instructors/editorinstructors.ui +++ b/InstructorsAndTrainees/instructors/editorinstructors.ui @@ -51,7 +51,7 @@ New instructor - + :/resources/icons/addInstructor.png:/resources/icons/addInstructor.png @@ -89,7 +89,7 @@ Delete instructor - + :/resources/icons/deleteInstructor.png:/resources/icons/deleteInstructor.png @@ -127,7 +127,7 @@ To archive - + :/resources/icons/instructorArchive.png:/resources/icons/instructorArchive.png @@ -165,7 +165,7 @@ Edit - + :/resources/icons/edit.png:/resources/icons/edit.png @@ -216,7 +216,7 @@ Show archive - + :/resources/icons/archive.png:/resources/icons/archive.png @@ -240,7 +240,7 @@ - + diff --git a/InstructorsAndTrainees/instructors/viewerinstructors.cpp b/InstructorsAndTrainees/instructors/viewerinstructors.cpp index 58499e8..e22505e 100644 --- a/InstructorsAndTrainees/instructors/viewerinstructors.cpp +++ b/InstructorsAndTrainees/instructors/viewerinstructors.cpp @@ -25,7 +25,11 @@ ViewerInstructors::ViewerInstructors(ConnectorToServer* connectorToServer, QWidg ViewerInstructors::~ViewerInstructors() { if(dlgRedactor) + { dlgRedactor->close(); + delete dlgRedactor; + dlgRedactor = nullptr; + } delete ui; } @@ -38,7 +42,11 @@ void ViewerInstructors::setAuthComplited(bool authComplited) void ViewerInstructors::deactivate() { if(dlgRedactor) + { dlgRedactor->close(); + delete dlgRedactor; + dlgRedactor = nullptr; + } CommonView::deactivate(); updateButtons(); diff --git a/InstructorsAndTrainees/instructors/viewerinstructors.ui b/InstructorsAndTrainees/instructors/viewerinstructors.ui index e21ea15..319eb41 100644 --- a/InstructorsAndTrainees/instructors/viewerinstructors.ui +++ b/InstructorsAndTrainees/instructors/viewerinstructors.ui @@ -44,7 +44,7 @@ Editor of Instructors - + :/resources/icons/DB-instructors.png:/resources/icons/DB-instructors.png @@ -67,7 +67,7 @@ - + diff --git a/InstructorsAndTrainees/trainees/dialogeditgroup.cpp b/InstructorsAndTrainees/trainees/dialogeditgroup.cpp index 51776e3..1e93300 100644 --- a/InstructorsAndTrainees/trainees/dialogeditgroup.cpp +++ b/InstructorsAndTrainees/trainees/dialogeditgroup.cpp @@ -1,7 +1,8 @@ -#include "dialogeditgroup.h" -#include "computersLocations.h" #include #include +#include "dialogeditgroup.h" +#include "computersLocations.h" +#include "ui_dialogeditgroup.h" DialogEditGroup::DialogEditGroup(QWidget *parent) : QDialog(parent), diff --git a/InstructorsAndTrainees/trainees/dialogeditgroup.h b/InstructorsAndTrainees/trainees/dialogeditgroup.h index 6ca8396..9258613 100644 --- a/InstructorsAndTrainees/trainees/dialogeditgroup.h +++ b/InstructorsAndTrainees/trainees/dialogeditgroup.h @@ -2,7 +2,7 @@ #define DIALOGEDITGROUP_H #include -#include "ui_dialogeditgroup.h" +//#include "ui_dialogeditgroup.h" #include "computersLocations.h" #include "group.h" diff --git a/InstructorsAndTrainees/trainees/editortrainees.cpp b/InstructorsAndTrainees/trainees/editortrainees.cpp index 545a08f..a04829a 100644 --- a/InstructorsAndTrainees/trainees/editortrainees.cpp +++ b/InstructorsAndTrainees/trainees/editortrainees.cpp @@ -7,7 +7,9 @@ EditorTrainees::EditorTrainees(ConnectorToServer* connectorToServer, bool adminMode, QWidget *parent) : TraineesView(connectorToServer, CommonView::TypeView::control, parent), - ui(new Ui::EditorTrainees) + ui(new Ui::EditorTrainees), + dlgEditTrainee(nullptr), + dlgEditGroup(nullptr) { ui->setupUi(this); @@ -38,12 +40,30 @@ EditorTrainees::EditorTrainees(ConnectorToServer* connectorToServer, bool adminM EditorTrainees::~EditorTrainees() { + if(dlgEditTrainee) + { + dlgEditTrainee->close(); + delete dlgEditTrainee; + dlgEditTrainee = nullptr; + } + + if(dlgEditGroup) + { + dlgEditGroup->close(); + delete dlgEditGroup; + dlgEditGroup = nullptr; + } + delete ui; } void EditorTrainees::closeEvent(QCloseEvent *event) { + if(dlgEditTrainee) + dlgEditTrainee->close(); + if(dlgEditGroup) + dlgEditGroup->close(); } void EditorTrainees::on_btnNewGroup_clicked() @@ -437,53 +457,73 @@ bool EditorTrainees::verifyTrainee(Trainee trainee) bool EditorTrainees::editGroup(Group group, Group *group_edit) { - DialogEditGroup dlg(this); - dlg.setWindowFlags(dlg.windowFlags() & ~Qt::WindowContextHelpButtonHint); + dlgEditGroup = new DialogEditGroup(this); + dlgEditGroup->setWindowFlags(dlgEditGroup->windowFlags() & ~Qt::WindowContextHelpButtonHint); - dlg.setGroup(group); + dlgEditGroup->setGroup(group); - while (true) + bool flStop = false; + bool res = false; + + while (!flStop) { - switch( dlg.exec() ) + switch( dlgEditGroup->exec() ) { case QDialog::Accepted: { - *group_edit = dlg.getGroup(); + *group_edit = dlgEditGroup->getGroup(); if(! verifyGroup(*group_edit)) { - dlg.setGroup(*group_edit); + dlgEditGroup->setGroup(*group_edit); continue; } - return true; + flStop = true; + res = true; + break; } case QDialog::Rejected: - return false; + flStop = true; + res = false; + break; default: - return false; + flStop = true; + res = false; + break; } } + + if(dlgEditGroup) + { + delete dlgEditGroup; + dlgEditGroup = nullptr; + } + + return res; } bool EditorTrainees::editTrainee(Trainee trainee, Trainee *trainee_edit) { - DialogEditTrainee dlg(adminMode, this); - dlg.setWindowFlags(dlg.windowFlags() & ~Qt::WindowContextHelpButtonHint); + dlgEditTrainee = new DialogEditTrainee(adminMode, this); + dlgEditTrainee->setWindowFlags(dlgEditTrainee->windowFlags() & ~Qt::WindowContextHelpButtonHint); - dlg.setTrainee(trainee); + dlgEditTrainee->setTrainee(trainee); - while (true) + bool flStop = false; + bool res = false; + + while (!flStop) { - switch( dlg.exec() ) + switch( dlgEditTrainee->exec() ) { case QDialog::Accepted: { - *trainee_edit = dlg.getTrainee(); + *trainee_edit = dlgEditTrainee->getTrainee(); if(! verifyTrainee(*trainee_edit)) { - dlg.setTrainee(*trainee_edit); + dlgEditTrainee->setTrainee(*trainee_edit); continue; } @@ -494,14 +534,28 @@ bool EditorTrainees::editTrainee(Trainee trainee, Trainee *trainee_edit) trainee_edit->setNeedSetPassword(false); } - return true; + flStop = true; + res = true; + break; } case QDialog::Rejected: - return false; + flStop = true; + res = false; + break; default: - return false; + flStop = true; + res = false; + break; } } + + if(dlgEditTrainee) + { + delete dlgEditTrainee; + dlgEditTrainee = nullptr; + } + + return res; } diff --git a/InstructorsAndTrainees/trainees/editortrainees.h b/InstructorsAndTrainees/trainees/editortrainees.h index 2272b45..ad4a22b 100644 --- a/InstructorsAndTrainees/trainees/editortrainees.h +++ b/InstructorsAndTrainees/trainees/editortrainees.h @@ -5,6 +5,8 @@ #include #include "traineesview.h" //#include "computersLocations.h" +#include "dialogedittrainee.h" +#include "dialogeditgroup.h" namespace Ui { class EditorTrainees; @@ -43,6 +45,9 @@ private: private: Ui::EditorTrainees *ui; + + DialogEditTrainee* dlgEditTrainee; + DialogEditGroup* dlgEditGroup; }; #endif // DIALOGTRAINEESGROUPS_H diff --git a/InstructorsAndTrainees/trainees/viewertrainees.cpp b/InstructorsAndTrainees/trainees/viewertrainees.cpp index e9a4370..865ac71 100644 --- a/InstructorsAndTrainees/trainees/viewertrainees.cpp +++ b/InstructorsAndTrainees/trainees/viewertrainees.cpp @@ -49,7 +49,11 @@ ViewerTrainees::~ViewerTrainees() } if(dlgRedactor) + { dlgRedactor->close(); + delete dlgRedactor; + dlgRedactor = nullptr; + } if(dlgCardTrainee) dlgCardTrainee->close(); @@ -66,7 +70,11 @@ void ViewerTrainees::setAuthComplited(bool authComplited) void ViewerTrainees::deactivate() { if(dlgRedactor) + { dlgRedactor->close(); + delete dlgRedactor; + dlgRedactor = nullptr; + } if(dlgCardTrainee) dlgCardTrainee->close(); diff --git a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm index 5cbd0056316c09893e9409a2475fa504f68b54bb..08040d36c206f2bc04fdb6f5c23be19a5a1b6346 100644 GIT binary patch delta 1181 zcmXAne@xV69LL{x_Z)ZM`+fllfew*7AudaSJBuF&$B#n}juSXKkPz1fzTE@su=?mgD9&~r*#0G;|69;k0`z=A&v^uWAA*hc0(PTd*`xLN8v<;5Sc|chX99L-FeG6qvbU)J$&-z1vbPb-&A)s=U zr>YB#zoKq`GX1Orb<-(;@d?z+#F7x-t2Rj?l~YZ!eV6#S+H1U^uBbQ*#Q&!L@qsyD z^*@@1PoAR++IftoRCR{?HHqrt7x*qsoN9p&X&!Wb$4+-Q0MvWWNW&~FN`L1@$^a8Ni$(J=fs#AOyGesQT+*NtENYRl%P}=Jq#oyNYDP9Psz%Y+J2(QZTwx@+c`^<&jgFd zrK#HufF&rMt2;nBn~^SNZXod^(vm_BJLUzev!tc5_b6JGf{%3=?zfwPLaX4W@p3CsW7LWAM0x*mA-(;*JUVd>h%6E;4U>-!KT4tLlaB?cGtM#j zn~E7AHA`N!)1!$!^2!eCV8WCV`b`M>vv}J>gbrsK%vdxvatJD1}kJvmd(5{GY7M>qI)aZG|OfA rY!h-|){_|sqY+yh=0_(V4yb& delta 1137 zcmXYxeN0nV7{;Go?rnQ}FRcQiMX<^Q=NM3eEf$KUU|UM1g`#eQ0AmC)_lI-3IFo6+ zO_v#*Z1u)YK8j2+>Sm&*F5*WB!_8^7K*-o)=0J@)|G<4@n^{$fwy3mHAT7`>g0fo{gS{Qo%v!8|~MT9h`GRp%LiP-&spm~uj8t#_YW-X)N&W>w`sl71Mf7Qx7twk^l?DE ziz@43pn6WRa1P^T)OS2Z#l}!SoCO%4M}tIk%_;{ulek6Y`{kb+SqBf(=!<99xy-8J|5j-yi)Pd1~apRrxKYPE0qchJR~80)SorNT0E!aI5b6lPPktM@kx} z>R$yw*{^c(2J)pK zB-e~l#w#{5KD$|N`ru=#dPR=%^j+!Ka_?{r@Qfo{jy;zLEb5Zawvd3deEIyQ^A!Ir z`HG6%H!fv#ys9*6+|BFz^(C%jq~mve+|7#^KjKz+Nm(0?FbF&k6kOSHS!#&47*>Ea$=Y~erG CCNvKK diff --git a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts index e14cbb0..5e0aa97 100644 --- a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts +++ b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts @@ -971,7 +971,17 @@ Delete it anyway? Сервер: - + + Version of materials: + Версия материалов: + + + + ... + + + + Instructor: Инструктор: @@ -991,85 +1001,85 @@ 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 подключен - + not connected не подключен - + Server settings have been changed. Please reconnect to the server. Настройки сервера изменены. Выполните переподключение к серверу. - + Instructor authorization Авторизация инструктора diff --git a/ServerLMS/Data/Client.h b/ServerLMS/Data/Client.h index 4593183..18975cc 100644 --- a/ServerLMS/Data/Client.h +++ b/ServerLMS/Data/Client.h @@ -17,7 +17,8 @@ public: this->name = name; this->address = address; this->port = port; - this->fullName = "Name: " + name + " IP: " + address + " port : " + port + " login: " + login; + //this->fullName = "Name: " + name + " IP: " + address + " port : " + port + " login: " + login; + this->fullName = "IP: " + address + " port : " + port + " login: " + login; }; ~Client(){}; @@ -31,7 +32,8 @@ public: { this->login = login; isLoggedIn = true; - fullName = "Name: " + name + " IP: " + address + " port : " + port + " login: " + login; + //fullName = "Name: " + name + " IP: " + address + " port : " + port + " login: " + login; + fullName = "IP: " + address + " port : " + port + " login: " + login; } QString getLogin() { diff --git a/ServerLMS/Systems/logger.cpp b/ServerLMS/Systems/logger.cpp index fa687ac..b827be6 100644 --- a/ServerLMS/Systems/logger.cpp +++ b/ServerLMS/Systems/logger.cpp @@ -53,7 +53,22 @@ void Logger::setLogToFile(bool flag) void Logger::handleLog(QString msg, LogLevel logLevel) { + /* + color: red; * Красный * + color: green; * Зелёный * + color: blue; * Синий * + color: yellow; * Жёлтый * + color: black; * Чёрный * + color: white; * Белый * + color: purple; * Фиолетовый * + color: orange; * Оранжевый * + color: pink; * Розовый * + color: brown; * Коричневый * + color: gray; * Серый * + */ + QString level; + QString colorLevel = "pink"; #ifndef PROJECT_TYPE_DEBUG if(logLevel == DEBUG) @@ -62,24 +77,44 @@ void Logger::handleLog(QString msg, LogLevel logLevel) switch (logLevel) { - case INFO: level = "INFO"; break; - case WARNING: level = "WARNING"; break; - case ERROR: level = "ERROR"; break; - case CRITICAL: level = "CRITICAL"; break; - case DEBUG: level = "DEBUG"; break; + case INFO: + level = "INFO"; + colorLevel = "green"; + break; + + case WARNING: + level = "WARNING"; + colorLevel = "yellow"; + break; + + case ERROR: + level = "ERROR"; + colorLevel = "red"; + break; + + case CRITICAL: + level = "CRITICAL"; + colorLevel = "purple"; + break; + + case DEBUG: + level = "DEBUG"; + colorLevel = "brown"; + break; } QString timeStamp = QDateTime::currentDateTime().toString("hh:mm:ss"); QString message = timeStamp + " " + level + " " + msg; - + QString messageHTML = QString("

%1 %3 %4

"). + arg(timeStamp, colorLevel, level, msg); if (loggingType == LoggingType::WIDGET) { - emit sigLogToWidget(message); + emit sigLogToWidget(messageHTML); } else if(loggingType == LoggingType::CONSOLE) { - qDebug() << message; + qDebug() << messageHTML; } if(isLogToFile) diff --git a/ServerLMS/serverlmswidget.cpp b/ServerLMS/serverlmswidget.cpp index 8e4f422..fb9ea90 100644 --- a/ServerLMS/serverlmswidget.cpp +++ b/ServerLMS/serverlmswidget.cpp @@ -32,6 +32,7 @@ ServerLMSWidget::ServerLMSWidget(QWidget *parent) : first (true), language(languageENG), errorCode(0), + versionStr("..."), flStartInitialization(false) { ui->setupUi(this); @@ -39,6 +40,9 @@ ServerLMSWidget::ServerLMSWidget(QWidget *parent) : qDebug() << "ServerLMSWidget init thread ID " << QThread::currentThreadId(); ui->widget_Control->setObjectName("widgetControl"); + ui->btnStopServer->setObjectName("btnStopServer"); + ui->btnStartServer->setObjectName("btnStartServer"); + ui->btnSettings->setObjectName("btnSettings"); registerMetaType(); @@ -125,7 +129,8 @@ void ServerLMSWidget::slot_UpdateListClients() void ServerLMSWidget::slot_AddMessageToLog(QString message) { - ui->loggerTextField->appendPlainText(message); + //ui->loggerTextField->appendPlainText(message); + ui->loggerTextField->appendHtml(message); } void ServerLMSWidget::slot_ErrorPostgreSQL(QString text) @@ -170,6 +175,7 @@ void ServerLMSWidget::slot_startInitialization_step1() void ServerLMSWidget::slot_setVersion(QString versionStr) { + this->versionStr = versionStr; ui->lblVersionText->setText(versionStr); } @@ -479,4 +485,6 @@ void ServerLMSWidget::updateStateServer() ui->btnStartServer->setEnabled(false); } } + + ui->lblVersionText->setText(versionStr); } diff --git a/ServerLMS/serverlmswidget.h b/ServerLMS/serverlmswidget.h index 38e1f3e..1093497 100644 --- a/ServerLMS/serverlmswidget.h +++ b/ServerLMS/serverlmswidget.h @@ -173,6 +173,8 @@ private: QString language; int errorCode; + QString versionStr; + bool flStartInitialization; }; diff --git a/ServerLMS/serverlmswidget.ui b/ServerLMS/serverlmswidget.ui index 8821854..24272ee 100644 --- a/ServerLMS/serverlmswidget.ui +++ b/ServerLMS/serverlmswidget.ui @@ -6,10 +6,16 @@ 0 0 - 1000 + 1200 600 + + + 1200 + 600 + + Tahoma @@ -45,14 +51,14 @@ - 80 - 55 + 16777215 + 16777215 - 80 - 40 + 0 + 0 @@ -86,14 +92,14 @@ - 80 - 55 + 16777215 + 16777215 - 80 - 40 + 0 + 0 @@ -262,13 +268,13 @@ - 150 + 100 0 - 150 + 100 16777215 diff --git a/ServerLMS/settings/dialogsettingstray.cpp b/ServerLMS/settings/dialogsettingstray.cpp index 19fd21f..d7cfdc9 100644 --- a/ServerLMS/settings/dialogsettingstray.cpp +++ b/ServerLMS/settings/dialogsettingstray.cpp @@ -18,6 +18,7 @@ DialogSettingsTray::DialogSettingsTray(ProviderDBLMS* providerDBLMS, QWidget *pa ui->btnSave->setObjectName("btnSave"); ui->btnCheckDB->setObjectName("btnCheckDB"); ui->btnUpdateDocs->setObjectName("btnUpdateDocs"); + ui->checkLocalhost->setObjectName("checkLocalhost"); /* Создаем строку для регулярного выражения */ QString ipRange = "(?:[0-1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])"; diff --git a/ServerLMS/settings/dialogsettingstray.ui b/ServerLMS/settings/dialogsettingstray.ui index 241a4d4..986453b 100644 --- a/ServerLMS/settings/dialogsettingstray.ui +++ b/ServerLMS/settings/dialogsettingstray.ui @@ -70,11 +70,11 @@ - + - + - Host name + Local @@ -94,7 +94,18 @@ - Localhost + + + + + + + + + + + + IP address @@ -218,67 +229,11 @@ - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 58 - 58 - - - - Check - - - - :/resources/icons/checkDB.png:/resources/icons/checkDB.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -329,19 +284,19 @@ - + - 80 + 58 58 - Update Docs + Check DB - - :/resources/icons/exchange.png:/resources/icons/exchange.png + + :/resources/icons/checkDB.png:/resources/icons/checkDB.png @@ -367,6 +322,32 @@ + + + + + 80 + 58 + + + + Update Docs + + + + :/resources/icons/exchange.png:/resources/icons/exchange.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + diff --git a/ServerLMS/translations/ServerLMS_ru_RU.qm b/ServerLMS/translations/ServerLMS_ru_RU.qm index 40b15479c2d7872af9372f9072c139d90ddee0e4..0da8f085a91d2fbb64fff47195d661625a2d636e 100644 GIT binary patch delta 178 zcmcbkdqhvvW=D#|srPfHo>i3DpRjQ6T_*+xCWeWkWlSPr6MNH`L_{ZkwU@lb;kW54 z0|OTWM{5Ej1B1Xjj;V}}3=G28C;Ku6vbU8V0J6&`&t(*6TsV0vV>FYf#AYF;YGHRZ z79kc>76%qb77G@C1_c%y76TS1u!seaWzAy8V#Hv@puoWZ1Z+So7M5C6oSC1eke{ZI Yn^=-sl$n@QY^5++Ku~gXuc$vG0C5y9sQ>@~ delta 112 zcmV-$0FVE~F5E2@Jh)^S%I}<&%^@7WV4=O;LI3~(_>mQM0u%O;jb;K9wUPBd8F~m# zvh@G}3IGU&U;zLC5bg+-0YLx&6L*tM0Z|u`b|C-&5A_PDg5&@I0~QLXn#2GA6hV`{ S0b2qTxU(7pdlR$u6;A;)@+Kkx diff --git a/ServerLMS/translations/ServerLMS_ru_RU.ts b/ServerLMS/translations/ServerLMS_ru_RU.ts index edda8b9..191ce40 100644 --- a/ServerLMS/translations/ServerLMS_ru_RU.ts +++ b/ServerLMS/translations/ServerLMS_ru_RU.ts @@ -4,7 +4,7 @@ AssetsManager - + LLC Constanta-Design ООО Константа-Дизайн @@ -168,8 +168,8 @@ - - + + Error! Ошибка! @@ -184,35 +184,35 @@ Авторизация суперпользователя PostgreSQL - - + + Error connecting to PostgreSQL! Ошибка соединения с PostgreSQL! - - + + Possible reasons: Возможные причины: - - + + *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 адреса: @@ -225,123 +225,129 @@ Форма - + Logger Логгер - + Clients Клиенты - + Settings Настройки - + Server: Сервер: - + Data base: База данных: - - + + + ... - + + Version of materials: + Версия материалов: + + + Authorization Авторизация - + Start Запустить - + Stop Остановить - + Server is started! Сервер запущен! - + Server is stoped! Сервер остановлен! - - + + Warning! Внимание! - + Database settings have been changed. The server will be restarted. Настройки Базы Данных были изменены. Сервер будет перезапущен. - + The file could not be opened Файл не может быть открыт - - + + Database connection error! Ошибка подключения Базы данных! - - + + Error! Ошибка! - + Error PostgreSQL! Ошибка PostgreSQL! - + Settings file could not be opened: Файл настроек не открыт: - + Database connection OK! База данных подключена! - + started запущен - + stoped остановлен - + connected подключена - + not connected не подключена diff --git a/TrayServerLMS/mainwindow.cpp b/TrayServerLMS/mainwindow.cpp index a91dca1..1c2a437 100644 --- a/TrayServerLMS/mainwindow.cpp +++ b/TrayServerLMS/mainwindow.cpp @@ -16,6 +16,7 @@ MainWindow::MainWindow(QWidget *parent) : action_Exit(nullptr) { ui->setupUi(this); + setWindowFlags(windowFlags() & ~Qt::WindowMinimizeButtonHint); //Скрываем ненужные элементы окна ui->menubar->setVisible(false);