feat: display Update size and notification

Core/recognizesystem.cpp

@@ -167,14 +167,13 @@ void RecognizeSystem::Recognize(QTcpSocket *socket)
                 sizeReceiveData += toFile;
                 countSend++;
 
-                emit UpdateBytesAvailable(fileSize,sizeReceiveData);
-
                 tmpBlock.clear();
 
                 if(sizeReceiveData == fileSize){
                     emit onSendDebugLog(Tools::GetTime() + "FINAL Count send: " + QString::number(countSend));
                     emit onSendDebugLog(Tools::GetTime() + "FINAL Size received: " + QString::number(sizeReceiveData));
                     emit onSendDebugLog(Tools::GetTime() + "FINAL File size" + QString::number(fileSize));
+                    emit UpdateBytesAvailable(fileSize,sizeReceiveData);
                     break;
                 }
             }
@@ -234,12 +233,13 @@ void RecognizeSystem::Recognize(QTcpSocket *socket)
         if(packetType == PacketType::TYPE_NEEDUPDATE){  //нужно обновление
 
             bool flag;
+            quint64 size;
 
             stream.startTransaction();
             stream >> flag;
+            stream >> size;
 
-
+            emit onNeedUpdate(flag,size);
-            emit onNeedUpdate(flag);
             packetType = PacketType::TYPE_NONE;
         }
 

Core/recognizesystem.h

@@ -24,7 +24,7 @@ public:
 signals:
     void UpdateBytesAvailable(qint64 size,quint64 sended);
     void LoadComplete();
-    void onNeedUpdate(bool flag);
+    void onNeedUpdate(bool flag,qint64 size);
     void onSendDebugLog(QString message);
     void SockedDisabled();
     void SaveLoginData(ServerAuthorization *serverAuth);

debug/moc_mainwindow.cpp

@@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
 struct qt_meta_stringdata_MainWindow_t {
-    QByteArrayData data[19];
+    QByteArrayData data[23];
-    char stringdata0[329];
+    char stringdata0[391];
 };
 #define QT_MOC_LITERAL(idx, ofs, len) \
     Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -50,7 +50,11 @@ QT_MOC_LITERAL(14, 205, 22), // "on_loginButton_clicked"
 QT_MOC_LITERAL(15, 228, 23), // "on_updateButton_clicked"
 QT_MOC_LITERAL(16, 252, 22), // "on_startButton_clicked"
 QT_MOC_LITERAL(17, 275, 27), // "on_saveServerButton_clicked"
-QT_MOC_LITERAL(18, 303, 25) // "on_settingsButton_clicked"
+QT_MOC_LITERAL(18, 303, 25), // "on_settingsButton_clicked"
+QT_MOC_LITERAL(19, 329, 13), // "disableNotify"
+QT_MOC_LITERAL(20, 343, 17), // "onConnectionState"
+QT_MOC_LITERAL(21, 361, 4), // "flag"
+QT_MOC_LITERAL(22, 366, 24) // "on_connectButton_clicked"
 
     },
     "MainWindow\0onInitializeClient\0\0"
@@ -62,7 +66,8 @@ QT_MOC_LITERAL(18, 303, 25) // "on_settingsButton_clicked"
     "message\0on_loginButton_clicked\0"
     "on_updateButton_clicked\0on_startButton_clicked\0"
     "on_saveServerButton_clicked\0"
-    "on_settingsButton_clicked"
+    "on_settingsButton_clicked\0disableNotify\0"
+    "onConnectionState\0flag\0on_connectButton_clicked"
 };
 #undef QT_MOC_LITERAL
 
@@ -72,7 +77,7 @@ static const uint qt_meta_data_MainWindow[] = {
        8,       // revision
        0,       // classname
        0,    0, // classinfo
-      10,   14, // methods
+      13,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
        0,    0, // constructors
@@ -80,18 +85,21 @@ static const uint qt_meta_data_MainWindow[] = {
        5,       // signalCount
 
  // signals: name, argc, parameters, tag, flags
-       1,    2,   64,    2, 0x06 /* Public */,
+       1,    2,   79,    2, 0x06 /* Public */,
-       7,    1,   69,    2, 0x06 /* Public */,
+       7,    1,   84,    2, 0x06 /* Public */,
-      10,    0,   72,    2, 0x06 /* Public */,
+      10,    0,   87,    2, 0x06 /* Public */,
-      11,    0,   73,    2, 0x06 /* Public */,
+      11,    0,   88,    2, 0x06 /* Public */,
-      12,    1,   74,    2, 0x06 /* Public */,
+      12,    1,   89,    2, 0x06 /* Public */,
 
  // slots: name, argc, parameters, tag, flags
-      14,    0,   77,    2, 0x08 /* Private */,
+      14,    0,   92,    2, 0x08 /* Private */,
-      15,    0,   78,    2, 0x08 /* Private */,
+      15,    0,   93,    2, 0x08 /* Private */,
-      16,    0,   79,    2, 0x08 /* Private */,
+      16,    0,   94,    2, 0x08 /* Private */,
-      17,    0,   80,    2, 0x08 /* Private */,
+      17,    0,   95,    2, 0x08 /* Private */,
-      18,    0,   81,    2, 0x08 /* Private */,
+      18,    0,   96,    2, 0x08 /* Private */,
+      19,    0,   97,    2, 0x08 /* Private */,
+      20,    1,   98,    2, 0x08 /* Private */,
+      22,    0,  101,    2, 0x08 /* Private */,
 
  // signals: parameters
     QMetaType::Void, 0x80000000 | 3, 0x80000000 | 5,    4,    6,
@@ -105,6 +113,9 @@ static const uint qt_meta_data_MainWindow[] = {
     QMetaType::Void,
     QMetaType::Void,
     QMetaType::Void,
+    QMetaType::Void,
+    QMetaType::Void,
+    QMetaType::Void, QMetaType::Bool,   21,
     QMetaType::Void,
 
        0        // eod
@@ -126,6 +137,9 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
         case 7: _t->on_startButton_clicked(); break;
         case 8: _t->on_saveServerButton_clicked(); break;
         case 9: _t->on_settingsButton_clicked(); break;
+        case 10: _t->disableNotify(); break;
+        case 11: _t->onConnectionState((*reinterpret_cast< bool(*)>(_a[1]))); break;
+        case 12: _t->on_connectButton_clicked(); break;
         default: ;
         }
     } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
@@ -210,13 +224,13 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 10)
+        if (_id < 13)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 10;
+        _id -= 13;
     } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
