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 send command

Browse Source
This commit is contained in:
semenov
2025-01-17 10:49:27 +03:00
parent a9357415e6
commit 52ed028515
47 changed files with 7765 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
Core/UpdateController.cpp
View File

@@ -104,67 +104,6 @@ QList<FileData> UpdateController::calculateHash(QString path,QString ignoreName)
} }
} }
// QDirIterator iterator(dir,QDirIterator::Subdirectories);
//
// if(!QDir(path).exists())
// { //проверка на наличие папки
// QDir().mkdir(path);
// }
// QString hashString;
// while (iterator.hasNext())
// {
// iterator.next();
// QFileInfo fileInfo = iterator.fileInfo();
// FileData currentFile;
// QFile file(fileInfo.absoluteFilePath());
// quint64 fileSize = file.size(); //буффер для хэширования крупных файлов
// const quint64 bufferSize = 10240;
// if(fileInfo.isHidden()) continue;
// if(ignoreName != "" && fileInfo.path().contains(ignoreName)) continue;
// if(fileInfo.isFile() && file.open(QIODevice::ReadOnly))
// {
// char buffer[bufferSize];
// int bytesRead;
// int readSize = qMin(fileSize,bufferSize);
// QCryptographicHash hash(QCryptographicHash::Md5);
// while(readSize > 0 && (bytesRead = file.read(buffer,readSize)) > 0){
// fileSize -= bytesRead;
// hash.addData(buffer,bytesRead);
// readSize = qMin(fileSize,bufferSize);
// }
// hashString = QString(hash.result().toHex());
// currentFile.path = Tools::createLocalPath(fileInfo.absoluteFilePath());
// currentFile.hash = hashString;
// hashes->push_back(currentFile);
// file.close();
// }
// else if (fileInfo.isDir() && !fileInfo.isRoot() && fileInfo.fileName() != "..")
// {
// currentFile.path = Tools::createLocalPath(fileInfo.path());
// currentFile.hash = "FOLDER";
// if(!hashes->contains(currentFile))
// {
// hashes->push_back(currentFile);
// }
// }
// }
//std::sort(hashes->begin(),hashes->end());
return *hashes; return *hashes;
} }
@@ -183,7 +122,8 @@ void UpdateController::updateFilesOnServer(QList<FileData> *fileSendList){
} }
else else
{ {
sendSystem->sendFileBlock(data.path); QString fullPath = Tools::createReceiveFullPath(data.path,versionContainer->getLocalVersionData());
sendSystem->sendFileBlockWithVersion(fullPath,data.path);
} }
} }

1
Core/notifycontroller.cpp
View File

@@ -9,6 +9,7 @@ void NotifyController::showWarning(QString text)
{ {
QMessageBox warning; QMessageBox warning;
warning.setText(text); warning.setText(text);
warning.setIcon(QMessageBox::Warning); warning.setIcon(QMessageBox::Warning);
warning.setWindowTitle(tr("Ошибка")); warning.setWindowTitle(tr("Ошибка"));
warning.exec(); warning.exec();

2
Core/recognizesystem.cpp
View File

@@ -297,7 +297,7 @@ void RecognizeSystem::checkAccessType(QString type)
void RecognizeSystem::setServerVersion(StreamingVersionData *serverVersion) void RecognizeSystem::setServerVersion(StreamingVersionData *serverVersion)
{ {
versionContainer->setServerVersonData(serverVersion); versionContainer->setServerVersionData(serverVersion);
} }
void RecognizeSystem::showServerDataList(QList<StreamingVersionData*> *showServerDataList) void RecognizeSystem::showServerDataList(QList<StreamingVersionData*> *showServerDataList)

71
Core/sendsystem.cpp
View File

@@ -98,6 +98,46 @@ void SendSystem::sendFolderBlock(QString path)
socket->waitForReadyRead(100); socket->waitForReadyRead(100);
} }
void SendSystem::sendFileBlockWithVersion(QString localPath,QString serverPath)
{
QDataStream stream(socket);
stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
//QString fullPath = Tools::createLocalPath(localPath);
quint64 fileSize = 0;
int countSend = 0;
QFile file(localPath); //Открываем файл для чтения
QFileInfo fileInfo(file);
fileSize = fileInfo.size();
stream << PacketType::TYPE_FILE; //Отправляем тип блока
stream << serverPath << fileSize;
socket->waitForReadyRead(20);
//socket->waitForBytesWritten();
if(file.open(QFile::ReadOnly)){
while(!file.atEnd()){
QByteArray data = file.read(1025*250);
stream << data;
socket->waitForBytesWritten();
countSend++;
}
qDebug() << Tools::getTime() << "count end Final: " << countSend;
}
file.close();
emit sigSend();
//qDebug() << "Transaction after send file: " << socket->isTransactionStarted();
countSend = 0;
//socket->waitForBytesWritten();
socket->waitForReadyRead(20);
}
void SendSystem::sendQTConnect() void SendSystem::sendQTConnect()
{ {
QString value = QString::number(PacketType::TYPE_QT); QString value = QString::number(PacketType::TYPE_QT);
@@ -158,6 +198,37 @@ void SendSystem::sendCopyVersion(QString streamingVersion)
stream << streamingVersion; stream << streamingVersion;
} }
void SendSystem::sendPacketType(PacketType packetType)
{
QDataStream stream(socket);
QByteArray data;
stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
stream << packetType;
}
void SendSystem::sendCheckHash()
{
QDataStream stream(socket);
QByteArray data;
stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
sendFileBlock(staticDataFolderName + hashFilename);
socket->waitForReadyRead(2000);
stream << PacketType::TYPE_CHECK_VERSION;
//socket->waitForReadyRead(1000);
// else if(command == "update")
// {
// qDebug() << ("Update started");
// stream << PacketType::TYPE_COMMAND;
// stream << command;
// socket->waitForReadyRead(1000);
// }
}
SendSystem::~SendSystem() SendSystem::~SendSystem()
{ {

3
Core/sendsystem.h
View File

@@ -25,12 +25,15 @@ public:
void sendDisable(); void sendDisable();
void sendFileBlock(QString path); void sendFileBlock(QString path);
void sendFolderBlock(QString path); void sendFolderBlock(QString path);
void sendFileBlockWithVersion(QString localPath, QString serverPath);
void sendQTConnect(); void sendQTConnect();
void sendXMLAnswer(QByteArray array); void sendXMLAnswer(QByteArray array);
void sendFinish(); void sendFinish();
void sendChangeVersion(StreamingVersionData *streamingVersion); void sendChangeVersion(StreamingVersionData *streamingVersion);
void sendDeleteVersion(StreamingVersionData *streamingVersion); void sendDeleteVersion(StreamingVersionData *streamingVersion);
void sendCopyVersion(QString versionName); void sendCopyVersion(QString versionName);
void sendCheckHash();
void sendPacketType(PacketType packetType);
~SendSystem(); ~SendSystem();
signals: signals:

33
Core/tcpclient.cpp
View File

@@ -68,39 +68,6 @@ QTcpSocket *TCPClient::getSocket()
return socket; return socket;
} }
void TCPClient::slotSendCommand(QString command)
{
QDataStream stream(socket);
QByteArray data;
stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
if(!command.isEmpty() && socket->state() == QTcpSocket::ConnectedState){
if(command == "check")
{
stream << PacketType::TYPE_COMMAND;
stream << command;
socket->waitForBytesWritten();
sendSystem->sendFileBlock(staticDataFolderName + hashFilename);
emit sigSendDebugLog(Tools::getTime() + " Local checkFile sended");
socket->waitForReadyRead(1000);
}
else if(command == "update"){
emit sigSendDebugLog("Update started");
stream << PacketType::TYPE_COMMAND;
stream << command;
socket->waitForReadyRead(1000);
}
else if(command == "run"){
externalExecuter->callApp();
}
}else{
emit sigSendDebugLog("WRONG SOCKET AFTER ENTERED");
}
}
void TCPClient::slotConnectNotify() void TCPClient::slotConnectNotify()
{ {
if(socket->state() != QTcpSocket::ConnectedState) if(socket->state() != QTcpSocket::ConnectedState)

1
Core/tcpclient.h
View File

@@ -43,7 +43,6 @@ signals:
void sigConnectionState(bool flag); void sigConnectionState(bool flag);
public slots: public slots:
void slotSendCommand(QString message);
void slotConnectNotify(); void slotConnectNotify();
private slots: private slots:

2
Core/tools.h
View File

@@ -41,6 +41,8 @@ enum PacketType{
TYPE_XMLANSWER = 8, TYPE_XMLANSWER = 8,
TYPE_QT = 9, TYPE_QT = 9,
TYPE_DISABLE = 11, TYPE_DISABLE = 11,
TYPE_UPDATE = 12,
TYPE_CHECK_VERSION = 13,
HASH_READY = 150, HASH_READY = 150,
CHANGE_DATA_VERSION = 151, CHANGE_DATA_VERSION = 151,

2
Core/versioncontainer.cpp
View File

@@ -36,7 +36,7 @@ StreamingVersionData *VersionContainer::getServerVersionData() const
return serverVersionData; return serverVersionData;
} }
void VersionContainer::setServerVersonData(StreamingVersionData *value) void VersionContainer::setServerVersionData(StreamingVersionData *value)
{ {
serverVersionData = value; serverVersionData = value;
} }

2
Core/versioncontainer.h
View File

@@ -19,7 +19,7 @@ public:
void setLocalVersionData(StreamingVersionData *value); void setLocalVersionData(StreamingVersionData *value);
StreamingVersionData *getServerVersionData() const; StreamingVersionData *getServerVersionData() const;
void setServerVersonData(StreamingVersionData *value); void setServerVersionData(StreamingVersionData *value);
private: private:
StreamingVersionData *localVersionData; StreamingVersionData *localVersionData;

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-15T18:05:39. --> <!-- Written by QtCreator 4.11.1, 2025-01-16T18:02:37. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>

4
StaticData/clientHash.xml
View File

@@ -26,6 +26,7 @@
<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/Temp" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/D3D12/D3D12Core.dll" Hash="7fc05c9a8366d19302dfd13d09d3ebac"/> <FileData Path="/Application/RRJLoader/D3D12/D3D12Core.dll" Hash="7fc05c9a8366d19302dfd13d09d3ebac"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/EmbedRuntime/mono-2.0-bdwgc.dll" Hash="1ce1473bec6862c3445a5697d28c3b7d"/> <FileData Path="/Application/RRJLoader/MonoBleedingEdge/EmbedRuntime/mono-2.0-bdwgc.dll" Hash="1ce1473bec6862c3445a5697d28c3b7d"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/EmbedRuntime/MonoPosixHelper.dll" Hash="2734ad3f554d1b95d7b04766260175e5"/> <FileData Path="/Application/RRJLoader/MonoBleedingEdge/EmbedRuntime/MonoPosixHelper.dll" Hash="2734ad3f554d1b95d7b04766260175e5"/>
@@ -183,12 +184,15 @@
<FileData Path="/Application/RRJLoader/RRJ_Data/ScriptingAssemblies.json" Hash="bc1156dee1f08ecf1afb66a3cbd653a9"/> <FileData Path="/Application/RRJLoader/RRJ_Data/ScriptingAssemblies.json" Hash="bc1156dee1f08ecf1afb66a3cbd653a9"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/sharedassets0.assets" Hash="a58dcde58175e502b6d824eec6fbeadc"/> <FileData Path="/Application/RRJLoader/RRJ_Data/sharedassets0.assets" Hash="a58dcde58175e502b6d824eec6fbeadc"/>
<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/RRJ_Data/Temp/UserData.xml" Hash="18352e1f88c92ef90c42bfe2b1ee0395"/>
<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/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/file12433.txt" Hash="c11112f91ecb21aa9f6d8ce0b0eb9e48"/>
<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/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/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"/>

7140
StaticData/serverHash.xml
View File

File diff suppressed because it is too large Load Diff

2
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 AutoStart="0" Language="RUS" Address="192.168.100.241" Port="6000"/> <ServerSettings Port="6000" AutoStart="0" Language="RUS" Address="192.168.100.241"/>
<VersionData Version="base"/> <VersionData Version="base"/>
</ServerSettingsContainer> </ServerSettingsContainer>

2
StaticData/streamingHash.xml
View File

@@ -4,6 +4,8 @@
<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/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/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/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"/>

9
Widgets/commonbuttongroupwidget.cpp
View File

@@ -19,8 +19,7 @@ void CommonButtonGroupWidget::initialize(MainWindow *mainWindow,ExternalExecuter
ui->startButton->hide(); ui->startButton->hide();
ui->startButton->setEnabled(false); ui->startButton->setEnabled(false);
connect(this,&CommonButtonGroupWidget::sigSendPacket,sendSystem,&SendSystem::sendPacketType,Qt::AutoConnection);
connect(this,&CommonButtonGroupWidget::sigSendCommand,client,&TCPClient::slotSendCommand,Qt::AutoConnection);
connect(this,&CommonButtonGroupWidget::sigSendXMLAnswer,sendSystem,&SendSystem::xmlAnswer,Qt::DirectConnection); connect(this,&CommonButtonGroupWidget::sigSendXMLAnswer,sendSystem,&SendSystem::xmlAnswer,Qt::DirectConnection);
} }
@@ -70,9 +69,9 @@ void CommonButtonGroupWidget::showProgressBar(bool flag)
void CommonButtonGroupWidget::needUpdateState(bool flag) void CommonButtonGroupWidget::needUpdateState(bool flag)
{ {
ui->startButton->show(); ui->startButton->hide();
ui->updateButton->setEnabled(flag); ui->updateButton->setEnabled(flag);
ui->startButton->setEnabled(externalExecuter->findApp()); //ui->startButton->setEnabled(externalExecuter->findApp());
ui->updateButton->show(); ui->updateButton->show();
} }
@@ -83,7 +82,7 @@ void CommonButtonGroupWidget::startButtonActive(bool flag)
void CommonButtonGroupWidget::on_updateButton_clicked() void CommonButtonGroupWidget::on_updateButton_clicked()
{ {
emit sigSendCommand("update"); emit sigSendPacket(PacketType::TYPE_UPDATE);
startUpdateState(); startUpdateState();
mainWindow->disableUnsaveButton(true); mainWindow->disableUnsaveButton(true);
} }

