fix: instructor update

.gitignore

@@ -60,3 +60,5 @@ debug/
 release/
 saves/
 build/
+
+BUILDS/

Core/UpdateController.cpp

@@ -124,8 +124,8 @@ QList<FileData> UpdateController::calculateHash(const QString& path,const QStrin
     return *hashes;
 }
 
-void UpdateController::updateFilesOnServer(QList<FileData> *fileSendList){
+void UpdateController::updateFilesOnServer(QList<FileData> *fileSendList)
-
+{
     QListIterator<FileData> serverIterator(*fileSendList);
     try {
 

Core/dataparser.cpp

@@ -189,13 +189,10 @@ bool DataParser::xmlParser(const QByteArray& array)
                 if (name == "AccessType")
                 {
                     serverAuth->AccessType = value;
-                    postProcessSystem->checkAccessType(value);
-                    //recognizeSystem->checkAccessType(value);
                 }
             }
 
             postProcessSystem->saveLoginData(serverAuth);
-            //emit recognizeSystem->sigSaveLoginData(serverAuth);
         }
 
         if(xmlReader.name() == "VersionData")
@@ -259,6 +256,7 @@ bool DataParser::xmlParser(const QByteArray& array)
 
                 xmlReader.readNext();
             }
+            emit postProcessSystem->sigCallUpdateList();
         }
 
         xmlReader.readNext();

Core/dataparseroutput.cpp

@@ -93,6 +93,7 @@ void DataParserOutput::createFileDataList(const QList<FileData>& fileDataList,co
 
         xmlWriter.writeAttribute("Path",data.path);
         xmlWriter.writeAttribute("Hash",data.hash);
+        xmlWriter.writeAttribute("LastUpdate",data.lastUpdate);
 
         xmlWriter.writeEndElement();
     }
@@ -333,6 +334,8 @@ QList<FileData>* DataParserOutput::xmlFileDataParse(const QByteArray& array,cons
                         data.path = value;
                     else if(name == "Hash")
                         data.hash = value;
+                    else if(name == "LastUpdate")
+                        data.lastUpdate = value;
                 }
 
                 if(data.path.contains(filter))

Core/externalexecuter.cpp

@@ -3,8 +3,8 @@
 void ExternalExecuter::callApp()
 {
     QProcess *myProcess = new QProcess(this);
-    QStringList args;
+    QStringList args = QCoreApplication::arguments();
-    args << "1";
+    args.removeFirst();
 
     myProcess->start(programPath,args);
     myProcess->waitForStarted();
@@ -21,10 +21,11 @@ bool ExternalExecuter::findApp()
 
         if(iterator.fileInfo().fileName() == applicationEXEName){
             programPath = iterator.fileInfo().absoluteFilePath();
+            isAvailable = true;
             return true;
         }
     }
-
+    isAvailable = false;
     return false;
 }
 
@@ -37,3 +38,8 @@ void ExternalExecuter::setIsAutoStart(bool value)
 {
     isAutoStart = value;
 }
+
+bool ExternalExecuter::getIsAvailable() const
+{
+    return isAvailable;
+}

Core/externalexecuter.h

@@ -23,9 +23,12 @@ public:
     bool getIsAutoStart() const;
     void setIsAutoStart(bool value);
 
+    bool getIsAvailable() const;
+
 private:
     QString programPath;
     bool isAutoStart;
+    bool isAvailable;
 };
 
 #endif // EXTERNALEXECUTER_H

Core/fasthashcalculator.cpp

