diff --git a/Core/dataparser.cpp b/Core/dataparser.cpp index 8c8d79b..e318060 100644 --- a/Core/dataparser.cpp +++ b/Core/dataparser.cpp @@ -95,13 +95,13 @@ void DataParser::createServerSettings(ServerSettings* serverSettings) { xmlWriter.writeStartElement("VersionData"); xmlWriter.writeAttribute("Version","NONE"); + xmlWriter.writeAttribute("isChangable","0"); xmlWriter.writeEndElement(); } else { - xmlWriter.writeStartElement("VersionData"); - xmlWriter.writeAttribute("Version",serverSettings->LocalVersionName); - xmlWriter.writeEndElement(); +// xmlWriter.writeStartElement("VersionData"); +// xmlWriter.writeAttribute("Version",serverSettings->LocalVersionName); } xmlWriter.writeEndElement(); @@ -112,7 +112,7 @@ void DataParser::createServerSettings(ServerSettings* serverSettings) } -void DataParser::changeVersion(QString versionName) +void DataParser::changeVersion(StreamingVersionData *versionData) { QFile file(settingsName); @@ -123,7 +123,9 @@ void DataParser::changeVersion(QString versionName) doc.setContent(xmlData); QDomElement containerElement = doc.firstChildElement("ServerSettingsContainer"); QDomElement verDataElement = containerElement.firstChildElement("VersionData"); - verDataElement.setAttribute("Version",versionName); + verDataElement.setAttribute("Version",versionData->getViewName()); + verDataElement.setAttribute("Created",versionData->getCreateData().toString()); + verDataElement.setAttribute("isChangable",versionData->getIsChangeable()); file.resize(0); QTextStream out(&file); @@ -202,7 +204,7 @@ void DataParser::addRunData(QList displays) } -ServerSettings *DataParser::getServerSettings() +ServerSettings *DataParser::getClientSettings() { ServerSettings *settings = new ServerSettings; QFile file(settingsName); @@ -241,6 +243,8 @@ ServerSettings *DataParser::getServerSettings() if (xmlReader.name() == "VersionData") { + StreamingVersionData *data = new StreamingVersionData; + foreach(const QXmlStreamAttribute &attr, xmlReader.attributes()) { QString name = attr.name().toString(); @@ -248,9 +252,23 @@ ServerSettings *DataParser::getServerSettings() if (name == "Version") { + data->setName(value); settings->LocalVersionName = value; } + if (name == "isChangable") + { + data->setIsChangeable(value.toInt()); + } + + if(name == "Created") + { + data->setCreateData(QDateTime::fromString(value)); + } + + + settings->versionData = *data; + } } } diff --git a/Core/dataparser.h b/Core/dataparser.h index 0b47d14..9dee4f9 100644 --- a/Core/dataparser.h +++ b/Core/dataparser.h @@ -31,7 +31,7 @@ public: HashComparer *hashComparer); ~DataParser(); - ServerSettings* getServerSettings(); + ServerSettings* getClientSettings(); void createServerSettings(ServerSettings* serverSettings); void saveClientSettrings(QString language,bool isAutoStart); void createFileDataList(QList fileDataList,QString filename); @@ -43,7 +43,7 @@ public: QList* xmlFileDataParse(QByteArray array,QString filter); void xmlParser(QByteArray array); - void changeVersion(QString versionName); + void changeVersion(StreamingVersionData *versionData); signals: void sigNotify(QString notify); diff --git a/Core/versioncontainer.cpp b/Core/versioncontainer.cpp index 1c8bd1c..2ea9b79 100644 --- a/Core/versioncontainer.cpp +++ b/Core/versioncontainer.cpp @@ -39,4 +39,6 @@ StreamingVersionData *VersionContainer::getServerVersionData() const void VersionContainer::setServerVersionData(StreamingVersionData *value) { serverVersionData = value; + emit sigSetServerVersion(value); + } diff --git a/Core/versioncontainer.h b/Core/versioncontainer.h index cf04184..d2ed834 100644 --- a/Core/versioncontainer.h +++ b/Core/versioncontainer.h @@ -21,6 +21,9 @@ public: StreamingVersionData *getServerVersionData() const; void setServerVersionData(StreamingVersionData *value); +signals: + void sigSetServerVersion(StreamingVersionData *value); + private: StreamingVersionData *localVersionData; StreamingVersionData *serverVersionData; diff --git a/Data/Datas.h b/Data/Datas.h index 4b62fa9..8402c6d 100644 --- a/Data/Datas.h +++ b/Data/Datas.h @@ -1,6 +1,8 @@ #ifndef DATAS_H #define DATAS_H +#include "streamingversiondata.h" + #include class ServerSettings{ @@ -9,6 +11,7 @@ public: QString Port; QString Language; QString LocalVersionName; + StreamingVersionData versionData; bool isAutoStart; }; diff --git a/Makefile.Debug b/Makefile.Debug index d0dcb46..fd1971f 100644 --- a/Makefile.Debug +++ b/Makefile.Debug @@ -564,11 +564,11 @@ debug/moc_sendsystem.cpp: Core/sendsystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -595,6 +595,9 @@ debug/moc_sendsystem.cpp: Core/sendsystem.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -615,9 +618,6 @@ debug/moc_sendsystem.cpp: Core/sendsystem.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -802,6 +802,7 @@ debug/moc_updatecontroller.cpp: Core/updatecontroller.h \ E:/QT/5.14.2/mingw73_64/include/QtXml/qtxmlglobal.h \ E:/QT/5.14.2/mingw73_64/include/QtXml/qtxml-config.h \ Data/Datas.h \ + Data/streamingversiondata.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ @@ -828,7 +829,6 @@ debug/moc_updatecontroller.cpp: Core/updatecontroller.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - Data/streamingversiondata.h \ Core/UpdateController.h \ Core/externalexecuter.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QProcess \ @@ -1074,6 +1074,8 @@ debug/moc_dataparser.cpp: Core/dataparser.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtCore/qdatastream.h \ @@ -1140,8 +1142,6 @@ debug/moc_dataparser.cpp: Core/dataparser.h \ Core/dataparser.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/tcpclient.h \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QHostAddress \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/qhostaddress.h \ @@ -1380,11 +1380,11 @@ debug/moc_recognizesystem.cpp: Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -1411,6 +1411,9 @@ debug/moc_recognizesystem.cpp: Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -1431,9 +1434,6 @@ debug/moc_recognizesystem.cpp: Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -1561,6 +1561,8 @@ debug/moc_screenchecker.cpp: Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtCore/qdatastream.h \ @@ -1634,8 +1636,6 @@ debug/moc_screenchecker.cpp: Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -1874,10 +1874,10 @@ debug/moc_tcpclient.cpp: Core/tcpclient.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/tcpclient.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ @@ -2050,6 +2050,8 @@ debug/moc_hashcomparer.cpp: Core/hashcomparer.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamWriter \ E:/QT/5.14.2/mingw73_64/include/QtCore/qxmlstream.h \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtCore/qdatastream.h \ @@ -2120,8 +2122,6 @@ debug/moc_hashcomparer.cpp: Core/hashcomparer.h \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/qtcpserver.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -2605,10 +2605,10 @@ debug/moc_commonbuttongroupwidget.cpp: Widgets/commonbuttongroupwidget.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -2832,6 +2832,8 @@ debug/moc_entrywidget.cpp: Widgets/entrywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ @@ -2841,8 +2843,6 @@ debug/moc_entrywidget.cpp: Widgets/entrywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -2869,6 +2869,9 @@ debug/moc_entrywidget.cpp: Widgets/entrywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -2889,9 +2892,6 @@ debug/moc_entrywidget.cpp: Widgets/entrywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -3076,6 +3076,8 @@ debug/moc_instructorbuttongroupwidget.cpp: Widgets/instructorbuttongroupwidget.h E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ @@ -3085,8 +3087,6 @@ debug/moc_instructorbuttongroupwidget.cpp: Widgets/instructorbuttongroupwidget.h E:/QT/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -3112,6 +3112,9 @@ debug/moc_instructorbuttongroupwidget.cpp: Widgets/instructorbuttongroupwidget.h Widgets/updatenotifywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -3132,9 +3135,6 @@ debug/moc_instructorbuttongroupwidget.cpp: Widgets/instructorbuttongroupwidget.h E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -3317,6 +3317,8 @@ debug/moc_mainwindow.cpp: mainwindow.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ @@ -3335,8 +3337,6 @@ debug/moc_mainwindow.cpp: mainwindow.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -3704,11 +3704,11 @@ debug/moc_newversionwidget.cpp: Widgets/newversionwidget.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -3734,6 +3734,8 @@ debug/moc_newversionwidget.cpp: Widgets/newversionwidget.h \ Widgets/updatenotifywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -3754,8 +3756,6 @@ debug/moc_newversionwidget.cpp: Widgets/newversionwidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -3919,6 +3919,8 @@ debug/moc_updatenotifywidget.cpp: Widgets/updatenotifywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ @@ -3928,8 +3930,6 @@ debug/moc_updatenotifywidget.cpp: Widgets/updatenotifywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -3956,6 +3956,9 @@ debug/moc_updatenotifywidget.cpp: Widgets/updatenotifywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -3976,9 +3979,6 @@ debug/moc_updatenotifywidget.cpp: Widgets/updatenotifywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -4189,11 +4189,11 @@ debug/moc_versionselectwidget.cpp: Widgets/versionselectwidget.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -4219,6 +4219,8 @@ debug/moc_versionselectwidget.cpp: Widgets/versionselectwidget.h \ Widgets/updatenotifywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -4239,8 +4241,6 @@ debug/moc_versionselectwidget.cpp: Widgets/versionselectwidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -4684,11 +4684,11 @@ debug/sendsystem.o: Core/sendsystem.cpp Core/sendsystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -4715,6 +4715,9 @@ debug/sendsystem.o: Core/sendsystem.cpp Core/sendsystem.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -4735,9 +4738,6 @@ debug/sendsystem.o: Core/sendsystem.cpp Core/sendsystem.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -4979,6 +4979,7 @@ debug/updatecontroller.o: Core/updatecontroller.cpp Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtXml/qtxmlglobal.h \ E:/QT/5.14.2/mingw73_64/include/QtXml/qtxml-config.h \ Data/Datas.h \ + Data/streamingversiondata.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ @@ -5005,7 +5006,6 @@ debug/updatecontroller.o: Core/updatecontroller.cpp Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - Data/streamingversiondata.h \ Core/externalexecuter.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QProcess \ E:/QT/5.14.2/mingw73_64/include/QtCore/qprocess.h \ @@ -5246,6 +5246,8 @@ debug/dataparser.o: Core/dataparser.cpp Core/dataparser.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtCore/qdatastream.h \ @@ -5319,8 +5321,6 @@ debug/dataparser.o: Core/dataparser.cpp Core/dataparser.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -5549,10 +5549,10 @@ debug/recognizesystem.o: Core/recognizesystem.cpp Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/tcpclient.h \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QHostAddress \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/qhostaddress.h \ @@ -5727,6 +5727,8 @@ debug/screenchecker.o: Core/screenchecker.cpp Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtCore/qdatastream.h \ @@ -5800,8 +5802,6 @@ debug/screenchecker.o: Core/screenchecker.cpp Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -5823,6 +5823,9 @@ debug/screenchecker.o: Core/screenchecker.cpp Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/versioncontainer.h \ Core/notifycontroller.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QMessageBox \ @@ -5836,7 +5839,6 @@ debug/screenchecker.o: Core/screenchecker.cpp Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlistview.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractitemview.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/qitemselectionmodel.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractitemdelegate.h \ @@ -5861,8 +5863,6 @@ debug/screenchecker.o: Core/screenchecker.cpp Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/qjsonvalue.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/qfactoryinterface.h \ UI/resourcemanager.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ mywinheader.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ E:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ @@ -6037,10 +6037,10 @@ debug/tcpclient.o: Core/tcpclient.cpp Core/tcpclient.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -6288,6 +6288,8 @@ debug/hashcomparer.o: Core/hashcomparer.cpp Core/hashcomparer.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamWriter \ E:/QT/5.14.2/mingw73_64/include/QtCore/qxmlstream.h \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtCore/qdatastream.h \ @@ -6358,8 +6360,6 @@ debug/hashcomparer.o: Core/hashcomparer.cpp Core/hashcomparer.h \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/qtcpserver.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -6845,10 +6845,10 @@ debug/commonbuttongroupwidget.o: Widgets/commonbuttongroupwidget.cpp Widgets/com E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -7070,6 +7070,8 @@ debug/entrywidget.o: Widgets/entrywidget.cpp Widgets/entrywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ @@ -7079,8 +7081,6 @@ debug/entrywidget.o: Widgets/entrywidget.cpp Widgets/entrywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -7107,6 +7107,9 @@ debug/entrywidget.o: Widgets/entrywidget.cpp Widgets/entrywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -7127,9 +7130,6 @@ debug/entrywidget.o: Widgets/entrywidget.cpp Widgets/entrywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -7312,6 +7312,8 @@ debug/instructorbuttongroupwidget.o: Widgets/instructorbuttongroupwidget.cpp Wid E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ @@ -7321,8 +7323,6 @@ debug/instructorbuttongroupwidget.o: Widgets/instructorbuttongroupwidget.cpp Wid E:/QT/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -7348,6 +7348,9 @@ debug/instructorbuttongroupwidget.o: Widgets/instructorbuttongroupwidget.cpp Wid Widgets/updatenotifywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -7368,9 +7371,6 @@ debug/instructorbuttongroupwidget.o: Widgets/instructorbuttongroupwidget.cpp Wid E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -7551,6 +7551,8 @@ debug/main.o: main.cpp mainwindow.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ @@ -7560,8 +7562,6 @@ debug/main.o: main.cpp mainwindow.h \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -7588,6 +7588,9 @@ debug/main.o: main.cpp mainwindow.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -7608,9 +7611,6 @@ debug/main.o: main.cpp mainwindow.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -7796,6 +7796,8 @@ debug/mainwindow.o: mainwindow.cpp mainwindow.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ @@ -7805,8 +7807,6 @@ debug/mainwindow.o: mainwindow.cpp mainwindow.h \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -7833,6 +7833,9 @@ debug/mainwindow.o: mainwindow.cpp mainwindow.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -7853,9 +7856,6 @@ debug/mainwindow.o: mainwindow.cpp mainwindow.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -8185,11 +8185,11 @@ debug/newversionwidget.o: Widgets/newversionwidget.cpp Widgets/newversionwidget. E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -8215,6 +8215,8 @@ debug/newversionwidget.o: Widgets/newversionwidget.cpp Widgets/newversionwidget. Widgets/updatenotifywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -8235,8 +8237,6 @@ debug/newversionwidget.o: Widgets/newversionwidget.cpp Widgets/newversionwidget. E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -8398,6 +8398,8 @@ debug/updatenotifywidget.o: Widgets/updatenotifywidget.cpp Widgets/updatenotifyw E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ @@ -8407,8 +8409,6 @@ debug/updatenotifywidget.o: Widgets/updatenotifywidget.cpp Widgets/updatenotifyw E:/QT/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -8666,11 +8666,11 @@ debug/versionselectwidget.o: Widgets/versionselectwidget.cpp Widgets/versionsele E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -8696,6 +8696,8 @@ debug/versionselectwidget.o: Widgets/versionselectwidget.cpp Widgets/versionsele Widgets/updatenotifywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -8716,8 +8718,6 @@ debug/versionselectwidget.o: Widgets/versionselectwidget.cpp Widgets/versionsele E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ diff --git a/Makefile.Release b/Makefile.Release index 083108a..f5d387d 100644 --- a/Makefile.Release +++ b/Makefile.Release @@ -564,11 +564,11 @@ release/moc_sendsystem.cpp: Core/sendsystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -595,6 +595,9 @@ release/moc_sendsystem.cpp: Core/sendsystem.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -615,9 +618,6 @@ release/moc_sendsystem.cpp: Core/sendsystem.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -802,6 +802,7 @@ release/moc_updatecontroller.cpp: Core/updatecontroller.h \ E:/QT/5.14.2/mingw73_64/include/QtXml/qtxmlglobal.h \ E:/QT/5.14.2/mingw73_64/include/QtXml/qtxml-config.h \ Data/Datas.h \ + Data/streamingversiondata.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ @@ -828,7 +829,6 @@ release/moc_updatecontroller.cpp: Core/updatecontroller.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - Data/streamingversiondata.h \ Core/UpdateController.h \ Core/externalexecuter.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QProcess \ @@ -1074,6 +1074,8 @@ release/moc_dataparser.cpp: Core/dataparser.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtCore/qdatastream.h \ @@ -1140,8 +1142,6 @@ release/moc_dataparser.cpp: Core/dataparser.h \ Core/dataparser.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/tcpclient.h \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QHostAddress \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/qhostaddress.h \ @@ -1380,11 +1380,11 @@ release/moc_recognizesystem.cpp: Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -1411,6 +1411,9 @@ release/moc_recognizesystem.cpp: Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -1431,9 +1434,6 @@ release/moc_recognizesystem.cpp: Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -1561,6 +1561,8 @@ release/moc_screenchecker.cpp: Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtCore/qdatastream.h \ @@ -1634,8 +1636,6 @@ release/moc_screenchecker.cpp: Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -1874,10 +1874,10 @@ release/moc_tcpclient.cpp: Core/tcpclient.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/tcpclient.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ @@ -2050,6 +2050,8 @@ release/moc_hashcomparer.cpp: Core/hashcomparer.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamWriter \ E:/QT/5.14.2/mingw73_64/include/QtCore/qxmlstream.h \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtCore/qdatastream.h \ @@ -2120,8 +2122,6 @@ release/moc_hashcomparer.cpp: Core/hashcomparer.h \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/qtcpserver.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -2605,10 +2605,10 @@ release/moc_commonbuttongroupwidget.cpp: Widgets/commonbuttongroupwidget.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -2832,6 +2832,8 @@ release/moc_entrywidget.cpp: Widgets/entrywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ @@ -2841,8 +2843,6 @@ release/moc_entrywidget.cpp: Widgets/entrywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -2869,6 +2869,9 @@ release/moc_entrywidget.cpp: Widgets/entrywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -2889,9 +2892,6 @@ release/moc_entrywidget.cpp: Widgets/entrywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -3076,6 +3076,8 @@ release/moc_instructorbuttongroupwidget.cpp: Widgets/instructorbuttongroupwidget E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ @@ -3085,8 +3087,6 @@ release/moc_instructorbuttongroupwidget.cpp: Widgets/instructorbuttongroupwidget E:/QT/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -3112,6 +3112,9 @@ release/moc_instructorbuttongroupwidget.cpp: Widgets/instructorbuttongroupwidget Widgets/updatenotifywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -3132,9 +3135,6 @@ release/moc_instructorbuttongroupwidget.cpp: Widgets/instructorbuttongroupwidget E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -3317,6 +3317,8 @@ release/moc_mainwindow.cpp: mainwindow.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ @@ -3335,8 +3337,6 @@ release/moc_mainwindow.cpp: mainwindow.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -3704,11 +3704,11 @@ release/moc_newversionwidget.cpp: Widgets/newversionwidget.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -3734,6 +3734,8 @@ release/moc_newversionwidget.cpp: Widgets/newversionwidget.h \ Widgets/updatenotifywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -3754,8 +3756,6 @@ release/moc_newversionwidget.cpp: Widgets/newversionwidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -3919,6 +3919,8 @@ release/moc_updatenotifywidget.cpp: Widgets/updatenotifywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ @@ -3928,8 +3930,6 @@ release/moc_updatenotifywidget.cpp: Widgets/updatenotifywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -3956,6 +3956,9 @@ release/moc_updatenotifywidget.cpp: Widgets/updatenotifywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -3976,9 +3979,6 @@ release/moc_updatenotifywidget.cpp: Widgets/updatenotifywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -4189,11 +4189,11 @@ release/moc_versionselectwidget.cpp: Widgets/versionselectwidget.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -4219,6 +4219,8 @@ release/moc_versionselectwidget.cpp: Widgets/versionselectwidget.h \ Widgets/updatenotifywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -4239,8 +4241,6 @@ release/moc_versionselectwidget.cpp: Widgets/versionselectwidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -4684,11 +4684,11 @@ release/sendsystem.o: Core/sendsystem.cpp Core/sendsystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -4715,6 +4715,9 @@ release/sendsystem.o: Core/sendsystem.cpp Core/sendsystem.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -4735,9 +4738,6 @@ release/sendsystem.o: Core/sendsystem.cpp Core/sendsystem.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -4979,6 +4979,7 @@ release/updatecontroller.o: Core/updatecontroller.cpp Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtXml/qtxmlglobal.h \ E:/QT/5.14.2/mingw73_64/include/QtXml/qtxml-config.h \ Data/Datas.h \ + Data/streamingversiondata.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ @@ -5005,7 +5006,6 @@ release/updatecontroller.o: Core/updatecontroller.cpp Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - Data/streamingversiondata.h \ Core/externalexecuter.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QProcess \ E:/QT/5.14.2/mingw73_64/include/QtCore/qprocess.h \ @@ -5246,6 +5246,8 @@ release/dataparser.o: Core/dataparser.cpp Core/dataparser.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtCore/qdatastream.h \ @@ -5319,8 +5321,6 @@ release/dataparser.o: Core/dataparser.cpp Core/dataparser.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -5549,10 +5549,10 @@ release/recognizesystem.o: Core/recognizesystem.cpp Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/tcpclient.h \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QHostAddress \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/qhostaddress.h \ @@ -5727,6 +5727,8 @@ release/screenchecker.o: Core/screenchecker.cpp Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtCore/qdatastream.h \ @@ -5800,8 +5802,6 @@ release/screenchecker.o: Core/screenchecker.cpp Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -5823,6 +5823,9 @@ release/screenchecker.o: Core/screenchecker.cpp Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/versioncontainer.h \ Core/notifycontroller.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QMessageBox \ @@ -5836,7 +5839,6 @@ release/screenchecker.o: Core/screenchecker.cpp Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlistview.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractitemview.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/qitemselectionmodel.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractitemdelegate.h \ @@ -5861,8 +5863,6 @@ release/screenchecker.o: Core/screenchecker.cpp Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/qjsonvalue.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/qfactoryinterface.h \ UI/resourcemanager.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ mywinheader.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ E:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ @@ -6037,10 +6037,10 @@ release/tcpclient.o: Core/tcpclient.cpp Core/tcpclient.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -6288,6 +6288,8 @@ release/hashcomparer.o: Core/hashcomparer.cpp Core/hashcomparer.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamWriter \ E:/QT/5.14.2/mingw73_64/include/QtCore/qxmlstream.h \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtCore/qdatastream.h \ @@ -6358,8 +6360,6 @@ release/hashcomparer.o: Core/hashcomparer.cpp Core/hashcomparer.h \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/qtcpserver.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -6845,10 +6845,10 @@ release/commonbuttongroupwidget.o: Widgets/commonbuttongroupwidget.cpp Widgets/c E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -7070,6 +7070,8 @@ release/entrywidget.o: Widgets/entrywidget.cpp Widgets/entrywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ @@ -7079,8 +7081,6 @@ release/entrywidget.o: Widgets/entrywidget.cpp Widgets/entrywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -7107,6 +7107,9 @@ release/entrywidget.o: Widgets/entrywidget.cpp Widgets/entrywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -7127,9 +7130,6 @@ release/entrywidget.o: Widgets/entrywidget.cpp Widgets/entrywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -7312,6 +7312,8 @@ release/instructorbuttongroupwidget.o: Widgets/instructorbuttongroupwidget.cpp W E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ @@ -7321,8 +7323,6 @@ release/instructorbuttongroupwidget.o: Widgets/instructorbuttongroupwidget.cpp W E:/QT/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -7348,6 +7348,9 @@ release/instructorbuttongroupwidget.o: Widgets/instructorbuttongroupwidget.cpp W Widgets/updatenotifywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -7368,9 +7371,6 @@ release/instructorbuttongroupwidget.o: Widgets/instructorbuttongroupwidget.cpp W E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -7551,6 +7551,8 @@ release/main.o: main.cpp mainwindow.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ @@ -7560,8 +7562,6 @@ release/main.o: main.cpp mainwindow.h \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -7588,6 +7588,9 @@ release/main.o: main.cpp mainwindow.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -7608,9 +7611,6 @@ release/main.o: main.cpp mainwindow.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -7796,6 +7796,8 @@ release/mainwindow.o: mainwindow.cpp mainwindow.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ @@ -7805,8 +7807,6 @@ release/mainwindow.o: mainwindow.cpp mainwindow.h \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -7833,6 +7833,9 @@ release/mainwindow.o: mainwindow.cpp mainwindow.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -7853,9 +7856,6 @@ release/mainwindow.o: mainwindow.cpp mainwindow.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -8185,11 +8185,11 @@ release/newversionwidget.o: Widgets/newversionwidget.cpp Widgets/newversionwidge E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -8215,6 +8215,8 @@ release/newversionwidget.o: Widgets/newversionwidget.cpp Widgets/newversionwidge Widgets/updatenotifywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -8235,8 +8237,6 @@ release/newversionwidget.o: Widgets/newversionwidget.cpp Widgets/newversionwidge E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ @@ -8398,6 +8398,8 @@ release/updatenotifywidget.o: Widgets/updatenotifywidget.cpp Widgets/updatenotif E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QDataStream \ E:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ @@ -8407,8 +8409,6 @@ release/updatenotifywidget.o: Widgets/updatenotifywidget.cpp Widgets/updatenotif E:/QT/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -8666,11 +8666,11 @@ release/versionselectwidget.o: Widgets/versionselectwidget.cpp Widgets/versionse E:/QT/5.14.2/mingw73_64/include/QtCore/QList \ E:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Data/Datas.h \ + Data/streamingversiondata.h \ + E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ Core/recognizesystem.h \ Core/tools.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ - E:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ - Data/streamingversiondata.h \ Core/UpdateController.h \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ E:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -8696,6 +8696,8 @@ release/versionselectwidget.o: Widgets/versionselectwidget.cpp Widgets/versionse Widgets/updatenotifywidget.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ Core/screenchecker.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QScreen \ E:/QT/5.14.2/mingw73_64/include/QtGui/qscreen.h \ @@ -8716,8 +8718,6 @@ release/versionselectwidget.o: Widgets/versionselectwidget.cpp Widgets/versionse E:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ E:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - E:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ E:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ E:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ diff --git a/RRJClient.pro.user b/RRJClient.pro.user index 611cc28..9f3805f 100644 --- a/RRJClient.pro.user +++ b/RRJClient.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -67,7 +67,7 @@ Desktop Qt 5.14.2 MinGW 64-bit Desktop Qt 5.14.2 MinGW 64-bit qt.qt5.5142.win64_mingw73_kit - 0 + 1 0 0 @@ -299,7 +299,7 @@ false true - D:/QT/Projects/RRJClient + D:/QT/BUILDS/RRJClient/Release64 1 diff --git a/StaticData/authData.xml b/StaticData/authData.xml index 4032548..9429aff 100644 --- a/StaticData/authData.xml +++ b/StaticData/authData.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/StaticData/clientHash.xml b/StaticData/clientHash.xml index 6d055e7..62a0a2b 100644 --- a/StaticData/clientHash.xml +++ b/StaticData/clientHash.xml @@ -22,7 +22,6 @@ - @@ -192,17 +191,15 @@ - - - - - - - - - - - - + + + + + + + + + + diff --git a/StaticData/serverHash.xml b/StaticData/serverHash.xml index 3b24a5d..01e5a23 100644 --- a/StaticData/serverHash.xml +++ b/StaticData/serverHash.xml @@ -181,12 +181,10 @@ - - diff --git a/StaticData/settings.xml b/StaticData/settings.xml index b8b9e7d..cbee759 100644 --- a/StaticData/settings.xml +++ b/StaticData/settings.xml @@ -1,5 +1,5 @@ - - + + diff --git a/StaticData/streamingHash.xml b/StaticData/streamingHash.xml index 5cde9ea..58d7c5a 100644 --- a/StaticData/streamingHash.xml +++ b/StaticData/streamingHash.xml @@ -4,17 +4,15 @@ - - - - - - - - - - - - + + + + + + + + + + diff --git a/StaticData/temp.xml b/StaticData/temp.xml index d67ab92..ed93f70 100644 --- a/StaticData/temp.xml +++ b/StaticData/temp.xml @@ -1,2 +1,2 @@ - + diff --git a/Widgets/commonbuttongroupwidget.cpp b/Widgets/commonbuttongroupwidget.cpp index fe37c8f..13d4509 100644 --- a/Widgets/commonbuttongroupwidget.cpp +++ b/Widgets/commonbuttongroupwidget.cpp @@ -85,6 +85,7 @@ void CommonButtonGroupWidget::on_updateButton_clicked() emit sigSendPacket(PacketType::TYPE_UPDATE); startUpdateState(); mainWindow->disableUnsaveButton(true); + mainWindow->setInlineDebug(tr("Загрузка...")); } void CommonButtonGroupWidget::on_startButton_clicked() diff --git a/Widgets/instructorbuttongroupwidget.h b/Widgets/instructorbuttongroupwidget.h index f6ebc28..f76d956 100644 --- a/Widgets/instructorbuttongroupwidget.h +++ b/Widgets/instructorbuttongroupwidget.h @@ -19,7 +19,6 @@ public: void initialize(MainWindow *mainWindow); ~InstructorButtonGroupWidget(); - private slots: void on_loadToServerButton_clicked(); diff --git a/Widgets/updatenotifywidget.cpp b/Widgets/updatenotifywidget.cpp index 757626e..c02972d 100644 --- a/Widgets/updatenotifywidget.cpp +++ b/Widgets/updatenotifywidget.cpp @@ -31,31 +31,45 @@ void UpdateNotifyWidget::addToList(FileData fileData) ui->updateListWidget->addItem(itemName); } +void UpdateNotifyWidget::showTryChangeBase() +{ + QString path = QDir::currentPath() + streamingAssetsPath; + QString link = "папку"; + + ui->labelsLayout->addWidget(createLabel(tr("Данные изменения нельзя выгрузить на сервер, так как версия сервера не изменяема \n"))); + ui->labelsLayout->addWidget(createLabel(tr("Чтобы выгрузить на сервер нужно:"))); + ui->labelsLayout->addWidget(createLabel(tr("1. Скопировать измененные или созданные файлы в временную папку"))); + QLabel *labelStorage = new QLabel; + QString link2 = "тут"; + labelStorage->setText(tr("Файлы можно найти в ") + link2 ); + labelStorage->setOpenExternalLinks(true); + ui->labelsLayout->addWidget(labelStorage); + ui->labelsLayout->addWidget(createLabel(tr("2. Нажать Отменить изменения и дождатся окончания операции"))); + ui->labelsLayout->addWidget(createLabel(tr("3. Изменить версию сервера на изменяемую"))); + ui->labelsLayout->addWidget(createLabel(tr("4. Нажать обновить"))); + + //СОЗДАНИЕ + QLabel *linkLabel = new QLabel; + linkLabel->setText(tr("5. Скопировать файлы из временной папки в эту ") + link); + linkLabel->setOpenExternalLinks(true); + + ui->labelsLayout->addWidget(linkLabel); + ui->labelsLayout->addWidget(createLabel(tr("6.Перезапустить клиент и выгрузить изменения на сервер"))); + + setCantUpdateState(); +} + void UpdateNotifyWidget::showWithFill() { clearList(); - if(versionContainer->getServerVersion() == baseNamePackage) + if(!versionContainer->getLocalVersionData()->getIsChangeable()) { - QString link; - - ui->labelsLayout->addWidget(createLabel(tr("Данные изменения нельзя выгрузить на сервер, так как версия сервера не изменяема \n"))); - ui->labelsLayout->addWidget(createLabel(tr("Чтобы внести изменения нужно:"))); - ui->labelsLayout->addWidget(createLabel(tr("1. Скопировать измененные или созданные файлы в временную папку"))); - ui->labelsLayout->addWidget(createLabel(tr("2. Изменить версию сервера на изменяемую"))); - ui->labelsLayout->addWidget(createLabel(tr("3. Запустить клиент и обновить версию и выключить клиент"))); - - //СОЗДАНИЕ - QString path = QDir::currentPath() + streamingAssetsPath; - link = "\"папку\""; - QLabel *linkLabel = new QLabel; - linkLabel->setText(tr("4. Скопировать файлы из временной папки в эту ") + link); - linkLabel->setOpenExternalLinks(true); - - ui->labelsLayout->addWidget(linkLabel); - ui->labelsLayout->addWidget(createLabel(tr("5.Запустить клиент и выгрузить изменения на сервер"))); - - ui->instructorButtonGroup->hide(); + showTryChangeBase(); + } + else if(!versionContainer->getServerVersionData()->getIsChangeable()) + { + showTryChangeBase(); } else { @@ -64,10 +78,8 @@ void UpdateNotifyWidget::showWithFill() ui->labelsLayout->addWidget(createLabel(tr(" 2. Отменить изменения с загрузкой версии с сервера"))); ui->labelsLayout->addWidget(createLabel(tr(" 3. Запустить без отправки файлов, но с текущими изменениями"))); - ui->instructorButtonGroup->show(); + setUpdateState(); } - - qDebug() << ui->NotificationLabel->text(); show(); } @@ -102,6 +114,21 @@ void UpdateNotifyWidget::on_startWithCurrentChangesButton_clicked() mainWindow->startUnityClient(); } +void UpdateNotifyWidget::setUpdateState() +{ + ui->undoChangesButton->show(); + ui->loadToServerButton->show(); + ui->startWithCurrentChangesButton->show(); +} + + +void UpdateNotifyWidget::setCantUpdateState() +{ + ui->undoChangesButton->show(); + ui->loadToServerButton->hide(); + ui->startWithCurrentChangesButton->hide(); +} + UpdateNotifyWidget::~UpdateNotifyWidget() { delete ui; diff --git a/Widgets/updatenotifywidget.h b/Widgets/updatenotifywidget.h index 47d8bec..f8bd0a5 100644 --- a/Widgets/updatenotifywidget.h +++ b/Widgets/updatenotifywidget.h @@ -30,6 +30,8 @@ public: ~UpdateNotifyWidget(); + void showTryChangeBase(); + private slots: void on_closeButton_clicked(); void on_loadToServerButton_clicked(); @@ -45,6 +47,8 @@ private: int currentLoadingCount; QLabel* createLabel(QString text); void clearList(); + void setUpdateState(); + void setCantUpdateState(); }; #endif // UPDATENOTIFYWIDGET_H diff --git a/debug/RRJClient.exe b/debug/RRJClient.exe index 5670448..e0a7f97 100644 Binary files a/debug/RRJClient.exe and b/debug/RRJClient.exe differ diff --git a/debug/commonbuttongroupwidget.o b/debug/commonbuttongroupwidget.o index d198c5c..ccbd562 100644 Binary files a/debug/commonbuttongroupwidget.o and b/debug/commonbuttongroupwidget.o differ diff --git a/debug/dataparser.o b/debug/dataparser.o index ecb0949..486bb9b 100644 Binary files a/debug/dataparser.o and b/debug/dataparser.o differ diff --git a/debug/entrywidget.o b/debug/entrywidget.o index 21711d7..a9e9e1f 100644 Binary files a/debug/entrywidget.o and b/debug/entrywidget.o differ diff --git a/debug/hashcomparer.o b/debug/hashcomparer.o index b18f547..66555db 100644 Binary files a/debug/hashcomparer.o and b/debug/hashcomparer.o differ diff --git a/debug/instructorbuttongroupwidget.o b/debug/instructorbuttongroupwidget.o index 51ca99b..956119b 100644 Binary files a/debug/instructorbuttongroupwidget.o and b/debug/instructorbuttongroupwidget.o differ diff --git a/debug/main.o b/debug/main.o index d66db89..5e148da 100644 Binary files a/debug/main.o and b/debug/main.o differ diff --git a/debug/mainwindow.o b/debug/mainwindow.o index 8b94717..4d427da 100644 Binary files a/debug/mainwindow.o and b/debug/mainwindow.o differ diff --git a/debug/moc_dataparser.o b/debug/moc_dataparser.o index c63b7cd..9077da6 100644 Binary files a/debug/moc_dataparser.o and b/debug/moc_dataparser.o differ diff --git a/debug/moc_entrywidget.o b/debug/moc_entrywidget.o index b5a69c4..a164bcd 100644 Binary files a/debug/moc_entrywidget.o and b/debug/moc_entrywidget.o differ diff --git a/debug/moc_hashcomparer.o b/debug/moc_hashcomparer.o index 59d4320..7a1a901 100644 Binary files a/debug/moc_hashcomparer.o and b/debug/moc_hashcomparer.o differ diff --git a/debug/moc_instructorbuttongroupwidget.o b/debug/moc_instructorbuttongroupwidget.o index c30d1ed..0356292 100644 Binary files a/debug/moc_instructorbuttongroupwidget.o and b/debug/moc_instructorbuttongroupwidget.o differ diff --git a/debug/moc_mainwindow.o b/debug/moc_mainwindow.o index 5a2c3c7..14c58ca 100644 Binary files a/debug/moc_mainwindow.o and b/debug/moc_mainwindow.o differ diff --git a/debug/moc_recognizesystem.o b/debug/moc_recognizesystem.o index c031945..fe0642e 100644 Binary files a/debug/moc_recognizesystem.o and b/debug/moc_recognizesystem.o differ diff --git a/debug/moc_screenchecker.o b/debug/moc_screenchecker.o index 77d341c..484111a 100644 Binary files a/debug/moc_screenchecker.o and b/debug/moc_screenchecker.o differ diff --git a/debug/moc_tcpclient.o b/debug/moc_tcpclient.o index 84b6ff5..2fea694 100644 Binary files a/debug/moc_tcpclient.o and b/debug/moc_tcpclient.o differ diff --git a/debug/moc_updatenotifywidget.o b/debug/moc_updatenotifywidget.o index ef08d1d..6a25114 100644 Binary files a/debug/moc_updatenotifywidget.o and b/debug/moc_updatenotifywidget.o differ diff --git a/debug/moc_versioncontainer.cpp b/debug/moc_versioncontainer.cpp index 3664892..374df0f 100644 --- a/debug/moc_versioncontainer.cpp +++ b/debug/moc_versioncontainer.cpp @@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_VersionContainer_t { - QByteArrayData data[1]; - char stringdata0[17]; + QByteArrayData data[5]; + char stringdata0[66]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -32,10 +32,15 @@ struct qt_meta_stringdata_VersionContainer_t { ) static const qt_meta_stringdata_VersionContainer_t qt_meta_stringdata_VersionContainer = { { -QT_MOC_LITERAL(0, 0, 16) // "VersionContainer" +QT_MOC_LITERAL(0, 0, 16), // "VersionContainer" +QT_MOC_LITERAL(1, 17, 19), // "sigSetServerVersion" +QT_MOC_LITERAL(2, 37, 0), // "" +QT_MOC_LITERAL(3, 38, 21), // "StreamingVersionData*" +QT_MOC_LITERAL(4, 60, 5) // "value" }, - "VersionContainer" + "VersionContainer\0sigSetServerVersion\0" + "\0StreamingVersionData*\0value" }; #undef QT_MOC_LITERAL @@ -45,22 +50,41 @@ static const uint qt_meta_data_VersionContainer[] = { 8, // revision 0, // classname 0, 0, // classinfo - 0, 0, // methods + 1, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags - 0, // signalCount + 1, // signalCount + + // signals: name, argc, parameters, tag, flags + 1, 1, 19, 2, 0x06 /* Public */, + + // signals: parameters + QMetaType::Void, 0x80000000 | 3, 4, 0 // eod }; void VersionContainer::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { - Q_UNUSED(_o); - Q_UNUSED(_id); - Q_UNUSED(_c); - Q_UNUSED(_a); + if (_c == QMetaObject::InvokeMetaMethod) { + auto *_t = static_cast(_o); + Q_UNUSED(_t) + switch (_id) { + case 0: _t->sigSetServerVersion((*reinterpret_cast< StreamingVersionData*(*)>(_a[1]))); break; + default: ; + } + } else if (_c == QMetaObject::IndexOfMethod) { + int *result = reinterpret_cast(_a[0]); + { + using _t = void (VersionContainer::*)(StreamingVersionData * ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&VersionContainer::sigSetServerVersion)) { + *result = 0; + return; + } + } + } } QT_INIT_METAOBJECT const QMetaObject VersionContainer::staticMetaObject = { { @@ -89,7 +113,25 @@ void *VersionContainer::qt_metacast(const char *_clname) int VersionContainer::qt_metacall(QMetaObject::Call _c, int _id, void **_a) { _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { + if (_id < 1) + *reinterpret_cast(_a[0]) = -1; + _id -= 1; + } return _id; } + +// SIGNAL 0 +void VersionContainer::sigSetServerVersion(StreamingVersionData * _t1) +{ + void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; + QMetaObject::activate(this, &staticMetaObject, 0, _a); +} QT_WARNING_POP QT_END_MOC_NAMESPACE diff --git a/debug/moc_versioncontainer.o b/debug/moc_versioncontainer.o index 97887bd..8f00230 100644 Binary files a/debug/moc_versioncontainer.o and b/debug/moc_versioncontainer.o differ diff --git a/debug/qrc_resources.cpp b/debug/qrc_resources.cpp index fc3c584..b714f42 100644 --- a/debug/qrc_resources.cpp +++ b/debug/qrc_resources.cpp @@ -8,62 +8,62 @@ static const unsigned char qt_resource_data[] = { // D:/QT/Projects/RRJClient/style.css - 0x0,0x0,0x3,0x60, + 0x0,0x0,0x3,0x5c, 0x0, - 0x0,0xf,0x7c,0x78,0x9c,0xd5,0x57,0xed,0x6e,0xda,0x30,0x14,0xfd,0x8f,0xc4,0x3b, - 0x44,0x45,0x93,0x4a,0x15,0x4a,0x8,0xd0,0xa2,0xec,0x1f,0xed,0x3e,0x35,0xaa,0x55, - 0xed,0xda,0x9f,0x93,0x93,0xb8,0x89,0x85,0xb1,0x91,0xe3,0x14,0xd0,0x34,0x69,0x7b, - 0xa5,0x49,0x93,0xba,0x49,0xeb,0x33,0xd0,0x37,0xda,0x25,0x9,0xf9,0x20,0x1,0x42, - 0x37,0x4d,0x6b,0x69,0x80,0x26,0xf6,0xf1,0xb9,0xbe,0xe7,0x1e,0xdf,0x56,0x2b,0xe7, - 0x3,0x44,0xd8,0x35,0x61,0x36,0x9f,0x54,0x2b,0x9f,0xaa,0x15,0x5,0x7e,0x4c,0x64, - 0xd,0x1d,0xc1,0x7d,0x66,0x37,0xc8,0x8,0x39,0xd8,0x50,0x7c,0x41,0xf7,0x8d,0xa6, - 0xc0,0x1e,0xf7,0x85,0x85,0x9b,0x17,0x17,0x6f,0x3f,0x26,0x83,0x4e,0x91,0x18,0x5e, - 0xc,0xe,0xc7,0xcc,0xa9,0x3f,0xcf,0x1,0x8c,0xb9,0x47,0x24,0xe1,0xcc,0x50,0x2c, - 0xcc,0x24,0x16,0x30,0xe2,0x73,0xb5,0x52,0xad,0x9c,0xbf,0x14,0x68,0x84,0x6b,0xc9, - 0xc8,0xf,0x63,0x1b,0x49,0xfc,0x6f,0x39,0xbc,0x23,0x9e,0xbc,0x26,0xb6,0x83,0x65, - 0xcd,0xf,0x96,0x4f,0x6e,0x14,0x11,0xb1,0x38,0xe5,0xc2,0x50,0x84,0x63,0xa2,0xfd, - 0x5e,0x4b,0xd,0x7f,0x5b,0x3d,0x6d,0xb9,0x64,0xf8,0x7c,0xe2,0x12,0x89,0x93,0x25, - 0x90,0x89,0x69,0x6d,0xc0,0x6f,0x9,0xe,0xbe,0xae,0xc7,0xd,0x60,0x35,0x75,0xf1, - 0xea,0x6a,0xcf,0xea,0x31,0xc2,0x9,0x1f,0x99,0xbc,0xcf,0xa7,0x9b,0x19,0xed,0xeb, - 0x5a,0x5b,0xd5,0xf5,0x9e,0xaa,0x77,0xbb,0xf1,0x16,0x70,0x61,0x63,0xd1,0xf0,0xe4, - 0x8c,0xc2,0xfe,0x71,0x5f,0x7a,0x58,0x66,0x1f,0x9,0x64,0x13,0xdf,0x33,0x94,0xf6, - 0x78,0x1a,0x3d,0xb8,0xe1,0x4c,0x36,0x6e,0xd0,0x88,0xd0,0x99,0xa1,0xec,0x9d,0x20, - 0x4a,0x4c,0x41,0xf6,0x52,0xf,0xd,0xa5,0x75,0x14,0x8f,0x4e,0xad,0xdf,0xe9,0xaa, - 0xbd,0x8e,0xda,0x6a,0x6b,0x9,0xf3,0xf7,0xbe,0xe7,0xf6,0x7d,0x29,0x39,0x7b,0xca, - 0xdc,0xd,0x9b,0x78,0xc8,0xa4,0xd8,0xde,0x10,0x4,0x25,0x8e,0x2b,0x5f,0x9,0x34, - 0xcb,0x62,0x3b,0x70,0x67,0x9,0x38,0xc0,0x9e,0x7,0x3a,0x2e,0x91,0xc8,0x8e,0xa6, - 0x46,0x57,0x42,0x27,0x99,0xad,0x9c,0x67,0x75,0x14,0xc5,0xd5,0x5b,0x8d,0xcb,0xa4, - 0x80,0x5e,0x38,0xbf,0x7c,0x5a,0xf4,0xae,0x1a,0x5d,0xf5,0x62,0xf0,0x24,0x1d,0x40, - 0x61,0x3c,0x55,0x3c,0x4e,0x89,0x1d,0x84,0x5d,0x9c,0x2b,0x3d,0x66,0x39,0x46,0xb6, - 0x4d,0x98,0x63,0x28,0xda,0xa1,0x8e,0x47,0xf1,0x7b,0x7b,0xf9,0x3d,0x1a,0x36,0x22, - 0xac,0x31,0x21,0xb6,0x74,0xd,0xe5,0x58,0xb,0x26,0x2f,0x2b,0x97,0xe1,0x17,0x36, - 0x49,0x95,0xe9,0x8e,0x7a,0x89,0xb2,0x2c,0xb8,0x3,0x8e,0xe2,0xf5,0x91,0x58,0x41, - 0xa,0xb8,0x46,0xf1,0xe4,0x24,0x52,0x80,0xda,0x5d,0xb7,0xff,0x65,0x85,0x9,0x0, - 0x80,0x49,0xed,0xe8,0xae,0xc4,0x53,0xd9,0x80,0x81,0x4e,0xce,0xb5,0xb2,0xb4,0xd, - 0xc3,0x72,0x7d,0x36,0x5c,0xdd,0x87,0x3c,0xad,0x52,0x95,0x17,0x39,0x8e,0x8b,0xad, - 0x61,0x5a,0xa8,0x69,0xfe,0x6b,0xe8,0xe7,0xf4,0x97,0xb5,0xc1,0xc8,0x65,0x89,0xc5, - 0xd9,0xaa,0xbf,0x86,0x84,0x8b,0x4d,0xfe,0xd,0x8c,0xf7,0x9a,0x63,0x8a,0x18,0xe, - 0xbc,0x5d,0xd1,0xa2,0x97,0x27,0x5,0x96,0x96,0xbb,0xfc,0x5c,0x8a,0x6a,0xad,0xd1, - 0xe7,0x4a,0x66,0x4b,0x3a,0x74,0x6d,0x73,0x3c,0x97,0x90,0x9e,0x85,0xfe,0x6a,0x84, - 0x51,0x90,0xe2,0xe2,0xcf,0x53,0x6c,0xfa,0xce,0xb6,0x63,0x23,0xf4,0xf7,0x58,0x44, - 0x65,0x84,0x51,0x6e,0x67,0x5d,0x8c,0x60,0x1b,0xb7,0x9d,0x5d,0x6b,0x53,0x9e,0x39, - 0x5,0xcb,0x9d,0x80,0x29,0x9c,0xc7,0x19,0x77,0x2b,0x5d,0xd0,0xe1,0x9a,0xca,0xe3, - 0x19,0x68,0xab,0x95,0xf9,0x37,0x18,0x14,0x99,0xed,0xce,0xca,0x29,0x3e,0x61,0x6, - 0x33,0xe8,0xba,0x5e,0x7,0x59,0x8b,0x92,0xb7,0xf3,0x52,0x79,0x69,0xac,0x39,0xcc, - 0xc2,0x26,0x4,0xaa,0xc8,0xf1,0xa1,0xca,0x2e,0x89,0xa4,0xb8,0xdc,0x3a,0x85,0x8a, - 0xb,0xd1,0xce,0xb8,0x24,0x37,0xc4,0x42,0x8b,0x7a,0xdb,0x81,0x79,0x11,0xe2,0xa2, - 0x9e,0x38,0xa7,0xe1,0x99,0x54,0x83,0xe3,0x16,0xa,0x7e,0x76,0x45,0xf0,0x24,0xe7, - 0xc9,0x9d,0x3f,0xf2,0xe4,0xe2,0x39,0x39,0x6d,0xad,0x54,0x7a,0x21,0x33,0x70,0x5d, - 0xf0,0xc8,0x8d,0x3d,0xc1,0x62,0xb5,0x56,0x17,0x1a,0xc4,0xe3,0x23,0x50,0x67,0xab, - 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, + 0x0,0xf,0x7c,0x78,0x9c,0xd5,0x57,0xdb,0x6e,0xda,0x40,0x10,0x7d,0x47,0xe2,0x1f, + 0xac,0xa0,0x4a,0x21,0x32,0xc1,0xdc,0x12,0xe4,0xbe,0x91,0xde,0x55,0xa2,0x46,0x49, + 0x93,0xc7,0x6a,0x6d,0x6f,0xec,0x15,0xcb,0xae,0xb5,0x5e,0x7,0x50,0x55,0xa9,0xfd, + 0xa5,0x4a,0x95,0xd2,0x4a,0xcd,0x37,0x90,0x3f,0xea,0x60,0x1b,0x5f,0xb0,0x1,0x93, + 0x46,0x55,0x3,0x18,0x1b,0x7b,0xf7,0xec,0x99,0x9d,0x99,0x33,0x43,0xb5,0x72,0x36, + 0x44,0x84,0x5d,0x11,0x66,0xf1,0x49,0xb5,0xf2,0xb9,0x5a,0x51,0xe0,0x65,0x20,0x73, + 0x64,0xb,0xee,0x33,0xab,0x41,0xc6,0xc8,0xc6,0xba,0xe2,0xb,0xba,0xaf,0x37,0x5, + 0xf6,0xb8,0x2f,0x4c,0xdc,0x3c,0x3f,0x7f,0xf7,0x29,0x19,0xf4,0x2,0x89,0xd1,0xf9, + 0xf0,0xd0,0x65,0x76,0xfd,0x79,0xe,0xc0,0xe5,0x1e,0x91,0x84,0x33,0x5d,0x31,0x31, + 0x93,0x58,0xc0,0x88,0x2f,0xd5,0x4a,0xb5,0x72,0xf6,0x4a,0xa0,0x31,0xae,0x25,0x23, + 0x3f,0xba,0x16,0x92,0xf8,0xdf,0x72,0x78,0x4f,0x3c,0x79,0x45,0x2c,0x1b,0xcb,0x9a, + 0x1f,0x2c,0x9f,0xdc,0x28,0x22,0x62,0x72,0xca,0x85,0xae,0x8,0xdb,0x40,0xfb,0xfd, + 0x96,0x1a,0x7e,0x5a,0x7d,0x6d,0xb9,0x64,0xf8,0x7c,0xe2,0x10,0x89,0x93,0x25,0x90, + 0x81,0x69,0x6d,0xc8,0x6f,0x8,0xe,0x2e,0xd7,0xe3,0x6,0xb0,0x9a,0xba,0x78,0xf7, + 0xb4,0x67,0xf5,0x18,0xe1,0x84,0x8f,0xd,0x3e,0xe0,0xd3,0xcd,0x8c,0xf6,0xdb,0x5a, + 0x47,0x6d,0xb7,0xfb,0x6a,0xbb,0xd7,0x8b,0xb7,0x80,0xb,0xb,0x8b,0x86,0x27,0x67, + 0x14,0xf6,0x8f,0xfb,0xd2,0xc3,0x32,0xfb,0x48,0x20,0x8b,0xf8,0x9e,0xae,0x74,0xdc, + 0x69,0xf4,0xe0,0x9a,0x33,0xd9,0xb8,0x46,0x63,0x42,0x67,0xba,0xb2,0x77,0x82,0x28, + 0x31,0x4,0xd9,0x4b,0x3d,0xd4,0x95,0xd6,0x51,0x3c,0x3a,0xb5,0x7e,0xb7,0xa7,0xf6, + 0xbb,0x6a,0xab,0xa3,0x25,0xcc,0x3f,0xf8,0x9e,0x33,0xf0,0xa5,0xe4,0xec,0x29,0x73, + 0xd7,0x2d,0xe2,0x21,0x83,0x62,0x6b,0x83,0x11,0x94,0xd8,0x8e,0x7c,0x2d,0xd0,0x2c, + 0x8b,0x6d,0xc3,0x9d,0x25,0xe0,0x10,0x7b,0x1e,0xc4,0x71,0x9,0x47,0x76,0x35,0x35, + 0x3a,0x12,0x3a,0xc9,0x6c,0xe5,0x2c,0x1b,0x47,0xeb,0xec,0x32,0x28,0xa0,0x17,0xce, + 0x2f,0xef,0x96,0x76,0x4f,0x8d,0x8e,0x7a,0x31,0x78,0xe2,0xe,0xa0,0xe0,0x4e,0x15, + 0x8f,0x53,0x62,0x5,0x66,0x17,0xfb,0xaa,0x1d,0xb3,0x74,0x91,0x65,0x11,0x66,0xeb, + 0x8a,0x76,0xd8,0xc6,0xe3,0xf8,0xbb,0xb3,0xbc,0x8e,0x86,0x8d,0x9,0x6b,0x4c,0x88, + 0x25,0x1d,0x5d,0x39,0xd6,0x82,0xc9,0xcb,0xcc,0x65,0xf8,0xa5,0x45,0x52,0x69,0xba, + 0x63,0xbc,0x44,0x5e,0x16,0xdc,0x6,0x45,0xf1,0x6,0x48,0xac,0x20,0x5,0x5c,0x23, + 0x7b,0x72,0x21,0x52,0x80,0xda,0x5b,0xb7,0xff,0x65,0x3,0x13,0x0,0x0,0x93,0x5a, + 0xd1,0x5d,0x89,0xa7,0xb2,0x1,0x3,0xed,0x9c,0x6a,0x65,0x69,0xeb,0xba,0xe9,0xf8, + 0x6c,0xb4,0xba,0xf,0x79,0x5a,0xa5,0x32,0x2f,0x52,0x1c,0x7,0x9b,0xa3,0x74,0xa0, + 0xa6,0xf9,0xaf,0xa1,0xdf,0x5f,0xb5,0x3f,0x2b,0x83,0x91,0xca,0x12,0x93,0xb3,0x55, + 0x7d,0xd,0x9,0x17,0x8b,0xfc,0x5b,0x18,0xef,0x35,0x5d,0x8a,0x18,0xe,0xb4,0x5d, + 0xd1,0xa2,0xb7,0x27,0x5,0x96,0xa6,0xb3,0x3c,0x2f,0x83,0x6a,0xad,0xd0,0xe7,0x52, + 0x66,0x9b,0x3b,0xb6,0xd8,0x73,0x1,0xee,0x59,0xc4,0x5f,0x8d,0x30,0xa,0xa1,0xb8, + 0xf8,0xf9,0x2,0x1b,0xbe,0xbd,0xad,0x6c,0x84,0xfa,0x1e,0x7,0xd1,0x23,0x30,0x89, + 0x76,0xd6,0xc1,0x8,0xb6,0x71,0x5b,0xed,0x5a,0xeb,0xf2,0x4c,0x15,0x2c,0x57,0x1, + 0x53,0x38,0xf,0x13,0xee,0x56,0x3a,0xa1,0xc3,0x35,0x95,0x87,0x33,0xd0,0x56,0x33, + 0xf3,0x31,0x18,0x14,0x89,0xed,0x16,0x7f,0xb5,0xb5,0x72,0x15,0x66,0x38,0x83,0xae, + 0xeb,0x4d,0xe0,0xb5,0xc8,0x79,0x8f,0x10,0xa4,0x6b,0x8a,0x59,0xd8,0x84,0x40,0x16, + 0xd9,0x3e,0x64,0xd9,0x5,0x91,0x14,0x97,0x5b,0xa7,0x30,0xe2,0x42,0xb4,0x53,0x2e, + 0xc9,0x35,0x31,0xd1,0x22,0xdf,0x76,0x60,0x5e,0x84,0xb8,0xc8,0x27,0xce,0x69,0x58, + 0x93,0x6a,0x50,0x6e,0x21,0xe1,0x67,0x97,0x4,0x4f,0x72,0x9a,0xdc,0xfd,0x2b,0x4d, + 0x2e,0x9e,0x93,0x8b,0xad,0x95,0x4c,0x2f,0x64,0x6,0xaa,0xb,0x1a,0xb9,0xb1,0x27, + 0x58,0xac,0xd6,0xea,0x41,0x83,0x78,0x7c,0x4,0xd1,0xd9,0xaa,0x6f,0xb5,0xb6,0x4c, + 0xa3,0x51,0x0,0xba,0xc1,0xbe,0x7c,0x33,0x53,0x8b,0x78,0x7,0x1e,0x2b,0xd3,0x4, + 0x64,0x24,0x2b,0x87,0x6,0xda,0x37,0xda,0x19,0xa5,0x64,0x8c,0x18,0xd4,0x8f,0xbd, + 0xd0,0x3c,0x50,0xe6,0x77,0xf3,0x5f,0xf3,0xdf,0xf3,0x3b,0x65,0xf1,0x35,0xff,0xe, + 0xc7,0x4f,0x5,0x4e,0x3f,0xee,0xbf,0xde,0x7f,0x9b,0xdf,0xce,0x6f,0xf,0x9a,0xf1, + 0x9f,0x8a,0x53,0x3c,0xb9,0xc4,0x62,0x10,0x13,0xd9,0xa2,0x87,0x45,0xfd,0x56,0x18, + 0xe3,0xae,0xc0,0x37,0x80,0x94,0x4d,0x98,0x25,0xbb,0x6c,0x79,0xd7,0xa3,0x64,0x2c, + 0x98,0x7e,0x89,0xc0,0x92,0x7,0x4c,0x67,0x78,0x72,0xa,0xe6,0x0,0x82,0x7,0x39, + 0xb6,0x3b,0x89,0xb4,0xd7,0x11,0x33,0xcb,0xf9,0xfb,0x7f,0x6e,0xfa,0xd2,0x6,0x9, + 0xc,0x22,0xfd,0xa4,0xd,0xfa,0x3,0xed,0xc6,0x88,0xa4, // D:/QT/Projects/RRJClient/resource/SSJ_backgroundDark.png 0x0,0x22,0x2a,0x2f, 0x89, @@ -328148,7 +328148,7 @@ static const unsigned char qt_resource_struct[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, // :/style.css 0x0,0x0,0x0,0x16,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0, -0x0,0x0,0x1,0x94,0x88,0xbe,0xfc,0x99, +0x0,0x0,0x1,0x94,0x8e,0x39,0x33,0xaa, // :/resource 0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x6,0x0,0x0,0x0,0x3, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, @@ -328159,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,0x0,0x0,0x0,0x0,0x0, // :/resource/SSJ-100Dark.png - 0x0,0x0,0x0,0xb2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x3c,0x49,0xe4, + 0x0,0x0,0x0,0xb2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x3c,0x49,0xe0, 0x0,0x0,0x1,0x94,0x82,0xb8,0xcc,0x46, // :/resource/SSJ-100.png - 0x0,0x0,0x0,0x96,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x2f,0xcd,0x36, + 0x0,0x0,0x0,0x96,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x2f,0xcd,0x32, 0x0,0x0,0x1,0x94,0x82,0xb8,0xcc,0x44, // :/resource/SSJ_backgroundDarkSM.png - 0x0,0x0,0x0,0x60,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x22,0x2d,0x97, + 0x0,0x0,0x0,0x60,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x22,0x2d,0x93, 0x0,0x0,0x1,0x94,0x82,0xb9,0x9,0xc2, // :/resource/SSJ_backgroundDark.png - 0x0,0x0,0x0,0x2e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x3,0x64, + 0x0,0x0,0x0,0x2e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x3,0x60, 0x0,0x0,0x1,0x94,0x82,0xb9,0x9,0xbf, // :/resource/Icons/caution.png - 0x0,0x0,0x1,0x90,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x5,0x71, + 0x0,0x0,0x1,0x90,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x5,0x6d, 0x0,0x0,0x1,0x94,0x82,0xb9,0xe,0x4a, // :/resource/Icons/setting.png - 0x0,0x0,0x2,0x34,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xa6,0x74, + 0x0,0x0,0x2,0x34,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xa6,0x70, 0x0,0x0,0x1,0x94,0x82,0xb8,0xc6,0x23, // :/resource/Icons/checked.png - 0x0,0x0,0x2,0x90,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0x3,0xe1, + 0x0,0x0,0x2,0x90,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0x3,0xdd, 0x0,0x0,0x1,0x94,0x82,0xb8,0xd6,0xe7, // :/resource/Icons/settingWhite.png - 0x0,0x0,0x1,0xe2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x5a,0x6d, + 0x0,0x0,0x1,0xe2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x5a,0x69, 0x0,0x0,0x1,0x94,0x82,0xb8,0xc6,0x23, // :/resource/Icons/plane.png - 0x0,0x0,0x2,0x50,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xd1,0x86, + 0x0,0x0,0x2,0x50,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xd1,0x82, 0x0,0x0,0x1,0x94,0x82,0xb8,0xc2,0xec, // :/resource/Icons/crossInCircle.png - 0x0,0x0,0x2,0x68,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xd5,0xd3, + 0x0,0x0,0x2,0x68,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xd5,0xcf, 0x0,0x0,0x1,0x94,0x82,0xb8,0xcc,0x41, // :/resource/Icons/whiteCross.png - 0x0,0x0,0x1,0xc0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x43,0xf8, + 0x0,0x0,0x1,0xc0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x43,0xf4, 0x0,0x0,0x1,0x94,0x82,0xb8,0xcc,0x41, // :/resource/Icons/monitor-display.png - 0x0,0x0,0x2,0x8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xa0,0xa5, + 0x0,0x0,0x2,0x8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xa0,0xa1, 0x0,0x0,0x1,0x94,0x82,0xb8,0xc2,0xec, // :/resource/Icons/762.gif - 0x0,0x0,0x1,0xac,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x1d,0x82, + 0x0,0x0,0x1,0xac,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x1d,0x7e, 0x0,0x0,0x1,0x94,0x82,0xb8,0xcc,0x40, // :/resource/Fonts/HelveticaNeue-Medium.ttf - 0x0,0x0,0x0,0xf6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x46,0xbc,0x41, + 0x0,0x0,0x0,0xf6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x46,0xbc,0x3d, 0x0,0x0,0x1,0x94,0x82,0xb8,0xc2,0xec, // :/resource/Fonts/LiberationSans-Regular.ttf - 0x0,0x0,0x1,0x56,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0xad,0x75, + 0x0,0x0,0x1,0x56,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0xad,0x71, 0x0,0x0,0x1,0x94,0x82,0xb8,0xba,0xb3, // :/resource/Fonts/Kanit Cyrillic.ttf - 0x0,0x0,0x1,0x2c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0x25,0xb5, + 0x0,0x0,0x1,0x2c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0x25,0xb1, 0x0,0x0,0x1,0x94,0x82,0xb8,0xba,0xb0, }; diff --git a/debug/qrc_resources.o b/debug/qrc_resources.o index ef31912..bc201d7 100644 Binary files a/debug/qrc_resources.o and b/debug/qrc_resources.o differ diff --git a/debug/recognizesystem.o b/debug/recognizesystem.o index c0b2c2b..262d975 100644 Binary files a/debug/recognizesystem.o and b/debug/recognizesystem.o differ diff --git a/debug/screenchecker.o b/debug/screenchecker.o index 5873415..89b10c7 100644 Binary files a/debug/screenchecker.o and b/debug/screenchecker.o differ diff --git a/debug/tcpclient.o b/debug/tcpclient.o index cf0ffce..f8db7d6 100644 Binary files a/debug/tcpclient.o and b/debug/tcpclient.o differ diff --git a/debug/updatenotifywidget.o b/debug/updatenotifywidget.o index 3ab686c..5f02bae 100644 Binary files a/debug/updatenotifywidget.o and b/debug/updatenotifywidget.o differ diff --git a/debug/versioncontainer.o b/debug/versioncontainer.o index 66bc7e5..b2735ac 100644 Binary files a/debug/versioncontainer.o and b/debug/versioncontainer.o differ diff --git a/mainwindow.cpp b/mainwindow.cpp index 03ddba8..1c40106 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -98,7 +98,7 @@ void MainWindow::initialize() screenChecker->check(); - emit sigSetConnect(dataParser->getServerSettings(),workerThread); + emit sigSetConnect(dataParser->getClientSettings(),workerThread); checkAppAvailable(); //post @@ -122,6 +122,7 @@ void MainWindow::bindConnection() connect(this,&MainWindow::sigSendCheckUpdate,updateController,&UpdateController::checkCanUpdate,Qt::AutoConnection); connect(this,&MainWindow::sigGetConnected,client,&TCPClient::getIsConnected); connect(this,&MainWindow::sigCalculateHash,updateController,&UpdateController::calculateCommonHash); + connect(versionContainer,&VersionContainer::sigSetServerVersion,this,&MainWindow::setServerVersion); } void MainWindow::updateProgress() @@ -141,7 +142,7 @@ void MainWindow::loadComplete() ui->autostartCheckBox->hide(); ui->offlineStartButton->show(); - dataParser->changeVersion(versionContainer->getServerVersionData()->getViewName()); + dataParser->changeVersion(versionContainer->getServerVersionData()); setTitle(); } @@ -183,7 +184,7 @@ void MainWindow::setNeedUpdate(bool flag,quint64 size, quint64 fileCount,quint64 commonButtonGroupWidget->lastVerInstalledState(); ui->unsafeChangingButton->hide(); ui->offlineStartButton->setEnabled(true); - dataParser->changeVersion(versionContainer->getServerVersion()); + dataParser->changeVersion(versionContainer->getServerVersionData()); activateLoadingAnimation(false); setTitle(); } @@ -284,19 +285,19 @@ void MainWindow::autoStart() void MainWindow::setTitle() { ui->versionLayoutWidget->show(); - ServerSettings *currentSettings = dataParser->getServerSettings(); + ServerSettings *currentSettings = dataParser->getClientSettings(); StreamingVersionData *versionData = new StreamingVersionData; versionData->setName(currentSettings->LocalVersionName); + versionData->setIsChangeable(currentSettings->versionData.getIsChangeable()); versionContainer->setLocalVersionData(versionData); ui->valueClientVersion->setText(versionContainer->getLocalVersion()); - ui->valueServerVersion->setText(versionContainer->getServerVersionData()->getViewName()); //title.append(" (" + currentSettings->LocalVersionName + ")"); } void MainWindow::loadStaticData() { - ServerSettings *currentSettings = dataParser->getServerSettings(); + ServerSettings *currentSettings = dataParser->getClientSettings(); entryWidget->fillSettings(currentSettings); ui->languageComboBox->setCurrentText(currentSettings->Language); @@ -329,6 +330,7 @@ void MainWindow::slotConnectionState(bool flag) { ui->notificationLabel->show(); QPalette palette = ui->notificationLabel->palette(); + ui->versionLayoutWidget->hide(); activateLoadingAnimation(false); @@ -405,7 +407,7 @@ void MainWindow::saveServerSettingsWithConnect() } //TODO: не заполняется 2 поля (автостарт и язык) ServerSettings *settings = entryWidget->getServerSettings(); - settings->LocalVersionName = dataParser->getServerSettings()->LocalVersionName; + settings->LocalVersionName = dataParser->getClientSettings()->LocalVersionName; dataParser->createServerSettings(settings); emit sigSetConnect(settings,workerThread); @@ -474,7 +476,7 @@ void MainWindow::on_offlineStartButton_clicked() void MainWindow::on_unsafeChangingButton_clicked() { - checkUpdate(); + //checkUpdate(); showUpdateInfo(); updateWidget->show(); } @@ -583,7 +585,15 @@ void MainWindow::activateLoadingAnimation(bool flag) } } +void MainWindow::setInlineDebug(QString value) +{ + ui->inlineTextDebug->setText(value); +} +void MainWindow::setServerVersion(StreamingVersionData *version) +{ + ui->valueServerVersion->setText(version->getViewName()); +} MainWindow::~MainWindow() { diff --git a/mainwindow.h b/mainwindow.h index 37f9682..693715f 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -61,6 +61,7 @@ public: void activateLoadingAnimation(bool flag); void showWarning(QString text); + void setInlineDebug(QString value); signals: void sigInitializeClient(MainWindow* mainWindow, RecognizeSystem *recognizeSystem, @@ -113,6 +114,7 @@ private: EntryWidget *entryWidget; VersionSelectWidget *versionSelectWidget; WaitAnimationWidget *waitAnimationWidget; + InstructorButtonGroupWidget *instructorButtonGroup; QTranslator translator; TCPClient *client; @@ -146,6 +148,7 @@ private: void setTitle(); void setUpUi(); + void setServerVersion(StreamingVersionData *version); protected: virtual void keyPressEvent(QKeyEvent *event); }; diff --git a/mainwindow.ui b/mainwindow.ui index d04cf5c..f235ec8 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -509,20 +509,23 @@ - + - 697 - 50 - 91 - 42 + 690 + 40 + 108 + 52 + + Qt::RightToLeft + - + 0 0 @@ -544,7 +547,7 @@ true - + 0 0 @@ -566,20 +569,33 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + 540 - 459 + 490 251 - 81 + 61 - 5 + 1 0 @@ -630,7 +646,7 @@ - value + ... Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -661,7 +677,7 @@ verticalLayoutWidget verticalLayoutWidget_2 verticalLayoutWidget_3 - horizontalLayoutWidget + horizontalWidget LanguageWidget versionLayoutWidget diff --git a/style.css b/style.css index f6fd7e4..69303f1 100644 --- a/style.css +++ b/style.css @@ -55,7 +55,7 @@ QMessageBox QMessageBox QLabel { - font: 18px; + font: 16px; color: black; } @@ -108,7 +108,7 @@ QWidget#iconWidget QLabel { font-family: "Calibri"; - font: 20px; + font: 18px; color: white; } diff --git a/ui_mainwindow.h b/ui_mainwindow.h index ac38d6f..a26f811 100644 --- a/ui_mainwindow.h +++ b/ui_mainwindow.h @@ -55,10 +55,11 @@ public: QVBoxLayout *verticalLayout; QCheckBox *autostartCheckBox; QLabel *inlineTextDebug; - QWidget *horizontalLayoutWidget; + QWidget *horizontalWidget; QHBoxLayout *additionalButtonLayout; QPushButton *unsafeChangingButton; QPushButton *settingsButton; + QSpacerItem *horizontalSpacer_3; QWidget *versionLayoutWidget; QVBoxLayout *versionLayout; QHBoxLayout *textPairLayout; @@ -267,35 +268,39 @@ public: verticalLayout->addWidget(inlineTextDebug); - horizontalLayoutWidget = new QWidget(centralwidget); - horizontalLayoutWidget->setObjectName(QString::fromUtf8("horizontalLayoutWidget")); - horizontalLayoutWidget->setGeometry(QRect(697, 50, 91, 42)); - additionalButtonLayout = new QHBoxLayout(horizontalLayoutWidget); + horizontalWidget = new QWidget(centralwidget); + horizontalWidget->setObjectName(QString::fromUtf8("horizontalWidget")); + horizontalWidget->setGeometry(QRect(690, 40, 108, 52)); + horizontalWidget->setLayoutDirection(Qt::RightToLeft); + additionalButtonLayout = new QHBoxLayout(horizontalWidget); additionalButtonLayout->setObjectName(QString::fromUtf8("additionalButtonLayout")); - additionalButtonLayout->setContentsMargins(0, 0, 0, 0); - unsafeChangingButton = new QPushButton(horizontalLayoutWidget); + unsafeChangingButton = new QPushButton(horizontalWidget); unsafeChangingButton->setObjectName(QString::fromUtf8("unsafeChangingButton")); - sizePolicy2.setHeightForWidth(unsafeChangingButton->sizePolicy().hasHeightForWidth()); - unsafeChangingButton->setSizePolicy(sizePolicy2); + sizePolicy.setHeightForWidth(unsafeChangingButton->sizePolicy().hasHeightForWidth()); + unsafeChangingButton->setSizePolicy(sizePolicy); unsafeChangingButton->setMinimumSize(QSize(40, 40)); additionalButtonLayout->addWidget(unsafeChangingButton); - settingsButton = new QPushButton(horizontalLayoutWidget); + settingsButton = new QPushButton(horizontalWidget); settingsButton->setObjectName(QString::fromUtf8("settingsButton")); settingsButton->setEnabled(true); - sizePolicy2.setHeightForWidth(settingsButton->sizePolicy().hasHeightForWidth()); - settingsButton->setSizePolicy(sizePolicy2); + sizePolicy.setHeightForWidth(settingsButton->sizePolicy().hasHeightForWidth()); + settingsButton->setSizePolicy(sizePolicy); settingsButton->setMinimumSize(QSize(40, 40)); settingsButton->setIconSize(QSize(30, 30)); additionalButtonLayout->addWidget(settingsButton); + horizontalSpacer_3 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + additionalButtonLayout->addItem(horizontalSpacer_3); + versionLayoutWidget = new QWidget(centralwidget); versionLayoutWidget->setObjectName(QString::fromUtf8("versionLayoutWidget")); - versionLayoutWidget->setGeometry(QRect(540, 459, 251, 81)); + versionLayoutWidget->setGeometry(QRect(540, 490, 251, 61)); versionLayout = new QVBoxLayout(versionLayoutWidget); - versionLayout->setSpacing(5); + versionLayout->setSpacing(1); versionLayout->setObjectName(QString::fromUtf8("versionLayout")); versionLayout->setContentsMargins(0, -1, -1, -1); textPairLayout = new QHBoxLayout(); @@ -346,7 +351,7 @@ public: verticalLayoutWidget->raise(); verticalLayoutWidget_2->raise(); verticalLayoutWidget_3->raise(); - horizontalLayoutWidget->raise(); + horizontalWidget->raise(); LanguageWidget->raise(); versionLayoutWidget->raise(); @@ -374,7 +379,7 @@ public: titleClientVersion->setText(QCoreApplication::translate("MainWindow", "\320\222\320\265\321\200\321\201\320\270\321\217:", nullptr)); valueClientVersion->setText(QCoreApplication::translate("MainWindow", "value", nullptr)); titleServerVersion->setText(QCoreApplication::translate("MainWindow", "\320\241\320\265\321\200\320\262\320\265\321\200:", nullptr)); - valueServerVersion->setText(QCoreApplication::translate("MainWindow", "value", nullptr)); + valueServerVersion->setText(QCoreApplication::translate("MainWindow", "...", nullptr)); } // retranslateUi };