2
Widgets/commonbuttongroupwidget.h
View File

@@ -29,7 +29,7 @@ public:
~CommonButtonGroupWidget(); ~CommonButtonGroupWidget();
signals: signals:
void sigSendCommand(QString command); void sigSendPacket(PacketType packet);
void sigSendXMLAnswer(QString answer); void sigSendXMLAnswer(QString answer);
private slots: private slots:

3
Widgets/newversionwidget.cpp
View File

@@ -6,9 +6,8 @@ NewVersionWidget::NewVersionWidget(QWidget *parent) :
ui(new Ui::NewVersionWidget) ui(new Ui::NewVersionWidget)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowFlags(Qt::SubWindow | Qt::FramelessWindowHint | Qt::CustomizeWindowHint ); setWindowFlags(Qt::SubWindow);
setAttribute(Qt::WA_ShowModal,true); setAttribute(Qt::WA_ShowModal,true);
setAttribute(Qt::WA_TranslucentBackground);
} }
void NewVersionWidget::initialize(VersionSelectWidget *versionSelectWidget, QString prevName) void NewVersionWidget::initialize(VersionSelectWidget *versionSelectWidget, QString prevName)

398
Widgets/newversionwidget.ui
View File

@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>310</width> <width>325</width>
<height>152</height> <height>200</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@@ -25,220 +25,194 @@
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"/> <string notr="true"/>
</property> </property>
<widget class="QFrame" name="NewVerBackground"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="enabled"> <item>
<bool>true</bool> <widget class="QFrame" name="NewVerBackground">
</property> <property name="enabled">
<property name="geometry"> <bool>true</bool>
<rect>
<x>0</x>
<y>0</y>
<width>311</width>
<height>191</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<widget class="QWidget" name="horizontalLayoutWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>311</width>
<height>51</height>
</rect>
</property>
<layout class="QHBoxLayout" name="baseVerLayout">
<property name="leftMargin">
<number>5</number>
</property> </property>
<property name="topMargin"> <property name="sizePolicy">
<number>5</number> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="rightMargin"> <property name="frameShape">
<number>5</number> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="bottomMargin"> <property name="frameShadow">
<number>5</number> <enum>QFrame::Raised</enum>
</property> </property>
<item> <layout class="QVBoxLayout" name="verticalLayout">
<widget class="QLabel" name="prevVerTitle"> <item>
<property name="sizePolicy"> <layout class="QHBoxLayout" name="baseVerLayout">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <property name="leftMargin">
<horstretch>0</horstretch> <number>5</number>
<verstretch>0</verstretch> </property>
</sizepolicy> <property name="topMargin">
</property> <number>5</number>
<property name="text"> </property>
<string>Базовая версия:</string> <property name="rightMargin">
</property> <number>5</number>
</widget> </property>
</item> <property name="bottomMargin">
<item> <number>5</number>
<widget class="QLabel" name="prevVerValue"> </property>
<property name="text"> <item>
<string>TextLabel</string> <widget class="QLabel" name="prevVerTitle">
</property> <property name="sizePolicy">
</widget> <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
</item> <horstretch>0</horstretch>
</layout> <verstretch>0</verstretch>
</widget> </sizepolicy>
<widget class="QWidget" name="horizontalLayoutWidget_2"> </property>
<property name="geometry"> <property name="text">
<rect> <string>Базовая версия:</string>
<x>0</x> </property>
<y>50</y> </widget>
<width>311</width> </item>
<height>51</height> <item>
</rect> <widget class="QLabel" name="prevVerValue">
</property> <property name="text">
<layout class="QHBoxLayout" name="newNameLayout"> <string>TextLabel</string>
<property name="spacing"> </property>
<number>6</number> </widget>
</property> </item>
<property name="leftMargin"> </layout>
<number>5</number> </item>
</property> <item>
<property name="topMargin"> <layout class="QHBoxLayout" name="newNameLayout">
<number>5</number> <property name="spacing">
</property> <number>6</number>
<property name="rightMargin"> </property>
<number>20</number> <property name="leftMargin">
</property> <number>5</number>
<property name="bottomMargin"> </property>
<number>5</number> <property name="topMargin">
</property> <number>5</number>
<item> </property>
<widget class="QLabel" name="newNameVersionTitle"> <property name="rightMargin">
<property name="text"> <number>20</number>
<string>Новое название:</string> </property>
</property> <property name="bottomMargin">
</widget> <number>5</number>
</item> </property>
<item> <item>
<widget class="QLineEdit" name="lineEdit"> <widget class="QLabel" name="newNameVersionTitle">
<property name="sizePolicy"> <property name="text">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <string>Новое название:</string>
<horstretch>0</horstretch> </property>
<verstretch>0</verstretch> </widget>
</sizepolicy> </item>
</property> <item>
<property name="minimumSize"> <widget class="QLineEdit" name="lineEdit">
<size> <property name="sizePolicy">
<width>150</width> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<height>30</height> <horstretch>0</horstretch>
</size> <verstretch>0</verstretch>
</property> </sizepolicy>
<property name="maximumSize"> </property>
<size> <property name="minimumSize">
<width>60</width> <size>
<height>30</height> <width>150</width>
</size> <height>30</height>
</property> </size>
</widget> </property>
</item> <property name="maximumSize">
</layout> <size>
</widget> <width>60</width>
<widget class="QWidget" name="horizontalLayoutWidget_3"> <height>30</height>
<property name="geometry"> </size>
<rect> </property>
<x>0</x> </widget>
<y>100</y> </item>
<width>311</width> </layout>
<height>51</height> </item>
</rect> <item>
</property> <layout class="QHBoxLayout" name="horizontalLayout">
<layout class="QHBoxLayout" name="horizontalLayout"> <property name="bottomMargin">
<property name="bottomMargin"> <number>6</number>
<number>6</number> </property>
</property> <item>
<item> <spacer name="horizontalSpacer">
<spacer name="horizontalSpacer"> <property name="orientation">
<property name="orientation"> <enum>Qt::Horizontal</enum>
<enum>Qt::Horizontal</enum> </property>
</property> <property name="sizeType">
<property name="sizeType"> <enum>QSizePolicy::Minimum</enum>
<enum>QSizePolicy::Minimum</enum> </property>
</property> <property name="sizeHint" stdset="0">
<property name="sizeHint" stdset="0"> <size>
<size> <width>40</width>
<width>40</width> <height>20</height>
<height>20</height> </size>
</size> </property>
</property> </spacer>
</spacer> </item>
</item> <item>
<item> <widget class="QPushButton" name="createButton">
<widget class="QPushButton" name="createButton"> <property name="sizePolicy">
<property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <horstretch>0</horstretch>
<horstretch>0</horstretch> <verstretch>0</verstretch>
<verstretch>0</verstretch> </sizepolicy>
</sizepolicy> </property>
</property> <property name="text">
<property name="text"> <string>Создать</string>
<string>Создать</string> </property>
</property> </widget>
</widget> </item>
</item> <item>
<item> <spacer name="horizontalSpacer_3">
<spacer name="horizontalSpacer_3"> <property name="orientation">
<property name="orientation"> <enum>Qt::Horizontal</enum>
<enum>Qt::Horizontal</enum> </property>
</property> <property name="sizeType">
<property name="sizeType"> <enum>QSizePolicy::Minimum</enum>
<enum>QSizePolicy::Minimum</enum> </property>
</property> <property name="sizeHint" stdset="0">
<property name="sizeHint" stdset="0"> <size>
<size> <width>40</width>
<width>40</width> <height>20</height>
<height>20</height> </size>
</size> </property>
</property> </spacer>
</spacer> </item>
</item> <item>
<item> <widget class="QPushButton" name="cancelButton">
<widget class="QPushButton" name="cancelButton"> <property name="sizePolicy">
<property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <horstretch>0</horstretch>
<horstretch>0</horstretch> <verstretch>0</verstretch>
<verstretch>0</verstretch> </sizepolicy>
</sizepolicy> </property>
</property> <property name="text">
<property name="text"> <string>Отмена</string>
<string>Отмена</string> </property>
</property> </widget>
</widget> </item>
</item> <item>
<item> <spacer name="horizontalSpacer_2">
<spacer name="horizontalSpacer_2"> <property name="orientation">
<property name="orientation"> <enum>Qt::Horizontal</enum>
<enum>Qt::Horizontal</enum> </property>
</property> <property name="sizeType">
<property name="sizeType"> <enum>QSizePolicy::Minimum</enum>
<enum>QSizePolicy::Minimum</enum> </property>
</property> <property name="sizeHint" stdset="0">
<property name="sizeHint" stdset="0"> <size>
<size> <width>40</width>
<width>40</width> <height>20</height>
<height>20</height> </size>
</size> </property>
</property> </spacer>
</spacer> </item>
</item> </layout>
</layout> </item>
</widget> </layout>
</widget> </widget>
</item>
</layout>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>

2
Widgets/versionselectwidget.cpp
View File

@@ -90,7 +90,7 @@ void VersionSelectWidget::on_switchServerVersionButton_clicked()
return; return;
} }
versionContainer->setServerVersonData(selectedVersion); versionContainer->setServerVersionData(selectedVersion);
ui->verValue->setText(selectedVersion->getViewName()); ui->verValue->setText(selectedVersion->getViewName());
emit sigSendSwitchVersion(selectedVersion); emit sigSendSwitchVersion(selectedVersion);
} }

BIN
debug/RRJClient.exe
View File

Binary file not shown.

BIN
debug/commonbuttongroupwidget.o
View File

Binary file not shown.

BIN
debug/mainwindow.o
View File

Binary file not shown.

44
debug/moc_commonbuttongroupwidget.cpp
View File

