refact

LibServer/serverlmswidget.cpp

@@ -2,7 +2,6 @@
 #include <QXmlStreamReader>
 #include <QXmlStreamAttribute>
 #include <QFile>
-#include <QMessageBox>
 #include <QThread>
 #include <QErrorMessage>
 #include "serverlmswidget.h"
@@ -141,7 +140,7 @@ void ServerLMSWidget::slot_AddMessageToLog(QString message)
 void ServerLMSWidget::slot_ErrorPostgreSQL(QString text)
 {
     emit signal_Menu_ShowWindow();
-    SpecMsgBox::CriticalClose(this, tr("Error PostgreSQL!"));
+    SpecMsgBox::CriticalClose(this, tr("Error PostgreSQL!") + "\n" + text);
 }
 
 void ServerLMSWidget::slot_UpdateDocs()
@@ -183,13 +182,13 @@ void ServerLMSWidget::slot_startInitialization_step1()
 void ServerLMSWidget::slot_setVersion(QString versionStr)
 {
     this->versionStr = versionStr;
+    Logger::instance().log("Set Version: " + versionStr);
     updateStateOnlyVersion();
 }
 
 void ServerLMSWidget::start()
 {
     startInitialization_step0();
-
 }
 
 void ServerLMSWidget::slot_BlockAutorization(bool block)
@@ -197,41 +196,14 @@ void ServerLMSWidget::slot_BlockAutorization(bool block)
     if(block)
     {
         server->blockAutorization();
-        //ui->lblBlockAuth->setPixmap(QPixmap(QStringLiteral(":/resources/icons/lock.png")));
-        //emit signal_Tray_ShowMessage(tr("Authorization blocked!"));
+        Logger::instance().log("Autorization is blocked");
     }
     else
     {
         server->unBlockAutorization();
-        //ui->lblBlockAuth->setPixmap(QPixmap(QStringLiteral(":/resources/icons/open.png")));
-        //emit signal_Tray_ShowMessage(tr("Authorization unblocked!"));
-    }
-    //updateStateServer();
-    //emit signal_updateStateServer(server->getStateServer(), server->getStateBlockAutorization());
-
-    if(server)
-    {
-        if(server->getStateServer() == EStateServer::started)
-        {
-            if(server->getStateBlockAutorization() == EStateBlockAutorization::unblocked)
-            {
-                ui->lblOnOffText->setText(tr("started"));
-                ui->lblOnOff->setPixmap(QPixmap(QStringLiteral(":/resources/icons/circleGreen.png")));
-            }
-            else
-            {
-                ui->lblOnOffText->setText(tr("started") + ", " + tr("locked"));
-                ui->lblOnOff->setPixmap(QPixmap(QStringLiteral(":/resources/icons/lock.png")));
-            }
-        }
-        else
-        {
-            ui->lblOnOffText->setText(tr("stoped"));
-            ui->lblOnOff->setPixmap(QPixmap(QStringLiteral(":/resources/icons/stop.png")));
-        }
-
-        emit signal_updateStateServer(server->getStateServer(), server->getStateBlockAutorization());
+        Logger::instance().log("Autorization is unblocked");
     }
+    updateStateOnlyServer();
 }
 
 void ServerLMSWidget::slot_LanguageChanged(QString language)
@@ -247,7 +219,6 @@ void ServerLMSWidget::on_btnStartServer_clicked()
     if(server->startServer())
     {
         QApplication::setOverrideCursor(Qt::WaitCursor);
-        QApplication::restoreOverrideCursor();
 
         ui->btnStartServer->setEnabled(false);
         ui->btnStopServer->setEnabled(true);
@@ -256,6 +227,8 @@ void ServerLMSWidget::on_btnStartServer_clicked()
         updateStateOnlyServer();
 
         emit signal_Tray_ShowMessage(tr("Server is started!"));
+
+        QApplication::restoreOverrideCursor();
     }
 }
 
@@ -263,6 +236,8 @@ void ServerLMSWidget::on_btnStopServer_clicked()
 {
     if(server->stopServer())
     {
+        QApplication::setOverrideCursor(Qt::WaitCursor);
+
         ui->btnStopServer->setEnabled(false);
         ui->btnStartServer->setEnabled(true);
         slot_BlockAutorization(true);
@@ -270,6 +245,8 @@ void ServerLMSWidget::on_btnStopServer_clicked()
         updateStateOnlyServer();
 
         emit signal_Tray_ShowMessage(tr("Server is stoped!"));
+
+        QApplication::restoreOverrideCursor();
     }
 }
 
@@ -409,41 +386,43 @@ void ServerLMSWidget::startInitialization_step0()
 
     processingSystem = new ProcessingSystem(providerDBLMS, updateController, docsUpdater);
 
-    dataParser = new DataParser(assetsManager,processingSystem);
+    dataParser = new DataParser(assetsManager, processingSystem);
 
     commonClientHandler = new CommonClientHandler;
