ref: segregate systems, codestyle, busy message

Core/UpdateController.cpp

@@ -1,5 +1,4 @@
 #include "UpdateController.h"
-#include <QDialogButtonBox>
 
 UpdateController::UpdateController(DataParser *parser,SendSystem *sendSystem, QObject *parent) :
     QObject(parent)

Core/UpdateController.h

@@ -1,11 +1,6 @@
 #ifndef UPDATECONTROLLER_H
 #define UPDATECONTROLLER_H
 
-
-#include "Core\FileData.h"
-#include "Core\dataparser.h"
-#include "Core\tcpclient.h"
-#include "streamingversiondata.h"
 #include <QXmlStreamWriter>
 #include <QXmlStreamReader>
 #include <QXmlStreamAttribute>
@@ -17,6 +12,12 @@
 #include <QDebug>
 #include <QList>
 #include <QObject>
+#include <QDialogButtonBox>
+
+#include <Data\FileData.h>
+#include <Core\dataparser.h>
+#include <Core\tcpclient.h>
+#include <Data\streamingversiondata.h>
 
 class SendSystem;
 class MainWindow;

Core/dataparser.cpp

@@ -1,11 +1,5 @@
 #include "Core/dataparser.h"
 
-#include "FileData.h"
-#include "tools.h"
-
-#include <QDir>
-#include <QDomDocument>
-
 DataParser::DataParser(QObject *parent) :
     QObject(parent)
 {

Core/dataparser.h

@@ -1,13 +1,17 @@
 #ifndef DATAPARSER_H
 #define DATAPARSER_H
 
-#include "FileData.h"
-#include "recognizesystem.h"
 
-#include <QObject>
+#include <QDir>
-#include <Datas.h>
 #include <QFile>
+#include <QObject>
+#include <QDomDocument>
 #include <QXmlStreamWriter>
+#include <Data/FileData.h>
+#include <Data/Datas.h>
+#include <Data/FileData.h>
+#include <Core/recognizesystem.h>
+#include <Core/tools.h>
 
 class RecognizeSystem;
 

Core/externalexecuter.cpp

@@ -1,17 +1,8 @@
 #include "externalexecuter.h"
 
-#include <QCoreApplication>
+ExternalExecuter::ExternalExecuter() {}
 
-
+ExternalExecuter::~ExternalExecuter() {}
-ExternalExecuter::ExternalExecuter()
-{
-
-}
-
-ExternalExecuter::~ExternalExecuter()
-{
-
-}
 
 void ExternalExecuter::callApp()
 {

Core/externalexecuter.h

@@ -7,7 +7,8 @@
 #include <QDirIterator>
 #include <QProcess>
 #include <QDebug>
-#include "tools.h"
+#include <QCoreApplication>
+#include <Core/tools.h>
 
 class ExternalExecuter : public QObject
 {

Core/hashcomparer.cpp

@@ -1,9 +1,5 @@
 #include "hashcomparer.h"
 
-#include <QCoreApplication>
-#include <updatenotifywidget.h>
-
-
 HashComparer::HashComparer(DataParser *dataParser,QObject *)
 {
     this->dataParser = dataParser;

Core/hashcomparer.h

@@ -1,13 +1,14 @@
 #ifndef HASHCOMPARER_H
 #define HASHCOMPARER_H
 
-#include "FileData.h"
+#include <QCoreApplication>
-#include "dataparser.h"
-#include "tools.h"
-
 #include <QObject>
 #include <QFile>
-#include <updatenotifywidget.h>
+#include <Data/FileData.h>
+#include <Core/dataparser.h>
+#include <Core/tools.h>
+#include <Widgets/updatenotifywidget.h>
+#include <Widgets/updatenotifywidget.h>
 
 class UpdateNotifyWidget;
 class VersionContainer;

Core/recognizesystem.cpp

@@ -1,9 +1,5 @@
 #include "Core/recognizesystem.h"
 
-#include "streamingversiondata.h"
-
-#include <updatenotifywidget.h>
-
 RecognizeSystem::RecognizeSystem(QObject *parent):
     QObject(parent)
 {
@@ -44,6 +40,7 @@ void RecognizeSystem::initialize(UpdateController *updateController,
     connect(this,&RecognizeSystem::sigSocketWaitForReadyRead,client,&TCPClient::waitRead,Qt::DirectConnection);
     connect(this,&RecognizeSystem::sigServerBlocked,mainWindow,&MainWindow::serverBlocked);
     connect(this,&RecognizeSystem::sigShowServerList,mainWindow,&MainWindow::showServerListWidget);
+    connect(this,&RecognizeSystem::sigAnimationActivated,mainWindow,&MainWindow::activateLoadingAnimation,Qt::AutoConnection);
 }
 
 void RecognizeSystem::recognize(QTcpSocket *socket)
@@ -275,6 +272,17 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
         {
            mainWindow->checkUpdate();
         }
+
+        if(packetType == PacketType::BUSY)
+        {
+            emit sigAnimationActivated(true);
+        }
+
+        if(packetType == PacketType::FREE)
+        {
+            emit sigAnimationActivated(false);
+        }
+
         packetType = PacketType::TYPE_NONE;
     }
 }

Core/recognizesystem.h

@@ -7,6 +7,8 @@
 #include <mainwindow.h>
 #include <Core\tools.h>
 #include <Core\UpdateController.h>
+#include <Data\streamingversiondata.h>
+#include <Widgets\updatenotifywidget.h>
 
 class UpdateController;
 class MainWindow;
@@ -45,6 +47,7 @@ signals:
     void sigSocketWaitForReadyRead(int waitTime);
     void sigStartCompare();
     void sigShowServerList(QList<StreamingVersionData*> *serverDatas);
+    void sigAnimationActivated(bool flag);
 
 private:
     QList<QString> *folderList;

Core/screenchecker.cpp

@@ -1,10 +1,5 @@
 #include "screenchecker.h"
 
-#include <QLabel>
-#include <QBitmap>
-#include <QToolButton>
-#include <QPainter>
-
 ScreenChecker::ScreenChecker(QWidget *mainWidget,DataParser *dataParser, QHBoxLayout *layout, QObject *parent) :
     QObject(parent)
 {

Core/screenchecker.h

@@ -11,6 +11,9 @@
 #include <QHBoxLayout>
 #include <QToolButton>
 #include <QLabel>
+#include <QBitmap>
+#include <QToolButton>
+#include <QPainter>
 
 class DataParser;
 class ScreenChecker : public QObject

Core/sendsystem.cpp

@@ -1,16 +1,6 @@
 #include "sendsystem.h"
-#include "tools.h"
 
-#include <QFile>
+SendSystem::SendSystem(QObject *) {}
-#include <QFileInfo>
-#include <QThread>
-
-
-
-SendSystem::SendSystem(QObject *)
-{
-
-}
 
 void SendSystem::initialize(MainWindow *mainWindow,DataParser *dataParser)
 {

Core/sendsystem.h

@@ -2,6 +2,9 @@
 #define SENDSYSTEM_H
 
 #include <QObject>
+#include <QFile>
+#include <QFileInfo>
+#include <QThread>
 #include <QTcpSocket>
 #include <QDataStream>
 #include <mainwindow.h>

Core/tcpclient.cpp

@@ -1,8 +1,4 @@
 #include "tcpclient.h"
-#include "UpdateController.h"
-#include "externalexecuter.h"
-
-#include <QDir>
 
 TCPClient::TCPClient(QObject *parent) :
     QObject(parent)

Core/tcpclient.h

@@ -7,11 +7,13 @@
 #include <QDataStream>
 #include <QTcpServer>
 #include <QFile>
+#include <QDir>
 #include <QCoreApplication>
-#include "Core\recognizesystem.h"
+#include <Core\recognizesystem.h>
-#include "Core\tools.h"
+#include <Core\tools.h>
-#include "Core\UpdateController.h"
+#include <Core\UpdateController.h>
-#include "Core\externalexecuter.h"
+#include <Core\externalexecuter.h>
+
 
 class UpdateController;
 class RecognizeSystem;

Core/tools.cpp

@@ -1,8 +1,5 @@
 #include "tools.h"
 
-#include <qdir.h>
-
-
 void Tools::printTime()
 {
     qDebug() << QTime::currentTime().toString("hh:mm:ss");

Core/tools.h

@@ -1,13 +1,14 @@
 #ifndef GLOBAL_H
 #define GLOBAL_H
 
-#include "streamingversiondata.h"
 
 #include <QString>
 #include <QTime>
 #include <QDebug>
 #include <QDir>
 
+#include <Data/streamingversiondata.h>
+
 #define TCP_READ_TIMEOUT 2000
 
 static QString applicationEXEName = "RRJ.exe";
@@ -44,7 +45,10 @@ enum PacketType{
     HASH_READY = 150,
     CHANGE_DATA_VERSION = 151,
     COPY_VERSION = 152,
-    DELETE_DATA_VERSION = 153
+    DELETE_DATA_VERSION = 153,
+    BUSY = 154,
+    FREE = 155
+
 };
 
 class Tools {

Core/versioncontainer.h

@@ -1,9 +1,8 @@
 #ifndef VERSIONCONTAINER_H
 #define VERSIONCONTAINER_H
 
-#include "streamingversiondata.h"
-
 #include <QObject>
+#include <Data/streamingversiondata.h>
 
 class VersionContainer : public QObject
 {

RRJClient.pro

@@ -28,15 +28,16 @@ SOURCES += \
     Core\tcpclient.cpp\
     Core\tools.cpp\
     Core\hashcomparer.cpp \
-    commonbuttongroupwidget.cpp \
+    UI/resourcemanager.cpp \
-    entrywidget.cpp \
+    Widgets\commonbuttongroupwidget.cpp \
-    instructorbuttongroupwidget.cpp \
+    Widgets\entrywidget.cpp \
+    Widgets\instructorbuttongroupwidget.cpp \
     main.cpp \
     mainwindow.cpp \
     mywinheader.cpp \
-    newversionwidget.cpp \
+    Widgets\newversionwidget.cpp \
-    updatenotifywidget.cpp \
+    Widgets\updatenotifywidget.cpp \
-    versionselectwidget.cpp
+    Widgets\versionselectwidget.cpp
 
 HEADERS += \
     Core/streamingversiondata.h \
@@ -45,30 +46,31 @@ HEADERS += \
     Core\updatecontroller.h \
     Core\externalexecuter.h\
     Core\dataparser.h\
-    Core\FileData.h\
     Core\recognizesystem.h\
     Core\screenchecker.h\
     Core\tcpclient.h\
     Core\tools.h\
     Core\hashcomparer.h \
-    Datas.h \
+    Data\FileData.h\
-    commonbuttongroupwidget.h \
+    Data\Datas.h \
-    entrywidget.h \
+    UI/resourcemanager.h \
-    instructorbuttongroupwidget.h \
+    Widgets\commonbuttongroupwidget.h \
+    Widgets\entrywidget.h \
+    Widgets\instructorbuttongroupwidget.h \
     mainwindow.h \
     mywinheader.h \
-    newversionwidget.h \
+    Widgets\newversionwidget.h \
-    updatenotifywidget.h \
+    Widgets\updatenotifywidget.h \
-    versionselectwidget.h
+    Widgets\versionselectwidget.h
 
 FORMS += \
-    commonbuttongroupwidget.ui \
+    Widgets\commonbuttongroupwidget.ui \
-    entrywidget.ui \
+    Widgets\entrywidget.ui \
-    instructorbuttongroupwidget.ui \
+    Widgets\instructorbuttongroupwidget.ui \
     mainwindow.ui \
-    newversionwidget.ui \
+    Widgets\newversionwidget.ui \
-    updatenotifywidget.ui \
+    Widgets\updatenotifywidget.ui \
-    versionselectwidget.ui
+    Widgets\versionselectwidget.ui
 
 TRANSLATIONS = QtLanguage_ru.ts\
                QtLanguage_eng.ts

RRJClient.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.1, 2024-12-26T11:29:31. -->
+<!-- Written by QtCreator 4.11.1, 2024-12-27T11:37:44. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -78,7 +78,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
       <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">true</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
      </valuemap>

StaticData/settings.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <ServerSettingsContainer>
-    <ServerSettings Language="RUS" AutoStart="0" Address="192.168.100.241" Port="6000"/>
+    <ServerSettings Address="192.168.100.241" Language="RUS" Port="6000" AutoStart="0"/>
     <VersionData Version="base"/>
 </ServerSettingsContainer>

UI/resourcemanager.cpp

@@ -0,0 +1,87 @@
+#include "resourcemanager.h"
+
+#include <QFontDatabase>
+#include <QIcon>
+#include <QPainter>
+
+ResourceManager::ResourceManager(QObject *parent) :
+    QObject(parent),
+    settingsIcon(new QIcon),
+    unsavedIcon(new QIcon),
+    closeIcon(new QIcon)
+{
+
+}
+
+void ResourceManager::painting()
+{
+    QFontDatabase::addApplicationFont(":/resource/Fonts/Kanit Cyrillic.ttf");
+    QFontDatabase::addApplicationFont(":/resource/Fonts/HelveticaNeue-Medium.ttf");
+
+    //settings
+    QPixmap settingIcon(":resource/Icons/settingWhite.png");
+    QPainter painter;
+    QColor color(45,84,130);
+
+    painter.begin(&settingIcon);
+    painter.setCompositionMode(QPainter::CompositionMode_SourceIn);
+    painter.fillRect(settingIcon.rect(),color);
+    painter.end();
+
+    settingsIcon->addPixmap(settingIcon,QIcon::Normal,QIcon::Off);
+
+    //caution
+    QPixmap cautionIcon(":resource/Icons/caution.png");
+
+    painter.begin(&cautionIcon);
+    painter.setCompositionMode(QPainter::CompositionMode_SourceIn);
+    painter.fillRect(cautionIcon.rect(),color);
+    painter.end();
+
+    unsavedIcon->addPixmap(cautionIcon,QIcon::Normal,QIcon::Off);
+
+    //exit
+    QPixmap crossPixmap(":resource/Icons/crossInCircle.png");
+    QPainter painterCross;
+
+    painter.begin(&crossPixmap);
+    painter.setCompositionMode(QPainter::CompositionMode_SourceIn);
+    painter.fillRect(crossPixmap.rect(),color);
+    painter.end();
+
+    closeIcon->addPixmap(crossPixmap,QIcon::Normal,QIcon::Off);
+    //loading
+
+    movie = new QMovie(":/resource/Icons/762.gif");
+    startLoadingAnim();
+}
+
+void ResourceManager::startLoadingAnim()
+{
+    movie->start();
+}
+
+void ResourceManager::stopLoadingMovie()
+{
+    movie->stop();
+}
+
+QMovie *ResourceManager::getMovie() const
+{
+    return movie;
+}
+
+QIcon *ResourceManager::getSettingsIcon() const
+{
+    return settingsIcon;
+}
+
+QIcon *ResourceManager::getUnsavedIcon() const
+{
+    return unsavedIcon;
+}
+
+QIcon *ResourceManager::getCloseIcon() const
+{
+    return closeIcon;
+}

UI/resourcemanager.h

@@ -0,0 +1,32 @@
+#ifndef RESOURCEMANAGER_H
+#define RESOURCEMANAGER_H
+
+#include <QLabel>
+#include <QMovie>
+#include <QObject>
+
+class ResourceManager : public QObject
+{
+    Q_OBJECT
+public:
+    explicit ResourceManager(QObject *parent = nullptr);
+
+    void painting();
+    void startLoadingAnim();
+    void stopLoadingMovie();
+
+    QMovie *getMovie() const;
+    QIcon *getSettingsIcon() const;
+    QIcon *getUnsavedIcon() const;
+    QIcon *getCloseIcon() const;
+
+signals:
+
+private:
+    QMovie *movie;
+    QIcon *settingsIcon;
+    QIcon *unsavedIcon;
+    QIcon *closeIcon;
+};
+
+#endif // RESOURCEMANAGER_H

Widgets/commonbuttongroupwidget.h

@@ -2,7 +2,6 @@
 #define COMMONBUTTONGROUPWIDGET_H
 
 #include <QWidget>
-
 #include <Core/tcpclient.h>
 
 namespace Ui {

Widgets/entrywidget.h

@@ -1,10 +1,9 @@
 #ifndef ENTRYWIDGET_H
 #define ENTRYWIDGET_H
 
-#include "Datas.h"
 #include "mainwindow.h"
-
 #include <QWidget>
+#include <Data/Datas.h>
 
 namespace Ui {
 class EntryWidget;

Widgets/newversionwidget.h

@@ -1,8 +1,7 @@
 #ifndef NEWVERSIONWIDGET_H
 #define NEWVERSIONWIDGET_H
 
-#include "versionselectwidget.h"
+#include <Widgets/versionselectwidget.h>
-
 #include <QWidget>
 
 namespace Ui {

Widgets/updatenotifywidget.cpp

@@ -84,4 +84,7 @@ void UpdateNotifyWidget::on_closeButton_clicked()
     close();
 }
 
+void UpdateNotifyWidget::on_updateActionListLabel_linkActivated(const QString &link)
+{
 
+}

Widgets/updatenotifywidget.h

@@ -6,7 +6,7 @@
 #include <QDialog>
 #include <QWidget>
 
-#include <Core/FileData.h>
+#include <Data/FileData.h>
 
 namespace Ui {
 class UpdateNotifyWidget;
@@ -35,6 +35,8 @@ private slots:
     void on_undoChangesButton_clicked();
     void on_startWithCurrentChangesButton_clicked();
 
+    void on_updateActionListLabel_linkActivated(const QString &link);
+
 private:
     Ui::UpdateNotifyWidget *ui;
     MainWindow *mainWindow;

Widgets/versionselectwidget.h

@@ -5,8 +5,8 @@
 #include <QWidget>
 
 #include <Core/sendsystem.h>
-#include <Core/streamingversiondata.h>
+#include <Data/streamingversiondata.h>
-#include <newversionwidget.h>
+#include <Widgets/newversionwidget.h>
 
 namespace Ui {
 class VersionSelectWidget;

debug/moc_commonbuttongroupwidget.cpp

@@ -7,7 +7,7 @@
 *****************************************************************************/
 
 #include <memory>
-#include "../commonbuttongroupwidget.h"
+#include "../Widgets/commonbuttongroupwidget.h"
 #include <QtCore/qbytearray.h>
 #include <QtCore/qmetatype.h>
 #if !defined(Q_MOC_OUTPUT_REVISION)

debug/moc_entrywidget.cpp

@@ -7,7 +7,7 @@
 *****************************************************************************/
 
 #include <memory>
-#include "../entrywidget.h"
+#include "../Widgets/entrywidget.h"
 #include <QtCore/qbytearray.h>
 #include <QtCore/qmetatype.h>
 #if !defined(Q_MOC_OUTPUT_REVISION)

debug/moc_instructorbuttongroupwidget.cpp

@@ -7,7 +7,7 @@
 *****************************************************************************/
 
 #include <memory>
-#include "../instructorbuttongroupwidget.h"
+#include "../Widgets/instructorbuttongroupwidget.h"
 #include <QtCore/qbytearray.h>
 #include <QtCore/qmetatype.h>
 #if !defined(Q_MOC_OUTPUT_REVISION)

debug/moc_mainwindow.cpp

@@ -23,8 +23,8 @@ QT_BEGIN_MOC_NAMESPACE
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
 struct qt_meta_stringdata_MainWindow_t {
-    QByteArrayData data[63];
+    QByteArrayData data[61];
-    char stringdata0[977];
+    char stringdata0[934];
 };
 #define QT_MOC_LITERAL(idx, ofs, len) \
     Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -91,11 +91,9 @@ QT_MOC_LITERAL(54, 771, 25), // "on_settingsButton_clicked"
 QT_MOC_LITERAL(55, 797, 29), // "on_languageComboBox_activated"
 QT_MOC_LITERAL(56, 827, 4), // "arg1"
 QT_MOC_LITERAL(57, 832, 17), // "slotDisableNotify"
-QT_MOC_LITERAL(58, 850, 37), // "on_updateListGuideLabel_linkA..."
+QT_MOC_LITERAL(58, 850, 21), // "on_exitButton_clicked"
-QT_MOC_LITERAL(59, 888, 4), // "link"
+QT_MOC_LITERAL(59, 872, 29), // "on_offlineStartButton_clicked"
-QT_MOC_LITERAL(60, 893, 21), // "on_exitButton_clicked"
+QT_MOC_LITERAL(60, 902, 31) // "on_unsafeChangingButton_clicked"
-QT_MOC_LITERAL(61, 915, 29), // "on_offlineStartButton_clicked"
-QT_MOC_LITERAL(62, 945, 31) // "on_unsafeChangingButton_clicked"
 
     },
     "MainWindow\0sigInitializeClient\0\0"
@@ -121,9 +119,7 @@ QT_MOC_LITERAL(62, 945, 31) // "on_unsafeChangingButton_clicked"
     "showServerListWidget\0QList<StreamingVersionData*>*\0"
     "serverData\0on_settingsButton_clicked\0"
     "on_languageComboBox_activated\0arg1\0"
-    "slotDisableNotify\0"
+    "slotDisableNotify\0on_exitButton_clicked\0"
-    "on_updateListGuideLabel_linkActivated\0"
-    "link\0on_exitButton_clicked\0"
     "on_offlineStartButton_clicked\0"
     "on_unsafeChangingButton_clicked"
 };
@@ -135,7 +131,7 @@ static const uint qt_meta_data_MainWindow[] = {
        8,       // revision
        0,       // classname
        0,    0, // classinfo
-      27,   14, // methods
+      26,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
        0,    0, // constructors
@@ -143,35 +139,34 @@ static const uint qt_meta_data_MainWindow[] = {
        9,       // signalCount
 
  // signals: name, argc, parameters, tag, flags
-       1,    5,  149,    2, 0x06 /* Public */,
+       1,    5,  144,    2, 0x06 /* Public */,
-      13,    5,  160,    2, 0x06 /* Public */,
+      13,    5,  155,    2, 0x06 /* Public */,
-      22,    1,  171,    2, 0x06 /* Public */,
+      22,    1,  166,    2, 0x06 /* Public */,
-      24,    1,  174,    2, 0x06 /* Public */,
+      24,    1,  169,    2, 0x06 /* Public */,
-      26,    1,  177,    2, 0x06 /* Public */,
+      26,    1,  172,    2, 0x06 /* Public */,
-      29,    2,  180,    2, 0x06 /* Public */,
+      29,    2,  175,    2, 0x06 /* Public */,
-      32,    0,  185,    2, 0x06 /* Public */,
+      32,    0,  180,    2, 0x06 /* Public */,
-      33,    0,  186,    2, 0x06 /* Public */,
+      33,    0,  181,    2, 0x06 /* Public */,
-      34,    0,  187,    2, 0x06 /* Public */,
+      34,    0,  182,    2, 0x06 /* Public */,
 
  // slots: name, argc, parameters, tag, flags
-      35,    0,  188,    2, 0x0a /* Public */,
+      35,    0,  183,    2, 0x0a /* Public */,
-      36,    0,  189,    2, 0x0a /* Public */,
+      36,    0,  184,    2, 0x0a /* Public */,
-      37,    1,  190,    2, 0x0a /* Public */,
+      37,    1,  185,    2, 0x0a /* Public */,
-      39,    0,  193,    2, 0x0a /* Public */,
+      39,    0,  188,    2, 0x0a /* Public */,
-      40,    0,  194,    2, 0x0a /* Public */,
+      40,    0,  189,    2, 0x0a /* Public */,
-      41,    0,  195,    2, 0x0a /* Public */,
+      41,    0,  190,    2, 0x0a /* Public */,
-      42,    0,  196,    2, 0x0a /* Public */,
+      42,    0,  191,    2, 0x0a /* Public */,
-      43,    0,  197,    2, 0x0a /* Public */,
+      43,    0,  192,    2, 0x0a /* Public */,
-      44,    1,  198,    2, 0x0a /* Public */,
+      44,    1,  193,    2, 0x0a /* Public */,
-      47,    4,  201,    2, 0x0a /* Public */,
+      47,    4,  196,    2, 0x0a /* Public */,
-      51,    1,  210,    2, 0x0a /* Public */,
+      51,    1,  205,    2, 0x0a /* Public */,
-      54,    0,  213,    2, 0x08 /* Private */,
+      54,    0,  208,    2, 0x08 /* Private */,
-      55,    1,  214,    2, 0x08 /* Private */,
+      55,    1,  209,    2, 0x08 /* Private */,
-      57,    0,  217,    2, 0x08 /* Private */,
+      57,    0,  212,    2, 0x08 /* Private */,
-      58,    1,  218,    2, 0x08 /* Private */,
+      58,    0,  213,    2, 0x08 /* Private */,
-      60,    0,  221,    2, 0x08 /* Private */,
+      59,    0,  214,    2, 0x08 /* Private */,
-      61,    0,  222,    2, 0x08 /* Private */,
+      60,    0,  215,    2, 0x08 /* Private */,
-      62,    0,  223,    2, 0x08 /* Private */,
 
  // signals: parameters
     QMetaType::Void, 0x80000000 | 3, 0x80000000 | 5, 0x80000000 | 7, 0x80000000 | 9, 0x80000000 | 11,    4,    6,    8,   10,   12,
@@ -199,7 +194,6 @@ static const uint qt_meta_data_MainWindow[] = {
     QMetaType::Void,
     QMetaType::Void, QMetaType::QString,   56,
     QMetaType::Void,
-    QMetaType::Void, QMetaType::QString,   59,
     QMetaType::Void,
     QMetaType::Void,
     QMetaType::Void,
@@ -237,10 +231,9 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
         case 20: _t->on_settingsButton_clicked(); break;
         case 21: _t->on_languageComboBox_activated((*reinterpret_cast< const QString(*)>(_a[1]))); break;
         case 22: _t->slotDisableNotify(); break;
-        case 23: _t->on_updateListGuideLabel_linkActivated((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 23: _t->on_exitButton_clicked(); break;
-        case 24: _t->on_exitButton_clicked(); break;
+        case 24: _t->on_offlineStartButton_clicked(); break;
-        case 25: _t->on_offlineStartButton_clicked(); break;
+        case 25: _t->on_unsafeChangingButton_clicked(); break;
-        case 26: _t->on_unsafeChangingButton_clicked(); break;
         default: ;
         }
     } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
@@ -381,13 +374,13 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 27)
+        if (_id < 26)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 27;
+        _id -= 26;
     } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
-        if (_id < 27)
+        if (_id < 26)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 27;
+        _id -= 26;
     }
     return _id;
 }

debug/moc_newversionwidget.cpp

@@ -7,7 +7,7 @@
 *****************************************************************************/
 
 #include <memory>
-#include "../newversionwidget.h"
+#include "../Widgets/newversionwidget.h"
 #include <QtCore/qbytearray.h>
 #include <QtCore/qmetatype.h>
 #if !defined(Q_MOC_OUTPUT_REVISION)

debug/moc_recognizesystem.cpp

@@ -23,8 +23,8 @@ QT_BEGIN_MOC_NAMESPACE
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
 struct qt_meta_stringdata_RecognizeSystem_t {
-    QByteArrayData data[22];
+    QByteArrayData data[23];
-    char stringdata0[321];
+    char stringdata0[343];
 };
 #define QT_MOC_LITERAL(idx, ofs, len) \
     Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -54,7 +54,8 @@ QT_MOC_LITERAL(17, 236, 8), // "waitTime"
 QT_MOC_LITERAL(18, 245, 15), // "sigStartCompare"
 QT_MOC_LITERAL(19, 261, 17), // "sigShowServerList"
 QT_MOC_LITERAL(20, 279, 29), // "QList<StreamingVersionData*>*"
-QT_MOC_LITERAL(21, 309, 11) // "serverDatas"
+QT_MOC_LITERAL(21, 309, 11), // "serverDatas"
+QT_MOC_LITERAL(22, 321, 21) // "sigAnimationActivated"
 
     },
     "RecognizeSystem\0sigUpdateBytesAvailable\0"
@@ -64,7 +65,8 @@ QT_MOC_LITERAL(21, 309, 11) // "serverDatas"
     "sigSaveLoginData\0ServerAuthorization*\0"
     "serverAuth\0sigSocketWaitForReadyRead\0"
     "waitTime\0sigStartCompare\0sigShowServerList\0"
-    "QList<StreamingVersionData*>*\0serverDatas"
+    "QList<StreamingVersionData*>*\0serverDatas\0"
+    "sigAnimationActivated"
 };
 #undef QT_MOC_LITERAL
 
@@ -74,24 +76,25 @@ static const uint qt_meta_data_RecognizeSystem[] = {
        8,       // revision
        0,       // classname
        0,    0, // classinfo
-      10,   14, // methods
+      11,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
        0,    0, // constructors
        0,       // flags
-      10,       // signalCount
+      11,       // signalCount
 
  // signals: name, argc, parameters, tag, flags
-       1,    0,   64,    2, 0x06 /* Public */,
+       1,    0,   69,    2, 0x06 /* Public */,
-       3,    0,   65,    2, 0x06 /* Public */,
+       3,    0,   70,    2, 0x06 /* Public */,
-       4,    4,   66,    2, 0x06 /* Public */,
+       4,    4,   71,    2, 0x06 /* Public */,
-       9,    1,   75,    2, 0x06 /* Public */,
+       9,    1,   80,    2, 0x06 /* Public */,
-      11,    0,   78,    2, 0x06 /* Public */,
+      11,    0,   83,    2, 0x06 /* Public */,
-      12,    0,   79,    2, 0x06 /* Public */,
+      12,    0,   84,    2, 0x06 /* Public */,
-      13,    1,   80,    2, 0x06 /* Public */,
+      13,    1,   85,    2, 0x06 /* Public */,
-      16,    1,   83,    2, 0x06 /* Public */,
+      16,    1,   88,    2, 0x06 /* Public */,
-      18,    0,   86,    2, 0x06 /* Public */,
+      18,    0,   91,    2, 0x06 /* Public */,
-      19,    1,   87,    2, 0x06 /* Public */,
+      19,    1,   92,    2, 0x06 /* Public */,
+      22,    1,   95,    2, 0x06 /* Public */,
 
  // signals: parameters
     QMetaType::Void,
@@ -104,6 +107,7 @@ static const uint qt_meta_data_RecognizeSystem[] = {
     QMetaType::Void, QMetaType::Int,   17,
     QMetaType::Void,
     QMetaType::Void, 0x80000000 | 20,   21,
+    QMetaType::Void, QMetaType::Bool,    5,
 
        0        // eod
 };
@@ -124,6 +128,7 @@ void RecognizeSystem::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int
         case 7: _t->sigSocketWaitForReadyRead((*reinterpret_cast< int(*)>(_a[1]))); break;
         case 8: _t->sigStartCompare(); break;
         case 9: _t->sigShowServerList((*reinterpret_cast< QList<StreamingVersionData*>*(*)>(_a[1]))); break;
+        case 10: _t->sigAnimationActivated((*reinterpret_cast< bool(*)>(_a[1]))); break;
         default: ;
         }
     } else if (_c == QMetaObject::IndexOfMethod) {
@@ -198,6 +203,13 @@ void RecognizeSystem::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int
                 return;
             }
         }
+        {
+            using _t = void (RecognizeSystem::*)(bool );
+            if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&RecognizeSystem::sigAnimationActivated)) {
+                *result = 10;
+                return;
+            }
+        }
     }
 }
 
@@ -230,13 +242,13 @@ int RecognizeSystem::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 10)
+        if (_id < 11)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 10;
+        _id -= 11;
     } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