@@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE
QT_WARNING_PUSH QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED QT_WARNING_DISABLE_DEPRECATED
struct qt_meta_stringdata_CommonButtonGroupWidget_t { struct qt_meta_stringdata_CommonButtonGroupWidget_t {
QByteArrayData data[8]; QByteArrayData data[9];
char stringdata0[119]; char stringdata0[128];
}; };
#define QT_MOC_LITERAL(idx, ofs, len) \ #define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -33,18 +33,20 @@ struct qt_meta_stringdata_CommonButtonGroupWidget_t {
static const qt_meta_stringdata_CommonButtonGroupWidget_t qt_meta_stringdata_CommonButtonGroupWidget = { static const qt_meta_stringdata_CommonButtonGroupWidget_t qt_meta_stringdata_CommonButtonGroupWidget = {
{ {
QT_MOC_LITERAL(0, 0, 23), // "CommonButtonGroupWidget" QT_MOC_LITERAL(0, 0, 23), // "CommonButtonGroupWidget"
QT_MOC_LITERAL(1, 24, 14), // "sigSendCommand" QT_MOC_LITERAL(1, 24, 13), // "sigSendPacket"
QT_MOC_LITERAL(2, 39, 0), // "" QT_MOC_LITERAL(2, 38, 0), // ""
QT_MOC_LITERAL(3, 40, 7), // "command" QT_MOC_LITERAL(3, 39, 10), // "PacketType"
QT_MOC_LITERAL(4, 48, 16), // "sigSendXMLAnswer" QT_MOC_LITERAL(4, 50, 6), // "packet"
QT_MOC_LITERAL(5, 65, 6), // "answer" QT_MOC_LITERAL(5, 57, 16), // "sigSendXMLAnswer"
QT_MOC_LITERAL(6, 72, 23), // "on_updateButton_clicked" QT_MOC_LITERAL(6, 74, 6), // "answer"
QT_MOC_LITERAL(7, 96, 22) // "on_startButton_clicked" QT_MOC_LITERAL(7, 81, 23), // "on_updateButton_clicked"
QT_MOC_LITERAL(8, 105, 22) // "on_startButton_clicked"
}, },
"CommonButtonGroupWidget\0sigSendCommand\0" "CommonButtonGroupWidget\0sigSendPacket\0"
"\0command\0sigSendXMLAnswer\0answer\0" "\0PacketType\0packet\0sigSendXMLAnswer\0"
"on_updateButton_clicked\0on_startButton_clicked" "answer\0on_updateButton_clicked\0"
"on_startButton_clicked"
}; };
#undef QT_MOC_LITERAL #undef QT_MOC_LITERAL
@@ -63,15 +65,15 @@ static const uint qt_meta_data_CommonButtonGroupWidget[] = {
// signals: name, argc, parameters, tag, flags // signals: name, argc, parameters, tag, flags
1, 1, 34, 2, 0x06 /* Public */, 1, 1, 34, 2, 0x06 /* Public */,
4, 1, 37, 2, 0x06 /* Public */, 5, 1, 37, 2, 0x06 /* Public */,
// slots: name, argc, parameters, tag, flags // slots: name, argc, parameters, tag, flags
6, 0, 40, 2, 0x08 /* Private */, 7, 0, 40, 2, 0x08 /* Private */,
7, 0, 41, 2, 0x08 /* Private */, 8, 0, 41, 2, 0x08 /* Private */,
// signals: parameters // signals: parameters
QMetaType::Void, QMetaType::QString, 3, QMetaType::Void, 0x80000000 | 3, 4,
QMetaType::Void, QMetaType::QString, 5, QMetaType::Void, QMetaType::QString, 6,
// slots: parameters // slots: parameters
QMetaType::Void, QMetaType::Void,
@@ -86,7 +88,7 @@ void CommonButtonGroupWidget::qt_static_metacall(QObject *_o, QMetaObject::Call
auto *_t = static_cast<CommonButtonGroupWidget *>(_o); auto *_t = static_cast<CommonButtonGroupWidget *>(_o);
Q_UNUSED(_t) Q_UNUSED(_t)
switch (_id) { switch (_id) {
case 0: _t->sigSendCommand((*reinterpret_cast< QString(*)>(_a[1]))); break; case 0: _t->sigSendPacket((*reinterpret_cast< PacketType(*)>(_a[1]))); break;
case 1: _t->sigSendXMLAnswer((*reinterpret_cast< QString(*)>(_a[1]))); break; case 1: _t->sigSendXMLAnswer((*reinterpret_cast< QString(*)>(_a[1]))); break;
case 2: _t->on_updateButton_clicked(); break; case 2: _t->on_updateButton_clicked(); break;
case 3: _t->on_startButton_clicked(); break; case 3: _t->on_startButton_clicked(); break;
@@ -95,8 +97,8 @@ void CommonButtonGroupWidget::qt_static_metacall(QObject *_o, QMetaObject::Call
} else if (_c == QMetaObject::IndexOfMethod) { } else if (_c == QMetaObject::IndexOfMethod) {
int *result = reinterpret_cast<int *>(_a[0]); int *result = reinterpret_cast<int *>(_a[0]);
{ {
using _t = void (CommonButtonGroupWidget::*)(QString ); using _t = void (CommonButtonGroupWidget::*)(PacketType );
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&CommonButtonGroupWidget::sigSendCommand)) { if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&CommonButtonGroupWidget::sigSendPacket)) {
*result = 0; *result = 0;
return; return;
} }
@@ -152,7 +154,7 @@ int CommonButtonGroupWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_
} }
// SIGNAL 0 // SIGNAL 0
void CommonButtonGroupWidget::sigSendCommand(QString _t1) void CommonButtonGroupWidget::sigSendPacket(PacketType _t1)
{ {
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) }; void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) };
QMetaObject::activate(this, &staticMetaObject, 0, _a); QMetaObject::activate(this, &staticMetaObject, 0, _a);

BIN
debug/moc_commonbuttongroupwidget.o
View File

Binary file not shown.

249
debug/moc_mainwindow.cpp
View File

