diff --git a/StaticData/clientHash.xml b/StaticData/clientHash.xml index 897a32a..0102b71 100644 --- a/StaticData/clientHash.xml +++ b/StaticData/clientHash.xml @@ -1,2 +1,34 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/StaticData/serverHash.xml b/StaticData/serverHash.xml index 6f41906..c3733ad 100644 --- a/StaticData/serverHash.xml +++ b/StaticData/serverHash.xml @@ -24,7 +24,6 @@ - @@ -186,11 +185,6 @@ - - - - - diff --git a/StaticData/streamingHash.xml b/StaticData/streamingHash.xml index 0bae3d3..1ff7c58 100644 --- a/StaticData/streamingHash.xml +++ b/StaticData/streamingHash.xml @@ -1,631 +1,309 @@ - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/debug/RRJClient.exe b/debug/RRJClient.exe index 4ac6c29..372669b 100644 Binary files a/debug/RRJClient.exe and b/debug/RRJClient.exe differ diff --git a/debug/mainwindow.o b/debug/mainwindow.o index 1f8b22e..1b25499 100644 Binary files a/debug/mainwindow.o and b/debug/mainwindow.o differ diff --git a/mainwindow.cpp b/mainwindow.cpp index 7822ce3..a7355a5 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -143,6 +143,7 @@ void MainWindow::loadComplete() ui->startButton->show(); ui->offlineStartButton->setEnabled(true); ui->autostartCheckBox->hide(); + ui->loadingProgressBar->hide(); ui->offlineStartButton->show(); } @@ -163,15 +164,13 @@ void MainWindow::setNeedUpdate(bool flag,quint64 size, quint64 fileCount) else { ui->inlineTextDebug->setText(tr("Установлена последняя версия")); - - ui->loadingProgressBar->setMaximum(100); - ui->loadingProgressBar->setValue(100); autoStart(); + ui->loadingProgressBar->hide(); ui->startButton->show(); - ui->offlineStartButton->setGeometry(570,510,220,35); - ui->offlineStartButton->show(); } + + stopLoadingMovie(); ui->updateButton->setEnabled(flag); ui->startButton->setEnabled(!flag); } @@ -208,8 +207,8 @@ void MainWindow::checkLoginResult(ServerAuthorization *serverAuth) ui->loginWidget->hide(); ui->LanguageWidget->hide(); ui->settingsButton->hide(); - ui->offlineStartButton->setGeometry(570,510,220,35); ui->offlineStartButton->show(); + startLoadingAnim(); } else { @@ -300,6 +299,7 @@ void MainWindow::slotConnectionState(bool flag) void MainWindow::slotServerDisconnect() { + ui->startButton->hide(); ui->loadingProgressBar->hide(); ui->updateButton->hide(); ui->autostartCheckBox->hide(); @@ -369,6 +369,7 @@ void MainWindow::on_updateButton_clicked() emit sigSendCommand("update"); ui->updateButton->hide(); ui->loadingProgressBar->setValue(0); + ui->loadingProgressBar->show(); } void MainWindow::on_startButton_clicked() @@ -424,7 +425,7 @@ void MainWindow::on_loadToServerButton_clicked() ui->inlineTextDebug->setText(tr("Отправка файлов...")); ui->loadingProgressBar->show(); ui->updateButtonGroup_2->hide(); - ui->offlineStartButton->hide(); + ui->offlineStartButton->setEnabled(false); ui->updateWidget->hide(); emit sigUpdateFilesOnServer(hashComparer->getFilesForUpdate()); @@ -457,17 +458,17 @@ void MainWindow::on_exitButton_clicked() void MainWindow::checkUpdate() { - ui->loadingProgressBar->setValue(0); - ui->loadingProgressBar->show(); emit sigSendCommand("check"); ui->inlineTextDebug->setText(tr("Проверка обновлений...")); } void MainWindow::showUpdateInfo() { - QString text = tr("Есть изменения в локальных файлах (список) "); + stopLoadingMovie(); + + QString text = tr("Есть изменения в локальных файлах (список) "); QString list = tr("Возможные действия:\n" - " 1. Загрузить изменения на сервер\n" + " 1. Выгрузить изменения на сервер\n" " 2. Отменить изменения с загрузкой версии с сервера \n" " 3. Запустить без отправки файлов, но с текущими изменениями"); @@ -486,12 +487,11 @@ void MainWindow::showUpdateInfo() void MainWindow::showCompleteDialogBox(bool flag) { ui->inlineTextDebug->setText(tr("Загрузка завершена")); - movie->start(); + startLoadingAnim(); QTime dieTime= QTime::currentTime().addSecs(10); while (QTime::currentTime() < dieTime) QCoreApplication::processEvents(QEventLoop::AllEvents, 100); - movie->stop(); - + stopLoadingMovie(); checkUpdate(); } diff --git a/mainwindow.ui b/mainwindow.ui index 47cde41..3387253 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -49,18 +49,24 @@ 10 550 - 780 - 41 + 551 + 39 - + 0 + + + 0 + 0 + + 0 @@ -70,7 +76,7 @@ 16777215 - 30 + 40 @@ -78,26 +84,13 @@ - - - - - - QLayout::SetFixedSize - - - 0 - - - 0 - true - + 0 0 @@ -110,8 +103,8 @@ - 100 - 30 + 1000 + 35 @@ -134,7 +127,7 @@ true - + 0 0 @@ -147,8 +140,8 @@ - 100 - 30 + 1000 + 35 @@ -572,7 +565,7 @@ - 350 + 500 16777215 @@ -589,7 +582,7 @@ - + 0 0 @@ -602,8 +595,8 @@ - 350 - 60 + 600 + 100 @@ -615,13 +608,13 @@ false - Связь с сервером не установлена проверьте настройки или запустите в автономном режиме + Связь с сервером не установлена! Проверьте настройки или запустите в автономном режиме true - Qt::AlignCenter + Qt::AlignHCenter|Qt::AlignTop true @@ -780,46 +773,6 @@ Qt::AlignCenter - - - true - - - - 565 - 552 - 220 - 35 - - - - - 0 - 0 - - - - - 150 - 35 - - - - - 1500 - 35 - - - - Запуск в автономном режиме - - - false - - - false - - @@ -1079,16 +1032,56 @@ + + + true + + + + 600 + 552 + 190 + 35 + + + + + 0 + 0 + + + + + 150 + 35 + + + + + 1500 + 35 + + + + Запуск в автономном режиме + + + false + + + false + + mainFrame layoutWidget horizontalWidget notificationLabel - offlineStartButton debugWidget updateButtonGroup_2 updateWidget headerWidget LanguageWidget + offlineStartButton diff --git a/ui_mainwindow.h b/ui_mainwindow.h index 1ea5981..543c83d 100644 --- a/ui_mainwindow.h +++ b/ui_mainwindow.h @@ -32,9 +32,8 @@ public: QWidget *centralwidget; QWidget *layoutWidget; QHBoxLayout *downlayout; - QVBoxLayout *downLayoutLoadingSlider; + QHBoxLayout *horizontalLayout_5; QProgressBar *loadingProgressBar; - QHBoxLayout *horizontalLayout_4; QPushButton *updateButton; QPushButton *startButton; QFrame *mainFrame; @@ -71,7 +70,6 @@ public: QLineEdit *portInputField; QPushButton *saveServerButton; QLabel *notificationLabel; - QPushButton *offlineStartButton; QWidget *debugWidget; QVBoxLayout *verticalLayout_5; QCheckBox *autostartCheckBox; @@ -90,6 +88,7 @@ public: QWidget *iconWidget; MyWinHeader *headerLabel; QPushButton *exitButton; + QPushButton *offlineStartButton; void setupUi(QMainWindow *MainWindow) { @@ -109,45 +108,43 @@ public: centralwidget->setMaximumSize(QSize(800, 600)); layoutWidget = new QWidget(centralwidget); layoutWidget->setObjectName(QString::fromUtf8("layoutWidget")); - layoutWidget->setGeometry(QRect(10, 550, 780, 41)); + layoutWidget->setGeometry(QRect(10, 550, 551, 39)); downlayout = new QHBoxLayout(layoutWidget); downlayout->setObjectName(QString::fromUtf8("downlayout")); downlayout->setContentsMargins(0, 0, 0, 0); - downLayoutLoadingSlider = new QVBoxLayout(); - downLayoutLoadingSlider->setSpacing(0); - downLayoutLoadingSlider->setObjectName(QString::fromUtf8("downLayoutLoadingSlider")); + horizontalLayout_5 = new QHBoxLayout(); + horizontalLayout_5->setSpacing(0); + horizontalLayout_5->setObjectName(QString::fromUtf8("horizontalLayout_5")); loadingProgressBar = new QProgressBar(layoutWidget); loadingProgressBar->setObjectName(QString::fromUtf8("loadingProgressBar")); + QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Fixed); + sizePolicy1.setHorizontalStretch(0); + sizePolicy1.setVerticalStretch(0); + sizePolicy1.setHeightForWidth(loadingProgressBar->sizePolicy().hasHeightForWidth()); + loadingProgressBar->setSizePolicy(sizePolicy1); loadingProgressBar->setMinimumSize(QSize(0, 30)); - loadingProgressBar->setMaximumSize(QSize(16777215, 30)); + loadingProgressBar->setMaximumSize(QSize(16777215, 40)); loadingProgressBar->setValue(10); - downLayoutLoadingSlider->addWidget(loadingProgressBar); + horizontalLayout_5->addWidget(loadingProgressBar); - - downlayout->addLayout(downLayoutLoadingSlider); - - horizontalLayout_4 = new QHBoxLayout(); - horizontalLayout_4->setObjectName(QString::fromUtf8("horizontalLayout_4")); - horizontalLayout_4->setSizeConstraint(QLayout::SetFixedSize); - horizontalLayout_4->setContentsMargins(-1, 0, -1, 0); updateButton = new QPushButton(layoutWidget); updateButton->setObjectName(QString::fromUtf8("updateButton")); updateButton->setEnabled(true); - QSizePolicy sizePolicy1(QSizePolicy::Minimum, QSizePolicy::Minimum); - sizePolicy1.setHorizontalStretch(0); - sizePolicy1.setVerticalStretch(0); - sizePolicy1.setHeightForWidth(updateButton->sizePolicy().hasHeightForWidth()); - updateButton->setSizePolicy(sizePolicy1); + QSizePolicy sizePolicy2(QSizePolicy::Preferred, QSizePolicy::Preferred); + sizePolicy2.setHorizontalStretch(0); + sizePolicy2.setVerticalStretch(0); + sizePolicy2.setHeightForWidth(updateButton->sizePolicy().hasHeightForWidth()); + updateButton->setSizePolicy(sizePolicy2); updateButton->setMinimumSize(QSize(100, 30)); - updateButton->setMaximumSize(QSize(100, 30)); + updateButton->setMaximumSize(QSize(1000, 35)); QFont font; font.setFamily(QString::fromUtf8("Calibri")); font.setPointSize(8); updateButton->setFont(font); updateButton->setFlat(false); - horizontalLayout_4->addWidget(updateButton); + horizontalLayout_5->addWidget(updateButton); startButton = new QPushButton(layoutWidget); startButton->setObjectName(QString::fromUtf8("startButton")); @@ -155,12 +152,12 @@ public: sizePolicy1.setHeightForWidth(startButton->sizePolicy().hasHeightForWidth()); startButton->setSizePolicy(sizePolicy1); startButton->setMinimumSize(QSize(100, 30)); - startButton->setMaximumSize(QSize(100, 30)); + startButton->setMaximumSize(QSize(1000, 35)); - horizontalLayout_4->addWidget(startButton); + horizontalLayout_5->addWidget(startButton); - downlayout->addLayout(horizontalLayout_4); + downlayout->addLayout(horizontalLayout_5); mainFrame = new QFrame(centralwidget); mainFrame->setObjectName(QString::fromUtf8("mainFrame")); @@ -171,9 +168,6 @@ public: displayGroupWidget = new QWidget(mainFrame); displayGroupWidget->setObjectName(QString::fromUtf8("displayGroupWidget")); displayGroupWidget->setGeometry(QRect(0, 10, 781, 200)); - QSizePolicy sizePolicy2(QSizePolicy::Preferred, QSizePolicy::Preferred); - sizePolicy2.setHorizontalStretch(0); - sizePolicy2.setVerticalStretch(0); sizePolicy2.setHeightForWidth(displayGroupWidget->sizePolicy().hasHeightForWidth()); displayGroupWidget->setSizePolicy(sizePolicy2); displayGroupWidget->setMinimumSize(QSize(300, 200)); @@ -184,8 +178,11 @@ public: verticalLayout_4->setContentsMargins(0, 0, 0, 0); displayChoiceTitle = new QLabel(displayGroupWidget); displayChoiceTitle->setObjectName(QString::fromUtf8("displayChoiceTitle")); - sizePolicy1.setHeightForWidth(displayChoiceTitle->sizePolicy().hasHeightForWidth()); - displayChoiceTitle->setSizePolicy(sizePolicy1); + QSizePolicy sizePolicy3(QSizePolicy::Minimum, QSizePolicy::Minimum); + sizePolicy3.setHorizontalStretch(0); + sizePolicy3.setVerticalStretch(0); + sizePolicy3.setHeightForWidth(displayChoiceTitle->sizePolicy().hasHeightForWidth()); + displayChoiceTitle->setSizePolicy(sizePolicy3); displayChoiceTitle->setMaximumSize(QSize(16777215, 30)); QFont font1; font1.setPointSize(10); @@ -225,8 +222,8 @@ public: horizontalLayout_2->setContentsMargins(-1, 0, -1, 0); languageTitle = new QLabel(LanguageWidget); languageTitle->setObjectName(QString::fromUtf8("languageTitle")); - sizePolicy1.setHeightForWidth(languageTitle->sizePolicy().hasHeightForWidth()); - languageTitle->setSizePolicy(sizePolicy1); + sizePolicy3.setHeightForWidth(languageTitle->sizePolicy().hasHeightForWidth()); + languageTitle->setSizePolicy(sizePolicy3); languageTitle->setMinimumSize(QSize(120, 0)); QFont font2; font2.setFamily(QString::fromUtf8("Calibri")); @@ -242,8 +239,8 @@ public: languageComboBox->addItem(QString()); languageComboBox->addItem(QString()); languageComboBox->setObjectName(QString::fromUtf8("languageComboBox")); - sizePolicy1.setHeightForWidth(languageComboBox->sizePolicy().hasHeightForWidth()); - languageComboBox->setSizePolicy(sizePolicy1); + sizePolicy3.setHeightForWidth(languageComboBox->sizePolicy().hasHeightForWidth()); + languageComboBox->setSizePolicy(sizePolicy3); languageComboBox->setMinimumSize(QSize(70, 0)); languageComboBox->setMaximumSize(QSize(70, 50)); QFont font3; @@ -264,11 +261,11 @@ public: loginWidget = new QWidget(horizontalWidget); loginWidget->setObjectName(QString::fromUtf8("loginWidget")); loginWidget->setEnabled(true); - QSizePolicy sizePolicy3(QSizePolicy::Minimum, QSizePolicy::Preferred); - sizePolicy3.setHorizontalStretch(0); - sizePolicy3.setVerticalStretch(0); - sizePolicy3.setHeightForWidth(loginWidget->sizePolicy().hasHeightForWidth()); - loginWidget->setSizePolicy(sizePolicy3); + QSizePolicy sizePolicy4(QSizePolicy::Minimum, QSizePolicy::Preferred); + sizePolicy4.setHorizontalStretch(0); + sizePolicy4.setVerticalStretch(0); + sizePolicy4.setHeightForWidth(loginWidget->sizePolicy().hasHeightForWidth()); + loginWidget->setSizePolicy(sizePolicy4); loginWidget->setMinimumSize(QSize(0, 0)); loginWidget->setMaximumSize(QSize(250, 300)); loginWidget->setAutoFillBackground(false); @@ -278,8 +275,8 @@ public: verticalLayout->setContentsMargins(0, 0, 0, 0); loginLayoutWidget = new QWidget(loginWidget); loginLayoutWidget->setObjectName(QString::fromUtf8("loginLayoutWidget")); - sizePolicy3.setHeightForWidth(loginLayoutWidget->sizePolicy().hasHeightForWidth()); - loginLayoutWidget->setSizePolicy(sizePolicy3); + sizePolicy4.setHeightForWidth(loginLayoutWidget->sizePolicy().hasHeightForWidth()); + loginLayoutWidget->setSizePolicy(sizePolicy4); loginLayoutWidget->setMinimumSize(QSize(250, 190)); loginLayoutWidget->setMaximumSize(QSize(240, 250)); loginLayout = new QVBoxLayout(loginLayoutWidget); @@ -287,8 +284,8 @@ public: loginLayout->setObjectName(QString::fromUtf8("loginLayout")); loginTitle = new QLabel(loginLayoutWidget); loginTitle->setObjectName(QString::fromUtf8("loginTitle")); - sizePolicy1.setHeightForWidth(loginTitle->sizePolicy().hasHeightForWidth()); - loginTitle->setSizePolicy(sizePolicy1); + sizePolicy3.setHeightForWidth(loginTitle->sizePolicy().hasHeightForWidth()); + loginTitle->setSizePolicy(sizePolicy3); loginTitle->setMaximumSize(QSize(250, 30)); loginTitle->setAlignment(Qt::AlignCenter); @@ -296,19 +293,19 @@ public: loginInputField = new QLineEdit(loginLayoutWidget); loginInputField->setObjectName(QString::fromUtf8("loginInputField")); - QSizePolicy sizePolicy4(QSizePolicy::Minimum, QSizePolicy::Fixed); - sizePolicy4.setHorizontalStretch(0); - sizePolicy4.setVerticalStretch(0); - sizePolicy4.setHeightForWidth(loginInputField->sizePolicy().hasHeightForWidth()); - loginInputField->setSizePolicy(sizePolicy4); + QSizePolicy sizePolicy5(QSizePolicy::Minimum, QSizePolicy::Fixed); + sizePolicy5.setHorizontalStretch(0); + sizePolicy5.setVerticalStretch(0); + sizePolicy5.setHeightForWidth(loginInputField->sizePolicy().hasHeightForWidth()); + loginInputField->setSizePolicy(sizePolicy5); loginInputField->setMinimumSize(QSize(230, 35)); loginLayout->addWidget(loginInputField); passwordInputField = new QLineEdit(loginLayoutWidget); passwordInputField->setObjectName(QString::fromUtf8("passwordInputField")); - sizePolicy4.setHeightForWidth(passwordInputField->sizePolicy().hasHeightForWidth()); - passwordInputField->setSizePolicy(sizePolicy4); + sizePolicy5.setHeightForWidth(passwordInputField->sizePolicy().hasHeightForWidth()); + passwordInputField->setSizePolicy(sizePolicy5); passwordInputField->setMinimumSize(QSize(230, 35)); loginLayout->addWidget(passwordInputField); @@ -329,22 +326,22 @@ public: offlineWidget = new QWidget(horizontalWidget); offlineWidget->setObjectName(QString::fromUtf8("offlineWidget")); offlineWidget->setMinimumSize(QSize(0, 0)); - offlineWidget->setMaximumSize(QSize(350, 16777215)); + offlineWidget->setMaximumSize(QSize(500, 16777215)); verticalLayout_3 = new QVBoxLayout(offlineWidget); verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3")); verticalLayout_3->setContentsMargins(0, 0, 0, -1); offlineNotifyLabel = new QLabel(offlineWidget); offlineNotifyLabel->setObjectName(QString::fromUtf8("offlineNotifyLabel")); - sizePolicy1.setHeightForWidth(offlineNotifyLabel->sizePolicy().hasHeightForWidth()); - offlineNotifyLabel->setSizePolicy(sizePolicy1); + sizePolicy2.setHeightForWidth(offlineNotifyLabel->sizePolicy().hasHeightForWidth()); + offlineNotifyLabel->setSizePolicy(sizePolicy2); offlineNotifyLabel->setMinimumSize(QSize(0, 50)); - offlineNotifyLabel->setMaximumSize(QSize(350, 60)); + offlineNotifyLabel->setMaximumSize(QSize(600, 100)); QFont font4; font4.setPointSize(8); offlineNotifyLabel->setFont(font4); offlineNotifyLabel->setAutoFillBackground(false); offlineNotifyLabel->setScaledContents(true); - offlineNotifyLabel->setAlignment(Qt::AlignCenter); + offlineNotifyLabel->setAlignment(Qt::AlignHCenter|Qt::AlignTop); offlineNotifyLabel->setWordWrap(true); offlineNotifyLabel->setMargin(0); @@ -414,16 +411,6 @@ public: notificationLabel->setFrameShadow(QFrame::Plain); notificationLabel->setTextFormat(Qt::RichText); notificationLabel->setAlignment(Qt::AlignCenter); - offlineStartButton = new QPushButton(centralwidget); - offlineStartButton->setObjectName(QString::fromUtf8("offlineStartButton")); - offlineStartButton->setEnabled(true); - offlineStartButton->setGeometry(QRect(565, 552, 220, 35)); - sizePolicy4.setHeightForWidth(offlineStartButton->sizePolicy().hasHeightForWidth()); - offlineStartButton->setSizePolicy(sizePolicy4); - offlineStartButton->setMinimumSize(QSize(150, 35)); - offlineStartButton->setMaximumSize(QSize(1500, 35)); - offlineStartButton->setCheckable(false); - offlineStartButton->setChecked(false); debugWidget = new QWidget(centralwidget); debugWidget->setObjectName(QString::fromUtf8("debugWidget")); debugWidget->setGeometry(QRect(10, 500, 561, 51)); @@ -503,8 +490,8 @@ public: headerLayout->setContentsMargins(0, 0, 0, 0); iconWidget = new QWidget(headerWidget); iconWidget->setObjectName(QString::fromUtf8("iconWidget")); - sizePolicy1.setHeightForWidth(iconWidget->sizePolicy().hasHeightForWidth()); - iconWidget->setSizePolicy(sizePolicy1); + sizePolicy3.setHeightForWidth(iconWidget->sizePolicy().hasHeightForWidth()); + iconWidget->setSizePolicy(sizePolicy3); iconWidget->setMinimumSize(QSize(30, 30)); iconWidget->setMaximumSize(QSize(30, 30)); @@ -517,24 +504,34 @@ public: exitButton = new QPushButton(headerWidget); exitButton->setObjectName(QString::fromUtf8("exitButton")); - sizePolicy1.setHeightForWidth(exitButton->sizePolicy().hasHeightForWidth()); - exitButton->setSizePolicy(sizePolicy1); + sizePolicy3.setHeightForWidth(exitButton->sizePolicy().hasHeightForWidth()); + exitButton->setSizePolicy(sizePolicy3); exitButton->setMinimumSize(QSize(30, 30)); exitButton->setMaximumSize(QSize(50, 50)); headerLayout->addWidget(exitButton); + offlineStartButton = new QPushButton(centralwidget); + offlineStartButton->setObjectName(QString::fromUtf8("offlineStartButton")); + offlineStartButton->setEnabled(true); + offlineStartButton->setGeometry(QRect(600, 552, 190, 35)); + sizePolicy5.setHeightForWidth(offlineStartButton->sizePolicy().hasHeightForWidth()); + offlineStartButton->setSizePolicy(sizePolicy5); + offlineStartButton->setMinimumSize(QSize(150, 35)); + offlineStartButton->setMaximumSize(QSize(1500, 35)); + offlineStartButton->setCheckable(false); + offlineStartButton->setChecked(false); MainWindow->setCentralWidget(centralwidget); mainFrame->raise(); layoutWidget->raise(); horizontalWidget->raise(); notificationLabel->raise(); - offlineStartButton->raise(); debugWidget->raise(); updateButtonGroup_2->raise(); updateWidget->raise(); headerWidget->raise(); LanguageWidget->raise(); + offlineStartButton->raise(); retranslateUi(MainWindow); @@ -557,13 +554,12 @@ public: 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)); loginButton->setText(QCoreApplication::translate("MainWindow", "\320\222\320\276\320\271\321\202\320\270", nullptr)); - offlineNotifyLabel->setText(QCoreApplication::translate("MainWindow", "\320\241\320\262\321\217\320\267\321\214 \321\201 \321\201\320\265\321\200\320\262\320\265\321\200\320\276\320\274 \320\275\320\265 \321\203\321\201\321\202\320\260\320\275\320\276\320\262\320\273\320\265\320\275\320\260 \320\277\321\200\320\276\320\262\320\265\321\200\321\214\321\202\320\265 \320\275\320\260\321\201\321\202\321\200\320\276\320\271\320\272\320\270 \320\270\320\273\320\270 \320\267\320\260\320\277\321\203\321\201\321\202\320\270\321\202\320\265 \320\262 \320\260\320\262\321\202\320\276\320\275\320\276\320\274\320\275\320\276\320\274 \321\200\320\265\320\266\320\270\320\274\320\265", nullptr)); + offlineNotifyLabel->setText(QCoreApplication::translate("MainWindow", "\320\241\320\262\321\217\320\267\321\214 \321\201 \321\201\320\265\321\200\320\262\320\265\321\200\320\276\320\274 \320\275\320\265 \321\203\321\201\321\202\320\260\320\275\320\276\320\262\320\273\320\265\320\275\320\260! \320\237\321\200\320\276\320\262\320\265\321\200\321\214\321\202\320\265 \320\275\320\260\321\201\321\202\321\200\320\276\320\271\320\272\320\270 \320\270\320\273\320\270 \320\267\320\260\320\277\321\203\321\201\321\202\320\270\321\202\320\265 \320\262 \320\260\320\262\321\202\320\276\320\275\320\276\320\274\320\275\320\276\320\274 \321\200\320\265\320\266\320\270\320\274\320\265", 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)); 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)); - offlineStartButton->setText(QCoreApplication::translate("MainWindow", "\320\227\320\260\320\277\321\203\321\201\320\272 \320\262 \320\260\320\262\321\202\320\276\320\275\320\276\320\274\320\275\320\276\320\274 \321\200\320\265\320\266\320\270\320\274\320\265", nullptr)); autostartCheckBox->setText(QCoreApplication::translate("MainWindow", "\320\220\320\262\321\202\320\276\320\267\320\260\320\277\321\203\321\201\320\272", nullptr)); inlineTextDebug->setText(QString()); updateListGuideLabel->setText(QCoreApplication::translate("MainWindow", "\320\225\321\201\321\202\321\214 \320\270\320\267\320\274\320\265\320\275\320\265\320\275\320\270\321\217 \320\262 \320\273\320\276\320\272\320\260\320\273\321\214\320\275\321\213\321\205 \321\204\320\260\320\271\320\273\320\260\321\205", nullptr)); @@ -573,6 +569,7 @@ public: startWithCurrentChangesButton->setText(QCoreApplication::translate("MainWindow", "\320\227\320\260\320\277\321\203\321\201\321\202\320\270\321\202\321\214 \320\261\320\265\320\267 \320\276\321\202\320\277\321\200\320\260\320\262\320\272\320\270", nullptr)); headerLabel->setText(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)); exitButton->setText(QString()); + offlineStartButton->setText(QCoreApplication::translate("MainWindow", "\320\227\320\260\320\277\321\203\321\201\320\272 \320\262 \320\260\320\262\321\202\320\276\320\275\320\276\320\274\320\275\320\276\320\274 \321\200\320\265\320\266\320\270\320\274\320\265", nullptr)); } // retranslateUi };