-    connect(this,&ServerLMSWidget::signal_DocsChanged,commonClientHandler, &CommonClientHandler::slot_DocsChanged);
-    connect(commonClientHandler,&CommonClientHandler::sigSetServerState,this,&ServerLMSWidget::slot_trySetServerState);
+    connect(this, &ServerLMSWidget::signal_DocsChanged, commonClientHandler, &CommonClientHandler::slot_DocsChanged);
+    connect(commonClientHandler, &CommonClientHandler::sigSetServerState, this, &ServerLMSWidget::slot_trySetServerState);
 
-    server = new MultiThreadServer(this,updateController,processingSystem,dataParser,6000);
+    server = new MultiThreadServer(this, updateController, processingSystem, dataParser, 6000);
 
     loggerThread->start();
     updateThread->start();
 
-    commonClientHandler->initialize(server->getClientsMap(),processingSystem,dataParser);
-    processingSystem->initialize(server,dataParser,commonClientHandler,updateController,chatSystem);
-    chatSystem->initialize(commonClientHandler,dataParser,server->getClientsMap());
+    commonClientHandler->initialize(server->getClientsMap(), processingSystem, dataParser);
+    processingSystem->initialize(server, dataParser, commonClientHandler, updateController, chatSystem);
+    chatSystem->initialize(commonClientHandler, dataParser, server->getClientsMap());
 
     Logger::instance().moveToThread(loggerThread);
     Logger::instance().setLoggingType(LoggingType::WIDGET);
     Logger::instance().setLogToFile(true);
 
-    connect(this,&ServerLMSWidget::sigUpdateControllerInitialize,updateController,&UpdateController::initialize/*,Qt::DirectConnection*/);
-    connect(updateController,&UpdateController::sigInitializeFinished, this,&ServerLMSWidget::slot_startInitialization_step1/*,Qt::DirectConnection*/);
-    connect(this,&ServerLMSWidget::sigCalculateFullHash,updateController,&UpdateController::calculateFullHash,Qt::AutoConnection);
-    connect(updateController,&UpdateController::sigErrorRequired,this,&ServerLMSWidget::setError);
-    connect(updateController,&UpdateController::sigUpdateDocs,this,&ServerLMSWidget::slot_UpdateDocs,Qt::AutoConnection);
-    connect(&Logger::instance(),&Logger::sigLogToWidget,this, &ServerLMSWidget::slot_AddMessageToLog,Qt::QueuedConnection);
+    connect(this, &ServerLMSWidget::sigUpdateControllerInitialize, updateController, &UpdateController::initialize);
+    connect(updateController, &UpdateController::sigInitializeFinished, this, &ServerLMSWidget::slot_startInitialization_step1);
+    connect(this, &ServerLMSWidget::sigCalculateFullHash, updateController, &UpdateController::calculateFullHash, Qt::AutoConnection);
+    connect(updateController, &UpdateController::sigErrorRequired, this, &ServerLMSWidget::setError);
+    connect(updateController, &UpdateController::sigUpdateDocs, this, &ServerLMSWidget::slot_UpdateDocs, Qt::AutoConnection);
+    connect(&Logger::instance(), &Logger::sigLogToWidget, this, &ServerLMSWidget::slot_AddMessageToLog, Qt::QueuedConnection);
 
-    connect(assetsManager,&AssetsManager::signal_setVersion, this, &ServerLMSWidget::slot_setVersion);
+    connect(assetsManager, &AssetsManager::signal_setVersion, this, &ServerLMSWidget::slot_setVersion);
 
-    emit sigUpdateControllerInitialize(commonClientHandler,dataParser,assetsManager);
+    emit sigUpdateControllerInitialize(commonClientHandler, dataParser, assetsManager);
 }
 
 void ServerLMSWidget::tryConnectionToDB()
 {
     if(! providerDBLMS->ConnectionToDB())
     {
+        Logger::instance().log("Database connection error!");
+
         emit signal_Tray_ShowMessage(tr("Database connection error!"), QSystemTrayIcon::Critical);
 
         emit signal_Menu_ShowWindow();

LibServer/serverlmswidget.h

@@ -82,7 +82,6 @@ signals:
     void sigRecognize();
     void sigCalculateFullHash();
     void sigUpdateControllerInitialize(CommonClientHandler* commonClientHandler,DataParser *dataParser,AssetsManager *assetManager);
-    QTcpSocket* sigGetSocket();
 
     void signal_DocsChanged();
     void signal_hasError(int code);
@@ -103,6 +102,8 @@ public slots:
 
     void slot_setVersion(QString versionStr);
 
+    void slot_trySetServerState(PacketType packetType);
+
 public:
     QString getLanguage()
     {
@@ -143,8 +144,7 @@ public:
 private slots:
     void on_btnStartServer_clicked();
     void on_btnStopServer_clicked();
-    void on_btnSettings_clicked();
-    void slot_trySetServerState(PacketType packetType);
+    void on_btnSettings_clicked();    
 
 private:
     void setLanguageInterfase();