ref: UI

Core/screenchecker.cpp

@@ -76,6 +76,23 @@ void ScreenChecker::UpdateDisplayData()
     dataParser->AddRunData(*displays);
 }
 
+void ScreenChecker::hide()
+{
+    for (int i = 0; i <buttons.count();i++)
+    {
+        buttons[i]->hide();
+    }
+}
+
+void ScreenChecker::show()
+{
+
+    for (int i = 0; i <buttons.count();i++)
+    {
+        buttons[i]->show();
+    }
+}
+
 QString ScreenChecker::getScreenCount() const
 {
     return QString::number(screenCount);

Core/screenchecker.h

@@ -19,6 +19,8 @@ public:
     ~ScreenChecker();
     void Check();
     void UpdateDisplayData();
+    void hide();
+    void show();
     QString getScreenCount() const;
 
 

Core/tcpclient.cpp

@@ -7,7 +7,7 @@
 TCPClient::TCPClient(QObject *parent) :
     QObject(parent)
 {
-
+    socket = NULL;
 }
 
 void TCPClient::Initialize(RecognizeSystem *recognize,ExternalExecuter *externalExecuter)
@@ -20,6 +20,12 @@ void TCPClient::Initialize(RecognizeSystem *recognize,ExternalExecuter *external
 
 void TCPClient::SetConnect(ServerSettings *serverSettings)
 {
+    if (socket != NULL && socket->state() == QTcpSocket::ConnectedState)
+    {
+        emit onSendDebugLog("already connected");
+        return;
+    }
+
     socket = new QTcpSocket(this);
 
     connect(socket,&QTcpSocket::readyRead,this,&TCPClient::onReadyRead,Qt::DirectConnection);
@@ -91,6 +97,14 @@ void TCPClient::SendFile()
     countSend = 0;
 }
 
+void TCPClient::SendUnityConnect()
+{
+    QDataStream stream(socket);
+    stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
+    stream << PacketType::TYPE_CHANGEPACKAGERESPONSE;
+    socket->waitForBytesWritten();
+}
+
 void TCPClient::SetDisconnect()
 {
     socket->disconnect();

Core/tcpclient.h

@@ -27,6 +27,7 @@ public:
     void SetConnect(ServerSettings *serverSettings);
     void SendClientAutorization();
     void SendFile();
+    void SendUnityConnect();
     void SetDisconnect();
     void WaitWrites();
     void WaitRead(int time);

Core/tools.h

@@ -22,7 +22,8 @@ enum PacketType{
     TYPE_DELETE = 5,
     TYPE_FINISH = 6,
     TYPE_NEEDUPDATE = 7,
-    TYPE_XMLANSWER = 8
+    TYPE_XMLANSWER = 8,
+    TYPE_CHANGEPACKAGERESPONSE = 9,
 };
 
 class Tools {

Makefile.Debug

@@ -1413,7 +1413,10 @@ debug/externalexecuter.o: Core/externalexecuter.cpp Core/externalexecuter.h \
 		D:/QT/5.14.2/mingw73_64/include/QtCore/qset.h \
 		D:/QT/5.14.2/mingw73_64/include/QtCore/qcontiguouscache.h \
 		D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer.h \
-		D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer_impl.h
+		D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer_impl.h \
+		D:/QT/5.14.2/mingw73_64/include/QtCore/QCoreApplication \
+		D:/QT/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \
+		D:/QT/5.14.2/mingw73_64/include/QtCore/qeventloop.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\externalexecuter.o Core\externalexecuter.cpp
 
 debug/dataparser.o: Core/dataparser.cpp Core/dataparser.h \
@@ -1494,7 +1497,10 @@ debug/dataparser.o: Core/dataparser.cpp Core/dataparser.h \
 		D:/QT/5.14.2/mingw73_64/include/QtCore/qset.h \
 		D:/QT/5.14.2/mingw73_64/include/QtCore/qcontiguouscache.h \
 		D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer.h \
-		D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer_impl.h
+		D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer_impl.h \
+		D:/QT/5.14.2/mingw73_64/include/QtCore/QDir \
+		D:/QT/5.14.2/mingw73_64/include/QtCore/qdir.h \
+		D:/QT/5.14.2/mingw73_64/include/QtCore/qfileinfo.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\dataparser.o Core\dataparser.cpp
 
 debug/recognizesystem.o: Core/recognizesystem.cpp Core/recognizesystem.h \

Makefile.Release

@@ -1413,7 +1413,10 @@ release/externalexecuter.o: Core/externalexecuter.cpp Core/externalexecuter.h \
 		D:/QT/5.14.2/mingw73_64/include/QtCore/qset.h \
 		D:/QT/5.14.2/mingw73_64/include/QtCore/qcontiguouscache.h \
 		D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer.h \
-		D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer_impl.h
+		D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer_impl.h \
+		D:/QT/5.14.2/mingw73_64/include/QtCore/QCoreApplication \
+		D:/QT/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \
+		D:/QT/5.14.2/mingw73_64/include/QtCore/qeventloop.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\externalexecuter.o Core\externalexecuter.cpp
 
 release/dataparser.o: Core/dataparser.cpp Core/dataparser.h \
@@ -1494,7 +1497,10 @@ release/dataparser.o: Core/dataparser.cpp Core/dataparser.h \
 		D:/QT/5.14.2/mingw73_64/include/QtCore/qset.h \
 		D:/QT/5.14.2/mingw73_64/include/QtCore/qcontiguouscache.h \
 		D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer.h \
-		D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer_impl.h
+		D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer_impl.h \
+		D:/QT/5.14.2/mingw73_64/include/QtCore/QDir \
+		D:/QT/5.14.2/mingw73_64/include/QtCore/qdir.h \
+		D:/QT/5.14.2/mingw73_64/include/QtCore/qfileinfo.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\dataparser.o Core\dataparser.cpp
 
 release/recognizesystem.o: Core/recognizesystem.cpp Core/recognizesystem.h \

RRJClient.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.1, 2024-08-27T17:44:10. -->
+<!-- Written by QtCreator 4.11.1, 2024-08-28T18:02:12. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

StaticData/hash.xml

@@ -25,8 +25,10 @@
     <FileData Path="/Application/RRJOnlyMain/RRJ_Data/Resources" Hash="FOLDER"/>
     <FileData Path="/Application/RRJOnlyMain/RRJ_Data/StreamingAssets" Hash="FOLDER"/>
     <FileData Path="/Application/RRJOnlyMain/RRJ_Data/StreamingAssets/RRJ-95NEW-100" Hash="FOLDER"/>
+    <FileData Path="/Application/RRJOnlyMain/RRJ_Data/StreamingAssets/RUS" Hash="FOLDER"/>
     <FileData Path="/Application/RRJOnlyMain/RRJ_Data/StreamingAssets/Sounds" Hash="FOLDER"/>
     <FileData Path="/Application/RRJOnlyMain/RRJ_Data/StreamingAssets/Sounds/UI" Hash="FOLDER"/>
+    <FileData Path="/Application/RRJOnlyMain/RRJ_Data/Temp" Hash="FOLDER"/>
     <FileData Path="/Application/RRJOnlyMain/D3D12/D3D12Core.dll" Hash="7fc05c9a8366d19302dfd13d09d3ebac"/>
     <FileData Path="/Application/RRJOnlyMain/MonoBleedingEdge/EmbedRuntime/mono-2.0-bdwgc.dll" Hash="1ce1473bec6862c3445a5697d28c3b7d"/>
     <FileData Path="/Application/RRJOnlyMain/MonoBleedingEdge/EmbedRuntime/MonoPosixHelper.dll" Hash="2734ad3f554d1b95d7b04766260175e5"/>
@@ -185,6 +187,7 @@
     <FileData Path="/Application/RRJOnlyMain/RRJ_Data/sharedassets0.assets" Hash="e72832651ab524b3eca4cb23b5134aa7"/>
     <FileData Path="/Application/RRJOnlyMain/RRJ_Data/sharedassets0.assets.resS" Hash="897317a657f377346d8932827dc78da0"/>
     <FileData Path="/Application/RRJOnlyMain/RRJ_Data/StreamingAssets/RRJ-95NEW-100/docs.xml" Hash="fcad1626c1ef3851931bf68a1aa054c6"/>
+    <FileData Path="/Application/RRJOnlyMain/RRJ_Data/StreamingAssets/RUS/024.31.00a.xml" Hash="e730fbd64cd77dd163732cfaf2bd0e75"/>
     <FileData Path="/Application/RRJOnlyMain/RRJ_Data/StreamingAssets/Sounds/UI/ir_begin.wav" Hash="2e0057ee08c7b6fa07d28863a40d1cbf"/>
     <FileData Path="/Application/RRJOnlyMain/RRJ_Data/StreamingAssets/Sounds/UI/ir_end.wav" Hash="e83345df81f1e577bb53766875efc31d"/>
     <FileData Path="/Application/RRJOnlyMain/RRJ_Data/StreamingAssets/Sounds/UI/Menu Command.wav" Hash="822b4c37ce07436e2192785f3274386f"/>
@@ -192,6 +195,7 @@
     <FileData Path="/Application/RRJOnlyMain/RRJ_Data/StreamingAssets/Sounds/UI/Navigation Start.wav" Hash="b82aa79f496456ffc5b952b484af25f5"/>
     <FileData Path="/Application/RRJOnlyMain/RRJ_Data/StreamingAssets/Sounds/UI/Proximity Connection.wav" Hash="00882d550b9389c6183ee3da0b668b2d"/>
     <FileData Path="/Application/RRJOnlyMain/RRJ_Data/StreamingAssets/Sounds/UI/Proximity Notification.wav" Hash="e15f0210410a574af39b07840ccbe4cc"/>
+    <FileData Path="/Application/RRJOnlyMain/RRJ_Data/Temp/UserData.xml" Hash="dfff243a25de3ace91512413a2908330"/>
     <FileData Path="/Application/RRJOnlyMain/UnityCrashHandler64.exe" Hash="ea440810e323f7b7ca54727cd23d068e"/>
     <FileData Path="/Application/RRJOnlyMain/UnityPlayer.dll" Hash="0486f8cc69625acdb24a62855754b228"/>
 </FileDataList>

main.cpp

@@ -5,6 +5,7 @@
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
+    a.setWindowIcon(QIcon("./plane.png"));
     MainWindow w;
     w.show();
     return a.exec();

mainwindow.cpp

@@ -25,6 +25,7 @@ void MainWindow::Initialize()
     ui->connectButton->hide();
     ui->startButton->setEnabled(false);
     ui->debugText->hide();
+    ui->displayGroupWidget->hide();
 
     updateControllerThread = new QThread;
     connectionThread = new QThread;
@@ -138,6 +139,7 @@ void MainWindow::CheckLoginResult(ServerAuthorization *serverAuth)
         ui->updateButton->show();
         dataParser->CreateAuthData(serverAuth);
         ui->loginWidget->hide();
+        ui->displayGroupWidget->show();
 
     }
     else {
@@ -177,11 +179,13 @@ void MainWindow::on_loginButton_clicked()
 void MainWindow::on_updateButton_clicked()
 {
     emit onSendMessage("update");
+    ui->updateButton->hide();
     ui->loadingProgressBar->setValue(0);
 }
 
 void MainWindow::on_startButton_clicked()
 {
+    client->SendUnityConnect();
     externalExecuter->CallApp();
 }
 

mainwindow.ui

@@ -29,15 +29,15 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Updater</string>
+   <string>Тренажер процедур технического обслуживания самолета RRJ-95NEW-100</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <widget class="QWidget" name="horizontalLayoutWidget">
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>10</y>
+      <y>100</y>
-      <width>682</width>
+      <width>681</width>
       <height>221</height>
      </rect>
     </property>
@@ -54,54 +54,60 @@
         <bool>true</bool>
        </property>
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
          <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>
        <property name="autoFillBackground">
         <bool>false</bool>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout">
         <item>
-         <widget class="QLabel" name="notificationLabel">
+         <widget class="QLabel" name="loginTitle">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
           <property name="text">
-           <string/>
+           <string>Вход в систему</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
           </property>
          </widget>
         </item>
         <item>
          <layout class="QHBoxLayout" name="loginLayout">
           <item>
-           <widget class="QLabel" name="loginTitle">
+           <widget class="QLineEdit" name="loginInputField">
             <property name="text">
-             <string>Логин:</string>
+             <string/>
+            </property>
+            <property name="placeholderText">
+             <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">
+           <widget class="QLineEdit" name="passwordInputField">
-            <property name="text">
+            <property name="placeholderText">
-             <string>Пароль:</string>
+             <string>Пароль</string>
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QLineEdit" name="passwordInputField"/>
-          </item>
          </layout>
         </item>
         <item>
@@ -136,36 +142,52 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize">
+        <size>
+         <width>200</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>200</width>
+         <height>16777215</height>
+        </size>
+       </property>
        <property name="autoFillBackground">
         <bool>false</bool>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <widget class="QLabel" name="serverSettingsTitle">
+          <property name="text">
+           <string>Настройки сервера</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
         <item>
          <layout class="QHBoxLayout" name="serverInputLayout">
           <item>
-           <widget class="QLabel" name="serverTitle">
+           <widget class="QLineEdit" name="serverInputField">
-            <property name="text">
+            <property name="placeholderText">
-             <string>Сервер:</string>
+             <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">
+           <widget class="QLineEdit" name="portInputField">
-            <property name="text">
+            <property name="placeholderText">
-             <string>Порт:</string>
+             <string>Порт</string>
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QLineEdit" name="portInputField"/>
-          </item>
          </layout>
         </item>
         <item>
@@ -178,49 +200,13 @@
        </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="horizontalLayoutWidget_2">
-    <property name="geometry">
-     <rect>
-      <x>130</x>
-      <y>240</y>
-      <width>401</width>
-      <height>171</height>
-     </rect>
-    </property>
-    <layout class="QHBoxLayout" name="displayWidget"/>
-   </widget>
    <widget class="QWidget" name="layoutWidget">
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>420</y>
+      <y>430</y>
       <width>681</width>
       <height>61</height>
      </rect>
@@ -228,6 +214,13 @@
     <layout class="QHBoxLayout" name="downlayout">
      <item>
       <layout class="QVBoxLayout" name="downLayoutLoadingSlider">
+       <item>
+        <widget class="QLabel" name="inlineTextDebug">
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
        <item>
         <widget class="QProgressBar" name="loadingProgressBar">
          <property name="minimumSize">
@@ -247,13 +240,6 @@
          </property>
         </widget>
        </item>
-       <item>
-        <widget class="QLabel" name="inlineTextDebug">
-         <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </item>
       </layout>
      </item>
      <item>
@@ -261,9 +247,12 @@
        <property name="sizeConstraint">
         <enum>QLayout::SetFixedSize</enum>
        </property>
-       <property name="bottomMargin">
+       <property name="topMargin">
         <number>27</number>
        </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
        <item>
         <widget class="QPushButton" name="connectButton">
          <property name="enabled">
@@ -324,6 +313,9 @@
          <property name="text">
           <string>Обновить</string>
          </property>
+         <property name="flat">
+          <bool>false</bool>
+         </property>
         </widget>
        </item>
        <item>
@@ -358,6 +350,125 @@
      </item>
     </layout>
    </widget>
+   <widget class="QLabel" name="notificationLabel">
+    <property name="geometry">
+     <rect>
+      <x>200</x>
+      <y>80</y>
+      <width>300</width>
+      <height>40</height>
+     </rect>
+    </property>
+    <property name="sizePolicy">
+     <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+      <horstretch>0</horstretch>
+      <verstretch>0</verstretch>
+     </sizepolicy>
+    </property>
+    <property name="minimumSize">
+     <size>
+      <width>300</width>
+      <height>0</height>
+     </size>
+    </property>
+    <property name="maximumSize">
+     <size>
+      <width>300</width>
+      <height>16777215</height>
+     </size>
+    </property>
+    <property name="font">
+     <font>
+      <pointsize>10</pointsize>
+     </font>
+    </property>
+    <property name="frameShape">
+     <enum>QFrame::StyledPanel</enum>
+    </property>
+    <property name="frameShadow">
+     <enum>QFrame::Plain</enum>
+    </property>
+    <property name="text">
+     <string>Какая-то ошибка</string>
+    </property>
+    <property name="textFormat">
+     <enum>Qt::RichText</enum>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignCenter</set>
+    </property>
+   </widget>
+   <widget class="QTextEdit" name="debugText">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>701</width>
+      <height>81</height>
+     </rect>
+    </property>
+   </widget>
+   <widget class="QWidget" name="displayGroupWidget" native="true">
+    <property name="geometry">
+     <rect>
+      <x>50</x>
+      <y>90</y>
+      <width>600</width>
+      <height>200</height>
+     </rect>
+    </property>
+    <property name="sizePolicy">
+     <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+      <horstretch>0</horstretch>
+      <verstretch>0</verstretch>
+     </sizepolicy>
+    </property>
+    <property name="minimumSize">
+     <size>
+      <width>600</width>
+      <height>200</height>
+     </size>
+    </property>
+    <property name="maximumSize">
+     <size>
+      <width>500</width>
+      <height>200</height>
+     </size>
+    </property>
+    <layout class="QVBoxLayout" name="verticalLayout_4">
+     <item>
+      <widget class="QLabel" name="displayChoiceTitle">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Выберите активные мониторы</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignHCenter|Qt::AlignTop</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QWidget" name="screenWidget" native="true">
+       <layout class="QHBoxLayout" name="displayWidget">
+        <item>
+         <layout class="QHBoxLayout" name="displayLayout"/>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </widget>
   </widget>
  </widget>
  <resources/>

ui_mainwindow.h

@@ -31,37 +31,39 @@ public:
     QHBoxLayout *horizontalLayout;
     QWidget *loginWidget;
     QVBoxLayout *verticalLayout;
-    QLabel *notificationLabel;
-    QHBoxLayout *loginLayout;
     QLabel *loginTitle;
+    QHBoxLayout *loginLayout;
     QLineEdit *loginInputField;
     QHBoxLayout *passwordLayout;
-    QLabel *passwordTitle;
     QLineEdit *passwordInputField;
     QHBoxLayout *loginButtonsLayout;
     QPushButton *settingsButton;
     QPushButton *loginButton;
     QWidget *settingsWidget;
     QVBoxLayout *verticalLayout_2;
+    QLabel *serverSettingsTitle;
     QHBoxLayout *serverInputLayout;
-    QLabel *serverTitle;
     QLineEdit *serverInputField;
     QHBoxLayout *portInputLayout;
-    QLabel *portTitle;
     QLineEdit *portInputField;
     QPushButton *saveServerButton;
-    QTextEdit *debugText;
-    QWidget *horizontalLayoutWidget_2;
-    QHBoxLayout *displayWidget;
     QWidget *layoutWidget;
     QHBoxLayout *downlayout;
     QVBoxLayout *downLayoutLoadingSlider;
-    QProgressBar *loadingProgressBar;
     QLabel *inlineTextDebug;
+    QProgressBar *loadingProgressBar;
     QHBoxLayout *downLayoutButtons;
     QPushButton *connectButton;
     QPushButton *updateButton;
     QPushButton *startButton;
+    QLabel *notificationLabel;
+    QTextEdit *debugText;
+    QWidget *displayGroupWidget;
+    QVBoxLayout *verticalLayout_4;
+    QLabel *displayChoiceTitle;
+    QWidget *screenWidget;
+    QHBoxLayout *displayWidget;
+    QHBoxLayout *displayLayout;
 
     void setupUi(QMainWindow *MainWindow)
     {
@@ -79,7 +81,7 @@ public:
         centralwidget->setObjectName(QString::fromUtf8("centralwidget"));
         horizontalLayoutWidget = new QWidget(centralwidget);
         horizontalLayoutWidget->setObjectName(QString::fromUtf8("horizontalLayoutWidget"));
-        horizontalLayoutWidget->setGeometry(QRect(10, 10, 682, 221));
+        horizontalLayoutWidget->setGeometry(QRect(10, 100, 681, 221));
         horizontalLayout = new QHBoxLayout(horizontalLayoutWidget);
         horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
         horizontalLayout->setSizeConstraint(QLayout::SetDefaultConstraint);
@@ -87,25 +89,24 @@ public:
         loginWidget = new QWidget(horizontalLayoutWidget);
         loginWidget->setObjectName(QString::fromUtf8("loginWidget"));
         loginWidget->setEnabled(true);
-        sizePolicy.setHeightForWidth(loginWidget->sizePolicy().hasHeightForWidth());
+        QSizePolicy sizePolicy1(QSizePolicy::Maximum, QSizePolicy::Maximum);
-        loginWidget->setSizePolicy(sizePolicy);
+        sizePolicy1.setHorizontalStretch(0);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(loginWidget->sizePolicy().hasHeightForWidth());
+        loginWidget->setSizePolicy(sizePolicy1);
+        loginWidget->setMinimumSize(QSize(250, 0));
+        loginWidget->setMaximumSize(QSize(250, 16777215));
         loginWidget->setAutoFillBackground(false);
         verticalLayout = new QVBoxLayout(loginWidget);
         verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
-        notificationLabel = new QLabel(loginWidget);
+        loginTitle = new QLabel(loginWidget);
-        notificationLabel->setObjectName(QString::fromUtf8("notificationLabel"));
+        loginTitle->setObjectName(QString::fromUtf8("loginTitle"));
-        sizePolicy.setHeightForWidth(notificationLabel->sizePolicy().hasHeightForWidth());
+        loginTitle->setAlignment(Qt::AlignCenter);
-        notificationLabel->setSizePolicy(sizePolicy);
 
-        verticalLayout->addWidget(notificationLabel);
+        verticalLayout->addWidget(loginTitle);
 
         loginLayout = new QHBoxLayout();
         loginLayout->setObjectName(QString::fromUtf8("loginLayout"));
-        loginTitle = new QLabel(loginWidget);
-        loginTitle->setObjectName(QString::fromUtf8("loginTitle"));
-
-        loginLayout->addWidget(loginTitle);
-
         loginInputField = new QLineEdit(loginWidget);
         loginInputField->setObjectName(QString::fromUtf8("loginInputField"));
 
@@ -116,11 +117,6 @@ public:
 
         passwordLayout = new QHBoxLayout();
         passwordLayout->setObjectName(QString::fromUtf8("passwordLayout"));
-        passwordTitle = new QLabel(loginWidget);
-        passwordTitle->setObjectName(QString::fromUtf8("passwordTitle"));
-
-        passwordLayout->addWidget(passwordTitle);
-
         passwordInputField = new QLineEdit(loginWidget);
         passwordInputField->setObjectName(QString::fromUtf8("passwordInputField"));
 
@@ -152,16 +148,19 @@ public:
         settingsWidget->setEnabled(true);
         sizePolicy.setHeightForWidth(settingsWidget->sizePolicy().hasHeightForWidth());
         settingsWidget->setSizePolicy(sizePolicy);
+        settingsWidget->setMinimumSize(QSize(200, 0));
+        settingsWidget->setMaximumSize(QSize(200, 16777215));
         settingsWidget->setAutoFillBackground(false);
         verticalLayout_2 = new QVBoxLayout(settingsWidget);
         verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2"));
+        serverSettingsTitle = new QLabel(settingsWidget);
+        serverSettingsTitle->setObjectName(QString::fromUtf8("serverSettingsTitle"));
+        serverSettingsTitle->setAlignment(Qt::AlignCenter);
+
+        verticalLayout_2->addWidget(serverSettingsTitle);
+
         serverInputLayout = new QHBoxLayout();
         serverInputLayout->setObjectName(QString::fromUtf8("serverInputLayout"));
-        serverTitle = new QLabel(settingsWidget);
-        serverTitle->setObjectName(QString::fromUtf8("serverTitle"));
-
-        serverInputLayout->addWidget(serverTitle);
-
         serverInputField = new QLineEdit(settingsWidget);
         serverInputField->setObjectName(QString::fromUtf8("serverInputField"));
 
@@ -172,11 +171,6 @@ public:
 
         portInputLayout = new QHBoxLayout();
         portInputLayout->setObjectName(QString::fromUtf8("portInputLayout"));
-        portTitle = new QLabel(settingsWidget);
-        portTitle->setObjectName(QString::fromUtf8("portTitle"));
-
-        portInputLayout->addWidget(portTitle);
-
         portInputField = new QLineEdit(settingsWidget);
         portInputField->setObjectName(QString::fromUtf8("portInputField"));
 
@@ -193,33 +187,19 @@ public:
 
         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);
-
-        horizontalLayoutWidget_2 = new QWidget(centralwidget);
-        horizontalLayoutWidget_2->setObjectName(QString::fromUtf8("horizontalLayoutWidget_2"));
-        horizontalLayoutWidget_2->setGeometry(QRect(130, 240, 401, 171));
-        displayWidget = new QHBoxLayout(horizontalLayoutWidget_2);
-        displayWidget->setObjectName(QString::fromUtf8("displayWidget"));
-        displayWidget->setContentsMargins(0, 0, 0, 0);
         layoutWidget = new QWidget(centralwidget);
         layoutWidget->setObjectName(QString::fromUtf8("layoutWidget"));
-        layoutWidget->setGeometry(QRect(10, 420, 681, 61));
+        layoutWidget->setGeometry(QRect(10, 430, 681, 61));
         downlayout = new QHBoxLayout(layoutWidget);
         downlayout->setObjectName(QString::fromUtf8("downlayout"));
         downlayout->setContentsMargins(0, 0, 0, 0);
         downLayoutLoadingSlider = new QVBoxLayout();
         downLayoutLoadingSlider->setObjectName(QString::fromUtf8("downLayoutLoadingSlider"));
+        inlineTextDebug = new QLabel(layoutWidget);
+        inlineTextDebug->setObjectName(QString::fromUtf8("inlineTextDebug"));
+
+        downLayoutLoadingSlider->addWidget(inlineTextDebug);
+
         loadingProgressBar = new QProgressBar(layoutWidget);
         loadingProgressBar->setObjectName(QString::fromUtf8("loadingProgressBar"));
         loadingProgressBar->setMinimumSize(QSize(0, 30));
@@ -228,18 +208,13 @@ public:
 
         downLayoutLoadingSlider->addWidget(loadingProgressBar);
 
-        inlineTextDebug = new QLabel(layoutWidget);
-        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);
+        downLayoutButtons->setContentsMargins(-1, 27, -1, 0);
         connectButton = new QPushButton(layoutWidget);
         connectButton->setObjectName(QString::fromUtf8("connectButton"));
         connectButton->setEnabled(true);
@@ -262,6 +237,7 @@ public:
         updateButton->setSizePolicy(sizePolicy2);
         updateButton->setMinimumSize(QSize(100, 30));
         updateButton->setMaximumSize(QSize(100, 30));
+        updateButton->setFlat(false);
 
         downLayoutButtons->addWidget(updateButton);
 
@@ -278,6 +254,56 @@ public:
 
         downlayout->addLayout(downLayoutButtons);
 
+        notificationLabel = new QLabel(centralwidget);
+        notificationLabel->setObjectName(QString::fromUtf8("notificationLabel"));
+        notificationLabel->setGeometry(QRect(200, 80, 300, 40));
+        sizePolicy.setHeightForWidth(notificationLabel->sizePolicy().hasHeightForWidth());
+        notificationLabel->setSizePolicy(sizePolicy);
+        notificationLabel->setMinimumSize(QSize(300, 0));
+        notificationLabel->setMaximumSize(QSize(300, 16777215));
+        QFont font;
+        font.setPointSize(10);
+        notificationLabel->setFont(font);
+        notificationLabel->setFrameShape(QFrame::StyledPanel);
+        notificationLabel->setFrameShadow(QFrame::Plain);
+        notificationLabel->setTextFormat(Qt::RichText);
+        notificationLabel->setAlignment(Qt::AlignCenter);
+        debugText = new QTextEdit(centralwidget);
+        debugText->setObjectName(QString::fromUtf8("debugText"));
+        debugText->setGeometry(QRect(0, 0, 701, 81));
+        displayGroupWidget = new QWidget(centralwidget);
+        displayGroupWidget->setObjectName(QString::fromUtf8("displayGroupWidget"));
+        displayGroupWidget->setGeometry(QRect(50, 90, 600, 200));
+        QSizePolicy sizePolicy3(QSizePolicy::Preferred, QSizePolicy::Minimum);
+        sizePolicy3.setHorizontalStretch(0);
+        sizePolicy3.setVerticalStretch(0);
+        sizePolicy3.setHeightForWidth(displayGroupWidget->sizePolicy().hasHeightForWidth());
+        displayGroupWidget->setSizePolicy(sizePolicy3);
+        displayGroupWidget->setMinimumSize(QSize(600, 200));
+        displayGroupWidget->setMaximumSize(QSize(500, 200));
+        verticalLayout_4 = new QVBoxLayout(displayGroupWidget);
+        verticalLayout_4->setObjectName(QString::fromUtf8("verticalLayout_4"));
+        displayChoiceTitle = new QLabel(displayGroupWidget);
+        displayChoiceTitle->setObjectName(QString::fromUtf8("displayChoiceTitle"));
+        sizePolicy2.setHeightForWidth(displayChoiceTitle->sizePolicy().hasHeightForWidth());
+        displayChoiceTitle->setSizePolicy(sizePolicy2);
+        displayChoiceTitle->setMaximumSize(QSize(16777215, 30));
+        displayChoiceTitle->setAlignment(Qt::AlignHCenter|Qt::AlignTop);
+
+        verticalLayout_4->addWidget(displayChoiceTitle);
+
+        screenWidget = new QWidget(displayGroupWidget);
+        screenWidget->setObjectName(QString::fromUtf8("screenWidget"));
+        displayWidget = new QHBoxLayout(screenWidget);
+        displayWidget->setObjectName(QString::fromUtf8("displayWidget"));
+        displayLayout = new QHBoxLayout();
+        displayLayout->setObjectName(QString::fromUtf8("displayLayout"));
+
+        displayWidget->addLayout(displayLayout);
+
+
+        verticalLayout_4->addWidget(screenWidget);
+
         MainWindow->setCentralWidget(centralwidget);
 
         retranslateUi(MainWindow);
@@ -287,19 +313,23 @@ public:
 
     void retranslateUi(QMainWindow *MainWindow)
     {
-        MainWindow->setWindowTitle(QCoreApplication::translate("MainWindow", "Updater", nullptr));
+        MainWindow->setWindowTitle(QCoreApplication::translate("MainWindow", "\320\242\321\200\320\265\320\275\320\260\320\266\320\265\321\200 \320\277\321\200\320\276\321\206\320\265\320\264\321\203\321\200 \321\202\320\265\321\205\320\275\320\270\321\207\320\265\321\201\320\272\320\276\320\263\320\276 \320\276\320\261\321\201\320\273\321\203\320\266\320\270\320\262\320\260\320\275\320\270\321\217 \321\201\320\260\320\274\320\276\320\273\320\265\321\202\320\260 RRJ-95NEW-100", nullptr));
-        notificationLabel->setText(QString());
+        loginTitle->setText(QCoreApplication::translate("MainWindow", "\320\222\321\205\320\276\320\264 \320\262 \321\201\320\270\321\201\321\202\320\265\320\274\321\203", nullptr));
-        loginTitle->setText(QCoreApplication::translate("MainWindow", "\320\233\320\276\320\263\320\270\320\275:", nullptr));
+        loginInputField->setText(QString());
-        passwordTitle->setText(QCoreApplication::translate("MainWindow", "\320\237\320\260\321\200\320\276\320\273\321\214:", nullptr));
+        loginInputField->setPlaceholderText(QCoreApplication::translate("MainWindow", "\320\233\320\276\320\263\320\270\320\275", nullptr));
+        passwordInputField->setPlaceholderText(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));
-        serverTitle->setText(QCoreApplication::translate("MainWindow", "\320\241\320\265\321\200\320\262\320\265\321\200:", nullptr));
+        serverSettingsTitle->setText(QCoreApplication::translate("MainWindow", "\320\235\320\260\321\201\321\202\321\200\320\276\320\271\320\272\320\270 \321\201\320\265\321\200\320\262\320\265\321\200\320\260", nullptr));
-        portTitle->setText(QCoreApplication::translate("MainWindow", "\320\237\320\276\321\200\321\202:", nullptr));
+        serverInputField->setPlaceholderText(QCoreApplication::translate("MainWindow", "\320\241\320\265\321\200\320\262\320\265\321\200", nullptr));
+        portInputField->setPlaceholderText(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));
+        notificationLabel->setText(QCoreApplication::translate("MainWindow", "\320\232\320\260\320\272\320\260\321\217-\321\202\320\276 \320\276\321\210\320\270\320\261\320\272\320\260", nullptr));
+        displayChoiceTitle->setText(QCoreApplication::translate("MainWindow", "\320\222\321\213\320\261\320\265\321\200\320\270\321\202\320\265 \320\260\320\272\321\202\320\270\320\262\320\275\321\213\320\265 \320\274\320\276\320\275\320\270\321\202\320\276\321\200\321\213", nullptr));
     } // retranslateUi
 
 };