diff --git a/Core/recognizesystem.cpp b/Core/recognizesystem.cpp index ca75671..b0aff77 100644 --- a/Core/recognizesystem.cpp +++ b/Core/recognizesystem.cpp @@ -303,5 +303,5 @@ void RecognizeSystem::setServerVersion(StreamingVersionData *serverVersion) void RecognizeSystem::showServerDataList(QList *showServerDataList) { - emit sigShowServerList(showServerDataList); + //emit sigShowServerList(showServerDataList); } diff --git a/RRJClient.pro.user b/RRJClient.pro.user index 71be105..611cc28 100644 --- a/RRJClient.pro.user +++ b/RRJClient.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/StaticData/clientHash.xml b/StaticData/clientHash.xml index d49bd2e..6d055e7 100644 --- a/StaticData/clientHash.xml +++ b/StaticData/clientHash.xml @@ -22,6 +22,7 @@ + @@ -191,15 +192,17 @@ - - - - - - - - - - + + + + + + + + + + + + diff --git a/StaticData/serverHash.xml b/StaticData/serverHash.xml index 67fc33c..3b24a5d 100644 --- a/StaticData/serverHash.xml +++ b/StaticData/serverHash.xml @@ -181,11 +181,15 @@ + + + + diff --git a/StaticData/settings.xml b/StaticData/settings.xml index 8877b7c..fe7e40f 100644 --- a/StaticData/settings.xml +++ b/StaticData/settings.xml @@ -1,5 +1,5 @@ - + - - + + diff --git a/StaticData/streamingHash.xml b/StaticData/streamingHash.xml index 69331f4..5cde9ea 100644 --- a/StaticData/streamingHash.xml +++ b/StaticData/streamingHash.xml @@ -4,15 +4,17 @@ - - - - - - - - - - + + + + + + + + + + + + diff --git a/StaticData/temp.xml b/StaticData/temp.xml index 021a729..ed93f70 100644 --- a/StaticData/temp.xml +++ b/StaticData/temp.xml @@ -1,2 +1,2 @@ - + diff --git a/Widgets/updatenotifywidget.cpp b/Widgets/updatenotifywidget.cpp index a74120d..d0da5b0 100644 --- a/Widgets/updatenotifywidget.cpp +++ b/Widgets/updatenotifywidget.cpp @@ -33,17 +33,50 @@ void UpdateNotifyWidget::addToList(FileData fileData) void UpdateNotifyWidget::showWithFill() { - QString list = tr("Возможные действия:\n" - " 1. Выгрузить изменения на сервер\n" - " 2. Отменить изменения с загрузкой версии с сервера \n" - " 3. Запустить без отправки файлов, но с текущими изменениями"); + if(versionContainer->getServerVersion() == baseNamePackage) + { + QString link; - ui->updateActionListLabel->setText(list); + ui->labelsLayout->addWidget(createLabel(tr("Данные изменения нельзя выгрузить на сервер, так как версия сервера не изменяема \n"))); + ui->labelsLayout->addWidget(createLabel(tr("Чтобы внести изменения нужно:"))); + ui->labelsLayout->addWidget(createLabel(tr("1. Скопировать измененные или созданные файлы в временную папку"))); + ui->labelsLayout->addWidget(createLabel(tr("2. Изменить версию сервера на изменяемую"))); + ui->labelsLayout->addWidget(createLabel(tr("3. Запустить клиент и обновить версию и выключить клиент"))); + //СОЗДАНИЕ + QString path = QDir::currentPath() + streamingAssetsPath; + link = "\"папку\""; + QLabel *linkLabel = new QLabel; + linkLabel->setText(tr("4. Скопировать файлы из временной папки в эту ") + link); + linkLabel->setOpenExternalLinks(true); + + ui->labelsLayout->addWidget(linkLabel); + ui->labelsLayout->addWidget(createLabel(tr("5.Запустить клиент и выгрузить изменения на сервер"))); + + ui->instructorButtonGroup->hide(); + } + else + { + ui->labelsLayout->addWidget(createLabel(tr("Возможные действия:"))); + ui->labelsLayout->addWidget(createLabel(tr(" 1. Выгрузить изменения на сервер"))); + ui->labelsLayout->addWidget(createLabel(tr(" 2. Отменить изменения с загрузкой версии с сервера"))); + ui->labelsLayout->addWidget(createLabel(tr(" 3. Запустить без отправки файлов, но с текущими изменениями"))); + + ui->instructorButtonGroup->show(); + } + + qDebug() << ui->NotificationLabel->text(); show(); } +QLabel* UpdateNotifyWidget::createLabel(QString text) +{ + QLabel *label = new QLabel; + label->setText(text); + + return label; +} void UpdateNotifyWidget::on_loadToServerButton_clicked() { mainWindow->loadToServer(); diff --git a/Widgets/updatenotifywidget.h b/Widgets/updatenotifywidget.h index 4fc8dca..49e8a4d 100644 --- a/Widgets/updatenotifywidget.h +++ b/Widgets/updatenotifywidget.h @@ -5,6 +5,7 @@ #include #include +#include #include @@ -42,6 +43,7 @@ private: MainWindow *mainWindow; VersionContainer *versionContainer; int currentLoadingCount; + QLabel* createLabel(QString text); }; #endif // UPDATENOTIFYWIDGET_H diff --git a/Widgets/updatenotifywidget.ui b/Widgets/updatenotifywidget.ui index 22a672e..7c81677 100644 --- a/Widgets/updatenotifywidget.ui +++ b/Widgets/updatenotifywidget.ui @@ -72,6 +72,9 @@ Обнаружены новые файлы: + + false + @@ -82,14 +85,17 @@ QFrame::Plain + + 100 + - - - text + + + 1 - + diff --git a/debug/RRJClient.exe b/debug/RRJClient.exe index f523613..eebf88d 100644 Binary files a/debug/RRJClient.exe and b/debug/RRJClient.exe differ diff --git a/debug/commonbuttongroupwidget.o b/debug/commonbuttongroupwidget.o index 00f049f..d198c5c 100644 Binary files a/debug/commonbuttongroupwidget.o and b/debug/commonbuttongroupwidget.o differ diff --git a/debug/entrywidget.o b/debug/entrywidget.o index f1624cc..21711d7 100644 Binary files a/debug/entrywidget.o and b/debug/entrywidget.o differ diff --git a/debug/instructorbuttongroupwidget.o b/debug/instructorbuttongroupwidget.o index 20a13ab..51ca99b 100644 Binary files a/debug/instructorbuttongroupwidget.o and b/debug/instructorbuttongroupwidget.o differ diff --git a/debug/mainwindow.o b/debug/mainwindow.o index 6a0a0b6..ef2f767 100644 Binary files a/debug/mainwindow.o and b/debug/mainwindow.o differ diff --git a/debug/moc_commonbuttongroupwidget.o b/debug/moc_commonbuttongroupwidget.o index 2ae7b4d..806436b 100644 Binary files a/debug/moc_commonbuttongroupwidget.o and b/debug/moc_commonbuttongroupwidget.o differ diff --git a/debug/moc_entrywidget.o b/debug/moc_entrywidget.o index 73244f4..b5a69c4 100644 Binary files a/debug/moc_entrywidget.o and b/debug/moc_entrywidget.o differ diff --git a/debug/moc_instructorbuttongroupwidget.o b/debug/moc_instructorbuttongroupwidget.o index 89cb91e..c30d1ed 100644 Binary files a/debug/moc_instructorbuttongroupwidget.o and b/debug/moc_instructorbuttongroupwidget.o differ diff --git a/debug/moc_mainwindow.o b/debug/moc_mainwindow.o index 72f7a7d..5a2c3c7 100644 Binary files a/debug/moc_mainwindow.o and b/debug/moc_mainwindow.o differ diff --git a/debug/moc_newversionwidget.o b/debug/moc_newversionwidget.o index 1c81b71..f8320f4 100644 Binary files a/debug/moc_newversionwidget.o and b/debug/moc_newversionwidget.o differ diff --git a/debug/moc_updatenotifywidget.o b/debug/moc_updatenotifywidget.o index 2dbc641..0b31bda 100644 Binary files a/debug/moc_updatenotifywidget.o and b/debug/moc_updatenotifywidget.o differ diff --git a/debug/moc_versionselectwidget.o b/debug/moc_versionselectwidget.o index 07a33c6..3779e20 100644 Binary files a/debug/moc_versionselectwidget.o and b/debug/moc_versionselectwidget.o differ diff --git a/debug/newversionwidget.o b/debug/newversionwidget.o index 56733f5..278e8eb 100644 Binary files a/debug/newversionwidget.o and b/debug/newversionwidget.o differ diff --git a/debug/qrc_resources.cpp b/debug/qrc_resources.cpp index fe3b4af..fc3c584 100644 --- a/debug/qrc_resources.cpp +++ b/debug/qrc_resources.cpp @@ -328148,7 +328148,7 @@ static const unsigned char qt_resource_struct[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, // :/style.css 0x0,0x0,0x0,0x16,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0, -0x0,0x0,0x1,0x94,0x73,0x3d,0x42,0x61, +0x0,0x0,0x1,0x94,0x88,0xbe,0xfc,0x99, // :/resource 0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x6,0x0,0x0,0x0,0x3, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, @@ -328160,52 +328160,52 @@ static const unsigned char qt_resource_struct[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, // :/resource/SSJ-100Dark.png 0x0,0x0,0x0,0xb2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x3c,0x49,0xe4, -0x0,0x0,0x1,0x92,0x4d,0x8e,0xd2,0xb0, +0x0,0x0,0x1,0x94,0x82,0xb8,0xcc,0x46, // :/resource/SSJ-100.png 0x0,0x0,0x0,0x96,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x2f,0xcd,0x36, -0x0,0x0,0x1,0x92,0x4d,0x0,0xce,0xbb, +0x0,0x0,0x1,0x94,0x82,0xb8,0xcc,0x44, // :/resource/SSJ_backgroundDarkSM.png 0x0,0x0,0x0,0x60,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x22,0x2d,0x97, -0x0,0x0,0x1,0x94,0x73,0x3d,0x42,0x5c, +0x0,0x0,0x1,0x94,0x82,0xb9,0x9,0xc2, // :/resource/SSJ_backgroundDark.png 0x0,0x0,0x0,0x2e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x3,0x64, -0x0,0x0,0x1,0x94,0x73,0x3d,0x42,0x32, +0x0,0x0,0x1,0x94,0x82,0xb9,0x9,0xbf, // :/resource/Icons/caution.png 0x0,0x0,0x1,0x90,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x5,0x71, -0x0,0x0,0x1,0x94,0x73,0x3d,0x41,0xee, +0x0,0x0,0x1,0x94,0x82,0xb9,0xe,0x4a, // :/resource/Icons/setting.png 0x0,0x0,0x2,0x34,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xa6,0x74, -0x0,0x0,0x1,0x92,0x47,0x9,0xdd,0xaa, +0x0,0x0,0x1,0x94,0x82,0xb8,0xc6,0x23, // :/resource/Icons/checked.png 0x0,0x0,0x2,0x90,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0x3,0xe1, -0x0,0x0,0x1,0x92,0x51,0xaa,0xfa,0x67, +0x0,0x0,0x1,0x94,0x82,0xb8,0xd6,0xe7, // :/resource/Icons/settingWhite.png 0x0,0x0,0x1,0xe2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x5a,0x6d, -0x0,0x0,0x1,0x92,0x47,0xc,0xaf,0x4c, +0x0,0x0,0x1,0x94,0x82,0xb8,0xc6,0x23, // :/resource/Icons/plane.png 0x0,0x0,0x2,0x50,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xd1,0x86, -0x0,0x0,0x1,0x91,0xb3,0xf,0xc0,0x1f, +0x0,0x0,0x1,0x94,0x82,0xb8,0xc2,0xec, // :/resource/Icons/crossInCircle.png 0x0,0x0,0x2,0x68,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xd5,0xd3, -0x0,0x0,0x1,0x92,0x4c,0x9f,0x4d,0xc4, +0x0,0x0,0x1,0x94,0x82,0xb8,0xcc,0x41, // :/resource/Icons/whiteCross.png 0x0,0x0,0x1,0xc0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x43,0xf8, -0x0,0x0,0x1,0x92,0x4c,0x9e,0xfa,0x44, +0x0,0x0,0x1,0x94,0x82,0xb8,0xcc,0x41, // :/resource/Icons/monitor-display.png 0x0,0x0,0x2,0x8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xa0,0xa5, -0x0,0x0,0x1,0x92,0x42,0xfe,0x89,0x26, +0x0,0x0,0x1,0x94,0x82,0xb8,0xc2,0xec, // :/resource/Icons/762.gif 0x0,0x0,0x1,0xac,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x1d,0x82, -0x0,0x0,0x1,0x92,0x4d,0xb,0xea,0x71, +0x0,0x0,0x1,0x94,0x82,0xb8,0xcc,0x40, // :/resource/Fonts/HelveticaNeue-Medium.ttf 0x0,0x0,0x0,0xf6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x46,0xbc,0x41, -0x0,0x0,0x1,0x92,0x42,0xb4,0xbd,0xcd, +0x0,0x0,0x1,0x94,0x82,0xb8,0xc2,0xec, // :/resource/Fonts/LiberationSans-Regular.ttf 0x0,0x0,0x1,0x56,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0xad,0x75, -0x0,0x0,0x1,0x92,0x42,0x25,0xa7,0xdc, +0x0,0x0,0x1,0x94,0x82,0xb8,0xba,0xb3, // :/resource/Fonts/Kanit Cyrillic.ttf 0x0,0x0,0x1,0x2c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0x25,0xb5, -0x0,0x0,0x1,0x92,0x42,0x14,0x94,0xcc, +0x0,0x0,0x1,0x94,0x82,0xb8,0xba,0xb0, }; diff --git a/debug/qrc_resources.o b/debug/qrc_resources.o index d6c5814..ef31912 100644 Binary files a/debug/qrc_resources.o and b/debug/qrc_resources.o differ diff --git a/debug/recognizesystem.o b/debug/recognizesystem.o index 3ebfe42..c0b2c2b 100644 Binary files a/debug/recognizesystem.o and b/debug/recognizesystem.o differ diff --git a/debug/updatenotifywidget.o b/debug/updatenotifywidget.o index 460ea4f..350aaa1 100644 Binary files a/debug/updatenotifywidget.o and b/debug/updatenotifywidget.o differ diff --git a/debug/versionselectwidget.o b/debug/versionselectwidget.o index 1ba9f23..b822ba0 100644 Binary files a/debug/versionselectwidget.o and b/debug/versionselectwidget.o differ diff --git a/ui_updatenotifywidget.h b/ui_updatenotifywidget.h index dbfaa1b..fb1bbb3 100644 --- a/ui_updatenotifywidget.h +++ b/ui_updatenotifywidget.h @@ -30,7 +30,7 @@ public: QVBoxLayout *updateListLayout; QLabel *NotificationLabel; QListWidget *updateListWidget; - QLabel *updateActionListLabel; + QVBoxLayout *labelsLayout; QHBoxLayout *ButtonsLayout; QWidget *instructorButtonGroup; QHBoxLayout *updateButtonGroup; @@ -70,6 +70,7 @@ public: sizePolicy1.setVerticalStretch(0); sizePolicy1.setHeightForWidth(NotificationLabel->sizePolicy().hasHeightForWidth()); NotificationLabel->setSizePolicy(sizePolicy1); + NotificationLabel->setOpenExternalLinks(false); updateListLayout->addWidget(NotificationLabel); @@ -77,13 +78,15 @@ public: updateListWidget->setObjectName(QString::fromUtf8("updateListWidget")); updateListWidget->setFrameShape(QFrame::NoFrame); updateListWidget->setFrameShadow(QFrame::Plain); + updateListWidget->setBatchSize(100); updateListLayout->addWidget(updateListWidget); - updateActionListLabel = new QLabel(verticalLayoutWidget); - updateActionListLabel->setObjectName(QString::fromUtf8("updateActionListLabel")); + labelsLayout = new QVBoxLayout(); + labelsLayout->setSpacing(1); + labelsLayout->setObjectName(QString::fromUtf8("labelsLayout")); - updateListLayout->addWidget(updateActionListLabel); + updateListLayout->addLayout(labelsLayout); mainLayout->addLayout(updateListLayout); @@ -156,7 +159,6 @@ public: { UpdateNotifyWidget->setWindowTitle(QCoreApplication::translate("UpdateNotifyWidget", "Form", nullptr)); NotificationLabel->setText(QCoreApplication::translate("UpdateNotifyWidget", "\320\236\320\261\320\275\320\260\321\200\321\203\320\266\320\265\320\275\321\213 \320\275\320\276\320\262\321\213\320\265 \321\204\320\260\320\271\320\273\321\213:", nullptr)); - updateActionListLabel->setText(QCoreApplication::translate("UpdateNotifyWidget", "text", nullptr)); loadToServerButton->setText(QCoreApplication::translate("UpdateNotifyWidget", "\320\222\321\213\320\263\321\200\321\203\320\267\320\270\321\202\321\214 \320\270\320\267\320\274\320\265\320\275\320\265\320\275\320\270\321\217", nullptr)); undoChangesButton->setText(QCoreApplication::translate("UpdateNotifyWidget", "\320\236\321\202\320\274\320\265\320\275\320\270\321\202\321\214 \320\270\320\267\320\274\320\265\320\275\320\265\320\275\320\270\321\217", nullptr)); startWithCurrentChangesButton->setText(QCoreApplication::translate("UpdateNotifyWidget", "\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));