-        if (_id < 10)
+        if (_id < 11)
             *reinterpret_cast<int*>(_a[0]) = -1;
-        _id -= 10;
+        _id -= 11;
     }
     return _id;
 }
@@ -305,5 +317,12 @@ void RecognizeSystem::sigShowServerList(QList<StreamingVersionData*> * _t1)
     void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) };
     QMetaObject::activate(this, &staticMetaObject, 9, _a);
 }
+
+// SIGNAL 10
+void RecognizeSystem::sigAnimationActivated(bool _t1)
+{
+    void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) };
+    QMetaObject::activate(this, &staticMetaObject, 10, _a);
+}
 QT_WARNING_POP
 QT_END_MOC_NAMESPACE

debug/moc_resourcemanager.cpp

@@ -0,0 +1,95 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'resourcemanager.h'
+**
+** Created by: The Qt Meta Object Compiler version 67 (Qt 5.14.2)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#include <memory>
+#include "../UI/resourcemanager.h"
+#include <QtCore/qbytearray.h>
+#include <QtCore/qmetatype.h>
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'resourcemanager.h' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 67
+#error "This file was generated using the moc from 5.14.2. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+QT_BEGIN_MOC_NAMESPACE
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
+struct qt_meta_stringdata_ResourceManager_t {
+    QByteArrayData data[1];
+    char stringdata0[16];
+};
+#define QT_MOC_LITERAL(idx, ofs, len) \
+    Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
+    qptrdiff(offsetof(qt_meta_stringdata_ResourceManager_t, stringdata0) + ofs \
+        - idx * sizeof(QByteArrayData)) \
+    )
+static const qt_meta_stringdata_ResourceManager_t qt_meta_stringdata_ResourceManager = {
+    {
+QT_MOC_LITERAL(0, 0, 15) // "ResourceManager"
+
+    },
+    "ResourceManager"
+};
+#undef QT_MOC_LITERAL
+
+static const uint qt_meta_data_ResourceManager[] = {
+
+ // content:
+       8,       // revision
+       0,       // classname
+       0,    0, // classinfo
+       0,    0, // methods
+       0,    0, // properties
+       0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       0,       // signalCount
+
+       0        // eod
+};
+
+void ResourceManager::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    Q_UNUSED(_o);
+    Q_UNUSED(_id);
+    Q_UNUSED(_c);
+    Q_UNUSED(_a);
+}
+
+QT_INIT_METAOBJECT const QMetaObject ResourceManager::staticMetaObject = { {
+    QMetaObject::SuperData::link<QObject::staticMetaObject>(),
+    qt_meta_stringdata_ResourceManager.data,
+    qt_meta_data_ResourceManager,
+    qt_static_metacall,
+    nullptr,
+    nullptr
+} };
+
+
+const QMetaObject *ResourceManager::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject;
+}
+
+void *ResourceManager::qt_metacast(const char *_clname)
+{
+    if (!_clname) return nullptr;
+    if (!strcmp(_clname, qt_meta_stringdata_ResourceManager.stringdata0))
+        return static_cast<void*>(this);
+    return QObject::qt_metacast(_clname);
+}
+
+int ResourceManager::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QObject::qt_metacall(_c, _id, _a);
+    return _id;
+}
+QT_WARNING_POP
+QT_END_MOC_NAMESPACE

