fix: update from instructor

ClientMPS_resource.rc

@@ -0,0 +1,37 @@
+#include <windows.h>
+
+IDI_ICON1	ICON	DISCARDABLE	"D:\\QT\\Projects\\RRJClient\\resource\\Icons\\planeCustomIco.ico"
+
+VS_VERSION_INFO VERSIONINFO
+	FILEVERSION 0,0,0,0
+	PRODUCTVERSION 0,0,0,0
+	FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+	FILEFLAGS VS_FF_DEBUG
+#else
+	FILEFLAGS 0x0L
+#endif
+	FILEOS VOS__WINDOWS32
+	FILETYPE VFT_DLL
+	FILESUBTYPE 0x0L
+	BEGIN
+		BLOCK "StringFileInfo"
+		BEGIN
+			BLOCK "040904b0"
+			BEGIN
+				VALUE "CompanyName", "\0"
+				VALUE "FileDescription", "\0"
+				VALUE "FileVersion", "0.0.0.0\0"
+				VALUE "LegalCopyright", "\0"
+				VALUE "OriginalFilename", "ClientMPS.exe\0"
+				VALUE "ProductName", "ClientMPS\0"
+				VALUE "ProductVersion", "0.0.0.0\0"
+			END
+		END
+		BLOCK "VarFileInfo"
+		BEGIN
+			VALUE "Translation", 0x0409, 1200
+		END
+	END
+/* End of Version info */
+

Core/dataparser.cpp

@@ -15,9 +15,9 @@ void DataParser::initialize(PostProcessorSystem *postProcessSystem)
 }
 
 
-ServerSettings *DataParser::getClientSettings()
+Settings *DataParser::getSettings()
 {
-    ServerSettings *settings = new ServerSettings;
+    Settings *settings = new Settings;
     QFile file(settingsName);
     file.open(QIODevice::ReadOnly);
     QXmlStreamReader xmlReader(&file);
@@ -135,15 +135,29 @@ bool DataParser::xmlParser(const QByteArray& array)
 
                     if (value == "UNCHANGEABLE")
                     {
-                        //версию нельзя изменять
                         result = true;
                     }
 
                     if (value == "CHANGEABLE")
                     {
                         postProcessSystem->compareFiles();
-                        //emit sigUpdateFilesOnServer(hashComparer->getFilesForUpdate());
                     }
+
+                    if (value == "ERROR_AUTH_ARCHIVED")
+                    {
+                        postProcessSystem->userArchived();
+                    }
+
+                    if (value == "ERROR_AUTH_LOGINORPASSWORD")
+                    {
+                        postProcessSystem->wrongLoginOrPass();
+                    }
+
+                    if (value == "ERROR_AUTH_ALREADYLOGIN")
+                    {
+                        postProcessSystem->alreadyLogin();
+                    }
+
                 }
             }
         }

Core/dataparser.h

@@ -20,7 +20,7 @@ public:
     ~DataParser() = default;
 
     void initialize(PostProcessorSystem *postProcessSystem);
-    ServerSettings* getClientSettings();
+    Settings* getSettings();
     bool xmlParser(const QByteArray& array);
 private:
     PostProcessorSystem *postProcessSystem;

Core/dataparseroutput.cpp

@@ -125,7 +125,42 @@ void DataParserOutput::createAuthMessage(ClientAutorization *auth)
     file.close();
 }
 
