Merge branch 'work29' into DEV

ServerLMS/serverlmswidget.h

@@ -28,6 +28,10 @@
 #include "providerdblms.h"
 #include "docsupdater.h"
 
+#include "waitanimationwidget.h"
+
+
+
 
 namespace Ui {
 class ServerLMSWidget;
@@ -64,6 +68,8 @@ protected:
     // В нём будет производиться проверка события смены перевода приложения
     void changeEvent(QEvent * event) override;
 
+    void resizeEvent(QResizeEvent *event) override;
+
 signals:
     //сигнал смены языка
     void signal_LanguageChanged(QString language);
@@ -76,7 +82,7 @@ signals:
 
     void sigRecognize();
     void sigCalculateFullHash();
-    void sigUpdateController(CommonClientHandler* commonClientHandler,DataParser *dataParser,AssetsManager *assetManager);
+    void sigUpdateControllerInitialize(CommonClientHandler* commonClientHandler,DataParser *dataParser,AssetsManager *assetManager);
     QTcpSocket* sigGetSocket();
 
     void signal_DocsChanged();
@@ -91,6 +97,10 @@ public slots:
 
     void slot_UpdateDocs();
 
+    void slot_startInitialization_step1();
+
+    void slot_setVersion(QString versionStr);
+
 public:
     QString getLanguage()
     {
@@ -130,7 +140,7 @@ private:
     void updateMyStyleSheet();
     QString loadStyleSheet();
 
-    void startInitialization();
+    void startInitialization_step0();
 
     void tryConnectionToDB();
 
@@ -140,7 +150,7 @@ private:
     Ui::ServerLMSWidget *ui;
 
 private:
-    //WaitAnimationWidget *waitAnimationWidget;
+    WaitAnimationWidget *waitAnimationWidget;
 
     MultiThreadServer *server;
     QThread *updateThread;