diff --git a/Core/screenchecker.cpp b/Core/screenchecker.cpp index 5068220..0d088e5 100644 --- a/Core/screenchecker.cpp +++ b/Core/screenchecker.cpp @@ -76,6 +76,23 @@ void ScreenChecker::UpdateDisplayData() dataParser->AddRunData(*displays); } +void ScreenChecker::hide() +{ + for (int i = 0; i hide(); + } +} + +void ScreenChecker::show() +{ + + for (int i = 0; i show(); + } +} + QString ScreenChecker::getScreenCount() const { return QString::number(screenCount); diff --git a/Core/screenchecker.h b/Core/screenchecker.h index 46ed634..7b4a210 100644 --- a/Core/screenchecker.h +++ b/Core/screenchecker.h @@ -19,6 +19,8 @@ public: ~ScreenChecker(); void Check(); void UpdateDisplayData(); + void hide(); + void show(); QString getScreenCount() const; diff --git a/Core/tcpclient.cpp b/Core/tcpclient.cpp index 5d7a54c..34357c8 100644 --- a/Core/tcpclient.cpp +++ b/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(); diff --git a/Core/tcpclient.h b/Core/tcpclient.h index 32b51e7..4ea5546 100644 --- a/Core/tcpclient.h +++ b/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); diff --git a/Core/tools.h b/Core/tools.h index 5bf24b8..9e829e4 100644 --- a/Core/tools.h +++ b/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 { diff --git a/Makefile.Debug b/Makefile.Debug index dc52e54..6130dea 100644 --- a/Makefile.Debug +++ b/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 \ diff --git a/Makefile.Release b/Makefile.Release index 1bc16eb..e9fd209 100644 --- a/Makefile.Release +++ b/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 \ diff --git a/RRJClient.pro.user b/RRJClient.pro.user index 869b933..8a957bb 100644 --- a/RRJClient.pro.user +++ b/RRJClient.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/StaticData/hash.xml b/StaticData/hash.xml index 48961bc..758b1eb 100644 --- a/StaticData/hash.xml +++ b/StaticData/hash.xml @@ -25,8 +25,10 @@ + + @@ -185,6 +187,7 @@ + @@ -192,6 +195,7 @@ + diff --git a/debug/RRJClient.exe b/debug/RRJClient.exe index b39afc9..d666c87 100644 Binary files a/debug/RRJClient.exe and b/debug/RRJClient.exe differ diff --git a/debug/main.o b/debug/main.o index 9eabaf0..c58c979 100644 Binary files a/debug/main.o and b/debug/main.o differ diff --git a/debug/mainwindow.o b/debug/mainwindow.o index f7b6aa7..e5015ac 100644 Binary files a/debug/mainwindow.o and b/debug/mainwindow.o differ diff --git a/debug/moc_recognizesystem.o b/debug/moc_recognizesystem.o index 54255a6..621ce0e 100644 Binary files a/debug/moc_recognizesystem.o and b/debug/moc_recognizesystem.o differ diff --git a/debug/moc_screenchecker.o b/debug/moc_screenchecker.o index a5e2204..509e6de 100644 Binary files a/debug/moc_screenchecker.o and b/debug/moc_screenchecker.o differ diff --git a/debug/moc_tcpclient.o b/debug/moc_tcpclient.o index c988fcc..954d80d 100644 Binary files a/debug/moc_tcpclient.o and b/debug/moc_tcpclient.o differ diff --git a/debug/recognizesystem.o b/debug/recognizesystem.o index f265eac..3e2a9b9 100644 Binary files a/debug/recognizesystem.o and b/debug/recognizesystem.o differ diff --git a/debug/screenchecker.o b/debug/screenchecker.o index 4cd38ec..96e0a91 100644 Binary files a/debug/screenchecker.o and b/debug/screenchecker.o differ diff --git a/debug/tcpclient.o b/debug/tcpclient.o index 9c95fe6..012a2e6 100644 Binary files a/debug/tcpclient.o and b/debug/tcpclient.o differ diff --git a/debug/tools.o b/debug/tools.o index 5a3d806..f62bdb4 100644 Binary files a/debug/tools.o and b/debug/tools.o differ diff --git a/main.cpp b/main.cpp index fd3e533..6ba4acc 100644 --- a/main.cpp +++ b/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(); diff --git a/mainwindow.cpp b/mainwindow.cpp index 3223dba..b487b58 100644 --- a/mainwindow.cpp +++ b/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(); } diff --git a/mainwindow.ui b/mainwindow.ui index efc21bf..053f2e5 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -29,15 +29,15 @@ - Updater + Тренажер процедур технического обслуживания самолета RRJ-95NEW-100 10 - 10 - 682 + 100 + 681 221 @@ -54,54 +54,60 @@ true - + 0 0 + + + 250 + 0 + + + + + 250 + 16777215 + + false - - - - 0 - 0 - - + - + Вход в систему + + + Qt::AlignCenter - + - Логин: + + + + Логин - - - - - - Пароль: + + + Пароль - - - @@ -136,36 +142,52 @@ 0 + + + 200 + 0 + + + + + 200 + 16777215 + + false + + + + Настройки сервера + + + Qt::AlignCenter + + + - - - Сервер: + + + Сервер - - - - - - Порт: + + + Порт - - - @@ -178,49 +200,13 @@ - - - - false - - - - 0 - 0 - - - - - 250 - 0 - - - - - 250 - 16777215 - - - - - - - - 130 - 240 - 401 - 171 - - - - 10 - 420 + 430 681 61 @@ -228,6 +214,13 @@ + + + + + + + @@ -247,13 +240,6 @@ - - - - - - - @@ -261,9 +247,12 @@ QLayout::SetFixedSize - + 27 + + 0 + @@ -324,6 +313,9 @@ Обновить + + false + @@ -358,6 +350,125 @@ + + + + 200 + 80 + 300 + 40 + + + + + 0 + 0 + + + + + 300 + 0 + + + + + 300 + 16777215 + + + + + 10 + + + + QFrame::StyledPanel + + + QFrame::Plain + + + Какая-то ошибка + + + Qt::RichText + + + Qt::AlignCenter + + + + + + 0 + 0 + 701 + 81 + + + + + + + 50 + 90 + 600 + 200 + + + + + 0 + 0 + + + + + 600 + 200 + + + + + 500 + 200 + + + + + + + + 0 + 0 + + + + + 16777215 + 30 + + + + Выберите активные мониторы + + + Qt::AlignHCenter|Qt::AlignTop + + + + + + + + + + + + + + diff --git a/plane.png b/plane.png new file mode 100644 index 0000000..43500f6 Binary files /dev/null and b/plane.png differ diff --git a/ui_mainwindow.h b/ui_mainwindow.h index 86ede91..db64825 100644 --- a/ui_mainwindow.h +++ b/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()); - loginWidget->setSizePolicy(sizePolicy); + QSizePolicy sizePolicy1(QSizePolicy::Maximum, QSizePolicy::Maximum); + 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); - notificationLabel->setObjectName(QString::fromUtf8("notificationLabel")); - sizePolicy.setHeightForWidth(notificationLabel->sizePolicy().hasHeightForWidth()); - notificationLabel->setSizePolicy(sizePolicy); + loginTitle = new QLabel(loginWidget); + loginTitle->setObjectName(QString::fromUtf8("loginTitle")); + loginTitle->setAlignment(Qt::AlignCenter); - 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)); - 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)); + 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)); + 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)); + loginInputField->setText(QString()); + 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)); - portTitle->setText(QCoreApplication::translate("MainWindow", "\320\237\320\276\321\200\321\202:", 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)); + 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 };