-void DataParserOutput::createServerSettings(ServerSettings* serverSettings)
+void DataParserOutput::createServerSettings()
+{
+    QFile file(settingsName);
+    if (file.exists()) return;
+
+    file.open(QIODevice::WriteOnly);
+
+    QXmlStreamWriter xmlWriter(&file);
+
+    xmlWriter.setAutoFormatting(true);
+    xmlWriter.writeStartDocument();
+
+    xmlWriter.writeStartElement("ServerSettingsContainer");
+    xmlWriter.writeStartElement("ServerSettings");
+
+    xmlWriter.writeAttribute("Address","");
+    xmlWriter.writeAttribute("Port","");
+    xmlWriter.writeAttribute("Language","RUS");
+    xmlWriter.writeAttribute("AutoStart",QString::number(false));
+
+    xmlWriter.writeEndElement();
+
+    xmlWriter.writeStartElement("VersionData");
+    xmlWriter.writeAttribute("Version","-----");
+    xmlWriter.writeAttribute("isChangable","0");
+    xmlWriter.writeEndElement();
+
+    xmlWriter.writeEndElement();
+
+    xmlWriter.writeEndDocument();
+
+    file.close();
+
+}
+
+void DataParserOutput::updateServerSettings(Settings* serverSettings)
 {
     QFile file(settingsName);
     file.open(QIODevice::WriteOnly);
@@ -142,9 +177,6 @@ void DataParserOutput::createServerSettings(ServerSettings* serverSettings)
     xmlWriter.writeAttribute("Port",serverSettings->Port);
     xmlWriter.writeAttribute("Language","RUS");
     xmlWriter.writeAttribute("AutoStart",QString::number(false));
-    //xmlWriter.writeAttribute("DestPortMath","18003");
-    //xmlWriter.writeAttribute("LocalPortMath","18004");
-    //xmlWriter.writeAttribute("UseMathModel",QString::number(serverSettings->mathModelUse));
 
     xmlWriter.writeEndElement();
 

Core/dataparseroutput.h

@@ -17,7 +17,8 @@ public:
     explicit DataParserOutput(QObject *parent = 0);
     void createFileDataList(const QList<FileData>& fileDataList,const QString& filename);
     void createAuthMessage(ClientAutorization *auth);
-    void createServerSettings(ServerSettings *serverSettings);
+    void createServerSettings();
+    void updateServerSettings(Settings *serverSettings);
     void changeVersion(StreamingVersionData *versionData);
     void createAuthData(ServerAuthorization *serverAuth);
     void createAuthDataOffline(const QString& username,const QString& pass);

Core/postprocessorsystem.cpp

@@ -19,14 +19,29 @@ void PostProcessorSystem::initialize(DataParserOutput *dataParserOutput,
 
 }
 
+void PostProcessorSystem::userArchived()
+{
+    emit sigShowError(ErrorsEnum::ARCHIVED);
+}
+
+void PostProcessorSystem::wrongLoginOrPass()
+{
+    emit sigShowError(ErrorsEnum::LOGIN_OR_PASS);
+}
+
+void PostProcessorSystem::alreadyLogin()
+{
+    emit sigShowError(ErrorsEnum::ALREADYLOGIN);
+}
+
 void PostProcessorSystem::socketDisable()
 {
-    emit sigSocketDisabled();
+    emit sigShowError(ErrorsEnum::DISABLE);
 }
 
 void PostProcessorSystem::serverBlocked()
 {
-    emit sigServerBlocked();
+    emit sigShowError(ErrorsEnum::BLOCKED);
 }
 
 void PostProcessorSystem::startCompare()

Core/postprocessorsystem.h

@@ -5,6 +5,7 @@
 #include "UpdateController.h"
 #include <QObject>
 #include <Data/Datas.h>
+#include <Data/ErrorsEnum.h>
 
 class PostProcessorSystem : public QObject
 {
@@ -24,9 +25,11 @@ public:
     void saveLoginData(ServerAuthorization *auth);
     void setServerVersion(StreamingVersionData *serverVersion);
     void calculateCommonHash();
+    void userArchived();
+    void wrongLoginOrPass();
+    void alreadyLogin();
 signals:
-    void sigSocketDisabled();
+    void sigShowError(ErrorsEnum error);
-    void sigServerBlocked();
     void sigStartCompare(QList<FileData> *serverStreamingHash, QList<FileData> localStreamingHash);
     void sigCallUpdateList();
     void sigSaveLoginData(ServerAuthorization *serverAuth);

Core/tcpclient.cpp

@@ -17,7 +17,7 @@ void TCPClient::initialize(RecognizeSystem *recognize,SendSystem *sendSystem)
     emit sigSendDebugLog(Tools::getTime() + " Client started");
 }
 
-void TCPClient::setConnect(ServerSettings *serverSettings)
+void TCPClient::setConnect(Settings *serverSettings)
 {
     socket = new QTcpSocket();
     qDebug() << "TCPCLient thread: " << thread();

Core/tcpclient.h

@@ -21,7 +21,7 @@ class TCPClient : public QObject
 public:
     explicit TCPClient(QObject *parent = 0);
     void initialize(RecognizeSystem *recognize,SendSystem *sendSystem);
-    void setConnect(ServerSettings *serverSettings);
+    void setConnect(Settings *serverSettings);
     ~TCPClient(){};
     void setDisconnect();
     bool getIsConnected() const;

Data/Datas.h

@@ -5,7 +5,7 @@
 
 #include <QString>
 
-class ServerSettings{
+class Settings{
 public:
     QString Address;
     QString Port;

Data/ErrorsEnum.h

@@ -0,0 +1,13 @@
+#ifndef ERRORSENUM_H
+#define ERRORSENUM_H
+
+enum ErrorsEnum
+{
+    BLOCKED,
+    ARCHIVED,
+    LOGIN_OR_PASS,
+    ALREADYLOGIN,
+    DISABLE
+};
+
+#endif // ERRORSENUM_H

RRJClient.pro

@@ -60,6 +60,7 @@ HEADERS += \
     Core\tools.h\
     Core\hashcomparer.h \
     Data/Client.h \
+    Data/ErrorsEnum.h \
     Data/monitorInfo.h \
     Data/streamingversiondata.h \
     Data\FileData.h\
@@ -95,6 +96,7 @@ qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
 
+TARGET = ClientMPS
 RESOURCES += \
     resources.qrc
 

StaticData/settings.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <ServerSettingsContainer>
-    <ServerSettings Address="192.168.100.83" Port="6000" Language="RUS" AutoStart="0"/>
+    <ServerSettings AutoStart="0" Port="6000" Address="192.168.100.134" Language="RUS"/>
-    <VersionData Version="base" isChangable="96"/>
+    <VersionData Created="Пн дек 22 15:46:11 2025" isChangable="1" Version="max2"/>
 </ServerSettingsContainer>

Widgets/entrywidget.cpp

@@ -65,21 +65,7 @@ void EntryWidget::on_saveServerButton_clicked()
     emit sigSaveServerSettings();
 }
 
-ServerSettings *EntryWidget::getServerSettings()
+void EntryWidget::fillSettings(Settings *settings)
-{
-    ServerSettings *data = new ServerSettings;
-    QString server = ui->serverInputField->text();
-    QString port = ui->portInputField->text();
-    //bool checked = ui->mathModelUsecheckBox->isChecked();
-
-    data->Address = server;
-    data->Port = port;
-    data->mathModelUse = true;
-
-    return data;
-}
-
-void EntryWidget::fillSettings(ServerSettings *settings)
 {
     ui->serverInputField->setText(settings->Address);
     ui->portInputField->setText(settings->Port);
@@ -97,6 +83,14 @@ bool EntryWidget::getLoginWidgetIsHidden()
     return ui->loginWidget->isHidden();
 }
 
+QString EntryWidget::getAddress(){
+    return ui->serverInputField->text();
+}
+
+QString EntryWidget::getPort(){
+    return ui->portInputField->text();
+}
+
 
 EntryWidget::~EntryWidget()
 {

Widgets/entrywidget.h

@@ -20,13 +20,13 @@ public:
     void showLoginWidget(bool flag);
 
     void disconnectState();
-    void fillSettings(ServerSettings *settings);
+    void fillSettings(Settings *settings);
     void isActive(bool flag);
     bool getLoginWidgetIsHidden();
-
-    ServerSettings *getServerSettings();
     ClientAutorization* getAuthData();
 
+    QString getAddress();
+    QString getPort();
 signals:
     void sigTryLogin();
     void sigSaveServerSettings();

Widgets/updatenotifywidget.cpp

@@ -72,11 +72,7 @@ void UpdateNotifyWidget::showWithFill()
 {
     clearList();
 
-    if(!versionContainer->getLocalVersionData()->getIsChangeable())
+    if(!versionContainer->getServerVersionData()->getIsChangeable())
-    {
-        showTryChangeBase();
-    }
-    else if(!versionContainer->getServerVersionData()->getIsChangeable())
     {
         showTryChangeBase();
     }

bootstrap.cpp

@@ -11,6 +11,7 @@ Bootstrap::Bootstrap(QObject *parent) : QObject(parent)
 void Bootstrap::initialize()
 {
     qRegisterMetaType<PacketType>("PacketType");
+    qRegisterMetaType<ErrorsEnum>("ErrorsEnum");
 
     widgetManager->initialize();
     coreManager->initialize(widgetManager, workerThread);

coremanager.cpp

@@ -17,10 +17,13 @@ CoreManager::CoreManager(QObject *parent) :
     resourceManager = new ResourceManager;
     postProcessorSystem = new PostProcessorSystem;
     client = new Client;
+    settings = new Settings;
 }
 
 void CoreManager::initialize(WidgetManager *widgetManager,QThread *workerThread)
 {
+    createNewServerSettings();
+
     this->workerThread = workerThread;
     this->widgetManager = widgetManager;
 
@@ -44,19 +47,18 @@ void CoreManager::initialize(WidgetManager *widgetManager,QThread *workerThread)
 
 void CoreManager::start()
 {
-     saveServerSettingsWithConnect();
      checkAppAvailable();
 }
 
 void CoreManager::loadStaticData()
 {
-    ServerSettings *currentSettings = dataParser->getClientSettings();
+    settings = dataParser->getSettings();
-    setLanguage(currentSettings->Language);
+    setLanguage(settings->Language);
     setLocalVersion();
-    externalExecuter->setIsAutoStart(currentSettings->isAutoStart);
+    externalExecuter->setIsAutoStart(settings->isAutoStart);
     bool appAvailable = externalExecuter->findApp();
     widgetManager->setAppAvailable(appAvailable);
-    emit sigSetLoadSettings(currentSettings);
+    emit sigSetLoadSettings(settings);
 }
 
 void CoreManager::binding()
@@ -68,7 +70,8 @@ void CoreManager::binding()
     connect(this,&CoreManager::sigSendPacketType,sendSystem,&SendSystem::sendPacketType,Qt::AutoConnection);
     connect(this,&CoreManager::sigSendCheckUpdate,sendSystem,&SendSystem::sendCheckHash,Qt::AutoConnection);
     connect(this,&CoreManager::sigSendXMLAnswer,sendSystem,&SendSystem::xmlAnswer,Qt::AutoConnection);
-    connect(this,&CoreManager::sigSendAutorization,sendSystem,&SendSystem::sendClientAutorization);
+    connect(this,&CoreManager::sigSendAutorization,sendSystem,&SendSystem::sendClientAutorization,Qt::AutoConnection);
+    connect(this,&CoreManager::sigGetClientSettings,dataParser,&DataParser::getSettings,Qt::DirectConnection);
 
     connect(this,&CoreManager::sigSendUpdateToServer,updateController,&UpdateController::checkCanUpdate,Qt::AutoConnection);
     connect(this,&CoreManager::sigGetConnected,tcpClient,&TCPClient::getIsConnected);
@@ -77,8 +80,7 @@ void CoreManager::binding()
     connect(this,&CoreManager::sigSetLoadSettings,widgetManager,&WidgetManager::slotSetLoadSettings,Qt::AutoConnection);
 
     connect(postProcessorSystem,&PostProcessorSystem::sigCallUpdateList,this,&CoreManager::callUpdateList,Qt::AutoConnection);
-    connect(postProcessorSystem,&PostProcessorSystem::sigSocketDisabled,this,&CoreManager::lostConnection,Qt::AutoConnection);
+    connect(postProcessorSystem,&PostProcessorSystem::sigShowError,this,&CoreManager::showError,Qt::AutoConnection);
-    connect(postProcessorSystem,&PostProcessorSystem::sigServerBlocked,this,&CoreManager::serverBlocked,Qt::AutoConnection);
     connect(postProcessorSystem,&PostProcessorSystem::sigStartCompare,hashComparer,&HashComparer::CompareDeltas,Qt::AutoConnection);
     connect(postProcessorSystem,&PostProcessorSystem::sigSaveLoginData,this,&CoreManager::checkLoginResult,Qt::AutoConnection);
 
@@ -106,6 +108,7 @@ void CoreManager::binding()
     connect(sendSystem,&SendSystem::sigSend,this,&CoreManager::calcUpdateProgress,Qt::AutoConnection);
 
     connect(sendSystem,&SendSystem::sigGetXmlAnswer,dataParserOutput,&DataParserOutput::xmlAnswer_notify,Qt::DirectConnection);
+
 }
 
 void CoreManager::initializeSystems()
@@ -123,7 +126,7 @@ void CoreManager::initializeSystems()
 
     screenChecker->check();
 
-    emit sigSetConnect(dataParser->getClientSettings());
+    emit sigSetConnect(dataParser->getSettings());
 }
 
 void CoreManager::initializeWidgets()
@@ -164,28 +167,34 @@ void CoreManager::callUpdateList()
     emit sigSendXMLAnswer(cmd_GetServerHash);
 }
 
-void CoreManager::lostConnection()
+void CoreManager::showError(ErrorsEnum errorEnum)
 {
-    widgetManager->setLostConnectionState();
+    widgetManager->getMainWindow()->showError(errorEnum);
-    client->setIsLoggedIn(false);
+
+    if (errorEnum == ErrorsEnum::BLOCKED)
+    {
+        widgetManager->getEntryWidget()->showLoginWidget(true);
+    }
 }
 
-void CoreManager::serverBlocked()
-{
-     widgetManager->getMainWindow()->serverBlocked();
-}
 
 void CoreManager::setServerVersion(StreamingVersionData *version)
 {
     widgetManager->getMainWindow()->setServerVersion(version);
+
+    if (version->getViewName() == settings->versionData.getViewName())
+    {
+        settings->versionData.setIsChangeable(version->getIsChangeable());
+        versionContainer->getLocalVersionData()->setIsChangeable(version->getIsChangeable());
+        dataParserOutput->updateServerSettings(settings);
+    }
 }
 
 void CoreManager::setLocalVersion()
 {
-    ServerSettings *currentSettings = dataParser->getClientSettings();
     StreamingVersionData *version = new StreamingVersionData;
-    version->setName(currentSettings->LocalVersionName);
+    version->setName(settings->LocalVersionName);
-    version->setIsChangeable(currentSettings->versionData.getIsChangeable());
+    version->setIsChangeable(settings->versionData.getIsChangeable());
 
     versionContainer->setLocalVersionData(version);
     widgetManager->getMainWindow()->setClientVersionName(versionContainer->getLocalVersion());
@@ -198,7 +207,7 @@ void CoreManager::checkLoginResult(ServerAuthorization *auth)
         widgetManager->activateLoadingAnimation(true);
         checkAccessType(auth->AccessType);
         dataParserOutput->createAuthData(auth);
-        setLocalVersion();
+        //setLocalVersion();
         widgetManager->setLoginSuccess();
         widgetManager->getMainWindow()->setClientVersionName(versionContainer->getLocalVersion());
         client->setLogin(auth->ClientName);
@@ -321,7 +330,7 @@ void CoreManager::loadComplete()
     dataParserOutput->changeVersion(versionContainer->getServerVersionData());
     setLocalVersion();
     checkAutoStart();
-    widgetManager->getMainWindow()->setClientVersionName(versionContainer->getLocalVersion());
+    widgetManager->getMainWindow()->setClientVersionName(versionContainer->getServerVersionData()->getViewName());
 }
 
 void CoreManager::loadToServer()
@@ -336,7 +345,7 @@ void CoreManager::undoCurrentChanges()
     isRecovery = true;
     widgetManager->setUndoCurrentChangesState();
     emit sigSendCheckUpdate();
-    emit sigSendPacketType(PacketType::TYPE_UPDATE);
+    //emit sigSendPacketType(PacketType::TYPE_UPDATE);
     //тут был таймер
     isRecovery = false;
 }
@@ -361,9 +370,10 @@ void CoreManager::saveServerSettingsWithConnect()
     EntryWidget *entryWidget = widgetManager->getEntryWidget();
 
     entryWidget->isActive(false);
-    ServerSettings *settings = entryWidget->getServerSettings();
+    settings->LocalVersionName = dataParser->getSettings()->LocalVersionName;
-    settings->LocalVersionName = dataParser->getClientSettings()->LocalVersionName;
+    settings->Address = entryWidget->getAddress();
-    dataParserOutput->createServerSettings(settings);
+    settings->Port = entryWidget->getPort();
+    dataParserOutput->updateServerSettings(settings);
 
     if(tcpClient->getIsConnected())
     {
@@ -377,6 +387,11 @@ void CoreManager::saveServerSettingsWithConnect()
     emit sigSetConnect(settings);
 }
 
+void CoreManager::createNewServerSettings()
+{
+    dataParserOutput->createServerSettings();
+}
+
 void CoreManager::checkAppAvailable()
 {
     bool isAvailable = externalExecuter->findApp();

coremanager.h

@@ -54,15 +54,16 @@ signals:
     void sigInitializeClient(RecognizeSystem *recognize,SendSystem *sendSystem);
     void sigSendPacketType(PacketType packetType);
     void sigSendXMLAnswer(QString answer);
-    void sigSetConnect(ServerSettings* serverSettings);
+    void sigSetConnect(Settings* serverSettings);
     void sigCalculateHash();
     void sigSendAutorization();
     void sigSendCheckUpdate();
     bool sigGetConnected();
     void sigSendUpdateToServer();
+    Settings *sigGetClientSettings();
 
 
-    void sigSetLoadSettings(ServerSettings *serverSettings);
+    void sigSetLoadSettings(Settings *serverSettings);
 
 private:
     QTranslator translator;
@@ -79,6 +80,7 @@ private:
     ResourceManager *resourceManager;
     PostProcessorSystem *postProcessorSystem;
     Client *client;
+    Settings *settings;
 
     WidgetManager *widgetManager;
 
@@ -94,8 +96,7 @@ private:
     void binding();
     void initializeSystems();
     void callUpdateList();
-    void lostConnection();
+    void showError(ErrorsEnum errorEnum);
-    void serverBlocked();
     void checkLoginResult(ServerAuthorization *auth);
     void checkAccessType(const QString &accessType);
     void setServerVersion(StreamingVersionData *version);
@@ -106,6 +107,7 @@ private:
     void checkUpdate();
 
     void setInlineDebug(QString text);
+    void createNewServerSettings();
 };
 
 #endif // COREMANAGER_H

mainwindow.cpp

@@ -12,7 +12,7 @@
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent),
       ui(new Ui::MainWindow),
-      bottomRightPosition(QRect(530,505,250,40)),
+      bottomRightPosition(QRect(530,506,250,40)),
       offlinePosition(240,340,300,40)
 {
     ui->setupUi(this);
@@ -97,16 +97,37 @@ void MainWindow::setNeedUpdateState(const QString& notifyText)
     ui->autostartCheckBox->show();
 }
 
-void MainWindow::serverBlocked()
-{
-    ui->notificationLabel->show();
-    QPalette palette = ui->notificationLabel->palette();
-    QColor orangeColor(255,165,0);
-    palette.setColor(ui->notificationLabel->foregroundRole(),orangeColor);
-    ui->notificationLabel->setText(tr("Сервер заблокирован"));
 
-    ui->notificationLabel->setPalette(palette);
+void MainWindow::showError(ErrorsEnum errorNum)
-    timer->start(3000);
+{
+        if (errorNum == ErrorsEnum::BLOCKED)
+        {
+            serverNotifyShow(tr("Сервер заблокирован"));
+
+        }
+        else if (errorNum == ErrorsEnum::DISABLE)
+        {
+            showConnectionEmpty();
+        }
+        else if (errorNum == ErrorsEnum::LOGIN_OR_PASS)
+        {
+            serverNotifyShow(tr("Неверный логин/пароль"));
+        }
+        else if (errorNum == ErrorsEnum::ARCHIVED)
+        {
+            serverNotifyShow(tr("Пользователь в архиве"));
+        }
+        else if (errorNum == ErrorsEnum::ALREADYLOGIN)
+        {
+            serverNotifyShow(tr("Пользователь уже в сети"));
+        }
+}
+
+void MainWindow::serverNotifyShow(QString text, int durationMS)
+{
+    ui->notificationLabel->setText(text);
+    ui->notificationLabel->show();
+    timer->start(durationMS);
 }
 
 void MainWindow::setLoginSuccessState()
@@ -116,19 +137,6 @@ void MainWindow::setLoginSuccessState()
     ui->versionLayoutWidget->show();
 }
 
-void MainWindow::setLoginFailedState()
-{
-    ui->notificationLabel->setText(tr("Неверный логин/пароль"));
-    timer->setInterval(3000);
-    timer->start();
-
-    QPalette palette = ui->notificationLabel->palette();
-    palette.setColor(ui->notificationLabel->foregroundRole(), Qt::red);
-
-    ui->notificationLabel->setPalette(palette);
-    ui->notificationLabel->show();
-}
-
 void MainWindow::setStartOfflineButton(bool isAvailable)
 {
     ui->offlineStartButton->setEnabled(isAvailable);
@@ -327,7 +335,7 @@ void MainWindow::addWidgetToInteractiveGroup(EntryWidget *entryWidget)
     this->entryWidget = entryWidget;
 }
 
-void MainWindow::setLoadSettings(ServerSettings *serverSettings)
+void MainWindow::setLoadSettings(Settings *serverSettings)
 {
     ui->retranslateUi(this);
 

mainwindow.h

@@ -29,9 +29,8 @@ public:
     void initialize(ResourceManager *resourceManager);
     void addWidgetToChangeGroup(CommonButtonGroupWidget *commonWidgetGroup);
     void addWidgetToInteractiveGroup(EntryWidget *entryWidget);
-    void setLoadSettings(ServerSettings *serverSettings);
+    void setLoadSettings(Settings *serverSettings);
     void setLoginSuccessState();
-    void setLoginFailedState();
     void setClientVersionName(const QString &versionName);
 
     void loadToServer();
@@ -47,9 +46,11 @@ public:
     void showOfflineButton(bool flag);
     void setStartOfflineButton(bool isAvailable);
     void setStartState();
-    void serverBlocked();
+    void serverNotifyShow(QString text, int durationMS = 3000);
+    void showError(ErrorsEnum errorNum);
 
     QHBoxLayout *getDisplayLayout() const;
+    void serverBlockedState();
 public slots:
     void slotShowUpdateInfo();
     void slotConnectionState(bool flag);

mainwindow.ui

@@ -427,7 +427,7 @@
      <property name="geometry">
       <rect>
        <x>530</x>
-       <y>510</y>
+       <y>511</y>
        <width>250</width>
        <height>40</height>
       </rect>

widgetmanager.cpp

@@ -35,7 +35,7 @@ void WidgetManager::binding()
     connect(commonButtonGroupWidget,&CommonButtonGroupWidget::sigUpdateCommonWidget,mainWindow,&MainWindow::slotCommonWidgetState);
     connect(mainWindow,&MainWindow::sigShowSettings,this,&WidgetManager::showSettings,Qt::AutoConnection);
 }
-void WidgetManager::slotSetLoadSettings(ServerSettings *settings)
+void WidgetManager::slotSetLoadSettings(Settings *settings)
 {
     mainWindow->setLoadSettings(settings);
     entryWidget->fillSettings(settings);
@@ -60,7 +60,6 @@ void WidgetManager::setLoginSuccess()
 void WidgetManager::setLoginFailed()
 {
     entryWidget->showLoginWidget(true);
-    mainWindow->setLoginFailedState();
     activateLoadingAnimation(false);
 }
 
@@ -161,7 +160,7 @@ void WidgetManager::setUndoCurrentChangesState()
     waitAnimationWidget->showWithPlay();
     mainWindow->undoCurrentChanges();
     updateWidget->hide();
-    commonButtonGroupWidget->showProgressBar(false);
+    commonButtonGroupWidget->showProgressBar(true);
     //waitAnimationWidget->hideWithStop();
 }
 

widgetmanager.h

@@ -49,7 +49,7 @@ public:
     void slotInlineDebug(const QString &text);
 public slots:
     void showSettings(bool isActive);
-    void slotSetLoadSettings(ServerSettings *settings);
+    void slotSetLoadSettings(Settings *settings);
     void slotActivateLoadAnimation(bool flag);
 signals: