From d1df6a2a05545ae0caa73283b370db28f8edfff1 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Tue, 16 Dec 2025 15:13:37 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D1=89=D0=B8=D0=B9=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=B2=D0=BE=D0=B4.=20SpecMsgBox?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FILES/DB_BACKUP/restoreDBscript.bat | 4 ++++ FILES/translations/RRJServer_ru_RU.qm | Bin 0 -> 31104 bytes .../instructorsandtraineeswidget.cpp | 6 +++--- LibServer/serverlmswidget.cpp | 17 +++++++++-------- LibServer/settings/dialogcheckdb.cpp | 9 +++++---- LibServer/settings/dialogsettingstray.cpp | 7 ++++--- ProgramAWSinstructorMPS/mainwindow.cpp | 4 ++-- ProgramServerMPS/mainwindow.cpp | 4 ++-- 8 files changed, 29 insertions(+), 22 deletions(-) create mode 100644 FILES/DB_BACKUP/restoreDBscript.bat create mode 100644 FILES/translations/RRJServer_ru_RU.qm diff --git a/FILES/DB_BACKUP/restoreDBscript.bat b/FILES/DB_BACKUP/restoreDBscript.bat new file mode 100644 index 0000000..70ee633 --- /dev/null +++ b/FILES/DB_BACKUP/restoreDBscript.bat @@ -0,0 +1,4 @@ +set CURRENT_DIR=%~dp0 +cd %CURRENT_DIR% +set "PGPASSWORD=12345678" +pg_restore -U postgres -h localhost -p 5432 -d rrjdatabase .\restoreDB\DBLMS_EMPTY.backup diff --git a/FILES/translations/RRJServer_ru_RU.qm b/FILES/translations/RRJServer_ru_RU.qm new file mode 100644 index 0000000000000000000000000000000000000000..2323d41295af26099cc82230ff22c3817cfb8df6 GIT binary patch literal 31104 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 Yn2Uf$d1b--$CZ6Bu~2z`exUk)0EqpbCIA2c literal 0 HcmV?d00001 diff --git a/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp b/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp index bca4c04..7cc4fe0 100644 --- a/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -194,7 +194,7 @@ QString InstructorsAndTraineesWidget::loadStyleSheet() void InstructorsAndTraineesWidget::slot_LanguageChanged(QString language) { - qtLanguageTranslator.load(QString(QStringLiteral("translations/LibInstructorsAndTrainees_")) + language, QStringLiteral(".")); + qtLanguageTranslator.load(QString(QStringLiteral("translations/RRJServer_")) + language, QStringLiteral(".")); qApp->installTranslator(&qtLanguageTranslator); emit signal_LanguageChanged(language); @@ -635,12 +635,12 @@ void InstructorsAndTraineesWidget::setLanguageInterfase() if(settings.Language == "ENG") { - qtLanguageTranslator.load(QString("translations/LibInstructorsAndTrainees_") + languageENG, "."); + qtLanguageTranslator.load(QString("translations/RRJServer_") + languageENG, "."); language = languageENG; } else { - qtLanguageTranslator.load(QString("translations/LibInstructorsAndTrainees_") + languageRUS, "."); + qtLanguageTranslator.load(QString("translations/RRJServer_") + languageRUS, "."); language = languageRUS; } diff --git a/LibServer/serverlmswidget.cpp b/LibServer/serverlmswidget.cpp index a29c6c4..ffcedd3 100644 --- a/LibServer/serverlmswidget.cpp +++ b/LibServer/serverlmswidget.cpp @@ -7,6 +7,7 @@ #include #include "serverlmswidget.h" #include "dialogsettingstray.h" +#include "specialmessagebox.h" #include "ui_serverlmswidget.h" #include "metatypes.h" @@ -136,7 +137,7 @@ void ServerLMSWidget::slot_AddMessageToLog(QString message) void ServerLMSWidget::slot_ErrorPostgreSQL(QString text) { emit signal_Menu_ShowWindow(); - QMessageBox::critical(this, tr("Error PostgreSQL!"),text); + SpecMsgBox::CriticalClose(this, tr("Error PostgreSQL!")); } void ServerLMSWidget::slot_UpdateDocs() @@ -203,7 +204,7 @@ void ServerLMSWidget::slot_BlockAutorization(bool block) void ServerLMSWidget::slot_LanguageChanged(QString language) { - qtLanguageTranslator.load(QString("translations/LibServer_") + language, "."); + qtLanguageTranslator.load(QString("translations/RRJServer_") + language, "."); qApp->installTranslator(&qtLanguageTranslator); emit signal_LanguageChanged(language); @@ -243,7 +244,7 @@ void ServerLMSWidget::on_btnSettings_clicked() ServerDBSettings settingsTemp; if(!DialogSettingsTray::loadSettings(&settingsTemp)) { - QMessageBox::critical(this, tr("Error!"), tr("Settings file could not be opened:") + "'config/settings.xml'"); + SpecMsgBox::CriticalClose(this, tr("Settings file could not be opened:") + "'config/settings.xml'"); return; } @@ -272,7 +273,7 @@ void ServerLMSWidget::on_btnSettings_clicked() updateStateServer(); - QMessageBox::warning(this, tr("Warning!"), tr("Database settings have been changed.\nThe server will be restarted.")); + SpecMsgBox::WarningClose(this, tr("Database settings have been changed.\nThe server will be restarted.")); tryConnectionToDB(); } @@ -307,12 +308,12 @@ void ServerLMSWidget::setLanguageInterfase() if(settings.Language == "ENG") { - qtLanguageTranslator.load(QString("translations/LibServer_") + languageENG, "."); + qtLanguageTranslator.load(QString("translations/RRJServer_") + languageENG, "."); language = languageENG; } else { - qtLanguageTranslator.load(QString("translations/LibServer_") + languageRUS, "."); + qtLanguageTranslator.load(QString("translations/RRJServer_") + languageRUS, "."); language = languageRUS; } @@ -335,7 +336,7 @@ QString ServerLMSWidget::loadStyleSheet() QFile styleSheetFile(fileName); if (!styleSheetFile.open(QFile::ReadOnly | QFile::Text)) { - QMessageBox::warning(this, tr("Warning!"), tr("The file could not be opened ") + fileName); + SpecMsgBox::WarningClose(this, tr("The file could not be opened ") + fileName); return QStringLiteral(""); } else @@ -413,7 +414,7 @@ void ServerLMSWidget::tryConnectionToDB() emit signal_Menu_ShowWindow(); - QMessageBox::critical(this, tr("Error!"), tr("Database connection error!")); + SpecMsgBox::CriticalClose(this, tr("Database connection error!")); on_btnSettings_clicked(); } diff --git a/LibServer/settings/dialogcheckdb.cpp b/LibServer/settings/dialogcheckdb.cpp index 1b45be2..5a3810b 100644 --- a/LibServer/settings/dialogcheckdb.cpp +++ b/LibServer/settings/dialogcheckdb.cpp @@ -1,6 +1,7 @@ #include #include #include +#include "specialmessagebox.h" #include "dialogcheckdb.h" #include "ui_dialogcheckdb.h" @@ -80,7 +81,7 @@ void DialogCheckDB::on_btnRepare_clicked() { if(!resDriver) { - QMessageBox::critical(this, tr("Error!"), tr("Install PostgreSQL.")); + SpecMsgBox::CriticalClose(this, tr("Install PostgreSQL.")); this->reject(); return; } @@ -90,7 +91,7 @@ void DialogCheckDB::on_btnRepare_clicked() if(!providerDBLMS->createUser()) { check(); - QMessageBox::critical(this, tr("Error!"), tr("Failed to create user!")); + SpecMsgBox::CriticalClose(this, tr("Failed to create user!")); this->reject(); return; } @@ -101,7 +102,7 @@ void DialogCheckDB::on_btnRepare_clicked() if(!providerDBLMS->createDB()) { check(); - QMessageBox::critical(this, tr("Error!"), tr("Failed to create Database!")); + SpecMsgBox::CriticalClose(this, tr("Failed to create Database!")); this->reject(); return; } @@ -111,7 +112,7 @@ void DialogCheckDB::on_btnRepare_clicked() if(resDriver && resUser && resDB) { - QMessageBox::information(this, tr("Completed!"), tr("The database has been successfully restored!")); + SpecMsgBox::InfoOk(this, tr("The database has been successfully restored!")); this->accept(); } } diff --git a/LibServer/settings/dialogsettingstray.cpp b/LibServer/settings/dialogsettingstray.cpp index 7a31797..946b613 100644 --- a/LibServer/settings/dialogsettingstray.cpp +++ b/LibServer/settings/dialogsettingstray.cpp @@ -5,6 +5,7 @@ #include "ui_dialogsettingstray.h" #include "dialogcheckdb.h" #include "dialogauthorization.h" +#include "specialmessagebox.h" DialogSettingsTray::DialogSettingsTray(ProviderDBLMS* providerDBLMS, QWidget *parent) : QDialog(parent), @@ -290,7 +291,7 @@ void DialogSettingsTray::on_btnCheckDB_clicked() //Проверяем, установлен ли PostgreSQL if(!providerDBLMS->checkDriverQPSQLavailable()) { - QMessageBox::critical(this, tr("Error!"), tr("Driver PostgreSQL is not installed!")); + SpecMsgBox::CriticalClose(this, tr("Driver PostgreSQL is not installed!")); return; } @@ -340,12 +341,12 @@ void DialogSettingsTray::on_btnCheckDB_clicked() else { if(settings->HostName == "localhost") - QMessageBox::critical(this, tr("Error!"), tr("Error connecting to PostgreSQL!") + "\n\n" + + 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.")); else - QMessageBox::critical(this, tr("Error!"), tr("Error connecting to PostgreSQL!") + "\n\n" + + 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" + diff --git a/ProgramAWSinstructorMPS/mainwindow.cpp b/ProgramAWSinstructorMPS/mainwindow.cpp index 1bd46c4..cd2c346 100644 --- a/ProgramAWSinstructorMPS/mainwindow.cpp +++ b/ProgramAWSinstructorMPS/mainwindow.cpp @@ -21,7 +21,7 @@ MainWindow::MainWindow(QWidget *parent) //this->showNormal(); this->showMaximized(); - qtLanguageTranslator.load(QString("translations/ProgramAWSinstructorMPS_") + instructorsAndTraineesWidget->getLanguage(), "."); + qtLanguageTranslator.load(QString("translations/RRJServer_") + instructorsAndTraineesWidget->getLanguage(), "."); qApp->installTranslator(&qtLanguageTranslator); } @@ -42,6 +42,6 @@ void MainWindow::changeEvent(QEvent *event) void MainWindow::slot_LanguageChanged(QString language) { - qtLanguageTranslator.load(QString(QStringLiteral("translations/ProgramAWSinstructorMPS_")) + language, QStringLiteral(".")); + qtLanguageTranslator.load(QString(QStringLiteral("translations/RRJServer_")) + language, QStringLiteral(".")); qApp->installTranslator(&qtLanguageTranslator); } diff --git a/ProgramServerMPS/mainwindow.cpp b/ProgramServerMPS/mainwindow.cpp index 9d5afca..2a661f0 100644 --- a/ProgramServerMPS/mainwindow.cpp +++ b/ProgramServerMPS/mainwindow.cpp @@ -30,7 +30,7 @@ MainWindow::MainWindow(QWidget *parent) : connect(serverLMSWidget, &ServerLMSWidget::signal_Menu_ShowWindow, this, &MainWindow::slot_TrayMenu_ShowWindow); connect(serverLMSWidget, &ServerLMSWidget::signal_Menu_HideWindow, this, &MainWindow::slot_TrayMenu_HideWindow); - qtLanguageTranslator.load(QString("translations/ProgramServerMPS_") + serverLMSWidget->getLanguage(), "."); + qtLanguageTranslator.load(QString("translations/RRJServer_") + serverLMSWidget->getLanguage(), "."); qApp->installTranslator(&qtLanguageTranslator); /* Инициализируем иконку трея, устанавливаем иконку, @@ -193,7 +193,7 @@ void MainWindow::slot_hasError(int code) void MainWindow::slot_LanguageChanged(QString language) { - qtLanguageTranslator.load(QString(QStringLiteral("translations/ProgramServerMPS_")) + language, QStringLiteral(".")); + qtLanguageTranslator.load(QString(QStringLiteral("translations/RRJServer_")) + language, QStringLiteral(".")); qApp->installTranslator(&qtLanguageTranslator); }