@@ -61,6 +61,7 @@ void FastHashCalculator::calculateHashes(const QString& path, const QString& ign
 
     QtConcurrent::map(files, [this](const QString &filePath)
     {
+        QFileInfo fileInfo(filePath);
         QByteArray hash = calculateFileHashOptimized(filePath);
         QMutexLocker locker(&_mutex);
         FileData currentFile;
@@ -68,7 +69,7 @@ void FastHashCalculator::calculateHashes(const QString& path, const QString& ign
 
         currentFile.path = Tools::createLocalPath(filePath);
         currentFile.hash = hash.toHex();
-
+        currentFile.lastUpdate = fileInfo.fileTime(QFileDevice::FileModificationTime).toString("dd.MM.yyyy hh:mm:ss");
         hashList->append(currentFile);
      }).waitForFinished();
 

Core/hashcomparer.cpp

@@ -13,12 +13,15 @@ void HashComparer::initialize(VersionContainer *versionContainer,UpdateNotifyWid
     this->versionContainer = versionContainer;
     this->updateWidget = updateWidget;
     filesForUpdate = new QList<FileData>;
+
+    connect(this,&HashComparer::sigAddToList,updateWidget,&UpdateNotifyWidget::addToList,Qt::QueuedConnection);
+    connect(this,&HashComparer::sigGetUpdateList,updateWidget,&UpdateNotifyWidget::getUpdateList,Qt::DirectConnection);
 }
 
 void HashComparer::CompareDeltas(QList<FileData> *serverStreamingHash, QList<FileData> localStreamingHash)
 {
     QList<FileData> *files = new QList<FileData>;
-
+    serverFiles = new QList<FileData>;
     QMutableListIterator<FileData> iterator(localStreamingHash);
 
     for (auto &item:localStreamingHash)
@@ -26,6 +29,13 @@ void HashComparer::CompareDeltas(QList<FileData> *serverStreamingHash, QList<Fil
         if(!serverStreamingHash->contains(item))
         {
             if (item.path.contains("docs.xml")) continue; //фильтр на docs
+            if (item.path.contains("CfiList.xml")) continue;
+
+            qint32 fileDataIndex = findIndexByPath(*serverStreamingHash, item.path);
+            if (fileDataIndex != -1)
+            {
+                serverFiles->append(serverStreamingHash->at(fileDataIndex));
+            }
             files->append(item);
         }
     }
@@ -34,6 +44,17 @@ void HashComparer::CompareDeltas(QList<FileData> *serverStreamingHash, QList<Fil
     showDeltas();
 }
 
+quint32 HashComparer::findIndexByPath(const QList<FileData> &serverStreamingHash,QString path)
+{
+    for(int i = 0; i < serverStreamingHash.size(); i++)
+    {
+        if(serverStreamingHash.at(i).path == path)
+            return i;
+    }
+
+    return -1;
+}
+
 void HashComparer::showDeltas()
 {
 
@@ -42,9 +63,19 @@ void HashComparer::showDeltas()
         emit sigCallCheck();
         return;
     }
-    for (auto &item:*filesForUpdate)
+
+    for (int i = 0; i < filesForUpdate->size(); i++)
     {
-        updateWidget->addToList(item);
+        FileData local = filesForUpdate->at(i);
+        FileData server = FileData();
+        server.lastUpdate = "нет";
+
+        if (serverFiles->size() > i)
+        {
+            server = serverFiles->at(i);
+        }
+
+        emit sigAddToList(local,server);
     }
 
     emit sigHaveDelta();
@@ -57,7 +88,7 @@ quint16 HashComparer::getFileUpdateCount() const
 
 QList<FileData> *HashComparer::getFilesForUpdate() const
 {
-    QList<FileData> *completeList = filesForUpdate;
+    QList<FileData> *completeList = emit sigGetUpdateList();
 
     for (int i = 0; i < completeList->count();i++)
     {
@@ -70,5 +101,5 @@ QList<FileData> *HashComparer::getFilesForUpdate() const
         completeList->replace(i,data);
     }
 
-    return filesForUpdate;
+    return completeList;
 }

Core/hashcomparer.h

@@ -23,10 +23,15 @@ public:
 signals:
     void sigCallCheck();
     void sigHaveDelta();
+    void sigAddToList(FileData local, FileData server);
+    QList<FileData> *sigGetUpdateList() const;
+
 private:
     UpdateNotifyWidget* updateWidget;
     QList<FileData> *filesForUpdate;
+    QList<FileData> *serverFiles;
     VersionContainer *versionContainer;
+    quint32 findIndexByPath(const QList<FileData> &serverStreamingHash, QString path);
 };
 
 #endif // HASHCOMPARER_H

Core/postprocessorsystem.cpp

@@ -69,14 +69,6 @@ void PostProcessorSystem::compareFiles()
     updateController->updateFilesOnServer(hashComparer->getFilesForUpdate());
 }
 
-void PostProcessorSystem::checkAccessType(const QString& type)
-{
-    if(type == "instructor")
-    {
-        emit sigCallUpdateList();
-    }
-}
-
 void PostProcessorSystem::saveLoginData(ServerAuthorization *auth)
 {
     emit sigSaveLoginData(auth);

Core/postprocessorsystem.h

@@ -21,7 +21,6 @@ public:
     void serverBlocked();
     void startCompare();
     void compareFiles();
-    void checkAccessType(const QString& type);
     void saveLoginData(ServerAuthorization *auth);
     void setServerVersion(StreamingVersionData *serverVersion);
     void calculateCommonHash();

Core/recognizesystem.cpp

@@ -1,13 +1,15 @@
 #include "Core/recognizesystem.h"
+#include <QMessageBox>
 
 RecognizeSystem::RecognizeSystem(QObject *parent):
     QObject(parent),
     versionContainer(nullptr),
     dataParser(nullptr),
-    postProcessorSystem(nullptr)
+    postProcessorSystem(nullptr),
+    client(nullptr)
 {
     packetType = PacketType::TYPE_NONE;
-    filePath.clear();
+    filePath = "";
     fileSize = 0;
     sizeReceiveData = 0;
     tmpBlock.clear();
@@ -17,66 +19,74 @@ RecognizeSystem::RecognizeSystem(QObject *parent):
 void RecognizeSystem::initialize(DataParser *dataParser, VersionContainer *versionContainer,PostProcessorSystem *postProcessorSystem,Client *client)
 {
     this->versionContainer = versionContainer;    
-    this->postProcessorSystem = postProcessorSystem;
     this->dataParser = dataParser;
+    this->postProcessorSystem = postProcessorSystem;
     this->client = client;
 }
 
 void RecognizeSystem::recognize(QTcpSocket *socket)
 {
-    qDebug() << "RecognizeThreadId " << QThread::currentThreadId();
+    //qDebug() << "RecognizeThreadId " << QThread::currentThreadId();
 
     QDataStream stream(socket);
     stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
 
-    while(socket->bytesAvailable())
+    int cntBytesAvl = 0;
+    while((cntBytesAvl = socket->bytesAvailable()) > 0)
     {
+        if (socket->state() != QTcpSocket::ConnectedState)
+        {
+            qDebug() << "RecognizeSystem::recognize socket->state() != QTcpSocket::ConnectedState";
+            return;
+        }
 
-      if (socket->state() != QTcpSocket::ConnectedState) return;
+        if(packetType == PacketType::TYPE_NONE) //определение первичного пакета
-
+        {
-        if(packetType == PacketType::TYPE_NONE){    //определение первичного пакета
-
             stream.startTransaction();
             stream >> packetType;
 
             if(!stream.commitTransaction())
             {
-                emit sigSendDebugLog(Tools::getTime() + " CLIENT: packetType - FAIL commitTransaction");
+                socket->waitForReadyRead(TCP_READ_TIMEOUT);
-
-                if(socket->waitForReadyRead(TCP_READ_TIMEOUT)){
-                    emit sigSendDebugLog("ERROR: PACKET TYPE READ TIMEOUT");
-                    return;
-                }
                 continue;
-
             }
-
             //qDebug() << Tools::GetTime() << "CLIENT: type: " << packetType;
+            if(packetType == PacketType::TYPE_FILE)
+                socket->waitForReadyRead(10);
+            else
+                socket->waitForReadyRead(100);
         }
 
-        if(packetType == PacketType::TYPE_FOLDER){  //создание папок
+
+        switch ((int)packetType)
+        {
+        case PacketType::TYPE_FOLDER:   //создание папок
+            {
                 stream.startTransaction();
                 stream >> filePath;
 
-            if(!stream.commitTransaction()){
+                if(!stream.commitTransaction())
+                {
+                    socket->waitForReadyRead(TCP_READ_TIMEOUT);
                     continue;
                 }
 
                 filePath = Tools::createReceiveFullPath(filePath,versionContainer->getServerVersionData());
 
                 QDir dir(filePath);
-            if(!dir.exists()){
+                if(!dir.exists())
-                if(dir.mkpath(filePath)){
+                {
-                    qDebug() << "Dir Created";
+                    if(dir.mkpath(filePath))
+                    {
+                        qDebug() << "Dir Created: " << filePath;
                     }
                 }
 
-            packetType = PacketType::TYPE_NONE;
                 emit sigUpdateBytesAvailable();
-            continue;
             }
+            break;
 
-        if(packetType == PacketType::TYPE_FILE)     //загрузка файлов
+        case PacketType::TYPE_FILE: //загрузка файлов
             {
                 //ПОЛУЧЕНИЕ ПУТИ
                 //ПОЛУЧЕНИЕ РАЗМЕРА ФАЙЛА
@@ -86,15 +96,11 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
                     stream >> filePath;
                     stream >> fileSize;
 
-                if(!stream.commitTransaction()){
+                    if(!stream.commitTransaction())
+                    {
                         emit sigSendDebugLog(Tools::getTime() + "CLIENT: filePath, fileSize - FAIL commitTransaction");
-
+                        socket->waitForReadyRead(TCP_READ_TIMEOUT);
-                    if (!socket->waitForReadyRead(TCP_READ_TIMEOUT)) {
-                        emit sigSendDebugLog(Tools::getTime() + "CLIENT: ERROR! readyRead timeout - filePath, fileSize!!!");
-                        return;
-                    }
                         continue;
-
                     }
 
                     filePath = Tools::createReceiveFullPath(filePath,versionContainer->getServerVersionData());
@@ -102,11 +108,10 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
                     emit sigSendDebugLog("CLIENT: filesize: " + QString::number(fileSize));
                     emit sigSendDebugLog("CLIENT: filePath: " + filePath);
 
-                socket->waitForReadyRead(100);
+                    socket->waitForReadyRead(10);
                     break;
                 }
 
-
                 //ПОЛУЧЕНИЕ САМОГО ФАЙЛА
                 emit sigSendDebugLog(Tools::getTime() + "AfterRead size and path BytesAvailable: " + socket->bytesAvailable());
 
@@ -117,47 +122,70 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
                 {
                     file.remove();  //удаление файла, если он уже есть, но необходимо обновить
                     emit sigSendDebugLog(Tools::getTime() + "Delete exist file: " + filePath);
-                socket->waitForReadyRead(100);
+
+                    //socket->waitForReadyRead(10);
                 }
 
+                tmpBlock.clear();
+                sizeReceiveData = 0;
+                countSend = 0;
 
+                file.open(QFile::WriteOnly);
 
-            file.open(QFile::Append);
+                if(! file.isOpen())
+                    QMessageBox::critical(nullptr, "P1", "isOpen false. File: " + file.fileName());
 
-            forever
+                if(! file.isWritable())
+                    QMessageBox::critical(nullptr, "P2", "isWritable false. File: " + file.fileName());
+
+                while(true)
                 {
-                stream.startTransaction();
-                stream >> tmpBlock;
 
-                if(!stream.commitTransaction()){
+                    if(socket->bytesAvailable() <= 0)
-
+                    {
-                    if(socket->state() == QAbstractSocket::UnconnectedState){
+                        socket->waitForReadyRead(10);
-                        postProcessorSystem->socketDisable();
-                        //emit sigSocketDisabled();
-                        return;
-                    }
-                    if(socket->waitForReadyRead(TCP_READ_TIMEOUT)){
                         continue;
                     }
 
+                    if(fileSize - sizeReceiveData >= BLOCK_SIZE)
+                        tmpBlock = socket->read(BLOCK_SIZE);
+                    else
+                        tmpBlock = socket->read(fileSize - sizeReceiveData);
+
+                    qint64 bytesReceived = tmpBlock.length();
+
+                    if(bytesReceived <= 0)
+                    {
+                        //QMessageBox::critical(nullptr, "P3", "bytesReceived <= 0. File: " + file.fileName());
                         continue;
                     }
 
-                quint64 toFile = file.write(tmpBlock);
+                    sizeReceiveData += bytesReceived;
-                emit sigSendDebugLog(Tools::getTime() + "CLIENT: toFile :" + toFile);
-
-                sizeReceiveData += toFile;
                     countSend++;
 
+                    qint64 toFile = file.write(tmpBlock);
+
+                    if(toFile <= 0)
+                    {
+                        //emit sigUpdateBytesAvailable();
+                        QMessageBox::critical(nullptr, "P4", "write toFile <= 0. File: " + file.fileName());
+                        continue;
+                    }
+
                     tmpBlock.clear();
 
-                if(sizeReceiveData == fileSize){
+                    if(sizeReceiveData == fileSize)
+                    {
                         emit sigSendDebugLog(Tools::getTime() + "FINAL Count send: " + QString::number(countSend));
                         emit sigSendDebugLog(Tools::getTime() + "FINAL Size received: " + QString::number(sizeReceiveData));
                         emit sigSendDebugLog(Tools::getTime() + "FINAL File size" + QString::number(fileSize));
                         emit sigUpdateBytesAvailable();
                         break;
                     }
+                    else if(sizeReceiveData > fileSize)
+                    {
+                        QMessageBox::critical(nullptr, "P5", "sizeReceiveData > fileSize");
+                    }
                 }
 
                 file.close();
@@ -171,13 +199,16 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
                 sizeReceiveData = 0;
                 countSend = 0;
             }
+            break;
 
-        if(packetType == PacketType::TYPE_DELETE)   //удаление лишних файлов (рекурсивно удаляет все содежимое)
+        case PacketType::TYPE_DELETE:   //удаление лишних файлов (рекурсивно удаляет все содежимое)
             {
                 stream.startTransaction();
                 stream >> filePath;
 
-            if(!stream.commitTransaction()){
+                if(!stream.commitTransaction())
+                {
+                    socket->waitForReadyRead(TCP_READ_TIMEOUT);
                     continue;
                 }
 
@@ -185,7 +216,6 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
 
                 QFileInfo fileInfo(filePath);
 
-
                 if(fileInfo.exists())
                 {
                     if(fileInfo.isFile())
@@ -194,22 +224,19 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
                         file.remove();
                     }
 
-                if(fileInfo.isDir()){
+                    if(fileInfo.isDir())
+                    {
                         QDir dir(filePath);
                         dir.removeRecursively();
                     }
 
                     qDebug() << Tools::getTime() << "Deleted: " << filePath;
                 }
-
-            packetType = PacketType::TYPE_NONE;
-            continue;
-
             }
+            break;
 
-        if(packetType == PacketType::TYPE_NEEDUPDATE)
+        case PacketType::TYPE_NEEDUPDATE:   //нужно обновление
-        {  //нужно обновление
+            {
-
                 bool flag = false;
                 quint64 size = 0;
                 quint64 fileCount = 0;
@@ -221,63 +248,78 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
                 stream >> fileCount;
                 stream >> fileDelete;
 
-            if(!stream.commitTransaction()){
+                if(!stream.commitTransaction())
+                {
+                    socket->waitForReadyRead(TCP_READ_TIMEOUT);
                     continue;
                 }
 
                 emit sigNeedUpdate(flag,size,fileCount,fileDelete);
-            packetType = PacketType::TYPE_NONE;
             }
+            break;
 
-        if(packetType == PacketType::TYPE_XMLANSWER){   //ответы формата XML
+        case PacketType::TYPE_XMLANSWER:    //ответы формата XML
+            {
                 QByteArray array;
                 stream.startTransaction();
                 stream >> array;
 
-            if(!stream.commitTransaction()){
+                if(!stream.commitTransaction())
+                {
+                    socket->waitForReadyRead(TCP_READ_TIMEOUT);
                     continue;
                 }
 
                 dataParser->xmlParser(array);
-
-            packetType = PacketType::TYPE_NONE;
             }
+            break;
 
-        if(packetType == PacketType::HASH_READY)
+        case PacketType::HASH_READY:
             {
                 emit sigCheckUpdate();
             }
+            break;
 
-        if(packetType == PacketType::RECALCULATE_HASH)
+        case PacketType::RECALCULATE_HASH:
             {
                 emit sigdRecalculateHashOnServerState();
             }
+            break;
 
-        if(packetType == PacketType::BUSY)
+        case PacketType::BUSY:
             {
                 emit sigAnimationActivated(true);
             }
+            break;
 
-        if(packetType == PacketType::FREE)
+        case PacketType::FREE:
             {
                 emit sigAnimationActivated(false);
             }
+            break;
 
-        if (packetType == PacketType::TYPE_XMLANSWER_DOCS_CHANGED) //на случай общего обновления
+        case PacketType::TYPE_XMLANSWER_DOCS_CHANGED:   //на случай общего обновления
             {
                 if (client->getIsLoggedIn())
                 {
                     emit sigSendPacketType(PacketType::GET_DOCS);
                 }
             }
+            break;
 
-        if (packetType == PacketType::UPDATE_FILE_COMPLETE)
+        case PacketType::UPDATE_FILE_COMPLETE:
             {
                 postProcessorSystem->calculateCommonHash();
                 emit sigLoadComplete();
                 emit sigSendPacketType(PacketType::GET_DOCS);
-            packetType = PacketType::TYPE_NONE;
             }
+            break;
+
+        default:
+            qCritical() << "RecognizeSystem::recognize packetType unknown!";
+        }
+
+        //socket->waitForReadyRead(10);
 
         packetType = PacketType::TYPE_NONE;
     }

Core/recognizesystem.h

@@ -14,6 +14,8 @@
 #include <Data\streamingversiondata.h>
 #include <Core\hashcomparer.h>
 
+const int BLOCK_SIZE = 1024 * 1024; // Размер блока
+
 class RecognizeSystem : public QObject
 {
     Q_OBJECT
@@ -21,8 +23,10 @@ class RecognizeSystem : public QObject
 public:
     explicit RecognizeSystem(QObject *parent = 0);
     ~RecognizeSystem(){};
+
     void initialize(DataParser *dataParser, VersionContainer* versionContainer,PostProcessorSystem *postProcessorSystem,Client *client);
     void recognize(QTcpSocket *socket);
+
 signals:
     void sigUpdateBytesAvailable();
     void sigLoadComplete();
@@ -34,19 +38,19 @@ signals:
     void sigSendPacketType(PacketType packetType);
     void sigSendPacketTypeWithDelay(PacketType packetType,int delay);
     void sigSendToInlineLog(QString message);
-    void sigCallUpdateList();
+    //void sigCallUpdateList();
 
 private:
     VersionContainer *versionContainer;
     DataParser *dataParser;
     PostProcessorSystem *postProcessorSystem;
-    PacketType packetType;
-    QString filePath;
-    QByteArray tmpBlock;
     Client *client;
 
-    qint64 sizeReceiveData;
+    PacketType packetType;
+    QString filePath;
     qint64 fileSize;
+    qint64 sizeReceiveData;    
+    QByteArray tmpBlock;
     int countSend;
 };
 

Data/FileData.h

@@ -8,6 +8,7 @@ struct FileData
 {
     QString path;
     QString hash;
+    QString lastUpdate;
 
     bool operator==(const FileData& other)const
     {

RRJClient.pro

@@ -32,6 +32,7 @@ SOURCES += \
     Core\tools.cpp\
     Core\hashcomparer.cpp \
     UI/resourcemanager.cpp \
+    Widgets/updatefileslot.cpp \
     Widgets/waitanimationwidget.cpp \
     Widgets\commonbuttongroupwidget.cpp \
     Widgets\entrywidget.cpp \
@@ -66,6 +67,7 @@ HEADERS += \
     Data\FileData.h\
     Data\Datas.h \
     UI/resourcemanager.h \
+    Widgets/updatefileslot.h \
     Widgets/waitanimationwidget.h \
     Widgets\commonbuttongroupwidget.h \
     Widgets\entrywidget.h \
@@ -78,6 +80,7 @@ HEADERS += \
     widgetmanager.h
 
 FORMS += \
+    Widgets/updatefileslot.ui \
     Widgets/waitanimationwidget.ui \
     Widgets\commonbuttongroupwidget.ui \
     Widgets\entrywidget.ui \

StaticData/authData.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<AuthData Login="I3" Password="2be9bd7a3434f7038ca27d1918de58bd" InstructorName="Моськин В.М." ClientName="Моськин В.М." AccessType="instructor"/>

StaticData/settings.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <ServerSettingsContainer>
-    <ServerSettings AutoStart="0" Port="6000" Address="192.168.100.134" Language="RUS"/>
+    <ServerSettings Port="6000" Address="192.168.100.83" Language="RUS" AutoStart="0"/>
-    <VersionData Created="Пн дек 22 15:46:11 2025" isChangable="1" Version="max2"/>
+    <VersionData Version="customND" isChangable="1" Created="Пт мар 6 10:49:55 2026"/>
 </ServerSettingsContainer>

StaticData/temp.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ClientNotify Code="DISABLE"/>
+<ClientNotify Code="GETSERVERDATALIST"/>

Widgets/commonbuttongroupwidget.cpp

@@ -15,7 +15,9 @@ void CommonButtonGroupWidget::initialize()
     ui->updateButton->hide();
     ui->startButton->hide();
     ui->startButton->setEnabled(false);
+    ui->offlineStartButton->hide();
     show();
+    down = ui->downlayout;
 }
 
 void CommonButtonGroupWidget::updateProgressBar(float value)
@@ -23,13 +25,19 @@ void CommonButtonGroupWidget::updateProgressBar(float value)
     ui->loadingProgressBar->setValue(value);
 }
 
+QHBoxLayout *CommonButtonGroupWidget::getDown() const
+{
+    return down;
+}
+
 void CommonButtonGroupWidget::loadCompleteState()
 {
     show();
     ui->updateButton->hide();
     ui->startButton->setEnabled(true);
-    ui->loadingProgressBar->setValue(100);
     ui->startButton->show();
+    ui->offlineStartButton->show();
+    ui->loadingProgressBar->setValue(100);
     ui->loadingProgressBar->hide();
 }
 
@@ -39,7 +47,9 @@ void CommonButtonGroupWidget::lastVerInstalledState()
     ui->updateButton->hide();
     ui->loadingProgressBar->hide();
     ui->startButton->setEnabled(true);
+    hideSpacer(true);
     ui->startButton->show();
+    ui->offlineStartButton->show();
 }
 
 void CommonButtonGroupWidget::disconnectState()
@@ -48,16 +58,32 @@ void CommonButtonGroupWidget::disconnectState()
     ui->loadingProgressBar->hide();
     ui->updateButton->hide();
     ui->updateButton->setEnabled(false);
+    ui->offlineStartButton->hide();
+    hideSpacer(false);
 }
 
 void CommonButtonGroupWidget::startUpdateState()
 {
     ui->updateButton->hide();
     ui->startButton->hide();
+    ui->offlineStartButton->hide();
     ui->loadingProgressBar->setValue(0);
     ui->loadingProgressBar->show();
 }
 
+void CommonButtonGroupWidget::loginState()
+{
+    bool isAvailable = emit sigAppAvailable();
+    if (isAvailable)
+    {
+        ui->offlineStartButton->show();
+    }
+    else
+    {
+        ui->offlineStartButton->hide();
+    }
+}
+
 void CommonButtonGroupWidget::showProgressBar(bool flag)
 {
     if (flag) ui->loadingProgressBar->show();
@@ -67,6 +93,7 @@ void CommonButtonGroupWidget::showProgressBar(bool flag)
 void CommonButtonGroupWidget::needUpdateState(bool flag)
 {
     show();
+    hideSpacer(true);
     ui->loadingProgressBar->hide();
     ui->startButton->hide();
     ui->updateButton->setEnabled(flag);
@@ -75,6 +102,9 @@ void CommonButtonGroupWidget::needUpdateState(bool flag)
 
 void CommonButtonGroupWidget::startButtonActive(bool flag)
 {
+    if(flag) ui->offlineStartButton->show();
+    else ui->offlineStartButton->hide();
+
     ui->startButton->setEnabled(flag);
 }
 
@@ -96,6 +126,13 @@ CommonButtonGroupWidget::~CommonButtonGroupWidget()
     delete ui;
 }
 
+void CommonButtonGroupWidget::hideSpacer(bool flag)
+{
+    if(flag) ui->horizontalSpacer->changeSize(0,0,QSizePolicy::Fixed,QSizePolicy::Fixed);
+    else ui->horizontalSpacer->changeSize(40,20,QSizePolicy::Expanding,QSizePolicy::Minimum);
+}
 
-
+void CommonButtonGroupWidget::on_offlineStartButton_clicked()
-
+{
+    emit sigStartOfflineUnityClient();
+}

Widgets/commonbuttongroupwidget.h

@@ -1,6 +1,7 @@
 #ifndef COMMONBUTTONGROUPWIDGET_H
 #define COMMONBUTTONGROUPWIDGET_H
 
+#include <QHBoxLayout>
 #include <QWidget>
 #include <Core/tcpclient.h>
 
@@ -20,6 +21,7 @@ public:
     void lastVerInstalledState();
     void disconnectState();
     void startUpdateState();
+    void loginState();
     void showProgressBar(bool flag);
     void needUpdateState(bool flag);
     void startButtonActive(bool flag);
@@ -28,16 +30,22 @@ signals:
     void sigSendPacket(PacketType packet);
     void sigUpdateCommonWidget();
     void sigStartUnityClient();
+    void sigStartOfflineUnityClient();
+    bool sigAppAvailable();
 
 private slots:
     void on_updateButton_clicked();
     void on_startButton_clicked();
+    void on_offlineStartButton_clicked();
 
 public:
     void updateProgressBar(float value);
+    QHBoxLayout *getDown() const;
 
 private:
     Ui::CommonButtonGroupWidget *ui;
+    QHBoxLayout *down;
+    void hideSpacer(bool flag);
 };
 
 #endif // COMMONBUTTONGROUPWIDGET_H

Widgets/commonbuttongroupwidget.ui

@@ -6,12 +6,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>520</width>
+    <width>763</width>
     <height>45</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+   <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -30,12 +30,12 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>520</width>
+     <width>761</width>
      <height>45</height>
     </rect>
    </property>
    <property name="sizePolicy">
-    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
      <horstretch>0</horstretch>
      <verstretch>0</verstretch>
     </sizepolicy>
@@ -99,14 +99,14 @@
        <bool>true</bool>
       </property>
       <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+       <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
       <property name="minimumSize">
        <size>
-        <width>100</width>
+        <width>500</width>
         <height>35</height>
        </size>
       </property>
@@ -143,7 +143,7 @@
       </property>
       <property name="minimumSize">
        <size>
-        <width>100</width>
+        <width>500</width>
         <height>35</height>
        </size>
       </property>
@@ -158,6 +158,47 @@
       </property>
      </widget>
     </item>
+    <item>
+     <spacer name="horizontalSpacer">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeType">
+       <enum>QSizePolicy::Expanding</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>40</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+    <item>
+     <widget class="QPushButton" name="offlineStartButton">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>250</width>
+        <height>0</height>
+       </size>
+      </property>
+      <property name="sizeIncrement">
+       <size>
+        <width>0</width>
+        <height>0</height>
+       </size>
+      </property>
+      <property name="text">
+       <string>Запуск в автономном режиме</string>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
  </widget>

Widgets/entrywidget.cpp

@@ -7,7 +7,8 @@
 
 EntryWidget::EntryWidget(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::EntryWidget)
+    ui(new Ui::EntryWidget),
+    isAppAvailable(false)
 {
     ui->setupUi(this);
 }
@@ -22,6 +23,7 @@ void EntryWidget::initialize()
 void EntryWidget::disconnectState()
 {
     show();
+    setAppAvailable(emit sigAppAvalable());
     ui->offlineWidget->show();
     ui->loginWidget->hide();
 }
@@ -69,7 +71,6 @@ void EntryWidget::fillSettings(Settings *settings)
 {
     ui->serverInputField->setText(settings->Address);
     ui->portInputField->setText(settings->Port);
-    //ui->mathModelUsecheckBox->setChecked(settings->mathModelUse);
 }
 
 void EntryWidget::isActive(bool flag)
@@ -83,6 +84,22 @@ bool EntryWidget::getLoginWidgetIsHidden()
     return ui->loginWidget->isHidden();
 }
 
+void EntryWidget::setAppAvailable(bool flag)
+{
+    isAppAvailable = flag;
+
+    if (flag)
+    {
+        QString text = tr("Связь с сервером не установлена! Проверьте настройки или запустите в автономном режиме");
+        ui->offlineNotifyLabel->setText(text);
+    }
+    else
+    {
+        QString text = tr("Связь с сервером не установлена! Проверьте настройки подключения и загрузите клиент с сервера");
+        ui->offlineNotifyLabel->setText(text);
+    }
+}
+
 QString EntryWidget::getAddress(){
     return ui->serverInputField->text();
 }

Widgets/entrywidget.h

@@ -23,6 +23,7 @@ public:
     void fillSettings(Settings *settings);
     void isActive(bool flag);
     bool getLoginWidgetIsHidden();
+    void setAppAvailable(bool flag);
     ClientAutorization* getAuthData();
 
     QString getAddress();
@@ -30,6 +31,7 @@ public:
 signals:
     void sigTryLogin();
     void sigSaveServerSettings();
+    bool sigAppAvalable();
 
 private slots:
     void on_loginButton_clicked();
@@ -37,6 +39,7 @@ private slots:
 
 private:
     Ui::EntryWidget *ui;
+    bool isAppAvailable;
 };
 
 #endif // ENTRYWIDGET_H

Widgets/entrywidget.ui

@@ -351,7 +351,7 @@
          <string notr="true"/>
         </property>
         <property name="text">
-         <string>Связь с сервером не установлена! Проверьте настройки или запустите в автономном режиме</string>
+         <string>тест</string>
         </property>
         <property name="scaledContents">
          <bool>true</bool>

Widgets/updatefileslot.cpp

@@ -0,0 +1,87 @@
+#include "updatefileslot.h"
+#include "ui_updatefileslot.h"
+
+#include <QDateTime>
+
+UpdateFileSlot::UpdateFileSlot(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::UpdateFileSlot),
+    needUpdate(false)
+{
+    ui->setupUi(this);
+}
+
+void UpdateFileSlot::fill(QString itemName, FileData serverData, FileData localData)
+{
+    ui->Path->setText(itemName);
+    local = localData;
+
+    bool haveData = serverData.lastUpdate != "нет";
+
+    QString result = " Сервер: ";
+
+    QDateTime serverFileTime;
+    if (haveData)
+    {
+        serverFileTime = QDateTime::fromString(serverData.lastUpdate,"dd.MM.yyyy hh:mm:ss");
+        result.append(serverFileTime.toString("dd.MM.yyyy"));
+    }
+    else
+    {
+       result.append("НЕТ");
+    }
+
+    QDateTime localFileTime = QDateTime::fromString(localData.lastUpdate,"dd.MM.yyyy hh:mm:ss");
+
+    result.append(" Локально: ");
+    result.append(localFileTime.toString("dd.MM.yyyy"));
+    ui->Dates->setText(result);
+
+    bool newest = localFileTime > serverFileTime;
+
+    ui->UpdateCheckBox->setChecked(newest);
+    QPixmap pixmap;
+    if (newest)
+    {
+        pixmap.load(":/resource/Icons/new.png");
+    }
+    else
+    {
+        pixmap.load(nullptr);
+    }
+
+    QPixmap scaled = pixmap.scaled(ui->Image->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
+    ui->Image->setPixmap(scaled);
+}
+
+UpdateFileSlot::~UpdateFileSlot()
+{
+    delete ui;
+}
+
+FileData UpdateFileSlot::getLocal() const
+{
+    return local;
+}
+
+bool UpdateFileSlot::getNeedUpdate() const
+{
+    return needUpdate;
+}
+
+void UpdateFileSlot::setNeedUpdate(bool value)
+{
+    needUpdate = value;
+}
+
+void UpdateFileSlot::on_UpdateCheckBox_stateChanged(int arg1)
+{
+    if (ui->UpdateCheckBox->checkState() == Qt::Checked)
+    {
+        needUpdate = true;
+    }
+    else if (ui->UpdateCheckBox->checkState() == Qt::Unchecked)
+    {
+        needUpdate = false;
+    }
+}

Widgets/updatefileslot.h

@@ -0,0 +1,36 @@
+#ifndef UPDATEFILESLOT_H
+#define UPDATEFILESLOT_H
+
+#include <QWidget>
+
+#include <Data/FileData.h>
+
+namespace Ui {
+class UpdateFileSlot;
+}
+
+class UpdateFileSlot : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit UpdateFileSlot(QWidget *parent = nullptr);
+    void fill(QString itemName, FileData serverData, FileData localData);
+
+    bool getNeedUpdate() const;
+    void setNeedUpdate(bool value);
+    FileData getLocal() const;
+
+    ~UpdateFileSlot();
+
+
+private slots:
+    void on_UpdateCheckBox_stateChanged(int arg1);
+
+private:
+    Ui::UpdateFileSlot *ui;
+    FileData local;
+    bool needUpdate;
+};
+
+#endif // UPDATEFILESLOT_H

Widgets/updatefileslot.ui

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>UpdateFileSlot</class>
+ <widget class="QWidget" name="UpdateFileSlot">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>789</width>
+    <height>40</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Frame</string>
+  </property>
+  <widget class="QWidget" name="horizontalLayoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>30</x>
+     <y>0</y>
+     <width>701</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <layout class="QHBoxLayout" name="mainLayout">
+    <item>
+     <widget class="QLabel" name="Path">
+      <property name="text">
+       <string>/RUS/Scens/XXX-X-XX-XX-XX-XXXXXX-XXXX-X</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QLabel" name="Dates">
+      <property name="text">
+       <string>XXXXXXX XXxXXxXXX XXXXXXXXx XXxXXxXXXX</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QLabel" name="Image">
+   <property name="geometry">
+    <rect>
+     <x>735</x>
+     <y>-4</y>
+     <width>51</width>
+     <height>51</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap resource="../resources.qrc">:/resource/Icons/new.png</pixmap>
+   </property>
+   <property name="scaledContents">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QCheckBox" name="UpdateCheckBox">
+   <property name="geometry">
+    <rect>
+     <x>6</x>
+     <y>10</y>
+     <width>21</width>
+     <height>22</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+  </widget>
+ </widget>
+ <resources>
+  <include location="../resources.qrc"/>
+ </resources>
+ <connections/>
+</ui>

Widgets/updatenotifywidget.cpp

@@ -28,11 +28,18 @@ void UpdateNotifyWidget::setVersionContainer(VersionContainer *versionContainer)
     this->versionContainer = versionContainer;
 }
 
-void UpdateNotifyWidget::addToList(FileData fileData)
+void UpdateNotifyWidget::addToList(FileData localFileData,FileData serverFileData)
 {
-    QString itemName = fileData.path;
+    QString itemName = localFileData.path;
     itemName = itemName.remove(streamingAssetsPath);
-    ui->updateListWidget->addItem(itemName);
+    UpdateFileSlot *slot = new UpdateFileSlot();
+    QListWidgetItem *widgetItem = new QListWidgetItem();
+
+    widgetItem->setSizeHint(QSize(slot->width(),slot->height()));
+    ui->updateListWidget->addItem(widgetItem);
+    ui->updateListWidget->setItemWidget(widgetItem,slot);
+
+    slot->fill(itemName,serverFileData,localFileData);
 }
 
 void UpdateNotifyWidget::showTryChangeBase()
@@ -124,6 +131,24 @@ void UpdateNotifyWidget::closeWindow()
     on_closeButton_clicked();
 }
 
+QList<FileData> *UpdateNotifyWidget::getUpdateList()
+{
+    QList<FileData> *realUpdateList = new QList<FileData>();
+
+    for (int i = 0; i < ui->updateListWidget->count(); i++) {
+        QListWidgetItem *item = ui->updateListWidget->item(i);
+        UpdateFileSlot *slot = qobject_cast<UpdateFileSlot*>(ui->updateListWidget->itemWidget(item));
+
+        if (slot && slot->getNeedUpdate())
+        {
+            realUpdateList->append(slot->getLocal());
+        }
+    }
+
+    return realUpdateList;
+
+}
+
 void UpdateNotifyWidget::setUpdateState()
 {
     ui->undoChangesButton->show();

Widgets/updatenotifywidget.h

@@ -7,6 +7,7 @@
 
 #include <Data/FileData.h>
 #include <Core/versioncontainer.h>
+#include <Widgets/updatefileslot.h>
 
 namespace Ui {
 class UpdateNotifyWidget;
@@ -21,11 +22,12 @@ public:
     explicit UpdateNotifyWidget(QWidget *parent = nullptr);
     ~UpdateNotifyWidget();
     void initialize(QPoint startPos);
-    void addToList(FileData fileData);
+    void addToList(FileData localFileData,FileData serverFileData);
     void showWithFill();
     void showTryChangeBase();
     void setVersionContainer(VersionContainer *versionContainer);
     void closeWindow();
+    QList<FileData> *getUpdateList();
 signals:
     void sigLoadToServerBehaviour();
     void sigUndoCurrentChanges();

Widgets/updatenotifywidget.ui

@@ -70,7 +70,7 @@
           </sizepolicy>
          </property>
          <property name="text">
-          <string>Обнаружены новые файлы:</string>
+          <string>Обнаружены новые или измененные файлы:</string>
          </property>
          <property name="openExternalLinks">
           <bool>false</bool>

bootstrap.cpp

@@ -12,6 +12,7 @@ void Bootstrap::initialize()
 {
     qRegisterMetaType<PacketType>("PacketType");
     qRegisterMetaType<ErrorsEnum>("ErrorsEnum");
+    qRegisterMetaType<FileData>("FileData");
 
     widgetManager->initialize();
     coreManager->initialize(widgetManager, workerThread);

coremanager.cpp

@@ -47,7 +47,7 @@ void CoreManager::initialize(WidgetManager *widgetManager,QThread *workerThread)
 
 void CoreManager::start()
 {
-     checkAppAvailable();
+     //checkAppAvailable();
 }
 
 void CoreManager::loadStaticData()
@@ -56,8 +56,6 @@ void CoreManager::loadStaticData()
     setLanguage(settings->Language);
     setLocalVersion();
     externalExecuter->setIsAutoStart(settings->isAutoStart);
-    bool appAvailable = externalExecuter->findApp();
-    widgetManager->setAppAvailable(appAvailable);
     emit sigSetLoadSettings(settings);
 }
 
@@ -94,7 +92,6 @@ void CoreManager::binding()
     connect(recognizeSystem,&RecognizeSystem::sigSendPacketType,this,&CoreManager::sendPacketType,Qt::AutoConnection);
     connect(recognizeSystem,&RecognizeSystem::sigSendPacketTypeWithDelay,sendSystem,&SendSystem::sendPacketTypeWithDelay,Qt::AutoConnection);
     connect(recognizeSystem,&RecognizeSystem::sigSendToInlineLog,this,&CoreManager::setInlineDebug,Qt::AutoConnection);
-    connect(recognizeSystem,&RecognizeSystem::sigCallUpdateList,this,&CoreManager::callUpdateList,Qt::AutoConnection);
 
     connect(hashComparer,&HashComparer::sigCallCheck,this,&CoreManager::checkUpdate);
     connect(hashComparer,&HashComparer::sigHaveDelta,this,&CoreManager::checkUpdateInfo);
@@ -106,9 +103,12 @@ void CoreManager::binding()
     connect(tcpClient,&TCPClient::sigServerDisconnect,widgetManager,&WidgetManager::setServerDisconnectState,Qt::AutoConnection);
 
     connect(sendSystem,&SendSystem::sigSend,this,&CoreManager::calcUpdateProgress,Qt::AutoConnection);
-
     connect(sendSystem,&SendSystem::sigGetXmlAnswer,dataParserOutput,&DataParserOutput::xmlAnswer_notify,Qt::DirectConnection);
 
+    connect(widgetManager->getEntryWidget(),&EntryWidget::sigAppAvalable,externalExecuter,&ExternalExecuter::findApp,Qt::DirectConnection);
+    connect(widgetManager->getMainWindow(),&MainWindow::sigAppAvailable,externalExecuter,&ExternalExecuter::findApp,Qt::DirectConnection);
+    connect(widgetManager->getCommonButtonGroupWidget(),&CommonButtonGroupWidget::sigAppAvailable,externalExecuter,&ExternalExecuter::findApp,Qt::DirectConnection);
+    connect(widgetManager,&WidgetManager::sigAppAvailable,externalExecuter,&ExternalExecuter::findApp,Qt::DirectConnection);
 }
 
 void CoreManager::initializeSystems()
@@ -151,9 +151,10 @@ void CoreManager::initializeWidgets()
 
     connect(widgetManager->getMainWindow(),&MainWindow::sigChangeLanguage,this,&CoreManager::setLanguage,Qt::AutoConnection);
     connect(widgetManager->getMainWindow(),&MainWindow::sigShowUpdateInfo,this,&CoreManager::checkUpdateInfo,Qt::AutoConnection);
-    connect(widgetManager->getMainWindow(),&MainWindow::sigExit,this,&CoreManager::exit,Qt::AutoConnection);
+    connect(widgetManager->getMainWindow(),&MainWindow::sigExit,this,&CoreManager::exit,Qt::DirectConnection);
     connect(widgetManager->getMainWindow(),&MainWindow::sigTryLogin,this,&CoreManager::tryLogin,Qt::AutoConnection);
     connect(widgetManager->getMainWindow(),&MainWindow::sigStartOffline,this,&CoreManager::startOffline,Qt::AutoConnection);
+    connect(widgetManager->getCommonButtonGroupWidget(),&CommonButtonGroupWidget::sigStartOfflineUnityClient,this,&CoreManager::startOffline,Qt::AutoConnection);
 
 }
 
@@ -254,11 +255,11 @@ void CoreManager::setInlineDebug(QString text)
 
 void CoreManager::checkAccessType(const QString& accessType)
 {
-    if (accessType == traineeTypeName)
+    if (accessType == traineeTypeName)//если обучаемый вызываем обновление
     {
         checkUpdate();
     }
-    else
+    else                              //если инструктор запрашивание версионирование
     {
         emit sigSendXMLAnswer(cmd_CheckVersionList);
     }
@@ -345,8 +346,6 @@ void CoreManager::undoCurrentChanges()
     isRecovery = true;
     widgetManager->setUndoCurrentChangesState();
     emit sigSendCheckUpdate();
-    //emit sigSendPacketType(PacketType::TYPE_UPDATE);
-    //тут был таймер
     isRecovery = false;
 }
 
@@ -380,7 +379,6 @@ void CoreManager::saveServerSettingsWithConnect()
         emit sigSendXMLAnswer(cmd_Disable);
         tcpClient->setDisconnect();
         entryWidget->showLoginWidget(true);
-        widgetManager->getMainWindow()->showOfflineButton(true);
         widgetManager->activateLoadingAnimation(false);
     }
 
@@ -392,12 +390,6 @@ void CoreManager::createNewServerSettings()
     dataParserOutput->createServerSettings();
 }
 
-void CoreManager::checkAppAvailable()
-{
-    bool isAvailable = externalExecuter->findApp();
-    widgetManager->setAppAvailable(isAvailable);
-}
-
 void CoreManager::setLanguage(const QString& language)
 {
     if (language == "RUS")

coremanager.h

@@ -43,9 +43,6 @@ public:
     void sendPacketType(PacketType packetType);
 
     void saveServerSettingsWithConnect();
-
-
-    void checkAppAvailable();
     void exit();
     void initializeWidgets();
 

mainwindow.cpp

@@ -13,7 +13,7 @@ MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent),
       ui(new Ui::MainWindow),
       bottomRightPosition(QRect(530,506,250,40)),
-      offlinePosition(240,340,300,40)
+      offlinePosition(240,350,300,40)
 {
     ui->setupUi(this);
     setAttribute(Qt::WA_TranslucentBackground);
@@ -44,7 +44,8 @@ void MainWindow::initialize(ResourceManager *resourceManager)
     bindConnection();
     this->resourceManager = resourceManager;
     ui->LanguageWidget->hide();
-
+    ui->offlineStartButton->setGeometry(offlinePosition);
+    ui->offlineStartButton->hide();
 }
 
 void MainWindow::setStartState()
@@ -74,9 +75,7 @@ void MainWindow::bindConnection()
 void MainWindow::loadCompleteState()
 {
     ui->inlineTextDebug->setText(tr("Обновление завершено"));
-    ui->offlineStartButton->setEnabled(true);
     ui->autostartCheckBox->hide();
-    ui->offlineStartButton->show();
 }
 
 bool MainWindow::getIsAutoStart()
@@ -133,15 +132,9 @@ void MainWindow::serverNotifyShow(QString text, int durationMS)
 void MainWindow::setLoginSuccessState()
 {
     ui->settingsButton->hide();
-    ui->offlineStartButton->show();
     ui->versionLayoutWidget->show();
 }
 
-void MainWindow::setStartOfflineButton(bool isAvailable)
-{
-    ui->offlineStartButton->setEnabled(isAvailable);
-}
-
 void MainWindow::setClientVersionName(const QString& versionName)
 {
     ui->valueClientVersion->setText(versionName);
@@ -153,9 +146,7 @@ void MainWindow::showConnectionEmpty()
     QPalette palette = ui->notificationLabel->palette();
     palette.setColor(ui->notificationLabel->foregroundRole(),Qt::red);
     ui->notificationLabel->setText(tr("Соединение отсутсвует"));
-    ui->offlineStartButton->show();
+
-    ui->offlineStartButton->setGeometry(offlinePosition);
-    ui->offlineStartButton->raise();
     ui->settingsButton->show();
     ui->unsafeChangingButton->hide();
 }
@@ -178,9 +169,6 @@ void MainWindow::slotConnectionState(bool flag)
     {
         palette.setColor(ui->notificationLabel->foregroundRole(),Qt::green);
         ui->notificationLabel->setText(tr("Соединение установлено"));
-
-        ui->offlineStartButton->show();
-        ui->offlineStartButton->setGeometry(bottomRightPosition);
     }
     else
     {
@@ -193,11 +181,19 @@ void MainWindow::slotConnectionState(bool flag)
 
 void MainWindow::slotServerDisconnect()
 {
+    checkApp();
     ui->autostartCheckBox->hide();
     ui->inlineTextDebug->setText("");
     slotConnectionState(false);
 }
 
+void MainWindow::checkApp()
+{
+    bool isAvailable = emit sigAppAvailable();
+    if (isAvailable) ui->offlineStartButton->show();
+    else ui->offlineStartButton->hide();
+}
+
 void MainWindow::slotDisableNotify()
 {
     ui->notificationLabel->hide();
@@ -209,14 +205,6 @@ void MainWindow::slotDisableNotify()
     timer->stop();
 }
 
-void MainWindow::showOfflineButton(bool flag)
-{
-    if (flag)
-        ui->offlineStartButton->show();
-    else
-        ui->offlineStartButton->hide();
-}
-
 void MainWindow::on_settingsButton_clicked()
 {
     emit sigShowSettings(true);
@@ -233,14 +221,14 @@ void MainWindow::loadToServer()
 {
     ui->mainFrame->show();
     ui->inlineTextDebug->setText(tr("Отправка файлов..."));
-    ui->offlineStartButton->setEnabled(false);
+    //ui->offlineStartButton->setEnabled(false);
     ui->unsafeChangingButton->hide();
 }
 
 void MainWindow::undoCurrentChanges()
 {
     ui->mainFrame->show();
-    ui->offlineStartButton->setEnabled(false);
+    //ui->offlineStartButton->setEnabled(false);
     ui->unsafeChangingButton->hide();
 }
 
@@ -260,7 +248,8 @@ void MainWindow::on_exitButton_clicked()
 void MainWindow::slotShowUpdateInfo()
 {
     ui->unsafeChangingButton->show();
-    ui->offlineStartButton->setGeometry(bottomRightPosition);
+    //ui->offlineStartButton->setGeometry(bottomRightPosition);
+    //ui->offlineStartButton->setParent(ui->changeButtonGroup->widget());
 }
 
 void MainWindow::setUpUi()
@@ -268,9 +257,10 @@ void MainWindow::setUpUi()
     ui->notificationLabel->hide();
     ui->unsafeChangingButton->hide();
 
-    ui->offlineStartButton->show();
+    //ui->offlineStartButton->show();
-    ui->offlineStartButton->setEnabled(false);
+    //ui->offlineStartButton->setEnabled(false);
-    ui->offlineStartButton->setGeometry(bottomRightPosition);
+    //ui->offlineStartButton->setGeometry(bottomRightPosition);
+    //ui->offlineStartButton->setParent(ui->changeButtonGroup->widget());
 
     ui->settingsButton->setIcon(*resourceManager->getSettingsIcon());
 
@@ -324,9 +314,14 @@ QHBoxLayout *MainWindow::getDisplayLayout() const
     return ui->displayLayout;
 }
 
+QPushButton *MainWindow::getStartOfflineButton() const
+{
+    return ui->offlineStartButton;
+}
+
 void MainWindow::addWidgetToChangeGroup(CommonButtonGroupWidget *commonWidgetGroup)
 {
-    ui->changButtonGroup->addWidget(commonWidgetGroup);
+    ui->changeButtonGroup->addWidget(commonWidgetGroup);
 }
 
 void MainWindow::addWidgetToInteractiveGroup(EntryWidget *entryWidget)

mainwindow.h

@@ -4,6 +4,7 @@
 #include <QMainWindow>
 #include <QDebug>
 #include <QHBoxLayout>
+#include <QPushButton>
 
 #include <Widgets/commonbuttongroupwidget.h>
 #include <Widgets/updatenotifywidget.h>
@@ -43,14 +44,13 @@ public:
     void setNeedUpdateState(const QString &notifyText);
     void setLastVersionState();
     void showConnectionEmpty();
-    void showOfflineButton(bool flag);
-    void setStartOfflineButton(bool isAvailable);
     void setStartState();
     void serverNotifyShow(QString text, int durationMS = 3000);
     void showError(ErrorsEnum errorNum);
-
     QHBoxLayout *getDisplayLayout() const;
     void serverBlockedState();
+    QPushButton *getStartOfflineButton() const;
+
 public slots:
     void slotShowUpdateInfo();
     void slotConnectionState(bool flag);
@@ -66,6 +66,8 @@ signals:
     void sigExit();
     void sigTryLogin();
     void sigStartOffline();
+    bool sigAppAvailable();
+
 
 private slots:
     void on_settingsButton_clicked();
@@ -84,11 +86,13 @@ private:
     QPixmap background;
     QRect bottomRightPosition;
     QRect offlinePosition;
+    QPushButton startOfflineButton;
     void bindClient();
     void bindConnection();
     void setUpUi();
 
     void paintEvent(QPaintEvent *event);
+    void checkApp();
 protected:
     virtual void keyPressEvent(QKeyEvent *event);
 };

mainwindow.ui

@@ -249,9 +249,9 @@
     <widget class="QWidget" name="versionLayoutWidget" native="true">
      <property name="geometry">
       <rect>
-       <x>529</x>
+       <x>540</x>
        <y>450</y>
-       <width>250</width>
+       <width>241</width>
        <height>60</height>
       </rect>
      </property>
@@ -420,46 +420,6 @@
       </item>
      </layout>
     </widget>
-    <widget class="QPushButton" name="offlineStartButton">
-     <property name="enabled">
-      <bool>true</bool>
-     </property>
-     <property name="geometry">
-      <rect>
-       <x>530</x>
-       <y>511</y>
-       <width>250</width>
-       <height>40</height>
-      </rect>
-     </property>
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>250</width>
-       <height>40</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>1500</width>
-       <height>40</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Запуск в автономном режиме</string>
-     </property>
-     <property name="checkable">
-      <bool>false</bool>
-     </property>
-     <property name="checked">
-      <bool>false</bool>
-     </property>
-    </widget>
     <widget class="QWidget" name="verticalLayoutWidget_2">
      <property name="geometry">
       <rect>
@@ -478,9 +438,9 @@
     <widget class="QWidget" name="verticalLayoutWidget_3">
      <property name="geometry">
       <rect>
-       <x>0</x>
+       <x>10</x>
        <y>440</y>
-       <width>511</width>
+       <width>501</width>
        <height>61</height>
       </rect>
      </property>
@@ -520,6 +480,46 @@
       </item>
      </layout>
     </widget>
+    <widget class="QPushButton" name="offlineStartButton">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="geometry">
+      <rect>
+       <x>240</x>
+       <y>350</y>
+       <width>300</width>
+       <height>40</height>
+      </rect>
+     </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>250</width>
+       <height>40</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>1500</width>
+       <height>40</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>Запуск в автономном режиме</string>
+     </property>
+     <property name="checkable">
+      <bool>false</bool>
+     </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
+    </widget>
    </widget>
    <widget class="QWidget" name="headerWidget" native="true">
     <property name="geometry">
@@ -617,13 +617,13 @@
    <widget class="QWidget" name="verticalLayoutWidget">
     <property name="geometry">
      <rect>
-      <x>10</x>
+      <x>20</x>
       <y>550</y>
-      <width>531</width>
+      <width>761</width>
-      <height>41</height>
+      <height>42</height>
      </rect>
     </property>
-    <layout class="QVBoxLayout" name="changButtonGroup">
+    <layout class="QHBoxLayout" name="changeButtonGroup">
      <property name="spacing">
       <number>0</number>
      </property>

resources.qrc

@@ -17,5 +17,6 @@
         <file>resource/Icons/caution.png</file>
         <file>resource/Icons/close.png</file>
         <file>resource/Icons/planeCustom.png</file>
+        <file>resource/Icons/new.png</file>
     </qresource>
 </RCC>

widgetmanager.cpp

@@ -129,7 +129,9 @@ void WidgetManager::setConnectionState(bool isConnected)
     mainWindow->slotConnectionState(isConnected);
     if (isConnected)
     {
+        mainWindow->getStartOfflineButton()->hide();
         entryWidget->showLoginWidget(true);
+        commonButtonGroupWidget->loginState();
     }
     waitAnimationWidget->hideWithStop();
 }
@@ -169,12 +171,6 @@ void WidgetManager::showMainFrame(bool flag)
     mainWindow->showMainFrame(flag);
 }
 
-void WidgetManager::setAppAvailable(bool isAvailable)
-{
-    commonButtonGroupWidget->startButtonActive(isAvailable);
-    mainWindow->setStartOfflineButton(isAvailable);
-}
-
 void WidgetManager::showSettings(bool isActive)
 {
     entryWidget->settingsState();

widgetmanager.h

@@ -45,13 +45,14 @@ public:
 
     void setUndoCurrentChangesState();
     void showMainFrame(bool flag);
-    void setAppAvailable(bool isAvailable);
     void slotInlineDebug(const QString &text);
 public slots:
     void showSettings(bool isActive);
     void slotSetLoadSettings(Settings *settings);
     void slotActivateLoadAnimation(bool flag);
+
 signals:
+    bool sigAppAvailable();
 
 private:
     MainWindow *mainWindow;