@@ -23,8 +23,8 @@ QT_BEGIN_MOC_NAMESPACE
QT_WARNING_PUSH QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED QT_WARNING_DISABLE_DEPRECATED
struct qt_meta_stringdata_MainWindow_t { struct qt_meta_stringdata_MainWindow_t {
QByteArrayData data[61]; QByteArrayData data[63];
char stringdata0[934]; char stringdata0[961];
}; };
#define QT_MOC_LITERAL(idx, ofs, len) \ #define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -56,44 +56,46 @@ QT_MOC_LITERAL(19, 247, 12), // "hashComparer"
QT_MOC_LITERAL(20, 260, 10), // "TCPClient*" QT_MOC_LITERAL(20, 260, 10), // "TCPClient*"
QT_MOC_LITERAL(21, 271, 9), // "tcpClient" QT_MOC_LITERAL(21, 271, 9), // "tcpClient"
QT_MOC_LITERAL(22, 281, 14), // "sigSendCommand" QT_MOC_LITERAL(22, 281, 14), // "sigSendCommand"
QT_MOC_LITERAL(23, 296, 7), // "command" QT_MOC_LITERAL(23, 296, 10), // "PacketType"
QT_MOC_LITERAL(24, 304, 16), // "sigSendXMLAnswer" QT_MOC_LITERAL(24, 307, 10), // "packetType"
QT_MOC_LITERAL(25, 321, 6), // "answer" QT_MOC_LITERAL(25, 318, 16), // "sigSendXMLAnswer"
QT_MOC_LITERAL(26, 328, 22), // "sigUpdateFilesOnServer" QT_MOC_LITERAL(26, 335, 6), // "answer"
QT_MOC_LITERAL(27, 351, 16), // "QList<FileData>*" QT_MOC_LITERAL(27, 342, 22), // "sigUpdateFilesOnServer"
QT_MOC_LITERAL(28, 368, 12), // "fileSendList" QT_MOC_LITERAL(28, 365, 16), // "QList<FileData>*"
QT_MOC_LITERAL(29, 381, 13), // "sigSetConnect" QT_MOC_LITERAL(29, 382, 12), // "fileSendList"
QT_MOC_LITERAL(30, 395, 15), // "ServerSettings*" QT_MOC_LITERAL(30, 395, 13), // "sigSetConnect"
QT_MOC_LITERAL(31, 411, 14), // "serverSettings" QT_MOC_LITERAL(31, 409, 15), // "ServerSettings*"
QT_MOC_LITERAL(32, 426, 16), // "sigCalculateHash" QT_MOC_LITERAL(32, 425, 14), // "serverSettings"
QT_MOC_LITERAL(33, 443, 19), // "sigSendAutorization" QT_MOC_LITERAL(33, 440, 16), // "sigCalculateHash"
QT_MOC_LITERAL(34, 463, 15), // "sigGetConnected" QT_MOC_LITERAL(34, 457, 19), // "sigSendAutorization"
QT_MOC_LITERAL(35, 479, 14), // "showUpdateInfo" QT_MOC_LITERAL(35, 477, 12), // "sigSendCheck"
QT_MOC_LITERAL(36, 494, 21), // "showCompleteDialogBox" QT_MOC_LITERAL(36, 490, 15), // "sigGetConnected"
QT_MOC_LITERAL(37, 516, 19), // "slotConnectionState" QT_MOC_LITERAL(37, 506, 14), // "showUpdateInfo"
QT_MOC_LITERAL(38, 536, 4), // "flag" QT_MOC_LITERAL(38, 521, 21), // "showCompleteDialogBox"
QT_MOC_LITERAL(39, 541, 20), // "slotServerDisconnect" QT_MOC_LITERAL(39, 543, 19), // "slotConnectionState"
QT_MOC_LITERAL(40, 562, 14), // "updateProgress" QT_MOC_LITERAL(40, 563, 4), // "flag"
QT_MOC_LITERAL(41, 577, 12), // "loadComplete" QT_MOC_LITERAL(41, 568, 20), // "slotServerDisconnect"
QT_MOC_LITERAL(42, 590, 14), // "lostConnection" QT_MOC_LITERAL(42, 589, 14), // "updateProgress"
QT_MOC_LITERAL(43, 605, 13), // "serverBlocked" QT_MOC_LITERAL(43, 604, 12), // "loadComplete"
QT_MOC_LITERAL(44, 619, 16), // "checkLoginResult" QT_MOC_LITERAL(44, 617, 14), // "lostConnection"
QT_MOC_LITERAL(45, 636, 20), // "ServerAuthorization*" QT_MOC_LITERAL(45, 632, 13), // "serverBlocked"
QT_MOC_LITERAL(46, 657, 10), // "serverAuth" QT_MOC_LITERAL(46, 646, 16), // "checkLoginResult"
QT_MOC_LITERAL(47, 668, 13), // "setNeedUpdate" QT_MOC_LITERAL(47, 663, 20), // "ServerAuthorization*"
QT_MOC_LITERAL(48, 682, 4), // "size" QT_MOC_LITERAL(48, 684, 10), // "serverAuth"
QT_MOC_LITERAL(49, 687, 9), // "fileCount" QT_MOC_LITERAL(49, 695, 13), // "setNeedUpdate"
QT_MOC_LITERAL(50, 697, 11), // "deleteCount" QT_MOC_LITERAL(50, 709, 4), // "size"
QT_MOC_LITERAL(51, 709, 20), // "showServerListWidget" QT_MOC_LITERAL(51, 714, 9), // "fileCount"
QT_MOC_LITERAL(52, 730, 29), // "QList<StreamingVersionData*>*" QT_MOC_LITERAL(52, 724, 11), // "deleteCount"
QT_MOC_LITERAL(53, 760, 10), // "serverData" QT_MOC_LITERAL(53, 736, 20), // "showServerListWidget"
QT_MOC_LITERAL(54, 771, 25), // "on_settingsButton_clicked" QT_MOC_LITERAL(54, 757, 29), // "QList<StreamingVersionData*>*"
QT_MOC_LITERAL(55, 797, 29), // "on_languageComboBox_activated" QT_MOC_LITERAL(55, 787, 10), // "serverData"
QT_MOC_LITERAL(56, 827, 4), // "arg1" QT_MOC_LITERAL(56, 798, 25), // "on_settingsButton_clicked"
QT_MOC_LITERAL(57, 832, 17), // "slotDisableNotify" QT_MOC_LITERAL(57, 824, 29), // "on_languageComboBox_activated"
QT_MOC_LITERAL(58, 850, 21), // "on_exitButton_clicked" QT_MOC_LITERAL(58, 854, 4), // "arg1"
QT_MOC_LITERAL(59, 872, 29), // "on_offlineStartButton_clicked" QT_MOC_LITERAL(59, 859, 17), // "slotDisableNotify"
QT_MOC_LITERAL(60, 902, 31) // "on_unsafeChangingButton_clicked" QT_MOC_LITERAL(60, 877, 21), // "on_exitButton_clicked"
QT_MOC_LITERAL(61, 899, 29), // "on_offlineStartButton_clicked"
QT_MOC_LITERAL(62, 929, 31) // "on_unsafeChangingButton_clicked"
}, },
"MainWindow\0sigInitializeClient\0\0" "MainWindow\0sigInitializeClient\0\0"
@@ -104,20 +106,21 @@ QT_MOC_LITERAL(60, 902, 31) // "on_unsafeChangingButton_clicked"
"UpdateController*\0updateController\0" "UpdateController*\0updateController\0"
"DataParser*\0dataParser\0HashComparer*\0" "DataParser*\0dataParser\0HashComparer*\0"
"hashComparer\0TCPClient*\0tcpClient\0" "hashComparer\0TCPClient*\0tcpClient\0"
"sigSendCommand\0command\0sigSendXMLAnswer\0" "sigSendCommand\0PacketType\0packetType\0"
"answer\0sigUpdateFilesOnServer\0" "sigSendXMLAnswer\0answer\0sigUpdateFilesOnServer\0"
"QList<FileData>*\0fileSendList\0" "QList<FileData>*\0fileSendList\0"
"sigSetConnect\0ServerSettings*\0" "sigSetConnect\0ServerSettings*\0"
"serverSettings\0sigCalculateHash\0" "serverSettings\0sigCalculateHash\0"
"sigSendAutorization\0sigGetConnected\0" "sigSendAutorization\0sigSendCheck\0"
"showUpdateInfo\0showCompleteDialogBox\0" "sigGetConnected\0showUpdateInfo\0"
"slotConnectionState\0flag\0slotServerDisconnect\0" "showCompleteDialogBox\0slotConnectionState\0"
"updateProgress\0loadComplete\0lostConnection\0" "flag\0slotServerDisconnect\0updateProgress\0"
"serverBlocked\0checkLoginResult\0" "loadComplete\0lostConnection\0serverBlocked\0"
"ServerAuthorization*\0serverAuth\0" "checkLoginResult\0ServerAuthorization*\0"
"setNeedUpdate\0size\0fileCount\0deleteCount\0" "serverAuth\0setNeedUpdate\0size\0fileCount\0"
"showServerListWidget\0QList<StreamingVersionData*>*\0" "deleteCount\0showServerListWidget\0"
"serverData\0on_settingsButton_clicked\0" "QList<StreamingVersionData*>*\0serverData\0"
"on_settingsButton_clicked\0"
"on_languageComboBox_activated\0arg1\0" "on_languageComboBox_activated\0arg1\0"
"slotDisableNotify\0on_exitButton_clicked\0" "slotDisableNotify\0on_exitButton_clicked\0"
"on_offlineStartButton_clicked\0" "on_offlineStartButton_clicked\0"
@@ -131,50 +134,52 @@ static const uint qt_meta_data_MainWindow[] = {
8, // revision 8, // revision
0, // classname 0, // classname
0, 0, // classinfo 0, 0, // classinfo
26, 14, // methods 27, 14, // methods
0, 0, // properties 0, 0, // properties
0, 0, // enums/sets 0, 0, // enums/sets
0, 0, // constructors 0, 0, // constructors
0, // flags 0, // flags
9, // signalCount 10, // signalCount
// signals: name, argc, parameters, tag, flags // signals: name, argc, parameters, tag, flags
1, 5, 144, 2, 0x06 /* Public */, 1, 5, 149, 2, 0x06 /* Public */,
13, 5, 155, 2, 0x06 /* Public */, 13, 5, 160, 2, 0x06 /* Public */,
22, 1, 166, 2, 0x06 /* Public */, 22, 1, 171, 2, 0x06 /* Public */,
24, 1, 169, 2, 0x06 /* Public */, 25, 1, 174, 2, 0x06 /* Public */,
26, 1, 172, 2, 0x06 /* Public */, 27, 1, 177, 2, 0x06 /* Public */,
29, 2, 175, 2, 0x06 /* Public */, 30, 2, 180, 2, 0x06 /* Public */,
32, 0, 180, 2, 0x06 /* Public */, 33, 0, 185, 2, 0x06 /* Public */,
33, 0, 181, 2, 0x06 /* Public */, 34, 0, 186, 2, 0x06 /* Public */,
34, 0, 182, 2, 0x06 /* Public */, 35, 0, 187, 2, 0x06 /* Public */,
36, 0, 188, 2, 0x06 /* Public */,
// slots: name, argc, parameters, tag, flags // slots: name, argc, parameters, tag, flags
35, 0, 183, 2, 0x0a /* Public */, 37, 0, 189, 2, 0x0a /* Public */,
36, 0, 184, 2, 0x0a /* Public */, 38, 0, 190, 2, 0x0a /* Public */,
37, 1, 185, 2, 0x0a /* Public */, 39, 1, 191, 2, 0x0a /* Public */,
39, 0, 188, 2, 0x0a /* Public */, 41, 0, 194, 2, 0x0a /* Public */,
40, 0, 189, 2, 0x0a /* Public */, 42, 0, 195, 2, 0x0a /* Public */,
41, 0, 190, 2, 0x0a /* Public */, 43, 0, 196, 2, 0x0a /* Public */,
42, 0, 191, 2, 0x0a /* Public */, 44, 0, 197, 2, 0x0a /* Public */,
43, 0, 192, 2, 0x0a /* Public */, 45, 0, 198, 2, 0x0a /* Public */,
44, 1, 193, 2, 0x0a /* Public */, 46, 1, 199, 2, 0x0a /* Public */,
47, 4, 196, 2, 0x0a /* Public */, 49, 4, 202, 2, 0x0a /* Public */,
51, 1, 205, 2, 0x0a /* Public */, 53, 1, 211, 2, 0x0a /* Public */,
54, 0, 208, 2, 0x08 /* Private */, 56, 0, 214, 2, 0x08 /* Private */,
55, 1, 209, 2, 0x08 /* Private */, 57, 1, 215, 2, 0x08 /* Private */,
57, 0, 212, 2, 0x08 /* Private */, 59, 0, 218, 2, 0x08 /* Private */,
58, 0, 213, 2, 0x08 /* Private */, 60, 0, 219, 2, 0x08 /* Private */,
59, 0, 214, 2, 0x08 /* Private */, 61, 0, 220, 2, 0x08 /* Private */,
60, 0, 215, 2, 0x08 /* Private */, 62, 0, 221, 2, 0x08 /* Private */,
// signals: parameters // signals: parameters
QMetaType::Void, 0x80000000 | 3, 0x80000000 | 5, 0x80000000 | 7, 0x80000000 | 9, 0x80000000 | 11, 4, 6, 8, 10, 12, QMetaType::Void, 0x80000000 | 3, 0x80000000 | 5, 0x80000000 | 7, 0x80000000 | 9, 0x80000000 | 11, 4, 6, 8, 10, 12,
QMetaType::Void, 0x80000000 | 14, 0x80000000 | 16, 0x80000000 | 3, 0x80000000 | 18, 0x80000000 | 20, 15, 17, 4, 19, 21, QMetaType::Void, 0x80000000 | 14, 0x80000000 | 16, 0x80000000 | 3, 0x80000000 | 18, 0x80000000 | 20, 15, 17, 4, 19, 21,
QMetaType::Void, QMetaType::QString, 23, QMetaType::Void, 0x80000000 | 23, 24,
QMetaType::Void, QMetaType::QString, 25, QMetaType::Void, QMetaType::QString, 26,
QMetaType::Void, 0x80000000 | 27, 28, QMetaType::Void, 0x80000000 | 28, 29,
QMetaType::Void, 0x80000000 | 30, 0x80000000 | 11, 31, 12, QMetaType::Void, 0x80000000 | 31, 0x80000000 | 11, 32, 12,
QMetaType::Void,
QMetaType::Void, QMetaType::Void,
QMetaType::Void, QMetaType::Void,
QMetaType::Bool, QMetaType::Bool,
@@ -182,17 +187,17 @@ static const uint qt_meta_data_MainWindow[] = {
// slots: parameters // slots: parameters
QMetaType::Void, QMetaType::Void,
QMetaType::Void, QMetaType::Void,
QMetaType::Void, QMetaType::Bool, 38, QMetaType::Void, QMetaType::Bool, 40,
QMetaType::Void, QMetaType::Void,
QMetaType::Void, QMetaType::Void,
QMetaType::Void, QMetaType::Void,
QMetaType::Void, QMetaType::Void,
QMetaType::Void, QMetaType::Void,
QMetaType::Void, 0x80000000 | 45, 46, QMetaType::Void, 0x80000000 | 47, 48,
QMetaType::Void, QMetaType::Bool, QMetaType::ULongLong, QMetaType::ULongLong, QMetaType::ULongLong, 38, 48, 49, 50, QMetaType::Void, QMetaType::Bool, QMetaType::ULongLong, QMetaType::ULongLong, QMetaType::ULongLong, 40, 50, 51, 52,
QMetaType::Void, 0x80000000 | 52, 53, QMetaType::Void, 0x80000000 | 54, 55,
QMetaType::Void, QMetaType::Void,
QMetaType::Void, QMetaType::QString, 56, QMetaType::Void, QMetaType::QString, 58,
QMetaType::Void, QMetaType::Void,
QMetaType::Void, QMetaType::Void,
QMetaType::Void, QMetaType::Void,
@@ -209,31 +214,32 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
switch (_id) { switch (_id) {
case 0: _t->sigInitializeClient((*reinterpret_cast< MainWindow*(*)>(_a[1])),(*reinterpret_cast< RecognizeSystem*(*)>(_a[2])),(*reinterpret_cast< ExternalExecuter*(*)>(_a[3])),(*reinterpret_cast< SendSystem*(*)>(_a[4])),(*reinterpret_cast< QThread*(*)>(_a[5]))); break; case 0: _t->sigInitializeClient((*reinterpret_cast< MainWindow*(*)>(_a[1])),(*reinterpret_cast< RecognizeSystem*(*)>(_a[2])),(*reinterpret_cast< ExternalExecuter*(*)>(_a[3])),(*reinterpret_cast< SendSystem*(*)>(_a[4])),(*reinterpret_cast< QThread*(*)>(_a[5]))); break;
case 1: _t->sigRecognize((*reinterpret_cast< UpdateController*(*)>(_a[1])),(*reinterpret_cast< DataParser*(*)>(_a[2])),(*reinterpret_cast< MainWindow*(*)>(_a[3])),(*reinterpret_cast< HashComparer*(*)>(_a[4])),(*reinterpret_cast< TCPClient*(*)>(_a[5]))); break; case 1: _t->sigRecognize((*reinterpret_cast< UpdateController*(*)>(_a[1])),(*reinterpret_cast< DataParser*(*)>(_a[2])),(*reinterpret_cast< MainWindow*(*)>(_a[3])),(*reinterpret_cast< HashComparer*(*)>(_a[4])),(*reinterpret_cast< TCPClient*(*)>(_a[5]))); break;
case 2: _t->sigSendCommand((*reinterpret_cast< QString(*)>(_a[1]))); break; case 2: _t->sigSendCommand((*reinterpret_cast< PacketType(*)>(_a[1]))); break;
case 3: _t->sigSendXMLAnswer((*reinterpret_cast< QString(*)>(_a[1]))); break; case 3: _t->sigSendXMLAnswer((*reinterpret_cast< QString(*)>(_a[1]))); break;
case 4: _t->sigUpdateFilesOnServer((*reinterpret_cast< QList<FileData>*(*)>(_a[1]))); break; case 4: _t->sigUpdateFilesOnServer((*reinterpret_cast< QList<FileData>*(*)>(_a[1]))); break;
case 5: _t->sigSetConnect((*reinterpret_cast< ServerSettings*(*)>(_a[1])),(*reinterpret_cast< QThread*(*)>(_a[2]))); break; case 5: _t->sigSetConnect((*reinterpret_cast< ServerSettings*(*)>(_a[1])),(*reinterpret_cast< QThread*(*)>(_a[2]))); break;
case 6: _t->sigCalculateHash(); break; case 6: _t->sigCalculateHash(); break;
case 7: _t->sigSendAutorization(); break; case 7: _t->sigSendAutorization(); break;
case 8: { bool _r = _t->sigGetConnected(); case 8: _t->sigSendCheck(); break;
case 9: { bool _r = _t->sigGetConnected();
if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = std::move(_r); } break; if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = std::move(_r); } break;
case 9: _t->showUpdateInfo(); break; case 10: _t->showUpdateInfo(); break;
case 10: _t->showCompleteDialogBox(); break; case 11: _t->showCompleteDialogBox(); break;
case 11: _t->slotConnectionState((*reinterpret_cast< bool(*)>(_a[1]))); break; case 12: _t->slotConnectionState((*reinterpret_cast< bool(*)>(_a[1]))); break;
case 12: _t->slotServerDisconnect(); break; case 13: _t->slotServerDisconnect(); break;
case 13: _t->updateProgress(); break; case 14: _t->updateProgress(); break;
case 14: _t->loadComplete(); break; case 15: _t->loadComplete(); break;
case 15: _t->lostConnection(); break; case 16: _t->lostConnection(); break;
case 16: _t->serverBlocked(); break; case 17: _t->serverBlocked(); break;
case 17: _t->checkLoginResult((*reinterpret_cast< ServerAuthorization*(*)>(_a[1]))); break; case 18: _t->checkLoginResult((*reinterpret_cast< ServerAuthorization*(*)>(_a[1]))); break;
case 18: _t->setNeedUpdate((*reinterpret_cast< bool(*)>(_a[1])),(*reinterpret_cast< quint64(*)>(_a[2])),(*reinterpret_cast< quint64(*)>(_a[3])),(*reinterpret_cast< quint64(*)>(_a[4]))); break; case 19: _t->setNeedUpdate((*reinterpret_cast< bool(*)>(_a[1])),(*reinterpret_cast< quint64(*)>(_a[2])),(*reinterpret_cast< quint64(*)>(_a[3])),(*reinterpret_cast< quint64(*)>(_a[4]))); break;
case 19: _t->showServerListWidget((*reinterpret_cast< QList<StreamingVersionData*>*(*)>(_a[1]))); break; case 20: _t->showServerListWidget((*reinterpret_cast< QList<StreamingVersionData*>*(*)>(_a[1]))); break;
case 20: _t->on_settingsButton_clicked(); break; case 21: _t->on_settingsButton_clicked(); break;
case 21: _t->on_languageComboBox_activated((*reinterpret_cast< const QString(*)>(_a[1]))); break; case 22: _t->on_languageComboBox_activated((*reinterpret_cast< const QString(*)>(_a[1]))); break;
case 22: _t->slotDisableNotify(); break; case 23: _t->slotDisableNotify(); break;
case 23: _t->on_exitButton_clicked(); break; case 24: _t->on_exitButton_clicked(); break;
case 24: _t->on_offlineStartButton_clicked(); break; case 25: _t->on_offlineStartButton_clicked(); break;
case 25: _t->on_unsafeChangingButton_clicked(); break; case 26: _t->on_unsafeChangingButton_clicked(); break;
default: ; default: ;
} }
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
@@ -294,7 +300,7 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
} }
} }
{ {
using _t = void (MainWindow::*)(QString ); using _t = void (MainWindow::*)(PacketType );
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::sigSendCommand)) { if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::sigSendCommand)) {
*result = 2; *result = 2;
return; return;
@@ -335,10 +341,17 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
return; return;
} }
} }
{
using _t = void (MainWindow::*)();
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::sigSendCheck)) {
*result = 8;
return;
}
}
{ {
using _t = bool (MainWindow::*)(); using _t = bool (MainWindow::*)();
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::sigGetConnected)) { if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::sigGetConnected)) {
*result = 8; *result = 9;
return; return;
} }
} }
@@ -374,13 +387,13 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
if (_id < 0) if (_id < 0)
return _id; return _id;
if (_c == QMetaObject::InvokeMetaMethod) { if (_c == QMetaObject::InvokeMetaMethod) {
if (_id < 26) if (_id < 27)
qt_static_metacall(this, _c, _id, _a); qt_static_metacall(this, _c, _id, _a);
_id -= 26; _id -= 27;
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
if (_id < 26) if (_id < 27)
qt_static_metacall(this, _c, _id, _a); qt_static_metacall(this, _c, _id, _a);
_id -= 26; _id -= 27;
} }
return _id; return _id;
} }
@@ -400,7 +413,7 @@ void MainWindow::sigRecognize(UpdateController * _t1, DataParser * _t2, MainWind
} }
// SIGNAL 2 // SIGNAL 2
void MainWindow::sigSendCommand(QString _t1) void MainWindow::sigSendCommand(PacketType _t1)
{ {
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) }; void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) };
QMetaObject::activate(this, &staticMetaObject, 2, _a); QMetaObject::activate(this, &staticMetaObject, 2, _a);
@@ -440,11 +453,17 @@ void MainWindow::sigSendAutorization()
} }
// SIGNAL 8 // SIGNAL 8
void MainWindow::sigSendCheck()
{
QMetaObject::activate(this, &staticMetaObject, 8, nullptr);
}
// SIGNAL 9
bool MainWindow::sigGetConnected() bool MainWindow::sigGetConnected()
{ {
bool _t0{}; bool _t0{};
void *_a[] = { const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t0))) }; void *_a[] = { const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t0))) };
QMetaObject::activate(this, &staticMetaObject, 8, _a); QMetaObject::activate(this, &staticMetaObject, 9, _a);
return _t0; return _t0;
} }
QT_WARNING_POP QT_WARNING_POP

