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 0000000..2323d41 Binary files /dev/null and b/FILES/translations/RRJServer_ru_RU.qm differ 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); }