debug/moc_updatenotifywidget.cpp

@@ -7,7 +7,7 @@
 *****************************************************************************/
 
 #include <memory>
-#include "../updatenotifywidget.h"
+#include "../Widgets/updatenotifywidget.h"
 #include <QtCore/qbytearray.h>
 #include <QtCore/qmetatype.h>
 #if !defined(Q_MOC_OUTPUT_REVISION)
@@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
 struct qt_meta_stringdata_UpdateNotifyWidget_t {
-    QByteArrayData data[6];
+    QByteArrayData data[8];
-    char stringdata0[143];
+    char stringdata0[187];
 };
 #define QT_MOC_LITERAL(idx, ofs, len) \
     Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -37,13 +37,17 @@ QT_MOC_LITERAL(1, 19, 22), // "on_closeButton_clicked"
 QT_MOC_LITERAL(2, 42, 0), // ""
 QT_MOC_LITERAL(3, 43, 29), // "on_loadToServerButton_clicked"
 QT_MOC_LITERAL(4, 73, 28), // "on_undoChangesButton_clicked"
-QT_MOC_LITERAL(5, 102, 40) // "on_startWithCurrentChangesBut..."
+QT_MOC_LITERAL(5, 102, 40), // "on_startWithCurrentChangesBut..."
+QT_MOC_LITERAL(6, 143, 38), // "on_updateActionListLabel_link..."
+QT_MOC_LITERAL(7, 182, 4) // "link"
 
     },
     "UpdateNotifyWidget\0on_closeButton_clicked\0"
     "\0on_loadToServerButton_clicked\0"
     "on_undoChangesButton_clicked\0"