BIN
debug/moc_mainwindow.o
View File

Binary file not shown.

BIN
debug/moc_recognizesystem.o
View File

Binary file not shown.

BIN
debug/moc_sendsystem.o
View File

Binary file not shown.

39
debug/moc_tcpclient.cpp
View File

@@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE
QT_WARNING_PUSH QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED QT_WARNING_DISABLE_DEPRECATED
struct qt_meta_stringdata_TCPClient_t { struct qt_meta_stringdata_TCPClient_t {
QByteArrayData data[10]; QByteArrayData data[9];
char stringdata0[127]; char stringdata0[111];
}; };
#define QT_MOC_LITERAL(idx, ofs, len) \ #define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -39,15 +39,13 @@ QT_MOC_LITERAL(3, 27, 7), // "message"
QT_MOC_LITERAL(4, 35, 19), // "sigServerDisconnect" QT_MOC_LITERAL(4, 35, 19), // "sigServerDisconnect"
QT_MOC_LITERAL(5, 55, 18), // "sigConnectionState" QT_MOC_LITERAL(5, 55, 18), // "sigConnectionState"
QT_MOC_LITERAL(6, 74, 4), // "flag" QT_MOC_LITERAL(6, 74, 4), // "flag"
QT_MOC_LITERAL(7, 79, 15), // "slotSendCommand" QT_MOC_LITERAL(7, 79, 17), // "slotConnectNotify"
QT_MOC_LITERAL(8, 95, 17), // "slotConnectNotify" QT_MOC_LITERAL(8, 97, 13) // "slotReadyRead"
QT_MOC_LITERAL(9, 113, 13) // "slotReadyRead"
}, },
"TCPClient\0sigSendDebugLog\0\0message\0" "TCPClient\0sigSendDebugLog\0\0message\0"
"sigServerDisconnect\0sigConnectionState\0" "sigServerDisconnect\0sigConnectionState\0"
"flag\0slotSendCommand\0slotConnectNotify\0" "flag\0slotConnectNotify\0slotReadyRead"
"slotReadyRead"
}; };
#undef QT_MOC_LITERAL #undef QT_MOC_LITERAL
@@ -57,7 +55,7 @@ static const uint qt_meta_data_TCPClient[] = {
8, // revision 8, // revision
0, // classname 0, // classname
0, 0, // classinfo 0, 0, // classinfo
6, 14, // methods 5, 14, // methods
0, 0, // properties 0, 0, // properties
0, 0, // enums/sets 0, 0, // enums/sets
0, 0, // constructors 0, 0, // constructors
@@ -65,14 +63,13 @@ static const uint qt_meta_data_TCPClient[] = {
3, // signalCount 3, // signalCount
// signals: name, argc, parameters, tag, flags // signals: name, argc, parameters, tag, flags
1, 1, 44, 2, 0x06 /* Public */, 1, 1, 39, 2, 0x06 /* Public */,
4, 0, 47, 2, 0x06 /* Public */, 4, 0, 42, 2, 0x06 /* Public */,
5, 1, 48, 2, 0x06 /* Public */, 5, 1, 43, 2, 0x06 /* Public */,
// slots: name, argc, parameters, tag, flags // slots: name, argc, parameters, tag, flags
7, 1, 51, 2, 0x0a /* Public */, 7, 0, 46, 2, 0x0a /* Public */,
8, 0, 54, 2, 0x0a /* Public */, 8, 0, 47, 2, 0x08 /* Private */,
9, 0, 55, 2, 0x08 /* Private */,
// signals: parameters // signals: parameters
QMetaType::Void, QMetaType::QString, 3, QMetaType::Void, QMetaType::QString, 3,
@@ -80,7 +77,6 @@ static const uint qt_meta_data_TCPClient[] = {
QMetaType::Void, QMetaType::Bool, 6, QMetaType::Void, QMetaType::Bool, 6,
// slots: parameters // slots: parameters
QMetaType::Void, QMetaType::QString, 3,
QMetaType::Void, QMetaType::Void,
QMetaType::Void, QMetaType::Void,
@@ -96,9 +92,8 @@ void TCPClient::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v
case 0: _t->sigSendDebugLog((*reinterpret_cast< QString(*)>(_a[1]))); break; case 0: _t->sigSendDebugLog((*reinterpret_cast< QString(*)>(_a[1]))); break;
case 1: _t->sigServerDisconnect(); break; case 1: _t->sigServerDisconnect(); break;
case 2: _t->sigConnectionState((*reinterpret_cast< bool(*)>(_a[1]))); break; case 2: _t->sigConnectionState((*reinterpret_cast< bool(*)>(_a[1]))); break;
case 3: _t->slotSendCommand((*reinterpret_cast< QString(*)>(_a[1]))); break; case 3: _t->slotConnectNotify(); break;
case 4: _t->slotConnectNotify(); break; case 4: _t->slotReadyRead(); break;
case 5: _t->slotReadyRead(); break;
default: ; default: ;
} }
} else if (_c == QMetaObject::IndexOfMethod) { } else if (_c == QMetaObject::IndexOfMethod) {
@@ -156,13 +151,13 @@ int TCPClient::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
if (_id < 0) if (_id < 0)
return _id; return _id;
if (_c == QMetaObject::InvokeMetaMethod) { if (_c == QMetaObject::InvokeMetaMethod) {
if (_id < 6) if (_id < 5)
qt_static_metacall(this, _c, _id, _a); qt_static_metacall(this, _c, _id, _a);
_id -= 6; _id -= 5;
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
if (_id < 6) if (_id < 5)
*reinterpret_cast<int*>(_a[0]) = -1; *reinterpret_cast<int*>(_a[0]) = -1;
_id -= 6; _id -= 5;
} }
return _id; return _id;
} }

BIN
debug/moc_tcpclient.o
View File

Binary file not shown.

BIN
debug/moc_versioncontainer.o
View File

Binary file not shown.

BIN
debug/newversionwidget.o
View File

Binary file not shown.

BIN
debug/notifycontroller.o
View File

Binary file not shown.

136
debug/qrc_resources.cpp
View File

