Constanta-Design/RRJClient
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJClient.git synced 2026-03-28 05:25:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

ref: change instructor behaviour

Browse Source
This commit is contained in:
semenov
2025-01-22 13:22:45 +03:00
parent c1cf263f5f
commit d09b8b5727
29 changed files with 109 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Core/recognizesystem.cpp
View File

@@ -303,5 +303,5 @@ void RecognizeSystem::setServerVersion(StreamingVersionData *serverVersion)
void RecognizeSystem::showServerDataList(QList<StreamingVersionData*> *showServerDataList) void RecognizeSystem::showServerDataList(QList<StreamingVersionData*> *showServerDataList)
{ {
emit sigShowServerList(showServerDataList); //emit sigShowServerList(showServerDataList);
} }

2
RRJClient.pro.user
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.11.1, 2025-01-17T17:02:20. --> <!-- Written by QtCreator 4.11.1, 2025-01-21T15:03:26. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>

23
StaticData/clientHash.xml
View File

@@ -22,6 +22,7 @@
<FileData Path="/Application/RRJLoader/RRJ_Data/Plugins/x86_64" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/Plugins/x86_64" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Resources" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/Resources" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Folder1922" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds" Hash="FOLDER"/>
@@ -191,15 +192,17 @@
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file12433.txt" Hash="c11112f91ecb21aa9f6d8ce0b0eb9e48"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Folder1922" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file6037.txt" Hash="2a14cbcfedf7d5548538b58a310dc234"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100/docs.xml" Hash="fcad1626c1ef3851931bf68a1aa054c6"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS/024.31.00a.xml" Hash="e730fbd64cd77dd163732cfaf2bd0e75"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/ir_begin.wav" Hash="2e0057ee08c7b6fa07d28863a40d1cbf"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/ir_end.wav" Hash="e83345df81f1e577bb53766875efc31d"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Menu Command.wav" Hash="822b4c37ce07436e2192785f3274386f"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Minimize.wav" Hash="8fb59dad02c94ebc63590b14f4d1de2e"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Navigation Start.wav" Hash="b82aa79f496456ffc5b952b484af25f5"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Proximity Connection.wav" Hash="00882d550b9389c6183ee3da0b668b2d"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Proximity Notification.wav" Hash="e15f0210410a574af39b07840ccbe4cc"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Proximity Notification.wav" Hash="e15f0210410a574af39b07840ccbe4cc"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Proximity Connection.wav" Hash="00882d550b9389c6183ee3da0b668b2d"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Navigation Start.wav" Hash="b82aa79f496456ffc5b952b484af25f5"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Minimize.wav" Hash="8fb59dad02c94ebc63590b14f4d1de2e"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Menu Command.wav" Hash="822b4c37ce07436e2192785f3274386f"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/ir_end.wav" Hash="e83345df81f1e577bb53766875efc31d"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/ir_begin.wav" Hash="2e0057ee08c7b6fa07d28863a40d1cbf"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS/024.31.00a.xml" Hash="e730fbd64cd77dd163732cfaf2bd0e75"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100/tasksFIM.xml" Hash="6e29a8516f67f562ad75eb7100e996f6"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100/tasksAMM.xml" Hash="29e38d460ab87f93c99d84cb407c411c"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100/docs.xml" Hash="fcad1626c1ef3851931bf68a1aa054c6"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file14766.txt" Hash="336c187cc3a6a0d7681d4364ab994cde"/>
</FileDataList> </FileDataList>

4
StaticData/serverHash.xml
View File