-    "on_startWithCurrentChangesButton_clicked"
+    "on_startWithCurrentChangesButton_clicked\0"
+    "on_updateActionListLabel_linkActivated\0"
+    "link"
 };
 #undef QT_MOC_LITERAL
 
@@ -53,7 +57,7 @@ static const uint qt_meta_data_UpdateNotifyWidget[] = {
        8,       // revision
        0,       // classname
        0,    0, // classinfo
-       4,   14, // methods
+       5,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
        0,    0, // constructors
@@ -61,16 +65,18 @@ static const uint qt_meta_data_UpdateNotifyWidget[] = {
        0,       // signalCount
 
  // slots: name, argc, parameters, tag, flags
-       1,    0,   34,    2, 0x08 /* Private */,
+       1,    0,   39,    2, 0x08 /* Private */,
-       3,    0,   35,    2, 0x08 /* Private */,
+       3,    0,   40,    2, 0x08 /* Private */,
-       4,    0,   36,    2, 0x08 /* Private */,
+       4,    0,   41,    2, 0x08 /* Private */,
-       5,    0,   37,    2, 0x08 /* Private */,
+       5,    0,   42,    2, 0x08 /* Private */,
+       6,    1,   43,    2, 0x08 /* Private */,
 
  // slots: parameters
     QMetaType::Void,
     QMetaType::Void,
     QMetaType::Void,
     QMetaType::Void,
+    QMetaType::Void, QMetaType::QString,    7,
 
        0        // eod
 };
@@ -85,10 +91,10 @@ void UpdateNotifyWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, i
         case 1: _t->on_loadToServerButton_clicked(); break;
         case 2: _t->on_undoChangesButton_clicked(); break;
         case 3: _t->on_startWithCurrentChangesButton_clicked(); break;
+        case 4: _t->on_updateActionListLabel_linkActivated((*reinterpret_cast< const QString(*)>(_a[1]))); break;
         default: ;
         }
     }