-        if (_id < 10)
+        if (_id < 13)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 10;
+        _id -= 13;
     }
     return _id;
 }

debug/moc_recognizesystem.cpp

@@ -75,16 +75,16 @@ static const uint qt_meta_data_RecognizeSystem[] = {
  // signals: name, argc, parameters, tag, flags
        1,    2,   49,    2, 0x06 /* Public */,
        5,    0,   54,    2, 0x06 /* Public */,
-       6,    1,   55,    2, 0x06 /* Public */,
+       6,    2,   55,    2, 0x06 /* Public */,
-       8,    1,   58,    2, 0x06 /* Public */,
+       8,    1,   60,    2, 0x06 /* Public */,
-      10,    0,   61,    2, 0x06 /* Public */,
+      10,    0,   63,    2, 0x06 /* Public */,
-      11,    1,   62,    2, 0x06 /* Public */,
+      11,    1,   64,    2, 0x06 /* Public */,
-      14,    1,   65,    2, 0x06 /* Public */,
+      14,    1,   67,    2, 0x06 /* Public */,
 
  // signals: parameters
     QMetaType::Void, QMetaType::LongLong, QMetaType::ULongLong,    3,    4,
     QMetaType::Void,
-    QMetaType::Void, QMetaType::Bool,    7,
+    QMetaType::Void, QMetaType::Bool, QMetaType::LongLong,    7,    3,
     QMetaType::Void, QMetaType::QString,    9,
     QMetaType::Void,
     QMetaType::Void, 0x80000000 | 12,   13,
@@ -101,7 +101,7 @@ void RecognizeSystem::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int
         switch (_id) {
         case 0: _t->UpdateBytesAvailable((*reinterpret_cast< qint64(*)>(_a[1])),(*reinterpret_cast< quint64(*)>(_a[2]))); break;
         case 1: _t->LoadComplete(); break;
-        case 2: _t->onNeedUpdate((*reinterpret_cast< bool(*)>(_a[1]))); break;
+        case 2: _t->onNeedUpdate((*reinterpret_cast< bool(*)>(_a[1])),(*reinterpret_cast< qint64(*)>(_a[2]))); break;
         case 3: _t->onSendDebugLog((*reinterpret_cast< QString(*)>(_a[1]))); break;
         case 4: _t->SockedDisabled(); break;
         case 5: _t->SaveLoginData((*reinterpret_cast< ServerAuthorization*(*)>(_a[1]))); break;
@@ -125,7 +125,7 @@ void RecognizeSystem::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int
             }
         }
         {
-            using _t = void (RecognizeSystem::*)(bool );
+            using _t = void (RecognizeSystem::*)(bool , qint64 );
             if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&RecognizeSystem::onNeedUpdate)) {
                 *result = 2;
                 return;
@@ -216,9 +216,9 @@ void RecognizeSystem::LoadComplete()
 }
 
 // SIGNAL 2
-void RecognizeSystem::onNeedUpdate(bool _t1)
+void RecognizeSystem::onNeedUpdate(bool _t1, qint64 _t2)
 {
-    void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) };
+    void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t2))) };
     QMetaObject::activate(this, &staticMetaObject, 2, _a);
 }
 

hash.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FileDataList>
     <FileData Path="/Application" Hash="FOLDER"/>
-    <FileData Path="/Application/RRJ_Build" Hash="FOLDER"/>
 </FileDataList>

mainwindow.cpp

@@ -1,6 +1,8 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 
+#include <QTimer>
+
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
@@ -8,6 +10,7 @@ MainWindow::MainWindow(QWidget *parent)
 {
     ui->setupUi(this);
     Initialize();
+
 }
 
 
@@ -19,12 +22,13 @@ void MainWindow::Initialize()
     ui->notificationLabel->hide();
     ui->loadingProgressBar->hide();
     ui->updateButton->hide();
+    ui->connectButton->hide();
     ui->startButton->setEnabled(false);
+    ui->debugText->hide();
 
     updateControllerThread = new QThread;
     connectionThread = new QThread;
 
-
     client = new TCPClient;
     client->moveToThread(connectionThread);
 
@@ -37,6 +41,9 @@ void MainWindow::Initialize()
     screenChecker = new ScreenChecker;
     externalExecuter = new ExternalExecuter;
 
+    timer = new QTimer;
+    connect(timer,&QTimer::timeout,this,&MainWindow::disableNotify);
+
     connect(recognizeSystem,&RecognizeSystem::UpdateBytesAvailable,this,&MainWindow::UpdateProgress);
     connect(recognizeSystem,&RecognizeSystem::LoadComplete,this,&MainWindow::LoadComplete);
     connect(recognizeSystem,&RecognizeSystem::onNeedUpdate,this,&MainWindow::SetNeedUpdate);
@@ -54,9 +61,10 @@ void MainWindow::Initialize()
     connect(client,&TCPClient::onSendDebugLog,this,&MainWindow::DebugLog,Qt::AutoConnection);
 
     connect(this,&MainWindow::onInitializeClient,client,&TCPClient::Initialize,Qt::AutoConnection);
-    connect(this,&MainWindow::onSetConnect,client,&TCPClient::SetConnect,Qt::AutoConnection); //умирает
+    connect(this,&MainWindow::onSetConnect,client,&TCPClient::SetConnect,Qt::AutoConnection);
     connect(this,&MainWindow::onSendMessage,client,&TCPClient::MessageEntered,Qt::AutoConnection);
     connect(this,&MainWindow::SendClientAuthorization,client,&TCPClient::SendClientAutorization,Qt::AutoConnection);