@@ -8,54 +8,62 @@
static const unsigned char qt_resource_data[] = { static const unsigned char qt_resource_data[] = {
// D:/QT/Projects/RRJClient/style.css // D:/QT/Projects/RRJClient/style.css
0x0,0x0,0x2,0xdd, 0x0,0x0,0x3,0x60,
0x0, 0x0,
0x0,0xc,0xab,0x78,0x9c,0xd5,0x56,0x6b,0x6f,0xda,0x30,0x14,0xfd,0x8e,0xc4,0x7f, 0x0,0xf,0x7c,0x78,0x9c,0xd5,0x57,0xed,0x6e,0xda,0x30,0x14,0xfd,0x8f,0xc4,0x3b,
0xb0,0x8a,0x26,0xb5,0x12,0xb4,0x49,0x28,0x2d,0xcb,0xbe,0xd1,0xee,0xa9,0x51,0xad, 0x44,0x45,0x93,0x4a,0x15,0x4a,0x8,0xd0,0xa2,0xec,0x1f,0xed,0x3e,0x35,0xaa,0x55,
0x6a,0xd7,0x7e,0x9c,0x9c,0xf8,0x36,0xb1,0x30,0x36,0xb2,0x9d,0x52,0x34,0xed,0xbf, 0xed,0xda,0x9f,0x93,0x93,0xb8,0x89,0x85,0xb1,0x91,0xe3,0x14,0xd0,0x34,0x69,0x7b,
0xcf,0x24,0x81,0xbc,0x21,0x7d,0x68,0xd2,0x8,0xe2,0x11,0x3b,0xe7,0x1e,0xfb,0x9e, 0xa5,0x49,0x93,0xba,0x49,0xeb,0x33,0xd0,0x37,0xda,0x25,0x9,0xf9,0x20,0x1,0x42,
0x7b,0xae,0xbb,0x9d,0xeb,0x29,0xa6,0xfc,0x9e,0x72,0x22,0x96,0xdd,0xce,0xef,0x6e, 0x37,0x4d,0x6b,0x69,0x80,0x26,0xf6,0xf1,0xb9,0xbe,0xe7,0x1e,0xdf,0x56,0x2b,0xe7,
0x7,0x99,0x97,0x87,0xfd,0x59,0x20,0x45,0xc4,0xc9,0x80,0xce,0x71,0x0,0x2e,0x8a, 0x3,0x44,0xd8,0x35,0x61,0x36,0x9f,0x54,0x2b,0x9f,0xaa,0x15,0x5,0x7e,0x4c,0x64,
0x24,0x3b,0x74,0x4f,0x24,0x28,0x11,0x49,0x1f,0x4e,0x6e,0x6e,0xbe,0xfd,0xca,0x26, 0xd,0x1d,0xc1,0x7d,0x66,0x37,0xc8,0x8,0x39,0xd8,0x50,0x7c,0x41,0xf7,0x8d,0xa6,
0x5d,0x62,0x39,0xbb,0x99,0x1e,0x2f,0x78,0x70,0xf4,0xa1,0x2,0xb0,0x10,0x8a,0x6a, 0xc0,0x1e,0xf7,0x85,0x85,0x9b,0x17,0x17,0x6f,0x3f,0x26,0x83,0x4e,0x91,0x18,0x5e,
0x2a,0xb8,0x8b,0x7c,0xe0,0x1a,0xa4,0x99,0xf1,0xa7,0xdb,0xe9,0x76,0xae,0x3f,0x49, 0xc,0xe,0xc7,0xcc,0xa9,0x3f,0xcf,0x1,0x8c,0xb9,0x47,0x24,0xe1,0xcc,0x50,0x2c,
0x3c,0x87,0x5e,0x36,0xf3,0xe7,0x82,0x60,0xd,0xff,0x96,0xc3,0x77,0xaa,0xf4,0x3d, 0xcc,0x24,0x16,0x30,0xe2,0x73,0xb5,0x52,0xad,0x9c,0xbf,0x14,0x68,0x84,0x6b,0xc9,
0x25,0x1,0xe8,0x5e,0x14,0x87,0xcf,0x6e,0xd4,0x11,0xf1,0x5,0x13,0xd2,0x45,0x32, 0xc8,0xf,0x63,0x1b,0x49,0xfc,0x6f,0x39,0xbc,0x23,0x9e,0xbc,0x26,0xb6,0x83,0x65,
0xf0,0xf0,0xe1,0xd8,0xee,0x27,0x6f,0x7b,0x6c,0x6d,0x42,0x26,0xe3,0xcb,0x90,0x6a, 0xcd,0xf,0x96,0x4f,0x6e,0x14,0x11,0xb1,0x38,0xe5,0xc2,0x50,0x84,0x63,0xa2,0xfd,
0x28,0x2d,0xf3,0xa,0x96,0x77,0x20,0x27,0x5b,0xa8,0x66,0xf4,0x18,0xdc,0xea,0xaf, 0x5e,0x4b,0xd,0x7f,0x5b,0x3d,0x6d,0xb9,0x64,0xf8,0x7c,0xe2,0x12,0x89,0x93,0x25,
0xaf,0xf7,0xd6,0xbb,0xa3,0x8c,0x2a,0xf6,0x80,0xf5,0xa6,0xe2,0x91,0x42,0xfc,0xb3, 0x90,0x89,0x69,0x6d,0xc0,0x6f,0x9,0xe,0xbe,0xae,0xc7,0xd,0x60,0x35,0x75,0xf1,
0x15,0xc2,0x28,0x8f,0x70,0x21,0xe6,0x9e,0x98,0x88,0xa7,0xdd,0x2b,0x3b,0x74,0xac, 0xea,0x6a,0xcf,0xea,0x31,0xc2,0x9,0x1f,0x99,0xbc,0xcf,0xa7,0x9b,0x19,0xed,0xeb,
0x61,0xdf,0x71,0xc6,0x7d,0x67,0x34,0xda,0x6e,0xa5,0x90,0x4,0xe4,0x40,0xe9,0x15, 0x5a,0x5b,0xd5,0xf5,0x9e,0xaa,0x77,0xbb,0xf1,0x16,0x70,0x61,0x63,0xd1,0xf0,0xe4,
0x33,0x79,0x10,0x91,0x56,0xa0,0x8b,0x43,0x12,0x13,0x1a,0x29,0x17,0xd,0x17,0x4f, 0x8c,0xc2,0xfe,0x71,0x5f,0x7a,0x58,0x66,0x1f,0x9,0x64,0x13,0xdf,0x33,0x94,0xf6,
0xe9,0xc0,0x83,0xe0,0x7a,0xf0,0x80,0xe7,0x94,0xad,0x5c,0x74,0x70,0x81,0x19,0xf5, 0x78,0x1a,0x3d,0xb8,0xe1,0x4c,0x36,0x6e,0xd0,0x88,0xd0,0x99,0xa1,0xec,0x9d,0x20,
0x24,0x3d,0xc8,0xd,0xba,0xc8,0x3e,0xdb,0xce,0xce,0xc5,0x3f,0x1d,0xf5,0xc7,0xa7, 0x4a,0x4c,0x41,0xf6,0x52,0xf,0xd,0xa5,0x75,0x14,0x8f,0x4e,0xad,0xdf,0xe9,0xaa,
0x7d,0x7b,0x68,0x65,0xcc,0x7f,0x44,0x2a,0x9c,0x44,0x5a,0xb,0xfe,0x3f,0x73,0x77, 0xbd,0x8e,0xda,0x6a,0x6b,0x9,0xf3,0xf7,0xbe,0xe7,0xf6,0x7d,0x29,0x39,0x7b,0xca,
0x9,0x55,0xd8,0x63,0xb0,0x23,0xf9,0x88,0xd1,0x20,0xd4,0x9f,0x25,0x5e,0x15,0xb1, 0xdc,0xd,0x9b,0x78,0xc8,0xa4,0xd8,0xde,0x10,0x4,0x25,0x8e,0x2b,0x5f,0x9,0x34,
0x3,0x73,0x67,0x3,0x38,0x5,0xa5,0x4c,0x3d,0xec,0x4e,0x64,0x51,0x83,0xd9,0x23, 0xcb,0x62,0x3b,0x70,0x67,0x9,0x38,0xc0,0x9e,0x7,0x3a,0x2e,0x91,0xc8,0x8e,0xa6,
0xe8,0xba,0x28,0x9e,0x16,0x2b,0x75,0xac,0xf2,0x4a,0x3d,0x66,0xe2,0xd5,0x82,0xd7, 0x46,0x57,0x42,0x27,0x99,0xad,0x9c,0x67,0x75,0x14,0xc5,0xd5,0x5b,0x8d,0xcb,0xa4,
0x25,0xaa,0xb8,0xc9,0xce,0x16,0x6c,0x81,0x9,0xa1,0x3c,0x70,0x91,0x75,0xec,0xc0, 0x80,0x5e,0x38,0xbf,0x7c,0x5a,0xf4,0xae,0x1a,0x5d,0xf5,0x62,0xf0,0x24,0x1d,0x40,
0x7c,0xfb,0x39,0xdc,0xfc,0x4e,0xa7,0xcd,0x29,0x1f,0x2c,0x29,0xd1,0xa1,0x8b,0xce, 0x61,0x3c,0x55,0x3c,0x4e,0x89,0x1d,0x84,0x5d,0x9c,0x2b,0x3d,0x66,0x39,0x46,0xb6,
0x13,0x26,0x9b,0xd2,0xe5,0xf0,0x91,0x50,0x5d,0xe,0xd4,0x3a,0xd1,0x69,0x7a,0xa4, 0x4d,0x98,0x63,0x28,0xda,0xa1,0x8e,0x47,0xf1,0x7b,0x7b,0xf9,0x3d,0x1a,0x36,0x22,
0x8,0x8c,0xa5,0xa8,0x9,0x96,0x25,0xa4,0x98,0x2b,0x52,0x82,0x51,0x52,0xcd,0x6d, 0xac,0x31,0x21,0xb6,0x74,0xd,0xe5,0x58,0xb,0x26,0x2f,0x2b,0x97,0xe1,0x17,0x36,
0xd,0xea,0xa8,0x69,0x9b,0xda,0x2a,0xca,0x0,0x18,0x4c,0x46,0xd2,0xbb,0x1a,0x9e, 0x49,0x95,0xe9,0x8e,0x7a,0x89,0xb2,0x2c,0xb8,0x3,0x8e,0xe2,0xf5,0x91,0x58,0x41,
0xf4,0xc0,0x4c,0xc,0x2a,0xb6,0x55,0xa4,0xed,0xba,0x7e,0x18,0xf1,0x59,0xd3,0x86, 0xa,0xb8,0x46,0xf1,0xe4,0x24,0x52,0x80,0xda,0x5d,0xb7,0xff,0x65,0x85,0x9,0x0,
0x67,0xb4,0x5a,0x95,0x4c,0x6a,0x15,0x21,0xf8,0xb3,0xbc,0xc2,0xf2,0xfc,0x1b,0xe8, 0x80,0x49,0xed,0xe8,0xae,0xc4,0x53,0xd9,0x80,0x81,0x4e,0xce,0xb5,0xb2,0xb4,0xd,
0x8f,0xcb,0xeb,0x2f,0x6a,0x30,0xb5,0x59,0xea,0xb,0x5e,0x36,0xd8,0x84,0x70,0xbd, 0xc3,0x72,0x7d,0x36,0x5c,0xdd,0x87,0x3c,0xad,0x52,0x95,0x17,0x39,0x8e,0x8b,0xad,
0xcb,0x7f,0x35,0xf3,0xd5,0xc9,0x82,0x61,0xe,0xb1,0xb9,0x23,0x2b,0xbd,0x94,0x96, 0x61,0x5a,0xa8,0x69,0xfe,0x6b,0xe8,0xe7,0xf4,0x97,0xb5,0xc1,0xc8,0x65,0x89,0xc5,
0xa0,0xfd,0x70,0xf3,0xbd,0x11,0x55,0xa3,0xd3,0xbf,0x5e,0xf6,0xc5,0xf5,0xdc,0x9a, 0xd9,0xaa,0xbf,0x86,0x84,0x8b,0x4d,0xfe,0xd,0x8c,0xf7,0x9a,0x63,0x8a,0x18,0xe,
0xf4,0xac,0xf5,0xd7,0xa3,0x9c,0x19,0x29,0xae,0xff,0x5e,0x82,0x17,0x5,0xfb,0xfa, 0xbc,0x5d,0xd1,0xa2,0x97,0x27,0x5,0x96,0x96,0xbb,0xfc,0x5c,0x8a,0x6a,0xad,0xd1,
0x46,0x62,0xcc,0x5b,0x11,0xb5,0x11,0x46,0xbb,0x9d,0xd,0x1,0x9b,0x6d,0xdc,0xd7, 0xe7,0x4a,0x66,0x4b,0x3a,0x74,0x6d,0x73,0x3c,0x97,0x90,0x9e,0x85,0xfe,0x6a,0x84,
0xbc,0x1a,0x53,0x5e,0x68,0x83,0xed,0x5a,0x60,0xe,0xe7,0x65,0x8e,0x6b,0xe7,0xb, 0x51,0x90,0xe2,0xe2,0xcf,0x53,0x6c,0xfa,0xce,0xb6,0x63,0x23,0xf4,0xf7,0x58,0x44,
0x3a,0x89,0x89,0x5e,0xce,0xc0,0x2a,0x57,0xe6,0x5b,0x30,0x78,0x13,0xc3,0xac,0x6f, 0x65,0x84,0x51,0x6e,0x67,0x5d,0x8c,0x60,0x1b,0xb7,0x9d,0x5d,0x6b,0x53,0x9e,0x39,
0xd,0xd3,0x95,0x39,0x76,0x7d,0x89,0xb3,0x96,0x26,0xef,0xd9,0xa1,0xaa,0xd2,0x68, 0x5,0xcb,0x9d,0x80,0x29,0x9c,0xc7,0x19,0x77,0x2b,0x5d,0xd0,0xe1,0x9a,0xca,0xe3,
0xe8,0x42,0xc9,0xe9,0xc1,0x54,0x51,0x10,0x99,0x2a,0xbb,0xa5,0x9a,0x41,0xbb,0x38, 0x19,0x68,0xab,0x95,0xf9,0x37,0x18,0x14,0x99,0xed,0xce,0xca,0x29,0x3e,0x61,0x6,
0xb5,0x8a,0x4b,0xd0,0xae,0x84,0xa6,0xf,0xd4,0xc7,0xeb,0x7a,0x7b,0x6,0xf3,0x3a, 0x33,0xe8,0xba,0x5e,0x7,0x59,0x8b,0x92,0xb7,0xf3,0x52,0x79,0x69,0xac,0x39,0xcc,
0xc4,0x75,0x3d,0x9,0xc1,0x92,0xd6,0xd1,0x33,0x7d,0xd2,0x14,0xfc,0xea,0x8e,0xc2, 0xc2,0x26,0x4,0xaa,0xc8,0xf1,0xa1,0xca,0x2e,0x89,0xa4,0xb8,0xdc,0x3a,0x85,0x8a,
0xb2,0xe2,0xc9,0xa7,0xaf,0xf2,0xe4,0xfa,0x67,0xf6,0x74,0xcf,0x7a,0x66,0xc6,0x75, 0xb,0xd1,0xce,0xb8,0x24,0x37,0xc4,0x42,0x8b,0x7a,0xdb,0x81,0x79,0x11,0xe2,0xa2,
0x8d,0x47,0xee,0x6c,0xe6,0xeb,0x68,0xf6,0xc8,0x9c,0x10,0xcf,0xcf,0x8c,0x3a,0xed, 0x9e,0x38,0xa7,0xe1,0x99,0x54,0x83,0xe3,0x16,0xa,0x7e,0x76,0x45,0xf0,0x24,0xe7,
0xa3,0xbd,0xab,0x6d,0x73,0x42,0xa8,0x1,0xdd,0xb1,0xbe,0xea,0x29,0xa4,0x97,0xf2, 0xc9,0x9d,0x3f,0xf2,0xe4,0xe2,0x39,0x39,0x6d,0xad,0x54,0x7a,0x21,0x33,0x70,0x5d,
0x8e,0x33,0xd6,0xe6,0x50,0x55,0xb0,0xac,0xa,0x9a,0xf1,0xbe,0xd9,0xb3,0x51,0x5a, 0xf0,0xc8,0x8d,0x3d,0xc1,0x62,0xb5,0x56,0x17,0x1a,0xc4,0xe3,0x23,0x50,0x67,0xab,
0x6a,0xc4,0x63,0x51,0x4e,0x21,0x7f,0x1,0xf0,0x87,0xaf,0xf, 0xbe,0x35,0xda,0x32,0x8d,0x46,0x1,0xe8,0x86,0xf8,0xf2,0xcd,0x4c,0x2d,0xe2,0x1d,
0x64,0xac,0x4c,0x13,0x90,0xb1,0xac,0x1c,0x1a,0x78,0xdf,0x70,0x67,0x94,0x92,0x1a,
0x31,0xa9,0x1f,0x67,0xa1,0x79,0xa0,0xcc,0xef,0xe7,0x3f,0xe7,0xbf,0xe6,0xf7,0xca,
0xe2,0x6d,0xfe,0xd,0xae,0x1f,0xa,0x7c,0x7c,0x7f,0xf8,0xf2,0xf0,0x75,0x7e,0x37,
0xbf,0x3b,0x68,0xc6,0xff,0x54,0x9c,0xe1,0xc9,0x15,0x16,0xfd,0x98,0xc8,0x16,0x3f,
0x2c,0xea,0xb7,0x42,0x8d,0x8f,0x5,0xbe,0x5,0xa4,0x6c,0xc1,0x2c,0xd9,0x65,0x8f,
0x77,0x23,0x2a,0xc6,0x82,0xe9,0x57,0x8,0x22,0x79,0xc4,0x74,0x86,0x27,0x67,0x10,
0xe,0x20,0x78,0x50,0x63,0xbb,0x93,0x48,0x67,0x1d,0x31,0xab,0x5c,0xbe,0xff,0xe7,
0xa6,0x2f,0x1d,0x90,0xc0,0x60,0xd2,0x4f,0x3a,0xa0,0xdf,0xca,0x7d,0x88,0x9f,
// D:/QT/Projects/RRJClient/resource/SSJ_backgroundDark.png // D:/QT/Projects/RRJClient/resource/SSJ_backgroundDark.png
0x0,0x22,0x2a,0x2f, 0x0,0x22,0x2a,0x2f,
0x89, 0x89,
@@ -328140,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,0x8,0x4d,0x2c,0x6b, 0x0,0x0,0x1,0x94,0x6e,0x89,0xce,0xcb,
// :/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,
@@ -328151,52 +328159,52 @@ static const unsigned char qt_resource_struct[] = {
0x0,0x0,0x0,0xd6,0x0,0x2,0x0,0x0,0x0,0x9,0x0,0x0,0x0,0x9, 0x0,0x0,0x0,0xd6,0x0,0x2,0x0,0x0,0x0,0x9,0x0,0x0,0x0,0x9,
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,0x61, 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,0x92,0x4d,0x8e,0xd2,0xb0,
// :/resource/SSJ-100.png // :/resource/SSJ-100.png
0x0,0x0,0x0,0x96,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x2f,0xcc,0xb3, 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,0x92,0x4d,0x0,0xce,0xbb,
// :/resource/SSJ_backgroundDarkSM.png // :/resource/SSJ_backgroundDarkSM.png
0x0,0x0,0x0,0x60,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x22,0x2d,0x14, 0x0,0x0,0x0,0x60,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x22,0x2d,0x97,
0x0,0x0,0x1,0x93,0xf7,0x6c,0xa6,0xcf, 0x0,0x0,0x1,0x93,0xf7,0x6c,0xa6,0xcf,
// :/resource/SSJ_backgroundDark.png // :/resource/SSJ_backgroundDark.png
0x0,0x0,0x0,0x2e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x2,0xe1, 0x0,0x0,0x0,0x2e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x3,0x64,
0x0,0x0,0x1,0x93,0xf7,0x67,0xfd,0xc6, 0x0,0x0,0x1,0x93,0xf7,0x67,0xfd,0xc6,
// :/resource/Icons/caution.png // :/resource/Icons/caution.png
0x0,0x0,0x1,0x90,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x4,0xee, 0x0,0x0,0x1,0x90,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x5,0x71,
0x0,0x0,0x1,0x93,0xf8,0xc4,0xe,0x70, 0x0,0x0,0x1,0x93,0xf8,0xc4,0xe,0x70,
// :/resource/Icons/setting.png // :/resource/Icons/setting.png
0x0,0x0,0x2,0x34,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xa5,0xf1, 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,0x92,0x47,0x9,0xdd,0xaa,
// :/resource/Icons/checked.png // :/resource/Icons/checked.png
0x0,0x0,0x2,0x90,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0x3,0x5e, 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,0x92,0x51,0xaa,0xfa,0x67,
// :/resource/Icons/settingWhite.png // :/resource/Icons/settingWhite.png
0x0,0x0,0x1,0xe2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x59,0xea, 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,0x92,0x47,0xc,0xaf,0x4c,
// :/resource/Icons/plane.png // :/resource/Icons/plane.png
0x0,0x0,0x2,0x50,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xd1,0x3, 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,0x91,0xb3,0xf,0xc0,0x1f,
// :/resource/Icons/crossInCircle.png // :/resource/Icons/crossInCircle.png
0x0,0x0,0x2,0x68,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xd5,0x50, 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,0x92,0x4c,0x9f,0x4d,0xc4,
// :/resource/Icons/whiteCross.png // :/resource/Icons/whiteCross.png
0x0,0x0,0x1,0xc0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x43,0x75, 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,0x92,0x4c,0x9e,0xfa,0x44,
// :/resource/Icons/monitor-display.png // :/resource/Icons/monitor-display.png
0x0,0x0,0x2,0x8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xa0,0x22, 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,0x92,0x42,0xfe,0x89,0x26,
// :/resource/Icons/762.gif // :/resource/Icons/762.gif
0x0,0x0,0x1,0xac,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x1c,0xff, 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,0x92,0x4d,0xb,0xea,0x71,
// :/resource/Fonts/HelveticaNeue-Medium.ttf // :/resource/Fonts/HelveticaNeue-Medium.ttf
0x0,0x0,0x0,0xf6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x46,0xbb,0xbe, 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,0x92,0x42,0xb4,0xbd,0xcd,
// :/resource/Fonts/LiberationSans-Regular.ttf // :/resource/Fonts/LiberationSans-Regular.ttf
0x0,0x0,0x1,0x56,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0xac,0xf2, 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,0x92,0x42,0x25,0xa7,0xdc,
// :/resource/Fonts/Kanit Cyrillic.ttf // :/resource/Fonts/Kanit Cyrillic.ttf
0x0,0x0,0x1,0x2c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0x25,0x32, 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,0x92,0x42,0x14,0x94,0xcc,
}; };

BIN
debug/qrc_resources.o
View File

Binary file not shown.

BIN
debug/recognizesystem.o
View File

Binary file not shown.

BIN
debug/sendsystem.o
View File

Binary file not shown.

BIN
debug/tcpclient.o
View File

Binary file not shown.

BIN
debug/tools.o
View File

Binary file not shown.

BIN
debug/updatecontroller.o
View File

Binary file not shown.

BIN
debug/versioncontainer.o
View File

Binary file not shown.

BIN
debug/versionselectwidget.o
View File

Binary file not shown.

23
mainwindow.cpp
View File

@@ -20,8 +20,9 @@ MainWindow::MainWindow(QWidget *parent)
void MainWindow::createObjects() void MainWindow::createObjects()
{ {
updateWidget = new UpdateNotifyWidget; qRegisterMetaType<PacketType>("PacketType");
updateWidget = new UpdateNotifyWidget;
updateWidget->setParent(this); updateWidget->setParent(this);
commonButtonGroupWidget = new CommonButtonGroupWidget; commonButtonGroupWidget = new CommonButtonGroupWidget;
@@ -98,12 +99,9 @@ void MainWindow::initialize()
screenChecker->check(); screenChecker->check();
emit sigSetConnect(dataParser->getServerSettings(),workerThread); emit sigSetConnect(dataParser->getServerSettings(),workerThread);
checkAppAvailable(); checkAppAvailable();
//post //post
} }
@@ -112,15 +110,16 @@ void MainWindow::bindConnection()
{ {
connect(timer,&QTimer::timeout,this,&MainWindow::slotDisableNotify); connect(timer,&QTimer::timeout,this,&MainWindow::slotDisableNotify);
connect(this,&MainWindow::sigUpdateFilesOnServer,updateController,&UpdateController::updateFilesOnServer); connect(this,&MainWindow::sigUpdateFilesOnServer,updateController,&UpdateController::updateFilesOnServer,Qt::AutoConnection);
connect(this,&MainWindow::sigInitializeClient,client,&TCPClient::initialize,Qt::AutoConnection); connect(this,&MainWindow::sigInitializeClient,client,&TCPClient::initialize,Qt::AutoConnection);
connect(this,&MainWindow::sigSetConnect,client,&TCPClient::setConnect,Qt::AutoConnection); connect(this,&MainWindow::sigSetConnect,client,&TCPClient::setConnect,Qt::AutoConnection);
connect(this,&MainWindow::sigSendCommand,client,&TCPClient::slotSendCommand,Qt::AutoConnection); connect(this,&MainWindow::sigSendCommand,sendSystem,&SendSystem::sendPacketType,Qt::AutoConnection);
connect(this,&MainWindow::sigSendCheck,sendSystem,&SendSystem::sendCheckHash,Qt::AutoConnection);
connect(this,&MainWindow::sigSendXMLAnswer,sendSystem,&SendSystem::xmlAnswer,Qt::AutoConnection); connect(this,&MainWindow::sigSendXMLAnswer,sendSystem,&SendSystem::xmlAnswer,Qt::AutoConnection);
connect(this,&MainWindow::sigSendAutorization,sendSystem,&SendSystem::sendClientAutorization);
connect(this,&MainWindow::sigGetConnected,client,&TCPClient::getIsConnected); connect(this,&MainWindow::sigGetConnected,client,&TCPClient::getIsConnected);
connect(this,&MainWindow::sigCalculateHash,updateController,&UpdateController::calculateCommonHash); connect(this,&MainWindow::sigCalculateHash,updateController,&UpdateController::calculateCommonHash);
connect(this,&MainWindow::sigSendAutorization,sendSystem,&SendSystem::sendClientAutorization);
} }
void MainWindow::updateProgress() void MainWindow::updateProgress()
@@ -192,7 +191,6 @@ void MainWindow::showServerListWidget(QList<StreamingVersionData *> *serverData)
entryWidget->hide(); entryWidget->hide();
activateLoadingAnimation(false); activateLoadingAnimation(false);
versionSelectWidget->fillView(serverData); versionSelectWidget->fillView(serverData);
checkUpdate();
} }
void MainWindow::lostConnection() void MainWindow::lostConnection()
@@ -282,10 +280,13 @@ void MainWindow::autoStart()
void MainWindow::setTitle() void MainWindow::setTitle()
{ {
ServerSettings *currentSettings = dataParser->getServerSettings(); ServerSettings *currentSettings = dataParser->getServerSettings();
StreamingVersionData *versionData = new StreamingVersionData;
versionData->setName(currentSettings->LocalVersionName);
QString title = tr("Тренажер процедур технического обслуживания самолета RRJ-95NEW-100"); QString title = tr("Тренажер процедур технического обслуживания самолета RRJ-95NEW-100");
title.append(" (" + currentSettings->LocalVersionName + ")"); title.append(" (" + currentSettings->LocalVersionName + ")");
ui->headerLabel->setText(title); ui->headerLabel->setText(title);
versionContainer->setLocalVersionData(versionData);
} }
void MainWindow::loadStaticData() void MainWindow::loadStaticData()
@@ -433,7 +434,7 @@ void MainWindow::loadToServer()
void MainWindow::undoCurrentChanges() void MainWindow::undoCurrentChanges()
{ {
isRecovery = true; isRecovery = true;
emit sigSendCommand("check"); emit sigSendCheck();
commonButtonGroupWidget->showProgressBar(true); commonButtonGroupWidget->showProgressBar(true);
ui->offlineStartButton->setEnabled(false); ui->offlineStartButton->setEnabled(false);
@@ -449,7 +450,7 @@ void MainWindow::undoCurrentChanges()
activateLoadingAnimation(true); activateLoadingAnimation(true);
emit sigSendCommand("update"); emit sigSendCommand(PacketType::TYPE_UPDATE);
commonButtonGroupWidget->startUpdateState(); commonButtonGroupWidget->startUpdateState();
isRecovery = false; isRecovery = false;
@@ -486,7 +487,7 @@ void MainWindow::on_exitButton_clicked()
void MainWindow::checkUpdate() void MainWindow::checkUpdate()
{ {
emit sigSendCommand("check"); emit sigSendCheck();
ui->inlineTextDebug->setText(tr("Проверка обновлений...")); ui->inlineTextDebug->setText(tr("Проверка обновлений..."));
} }

3
mainwindow.h
View File

@@ -73,12 +73,13 @@ signals:
HashComparer* hashComparer, HashComparer* hashComparer,
TCPClient *tcpClient); TCPClient *tcpClient);
void sigSendCommand(QString command); void sigSendCommand(PacketType packetType);
void sigSendXMLAnswer(QString answer); void sigSendXMLAnswer(QString answer);
void sigUpdateFilesOnServer(QList<FileData> *fileSendList); void sigUpdateFilesOnServer(QList<FileData> *fileSendList);
void sigSetConnect(ServerSettings* serverSettings,QThread *thread); void sigSetConnect(ServerSettings* serverSettings,QThread *thread);
void sigCalculateHash(); void sigCalculateHash();
void sigSendAutorization(); void sigSendAutorization();
void sigSendCheck();
bool sigGetConnected(); bool sigGetConnected();