-    Q_UNUSED(_a);
 }
 
 QT_INIT_METAOBJECT const QMetaObject UpdateNotifyWidget::staticMetaObject = { {
@@ -120,13 +126,13 @@ int UpdateNotifyWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 4)
+        if (_id < 5)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 4;
+        _id -= 5;
     } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
-        if (_id < 4)
+        if (_id < 5)
             *reinterpret_cast<int*>(_a[0]) = -1;
-        _id -= 4;
+        _id -= 5;
     }
     return _id;
 }

debug/moc_versionselectwidget.cpp

@@ -7,7 +7,7 @@
 *****************************************************************************/
 
 #include <memory>
-#include "../versionselectwidget.h"
+#include "../Widgets/versionselectwidget.h"
 #include <QtCore/qbytearray.h>
 #include <QtCore/qmetatype.h>
 #if !defined(Q_MOC_OUTPUT_REVISION)

debug/qrc_resources.cpp

@@ -10,52 +10,52 @@ static const unsigned char qt_resource_data[] = {
   // D:/QT/Projects/RRJClient/style.css
   0x0,0x0,0x2,0xd4,
   0x0,
-  0x0,0xc,0x69,0x78,0x9c,0xd5,0x56,0xd9,0x6e,0xe2,0x30,0x14,0x7d,0x47,0xe2,0x1f,
+  0x0,0xc,0x68,0x78,0x9c,0xd5,0x56,0x6b,0x6f,0xda,0x30,0x14,0xfd,0x8e,0xc4,0x7f,
-  0xac,0xa2,0x91,0x5a,0x9,0xda,0x24,0x94,0x96,0x49,0xdf,0x68,0x67,0x55,0xa9,0xa6,
+  0xb0,0x8a,0x26,0xb5,0x12,0xb4,0x49,0x28,0x2d,0xcb,0xbe,0xd1,0xee,0xd1,0xa9,0x54,
-  0x6a,0xa7,0x7d,0x1c,0x39,0xf1,0x6d,0x62,0x61,0x6c,0x64,0x3b,0xa2,0x68,0x34,0xff,
+  0xab,0xda,0xb5,0x1f,0x27,0x27,0xbe,0x4d,0x2c,0x8c,0x8d,0x6c,0x47,0x14,0x4d,0xfb,
-  0x3e,0x26,0x1b,0xd9,0x80,0x74,0xd1,0x48,0x43,0x10,0x4b,0xec,0x9c,0x7b,0xee,0x76,
+  0xef,0x33,0x79,0x91,0x17,0x90,0x3e,0x34,0x69,0x4,0xf1,0x88,0x9d,0x73,0x8f,0x7d,
-  0xae,0xbb,0x9d,0xdb,0x29,0xa6,0xfc,0x91,0x72,0x22,0x96,0xdd,0xce,0xef,0x6e,0x7,
+  0xcf,0x3d,0xd7,0xdd,0xce,0xed,0x14,0x53,0xfe,0x48,0x39,0x11,0xcb,0x6e,0xe7,0x77,
-  0x99,0x97,0x87,0xfd,0x59,0x20,0x45,0xc4,0xc9,0x80,0xce,0x71,0x0,0x2e,0x8a,0x24,
+  0xb7,0x83,0xcc,0xcb,0xc3,0xfe,0x2c,0x90,0x22,0xe2,0x64,0x40,0xe7,0x38,0x0,0x17,
-  0x3b,0x74,0x4f,0x24,0x28,0x11,0x49,0x1f,0x4e,0xee,0xee,0xbe,0xff,0xda,0x6c,0xba,
+  0x45,0x92,0x1d,0xba,0x27,0x12,0x94,0x88,0xa4,0xf,0x27,0x77,0x77,0xdf,0x7f,0x6d,
-  0xc2,0x72,0x76,0x37,0x3d,0x5e,0xf0,0xe0,0xe8,0xa2,0x6,0xb0,0x10,0x8a,0x6a,0x2a,
+  0x26,0x5d,0x62,0x39,0xbb,0x9b,0x1e,0x2f,0x78,0x70,0xf4,0xa9,0x6,0xb0,0x10,0x8a,
-  0xb8,0x8b,0x7c,0xe0,0x1a,0xa4,0xd9,0xf1,0xa7,0xdb,0xe9,0x76,0x6e,0x3f,0x4b,0x3c,
+  0x6a,0x2a,0xb8,0x8b,0x7c,0xe0,0x1a,0xa4,0x99,0xf1,0xa7,0xdb,0xe9,0x76,0x6e,0xbf,
-  0x87,0xde,0x66,0xe7,0xcf,0x5,0xc1,0x1a,0xfe,0x2d,0x87,0x6b,0xaa,0xf4,0x23,0x25,
+  0x48,0x3c,0x87,0xde,0x66,0xe6,0xcf,0x5,0xc1,0x1a,0xfe,0x2d,0x87,0x6b,0xaa,0xf4,
-  0x1,0xe8,0x5e,0x14,0x9b,0xdf,0xdc,0x68,0x22,0xe2,0xb,0x26,0xa4,0x8b,0x64,0xe0,
+  0x23,0x25,0x1,0xe8,0x5e,0x14,0x87,0xdf,0xdc,0x68,0x22,0xe2,0xb,0x26,0xa4,0x8b,
-  0xe1,0xc3,0xb1,0xdd,0x4f,0xde,0xf6,0xd8,0xca,0x4c,0x26,0xeb,0xcb,0x90,0x6a,0xa8,
+  0x64,0xe0,0xe1,0xc3,0xb1,0xdd,0x4f,0xde,0xf6,0xd8,0xca,0x42,0x26,0xe3,0xcb,0x90,
-  0xb8,0x79,0x3,0xcb,0x7,0x90,0x93,0x1c,0x2a,0x43,0xaf,0x81,0xc7,0xd8,0x56,0x7f,
+  0x6a,0xa8,0x2c,0xf3,0x6,0x96,0xf,0x20,0x27,0x39,0x54,0x86,0x5e,0x3,0x8f,0xb1,
-  0x7d,0x7d,0xb4,0x3e,0x1c,0x5d,0xe4,0x38,0x97,0x62,0xee,0x89,0x89,0x78,0xde,0xcd,
+  0xad,0xfe,0xfa,0xfa,0x68,0x7d,0x38,0xca,0x61,0x2e,0xc4,0xdc,0x13,0x13,0xf1,0xbc,
-  0xeb,0xd0,0xb1,0x86,0x7d,0xc7,0x19,0xf7,0x9d,0xd1,0x28,0xf,0x84,0x90,0x4,0xe4,
+  0x9b,0xd6,0xa1,0x63,0xd,0xfb,0x8e,0x33,0xee,0x3b,0xa3,0x51,0xbe,0xf,0x42,0x12,
-  0x40,0xe9,0x15,0x33,0x51,0x14,0x91,0x56,0xa0,0xcb,0x4b,0x12,0x13,0x1a,0x29,0x17,
+  0x90,0x3,0xa5,0x57,0xcc,0x6c,0xa2,0x88,0xb4,0x2,0x5d,0x1e,0x92,0x98,0xd0,0x48,
-  0xd,0x17,0xcf,0xe9,0xc2,0x93,0xe0,0x7a,0xf0,0x84,0xe7,0x94,0xad,0x5c,0x74,0x70,
+  0xb9,0x68,0xb8,0x78,0x4e,0x7,0x9e,0x4,0xd7,0x83,0x27,0x3c,0xa7,0x6c,0xe5,0xa2,
-  0x89,0x19,0xf5,0x24,0x3d,0x28,0x2c,0xba,0xc8,0x3e,0xcb,0x77,0x17,0xec,0x9f,0x8e,
+  0x83,0xb,0xcc,0xa8,0x27,0xe9,0x41,0x61,0xd0,0x45,0xf6,0x59,0x3e,0xbb,0x10,0xff,
-  0xfa,0xe3,0xd3,0xbe,0x3d,0x8c,0x63,0x92,0x30,0xff,0x11,0xa9,0x70,0x12,0x69,0x2d,
+  0x74,0xd4,0x1f,0x9f,0xf6,0xed,0xa1,0xb5,0x61,0xfe,0x23,0x52,0xe1,0x24,0xd2,0x5a,
-  0xf8,0xff,0xcc,0xdd,0x25,0x54,0x61,0x8f,0x1,0xd9,0xe1,0x4,0xa3,0x41,0xa8,0xbf,
+  0xf0,0xff,0x99,0xbb,0x4b,0xa8,0xc2,0x1e,0x3,0xb2,0x63,0x11,0x8c,0x6,0xa1,0xfe,
-  0x48,0xbc,0x2a,0x63,0x7,0xe6,0x4e,0x6,0x38,0x5,0xa5,0x4c,0x35,0xef,0x4e,0x64,
+  0x2a,0xf1,0xaa,0x8c,0x1d,0x98,0x3b,0x19,0xe0,0x14,0x94,0x32,0x62,0xde,0x9d,0xc8,
-  0xb9,0x82,0x36,0x8f,0xa0,0xdb,0x6b,0xec,0x1,0xcb,0x9f,0x6c,0xe1,0xa9,0x63,0x55,
+  0xb2,0x80,0x36,0x8f,0xa0,0xdb,0x6b,0xec,0x1,0xcb,0x9f,0x6c,0xb1,0x52,0xc7,0xaa,
-  0x3d,0xf5,0x98,0xb1,0xd7,0x8,0xde,0x94,0xa8,0x72,0x90,0x9d,0x1c,0x6c,0x81,0x9,
+  0xae,0xd4,0x63,0x26,0x5e,0x23,0x78,0x53,0xa2,0xca,0x9b,0xec,0xe4,0x60,0xb,0x4c,
-  0xa1,0x3c,0x70,0x91,0x75,0xec,0xc0,0x3c,0xff,0x1c,0x66,0xbf,0xd3,0x6d,0x73,0xca,
+  0x8,0xe5,0x81,0x8b,0xac,0x63,0x7,0xe6,0xf9,0xe7,0x30,0xfb,0x9d,0x4e,0x9b,0x53,
-  0x7,0x4b,0x4a,0x74,0xe8,0xa2,0xf3,0x84,0x49,0xd6,0x78,0x1c,0x3e,0x11,0xaa,0xab,
+  0x3e,0x58,0x52,0xa2,0x43,0x17,0x9d,0x27,0x4c,0xb2,0xba,0xe3,0xf0,0x99,0x50,0x5d,
-  0x86,0x5a,0x27,0x3a,0x4d,0x8f,0x14,0x81,0x11,0x4,0x35,0xc1,0xb2,0x82,0x14,0x73,
+  0xd,0xd4,0x3a,0xd1,0x69,0x7a,0xa4,0x8,0x8c,0x1f,0xa8,0x9,0x96,0x15,0xa4,0x98,
-  0x45,0x4a,0x30,0x4a,0xea,0xb9,0x6d,0x40,0x1d,0x6d,0xb,0x53,0xdb,0x8a,0x32,0x0,
+  0x2b,0x52,0x82,0x51,0x52,0xcf,0x6d,0x3,0xea,0x68,0xdb,0x36,0xb5,0x55,0x94,0x1,
-  0x6,0x93,0x91,0xf4,0xae,0x86,0x67,0x3d,0x30,0x1b,0x83,0x9a,0xe8,0x94,0x69,0xbb,
+  0x30,0x98,0x8c,0xa4,0x77,0x35,0x3c,0xeb,0x81,0x99,0x18,0xd4,0x3c,0xa7,0x4c,0xdb,
-  0xae,0x1f,0x46,0x7c,0xb6,0x2d,0xe0,0x1b,0x5a,0xad,0x5a,0x26,0x95,0x8a,0x10,0xfc,
+  0x75,0xfd,0x30,0xe2,0xb3,0x6d,0x1b,0xbe,0xa1,0xd5,0xaa,0x64,0x52,0xab,0x8,0xc1,
-  0x59,0xb1,0xc2,0x8a,0xfc,0xb7,0xd0,0x1f,0x57,0xfd,0x2f,0xd7,0x60,0x2a,0x92,0xd4,
+  0x9f,0x15,0x15,0x56,0xe4,0xbf,0x85,0xfe,0xb8,0xba,0xfe,0xb2,0x6,0x53,0x8f,0xa4,
-  0x17,0xbc,0x2a,0x8f,0x9,0xe1,0x66,0x8d,0xfe,0x66,0xf6,0xab,0x93,0x5,0xc3,0x1c,
+  0xbe,0xe0,0x55,0x77,0x4c,0x8,0x37,0x5b,0xf4,0x95,0x99,0xaf,0x4e,0x16,0xc,0x73,
-  0x62,0x69,0x46,0x56,0x7a,0x29,0x2d,0x41,0xfb,0x61,0xf6,0x9d,0x15,0xd5,0x56,0x9d,
+  0x88,0x9d,0x19,0x59,0xe9,0xa5,0xb4,0x4,0xed,0x87,0xd9,0x77,0x26,0xaa,0xad,0x36,
-  0x7e,0x7b,0xd9,0x97,0xfd,0xb9,0x37,0xe9,0x59,0xd7,0x5f,0x8f,0x72,0x66,0x4a,0x71,
+  0xfd,0x76,0xd9,0x97,0xd7,0x73,0x6f,0xd2,0xb3,0xd6,0x5f,0x8f,0x72,0x66,0xa4,0xb8,
-  0xfd,0xf7,0xa,0xbc,0x28,0xd8,0xa7,0xfa,0x89,0x32,0xe7,0x45,0xd4,0xa6,0x30,0xda,
+  0xfe,0x7b,0x9,0x5e,0x14,0xec,0x33,0xfd,0xc4,0x98,0x73,0x11,0xb5,0x11,0x46,0xbb,
-  0x45,0x36,0x4,0x6c,0xc2,0xb8,0x6f,0xf4,0x6c,0x4d,0x79,0x69,0x88,0xb5,0x1b,0x60,
+  0x9d,0xd,0x1,0x9b,0x6d,0xdc,0xd7,0x79,0xb6,0xa6,0xbc,0xd4,0xc3,0xda,0xf5,0xaf,
-  0x5,0x9c,0xd7,0x29,0xae,0x5d,0x6c,0xe8,0xc4,0x26,0x7a,0x3d,0x3,0xab,0xda,0x99,
+  0x2,0xce,0xeb,0x1c,0xd7,0x2e,0x16,0x74,0x12,0x13,0xbd,0x9e,0x81,0x55,0xad,0xcc,
-  0xef,0xc1,0xe0,0x5d,0x4,0xb3,0x79,0x34,0x4c,0x57,0xe6,0xd0,0xf4,0x35,0xce,0x5a,
+  0xf7,0x60,0xf0,0x2e,0x86,0xd9,0xdc,0x1a,0xa6,0x2b,0x73,0x66,0xfa,0x16,0x67,0x2d,
-  0x9a,0xbc,0x17,0x9b,0xaa,0x97,0xc6,0x96,0x29,0x14,0x23,0xf7,0x4c,0x17,0x5,0x91,
+  0x4d,0xde,0x8b,0x43,0xd5,0xa5,0xb1,0xa5,0xb,0xc5,0xc8,0x3d,0x53,0x45,0x41,0x64,
-  0xe9,0xb2,0x7b,0xaa,0x19,0xb4,0xb3,0xd3,0x58,0x71,0x9,0xda,0x8d,0xd0,0xf4,0x89,
+  0xaa,0xec,0x9e,0x6a,0x6,0xed,0xe2,0x34,0x2a,0x2e,0x41,0xbb,0x11,0x9a,0x3e,0x51,
-  0xfa,0x78,0xdd,0x6f,0x2f,0x60,0xde,0x84,0xb8,0xee,0x27,0x21,0x58,0x32,0x3a,0x7a,
+  0x1f,0xaf,0xeb,0xed,0x5,0xcc,0x9b,0x10,0xd7,0xf5,0x24,0x4,0x4b,0x5a,0x47,0xcf,
-  0x66,0x4e,0x9a,0x86,0x5f,0x3d,0x50,0x58,0xd6,0x34,0xf9,0xf4,0x4d,0x9a,0xdc,0xfc,
+  0xf4,0x49,0x53,0xf0,0xab,0x7,0xa,0xcb,0x9a,0x27,0x9f,0xbe,0xc9,0x93,0x9b,0x9f,
-  0xcc,0x9e,0xe9,0xd9,0xcc,0xcc,0xa8,0xae,0xd1,0xc8,0x9d,0xc3,0x7c,0x6d,0xcd,0x1e,
+  0xd9,0xd3,0x3d,0x9b,0x99,0x19,0xd7,0x35,0x1e,0xb9,0xb3,0x99,0xaf,0xa3,0xd9,0x23,
-  0x99,0xf3,0xdd,0xf9,0x99,0xa9,0x4e,0xfb,0x68,0xaf,0xb7,0x6d,0x4e,0x8,0xd,0xa0,
+  0x73,0xbc,0x3b,0x3f,0x33,0xea,0xb4,0x8f,0xf6,0xae,0xb6,0xcd,0x9,0xa1,0x1,0x74,
-  0x3b,0xfc,0xab,0x9f,0x42,0x7a,0x29,0xef,0x38,0x63,0x6d,0xe,0x55,0x25,0xc9,0xaa,
+  0xc7,0xfa,0xea,0xa7,0x90,0x5e,0xca,0x3b,0xce,0x58,0x9b,0x43,0x55,0xc9,0xb2,0x6a,
-  0xa1,0x19,0xed,0x9b,0xbd,0x18,0xa5,0x65,0x8d,0x78,0x2c,0x2a,0x54,0xc8,0x5f,0x90,
+  0x68,0xc6,0xfb,0x66,0x2f,0x46,0x69,0xa9,0x11,0x8f,0x45,0x5,0x85,0xfc,0x5,0x8f,
-  0x99,0x9c,0x9f,
+  0x9b,0x9c,0x64,
     // D:/QT/Projects/RRJClient/resource/SSJ_backgroundDark.png
   0x0,0x22,0x2a,0x2f,
   0x89,
@@ -328140,7 +328140,7 @@ static const unsigned char qt_resource_struct[] = {
 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
   // :/style.css
   0x0,0x0,0x0,0x16,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,
-0x0,0x0,0x1,0x93,0xf9,0x25,0xe1,0x94,
+0x0,0x0,0x1,0x94,0x8,0x1a,0xbc,0x65,
   // :/resource
   0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x6,0x0,0x0,0x0,0x3,
 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,

main.cpp

@@ -1,5 +1,4 @@
 #include "mainwindow.h"
-#include "updatenotifywidget.h"
 
 #include <QApplication>
 #include <QFontDatabase>

mainwindow.cpp

@@ -1,6 +1,5 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
-#include "updatenotifywidget.h"
 
 #include <QFontDatabase>
 #include <QMessageBox>
@@ -8,6 +7,7 @@
 #include <QPaintEvent>
 #include <QPainter>
 #include <QTimer>
+#include <Widgets/updatenotifywidget.h>
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
@@ -16,42 +16,31 @@ MainWindow::MainWindow(QWidget *parent)
     ui->setupUi(this);
     isRecovery = false;
     setWindowFlag(Qt::FramelessWindowHint);
-    painting();
 }
 
 void MainWindow::initialize()
 {
     createObjects();
     loadStaticData();
+    bindConnection();
 
     updateWidget->initialize(this,versionContainer);
     entryWidget->initialize(this);
     versionSelectWidget->initialize(sendSystem,versionContainer);
     hashComparer->initialize(this,versionContainer);
     updateController->initialize(this,versionContainer);
-
+    sendSystem->initialize(this,dataParser);
+    dataParser->initialize(recognizeSystem);
+    recognizeSystem->initialize(updateController,dataParser,this,hashComparer,client,versionContainer);
+    resourceManager->painting();
     commonButtonGroupWidget->initialize(this,externalExecuter,sendSystem,client);
     commonButtonGroupWidget->show();
 
-    ui->notificationLabel->hide();
+    setUpUi();
-    ui->unsafeChangingButton->hide();
-
-    ui->offlineStartButton->show();
-    ui->offlineStartButton->setEnabled(false);
-    ui->offlineStartButton->setGeometry(540,549,250,40);
-
-    ui->displayGroupWidget->show();
-    ui->autostartCheckBox->hide();
-    bindConnection();
-
-    sendSystem->initialize(this,dataParser);
-    dataParser->initialize(recognizeSystem);
 
 
     emit sigCalculateHash();
     emit sigInitializeClient(this,recognizeSystem,externalExecuter,sendSystem,workerThread);
-    recognizeSystem->initialize(updateController,dataParser,this,hashComparer,client,versionContainer);
-    //emit sigRecognize(updateController,dataParser,this,hashComparer,client);
 
     screenChecker->check();
 
@@ -59,7 +48,7 @@ void MainWindow::initialize()
 
     checkAppAvailable();
 
-    //test
+    //post
 
 
 }
@@ -73,7 +62,6 @@ void MainWindow::createObjects()
     versionSelectWidget = new VersionSelectWidget;
 
     ui->changButtonGroup->addWidget(commonButtonGroupWidget);
-
     ui->interactiveGroup->addWidget(entryWidget);
     ui->interactiveGroup->addWidget(versionSelectWidget);
 
@@ -102,10 +90,19 @@ void MainWindow::createObjects()
     hashComparer->moveToThread(workerThread);
 
     versionContainer = new VersionContainer;
+    resourceManager = new ResourceManager;
 
     workerThread->start();
     workerThread->setPriority(QThread::HighestPriority);
 
+    QVBoxLayout *layout = new QVBoxLayout();
+    layout->setParent(this);
+
+    movieLabel = new QLabel("MovieLabel");
+    layout->addWidget(movieLabel);
+    setLayout(layout);
+    movieLabel->setStyleSheet("background-color:rgba(0,0,0,90)");
+
     timer = new QTimer;
 }
 
@@ -118,7 +115,6 @@ void MainWindow::bindConnection()
     connect(this,&MainWindow::sigSetConnect,client,&TCPClient::setConnect,Qt::AutoConnection);
     connect(this,&MainWindow::sigSendCommand,client,&TCPClient::slotSendCommand,Qt::AutoConnection);
     connect(this,&MainWindow::sigSendXMLAnswer,sendSystem,&SendSystem::xmlAnswer,Qt::AutoConnection);
-    //connect(this,&MainWindow::sigRecognize,recognizeSystem,&RecognizeSystem::initialize,Qt::AutoConnection);
 
     connect(this,&MainWindow::sigGetConnected,client,&TCPClient::getIsConnected);
     connect(this,&MainWindow::sigCalculateHash,updateController,&UpdateController::calculateCommonHash);
@@ -174,7 +170,7 @@ void MainWindow::setNeedUpdate(bool flag,quint64 size, quint64 fileCount,quint64
         ui->inlineTextDebug->setText(result);
         commonButtonGroupWidget->needUpdateState(flag);
         ui->autostartCheckBox->show();
-        stopLoadingMovie();
+        activateLoadingAnimation(false);
     }
     else
     {
@@ -185,14 +181,14 @@ void MainWindow::setNeedUpdate(bool flag,quint64 size, quint64 fileCount,quint64
         ui->offlineStartButton->setEnabled(true);
         dataParser->changeVersion(versionContainer->getServerVersion());
         setTitle();
-        stopLoadingMovie();
+        activateLoadingAnimation(false);
     }
 }
 
 void MainWindow::showServerListWidget(QList<StreamingVersionData *> *serverData)
 {
     entryWidget->hide();
-    stopLoadingMovie();
+    activateLoadingAnimation(false);
     versionSelectWidget->fillView(serverData);
     checkUpdate();
 }