+    connect(client,&TCPClient::ConnectionState,this,&MainWindow::onConnectionState);
 
     connect(this,&MainWindow::onCalculateHash,updateController,&UpdateController::CalculateHash);
 
@@ -66,11 +74,11 @@ void MainWindow::Initialize()
     recognizeSystem->Initialize(updateController,dataParser);
 
     screenChecker->Check();
-    ui->disblayCount->setText(screenChecker->getScreenCount());
     ui->updateButton->setEnabled(false);
     ui->startButton->setEnabled(false);
 
     maxBytesAvailable = 0;
+    globalValue = 0;
     ui->loadingProgressBar->setValue(0);
 
     emit onSetConnect(dataParser->GetServerSettings());
@@ -80,11 +88,10 @@ void MainWindow::Initialize()
 
 void MainWindow::UpdateProgress(qint64 size,quint64 sended)
 {
+    float currentValue = 100.00 / (maxBytesAvailable / size);
+    globalValue += currentValue;
 
-    ui->loadingProgressBar->setMaximum(size);
+    ui->loadingProgressBar->setValue(globalValue);
-    ui->loadingProgressBar->setMinimum(0);
-
-    ui->loadingProgressBar->setValue(sended);
 }
 
 void MainWindow::LoadComplete()
@@ -95,29 +102,49 @@ void MainWindow::LoadComplete()
     ui->startButton->setEnabled(true);
 }
 
-void MainWindow::SetNeedUpdate(bool flag)
+void MainWindow::SetNeedUpdate(bool flag,quint64 size)
 {
+    maxBytesAvailable = 0;
+    if(flag){
+        quint64 megaByte = size / (1024 * 1024);
+        QString result = "Доступно обновление: " + QString::number(megaByte) + " мегабайт";
+        ui->inlineTextDebug->setText(result);
+        maxBytesAvailable = size;
+    }else{
+        ui->inlineTextDebug->setText("Установлена последняя версия");
+    }
+
     ui->updateButton->setEnabled(flag);
     ui->startButton->setEnabled(!flag);
+    ui->loadingProgressBar->setRange(0,100);
 }
 
 void MainWindow::LostConnection()
 {
     ui->loadingProgressBar->setValue(0);
-
 }
 
 void MainWindow::CheckLoginResult(ServerAuthorization *serverAuth)
 {
     if (serverAuth->Result){
         emit onSendMessage("check");
+
+        ui->inlineTextDebug->setText("Проверка обновлений...");
         ui->loadingProgressBar->show();
         ui->updateButton->show();
         dataParser->CreateAuthData(serverAuth);
+        ui->loginWidget->hide();
 
     }
     else {
         ui->notificationLabel->setText("Неверный логин/пароль");
+        timer->setInterval(3000);
+        timer->start();
+
+        QPalette palette = ui->notificationLabel->palette();
+        palette.setColor(ui->notificationLabel->foregroundRole(), Qt::red);
+
+        ui->notificationLabel->setPalette(palette);
         ui->notificationLabel->show();
     }
 
@@ -179,6 +206,39 @@ void MainWindow::on_settingsButton_clicked()
     ui->portInputField->setText(currentSettings->Port);
 }
 
+void MainWindow::disableNotify()
+{
+    ui->notificationLabel->hide();
+
+    QPalette palette = ui->notificationLabel->palette();
+    palette.setColor(ui->notificationLabel->foregroundRole(), Qt::black);
+
+    ui->notificationLabel->setPalette(palette);
+    timer->stop();
+}
+
+void MainWindow::onConnectionState(bool flag)
+{
+    ui->notificationLabel->show();
+    QPalette palette = ui->notificationLabel->palette();
+
+    if(flag)
+    {
+        palette.setColor(ui->notificationLabel->foregroundRole(),Qt::green);
+        ui->notificationLabel->setText("Соединение установлено");
+        ui->connectButton->hide();
+    }
+    else
+    {
+        palette.setColor(ui->notificationLabel->foregroundRole(),Qt::red);
+        ui->notificationLabel->setText("Соединение отсутсвует");
+        ui->connectButton->show();
+    }
+
+    ui->notificationLabel->setPalette(palette);
+    timer->start(3000);
+}
+
 void MainWindow::DebugLog(QString message)
 {
     ui->debugText->append(message);
@@ -198,3 +258,7 @@ MainWindow::~MainWindow()
     delete ui;
 }
 
+void MainWindow::on_connectButton_clicked()
+{
+    emit onSetConnect(dataParser->GetServerSettings());
+}

mainwindow.h

@@ -48,6 +48,12 @@ private slots:
 
     void on_settingsButton_clicked();
 
+    void disableNotify();
+
+    void onConnectionState(bool flag);
+
+    void on_connectButton_clicked();
+
 private:
     Ui::MainWindow *ui;
     TCPClient *client;
@@ -59,12 +65,14 @@ private:
     QThread *connectionThread;
     QThread *updateControllerThread;
     quint64 maxBytesAvailable;
+    QTimer *timer;
+    float globalValue;
 
     void DebugLog(QString message);
     void Initialize();
     void UpdateProgress(qint64 size,quint64 sended);
     void LoadComplete();
-    void SetNeedUpdate(bool flag);
+    void SetNeedUpdate(bool flag,quint64 size);
     void LostConnection();
     void CheckLoginResult(ServerAuthorization * serverAuth);
     void CheckAppAvailable();

mainwindow.ui

