diff --git a/LibServer/serverlmswidget.cpp b/LibServer/serverlmswidget.cpp index 72121a9..8a82a23 100644 --- a/LibServer/serverlmswidget.cpp +++ b/LibServer/serverlmswidget.cpp @@ -16,11 +16,11 @@ const QString ServerLMSWidget::languageRUS = "ru_RU"; ServerLMSWidget::ServerLMSWidget(QWidget *parent) : QWidget(parent), ui(new Ui::ServerLMSWidget), - waitAnimationWidget(nullptr), - server(nullptr), + waitAnimationWidget(nullptr), updateThread(nullptr), loggerThread(nullptr), mutex(nullptr), + server(nullptr), dataParser(nullptr), processingSystem(nullptr), updateController(nullptr), @@ -56,8 +56,6 @@ ServerLMSWidget::ServerLMSWidget(QWidget *parent) : waitAnimationWidget->setParent(this); waitAnimationWidget->initialize(movie,this); - //waitAnimationWidget->showWithPlay(); - updateStateOnlyVersion(); } @@ -231,7 +229,7 @@ void ServerLMSWidget::on_btnStartServer_clicked() { if(server->startServer()) { - QApplication::setOverrideCursor(Qt::WaitCursor); + //QApplication::setOverrideCursor(Qt::WaitCursor); ui->btnStartServer->setEnabled(false); ui->btnStopServer->setEnabled(true); @@ -241,7 +239,7 @@ void ServerLMSWidget::on_btnStartServer_clicked() emit signal_Tray_ShowMessage(tr("Server is started!")); - QApplication::restoreOverrideCursor(); + //QApplication::restoreOverrideCursor(); } } @@ -249,7 +247,7 @@ void ServerLMSWidget::on_btnStopServer_clicked() { if(server->stopServer()) { - QApplication::setOverrideCursor(Qt::WaitCursor); + //QApplication::setOverrideCursor(Qt::WaitCursor); ui->btnStopServer->setEnabled(false); ui->btnStartServer->setEnabled(true); @@ -259,7 +257,7 @@ void ServerLMSWidget::on_btnStopServer_clicked() emit signal_Tray_ShowMessage(tr("Server is stoped!")); - QApplication::restoreOverrideCursor(); + //QApplication::restoreOverrideCursor(); } } diff --git a/LibServer/serverlmswidget.h b/LibServer/serverlmswidget.h index dfb7346..542506d 100644 --- a/LibServer/serverlmswidget.h +++ b/LibServer/serverlmswidget.h @@ -170,20 +170,23 @@ private: private: WaitAnimationWidget *waitAnimationWidget; - MultiThreadServer *server; QThread *updateThread; QThread *loggerThread; + QMutex *mutex; + MultiThreadServer *server; + DataParser *dataParser; ProcessingSystem *processingSystem; - UpdateController *updateController; - AssetsManager *assetsManager; + UpdateController *updateController; //updateThread + AssetsManager *assetsManager; //updateThread CommonClientHandler *commonClientHandler; ChatSystem *chatSystem; - DocsUpdater* docsUpdater; - CfiController* cfiController; + DocsUpdater* docsUpdater; //updateThread + CfiController* cfiController; //updateThread + ProviderDBLMS* providerDBLMS; bool first = true; // для тестов Unity @@ -191,7 +194,6 @@ private: QTranslator qtLanguageTranslator; QString language; int errorCode; - QString versionStr; bool flStartInitialization;