@@ -234,7 +230,7 @@ void MainWindow::checkLoginResult(ServerAuthorization *serverAuth)
         ui->LanguageWidget->hide();
         ui->settingsButton->hide();
         ui->offlineStartButton->show();
-        startLoadingAnim();
+        activateLoadingAnimation(true);
     }
     else
     {
@@ -327,7 +323,7 @@ void MainWindow::slotConnectionState(bool flag)
     ui->notificationLabel->show();
     QPalette palette = ui->notificationLabel->palette();
 
-    stopLoadingMovie();
+    activateLoadingAnimation(false);
 
     if(flag)
     {
@@ -390,14 +386,14 @@ void MainWindow::login()
 
 void MainWindow::saveServerSettingsWithConnect()
 {
-    startLoadingAnim();
+    activateLoadingAnimation(true);
     entryWidget->settingsWidgetIsActive(false);
 
     if(client->getIsConnected())
     {
         entryWidget->loginIsActive(true);
         ui->offlineStartButton->show();
-        stopLoadingMovie();
+        activateLoadingAnimation(false);
         return;
     }
     //TODO: не заполняется 2 поля (автостарт и язык)
@@ -441,7 +437,7 @@ void MainWindow::undoCurrentChanges()
     ui->offlineStartButton->setEnabled(false);
     updateWidget->hide();
 
-    startLoadingAnim();
+    activateLoadingAnimation(true);
 
     //delay
 
@@ -449,18 +445,13 @@ void MainWindow::undoCurrentChanges()
     while (QTime::currentTime() < dieTime)
         QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
 
-    startLoadingAnim();
+     activateLoadingAnimation(true);
 
     emit sigSendCommand("update");
     commonButtonGroupWidget->startUpdateState();
 
     isRecovery = false;
-    stopLoadingMovie();
+     activateLoadingAnimation(false);
-}
-
-void MainWindow::on_updateListGuideLabel_linkActivated(const QString &)
-{
-    updateWidget->show();
 }
 
 void MainWindow::on_offlineStartButton_clicked()
@@ -491,7 +482,7 @@ void MainWindow::checkUpdate()
 
 void MainWindow::showUpdateInfo()
 {
-    stopLoadingMovie();
+    activateLoadingAnimation(false);
     updateWidget->showWithFill();
     ui->unsafeChangingButton->show();
     entryWidget->hide();
@@ -505,13 +496,13 @@ void MainWindow::showUpdateInfo()
 void MainWindow::showCompleteDialogBox()
 {
     ui->inlineTextDebug->setText(tr("Загрузка завершена"));
-    startLoadingAnim();
+    activateLoadingAnimation(true);
 
     QTime dieTime= QTime::currentTime().addSecs(10);        //DELAY ДЛЯ ПЕРЕСЧЕТА ХЭША НА СЕРВЕРЕ
     while (QTime::currentTime() < dieTime)
         QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
 
-    stopLoadingMovie();
+    activateLoadingAnimation(false);
     checkUpdate();
 }
 
@@ -526,6 +517,35 @@ void MainWindow::setCurrentVersionName(StreamingVersionData *version)
     versionContainer->setLocalVersionData(version);
 }
 
+void MainWindow::setUpUi()
+{
+    ui->notificationLabel->hide();
+    ui->unsafeChangingButton->hide();
+
+    ui->offlineStartButton->show();
+    ui->offlineStartButton->setEnabled(false);
+    ui->offlineStartButton->setGeometry(540,549,250,40);
+
+    ui->settingsButton->setIcon(*resourceManager->getSettingsIcon());
+
+    QSize cautionIconSize(30,30);
+    ui->unsafeChangingButton->setIcon(*resourceManager->getUnsavedIcon());
+    ui->unsafeChangingButton->setIconSize(cautionIconSize);
+
+    movieLabel->setGeometry(367,300,70,70);
+    movieLabel->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
+    movieLabel->setMovie(resourceManager->getMovie());
+
+    QSize iconSize(30,30);
+    ui->exitButton->setIcon(*resourceManager->getCloseIcon());
+    ui->exitButton->setIconSize(iconSize);
+
+    ui->displayGroupWidget->show();
+    ui->autostartCheckBox->hide();
+
+    activateLoadingAnimation(true);
+}
+
 void MainWindow::keyPressEvent(QKeyEvent *event)
 {
     if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return)
@@ -535,77 +555,18 @@ void MainWindow::keyPressEvent(QKeyEvent *event)
     }
 }
 