@@ -181,11 +181,15 @@
<FileData Path="/Application/RRJLoader/RRJ_Data/sharedassets0.assets.resS" Hash="897317a657f377346d8932827dc78da0"/> <FileData Path="/Application/RRJLoader/RRJ_Data/sharedassets0.assets.resS" Hash="897317a657f377346d8932827dc78da0"/>
<FileData Path="/Application/RRJLoader/UnityCrashHandler64.exe" Hash="ea440810e323f7b7ca54727cd23d068e"/> <FileData Path="/Application/RRJLoader/UnityCrashHandler64.exe" Hash="ea440810e323f7b7ca54727cd23d068e"/>
<FileData Path="/Application/RRJLoader/UnityPlayer.dll" Hash="0486f8cc69625acdb24a62855754b228"/> <FileData Path="/Application/RRJLoader/UnityPlayer.dll" Hash="0486f8cc69625acdb24a62855754b228"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Folder1922" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file14766.txt" Hash="336c187cc3a6a0d7681d4364ab994cde"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100/docs.xml" Hash="fcad1626c1ef3851931bf68a1aa054c6"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100/docs.xml" Hash="fcad1626c1ef3851931bf68a1aa054c6"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100/tasksAMM.xml" Hash="29e38d460ab87f93c99d84cb407c411c"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100/tasksFIM.xml" Hash="6e29a8516f67f562ad75eb7100e996f6"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS/024.31.00a.xml" Hash="e730fbd64cd77dd163732cfaf2bd0e75"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS/024.31.00a.xml" Hash="e730fbd64cd77dd163732cfaf2bd0e75"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/ir_begin.wav" Hash="2e0057ee08c7b6fa07d28863a40d1cbf"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/ir_begin.wav" Hash="2e0057ee08c7b6fa07d28863a40d1cbf"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/ir_end.wav" Hash="e83345df81f1e577bb53766875efc31d"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/ir_end.wav" Hash="e83345df81f1e577bb53766875efc31d"/>

6
StaticData/settings.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version='1.0' encoding='UTF-8'?>
<ServerSettingsContainer> <ServerSettingsContainer>
<ServerSettings Address="192.168.100.241" Port="6000" Language="RUS" AutoStart="0"/> <ServerSettings Port="6000" Language="RUS" AutoStart="0" Address="192.168.100.241"/>
<VersionData Version="base"/> <VersionData Version="modifyBase"/>
</ServerSettingsContainer> </ServerSettingsContainer>

22
StaticData/streamingHash.xml
View File

@@ -4,15 +4,17 @@
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file12433.txt" Hash="c11112f91ecb21aa9f6d8ce0b0eb9e48"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Folder1922" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file6037.txt" Hash="2a14cbcfedf7d5548538b58a310dc234"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100/docs.xml" Hash="fcad1626c1ef3851931bf68a1aa054c6"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS/024.31.00a.xml" Hash="e730fbd64cd77dd163732cfaf2bd0e75"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/ir_begin.wav" Hash="2e0057ee08c7b6fa07d28863a40d1cbf"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/ir_end.wav" Hash="e83345df81f1e577bb53766875efc31d"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Menu Command.wav" Hash="822b4c37ce07436e2192785f3274386f"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Minimize.wav" Hash="8fb59dad02c94ebc63590b14f4d1de2e"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Navigation Start.wav" Hash="b82aa79f496456ffc5b952b484af25f5"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Proximity Connection.wav" Hash="00882d550b9389c6183ee3da0b668b2d"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Proximity Notification.wav" Hash="e15f0210410a574af39b07840ccbe4cc"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Proximity Notification.wav" Hash="e15f0210410a574af39b07840ccbe4cc"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Proximity Connection.wav" Hash="00882d550b9389c6183ee3da0b668b2d"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Navigation Start.wav" Hash="b82aa79f496456ffc5b952b484af25f5"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Minimize.wav" Hash="8fb59dad02c94ebc63590b14f4d1de2e"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Menu Command.wav" Hash="822b4c37ce07436e2192785f3274386f"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/ir_end.wav" Hash="e83345df81f1e577bb53766875efc31d"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/ir_begin.wav" Hash="2e0057ee08c7b6fa07d28863a40d1cbf"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS/024.31.00a.xml" Hash="e730fbd64cd77dd163732cfaf2bd0e75"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100/tasksFIM.xml" Hash="6e29a8516f67f562ad75eb7100e996f6"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100/tasksAMM.xml" Hash="29e38d460ab87f93c99d84cb407c411c"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100/docs.xml" Hash="fcad1626c1ef3851931bf68a1aa054c6"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file14766.txt" Hash="336c187cc3a6a0d7681d4364ab994cde"/>
</FileDataList> </FileDataList>

2
StaticData/temp.xml
View File

@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ClientNotify Code="CANCHANGE"/> <ClientNotify Code="CHECKVERSIONLIST"/>

