mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJClient.git
synced 2026-03-28 05:25:39 +03:00
feat: loading base version
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
#include "UpdateController.h"
|
||||
|
||||
#include <QDialogButtonBox>
|
||||
|
||||
UpdateController::UpdateController(DataParser *parser,SendSystem *sendSystem, QObject *parent) :
|
||||
@@ -26,6 +25,11 @@ void UpdateController::calculateStreamingHash()
|
||||
dataParser->createFileDataList(appDataList,streamingHashFilename);
|
||||
}
|
||||
|
||||
void UpdateController::setServerVersion(StreamingVersionData *version)
|
||||
{
|
||||
serverVersion = version;
|
||||
}
|
||||
|
||||
QList<FileData> UpdateController::calculateHash(QString path)
|
||||
{
|
||||
qDebug() << "Try calculate";
|
||||
@@ -122,6 +126,11 @@ void UpdateController::updateFilesOnServer(QList<FileData> *fileSendList){
|
||||
|
||||
}
|
||||
|
||||
StreamingVersionData *UpdateController::getServerVersion() const
|
||||
{
|
||||
return serverVersion;
|
||||
}
|
||||
|
||||
|
||||
UpdateController::~UpdateController()
|
||||
{
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
#include "Core\FileData.h"
|
||||
#include "Core\dataparser.h"
|
||||
#include "Core\tcpclient.h"
|
||||
#include "streamingversiondata.h"
|
||||
#include <QXmlStreamWriter>
|
||||
#include <QXmlStreamReader>
|
||||
#include <QXmlStreamAttribute>
|
||||
@@ -29,10 +30,13 @@ public:
|
||||
|
||||
void calculateCommonHash();
|
||||
void calculateStreamingHash();
|
||||
void setServerVersion(StreamingVersionData *version);
|
||||
~UpdateController();
|
||||
|
||||
void updateFilesOnServer(QList<FileData> *fileSendList);
|
||||
|
||||
StreamingVersionData *getServerVersion() const;
|
||||
|
||||
signals:
|
||||
void sigUpdateComplete(bool flag);
|
||||
private:
|
||||
@@ -41,6 +45,7 @@ private:
|
||||
QString applicationFolderPath;
|
||||
QList<FileData> appDataList;
|
||||
QList<FileData> streamingDataList;
|
||||
StreamingVersionData *serverVersion;
|
||||
|
||||
QList<FileData> calculateHash(QString path);
|
||||
};
|
||||
|
||||
@@ -13,14 +13,6 @@ DataParser::DataParser(QObject *parent) :
|
||||
}
|
||||
}
|
||||
|
||||
QByteArray DataParser::slotGetXmlAnswer(QString answerCode)
|
||||
{
|
||||
if(answerCode == "END"){
|
||||
return xmlAnswer_notify(answerCode);
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void DataParser::createFileDataList(QList<FileData> fileDataList,QString filename)
|
||||
{
|
||||
|
||||
|
||||
@@ -23,13 +23,12 @@ public:
|
||||
void createAuthMessage(ClientAutorization *auth);
|
||||
void createAuthData(ServerAuthorization *serverAuth);
|
||||
void createAuthDataOffline(QString username,QString pass);
|
||||
void addRunData(QList<int> displays);
|
||||
QByteArray xmlAnswer_notify(QString code);
|
||||
void addRunData(QList<int> displays);
|
||||
QByteArray xmlAnswer(QList<SXmlAnswerTag> listTag, QString elemUp1 = "", QString elemUp2 = "");
|
||||
|
||||
QList<FileData>* xmlFileDataParse(QByteArray array,QString filter);
|
||||
|
||||
public slots:
|
||||
QByteArray slotGetXmlAnswer(QString);
|
||||
QByteArray xmlAnswer_notify(QString code);
|
||||
|
||||
|
||||
private:
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
#include "Core/recognizesystem.h"
|
||||
|
||||
#include "streamingversiondata.h"
|
||||
|
||||
#include <updatenotifywidget.h>
|
||||
|
||||
RecognizeSystem::RecognizeSystem(QObject *parent):
|
||||
@@ -80,7 +82,7 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
|
||||
continue;
|
||||
}
|
||||
|
||||
filePath = Tools::createFullPath(filePath);
|
||||
filePath = Tools::createReceiveFullPath(filePath,updateController->getServerVersion());
|
||||
|
||||
QDir dir(filePath);
|
||||
if(!dir.exists()){
|
||||
@@ -115,7 +117,7 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
|
||||
|
||||
}
|
||||
|
||||
filePath = Tools::createFullPath(filePath);
|
||||
filePath = Tools::createReceiveFullPath(filePath,updateController->getServerVersion());
|
||||
|
||||
emit sigSendDebugLog("CLIENT: filesize: " + QString::number(fileSize));
|
||||
emit sigSendDebugLog("CLIENT: filePath: " + filePath);
|
||||
@@ -198,7 +200,7 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
|
||||
continue;
|
||||
}
|
||||
|
||||
filePath = Tools::createFullPath(filePath);
|
||||
filePath = Tools::createReceiveFullPath(filePath,updateController->getServerVersion());
|
||||
|
||||
QFileInfo fileInfo(filePath);
|
||||
|
||||
@@ -337,6 +339,28 @@ void RecognizeSystem::xmlParser(QByteArray array)
|
||||
emit sigSaveLoginData(serverAuth);
|
||||
}
|
||||
|
||||
if(xmlReader.name() == "VersionData")
|
||||
{
|
||||
StreamingVersionData *serverVersion = new StreamingVersionData;
|
||||
foreach(const QXmlStreamAttribute &attr,xmlReader.attributes())
|
||||
{
|
||||
QString name = attr.name().toString();
|
||||
QString value = attr.value().toString();
|
||||
|
||||
if(name == "Version")
|
||||
{
|
||||
serverVersion->setName(value);
|
||||
}
|
||||
|
||||
if(name == "Created")
|
||||
{
|
||||
serverVersion->setCreateData(QDateTime::fromString(value));
|
||||
}
|
||||
|
||||
}
|
||||
updateController->setServerVersion(serverVersion);
|
||||
}
|
||||
|
||||
xmlReader.readNext();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,19 +12,24 @@ SendSystem::SendSystem(QObject *)
|
||||
|
||||
}
|
||||
|
||||
void SendSystem::initialize(MainWindow *mainWindow,DataParser *dataParser)
|
||||
{
|
||||
connect(this,&SendSystem::sigSend,mainWindow,&MainWindow::updateProgress);
|
||||
connect(this,&SendSystem::sigGetXmlAnswer,dataParser,&DataParser::xmlAnswer_notify,Qt::DirectConnection); //МОЖЕТ ДАТУ ПАРСЕР В ВТОРОСТЕПЕННЫЙ ПОТОК?
|
||||
}
|
||||
|
||||
void SendSystem::setSocket(QTcpSocket *socket)
|
||||
{
|
||||
this->socket = socket;
|
||||
}
|
||||
|
||||
|
||||
void SendSystem:: sendDisable()
|
||||
void SendSystem::xmlAnswer(QString message)
|
||||
{
|
||||
QDataStream stream(socket);
|
||||
stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
|
||||
|
||||
QByteArray data;
|
||||
data = emit sigGetXmlAnswer("DISABLE");
|
||||
data = emit sigGetXmlAnswer(message);
|
||||
|
||||
stream << PacketType::TYPE_XMLANSWER;
|
||||
stream << data;
|
||||
@@ -52,7 +57,7 @@ void SendSystem::sendFileBlock(QString path)
|
||||
{
|
||||
QDataStream stream(socket);
|
||||
stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
|
||||
QString fullPath = Tools::createFullPath(path);
|
||||
QString fullPath = Tools::createSendFullPath(path);
|
||||
quint64 fileSize = 0;
|
||||
int countSend = 0;
|
||||
|
||||
|
||||
@@ -4,12 +4,17 @@
|
||||
#include <QObject>
|
||||
#include <QTcpSocket>
|
||||
#include <QDataStream>
|
||||
#include <mainwindow.h>
|
||||
|
||||
class MainWindow;
|
||||
class DataParser;
|
||||
|
||||
class SendSystem :public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit SendSystem(QObject* parent = nullptr);
|
||||
void initialize(MainWindow *mainWindow,DataParser *dataParser);
|
||||
void setSocket(QTcpSocket *socket);
|
||||
void sendClientAutorization();
|
||||
void sendDisable();
|
||||
@@ -17,14 +22,19 @@ public:
|
||||
void sendFolderBlock(QString path);
|
||||
void sendQTConnect();
|
||||
void sendXMLAnswer(QByteArray array);
|
||||
~SendSystem();
|
||||
void sendFinish();
|
||||
|
||||
~SendSystem();
|
||||
|
||||
signals:
|
||||
void sigSend();
|
||||
QByteArray sigGetXmlAnswer(QString);
|
||||
|
||||
public slots:
|
||||
void xmlAnswer(QString message);
|
||||
private:
|
||||
QTcpSocket *socket;
|
||||
|
||||
};
|
||||
|
||||
#endif // SENDSYSTEM_H
|
||||
|
||||
60
Core/streamingversiondata.h
Normal file
60
Core/streamingversiondata.h
Normal file
@@ -0,0 +1,60 @@
|
||||
#ifndef STREAMINGVERSIONDATA_H
|
||||
#define STREAMINGVERSIONDATA_H
|
||||
|
||||
#include <QObject>
|
||||
#include <qdatetime.h>
|
||||
|
||||
class StreamingVersionData
|
||||
{
|
||||
public:
|
||||
|
||||
StreamingVersionData(){}
|
||||
|
||||
StreamingVersionData(QString absoltePath,QString viewName,QDateTime data,qint32 size)
|
||||
{
|
||||
this->absolutePath = absoltePath;
|
||||
this->viewName = viewName;
|
||||
this->createData = data;
|
||||
this->size = size;
|
||||
}
|
||||
|
||||
void setName(QString viewName)
|
||||
{
|
||||
this->viewName = viewName;
|
||||
}
|
||||
|
||||
void setCreateData(QDateTime data)
|
||||
{
|
||||
this->createData = data;
|
||||
}
|
||||
|
||||
~StreamingVersionData();
|
||||
|
||||
QString getAbsolutPath() const
|
||||
{
|
||||
return absolutePath;
|
||||
}
|
||||
|
||||
QString getViewName() const
|
||||
{
|
||||
return viewName;
|
||||
}
|
||||
|
||||
QDateTime getCreateData() const
|
||||
{
|
||||
return createData;
|
||||
}
|
||||
|
||||
qint32 getSize() const
|
||||
{
|
||||
return size;
|
||||
}
|
||||
|
||||
private:
|
||||
QString absolutePath;
|
||||
QString viewName;
|
||||
QDateTime createData;
|
||||
qint32 size;
|
||||
};
|
||||
|
||||
#endif // STREAMINGVERSIONDATA_H
|
||||
@@ -24,7 +24,31 @@ QString Tools::createLocalPath(QString path)
|
||||
return localPath;
|
||||
}
|
||||
|
||||
QString Tools::createFullPath(QString path)
|
||||
QString Tools::createReceiveFullPath(QString path, StreamingVersionData *version)
|
||||
{
|
||||
QString fullPath;
|
||||
QString localPath;
|
||||
qint8 pos = path.indexOf("Application");
|
||||
|
||||
if(pos == -1)
|
||||
{
|
||||
pos = path.indexOf(version->getViewName());
|
||||
localPath = path.remove(0,pos + version->getViewName().length());
|
||||
localPath.prepend(streamingAssetsPath);
|
||||
}
|
||||
else
|
||||
{
|
||||
localPath = path.remove(0,--pos);
|
||||
}
|
||||
|
||||
fullPath = QDir::currentPath() + localPath;
|
||||
qDebug() << "CLIENT: localPath" << localPath;
|
||||
|
||||
|
||||
return fullPath;
|
||||
}
|
||||
|
||||
QString Tools::createSendFullPath(QString path)
|
||||
{
|
||||
QString fullPath;
|
||||
qint8 pos = path.indexOf("Application");
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
#ifndef GLOBAL_H
|
||||
#define GLOBAL_H
|
||||
|
||||
#include "streamingversiondata.h"
|
||||
|
||||
#include <QString>
|
||||
#include <QTime>
|
||||
#include <QDebug>
|
||||
@@ -39,7 +41,8 @@ public:
|
||||
static void printTime();
|
||||
static QString getTime();
|
||||
static QString createLocalPath(QString path);
|
||||
static QString createFullPath(QString path);
|
||||
static QString createSendFullPath(QString path);
|
||||
static QString createReceiveFullPath(QString path,StreamingVersionData *version);
|
||||
static QString convertFileSize(quint64 fileSize);
|
||||
};
|
||||
|
||||
|
||||
628
Makefile.Debug
628
Makefile.Debug
File diff suppressed because one or more lines are too long
628
Makefile.Release
628
Makefile.Release
File diff suppressed because one or more lines are too long
@@ -33,9 +33,11 @@ SOURCES += \
|
||||
mainwindow.cpp \
|
||||
mywinheader.cpp \
|
||||
updatenotifywidget.cpp \
|
||||
updatewidget.cpp
|
||||
updatewidget.cpp \
|
||||
versionselectwidget.cpp
|
||||
|
||||
HEADERS += \
|
||||
Core/streamingversiondata.h \
|
||||
Core\sendsystem.h \
|
||||
Core\updatecontroller.h \
|
||||
Core\externalexecuter.h\
|
||||
@@ -53,7 +55,8 @@ HEADERS += \
|
||||
mainwindow.h \
|
||||
mywinheader.h \
|
||||
updatenotifywidget.h \
|
||||
updatewidget.h
|
||||
updatewidget.h \
|
||||
versionselectwidget.h
|
||||
|
||||
FORMS += \
|
||||
commonbuttongroupwidget.ui \
|
||||
@@ -61,7 +64,8 @@ FORMS += \
|
||||
instructorbuttongroupwidget.ui \
|
||||
mainwindow.ui \
|
||||
updatenotifywidget.ui \
|
||||
updatewidget.ui
|
||||
updatewidget.ui \
|
||||
versionselectwidget.ui
|
||||
|
||||
TRANSLATIONS = QtLanguage_ru.ts\
|
||||
QtLanguage_eng.ts
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE QtCreatorProject>
|
||||
<!-- Written by QtCreator 4.11.1, 2024-12-11T18:01:56. -->
|
||||
<!-- Written by QtCreator 4.11.1, 2024-12-16T14:16:13. -->
|
||||
<qtcreator>
|
||||
<data>
|
||||
<variable>EnvironmentId</variable>
|
||||
|
||||
@@ -181,17 +181,6 @@
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/sharedassets0.assets" Hash="1007009da1bc4721385a45b38f143ea3"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/sharedassets0.assets.resS" Hash="897317a657f377346d8932827dc78da0"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets" Hash="FOLDER"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file11344.txt" Hash="9f7174f98807a71deb168a9f6ff9f8a5"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file1523.txt" Hash="c6539e337bc0a1b532aa5ebdd54601b4"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file3739.txt" Hash="5b394e767fe8a939456f9fe321a2d60a"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file4252.txt" Hash="d4f6e252dffe2762065e815dd7cac0d3"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file8872.txt" Hash="83b72ec0248dd9fa32c8c3d30ddc6e9f"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Folder10682" Hash="FOLDER"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Folder11107" Hash="FOLDER"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Folder11965" Hash="FOLDER"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Folder6451" Hash="FOLDER"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Folder879" Hash="FOLDER"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Folder9826" Hash="FOLDER"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100" Hash="FOLDER"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100/docs.xml" Hash="fcad1626c1ef3851931bf68a1aa054c6"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS" Hash="FOLDER"/>
|
||||
|
||||
@@ -33,6 +33,8 @@
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Folder6451" Hash="FOLDER"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Folder879" Hash="FOLDER"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Folder9826" Hash="FOLDER"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Folder11107" Hash="FOLDER"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Folder11965" Hash="FOLDER"/>
|
||||
<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/MonoPosixHelper.dll" Hash="2734ad3f554d1b95d7b04766260175e5"/>
|
||||
@@ -190,6 +192,8 @@
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/ScriptingAssemblies.json" Hash="bc1156dee1f08ecf1afb66a3cbd653a9"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/sharedassets0.assets" Hash="1007009da1bc4721385a45b38f143ea3"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/sharedassets0.assets.resS" Hash="897317a657f377346d8932827dc78da0"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file11344.txt" Hash="9f7174f98807a71deb168a9f6ff9f8a5"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file1523.txt" Hash="c6539e337bc0a1b532aa5ebdd54601b4"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file3739.txt" Hash="5b394e767fe8a939456f9fe321a2d60a"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file4252.txt" Hash="d4f6e252dffe2762065e815dd7cac0d3"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file8872.txt" Hash="83b72ec0248dd9fa32c8c3d30ddc6e9f"/>
|
||||
|
||||
@@ -181,17 +181,6 @@
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/sharedassets0.assets" Hash="1007009da1bc4721385a45b38f143ea3"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/sharedassets0.assets.resS" Hash="897317a657f377346d8932827dc78da0"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets" Hash="FOLDER"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file11344.txt" Hash="9f7174f98807a71deb168a9f6ff9f8a5"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file1523.txt" Hash="c6539e337bc0a1b532aa5ebdd54601b4"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file3739.txt" Hash="5b394e767fe8a939456f9fe321a2d60a"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file4252.txt" Hash="d4f6e252dffe2762065e815dd7cac0d3"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file8872.txt" Hash="83b72ec0248dd9fa32c8c3d30ddc6e9f"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Folder10682" Hash="FOLDER"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Folder11107" Hash="FOLDER"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Folder11965" Hash="FOLDER"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Folder6451" Hash="FOLDER"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Folder879" Hash="FOLDER"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Folder9826" Hash="FOLDER"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100" Hash="FOLDER"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100/docs.xml" Hash="fcad1626c1ef3851931bf68a1aa054c6"/>
|
||||
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS" Hash="FOLDER"/>
|
||||
|
||||
@@ -20,6 +20,7 @@ void CommonButtonGroupWidget::initialize(ExternalExecuter *extExec,SendSystem *s
|
||||
ui->startButton->setEnabled(false);
|
||||
|
||||
connect(this,&CommonButtonGroupWidget::sigSendCommand,client,&TCPClient::slotSendCommand,Qt::AutoConnection);
|
||||
connect(this,&CommonButtonGroupWidget::sigSendXMLAnswer,sendSystem,&SendSystem::xmlAnswer,Qt::DirectConnection);
|
||||
}
|
||||
|
||||
void CommonButtonGroupWidget::updateProgressBar(float value)
|
||||
@@ -38,6 +39,7 @@ void CommonButtonGroupWidget::loadCompleteState()
|
||||
|
||||
void CommonButtonGroupWidget::lastVerInstalledState()
|
||||
{
|
||||
show();
|
||||
ui->loadingProgressBar->hide();
|
||||
ui->startButton->show();
|
||||
}
|
||||
@@ -86,7 +88,7 @@ void CommonButtonGroupWidget::on_updateButton_clicked()
|
||||
void CommonButtonGroupWidget::on_startButton_clicked()
|
||||
{
|
||||
externalExecuter->callApp();
|
||||
sendSystem->sendDisable();
|
||||
emit sigSendXMLAnswer("DISABLE");
|
||||
}
|
||||
|
||||
CommonButtonGroupWidget::~CommonButtonGroupWidget()
|
||||
|
||||
@@ -31,6 +31,7 @@ public:
|
||||
|
||||
signals:
|
||||
void sigSendCommand(QString command);
|
||||
void sigSendXMLAnswer(QString answer);
|
||||
|
||||
private slots:
|
||||
void on_updateButton_clicked();
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
debug/main.o
BIN
debug/main.o
Binary file not shown.
Binary file not shown.
@@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE
|
||||
QT_WARNING_PUSH
|
||||
QT_WARNING_DISABLE_DEPRECATED
|
||||
struct qt_meta_stringdata_CommonButtonGroupWidget_t {
|
||||
QByteArrayData data[6];
|
||||
char stringdata0[95];
|
||||
QByteArrayData data[8];
|
||||
char stringdata0[119];
|
||||
};
|
||||
#define QT_MOC_LITERAL(idx, ofs, len) \
|
||||
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
|
||||
@@ -36,13 +36,15 @@ QT_MOC_LITERAL(0, 0, 23), // "CommonButtonGroupWidget"
|
||||
QT_MOC_LITERAL(1, 24, 14), // "sigSendCommand"
|
||||
QT_MOC_LITERAL(2, 39, 0), // ""
|
||||
QT_MOC_LITERAL(3, 40, 7), // "command"
|
||||
QT_MOC_LITERAL(4, 48, 23), // "on_updateButton_clicked"
|
||||
QT_MOC_LITERAL(5, 72, 22) // "on_startButton_clicked"
|
||||
QT_MOC_LITERAL(4, 48, 16), // "sigSendXMLAnswer"
|
||||
QT_MOC_LITERAL(5, 65, 6), // "answer"
|
||||
QT_MOC_LITERAL(6, 72, 23), // "on_updateButton_clicked"
|
||||
QT_MOC_LITERAL(7, 96, 22) // "on_startButton_clicked"
|
||||
|
||||
},
|
||||
"CommonButtonGroupWidget\0sigSendCommand\0"
|
||||
"\0command\0on_updateButton_clicked\0"
|
||||
"on_startButton_clicked"
|
||||
"\0command\0sigSendXMLAnswer\0answer\0"
|
||||
"on_updateButton_clicked\0on_startButton_clicked"
|
||||
};
|
||||
#undef QT_MOC_LITERAL
|
||||
|
||||
@@ -52,22 +54,24 @@ static const uint qt_meta_data_CommonButtonGroupWidget[] = {
|
||||
8, // revision
|
||||
0, // classname
|
||||
0, 0, // classinfo
|
||||
3, 14, // methods
|
||||
4, 14, // methods
|
||||
0, 0, // properties
|
||||
0, 0, // enums/sets
|
||||
0, 0, // constructors
|
||||
0, // flags
|
||||
1, // signalCount
|
||||
2, // signalCount
|
||||
|
||||
// signals: name, argc, parameters, tag, flags
|
||||
1, 1, 29, 2, 0x06 /* Public */,
|
||||
1, 1, 34, 2, 0x06 /* Public */,
|
||||
4, 1, 37, 2, 0x06 /* Public */,
|
||||
|
||||
// slots: name, argc, parameters, tag, flags
|
||||
4, 0, 32, 2, 0x08 /* Private */,
|
||||
5, 0, 33, 2, 0x08 /* Private */,
|
||||
6, 0, 40, 2, 0x08 /* Private */,
|
||||
7, 0, 41, 2, 0x08 /* Private */,
|
||||
|
||||
// signals: parameters
|
||||
QMetaType::Void, QMetaType::QString, 3,
|
||||
QMetaType::Void, QMetaType::QString, 5,
|
||||
|
||||
// slots: parameters
|
||||
QMetaType::Void,
|
||||
@@ -83,8 +87,9 @@ void CommonButtonGroupWidget::qt_static_metacall(QObject *_o, QMetaObject::Call
|
||||
Q_UNUSED(_t)
|
||||
switch (_id) {
|
||||
case 0: _t->sigSendCommand((*reinterpret_cast< QString(*)>(_a[1]))); break;
|
||||
case 1: _t->on_updateButton_clicked(); break;
|
||||
case 2: _t->on_startButton_clicked(); break;
|
||||
case 1: _t->sigSendXMLAnswer((*reinterpret_cast< QString(*)>(_a[1]))); break;
|
||||
case 2: _t->on_updateButton_clicked(); break;
|
||||
case 3: _t->on_startButton_clicked(); break;
|
||||
default: ;
|
||||
}
|
||||
} else if (_c == QMetaObject::IndexOfMethod) {
|
||||
@@ -96,6 +101,13 @@ void CommonButtonGroupWidget::qt_static_metacall(QObject *_o, QMetaObject::Call
|
||||
return;
|
||||
}
|
||||
}
|
||||
{
|
||||
using _t = void (CommonButtonGroupWidget::*)(QString );
|
||||
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&CommonButtonGroupWidget::sigSendXMLAnswer)) {
|
||||
*result = 1;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -128,13 +140,13 @@ int CommonButtonGroupWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_
|
||||
if (_id < 0)
|
||||
return _id;
|
||||
if (_c == QMetaObject::InvokeMetaMethod) {
|
||||
if (_id < 3)
|
||||
if (_id < 4)
|
||||
qt_static_metacall(this, _c, _id, _a);
|
||||
_id -= 3;
|
||||
_id -= 4;
|
||||
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
|
||||
if (_id < 3)
|
||||
if (_id < 4)
|
||||
*reinterpret_cast<int*>(_a[0]) = -1;
|
||||
_id -= 3;
|
||||
_id -= 4;
|
||||
}
|
||||
return _id;
|
||||
}
|
||||
@@ -145,5 +157,12 @@ void CommonButtonGroupWidget::sigSendCommand(QString _t1)
|
||||
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) };
|
||||
QMetaObject::activate(this, &staticMetaObject, 0, _a);
|
||||
}
|
||||
|
||||
// SIGNAL 1
|
||||
void CommonButtonGroupWidget::sigSendXMLAnswer(QString _t1)
|
||||
{
|
||||
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) };
|
||||
QMetaObject::activate(this, &staticMetaObject, 1, _a);
|
||||
}
|
||||
QT_WARNING_POP
|
||||
QT_END_MOC_NAMESPACE
|
||||
|
||||
Binary file not shown.
@@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE
|
||||
QT_WARNING_PUSH
|
||||
QT_WARNING_DISABLE_DEPRECATED
|
||||
struct qt_meta_stringdata_DataParser_t {
|
||||
QByteArrayData data[3];
|
||||
char stringdata0[29];
|
||||
QByteArrayData data[4];
|
||||
char stringdata0[34];
|
||||
};
|
||||
#define QT_MOC_LITERAL(idx, ofs, len) \
|
||||
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
|
||||
@@ -33,11 +33,12 @@ struct qt_meta_stringdata_DataParser_t {
|
||||
static const qt_meta_stringdata_DataParser_t qt_meta_stringdata_DataParser = {
|
||||
{
|
||||
QT_MOC_LITERAL(0, 0, 10), // "DataParser"
|
||||
QT_MOC_LITERAL(1, 11, 16), // "slotGetXmlAnswer"
|
||||
QT_MOC_LITERAL(2, 28, 0) // ""
|
||||
QT_MOC_LITERAL(1, 11, 16), // "xmlAnswer_notify"
|
||||
QT_MOC_LITERAL(2, 28, 0), // ""
|
||||
QT_MOC_LITERAL(3, 29, 4) // "code"
|
||||
|
||||
},
|
||||
"DataParser\0slotGetXmlAnswer\0"
|
||||
"DataParser\0xmlAnswer_notify\0\0code"
|
||||
};
|
||||
#undef QT_MOC_LITERAL
|
||||
|
||||
@@ -58,7 +59,7 @@ static const uint qt_meta_data_DataParser[] = {
|
||||
1, 1, 19, 2, 0x0a /* Public */,
|
||||
|
||||
// slots: parameters
|
||||
QMetaType::QByteArray, QMetaType::QString, 2,
|
||||
QMetaType::QByteArray, QMetaType::QString, 3,
|
||||
|
||||
0 // eod
|
||||
};
|
||||
@@ -69,7 +70,7 @@ void DataParser::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
|
||||
auto *_t = static_cast<DataParser *>(_o);
|
||||
Q_UNUSED(_t)
|
||||
switch (_id) {
|
||||
case 0: { QByteArray _r = _t->slotGetXmlAnswer((*reinterpret_cast< QString(*)>(_a[1])));
|
||||
case 0: { QByteArray _r = _t->xmlAnswer_notify((*reinterpret_cast< QString(*)>(_a[1])));
|
||||
if (_a[0]) *reinterpret_cast< QByteArray*>(_a[0]) = std::move(_r); } break;
|
||||
default: ;
|
||||
}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -23,8 +23,8 @@ QT_BEGIN_MOC_NAMESPACE
|
||||
QT_WARNING_PUSH
|
||||
QT_WARNING_DISABLE_DEPRECATED
|
||||
struct qt_meta_stringdata_MainWindow_t {
|
||||
QByteArrayData data[43];
|
||||
char stringdata0[668];
|
||||
QByteArrayData data[45];
|
||||
char stringdata0[692];
|
||||
};
|
||||
#define QT_MOC_LITERAL(idx, ofs, len) \
|
||||
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
|
||||
@@ -46,43 +46,46 @@ QT_MOC_LITERAL(9, 123, 8), // "QThread*"
|
||||
QT_MOC_LITERAL(10, 132, 6), // "thread"
|
||||
QT_MOC_LITERAL(11, 139, 14), // "sigSendCommand"
|
||||
QT_MOC_LITERAL(12, 154, 7), // "command"
|
||||
QT_MOC_LITERAL(13, 162, 22), // "sigUpdateFilesOnServer"
|
||||
QT_MOC_LITERAL(14, 185, 16), // "QList<FileData>*"
|
||||
QT_MOC_LITERAL(15, 202, 12), // "fileSendList"
|
||||
QT_MOC_LITERAL(16, 215, 13), // "sigSetConnect"
|
||||
QT_MOC_LITERAL(17, 229, 15), // "ServerSettings*"
|
||||
QT_MOC_LITERAL(18, 245, 14), // "serverSettings"
|
||||
QT_MOC_LITERAL(19, 260, 16), // "sigCalculateHash"
|
||||
QT_MOC_LITERAL(20, 277, 19), // "sigSendAutorization"
|
||||
QT_MOC_LITERAL(21, 297, 15), // "sigGetConnected"
|
||||
QT_MOC_LITERAL(22, 313, 14), // "updateProgress"
|
||||
QT_MOC_LITERAL(23, 328, 12), // "loadComplete"
|
||||
QT_MOC_LITERAL(24, 341, 14), // "lostConnection"
|
||||
QT_MOC_LITERAL(25, 356, 13), // "serverBlocked"
|
||||
QT_MOC_LITERAL(26, 370, 16), // "checkLoginResult"
|
||||
QT_MOC_LITERAL(27, 387, 20), // "ServerAuthorization*"
|
||||
QT_MOC_LITERAL(28, 408, 10), // "serverAuth"
|
||||
QT_MOC_LITERAL(29, 419, 13), // "setNeedUpdate"
|
||||
QT_MOC_LITERAL(30, 433, 4), // "flag"
|
||||
QT_MOC_LITERAL(31, 438, 4), // "size"
|
||||
QT_MOC_LITERAL(32, 443, 9), // "fileCount"
|
||||
QT_MOC_LITERAL(33, 453, 25), // "on_settingsButton_clicked"
|
||||
QT_MOC_LITERAL(34, 479, 29), // "on_languageComboBox_activated"
|
||||
QT_MOC_LITERAL(35, 509, 4), // "arg1"
|
||||
QT_MOC_LITERAL(36, 514, 17), // "slotDisableNotify"
|
||||
QT_MOC_LITERAL(37, 532, 19), // "slotConnectionState"
|
||||
QT_MOC_LITERAL(38, 552, 20), // "slotServerDisconnect"
|
||||
QT_MOC_LITERAL(39, 573, 37), // "on_updateListGuideLabel_linkA..."
|
||||
QT_MOC_LITERAL(40, 611, 4), // "link"
|
||||
QT_MOC_LITERAL(41, 616, 21), // "on_exitButton_clicked"
|
||||
QT_MOC_LITERAL(42, 638, 29) // "on_offlineStartButton_clicked"
|
||||
QT_MOC_LITERAL(13, 162, 16), // "sigSendXMLAnswer"
|
||||
QT_MOC_LITERAL(14, 179, 6), // "answer"
|
||||
QT_MOC_LITERAL(15, 186, 22), // "sigUpdateFilesOnServer"
|
||||
QT_MOC_LITERAL(16, 209, 16), // "QList<FileData>*"
|
||||
QT_MOC_LITERAL(17, 226, 12), // "fileSendList"
|
||||
QT_MOC_LITERAL(18, 239, 13), // "sigSetConnect"
|
||||
QT_MOC_LITERAL(19, 253, 15), // "ServerSettings*"
|
||||
QT_MOC_LITERAL(20, 269, 14), // "serverSettings"
|
||||
QT_MOC_LITERAL(21, 284, 16), // "sigCalculateHash"
|
||||
QT_MOC_LITERAL(22, 301, 19), // "sigSendAutorization"
|
||||
QT_MOC_LITERAL(23, 321, 15), // "sigGetConnected"
|
||||
QT_MOC_LITERAL(24, 337, 14), // "updateProgress"
|
||||
QT_MOC_LITERAL(25, 352, 12), // "loadComplete"
|
||||
QT_MOC_LITERAL(26, 365, 14), // "lostConnection"
|
||||
QT_MOC_LITERAL(27, 380, 13), // "serverBlocked"
|
||||
QT_MOC_LITERAL(28, 394, 16), // "checkLoginResult"
|
||||
QT_MOC_LITERAL(29, 411, 20), // "ServerAuthorization*"
|
||||
QT_MOC_LITERAL(30, 432, 10), // "serverAuth"
|
||||
QT_MOC_LITERAL(31, 443, 13), // "setNeedUpdate"
|
||||
QT_MOC_LITERAL(32, 457, 4), // "flag"
|
||||
QT_MOC_LITERAL(33, 462, 4), // "size"
|
||||
QT_MOC_LITERAL(34, 467, 9), // "fileCount"
|
||||
QT_MOC_LITERAL(35, 477, 25), // "on_settingsButton_clicked"
|
||||
QT_MOC_LITERAL(36, 503, 29), // "on_languageComboBox_activated"
|
||||
QT_MOC_LITERAL(37, 533, 4), // "arg1"
|
||||
QT_MOC_LITERAL(38, 538, 17), // "slotDisableNotify"
|
||||
QT_MOC_LITERAL(39, 556, 19), // "slotConnectionState"
|
||||
QT_MOC_LITERAL(40, 576, 20), // "slotServerDisconnect"
|
||||
QT_MOC_LITERAL(41, 597, 37), // "on_updateListGuideLabel_linkA..."
|
||||
QT_MOC_LITERAL(42, 635, 4), // "link"
|
||||
QT_MOC_LITERAL(43, 640, 21), // "on_exitButton_clicked"
|
||||
QT_MOC_LITERAL(44, 662, 29) // "on_offlineStartButton_clicked"
|
||||
|
||||
},
|
||||
"MainWindow\0sigInitializeClient\0\0"
|
||||
"RecognizeSystem*\0recognizeSystem\0"
|
||||
"ExternalExecuter*\0externalExecuter\0"
|
||||
"SendSystem*\0sendSystem\0QThread*\0thread\0"
|
||||
"sigSendCommand\0command\0sigUpdateFilesOnServer\0"
|
||||
"sigSendCommand\0command\0sigSendXMLAnswer\0"
|
||||
"answer\0sigUpdateFilesOnServer\0"
|
||||
"QList<FileData>*\0fileSendList\0"
|
||||
"sigSetConnect\0ServerSettings*\0"
|
||||
"serverSettings\0sigCalculateHash\0"
|
||||
@@ -107,43 +110,45 @@ static const uint qt_meta_data_MainWindow[] = {
|
||||
8, // revision
|
||||
0, // classname
|
||||
0, 0, // classinfo
|
||||
21, 14, // methods
|
||||
22, 14, // methods
|
||||
0, 0, // properties
|
||||
0, 0, // enums/sets
|
||||
0, 0, // constructors
|
||||
0, // flags
|
||||
7, // signalCount
|
||||
8, // signalCount
|
||||
|
||||
// signals: name, argc, parameters, tag, flags
|
||||
1, 4, 119, 2, 0x06 /* Public */,
|
||||
11, 1, 128, 2, 0x06 /* Public */,
|
||||
13, 1, 131, 2, 0x06 /* Public */,
|
||||
16, 2, 134, 2, 0x06 /* Public */,
|
||||
19, 0, 139, 2, 0x06 /* Public */,
|
||||
20, 0, 140, 2, 0x06 /* Public */,
|
||||
21, 0, 141, 2, 0x06 /* Public */,
|
||||
1, 4, 124, 2, 0x06 /* Public */,
|
||||
11, 1, 133, 2, 0x06 /* Public */,
|
||||
13, 1, 136, 2, 0x06 /* Public */,
|
||||
15, 1, 139, 2, 0x06 /* Public */,
|
||||
18, 2, 142, 2, 0x06 /* Public */,
|
||||
21, 0, 147, 2, 0x06 /* Public */,
|
||||
22, 0, 148, 2, 0x06 /* Public */,
|
||||
23, 0, 149, 2, 0x06 /* Public */,
|
||||
|
||||
// slots: name, argc, parameters, tag, flags
|
||||
22, 0, 142, 2, 0x0a /* Public */,
|
||||
23, 0, 143, 2, 0x0a /* Public */,
|
||||
24, 0, 144, 2, 0x0a /* Public */,
|
||||
25, 0, 145, 2, 0x0a /* Public */,
|
||||
26, 1, 146, 2, 0x0a /* Public */,
|
||||
29, 3, 149, 2, 0x0a /* Public */,
|
||||
33, 0, 156, 2, 0x08 /* Private */,
|
||||
34, 1, 157, 2, 0x08 /* Private */,
|
||||
36, 0, 160, 2, 0x08 /* Private */,
|
||||
37, 1, 161, 2, 0x08 /* Private */,
|
||||
38, 0, 164, 2, 0x08 /* Private */,
|
||||
39, 1, 165, 2, 0x08 /* Private */,
|
||||
41, 0, 168, 2, 0x08 /* Private */,
|
||||
42, 0, 169, 2, 0x08 /* Private */,
|
||||
24, 0, 150, 2, 0x0a /* Public */,
|
||||
25, 0, 151, 2, 0x0a /* Public */,
|
||||
26, 0, 152, 2, 0x0a /* Public */,
|
||||
27, 0, 153, 2, 0x0a /* Public */,
|
||||
28, 1, 154, 2, 0x0a /* Public */,
|
||||
31, 3, 157, 2, 0x0a /* Public */,
|
||||
35, 0, 164, 2, 0x08 /* Private */,
|
||||
36, 1, 165, 2, 0x08 /* Private */,
|
||||
38, 0, 168, 2, 0x08 /* Private */,
|
||||
39, 1, 169, 2, 0x08 /* Private */,
|
||||
40, 0, 172, 2, 0x08 /* Private */,
|
||||
41, 1, 173, 2, 0x08 /* Private */,
|
||||
43, 0, 176, 2, 0x08 /* Private */,
|
||||
44, 0, 177, 2, 0x08 /* Private */,
|
||||
|
||||
// signals: parameters
|
||||
QMetaType::Void, 0x80000000 | 3, 0x80000000 | 5, 0x80000000 | 7, 0x80000000 | 9, 4, 6, 8, 10,
|
||||
QMetaType::Void, QMetaType::QString, 12,
|
||||
QMetaType::Void, 0x80000000 | 14, 15,
|
||||
QMetaType::Void, 0x80000000 | 17, 0x80000000 | 9, 18, 10,
|
||||
QMetaType::Void, QMetaType::QString, 14,
|
||||
QMetaType::Void, 0x80000000 | 16, 17,
|
||||
QMetaType::Void, 0x80000000 | 19, 0x80000000 | 9, 20, 10,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void,
|
||||
QMetaType::Bool,
|
||||
@@ -153,14 +158,14 @@ static const uint qt_meta_data_MainWindow[] = {
|
||||
QMetaType::Void,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void, 0x80000000 | 27, 28,
|
||||
QMetaType::Void, QMetaType::Bool, QMetaType::ULongLong, QMetaType::ULongLong, 30, 31, 32,
|
||||
QMetaType::Void, 0x80000000 | 29, 30,
|
||||
QMetaType::Void, QMetaType::Bool, QMetaType::ULongLong, QMetaType::ULongLong, 32, 33, 34,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void, QMetaType::QString, 35,
|
||||
QMetaType::Void, QMetaType::QString, 37,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void, QMetaType::Bool, 30,
|
||||
QMetaType::Void, QMetaType::Bool, 32,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void, QMetaType::QString, 40,
|
||||
QMetaType::Void, QMetaType::QString, 42,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void,
|
||||
|
||||
@@ -175,26 +180,27 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
|
||||
switch (_id) {
|
||||
case 0: _t->sigInitializeClient((*reinterpret_cast< RecognizeSystem*(*)>(_a[1])),(*reinterpret_cast< ExternalExecuter*(*)>(_a[2])),(*reinterpret_cast< SendSystem*(*)>(_a[3])),(*reinterpret_cast< QThread*(*)>(_a[4]))); break;
|
||||
case 1: _t->sigSendCommand((*reinterpret_cast< QString(*)>(_a[1]))); break;
|
||||
case 2: _t->sigUpdateFilesOnServer((*reinterpret_cast< QList<FileData>*(*)>(_a[1]))); break;
|
||||
case 3: _t->sigSetConnect((*reinterpret_cast< ServerSettings*(*)>(_a[1])),(*reinterpret_cast< QThread*(*)>(_a[2]))); break;
|
||||
case 4: _t->sigCalculateHash(); break;
|
||||
case 5: _t->sigSendAutorization(); break;
|
||||
case 6: { bool _r = _t->sigGetConnected();
|
||||
case 2: _t->sigSendXMLAnswer((*reinterpret_cast< QString(*)>(_a[1]))); break;
|
||||
case 3: _t->sigUpdateFilesOnServer((*reinterpret_cast< QList<FileData>*(*)>(_a[1]))); break;
|
||||
case 4: _t->sigSetConnect((*reinterpret_cast< ServerSettings*(*)>(_a[1])),(*reinterpret_cast< QThread*(*)>(_a[2]))); break;
|
||||
case 5: _t->sigCalculateHash(); break;
|
||||
case 6: _t->sigSendAutorization(); break;
|
||||
case 7: { bool _r = _t->sigGetConnected();
|
||||
if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = std::move(_r); } break;
|
||||
case 7: _t->updateProgress(); break;
|
||||
case 8: _t->loadComplete(); break;
|
||||
case 9: _t->lostConnection(); break;
|
||||
case 10: _t->serverBlocked(); break;
|
||||
case 11: _t->checkLoginResult((*reinterpret_cast< ServerAuthorization*(*)>(_a[1]))); break;
|
||||
case 12: _t->setNeedUpdate((*reinterpret_cast< bool(*)>(_a[1])),(*reinterpret_cast< quint64(*)>(_a[2])),(*reinterpret_cast< quint64(*)>(_a[3]))); break;
|
||||
case 13: _t->on_settingsButton_clicked(); break;
|
||||
case 14: _t->on_languageComboBox_activated((*reinterpret_cast< const QString(*)>(_a[1]))); break;
|
||||
case 15: _t->slotDisableNotify(); break;
|
||||
case 16: _t->slotConnectionState((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 17: _t->slotServerDisconnect(); break;
|
||||
case 18: _t->on_updateListGuideLabel_linkActivated((*reinterpret_cast< const QString(*)>(_a[1]))); break;
|
||||
case 19: _t->on_exitButton_clicked(); break;
|
||||
case 20: _t->on_offlineStartButton_clicked(); break;
|
||||
case 8: _t->updateProgress(); break;
|
||||
case 9: _t->loadComplete(); break;
|
||||
case 10: _t->lostConnection(); break;
|
||||
case 11: _t->serverBlocked(); break;
|
||||
case 12: _t->checkLoginResult((*reinterpret_cast< ServerAuthorization*(*)>(_a[1]))); break;
|
||||
case 13: _t->setNeedUpdate((*reinterpret_cast< bool(*)>(_a[1])),(*reinterpret_cast< quint64(*)>(_a[2])),(*reinterpret_cast< quint64(*)>(_a[3]))); break;
|
||||
case 14: _t->on_settingsButton_clicked(); break;
|
||||
case 15: _t->on_languageComboBox_activated((*reinterpret_cast< const QString(*)>(_a[1]))); break;
|
||||
case 16: _t->slotDisableNotify(); break;
|
||||
case 17: _t->slotConnectionState((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 18: _t->slotServerDisconnect(); break;
|
||||
case 19: _t->on_updateListGuideLabel_linkActivated((*reinterpret_cast< const QString(*)>(_a[1]))); break;
|
||||
case 20: _t->on_exitButton_clicked(); break;
|
||||
case 21: _t->on_offlineStartButton_clicked(); break;
|
||||
default: ;
|
||||
}
|
||||
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
|
||||
@@ -213,7 +219,7 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
|
||||
*reinterpret_cast<int*>(_a[0]) = qRegisterMetaType< SendSystem* >(); break;
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
case 4:
|
||||
switch (*reinterpret_cast<int*>(_a[1])) {
|
||||
default: *reinterpret_cast<int*>(_a[0]) = -1; break;
|
||||
case 1:
|
||||
@@ -237,38 +243,45 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
|
||||
return;
|
||||
}
|
||||
}
|
||||
{
|
||||
using _t = void (MainWindow::*)(QString );
|
||||
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::sigSendXMLAnswer)) {
|
||||
*result = 2;
|
||||
return;
|
||||
}
|
||||
}
|
||||
{
|
||||
using _t = void (MainWindow::*)(QList<FileData> * );
|
||||
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::sigUpdateFilesOnServer)) {
|
||||
*result = 2;
|
||||
*result = 3;
|
||||
return;
|
||||
}
|
||||
}
|
||||
{
|
||||
using _t = void (MainWindow::*)(ServerSettings * , QThread * );
|
||||
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::sigSetConnect)) {
|
||||
*result = 3;
|
||||
return;
|
||||
}
|
||||
}
|
||||
{
|
||||
using _t = void (MainWindow::*)();
|
||||
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::sigCalculateHash)) {
|
||||
*result = 4;
|
||||
return;
|
||||
}
|
||||
}
|
||||
{
|
||||
using _t = void (MainWindow::*)();
|
||||
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::sigSendAutorization)) {
|
||||
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::sigCalculateHash)) {
|
||||
*result = 5;
|
||||
return;
|
||||
}
|
||||
}
|
||||
{
|
||||
using _t = void (MainWindow::*)();
|
||||
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::sigSendAutorization)) {
|
||||
*result = 6;
|
||||
return;
|
||||
}
|
||||
}
|
||||
{
|
||||
using _t = bool (MainWindow::*)();
|
||||
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::sigGetConnected)) {
|
||||
*result = 6;
|
||||
*result = 7;
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -304,13 +317,13 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
|
||||
if (_id < 0)
|
||||
return _id;
|
||||
if (_c == QMetaObject::InvokeMetaMethod) {
|
||||
if (_id < 21)
|
||||
if (_id < 22)
|
||||
qt_static_metacall(this, _c, _id, _a);
|
||||
_id -= 21;
|
||||
_id -= 22;
|
||||
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
|
||||
if (_id < 21)
|
||||
if (_id < 22)
|
||||
qt_static_metacall(this, _c, _id, _a);
|
||||
_id -= 21;
|
||||
_id -= 22;
|
||||
}
|
||||
return _id;
|
||||
}
|
||||
@@ -330,37 +343,44 @@ void MainWindow::sigSendCommand(QString _t1)
|
||||
}
|
||||
|
||||
// SIGNAL 2
|
||||
void MainWindow::sigUpdateFilesOnServer(QList<FileData> * _t1)
|
||||
void MainWindow::sigSendXMLAnswer(QString _t1)
|
||||
{
|
||||
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) };
|
||||
QMetaObject::activate(this, &staticMetaObject, 2, _a);
|
||||
}
|
||||
|
||||
// SIGNAL 3
|
||||
void MainWindow::sigSetConnect(ServerSettings * _t1, QThread * _t2)
|
||||
void MainWindow::sigUpdateFilesOnServer(QList<FileData> * _t1)
|
||||
{
|
||||
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t2))) };
|
||||
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) };
|
||||
QMetaObject::activate(this, &staticMetaObject, 3, _a);
|
||||
}
|
||||
|
||||
// SIGNAL 4
|
||||
void MainWindow::sigCalculateHash()
|
||||
void MainWindow::sigSetConnect(ServerSettings * _t1, QThread * _t2)
|
||||
{
|
||||
QMetaObject::activate(this, &staticMetaObject, 4, nullptr);
|
||||
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t2))) };
|
||||
QMetaObject::activate(this, &staticMetaObject, 4, _a);
|
||||
}
|
||||
|
||||
// SIGNAL 5
|
||||
void MainWindow::sigSendAutorization()
|
||||
void MainWindow::sigCalculateHash()
|
||||
{
|
||||
QMetaObject::activate(this, &staticMetaObject, 5, nullptr);
|
||||
}
|
||||
|
||||
// SIGNAL 6
|
||||
void MainWindow::sigSendAutorization()
|
||||
{
|
||||
QMetaObject::activate(this, &staticMetaObject, 6, nullptr);
|
||||
}
|
||||
|
||||
// SIGNAL 7
|
||||
bool MainWindow::sigGetConnected()
|
||||
{
|
||||
bool _t0{};
|
||||
void *_a[] = { const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t0))) };
|
||||
QMetaObject::activate(this, &staticMetaObject, 6, _a);
|
||||
QMetaObject::activate(this, &staticMetaObject, 7, _a);
|
||||
return _t0;
|
||||
}
|
||||
QT_WARNING_POP
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE
|
||||
QT_WARNING_PUSH
|
||||
QT_WARNING_DISABLE_DEPRECATED
|
||||
struct qt_meta_stringdata_SendSystem_t {
|
||||
QByteArrayData data[4];
|
||||
char stringdata0[36];
|
||||
QByteArrayData data[6];
|
||||
char stringdata0[54];
|
||||
};
|
||||
#define QT_MOC_LITERAL(idx, ofs, len) \
|
||||
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
|
||||
@@ -35,10 +35,13 @@ static const qt_meta_stringdata_SendSystem_t qt_meta_stringdata_SendSystem = {
|
||||
QT_MOC_LITERAL(0, 0, 10), // "SendSystem"
|
||||
QT_MOC_LITERAL(1, 11, 7), // "sigSend"
|
||||
QT_MOC_LITERAL(2, 19, 0), // ""
|
||||
QT_MOC_LITERAL(3, 20, 15) // "sigGetXmlAnswer"
|
||||
QT_MOC_LITERAL(3, 20, 15), // "sigGetXmlAnswer"
|
||||
QT_MOC_LITERAL(4, 36, 9), // "xmlAnswer"
|
||||
QT_MOC_LITERAL(5, 46, 7) // "message"
|
||||
|
||||
},
|
||||
"SendSystem\0sigSend\0\0sigGetXmlAnswer"
|
||||
"SendSystem\0sigSend\0\0sigGetXmlAnswer\0"
|
||||
"xmlAnswer\0message"
|
||||
};
|
||||
#undef QT_MOC_LITERAL
|
||||
|
||||
@@ -48,7 +51,7 @@ static const uint qt_meta_data_SendSystem[] = {
|
||||
8, // revision
|
||||
0, // classname
|
||||
0, 0, // classinfo
|
||||
2, 14, // methods
|
||||
3, 14, // methods
|
||||
0, 0, // properties
|
||||
0, 0, // enums/sets
|
||||
0, 0, // constructors
|
||||
@@ -56,13 +59,19 @@ static const uint qt_meta_data_SendSystem[] = {
|
||||
2, // signalCount
|
||||
|
||||
// signals: name, argc, parameters, tag, flags
|
||||
1, 0, 24, 2, 0x06 /* Public */,
|
||||
3, 1, 25, 2, 0x06 /* Public */,
|
||||
1, 0, 29, 2, 0x06 /* Public */,
|
||||
3, 1, 30, 2, 0x06 /* Public */,
|
||||
|
||||
// slots: name, argc, parameters, tag, flags
|
||||
4, 1, 33, 2, 0x0a /* Public */,
|
||||
|
||||
// signals: parameters
|
||||
QMetaType::Void,
|
||||
QMetaType::QByteArray, QMetaType::QString, 2,
|
||||
|
||||
// slots: parameters
|
||||
QMetaType::Void, QMetaType::QString, 5,
|
||||
|
||||
0 // eod
|
||||
};
|
||||
|
||||
@@ -75,6 +84,7 @@ void SendSystem::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
|
||||
case 0: _t->sigSend(); break;
|
||||
case 1: { QByteArray _r = _t->sigGetXmlAnswer((*reinterpret_cast< QString(*)>(_a[1])));
|
||||
if (_a[0]) *reinterpret_cast< QByteArray*>(_a[0]) = std::move(_r); } break;
|
||||
case 2: _t->xmlAnswer((*reinterpret_cast< QString(*)>(_a[1]))); break;
|
||||
default: ;
|
||||
}
|
||||
} else if (_c == QMetaObject::IndexOfMethod) {
|
||||
@@ -125,13 +135,13 @@ int SendSystem::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
|
||||
if (_id < 0)
|
||||
return _id;
|
||||
if (_c == QMetaObject::InvokeMetaMethod) {
|
||||
if (_id < 2)
|
||||
if (_id < 3)
|
||||
qt_static_metacall(this, _c, _id, _a);
|
||||
_id -= 2;
|
||||
_id -= 3;
|
||||
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
|
||||
if (_id < 2)
|
||||
if (_id < 3)
|
||||
*reinterpret_cast<int*>(_a[0]) = -1;
|
||||
_id -= 2;
|
||||
_id -= 3;
|
||||
}
|
||||
return _id;
|
||||
}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
95
debug/moc_versionselectwidget.cpp
Normal file
95
debug/moc_versionselectwidget.cpp
Normal file
@@ -0,0 +1,95 @@
|
||||
/****************************************************************************
|
||||
** Meta object code from reading C++ file 'versionselectwidget.h'
|
||||
**
|
||||
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.14.2)
|
||||
**
|
||||
** WARNING! All changes made in this file will be lost!
|
||||
*****************************************************************************/
|
||||
|
||||
#include <memory>
|
||||
#include "../versionselectwidget.h"
|
||||
#include <QtCore/qbytearray.h>
|
||||
#include <QtCore/qmetatype.h>
|
||||
#if !defined(Q_MOC_OUTPUT_REVISION)
|
||||
#error "The header file 'versionselectwidget.h' doesn't include <QObject>."
|
||||
#elif Q_MOC_OUTPUT_REVISION != 67
|
||||
#error "This file was generated using the moc from 5.14.2. It"
|
||||
#error "cannot be used with the include files from this version of Qt."
|
||||
#error "(The moc has changed too much.)"
|
||||
#endif
|
||||
|
||||
QT_BEGIN_MOC_NAMESPACE
|
||||
QT_WARNING_PUSH
|
||||
QT_WARNING_DISABLE_DEPRECATED
|
||||
struct qt_meta_stringdata_VersionSelectWidget_t {
|
||||
QByteArrayData data[1];
|
||||
char stringdata0[20];
|
||||
};
|
||||
#define QT_MOC_LITERAL(idx, ofs, len) \
|
||||
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
|
||||
qptrdiff(offsetof(qt_meta_stringdata_VersionSelectWidget_t, stringdata0) + ofs \
|
||||
- idx * sizeof(QByteArrayData)) \
|
||||
)
|
||||
static const qt_meta_stringdata_VersionSelectWidget_t qt_meta_stringdata_VersionSelectWidget = {
|
||||
{
|
||||
QT_MOC_LITERAL(0, 0, 19) // "VersionSelectWidget"
|
||||
|
||||
},
|
||||
"VersionSelectWidget"
|
||||
};
|
||||
#undef QT_MOC_LITERAL
|
||||
|
||||
static const uint qt_meta_data_VersionSelectWidget[] = {
|
||||
|
||||
// content:
|
||||
8, // revision
|
||||
0, // classname
|
||||
0, 0, // classinfo
|
||||
0, 0, // methods
|
||||
0, 0, // properties
|
||||
0, 0, // enums/sets
|
||||
0, 0, // constructors
|
||||
0, // flags
|
||||
0, // signalCount
|
||||
|
||||
0 // eod
|
||||
};
|
||||
|
||||
void VersionSelectWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
|
||||
{
|
||||
Q_UNUSED(_o);
|
||||
Q_UNUSED(_id);
|
||||
Q_UNUSED(_c);
|
||||
Q_UNUSED(_a);
|
||||
}
|
||||
|
||||
QT_INIT_METAOBJECT const QMetaObject VersionSelectWidget::staticMetaObject = { {
|
||||
QMetaObject::SuperData::link<QWidget::staticMetaObject>(),
|
||||
qt_meta_stringdata_VersionSelectWidget.data,
|
||||
qt_meta_data_VersionSelectWidget,
|
||||
qt_static_metacall,
|
||||
nullptr,
|
||||
nullptr
|
||||
} };
|
||||
|
||||
|
||||
const QMetaObject *VersionSelectWidget::metaObject() const
|
||||
{
|
||||
return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject;
|
||||
}
|
||||
|
||||
void *VersionSelectWidget::qt_metacast(const char *_clname)
|
||||
{
|
||||
if (!_clname) return nullptr;
|
||||
if (!strcmp(_clname, qt_meta_stringdata_VersionSelectWidget.stringdata0))
|
||||
return static_cast<void*>(this);
|
||||
return QWidget::qt_metacast(_clname);
|
||||
}
|
||||
|
||||
int VersionSelectWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
|
||||
{
|
||||
_id = QWidget::qt_metacall(_c, _id, _a);
|
||||
return _id;
|
||||
}
|
||||
QT_WARNING_POP
|
||||
QT_END_MOC_NAMESPACE
|
||||
BIN
debug/moc_versionselectwidget.o
Normal file
BIN
debug/moc_versionselectwidget.o
Normal file
Binary file not shown.
@@ -10,48 +10,48 @@ static const unsigned char qt_resource_data[] = {
|
||||
// D:/QT/Projects/RRJClient/style.css
|
||||
0x0,0x0,0x2,0x99,
|
||||
0x0,
|
||||
0x0,0xb,0x22,0x78,0x9c,0xd5,0x56,0x5b,0x6f,0xda,0x30,0x14,0x7e,0x47,0xe2,0x3f,
|
||||
0x58,0xe5,0x85,0x4a,0x50,0x92,0x0,0x2d,0x4a,0xdf,0x68,0xa7,0x5d,0x54,0xa6,0xa1,
|
||||
0xa2,0xf5,0xd9,0x89,0x4d,0x72,0x84,0xb1,0x91,0xed,0x8,0xd0,0xb4,0xff,0x3e,0x93,
|
||||
0x84,0x8c,0xdc,0x68,0xe8,0x78,0x19,0x91,0x48,0x94,0xd8,0xdf,0xf9,0xce,0xf9,0xce,
|
||||
0xc5,0xed,0xd6,0x7c,0x86,0x81,0xbf,0x1,0x27,0x62,0xdb,0x6e,0xfd,0x6a,0xb7,0x90,
|
||||
0x0,0xb,0x26,0x78,0x9c,0xd5,0x56,0xcb,0x6e,0xe2,0x30,0x14,0xdd,0x23,0xf1,0xf,
|
||||
0x56,0xd9,0x50,0x9,0x4a,0x12,0xa0,0x45,0xe9,0x8e,0x76,0x34,0xf,0x95,0xd1,0xa0,
|
||||
0xa2,0xe9,0xda,0x89,0x4d,0x72,0x85,0xb1,0x91,0xed,0x88,0xa2,0xd1,0xfc,0x7b,0x4d,
|
||||
0x12,0x52,0xf2,0xa2,0xa1,0xc3,0x66,0x88,0x44,0xa2,0xc4,0x3e,0xf7,0xdc,0x7b,0xee,
|
||||
0xc3,0xed,0xd6,0x7c,0x86,0x81,0xbf,0x0,0x27,0x62,0xdb,0x6e,0xfd,0x69,0xb7,0x90,
|
||||
0xf9,0x79,0xd8,0x5f,0x5,0x52,0x44,0x9c,0xf4,0x61,0x8d,0x3,0xea,0xa2,0x48,0xb2,
|
||||
0xae,0x3b,0x90,0x54,0x89,0x48,0xfa,0x74,0xf0,0xfa,0xfa,0xad,0x6f,0x5b,0xd6,0x33,
|
||||
0x96,0xab,0xbb,0xd,0xf,0x6e,0x1f,0x4b,0xfb,0x36,0x42,0x81,0x6,0xc1,0x5d,0xe4,
|
||||
0x53,0xae,0xa9,0x34,0x2b,0x7e,0xb7,0x5b,0xed,0xd6,0xfc,0x49,0xac,0x3d,0x31,0x15,
|
||||
0xbb,0x2a,0x63,0xbe,0x60,0x42,0xba,0x48,0x6,0x5e,0xd7,0xb1,0x86,0x3d,0xc7,0x99,
|
||||
0xf4,0x9c,0xf1,0x38,0x43,0x17,0x92,0x50,0xd9,0x57,0x7a,0xcf,0xc,0x23,0x11,0x69,
|
||||
0x45,0x75,0xfe,0x93,0xc4,0x4,0x22,0xe5,0xa2,0xe1,0x66,0x97,0x7e,0x58,0xa,0xae,
|
||||
0xfb,0x4b,0xbc,0x6,0xb6,0x77,0xd1,0xcd,0x13,0x66,0xe0,0x49,0xb8,0x39,0xf9,0xe8,
|
||||
0x22,0xfb,0x3e,0x5b,0x7d,0x62,0x7f,0x34,0xee,0x4d,0x46,0x3d,0x7b,0x68,0xdd,0x66,
|
||||
0xcc,0x7f,0x44,0x2a,0x9c,0x46,0x5a,0xb,0xfe,0x3f,0x73,0x77,0x9,0x28,0xec,0x31,
|
||||
0x4a,0xce,0x38,0xc1,0x20,0x8,0xf5,0x67,0x89,0xf7,0x79,0xec,0xc0,0xbc,0x39,0x2,
|
||||
0xce,0xa8,0x52,0x26,0x33,0xce,0xb,0xb9,0xd,0x41,0xd3,0xc7,0xf2,0x16,0x34,0x7f,
|
||||
0xc1,0x1e,0x65,0xd9,0xce,0x6,0x9e,0x3a,0x56,0xd1,0x53,0x8f,0x19,0x7b,0x95,0xe0,
|
||||
0x55,0x42,0xe5,0x83,0xec,0x64,0x60,0x1b,0x4c,0x8,0xf0,0xc0,0x45,0xd6,0x9d,0x43,
|
||||
0xd7,0xd9,0xff,0xf0,0xf8,0x9c,0x2e,0x5b,0x3,0xef,0x6f,0x81,0xe8,0xd0,0x45,0xf,
|
||||
0x9,0x93,0xc4,0xec,0xb,0x70,0xfa,0x89,0x80,0x2e,0x1a,0x6a,0x2c,0x74,0x2a,0x8f,
|
||||
0x14,0x81,0x29,0x2e,0x35,0xc5,0xb2,0x80,0x14,0x73,0x45,0x4a,0x30,0x20,0x65,0x6d,
|
||||
0x2b,0x50,0xc7,0x75,0x61,0x6a,0x9a,0x51,0x6,0xc0,0x60,0x32,0x92,0xbe,0xd5,0x74,
|
||||
0xa7,0xfb,0x66,0x61,0x50,0xaa,0xe4,0x3c,0x6d,0xd7,0xf5,0xc3,0x88,0xaf,0xea,0x2,
|
||||
0xfe,0x97,0x56,0xa3,0x92,0x49,0x5b,0x45,0x48,0xfd,0xd5,0x69,0x86,0x9d,0xf2,0xaf,
|
||||
0xa1,0x3f,0x29,0xfa,0x9f,0xcf,0xc1,0x37,0x20,0x1,0xd5,0x1d,0xf0,0x5,0x4f,0x1e,
|
||||
0x8b,0x84,0xab,0xfb,0xdd,0x57,0xb3,0x5e,0xd,0x36,0xc,0x73,0x1a,0xf7,0x3b,0x64,
|
||||
0xa5,0x97,0xd2,0x92,0x6a,0x3f,0x3c,0xde,0x8f,0x49,0x55,0xd7,0xfc,0xae,0x90,0xf6,
|
||||
0x79,0x7f,0x62,0xc0,0xe,0x70,0x66,0xf2,0x70,0x61,0xa4,0x7a,0xa6,0x5e,0x14,0x5c,
|
||||
0x62,0x20,0xd,0x58,0x2e,0x3a,0x21,0xc5,0x26,0x14,0xc5,0xf8,0x14,0x75,0xab,0x95,
|
||||
0x2d,0x45,0x89,0x36,0x4,0x6b,0xfa,0x1e,0xca,0x41,0x7d,0x7c,0x8a,0xf3,0xb1,0xae,
|
||||
0x69,0x5b,0x25,0x37,0xd0,0xc7,0x19,0x58,0xc5,0xea,0xba,0x6,0x83,0xab,0x34,0xbd,
|
||||
0xea,0xf6,0x3e,0xdb,0x9b,0x1,0xfe,0x25,0x56,0x2d,0x15,0xef,0x62,0x53,0xe5,0xc2,
|
||||
0xa9,0x99,0x24,0x49,0xc6,0x99,0x4a,0x8,0x22,0x53,0x29,0xb,0xd0,0x8c,0x36,0xb3,
|
||||
0x73,0x26,0x7f,0xbf,0xb,0xd,0x4b,0xf0,0xf1,0xa1,0x66,0x2e,0x60,0x5e,0x39,0x8,
|
||||
0x12,0x44,0x7e,0x16,0x31,0x8b,0x6c,0xb2,0x65,0x21,0x4,0x4b,0xe6,0x45,0xc7,0xc,
|
||||
0x47,0x53,0xe5,0xfb,0x9f,0x40,0xb7,0xa5,0x46,0x3c,0xfa,0xa7,0x46,0x5c,0xbd,0xe7,
|
||||
0x9d,0x91,0x59,0xcd,0xcc,0xb4,0x5a,0xd3,0x18,0xcf,0x4e,0xf0,0x83,0x35,0x7b,0x6c,
|
||||
0xf7,0xec,0x87,0x7b,0x93,0xce,0x76,0x26,0x5f,0x3d,0x66,0x83,0x63,0x41,0x5,0xe8,
|
||||
0x19,0xff,0x62,0x8b,0x27,0xb3,0xb8,0x93,0xb2,0x8e,0xe5,0x68,0x72,0x8e,0xc2,0x5d,
|
||||
0xab,0x17,0x5f,0x55,0xc7,0x98,0x8e,0xe9,0x78,0xab,0x8b,0x51,0x1a,0xa6,0x94,0xc7,
|
||||
0xa2,0x4c,0x83,0x3f,0xae,0x6e,0x36,0xa8,
|
||||
0xae,0x3b,0x90,0x54,0x89,0x48,0xfa,0x74,0xf0,0xfc,0xfc,0xa3,0x6f,0x5b,0xd6,0x23,
|
||||
0x96,0xab,0x9b,0xd,0xf,0xae,0xef,0x4b,0xfb,0x36,0x42,0x81,0x6,0xc1,0x5d,0xe4,
|
||||
0x53,0xae,0xa9,0x34,0x2b,0xfe,0xb6,0x5b,0xed,0xd6,0xfc,0x41,0xac,0x3d,0x31,0x15,
|
||||
0xaf,0x55,0xc6,0x7c,0xc1,0x84,0x74,0x91,0xc,0xbc,0xae,0x63,0xd,0x7b,0x8e,0x33,
|
||||
0xe9,0x39,0xe3,0x71,0x86,0x2e,0x24,0xa1,0xb2,0xaf,0xf4,0x8e,0x19,0x46,0x22,0xd2,
|
||||
0x8a,0xea,0xfc,0x27,0x89,0x9,0x44,0xca,0x45,0xc3,0xcd,0x6b,0xfa,0x61,0x29,0xb8,
|
||||
0xee,0x2f,0xf1,0x1a,0xd8,0xce,0x45,0x57,0xf,0x98,0x81,0x27,0xe1,0xea,0xe8,0xa3,
|
||||
0x8b,0xec,0xdb,0x6c,0xf5,0x91,0xfd,0xd1,0xb8,0x37,0x19,0xf5,0xec,0xa1,0x75,0x9d,
|
||||
0x31,0xff,0x15,0xa9,0x70,0x1a,0x69,0x2d,0xf8,0xff,0xcc,0xdd,0x25,0xa0,0xb0,0xc7,
|
||||
0x28,0x39,0xe1,0x4,0x83,0x20,0xd4,0x5f,0x25,0xde,0xe5,0xb1,0x3,0xf3,0xe6,0x0,
|
||||
0x38,0xa3,0x4a,0x99,0xcc,0x38,0x2d,0xe4,0x36,0x4,0x4d,0xef,0xcb,0x5b,0xd0,0xfc,
|
||||
0x9,0x7b,0x94,0x65,0x3b,0x1b,0x78,0xea,0x58,0x45,0x4f,0x3d,0x66,0xec,0x55,0x82,
|
||||
0x57,0x9,0x95,0xf,0xb2,0x93,0x81,0x6d,0x30,0x21,0xc0,0x3,0x17,0x59,0x37,0xe,
|
||||
0x5d,0x67,0xff,0xc3,0xc3,0x73,0xba,0x6c,0xd,0xbc,0xbf,0x5,0xa2,0x43,0x17,0xdd,
|
||||
0x25,0x4c,0x12,0xb3,0x4f,0xc0,0xe9,0x17,0x2,0xba,0x68,0xa8,0xb1,0xd0,0xa9,0x3c,
|
||||
0x52,0x4,0xa6,0xb8,0xd4,0x14,0xcb,0x2,0x52,0xcc,0x15,0x29,0xc1,0x80,0x94,0xb5,
|
||||
0xad,0x40,0x1d,0xd7,0x85,0xa9,0x69,0x46,0x19,0x0,0x83,0xc9,0x48,0xfa,0x56,0xd3,
|
||||
0x57,0xdd,0x37,0xb,0x83,0x52,0x25,0xe7,0x69,0xbb,0xae,0x1f,0x46,0x7c,0x55,0x17,
|
||||
0xf0,0x77,0x5a,0x8d,0x4a,0x26,0x6d,0x15,0x21,0xf5,0x57,0xc7,0x19,0x76,0xcc,0xbf,
|
||||
0x86,0xfe,0xa4,0xe8,0x7f,0x3e,0x7,0x5f,0x80,0x4,0x54,0x77,0xc0,0x17,0x3c,0x79,
|
||||
0x2c,0x12,0xae,0xee,0x77,0xdf,0xcd,0x7a,0x35,0xd8,0x30,0xcc,0x69,0xdc,0xef,0x90,
|
||||
0x95,0x5e,0x4a,0x4b,0xaa,0xfd,0xf0,0x70,0x3f,0x24,0x55,0x5d,0xf3,0xbb,0x40,0xda,
|
||||
0xe7,0xfd,0x89,0x1,0x3b,0xc0,0x99,0xc9,0xc3,0x85,0x91,0xea,0x91,0x7a,0x51,0x70,
|
||||
0x8e,0x81,0x34,0x60,0xb9,0xe8,0x84,0x14,0x9b,0x50,0x14,0xe3,0x53,0xd4,0xad,0x56,
|
||||
0xb6,0x14,0x25,0xda,0x10,0xac,0xe9,0x47,0x28,0x7b,0xf5,0xf1,0x31,0xce,0xe7,0xba,
|
||||
0xa6,0x6d,0x95,0xdc,0x40,0x9f,0x67,0x60,0x15,0xab,0xeb,0x12,0xc,0x2e,0xd2,0xf4,
|
||||
0xaa,0xdb,0xfb,0x6c,0x67,0x6,0xf8,0xb7,0x58,0xb5,0x54,0xbc,0xb3,0x4d,0x95,0xb,
|
||||
0xa7,0x66,0x92,0x24,0x19,0x67,0x2a,0x21,0x88,0x4c,0xa5,0x2c,0x40,0x33,0xda,0xcc,
|
||||
0xce,0x89,0xfc,0xfd,0x29,0x34,0x2c,0xc1,0xc7,0xfb,0x9a,0x39,0x83,0x79,0xe5,0x20,
|
||||
0x48,0x10,0xf9,0x49,0xc4,0x2c,0xb2,0xc9,0x96,0x85,0x10,0x2c,0x99,0x17,0x1d,0x33,
|
||||
0x1c,0x4d,0x95,0xef,0x7e,0x3,0xdd,0x96,0x1a,0xf1,0xe8,0x9f,0x1a,0x71,0xf5,0x9e,
|
||||
0xf,0x46,0x66,0x35,0x33,0xd3,0x6a,0x4d,0x63,0x3c,0x39,0xc1,0xf7,0xd6,0xec,0xb1,
|
||||
0xdd,0xb3,0xef,0x6e,0x4d,0x3a,0xdb,0x99,0x7c,0xf5,0x98,0xd,0x8e,0x5,0x15,0xa0,
|
||||
0x27,0xfc,0x2b,0x1f,0x3d,0x3a,0x29,0xef,0x58,0x90,0x26,0x27,0x29,0xdc,0xb5,0x7a,
|
||||
0xf1,0x55,0x75,0x90,0xe9,0x98,0x9e,0xb7,0x3a,0x1b,0xa5,0x61,0x52,0x79,0x2c,0xa2,
|
||||
0xef,0x31,0x7b,0x3,0x26,0xf5,0x36,0xd6,
|
||||
// D:/QT/Projects/RRJClient/resource/SSJ-100.png
|
||||
0x0,0xc,0x7c,0xaa,
|
||||
0x89,
|
||||
@@ -131984,7 +131984,7 @@ static const unsigned char qt_resource_struct[] = {
|
||||
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
|
||||
// :/style.css
|
||||
0x0,0x0,0x0,0x16,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,
|
||||
0x0,0x0,0x1,0x92,0x56,0xb1,0xc1,0x4,
|
||||
0x0,0x0,0x1,0x93,0xbf,0xf5,0xb0,0x7,
|
||||
// :/resource
|
||||
0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x3,
|
||||
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
debug/tools.o
BIN
debug/tools.o
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
debug/versionselectwidget.o
Normal file
BIN
debug/versionselectwidget.o
Normal file
Binary file not shown.
@@ -64,11 +64,6 @@ void EntryWidget::loginIsActive(bool flag)
|
||||
else ui->loginWidget->hide();
|
||||
}
|
||||
|
||||
void EntryWidget::offlineWidgetIsActive(bool flag)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void EntryWidget::settingsWidgetIsActive(bool flag)
|
||||
{
|
||||
if(flag) ui->settingsWidget->show();
|
||||
|
||||
@@ -23,7 +23,6 @@ public:
|
||||
ClientAutorization* getAuthData();
|
||||
ServerSettings* getServerSettings();
|
||||
void loginIsActive(bool flag);
|
||||
void offlineWidgetIsActive(bool flag);
|
||||
void settingsWidgetIsActive(bool flag);
|
||||
void fillSettings(ServerSettings *settings);
|
||||
~EntryWidget();
|
||||
|
||||
@@ -25,6 +25,8 @@ void MainWindow::initialize()
|
||||
|
||||
updateTextWidget->initialize();
|
||||
entryWidget->initialize(this);
|
||||
versionSelectWidget->initialize();
|
||||
|
||||
commonButtonGroupWidget->initialize(externalExecuter,sendSystem,client);
|
||||
commonButtonGroupWidget->show();
|
||||
|
||||
@@ -40,6 +42,7 @@ void MainWindow::initialize()
|
||||
ui->autostartCheckBox->hide();
|
||||
bindConnection();
|
||||
|
||||
sendSystem->initialize(this,dataParser);
|
||||
emit sigCalculateHash();
|
||||
emit sigInitializeClient(recognizeSystem,externalExecuter,sendSystem,connectionThread);
|
||||
|
||||
@@ -62,12 +65,14 @@ void MainWindow::createObjects()
|
||||
instructorButtonGroupWidget = new InstructorButtonGroupWidget;
|
||||
updateTextWidget = new UpdateWidget;
|
||||
entryWidget = new EntryWidget;
|
||||
versionSelectWidget = new VersionSelectWidget;
|
||||
|
||||
ui->changButtonGroup->addWidget(commonButtonGroupWidget);
|
||||
ui->changButtonGroup->addWidget(instructorButtonGroupWidget);
|
||||
|
||||
ui->interactiveGroup->addWidget(entryWidget);
|
||||
ui->interactiveGroup->addWidget(updateTextWidget);
|
||||
ui->interactiveGroup->addWidget(versionSelectWidget);
|
||||
|
||||
connectionThread = new QThread;
|
||||
animationThread = new QThread;
|
||||
@@ -106,13 +111,11 @@ void MainWindow::bindConnection()
|
||||
connect(hashComparer,&HashComparer::sigCallCheck,this,&MainWindow::checkUpdate);
|
||||
connect(hashComparer,&HashComparer::sigHaveDelta,this,&MainWindow::showUpdateInfo);
|
||||
|
||||
connect(sendSystem,&SendSystem::sigSend,this,&MainWindow::updateProgress);
|
||||
connect(sendSystem,&SendSystem::sigGetXmlAnswer,dataParser,&DataParser::slotGetXmlAnswer);
|
||||
|
||||
connect(this,&MainWindow::sigUpdateFilesOnServer,updateController,&UpdateController::updateFilesOnServer);
|
||||
connect(this,&MainWindow::sigInitializeClient,client,&TCPClient::initialize,Qt::AutoConnection);
|
||||
connect(this,&MainWindow::sigSetConnect,client,&TCPClient::setConnect,Qt::AutoConnection);
|
||||
connect(this,&MainWindow::sigSendCommand,client,&TCPClient::slotSendCommand,Qt::AutoConnection);
|
||||
connect(this,&MainWindow::sigSendXMLAnswer,sendSystem,&SendSystem::xmlAnswer,Qt::AutoConnection);
|
||||
|
||||
connect(client,&TCPClient::sigConnectionState,this,&MainWindow::slotConnectionState,Qt::AutoConnection);
|
||||
connect(client,&TCPClient::sigServerDisconnect,this,&MainWindow::slotServerDisconnect);
|
||||
@@ -198,6 +201,10 @@ void MainWindow::checkLoginResult(ServerAuthorization *serverAuth)
|
||||
{
|
||||
checkUpdate();
|
||||
}
|
||||
else
|
||||
{
|
||||
emit sigSendXMLAnswer("CHECKVERSIONLIST");
|
||||
}
|
||||
|
||||
dataParser->createAuthData(serverAuth);
|
||||
entryWidget->loginIsActive(false);
|
||||
@@ -321,10 +328,8 @@ void MainWindow::slotDisableNotify()
|
||||
void MainWindow::callUpdateList()
|
||||
{
|
||||
hashComparer->setWidget(updateWidget);
|
||||
|
||||
QByteArray answer = dataParser->xmlAnswer_notify("GETSERVERDATALIST");
|
||||
sendSystem->sendXMLAnswer(answer);
|
||||
|
||||
//QByteArray answer = dataParser->xmlAnswer_notify("GETSERVERDATALIST");
|
||||
emit sigSendXMLAnswer("GETSERVERDATALIST");
|
||||
updateWidget->initialize(this);
|
||||
}
|
||||
|
||||
@@ -468,7 +473,7 @@ void MainWindow::showCompleteDialogBox()
|
||||
void MainWindow::startUnityClient()
|
||||
{
|
||||
externalExecuter->callApp();
|
||||
sendSystem->sendDisable();
|
||||
emit sigSendXMLAnswer("DISABLE");
|
||||
}
|
||||
|
||||
void MainWindow::keyPressEvent(QKeyEvent *event)
|
||||
@@ -544,7 +549,7 @@ MainWindow::~MainWindow()
|
||||
connectionThread->quit();
|
||||
connectionThread->wait();
|
||||
|
||||
sendSystem->sendDisable();
|
||||
emit sigSendXMLAnswer("DISABLE");
|
||||
|
||||
delete connectionThread;
|
||||
delete ui;
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
#include "mywinheader.h"
|
||||
#include "updatenotifywidget.h"
|
||||
#include "updatewidget.h"
|
||||
#include "versionselectwidget.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
namespace Ui { class MainWindow; }
|
||||
@@ -51,6 +52,7 @@ signals:
|
||||
SendSystem *sendSystem,
|
||||
QThread *thread);
|
||||
void sigSendCommand(QString command);
|
||||
void sigSendXMLAnswer(QString answer);
|
||||
void sigUpdateFilesOnServer(QList<FileData> *fileSendList);
|
||||
void sigSetConnect(ServerSettings* serverSettings,QThread *thread);
|
||||
void sigCalculateHash();
|
||||
@@ -86,6 +88,8 @@ private:
|
||||
InstructorButtonGroupWidget *instructorButtonGroupWidget;
|
||||
EntryWidget *entryWidget;
|
||||
UpdateWidget *updateTextWidget;
|
||||
VersionSelectWidget *versionSelectWidget;
|
||||
|
||||
QTranslator translator;
|
||||
TCPClient *client;
|
||||
DataParser *dataParser;
|
||||
|
||||
@@ -547,9 +547,9 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>209</y>
|
||||
<y>229</y>
|
||||
<width>781</width>
|
||||
<height>251</height>
|
||||
<height>231</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="interactiveGroup"/>
|
||||
|
||||
@@ -15,6 +15,7 @@ debug/mainwindow.o
|
||||
debug/mywinheader.o
|
||||
debug/updatenotifywidget.o
|
||||
debug/updatewidget.o
|
||||
debug/versionselectwidget.o
|
||||
debug/qrc_resources.o
|
||||
debug/moc_sendsystem.o
|
||||
debug/moc_updatecontroller.o
|
||||
@@ -31,3 +32,4 @@ debug/moc_mainwindow.o
|
||||
debug/moc_mywinheader.o
|
||||
debug/moc_updatenotifywidget.o
|
||||
debug/moc_updatewidget.o
|
||||
debug/moc_versionselectwidget.o
|
||||
|
||||
@@ -15,6 +15,7 @@ release/mainwindow.o
|
||||
release/mywinheader.o
|
||||
release/updatenotifywidget.o
|
||||
release/updatewidget.o
|
||||
release/versionselectwidget.o
|
||||
release/qrc_resources.o
|
||||
release/moc_sendsystem.o
|
||||
release/moc_updatecontroller.o
|
||||
@@ -31,3 +32,4 @@ release/moc_mainwindow.o
|
||||
release/moc_mywinheader.o
|
||||
release/moc_updatenotifywidget.o
|
||||
release/moc_updatewidget.o
|
||||
release/moc_versionselectwidget.o
|
||||
|
||||
@@ -169,6 +169,7 @@ QToolButton#displayView:disabled
|
||||
color:rgb(45,84,130);
|
||||
|
||||
}
|
||||
|
||||
QPushButton#checkedLabelButton
|
||||
{
|
||||
background-color: rgba(0,0,0,0);
|
||||
@@ -181,3 +182,4 @@ QPushButton#linkButton
|
||||
color:blue;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -257,7 +257,7 @@ public:
|
||||
changButtonGroup->setContentsMargins(0, 0, 0, 0);
|
||||
verticalLayoutWidget_2 = new QWidget(centralwidget);
|
||||
verticalLayoutWidget_2->setObjectName(QString::fromUtf8("verticalLayoutWidget_2"));
|
||||
verticalLayoutWidget_2->setGeometry(QRect(10, 209, 781, 251));
|
||||
verticalLayoutWidget_2->setGeometry(QRect(10, 229, 781, 231));
|
||||
interactiveGroup = new QVBoxLayout(verticalLayoutWidget_2);
|
||||
interactiveGroup->setObjectName(QString::fromUtf8("interactiveGroup"));
|
||||
interactiveGroup->setContentsMargins(0, 0, 0, 0);
|
||||
|
||||
85
ui_versionselectwidget.h
Normal file
85
ui_versionselectwidget.h
Normal file
@@ -0,0 +1,85 @@
|
||||
/********************************************************************************
|
||||
** Form generated from reading UI file 'versionselectwidget.ui'
|
||||
**
|
||||
** Created by: Qt User Interface Compiler version 5.14.2
|
||||
**
|
||||
** WARNING! All changes made in this file will be lost when recompiling UI file!
|
||||
********************************************************************************/
|
||||
|
||||
#ifndef UI_VERSIONSELECTWIDGET_H
|
||||
#define UI_VERSIONSELECTWIDGET_H
|
||||
|
||||
#include <QtCore/QVariant>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtWidgets/QListView>
|
||||
#include <QtWidgets/QPushButton>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class Ui_VersionSelectWidget
|
||||
{
|
||||
public:
|
||||
QPushButton *confirmVerButton;
|
||||
QLabel *verTitle;
|
||||
QLabel *verValue;
|
||||
QListView *verListView;
|
||||
QLabel *verListTitle;
|
||||
QLabel *infoViewTitle;
|
||||
QLabel *infoValue;
|
||||
|
||||
void setupUi(QWidget *VersionSelectWidget)
|
||||
{
|
||||
if (VersionSelectWidget->objectName().isEmpty())
|
||||
VersionSelectWidget->setObjectName(QString::fromUtf8("VersionSelectWidget"));
|
||||
VersionSelectWidget->resize(584, 300);
|
||||
confirmVerButton = new QPushButton(VersionSelectWidget);
|
||||
confirmVerButton->setObjectName(QString::fromUtf8("confirmVerButton"));
|
||||
confirmVerButton->setGeometry(QRect(10, 250, 151, 41));
|
||||
verTitle = new QLabel(VersionSelectWidget);
|
||||
verTitle->setObjectName(QString::fromUtf8("verTitle"));
|
||||
verTitle->setGeometry(QRect(170, 250, 101, 16));
|
||||
verValue = new QLabel(VersionSelectWidget);
|
||||
verValue->setObjectName(QString::fromUtf8("verValue"));
|
||||
verValue->setGeometry(QRect(280, 250, 55, 16));
|
||||
verListView = new QListView(VersionSelectWidget);
|
||||
verListView->setObjectName(QString::fromUtf8("verListView"));
|
||||
verListView->setGeometry(QRect(20, 30, 281, 211));
|
||||
verListTitle = new QLabel(VersionSelectWidget);
|
||||
verListTitle->setObjectName(QString::fromUtf8("verListTitle"));
|
||||
verListTitle->setGeometry(QRect(20, 10, 121, 16));
|
||||
verListTitle->setContextMenuPolicy(Qt::PreventContextMenu);
|
||||
infoViewTitle = new QLabel(VersionSelectWidget);
|
||||
infoViewTitle->setObjectName(QString::fromUtf8("infoViewTitle"));
|
||||
infoViewTitle->setGeometry(QRect(320, 10, 91, 16));
|
||||
infoValue = new QLabel(VersionSelectWidget);
|
||||
infoValue->setObjectName(QString::fromUtf8("infoValue"));
|
||||
infoValue->setGeometry(QRect(320, 30, 241, 211));
|
||||
infoValue->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop);
|
||||
|
||||
retranslateUi(VersionSelectWidget);
|
||||
|
||||
QMetaObject::connectSlotsByName(VersionSelectWidget);
|
||||
} // setupUi
|
||||
|
||||
void retranslateUi(QWidget *VersionSelectWidget)
|
||||
{
|
||||
VersionSelectWidget->setWindowTitle(QCoreApplication::translate("VersionSelectWidget", "Form", nullptr));
|
||||
confirmVerButton->setText(QCoreApplication::translate("VersionSelectWidget", "\320\230\320\267\320\274\320\265\320\275\320\270\321\202\321\214 \320\262\320\265\321\200\321\201\320\270\321\216", nullptr));
|
||||
verTitle->setText(QCoreApplication::translate("VersionSelectWidget", "\320\242\320\265\320\272\321\203\321\211\320\260\321\217 \320\262\320\265\321\200\321\201\320\270\321\217:", nullptr));
|
||||
verValue->setText(QCoreApplication::translate("VersionSelectWidget", "base", nullptr));
|
||||
verListTitle->setText(QCoreApplication::translate("VersionSelectWidget", "\320\224\320\276\321\201\321\202\321\203\320\277\320\275\321\213\320\265 \320\262\320\265\321\200\321\201\320\270\320\270", nullptr));
|
||||
infoViewTitle->setText(QCoreApplication::translate("VersionSelectWidget", "\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\321\217:", nullptr));
|
||||
infoValue->setText(QCoreApplication::translate("VersionSelectWidget", "\320\242\321\203\321\202 \320\261\321\203\320\264\320\265\321\202 \320\270\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\321\217 \320\276 \320\262\320\265\321\200\321\201\320\270\320\270...", nullptr));
|
||||
} // retranslateUi
|
||||
|
||||
};
|
||||
|
||||
namespace Ui {
|
||||
class VersionSelectWidget: public Ui_VersionSelectWidget {};
|
||||
} // namespace Ui
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // UI_VERSIONSELECTWIDGET_H
|
||||
19
versionselectwidget.cpp
Normal file
19
versionselectwidget.cpp
Normal file
@@ -0,0 +1,19 @@
|
||||
#include "versionselectwidget.h"
|
||||
#include "ui_versionselectwidget.h"
|
||||
|
||||
VersionSelectWidget::VersionSelectWidget(QWidget *parent) :
|
||||
QWidget(parent),
|
||||
ui(new Ui::VersionSelectWidget)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
}
|
||||
|
||||
void VersionSelectWidget::initialize()
|
||||
{
|
||||
hide();
|
||||
}
|
||||
|
||||
VersionSelectWidget::~VersionSelectWidget()
|
||||
{
|
||||
delete ui;
|
||||
}
|
||||
23
versionselectwidget.h
Normal file
23
versionselectwidget.h
Normal file
@@ -0,0 +1,23 @@
|
||||
#ifndef VERSIONSELECTWIDGET_H
|
||||
#define VERSIONSELECTWIDGET_H
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
namespace Ui {
|
||||
class VersionSelectWidget;
|
||||
}
|
||||
|
||||
class VersionSelectWidget : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit VersionSelectWidget(QWidget *parent = nullptr);
|
||||
void initialize();
|
||||
~VersionSelectWidget();
|
||||
|
||||
private:
|
||||
Ui::VersionSelectWidget *ui;
|
||||
};
|
||||
|
||||
#endif // VERSIONSELECTWIDGET_H
|
||||
113
versionselectwidget.ui
Normal file
113
versionselectwidget.ui
Normal file
@@ -0,0 +1,113 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>VersionSelectWidget</class>
|
||||
<widget class="QWidget" name="VersionSelectWidget">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>584</width>
|
||||
<height>300</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Form</string>
|
||||
</property>
|
||||
<widget class="QPushButton" name="confirmVerButton">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>250</y>
|
||||
<width>151</width>
|
||||
<height>41</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Изменить версию</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="verTitle">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>170</x>
|
||||
<y>250</y>
|
||||
<width>101</width>
|
||||
<height>16</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Текущая версия:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="verValue">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>280</x>
|
||||
<y>250</y>
|
||||
<width>55</width>
|
||||
<height>16</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>base</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QListView" name="verListView">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>30</y>
|
||||
<width>281</width>
|
||||
<height>211</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="verListTitle">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>10</y>
|
||||
<width>121</width>
|
||||
<height>16</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="contextMenuPolicy">
|
||||
<enum>Qt::PreventContextMenu</enum>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Доступные версии</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="infoViewTitle">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>320</x>
|
||||
<y>10</y>
|
||||
<width>91</width>
|
||||
<height>16</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Информация:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="infoValue">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>320</x>
|
||||
<y>30</y>
|
||||
<width>241</width>
|
||||
<height>211</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Тут будет информация о версии...</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
Reference in New Issue
Block a user