-void MainWindow::painting()
+void MainWindow::activateLoadingAnimation(bool flag)
 {
-    QFontDatabase::addApplicationFont(":/resource/Fonts/Kanit Cyrillic.ttf");
+    if (flag)
-    QFontDatabase::addApplicationFont(":/resource/Fonts/HelveticaNeue-Medium.ttf");
+    {
-
+        movieLabel->show();
-    //settings
+        resourceManager->startLoadingAnim();
-    QPixmap settingIcon(":resource/Icons/settingWhite.png");
+    }
-    QPainter painter;
+    else
-    QColor color(45,84,130);
+    {
-
+        movieLabel->hide();
-    painter.begin(&settingIcon);
+        resourceManager->stopLoadingMovie();
-    painter.setCompositionMode(QPainter::CompositionMode_SourceIn);
+    }
-    painter.fillRect(settingIcon.rect(),color);
-    painter.end();
-
-    QIcon icon;
-    icon.addPixmap(settingIcon,QIcon::Normal,QIcon::Off);
-
-    ui->settingsButton->setIcon(icon);
-
-    //caution
-    QPixmap cautionIcon(":resource/Icons/caution.png");
-
-    painter.begin(&cautionIcon);
-    painter.setCompositionMode(QPainter::CompositionMode_SourceIn);
-    painter.fillRect(cautionIcon.rect(),color);
-    painter.end();
-
-    icon.addPixmap(cautionIcon,QIcon::Normal,QIcon::Off);
-
-    QSize cautionIconSize(30,30);
-    ui->unsafeChangingButton->setIcon(icon);
-    ui->unsafeChangingButton->setIconSize(cautionIconSize);
-
-    //exit
-    QPixmap crossPixmap(":resource/Icons/crossInCircle.png");
-    QPainter painterCross;
-    QSize iconSize(30,30);
-
-    painter.begin(&crossPixmap);
-    painter.setCompositionMode(QPainter::CompositionMode_SourceIn);
-    painter.fillRect(crossPixmap.rect(),color);
-    painter.end();
-
-    QIcon crossIcon;
-    crossIcon.addPixmap(crossPixmap,QIcon::Normal,QIcon::Off);
-
-    ui->exitButton->setIcon(crossIcon);
-    ui->exitButton->setIconSize(iconSize);
-
-    //loading
-
-    movie = new QMovie(":/resource/Icons/762.gif");
-    movieLabel = new QLabel("No movie");
-    movieLabel->setParent(this);
-    movieLabel->setGeometry(367,300,70,70);
-    movieLabel->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
-    movieLabel->setMovie(movie);
-    startLoadingAnim();
-}
-
-void MainWindow::startLoadingAnim()
-{
-    movie->start();
-    movieLabel->show();
-}
-
-void MainWindow::stopLoadingMovie()
-{
-    movie->stop();
-    movieLabel->hide();
 }
 
 MainWindow::~MainWindow()

mainwindow.h

@@ -12,13 +12,14 @@
 #include <Core/sendsystem.h>
 #include <Core/hashcomparer.h>
 #include <Core/versioncontainer.h>
-#include "Datas.h"
+#include <Data/Datas.h>
-#include "commonbuttongroupwidget.h"
+#include <Widgets/commonbuttongroupwidget.h>
-#include "entrywidget.h"
+#include <Widgets/entrywidget.h>
-#include "instructorbuttongroupwidget.h"
+#include <Widgets/instructorbuttongroupwidget.h>
+#include <Widgets/updatenotifywidget.h>
+#include <Widgets/versionselectwidget.h>
+#include <UI/resourcemanager.h>
 #include "mywinheader.h"
-#include "updatenotifywidget.h"
-#include "versionselectwidget.h"
 
 QT_BEGIN_NAMESPACE
 namespace Ui { class MainWindow; }
@@ -55,13 +56,14 @@ public:
     void startUnityClient();
     void setCurrentVersionName(StreamingVersionData *version);
     void disableUnsaveButton(bool flag);
+    void activateLoadingAnimation(bool flag);
 
 signals:
     void sigInitializeClient(MainWindow* mainWindow,
                              RecognizeSystem *recognizeSystem,
-                            ExternalExecuter *externalExecuter,
+                             ExternalExecuter *externalExecuter,
-                            SendSystem *sendSystem,
+                             SendSystem *sendSystem,
-                            QThread *thread);
+                             QThread *thread);
     void sigRecognize(UpdateController* updateController,
                       DataParser* dataParser,
                       MainWindow* mainWindow,
@@ -95,11 +97,8 @@ private slots:
     void on_settingsButton_clicked();
     void on_languageComboBox_activated(const QString &arg1);
     void slotDisableNotify();
-    void on_updateListGuideLabel_linkActivated(const QString &link);
     void on_exitButton_clicked();
     void on_offlineStartButton_clicked();
-
-
     void on_unsafeChangingButton_clicked();
 
 private:
@@ -120,10 +119,10 @@ private:
     SendSystem *sendSystem;
     HashComparer *hashComparer;
     VersionContainer *versionContainer;
+    ResourceManager *resourceManager;
     QThread *workerThread;
     QThread *animationThread;
     QTimer *timer;
-    QMovie *movie;
     QLabel *movieLabel;
     QList<FileData> *updateList;
 
@@ -131,18 +130,15 @@ private:
     int filesLoaded;
     bool isRecovery;
 
-
-    void painting();
     void checkAppAvailable();
     void checkLanguage(QString language);
     void autoStart();
     void loadStaticData();
     void bindClient();
     void createObjects();
-    void startLoadingAnim();
-    void stopLoadingMovie();
     void showConnectionEmpty();
     void setTitle();
+    void setUpUi();
 
 protected:
     virtual void keyPressEvent(QKeyEvent *event);

mainwindow.ui

@@ -514,7 +514,7 @@
      <rect>
       <x>740</x>
       <y>50</y>
-      <width>50</width>
+      <width>88</width>
       <height>42</height>
      </rect>
     </property>

object_script.RRJClient.Debug

@@ -8,6 +8,7 @@ debug/screenchecker.o
 debug/tcpclient.o
 debug/tools.o
 debug/hashcomparer.o
+debug/resourcemanager.o
 debug/commonbuttongroupwidget.o
 debug/entrywidget.o
 debug/instructorbuttongroupwidget.o
@@ -27,6 +28,7 @@ debug/moc_recognizesystem.o
 debug/moc_screenchecker.o
 debug/moc_tcpclient.o
 debug/moc_hashcomparer.o
+debug/moc_resourcemanager.o
 debug/moc_commonbuttongroupwidget.o
 debug/moc_entrywidget.o
 debug/moc_instructorbuttongroupwidget.o