55
style.css
View File

@@ -17,11 +17,6 @@ QListWidget#updateListWidget
color:white; color:white;
} }
QFrame#NewVerBackground
{
background-color:rgba(0,0,0,90%);
}
QLabel#MovieLabel QLabel#MovieLabel
{ {
background-color:rgba(0,0,0,50%); background-color:rgba(0,0,0,50%);
@@ -55,18 +50,20 @@ QPushButton:disabled
QMessageBox QMessageBox
{ {
background-color: white; background-color: rgb(240,240,240);
} }
QMessageBox QLabel QMessageBox QLabel
{ {
font-family: "Calibri"; font: 18px;
font: 20px;
color: black; color: black;
} }
QMessageBox QPushButton QMessageBox QPushButton
{ {
background-color: rgb(225,225,225);
color: black;
border: 1px solid gray;
border-radius: 2px; border-radius: 2px;
padding: 0.2em 0.2em 0.3em 0.2em; padding: 0.2em 0.2em 0.3em 0.2em;
min-width: 70px; min-width: 70px;
@@ -202,4 +199,46 @@ QPushButton#linkButton
color:blue; color:blue;
} }
/* окно новой версии*/
QFrame#NewVerBackground
{
background-color:rgb(240,240,240);
}
QLabel#prevVerTitle
{
color:black;
font:18px;
}
QLabel#prevVerValue
{
color:black;
font:18px;
}
QLabel#newNameVersionTitle
{
color:black;
font:18px;
}
QPushButton#cancelButton
{
background-color: rgb(225,225,225);
color: black;
border: 1px solid gray;
border-radius: 2px;
padding: 0.2em 0.2em 0.3em 0.2em;
min-width: 70px;
}
QPushButton#createButton
{
background-color: rgb(225,225,225);
color: black;
border: 1px solid gray;
border-radius: 2px;
padding: 0.2em 0.2em 0.3em 0.2em;
min-width: 70px;
}

71
ui_newversionwidget.h
View File

@@ -17,6 +17,7 @@
#include <QtWidgets/QLineEdit> #include <QtWidgets/QLineEdit>
#include <QtWidgets/QPushButton> #include <QtWidgets/QPushButton>
#include <QtWidgets/QSpacerItem> #include <QtWidgets/QSpacerItem>
#include <QtWidgets/QVBoxLayout>
#include <QtWidgets/QWidget> #include <QtWidgets/QWidget>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@@ -24,16 +25,15 @@ QT_BEGIN_NAMESPACE
class Ui_NewVersionWidget class Ui_NewVersionWidget
{ {
public: public:
QVBoxLayout *verticalLayout_2;
QFrame *NewVerBackground; QFrame *NewVerBackground;
QWidget *horizontalLayoutWidget; QVBoxLayout *verticalLayout;
QHBoxLayout *baseVerLayout; QHBoxLayout *baseVerLayout;
QLabel *prevVerTitle; QLabel *prevVerTitle;
QLabel *prevVerValue; QLabel *prevVerValue;
QWidget *horizontalLayoutWidget_2;
QHBoxLayout *newNameLayout; QHBoxLayout *newNameLayout;
QLabel *newNameVersionTitle; QLabel *newNameVersionTitle;
QLineEdit *lineEdit; QLineEdit *lineEdit;
QWidget *horizontalLayoutWidget_3;
QHBoxLayout *horizontalLayout; QHBoxLayout *horizontalLayout;
QSpacerItem *horizontalSpacer; QSpacerItem *horizontalSpacer;
QPushButton *createButton; QPushButton *createButton;
@@ -45,7 +45,7 @@ public:
{ {
if (NewVersionWidget->objectName().isEmpty()) if (NewVersionWidget->objectName().isEmpty())
NewVersionWidget->setObjectName(QString::fromUtf8("NewVersionWidget")); NewVersionWidget->setObjectName(QString::fromUtf8("NewVersionWidget"));
NewVersionWidget->resize(310, 152); NewVersionWidget->resize(325, 200);
QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
sizePolicy.setHorizontalStretch(0); sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0); sizePolicy.setVerticalStretch(0);
@@ -53,51 +53,48 @@ public:
NewVersionWidget->setSizePolicy(sizePolicy); NewVersionWidget->setSizePolicy(sizePolicy);
NewVersionWidget->setAutoFillBackground(true); NewVersionWidget->setAutoFillBackground(true);
NewVersionWidget->setStyleSheet(QString::fromUtf8("")); NewVersionWidget->setStyleSheet(QString::fromUtf8(""));
verticalLayout_2 = new QVBoxLayout(NewVersionWidget);
verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2"));
NewVerBackground = new QFrame(NewVersionWidget); NewVerBackground = new QFrame(NewVersionWidget);
NewVerBackground->setObjectName(QString::fromUtf8("NewVerBackground")); NewVerBackground->setObjectName(QString::fromUtf8("NewVerBackground"));
NewVerBackground->setEnabled(true); NewVerBackground->setEnabled(true);
NewVerBackground->setGeometry(QRect(0, 0, 311, 191)); sizePolicy.setHeightForWidth(NewVerBackground->sizePolicy().hasHeightForWidth());
QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Expanding); NewVerBackground->setSizePolicy(sizePolicy);
sizePolicy1.setHorizontalStretch(0);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(NewVerBackground->sizePolicy().hasHeightForWidth());
NewVerBackground->setSizePolicy(sizePolicy1);
NewVerBackground->setFrameShape(QFrame::StyledPanel); NewVerBackground->setFrameShape(QFrame::StyledPanel);
NewVerBackground->setFrameShadow(QFrame::Raised); NewVerBackground->setFrameShadow(QFrame::Raised);
horizontalLayoutWidget = new QWidget(NewVerBackground); verticalLayout = new QVBoxLayout(NewVerBackground);
horizontalLayoutWidget->setObjectName(QString::fromUtf8("horizontalLayoutWidget")); verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
horizontalLayoutWidget->setGeometry(QRect(0, 0, 311, 51)); baseVerLayout = new QHBoxLayout();
baseVerLayout = new QHBoxLayout(horizontalLayoutWidget);
baseVerLayout->setObjectName(QString::fromUtf8("baseVerLayout")); baseVerLayout->setObjectName(QString::fromUtf8("baseVerLayout"));
baseVerLayout->setContentsMargins(5, 5, 5, 5); baseVerLayout->setContentsMargins(5, 5, 5, 5);
prevVerTitle = new QLabel(horizontalLayoutWidget); prevVerTitle = new QLabel(NewVerBackground);
prevVerTitle->setObjectName(QString::fromUtf8("prevVerTitle")); prevVerTitle->setObjectName(QString::fromUtf8("prevVerTitle"));
QSizePolicy sizePolicy2(QSizePolicy::Minimum, QSizePolicy::Minimum); QSizePolicy sizePolicy1(QSizePolicy::Minimum, QSizePolicy::Minimum);
sizePolicy2.setHorizontalStretch(0); sizePolicy1.setHorizontalStretch(0);
sizePolicy2.setVerticalStretch(0); sizePolicy1.setVerticalStretch(0);
sizePolicy2.setHeightForWidth(prevVerTitle->sizePolicy().hasHeightForWidth()); sizePolicy1.setHeightForWidth(prevVerTitle->sizePolicy().hasHeightForWidth());
prevVerTitle->setSizePolicy(sizePolicy2); prevVerTitle->setSizePolicy(sizePolicy1);
baseVerLayout->addWidget(prevVerTitle); baseVerLayout->addWidget(prevVerTitle);
prevVerValue = new QLabel(horizontalLayoutWidget); prevVerValue = new QLabel(NewVerBackground);
prevVerValue->setObjectName(QString::fromUtf8("prevVerValue")); prevVerValue->setObjectName(QString::fromUtf8("prevVerValue"));
baseVerLayout->addWidget(prevVerValue); baseVerLayout->addWidget(prevVerValue);
horizontalLayoutWidget_2 = new QWidget(NewVerBackground);
horizontalLayoutWidget_2->setObjectName(QString::fromUtf8("horizontalLayoutWidget_2")); verticalLayout->addLayout(baseVerLayout);
horizontalLayoutWidget_2->setGeometry(QRect(0, 50, 311, 51));
newNameLayout = new QHBoxLayout(horizontalLayoutWidget_2); newNameLayout = new QHBoxLayout();
newNameLayout->setSpacing(6); newNameLayout->setSpacing(6);
newNameLayout->setObjectName(QString::fromUtf8("newNameLayout")); newNameLayout->setObjectName(QString::fromUtf8("newNameLayout"));
newNameLayout->setContentsMargins(5, 5, 20, 5); newNameLayout->setContentsMargins(5, 5, 20, 5);
newNameVersionTitle = new QLabel(horizontalLayoutWidget_2); newNameVersionTitle = new QLabel(NewVerBackground);
newNameVersionTitle->setObjectName(QString::fromUtf8("newNameVersionTitle")); newNameVersionTitle->setObjectName(QString::fromUtf8("newNameVersionTitle"));
newNameLayout->addWidget(newNameVersionTitle); newNameLayout->addWidget(newNameVersionTitle);
lineEdit = new QLineEdit(horizontalLayoutWidget_2); lineEdit = new QLineEdit(NewVerBackground);
lineEdit->setObjectName(QString::fromUtf8("lineEdit")); lineEdit->setObjectName(QString::fromUtf8("lineEdit"));
sizePolicy.setHeightForWidth(lineEdit->sizePolicy().hasHeightForWidth()); sizePolicy.setHeightForWidth(lineEdit->sizePolicy().hasHeightForWidth());
lineEdit->setSizePolicy(sizePolicy); lineEdit->setSizePolicy(sizePolicy);
@@ -106,17 +103,17 @@ public:
newNameLayout->addWidget(lineEdit); newNameLayout->addWidget(lineEdit);
horizontalLayoutWidget_3 = new QWidget(NewVerBackground);
horizontalLayoutWidget_3->setObjectName(QString::fromUtf8("horizontalLayoutWidget_3")); verticalLayout->addLayout(newNameLayout);
horizontalLayoutWidget_3->setGeometry(QRect(0, 100, 311, 51));
horizontalLayout = new QHBoxLayout(horizontalLayoutWidget_3); horizontalLayout = new QHBoxLayout();
horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
horizontalLayout->setContentsMargins(0, 0, 0, 6); horizontalLayout->setContentsMargins(-1, -1, -1, 6);
horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Minimum, QSizePolicy::Minimum); horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Minimum, QSizePolicy::Minimum);
horizontalLayout->addItem(horizontalSpacer); horizontalLayout->addItem(horizontalSpacer);
createButton = new QPushButton(horizontalLayoutWidget_3); createButton = new QPushButton(NewVerBackground);
createButton->setObjectName(QString::fromUtf8("createButton")); createButton->setObjectName(QString::fromUtf8("createButton"));
sizePolicy.setHeightForWidth(createButton->sizePolicy().hasHeightForWidth()); sizePolicy.setHeightForWidth(createButton->sizePolicy().hasHeightForWidth());
createButton->setSizePolicy(sizePolicy); createButton->setSizePolicy(sizePolicy);
@@ -127,7 +124,7 @@ public:
horizontalLayout->addItem(horizontalSpacer_3); horizontalLayout->addItem(horizontalSpacer_3);
cancelButton = new QPushButton(horizontalLayoutWidget_3); cancelButton = new QPushButton(NewVerBackground);
cancelButton->setObjectName(QString::fromUtf8("cancelButton")); cancelButton->setObjectName(QString::fromUtf8("cancelButton"));
sizePolicy.setHeightForWidth(cancelButton->sizePolicy().hasHeightForWidth()); sizePolicy.setHeightForWidth(cancelButton->sizePolicy().hasHeightForWidth());
cancelButton->setSizePolicy(sizePolicy); cancelButton->setSizePolicy(sizePolicy);
@@ -139,6 +136,12 @@ public:
horizontalLayout->addItem(horizontalSpacer_2); horizontalLayout->addItem(horizontalSpacer_2);
verticalLayout->addLayout(horizontalLayout);
verticalLayout_2->addWidget(NewVerBackground);
retranslateUi(NewVersionWidget); retranslateUi(NewVersionWidget);
QMetaObject::connectSlotsByName(NewVersionWidget); QMetaObject::connectSlotsByName(NewVersionWidget);