Прокинул сигнал ошибки SQL на виджет

ServerLMS/dialogsettingstray.cpp

@@ -64,11 +64,26 @@ DialogSettingsTray::DialogSettingsTray(ProviderDBLMS* providerDBLMS, QWidget *pa
         ui->editPort->setText(settings->Port);
         ui->editUserName->setText(settings->UserName);
         ui->editPassword->setText(settings->Password);
-    }
 
-    ui->btnSave->setEnabled(false);
-    ui->btnCheckDB->setEnabled(true);
-    flSettingsServerChanged = false;
+        ui->btnSave->setEnabled(false);
+        ui->btnCheckDB->setEnabled(true);
+        flSettingsServerChanged = false;
+    }
+    else
+    {
+        ui->checkLocalhost->setChecked(true);
+        //ui->editHostName->setEnabled(true);
+        ui->editPort->setEnabled(true);
+        ui->editNameDB->setEnabled(true);
+        ui->editUserName->setEnabled(true);
+        ui->editPassword->setEnabled(true);
+
+        ui->btnSave->setEnabled(false);
+
+        ui->btnSave->setEnabled(false);
+        ui->btnCheckDB->setEnabled(false);
+        flSettingsServerChanged = false;
+    }
 }
 
 DialogSettingsTray::~DialogSettingsTray()

ServerLMS/providerdblms.cpp

@@ -9,6 +9,7 @@ ProviderDBLMS::ProviderDBLMS(QWidget *parentWidget, QObject *parent) :
     parentWidget(parentWidget)
 {
     dbLMS = new InterfaceDataBaseLMS(parentWidget);
+    connect(dbLMS, &InterfaceDataBaseLMS::signal_ErrorPostgreSQL, this, &ProviderDBLMS::signal_ErrorPostgreSQL);
 }
 
 ProviderDBLMS::~ProviderDBLMS()

ServerLMS/providerdblms.h

@@ -73,6 +73,8 @@ public:
 Q_SIGNALS:
     //сигнал о блокировке авторизации
     void signal_BlockAutorization(bool block);
+signals:
+    void signal_ErrorPostgreSQL(QString text);
 
 public:
     bool ConnectionToDB();

ServerLMS/serverlmswidget.cpp

@@ -107,6 +107,12 @@ void ServerLMSWidget::slot_AddMessageToLog(QString message)
     ui->loggerTextField->appendPlainText(message);
 }
 