@@ -6,278 +6,342 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>993</width>
+    <width>700</width>
-    <height>571</height>
+    <height>500</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>700</width>
+    <height>500</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>700</width>
+    <height>500</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>Updater</string>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <widget class="QWidget" name="loginWidget" native="true">
+   <widget class="QWidget" name="horizontalLayoutWidget">
-    <property name="enabled">
-     <bool>true</bool>
-    </property>
-    <property name="geometry">
-     <rect>
-      <x>300</x>
-      <y>100</y>
-      <width>371</width>
-      <height>291</height>
-     </rect>
-    </property>
-    <property name="autoFillBackground">
-     <bool>false</bool>
-    </property>
-    <widget class="QWidget" name="layoutWidget">
-     <property name="geometry">
-      <rect>
-       <x>100</x>
-       <y>80</y>
-       <width>171</width>
-       <height>31</height>
-      </rect>
-     </property>
-     <layout class="QHBoxLayout" name="loginLayout">
-      <item>
-       <widget class="QLabel" name="loginTitle">
-        <property name="text">
-         <string>Логин:</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="loginInputField"/>
-      </item>
-     </layout>
-    </widget>
-    <widget class="QWidget" name="layoutWidget">
-     <property name="geometry">
-      <rect>
-       <x>100</x>
-       <y>120</y>
-       <width>171</width>
-       <height>26</height>
-      </rect>
-     </property>
-     <layout class="QHBoxLayout" name="passwordLayout">
-      <item>
-       <widget class="QLabel" name="passwordTitle">
-        <property name="text">
-         <string>Пароль:</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="passwordInputField"/>
-      </item>
-     </layout>
-    </widget>
-    <widget class="QWidget" name="layoutWidget">
-     <property name="geometry">
-      <rect>
-       <x>100</x>
-       <y>180</y>
-       <width>168</width>
-       <height>27</height>
-      </rect>
-     </property>
-     <layout class="QHBoxLayout" name="loginButtonsLayout">
-      <item>
-       <widget class="QPushButton" name="settingsButton">
-        <property name="text">
-         <string>Настройки</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="loginButton">
-        <property name="text">
-         <string>Войти</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-    <widget class="QLineEdit" name="notificationLabel">
-     <property name="geometry">
-      <rect>
-       <x>100</x>
-       <y>50</y>
-       <width>191</width>
-       <height>24</height>
-      </rect>
-     </property>
-     <property name="text">
-      <string>Неверный логин/пароль</string>
-     </property>
-    </widget>
-   </widget>
-   <widget class="QWidget" name="settingsWidget" native="true">
-    <property name="enabled">
-     <bool>true</bool>
-    </property>
-    <property name="geometry">
-     <rect>
-      <x>300</x>
-      <y>100</y>
-      <width>364</width>
-      <height>226</height>
-     </rect>
-    </property>
-    <property name="autoFillBackground">
-     <bool>false</bool>
-    </property>
-    <widget class="QPushButton" name="saveServerButton">
-     <property name="geometry">
-      <rect>
-       <x>130</x>
-       <y>170</y>
-       <width>101</width>
-       <height>41</height>
-      </rect>
-     </property>
-     <property name="text">
-      <string>Сохранить</string>
-     </property>
-    </widget>
-    <widget class="QWidget" name="layoutWidget_4">
-     <property name="geometry">
-      <rect>
-       <x>100</x>
-       <y>80</y>
-       <width>171</width>
-       <height>31</height>
-      </rect>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_6">
-      <item>
-       <widget class="QLabel" name="serverTitle">
-        <property name="text">
-         <string>Сервер:</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="serverInputField"/>
-      </item>
-     </layout>
-    </widget>
-    <widget class="QWidget" name="layoutWidget_5">
-     <property name="geometry">
-      <rect>
-       <x>100</x>
-       <y>120</y>
-       <width>171</width>
-       <height>26</height>
-      </rect>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_7">
-      <item>
-       <widget class="QLabel" name="portTitle">
-        <property name="text">
-         <string>Порт:</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="portInputField"/>
-      </item>
-     </layout>
-    </widget>
-   </widget>
-   <widget class="QWidget" name="layoutWidget">
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>490</y>
-      <width>971</width>
-      <height>27</height>
-     </rect>
-    </property>
-    <layout class="QHBoxLayout" name="downLayout">
-     <item>
-      <widget class="QProgressBar" name="loadingProgressBar">
-       <property name="value">
-        <number>10</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="updateButton">
-       <property name="enabled">
-        <bool>true</bool>
-       </property>
-       <property name="text">
-        <string>Обновить</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="startButton">
-       <property name="enabled">
-        <bool>true</bool>
-       </property>
-       <property name="text">
-        <string>Запуск</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-   <widget class="QWidget" name="layoutWidget">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>470</y>
-      <width>194</width>
-      <height>18</height>
-     </rect>
-    </property>
-    <layout class="QHBoxLayout" name="displayLayout">
-     <item>
-      <widget class="QLabel" name="displayCountTitle">
-       <property name="text">
-        <string>Доступно мониторов: </string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="disblayCount">
-       <property name="text">
-        <string>0</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-   <widget class="QTextEdit" name="debugText">
-    <property name="geometry">
-     <rect>
-      <x>630</x>
       <y>10</y>
-      <width>341</width>
+      <width>682</width>
-      <height>461</height>
+      <height>307</height>
      </rect>
     </property>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="sizeConstraint">
