Рефакт Администрирование БД 2

ServerLMS/dialogcheckdb.cpp

@@ -1,5 +1,6 @@
 #include <QMessageBox>
 #include <QProcess>
+#include <QFile>
 #include "dialogcheckdb.h"
 #include "ui_dialogcheckdb.h"
 
@@ -68,7 +69,9 @@ void DialogCheckDB::check()
     }
 
     if(!resDriver || !resUser || !resDB)
+    {
         ui->btnRepare->setEnabled(true);
+    }
     else
         ui->btnRepare->setEnabled(false);
 }
@@ -86,6 +89,7 @@ void DialogCheckDB::on_btnRepare_clicked()
         if(!providerDBLMS->createUser())
         {
             QMessageBox::critical(this, tr("Error!"), tr("Failed to create user!"));
+            check();
             return;
         }
     }
@@ -95,7 +99,16 @@ void DialogCheckDB::on_btnRepare_clicked()
         if(!providerDBLMS->createDB())
         {
             QMessageBox::critical(this, tr("Error!"), tr("Failed to create Database!"));
+            check();
             return;
         }
     }
+
+    check();
+
+    if(resDriver && resUser && resDB)
+    {
+        QMessageBox::information(this, tr("Completed!"), tr("The database has been successfully restored!"));
+        this->accept();
+    }
 }

ServerLMS/dialogcheckdb.h

@@ -21,6 +21,7 @@ private slots:
 
 private:
     void check();
+    void prepareRestoreDBscript();
 
 private:
     Ui::DialogCheckDB *ui;

ServerLMS/dialogsettingstray.cpp

@@ -277,10 +277,6 @@ void DialogSettingsTray::on_btnCheckDB_clicked()
         return;
     }
 
-    //Имитация
-    //UserNamePostgres = "postgres";
-    //PasswordPostgres = "12345678";
-
     if(providerDBLMS->setUserPasswordPostgres(UserNamePostgres, PasswordPostgres))
     {
         DialogCheckDB dlgCheckDB(providerDBLMS, this);
@@ -289,6 +285,8 @@ void DialogSettingsTray::on_btnCheckDB_clicked()
         switch( dlgCheckDB.exec() )
         {
         case QDialog::Accepted:
+            ui->btnSave->setEnabled(true);
+            flSettingsServerChanged = true;
             break;
         case QDialog::Rejected:
             break;

ServerLMS/dialogsettingstray.ui

@@ -203,7 +203,7 @@
                     </size>
                    </property>
                    <property name="text">
-                    <string>Check</string>
+                    <string>Check&amp;&amp;Repare</string>
                    </property>
                    <property name="icon">
                     <iconset resource="ServerLMS.qrc">

ServerLMS/serverlmswidget.cpp

@@ -314,6 +314,8 @@ void ServerLMSWidget::tryConnectionToDB()
         emit signal_Menu_ShowWindow();
 
         QMessageBox::critical(this, tr("Error!"), tr("Database connection error!"));
+
+        on_btnSettings_clicked();
     }
     else
     {