43
Widgets/updatenotifywidget.cpp
View File

@@ -33,17 +33,50 @@ void UpdateNotifyWidget::addToList(FileData fileData)
void UpdateNotifyWidget::showWithFill() 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 = "\"<a href=\""+ path + "\">папку</a>\"";
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(); show();
} }
QLabel* UpdateNotifyWidget::createLabel(QString text)
{
QLabel *label = new QLabel;
label->setText(text);
return label;
}
void UpdateNotifyWidget::on_loadToServerButton_clicked() void UpdateNotifyWidget::on_loadToServerButton_clicked()
{ {
mainWindow->loadToServer(); mainWindow->loadToServer();

2
Widgets/updatenotifywidget.h
View File

@@ -5,6 +5,7 @@
#include <QDialog> #include <QDialog>
#include <QWidget> #include <QWidget>
#include <QLabel>
#include <Data/FileData.h> #include <Data/FileData.h>
@@ -42,6 +43,7 @@ private:
MainWindow *mainWindow; MainWindow *mainWindow;
VersionContainer *versionContainer; VersionContainer *versionContainer;
int currentLoadingCount; int currentLoadingCount;
QLabel* createLabel(QString text);
}; };
#endif // UPDATENOTIFYWIDGET_H #endif // UPDATENOTIFYWIDGET_H

14
Widgets/updatenotifywidget.ui
View File

@@ -72,6 +72,9 @@
<property name="text"> <property name="text">
<string>Обнаружены новые файлы:</string> <string>Обнаружены новые файлы:</string>
</property> </property>
<property name="openExternalLinks">
<bool>false</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@@ -82,14 +85,17 @@
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Plain</enum> <enum>QFrame::Plain</enum>
</property> </property>
<property name="batchSize">
<number>100</number>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="updateActionListLabel"> <layout class="QVBoxLayout" name="labelsLayout">
<property name="text"> <property name="spacing">
<string>text</string> <number>1</number>
</property> </property>
</widget> </layout>
</item> </item>
</layout> </layout>
</item> </item>

BIN
debug/RRJClient.exe
View File

Binary file not shown.

BIN
debug/commonbuttongroupwidget.o
View File

Binary file not shown.

BIN
debug/entrywidget.o
View File

Binary file not shown.

BIN
debug/instructorbuttongroupwidget.o
View File

Binary file not shown.

BIN
debug/mainwindow.o
View File

Binary file not shown.

BIN
debug/moc_commonbuttongroupwidget.o
View File

Binary file not shown.

BIN
debug/moc_entrywidget.o
View File

Binary file not shown.

BIN
debug/moc_instructorbuttongroupwidget.o
View File

Binary file not shown.

BIN
debug/moc_mainwindow.o
View File

Binary file not shown.

BIN
debug/moc_newversionwidget.o
View File

Binary file not shown.

BIN
debug/moc_updatenotifywidget.o
View File

Binary file not shown.

BIN
debug/moc_versionselectwidget.o
View File

Binary file not shown.

BIN
debug/newversionwidget.o
View File

Binary file not shown.

34
debug/qrc_resources.cpp
View File