+      <enum>QLayout::SetDefaultConstraint</enum>
+     </property>
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QWidget" name="loginWidget" native="true">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="autoFillBackground">
+        <bool>false</bool>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <widget class="QLabel" name="notificationLabel">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="loginLayout">
+          <item>
+           <widget class="QLabel" name="loginTitle">
+            <property name="text">
+             <string>Логин:</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLineEdit" name="loginInputField"/>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="passwordLayout">
+          <item>
+           <widget class="QLabel" name="passwordTitle">
+            <property name="text">
+             <string>Пароль:</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLineEdit" name="passwordInputField"/>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="loginButtonsLayout">
+          <item>
+           <widget class="QPushButton" name="settingsButton">
+            <property name="text">
+             <string>Настройки</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="loginButton">
+            <property name="text">
+             <string>Войти</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QWidget" name="settingsWidget" native="true">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="autoFillBackground">
+        <bool>false</bool>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <layout class="QHBoxLayout" name="serverInputLayout">
+          <item>
+           <widget class="QLabel" name="serverTitle">
+            <property name="text">
+             <string>Сервер:</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLineEdit" name="serverInputField"/>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="portInputLayout">
+          <item>
+           <widget class="QLabel" name="portTitle">
+            <property name="text">
+             <string>Порт:</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLineEdit" name="portInputField"/>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <widget class="QPushButton" name="saveServerButton">
+          <property name="text">
+           <string>Сохранить</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QTextEdit" name="debugText">
+       <property name="enabled">
+        <bool>false</bool>
+       </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>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>250</width>
+         <height>16777215</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+   <widget class="QWidget" name="">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>420</y>
+      <width>681</width>
+      <height>61</height>
+     </rect>
+    </property>
+    <layout class="QHBoxLayout" name="downlayout">
+     <item>
+      <layout class="QVBoxLayout" name="downLayoutLoadingSlider">
+       <item>
+        <widget class="QProgressBar" name="loadingProgressBar">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="value">
+          <number>10</number>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="inlineTextDebug">
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="downLayoutButtons">
+       <property name="sizeConstraint">
+        <enum>QLayout::SetFixedSize</enum>
+       </property>
+       <property name="bottomMargin">
+        <number>27</number>
+       </property>
+       <item>
+        <widget class="QPushButton" name="connectButton">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>100</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>100</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>Соединиться</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="updateButton">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>100</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>100</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>Обновить</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="startButton">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>100</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>100</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>Запуск</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
    </widget>
-   <zorder>settingsWidget</zorder>
-   <zorder>layoutWidget</zorder>
-   <zorder>layoutWidget</zorder>
-   <zorder>loginWidget</zorder>
-   <zorder>debugText</zorder>
   </widget>
-  <widget class="QMenuBar" name="menubar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>993</width>
-     <height>25</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QStatusBar" name="statusbar"/>
  </widget>
  <resources/>
  <connections/>

ui_mainwindow.h

@@ -15,11 +15,10 @@
 #include <QtWidgets/QLabel>
 #include <QtWidgets/QLineEdit>
 #include <QtWidgets/QMainWindow>
-#include <QtWidgets/QMenuBar>
 #include <QtWidgets/QProgressBar>
 #include <QtWidgets/QPushButton>
-#include <QtWidgets/QStatusBar>
 #include <QtWidgets/QTextEdit>
+#include <QtWidgets/QVBoxLayout>
 #include <QtWidgets/QWidget>
 
 QT_BEGIN_NAMESPACE