+void ServerLMSWidget::slot_ErrorPostgreSQL(QString text)
+{
+    emit signal_Menu_ShowWindow();
+    QMessageBox::critical(this, tr("Error PostgreSQL!"),text);
+}
+
 void ServerLMSWidget::start()
 {
     startInitialization();
@@ -170,6 +176,13 @@ void ServerLMSWidget::on_btnStopServer_clicked()
 
 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'");
+        return;
+    }
+
     DialogSettingsTray dlg(providerDBLMS, this);
     dlg.setWindowFlags(dlg.windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
@@ -258,6 +271,7 @@ QString ServerLMSWidget::loadStyleSheet()
 void ServerLMSWidget::startInitialization()
 {
     providerDBLMS = new ProviderDBLMS(this);
+    connect(providerDBLMS, &ProviderDBLMS::signal_ErrorPostgreSQL, this, &ServerLMSWidget::slot_ErrorPostgreSQL);
     connect(providerDBLMS, &ProviderDBLMS::signal_BlockAutorization, this, &ServerLMSWidget::slot_BlockAutorization);
 
     mutex = new QMutex;

ServerLMS/serverlmswidget.h

@@ -82,6 +82,8 @@ public slots:
     void slot_BlockAutorization(bool block);
     void slot_AddMessageToLog(QString message);
 
+    void slot_ErrorPostgreSQL(QString text);
+
 public:
     QString getLanguage()
     {

ServerLMS/translations/ServerLMS_ru_RU.ts

@@ -13,7 +13,7 @@
     <name>DialogCheckDB</name>
     <message>
         <location filename="../dialogcheckdb.ui" line="14"/>
-        <location filename="../dialogcheckdb.ui" line="152"/>
+        <location filename="../dialogcheckdb.ui" line="178"/>
         <source>Database</source>
         <translation>База данных</translation>
     </message>
@@ -24,67 +24,72 @@
     </message>
     <message>
         <location filename="../dialogcheckdb.ui" line="43"/>
-        <location filename="../dialogcheckdb.ui" line="101"/>
-        <location filename="../dialogcheckdb.ui" line="159"/>
-        <location filename="../dialogcheckdb.ui" line="204"/>
+        <location filename="../dialogcheckdb.ui" line="114"/>
+        <location filename="../dialogcheckdb.ui" line="185"/>
         <source>...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../dialogcheckdb.ui" line="94"/>
+        <location filename="../dialogcheckdb.ui" line="107"/>
         <source>User</source>
         <translation>Пользователь</translation>
     </message>
     <message>
-        <location filename="../dialogcheckdb.ui" line="217"/>
+        <location filename="../dialogcheckdb.ui" line="259"/>
         <source>Repare</source>
         <translation>Восстановить</translation>
     </message>
     <message>
-        <location filename="../dialogcheckdb.cpp" line="35"/>
+        <location filename="../dialogcheckdb.cpp" line="38"/>
         <source>Installed</source>
         <translation>Установлен</translation>
     </message>
     <message>
-        <location filename="../dialogcheckdb.cpp" line="40"/>
+        <location filename="../dialogcheckdb.cpp" line="43"/>
         <source>Not installed</source>
         <translation>Не установлен</translation>
     </message>
     <message>
-        <location filename="../dialogcheckdb.cpp" line="47"/>
-        <location filename="../dialogcheckdb.cpp" line="59"/>
+        <location filename="../dialogcheckdb.cpp" line="50"/>
+        <location filename="../dialogcheckdb.cpp" line="62"/>
         <source>Exist</source>
         <translation>Существует</translation>
     </message>
     <message>
-        <location filename="../dialogcheckdb.cpp" line="52"/>
-        <location filename="../dialogcheckdb.cpp" line="64"/>
+        <location filename="../dialogcheckdb.cpp" line="55"/>
+        <location filename="../dialogcheckdb.cpp" line="67"/>
         <source>Not exist</source>
         <translation>Не существует</translation>
     </message>
     <message>
-        <location filename="../dialogcheckdb.cpp" line="78"/>
-        <source>Warning!</source>
-        <translation>Внимание!</translation>
+        <location filename="../dialogcheckdb.cpp" line="114"/>
+        <source>Completed!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogcheckdb.cpp" line="78"/>
+        <location filename="../dialogcheckdb.cpp" line="114"/>
+        <source>The database has been successfully restored!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogcheckdb.cpp" line="83"/>
         <source>Install PostgreSQL.</source>
         <translation>Установите  PostgreSQL.</translation>
     </message>
     <message>
-        <location filename="../dialogcheckdb.cpp" line="86"/>
-        <location filename="../dialogcheckdb.cpp" line="95"/>
+        <location filename="../dialogcheckdb.cpp" line="83"/>
+        <location filename="../dialogcheckdb.cpp" line="93"/>
+        <location filename="../dialogcheckdb.cpp" line="104"/>
         <source>Error!</source>
         <translation>Ошибка!</translation>
     </message>
     <message>
-        <location filename="../dialogcheckdb.cpp" line="86"/>
+        <location filename="../dialogcheckdb.cpp" line="93"/>
         <source>Failed to create user!</source>
         <translation>Ошибка создания пользователя!</translation>
     </message>
     <message>
-        <location filename="../dialogcheckdb.cpp" line="95"/>
+        <location filename="../dialogcheckdb.cpp" line="104"/>
         <source>Failed to create Database!</source>
         <translation>Ошибка создания Базы данных!</translation>
     </message>
@@ -106,46 +111,101 @@
         <source>Language</source>
         <translation>Язык</translation>
     </message>
-    <message>
-        <location filename="../dialogsettingstray.ui" line="57"/>
-        <source>Data Base</source>
-        <translation>База Данных</translation>
-    </message>
     <message>
         <location filename="../dialogsettingstray.ui" line="67"/>
-        <source>DB name</source>
-        <translation>Имя БД</translation>
+        <source>Database</source>
+        <translation type="unfinished">База данных</translation>
     </message>
     <message>
-        <location filename="../dialogsettingstray.ui" line="91"/>
+        <location filename="../dialogsettingstray.ui" line="77"/>
         <source>Host name</source>
         <translation>Хост</translation>
     </message>
     <message>
-        <location filename="../dialogsettingstray.ui" line="115"/>
+        <location filename="../dialogsettingstray.ui" line="97"/>
+        <source>Localhost</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogsettingstray.ui" line="121"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../dialogsettingstray.ui" line="139"/>
+        <location filename="../dialogsettingstray.ui" line="145"/>
+        <source>Database name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogsettingstray.ui" line="172"/>
         <source>User name</source>
         <translation>Имя пользователя</translation>
     </message>
     <message>
-        <location filename="../dialogsettingstray.ui" line="163"/>
-        <source>Password</source>
-        <translation>Пароль</translation>
+        <location filename="../dialogsettingstray.ui" line="199"/>
+        <source>User password</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogsettingstray.ui" line="193"/>
-        <source>Check DB</source>
-        <translation>Проверить БД</translation>
+        <location filename="../dialogsettingstray.ui" line="245"/>
+        <source>Check&amp;&amp;Repare</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogsettingstray.ui" line="241"/>
+        <location filename="../dialogsettingstray.ui" line="293"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
+    <message>
+        <location filename="../dialogsettingstray.cpp" line="272"/>
+        <location filename="../dialogsettingstray.cpp" line="324"/>
+        <location filename="../dialogsettingstray.cpp" line="329"/>
+        <source>Error!</source>
+        <translation type="unfinished">Ошибка!</translation>
+    </message>
+    <message>
+        <location filename="../dialogsettingstray.cpp" line="272"/>
+        <source>Driver PostgreSQL is not installed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogsettingstray.cpp" line="281"/>
+        <source>Superuser PostgreSQL authorization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogsettingstray.cpp" line="324"/>
+        <location filename="../dialogsettingstray.cpp" line="329"/>
+        <source>Error connecting to PostgreSQL!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogsettingstray.cpp" line="325"/>
+        <location filename="../dialogsettingstray.cpp" line="330"/>
+        <source>Possible reasons:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogsettingstray.cpp" line="326"/>
+        <location filename="../dialogsettingstray.cpp" line="331"/>
+        <source>*superuser PostgreSQL login or password is incorrect;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogsettingstray.cpp" line="327"/>
+        <source>*Port is incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogsettingstray.cpp" line="332"/>
+        <source>*Port is incorrect;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogsettingstray.cpp" line="333"/>
+        <source>*file &apos;pg_hba.conf&apos; does not contain an entry for the IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ServerLMSWidget</name>
@@ -201,66 +261,66 @@
         <translation>Остановить</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="151"/>
+        <location filename="../serverlmswidget.cpp" line="153"/>
         <source>Server is started!</source>
         <translation>Сервер запущен!</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="164"/>
+        <location filename="../serverlmswidget.cpp" line="166"/>
         <source>Server is stoped!</source>
         <translation>Сервер остановлен!</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="194"/>
-        <location filename="../serverlmswidget.cpp" line="243"/>
+        <location filename="../serverlmswidget.cpp" line="196"/>
+        <location filename="../serverlmswidget.cpp" line="245"/>
         <source>Warning!</source>
         <translation>Внимание!</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="194"/>
+        <location filename="../serverlmswidget.cpp" line="196"/>
         <source>Database settings have been changed.
 The server will be restarted.</source>
         <translation>Настройки Базы Данных были изменены.
 Сервер будет перезапущен.</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="243"/>
+        <location filename="../serverlmswidget.cpp" line="245"/>
         <source>The file could not be opened </source>
         <translation>Файл не может быть открыт </translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="312"/>
-        <location filename="../serverlmswidget.cpp" line="316"/>
+        <location filename="../serverlmswidget.cpp" line="314"/>
+        <location filename="../serverlmswidget.cpp" line="318"/>
         <source>Database connection error!</source>
         <translation>Ошибка подключения Базы данных!</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="316"/>
+        <location filename="../serverlmswidget.cpp" line="318"/>
         <source>Error!</source>
         <translation>Ошибка!</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="329"/>
+        <location filename="../serverlmswidget.cpp" line="333"/>
         <source>Database connection OK!</source>
         <translation>База данных подключена!</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="343"/>
+        <location filename="../serverlmswidget.cpp" line="347"/>
         <source>started</source>
         <translation>запущен</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="348"/>
+        <location filename="../serverlmswidget.cpp" line="352"/>
         <source>stoped</source>
         <translation>остановлен</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="368"/>
+        <location filename="../serverlmswidget.cpp" line="372"/>
         <source>connected</source>
         <translation>подключена</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="377"/>
+        <location filename="../serverlmswidget.cpp" line="381"/>
         <source>not connected</source>
         <translation>не подключена</translation>
     </message>