@@ -328148,7 +328148,7 @@ static const unsigned char qt_resource_struct[] = {
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
// :/style.css // :/style.css
0x0,0x0,0x0,0x16,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0, 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 // :/resource
0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x6,0x0,0x0,0x0,0x3, 0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x6,0x0,0x0,0x0,0x3,
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 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, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
// :/resource/SSJ-100Dark.png // :/resource/SSJ-100Dark.png
0x0,0x0,0x0,0xb2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x3c,0x49,0xe4, 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 // :/resource/SSJ-100.png
0x0,0x0,0x0,0x96,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x2f,0xcd,0x36, 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 // :/resource/SSJ_backgroundDarkSM.png
0x0,0x0,0x0,0x60,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x22,0x2d,0x97, 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 // :/resource/SSJ_backgroundDark.png
0x0,0x0,0x0,0x2e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x3,0x64, 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 // :/resource/Icons/caution.png
0x0,0x0,0x1,0x90,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x5,0x71, 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 // :/resource/Icons/setting.png
0x0,0x0,0x2,0x34,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xa6,0x74, 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 // :/resource/Icons/checked.png
0x0,0x0,0x2,0x90,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0x3,0xe1, 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 // :/resource/Icons/settingWhite.png
0x0,0x0,0x1,0xe2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x5a,0x6d, 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 // :/resource/Icons/plane.png
0x0,0x0,0x2,0x50,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xd1,0x86, 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 // :/resource/Icons/crossInCircle.png
0x0,0x0,0x2,0x68,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xd5,0xd3, 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 // :/resource/Icons/whiteCross.png
0x0,0x0,0x1,0xc0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x43,0xf8, 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 // :/resource/Icons/monitor-display.png
0x0,0x0,0x2,0x8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xa0,0xa5, 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 // :/resource/Icons/762.gif
0x0,0x0,0x1,0xac,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x1d,0x82, 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 // :/resource/Fonts/HelveticaNeue-Medium.ttf
0x0,0x0,0x0,0xf6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x46,0xbc,0x41, 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 // :/resource/Fonts/LiberationSans-Regular.ttf
0x0,0x0,0x1,0x56,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0xad,0x75, 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 // :/resource/Fonts/Kanit Cyrillic.ttf
0x0,0x0,0x1,0x2c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0x25,0xb5, 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,
}; };

BIN
debug/qrc_resources.o
View File

Binary file not shown.

BIN
debug/recognizesystem.o
View File

Binary file not shown.

BIN
debug/updatenotifywidget.o
View File

Binary file not shown.

BIN
debug/versionselectwidget.o
View File

Binary file not shown.

12
ui_updatenotifywidget.h
View File

@@ -30,7 +30,7 @@ public:
QVBoxLayout *updateListLayout; QVBoxLayout *updateListLayout;
QLabel *NotificationLabel; QLabel *NotificationLabel;
QListWidget *updateListWidget; QListWidget *updateListWidget;
QLabel *updateActionListLabel; QVBoxLayout *labelsLayout;
QHBoxLayout *ButtonsLayout; QHBoxLayout *ButtonsLayout;
QWidget *instructorButtonGroup; QWidget *instructorButtonGroup;
QHBoxLayout *updateButtonGroup; QHBoxLayout *updateButtonGroup;
@@ -70,6 +70,7 @@ public:
sizePolicy1.setVerticalStretch(0); sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(NotificationLabel->sizePolicy().hasHeightForWidth()); sizePolicy1.setHeightForWidth(NotificationLabel->sizePolicy().hasHeightForWidth());
NotificationLabel->setSizePolicy(sizePolicy1); NotificationLabel->setSizePolicy(sizePolicy1);
NotificationLabel->setOpenExternalLinks(false);
updateListLayout->addWidget(NotificationLabel); updateListLayout->addWidget(NotificationLabel);
@@ -77,13 +78,15 @@ public:
updateListWidget->setObjectName(QString::fromUtf8("updateListWidget")); updateListWidget->setObjectName(QString::fromUtf8("updateListWidget"));
updateListWidget->setFrameShape(QFrame::NoFrame); updateListWidget->setFrameShape(QFrame::NoFrame);
updateListWidget->setFrameShadow(QFrame::Plain); updateListWidget->setFrameShadow(QFrame::Plain);
updateListWidget->setBatchSize(100);
updateListLayout->addWidget(updateListWidget); updateListLayout->addWidget(updateListWidget);
updateActionListLabel = new QLabel(verticalLayoutWidget); labelsLayout = new QVBoxLayout();
updateActionListLabel->setObjectName(QString::fromUtf8("updateActionListLabel")); labelsLayout->setSpacing(1);
labelsLayout->setObjectName(QString::fromUtf8("labelsLayout"));
updateListLayout->addWidget(updateActionListLabel); updateListLayout->addLayout(labelsLayout);
mainLayout->addLayout(updateListLayout); mainLayout->addLayout(updateListLayout);
@@ -156,7 +159,6 @@ public:
{ {
UpdateNotifyWidget->setWindowTitle(QCoreApplication::translate("UpdateNotifyWidget", "Form", nullptr)); 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)); 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)); 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)); 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)); 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));