@@ -28,202 +27,248 @@ class Ui_MainWindow
 {
 public:
     QWidget *centralwidget;
+    QWidget *horizontalLayoutWidget;
+    QHBoxLayout *horizontalLayout;
     QWidget *loginWidget;
-    QWidget *layoutWidget;
+    QVBoxLayout *verticalLayout;
+    QLabel *notificationLabel;
     QHBoxLayout *loginLayout;
     QLabel *loginTitle;
     QLineEdit *loginInputField;
-    QWidget *layoutWidget1;
     QHBoxLayout *passwordLayout;
     QLabel *passwordTitle;
     QLineEdit *passwordInputField;
-    QWidget *layoutWidget2;
     QHBoxLayout *loginButtonsLayout;
     QPushButton *settingsButton;
     QPushButton *loginButton;
-    QLineEdit *notificationLabel;
     QWidget *settingsWidget;
-    QPushButton *saveServerButton;
+    QVBoxLayout *verticalLayout_2;
-    QWidget *layoutWidget_4;
+    QHBoxLayout *serverInputLayout;
-    QHBoxLayout *horizontalLayout_6;
     QLabel *serverTitle;
     QLineEdit *serverInputField;
-    QWidget *layoutWidget_5;
+    QHBoxLayout *portInputLayout;
-    QHBoxLayout *horizontalLayout_7;
     QLabel *portTitle;
     QLineEdit *portInputField;
-    QWidget *layoutWidget3;
+    QPushButton *saveServerButton;
-    QHBoxLayout *downLayout;
+    QTextEdit *debugText;
+    QWidget *widget;
+    QHBoxLayout *downlayout;
+    QVBoxLayout *downLayoutLoadingSlider;
     QProgressBar *loadingProgressBar;
+    QLabel *inlineTextDebug;
+    QHBoxLayout *downLayoutButtons;
+    QPushButton *connectButton;
     QPushButton *updateButton;
     QPushButton *startButton;
-    QWidget *layoutWidget4;
-    QHBoxLayout *displayLayout;
-    QLabel *displayCountTitle;
-    QLabel *disblayCount;
-    QTextEdit *debugText;
-    QMenuBar *menubar;
-    QStatusBar *statusbar;
 
     void setupUi(QMainWindow *MainWindow)
     {
         if (MainWindow->objectName().isEmpty())
             MainWindow->setObjectName(QString::fromUtf8("MainWindow"));
-        MainWindow->resize(993, 571);
+        MainWindow->resize(700, 500);
+        QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(MainWindow->sizePolicy().hasHeightForWidth());
+        MainWindow->setSizePolicy(sizePolicy);
+        MainWindow->setMinimumSize(QSize(700, 500));
+        MainWindow->setMaximumSize(QSize(700, 500));
         centralwidget = new QWidget(MainWindow);
         centralwidget->setObjectName(QString::fromUtf8("centralwidget"));
-        loginWidget = new QWidget(centralwidget);
+        horizontalLayoutWidget = new QWidget(centralwidget);
+        horizontalLayoutWidget->setObjectName(QString::fromUtf8("horizontalLayoutWidget"));
+        horizontalLayoutWidget->setGeometry(QRect(10, 10, 682, 307));
+        horizontalLayout = new QHBoxLayout(horizontalLayoutWidget);
+        horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
+        horizontalLayout->setSizeConstraint(QLayout::SetDefaultConstraint);
+        horizontalLayout->setContentsMargins(0, 0, 0, 0);
+        loginWidget = new QWidget(horizontalLayoutWidget);
         loginWidget->setObjectName(QString::fromUtf8("loginWidget"));
         loginWidget->setEnabled(true);
-        loginWidget->setGeometry(QRect(300, 100, 371, 291));
+        sizePolicy.setHeightForWidth(loginWidget->sizePolicy().hasHeightForWidth());
+        loginWidget->setSizePolicy(sizePolicy);
         loginWidget->setAutoFillBackground(false);
-        layoutWidget = new QWidget(loginWidget);
+        verticalLayout = new QVBoxLayout(loginWidget);
-        layoutWidget->setObjectName(QString::fromUtf8("layoutWidget"));
+        verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
-        layoutWidget->setGeometry(QRect(100, 80, 171, 31));
+        notificationLabel = new QLabel(loginWidget);
-        loginLayout = new QHBoxLayout(layoutWidget);
+        notificationLabel->setObjectName(QString::fromUtf8("notificationLabel"));
+        sizePolicy.setHeightForWidth(notificationLabel->sizePolicy().hasHeightForWidth());
+        notificationLabel->setSizePolicy(sizePolicy);
+
+        verticalLayout->addWidget(notificationLabel);
+
+        loginLayout = new QHBoxLayout();
         loginLayout->setObjectName(QString::fromUtf8("loginLayout"));
-        loginLayout->setContentsMargins(0, 0, 0, 0);
+        loginTitle = new QLabel(loginWidget);
-        loginTitle = new QLabel(layoutWidget);
         loginTitle->setObjectName(QString::fromUtf8("loginTitle"));
 
         loginLayout->addWidget(loginTitle);
 
-        loginInputField = new QLineEdit(layoutWidget);
+        loginInputField = new QLineEdit(loginWidget);
         loginInputField->setObjectName(QString::fromUtf8("loginInputField"));
 
         loginLayout->addWidget(loginInputField);
 
-        layoutWidget1 = new QWidget(loginWidget);
+
-        layoutWidget1->setObjectName(QString::fromUtf8("layoutWidget1"));
+        verticalLayout->addLayout(loginLayout);
-        layoutWidget1->setGeometry(QRect(100, 120, 171, 26));
+
-        passwordLayout = new QHBoxLayout(layoutWidget1);
+        passwordLayout = new QHBoxLayout();
         passwordLayout->setObjectName(QString::fromUtf8("passwordLayout"));
-        passwordLayout->setContentsMargins(0, 0, 0, 0);
+        passwordTitle = new QLabel(loginWidget);
-        passwordTitle = new QLabel(layoutWidget1);
         passwordTitle->setObjectName(QString::fromUtf8("passwordTitle"));
 
         passwordLayout->addWidget(passwordTitle);
 
-        passwordInputField = new QLineEdit(layoutWidget1);
+        passwordInputField = new QLineEdit(loginWidget);
         passwordInputField->setObjectName(QString::fromUtf8("passwordInputField"));
 
         passwordLayout->addWidget(passwordInputField);
 
-        layoutWidget2 = new QWidget(loginWidget);
+
-        layoutWidget2->setObjectName(QString::fromUtf8("layoutWidget2"));
+        verticalLayout->addLayout(passwordLayout);
-        layoutWidget2->setGeometry(QRect(100, 180, 168, 27));
+
-        loginButtonsLayout = new QHBoxLayout(layoutWidget2);
+        loginButtonsLayout = new QHBoxLayout();
         loginButtonsLayout->setObjectName(QString::fromUtf8("loginButtonsLayout"));
-        loginButtonsLayout->setContentsMargins(0, 0, 0, 0);
+        settingsButton = new QPushButton(loginWidget);
-        settingsButton = new QPushButton(layoutWidget2);
         settingsButton->setObjectName(QString::fromUtf8("settingsButton"));
 
         loginButtonsLayout->addWidget(settingsButton);
 
-        loginButton = new QPushButton(layoutWidget2);
+        loginButton = new QPushButton(loginWidget);
         loginButton->setObjectName(QString::fromUtf8("loginButton"));
 
         loginButtonsLayout->addWidget(loginButton);
 
-        notificationLabel = new QLineEdit(loginWidget);
+
-        notificationLabel->setObjectName(QString::fromUtf8("notificationLabel"));
+        verticalLayout->addLayout(loginButtonsLayout);
-        notificationLabel->setGeometry(QRect(100, 50, 191, 24));
+
-        settingsWidget = new QWidget(centralwidget);
+
+        horizontalLayout->addWidget(loginWidget);
+
+        settingsWidget = new QWidget(horizontalLayoutWidget);
         settingsWidget->setObjectName(QString::fromUtf8("settingsWidget"));
         settingsWidget->setEnabled(true);
-        settingsWidget->setGeometry(QRect(300, 100, 364, 226));
+        sizePolicy.setHeightForWidth(settingsWidget->sizePolicy().hasHeightForWidth());
+        settingsWidget->setSizePolicy(sizePolicy);
         settingsWidget->setAutoFillBackground(false);
-        saveServerButton = new QPushButton(settingsWidget);
+        verticalLayout_2 = new QVBoxLayout(settingsWidget);
-        saveServerButton->setObjectName(QString::fromUtf8("saveServerButton"));
+        verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2"));
-        saveServerButton->setGeometry(QRect(130, 170, 101, 41));
+        serverInputLayout = new QHBoxLayout();
-        layoutWidget_4 = new QWidget(settingsWidget);
+        serverInputLayout->setObjectName(QString::fromUtf8("serverInputLayout"));
-        layoutWidget_4->setObjectName(QString::fromUtf8("layoutWidget_4"));
+        serverTitle = new QLabel(settingsWidget);
-        layoutWidget_4->setGeometry(QRect(100, 80, 171, 31));
-        horizontalLayout_6 = new QHBoxLayout(layoutWidget_4);
-        horizontalLayout_6->setObjectName(QString::fromUtf8("horizontalLayout_6"));
-        horizontalLayout_6->setContentsMargins(0, 0, 0, 0);
-        serverTitle = new QLabel(layoutWidget_4);
         serverTitle->setObjectName(QString::fromUtf8("serverTitle"));
 
-        horizontalLayout_6->addWidget(serverTitle);
+        serverInputLayout->addWidget(serverTitle);
 
-        serverInputField = new QLineEdit(layoutWidget_4);
+        serverInputField = new QLineEdit(settingsWidget);
         serverInputField->setObjectName(QString::fromUtf8("serverInputField"));
 
-        horizontalLayout_6->addWidget(serverInputField);
+        serverInputLayout->addWidget(serverInputField);
 
-        layoutWidget_5 = new QWidget(settingsWidget);
+
-        layoutWidget_5->setObjectName(QString::fromUtf8("layoutWidget_5"));
+        verticalLayout_2->addLayout(serverInputLayout);
-        layoutWidget_5->setGeometry(QRect(100, 120, 171, 26));
+
-        horizontalLayout_7 = new QHBoxLayout(layoutWidget_5);
+        portInputLayout = new QHBoxLayout();
-        horizontalLayout_7->setObjectName(QString::fromUtf8("horizontalLayout_7"));
+        portInputLayout->setObjectName(QString::fromUtf8("portInputLayout"));
-        horizontalLayout_7->setContentsMargins(0, 0, 0, 0);
+        portTitle = new QLabel(settingsWidget);
-        portTitle = new QLabel(layoutWidget_5);
         portTitle->setObjectName(QString::fromUtf8("portTitle"));
 
-        horizontalLayout_7->addWidget(portTitle);
+        portInputLayout->addWidget(portTitle);
 
-        portInputField = new QLineEdit(layoutWidget_5);
+        portInputField = new QLineEdit(settingsWidget);
         portInputField->setObjectName(QString::fromUtf8("portInputField"));
 
-        horizontalLayout_7->addWidget(portInputField);
+        portInputLayout->addWidget(portInputField);
 
-        layoutWidget3 = new QWidget(centralwidget);
+
-        layoutWidget3->setObjectName(QString::fromUtf8("layoutWidget3"));
+        verticalLayout_2->addLayout(portInputLayout);
-        layoutWidget3->setGeometry(QRect(10, 490, 971, 27));
+
-        downLayout = new QHBoxLayout(layoutWidget3);
+        saveServerButton = new QPushButton(settingsWidget);
-        downLayout->setObjectName(QString::fromUtf8("downLayout"));
+        saveServerButton->setObjectName(QString::fromUtf8("saveServerButton"));
-        downLayout->setContentsMargins(0, 0, 0, 0);
+
-        loadingProgressBar = new QProgressBar(layoutWidget3);
+        verticalLayout_2->addWidget(saveServerButton);
+
+
+        horizontalLayout->addWidget(settingsWidget);
+
+        debugText = new QTextEdit(horizontalLayoutWidget);
+        debugText->setObjectName(QString::fromUtf8("debugText"));
+        debugText->setEnabled(false);
+        QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Minimum);
+        sizePolicy1.setHorizontalStretch(0);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(debugText->sizePolicy().hasHeightForWidth());
+        debugText->setSizePolicy(sizePolicy1);
+        debugText->setMinimumSize(QSize(250, 0));
+        debugText->setMaximumSize(QSize(250, 16777215));
+
+        horizontalLayout->addWidget(debugText);
+
+        widget = new QWidget(centralwidget);
+        widget->setObjectName(QString::fromUtf8("widget"));
+        widget->setGeometry(QRect(10, 420, 681, 61));
+        downlayout = new QHBoxLayout(widget);
+        downlayout->setObjectName(QString::fromUtf8("downlayout"));
+        downlayout->setContentsMargins(0, 0, 0, 0);
+        downLayoutLoadingSlider = new QVBoxLayout();
+        downLayoutLoadingSlider->setObjectName(QString::fromUtf8("downLayoutLoadingSlider"));
+        loadingProgressBar = new QProgressBar(widget);
         loadingProgressBar->setObjectName(QString::fromUtf8("loadingProgressBar"));
+        loadingProgressBar->setMinimumSize(QSize(0, 30));
+        loadingProgressBar->setMaximumSize(QSize(16777215, 30));
         loadingProgressBar->setValue(10);
 
-        downLayout->addWidget(loadingProgressBar);
+        downLayoutLoadingSlider->addWidget(loadingProgressBar);
 
-        updateButton = new QPushButton(layoutWidget3);
+        inlineTextDebug = new QLabel(widget);
+        inlineTextDebug->setObjectName(QString::fromUtf8("inlineTextDebug"));
+
+        downLayoutLoadingSlider->addWidget(inlineTextDebug);
+
+
+        downlayout->addLayout(downLayoutLoadingSlider);
+
+        downLayoutButtons = new QHBoxLayout();
+        downLayoutButtons->setObjectName(QString::fromUtf8("downLayoutButtons"));
+        downLayoutButtons->setSizeConstraint(QLayout::SetFixedSize);
+        downLayoutButtons->setContentsMargins(-1, -1, -1, 27);
+        connectButton = new QPushButton(widget);
+        connectButton->setObjectName(QString::fromUtf8("connectButton"));
+        connectButton->setEnabled(true);
+        QSizePolicy sizePolicy2(QSizePolicy::Minimum, QSizePolicy::Minimum);
+        sizePolicy2.setHorizontalStretch(0);
+        sizePolicy2.setVerticalStretch(0);
+        sizePolicy2.setHeightForWidth(connectButton->sizePolicy().hasHeightForWidth());
+        connectButton->setSizePolicy(sizePolicy2);
+        connectButton->setMinimumSize(QSize(100, 30));
+        connectButton->setMaximumSize(QSize(100, 30));
+
+        downLayoutButtons->addWidget(connectButton);
+
+        updateButton = new QPushButton(widget);
         updateButton->setObjectName(QString::fromUtf8("updateButton"));
         updateButton->setEnabled(true);
+        sizePolicy2.setHeightForWidth(updateButton->sizePolicy().hasHeightForWidth());
+        updateButton->setSizePolicy(sizePolicy2);
+        updateButton->setMinimumSize(QSize(100, 30));
+        updateButton->setMaximumSize(QSize(100, 30));
 
-        downLayout->addWidget(updateButton);
+        downLayoutButtons->addWidget(updateButton);
 
-        startButton = new QPushButton(layoutWidget3);
+        startButton = new QPushButton(widget);
         startButton->setObjectName(QString::fromUtf8("startButton"));
         startButton->setEnabled(true);
+        sizePolicy2.setHeightForWidth(startButton->sizePolicy().hasHeightForWidth());
+        startButton->setSizePolicy(sizePolicy2);
+        startButton->setMinimumSize(QSize(100, 30));
+        startButton->setMaximumSize(QSize(100, 30));
 
-        downLayout->addWidget(startButton);
+        downLayoutButtons->addWidget(startButton);
 
-        layoutWidget4 = new QWidget(centralwidget);
-        layoutWidget4->setObjectName(QString::fromUtf8("layoutWidget4"));
-        layoutWidget4->setGeometry(QRect(10, 470, 194, 18));
-        displayLayout = new QHBoxLayout(layoutWidget4);
-        displayLayout->setObjectName(QString::fromUtf8("displayLayout"));
-        displayLayout->setContentsMargins(0, 0, 0, 0);
-        displayCountTitle = new QLabel(layoutWidget4);
-        displayCountTitle->setObjectName(QString::fromUtf8("displayCountTitle"));
 
-        displayLayout->addWidget(displayCountTitle);
+        downlayout->addLayout(downLayoutButtons);
 
-        disblayCount = new QLabel(layoutWidget4);
-        disblayCount->setObjectName(QString::fromUtf8("disblayCount"));
-
-        displayLayout->addWidget(disblayCount);
-
-        debugText = new QTextEdit(centralwidget);
-        debugText->setObjectName(QString::fromUtf8("debugText"));
-        debugText->setGeometry(QRect(630, 10, 341, 461));
         MainWindow->setCentralWidget(centralwidget);
-        settingsWidget->raise();
-        layoutWidget4->raise();
-        layoutWidget4->raise();
-        loginWidget->raise();
-        debugText->raise();
-        menubar = new QMenuBar(MainWindow);
-        menubar->setObjectName(QString::fromUtf8("menubar"));
-        menubar->setGeometry(QRect(0, 0, 993, 25));
-        MainWindow->setMenuBar(menubar);
-        statusbar = new QStatusBar(MainWindow);
-        statusbar->setObjectName(QString::fromUtf8("statusbar"));
-        MainWindow->setStatusBar(statusbar);
 
         retranslateUi(MainWindow);
 
@@ -233,18 +278,18 @@ public:
     void retranslateUi(QMainWindow *MainWindow)
     {
         MainWindow->setWindowTitle(QCoreApplication::translate("MainWindow", "Updater", nullptr));
+        notificationLabel->setText(QString());
         loginTitle->setText(QCoreApplication::translate("MainWindow", "\320\233\320\276\320\263\320\270\320\275:", nullptr));
         passwordTitle->setText(QCoreApplication::translate("MainWindow", "\320\237\320\260\321\200\320\276\320\273\321\214:", nullptr));
         settingsButton->setText(QCoreApplication::translate("MainWindow", "\320\235\320\260\321\201\321\202\321\200\320\276\320\271\320\272\320\270", nullptr));
         loginButton->setText(QCoreApplication::translate("MainWindow", "\320\222\320\276\320\271\321\202\320\270", nullptr));
-        notificationLabel->setText(QCoreApplication::translate("MainWindow", "\320\235\320\265\320\262\320\265\321\200\320\275\321\213\320\271 \320\273\320\276\320\263\320\270\320\275/\320\277\320\260\321\200\320\276\320\273\321\214", nullptr));
-        saveServerButton->setText(QCoreApplication::translate("MainWindow", "\320\241\320\276\321\205\321\200\320\260\320\275\320\270\321\202\321\214", nullptr));
         serverTitle->setText(QCoreApplication::translate("MainWindow", "\320\241\320\265\321\200\320\262\320\265\321\200:", nullptr));
         portTitle->setText(QCoreApplication::translate("MainWindow", "\320\237\320\276\321\200\321\202:", nullptr));
+        saveServerButton->setText(QCoreApplication::translate("MainWindow", "\320\241\320\276\321\205\321\200\320\260\320\275\320\270\321\202\321\214", nullptr));
+        inlineTextDebug->setText(QString());
+        connectButton->setText(QCoreApplication::translate("MainWindow", "\320\241\320\276\320\265\320\264\320\270\320\275\320\270\321\202\321\214\321\201\321\217", nullptr));
         updateButton->setText(QCoreApplication::translate("MainWindow", "\320\236\320\261\320\275\320\276\320\262\320\270\321\202\321\214", nullptr));
         startButton->setText(QCoreApplication::translate("MainWindow", "\320\227\320\260\320\277\321\203\321\201\320\272", nullptr));
-        displayCountTitle->setText(QCoreApplication::translate("MainWindow", "\320\224\320\276\321\201\321\202\321\203\320\277\320\275\320\276 \320\274\320\276\320\275\320\270\321\202\320\276\321\200\320\276\320\262: ", nullptr));
-        disblayCount->setText(QCoreApplication::translate("MainWindow", "0", nullptr));
     } // retranslateUi
 
 };