From c23f3d519b569685d3138bf66f74b9969f9e76e5 Mon Sep 17 00:00:00 2001 From: semenov Date: Fri, 12 Dec 2025 11:34:02 +0300 Subject: [PATCH] fix: server changable version --- Core/dataparser.cpp | 4 +- Core/dataparser.h | 2 +- Core/dataparseroutput.cpp | 40 +- Core/dataparseroutput.h | 3 +- Core/tcpclient.cpp | 2 +- Core/tcpclient.h | 2 +- Data/Datas.h | 2 +- StaticData/authData.xml | 2 + StaticData/clientHash.xml | 8855 +++++++++++++++-------------- StaticData/serverHash.xml | 8842 ++++++++++++++-------------- StaticData/settings.xml | 4 +- StaticData/streamingHash.xml | 8719 ++++++++++++++-------------- StaticData/temp.xml | 2 +- Widgets/entrywidget.cpp | 16 +- Widgets/entrywidget.h | 4 +- Widgets/updatenotifywidget.cpp | 6 +- coremanager.cpp | 42 +- coremanager.h | 7 +- mainwindow.cpp | 2 +- mainwindow.h | 2 +- resource/Icons/planeCustom.png | Bin 13817 -> 15212 bytes resource/Icons/planeCustomIco.ico | Bin 7905 -> 15942 bytes widgetmanager.cpp | 2 +- widgetmanager.h | 2 +- 24 files changed, 13298 insertions(+), 13264 deletions(-) create mode 100644 StaticData/authData.xml diff --git a/Core/dataparser.cpp b/Core/dataparser.cpp index 5124959..897c4da 100644 --- a/Core/dataparser.cpp +++ b/Core/dataparser.cpp @@ -15,9 +15,9 @@ void DataParser::initialize(PostProcessorSystem *postProcessSystem) } -ServerSettings *DataParser::getClientSettings() +Settings *DataParser::getSettings() { - ServerSettings *settings = new ServerSettings; + Settings *settings = new Settings; QFile file(settingsName); file.open(QIODevice::ReadOnly); QXmlStreamReader xmlReader(&file); diff --git a/Core/dataparser.h b/Core/dataparser.h index 308246b..c664e7f 100644 --- a/Core/dataparser.h +++ b/Core/dataparser.h @@ -20,7 +20,7 @@ public: ~DataParser() = default; void initialize(PostProcessorSystem *postProcessSystem); - ServerSettings* getClientSettings(); + Settings* getSettings(); bool xmlParser(const QByteArray& array); private: PostProcessorSystem *postProcessSystem; diff --git a/Core/dataparseroutput.cpp b/Core/dataparseroutput.cpp index 24c34f6..0230a71 100644 --- a/Core/dataparseroutput.cpp +++ b/Core/dataparseroutput.cpp @@ -125,7 +125,42 @@ void DataParserOutput::createAuthMessage(ClientAutorization *auth) file.close(); } -void DataParserOutput::createServerSettings(ServerSettings* serverSettings) +void DataParserOutput::createServerSettings() +{ + QFile file(settingsName); + if (file.exists()) return; + + file.open(QIODevice::WriteOnly); + + QXmlStreamWriter xmlWriter(&file); + + xmlWriter.setAutoFormatting(true); + xmlWriter.writeStartDocument(); + + xmlWriter.writeStartElement("ServerSettingsContainer"); + xmlWriter.writeStartElement("ServerSettings"); + + xmlWriter.writeAttribute("Address",""); + xmlWriter.writeAttribute("Port",""); + xmlWriter.writeAttribute("Language","RUS"); + xmlWriter.writeAttribute("AutoStart",QString::number(false)); + + xmlWriter.writeEndElement(); + + xmlWriter.writeStartElement("VersionData"); + xmlWriter.writeAttribute("Version","-----"); + xmlWriter.writeAttribute("isChangable","0"); + xmlWriter.writeEndElement(); + + xmlWriter.writeEndElement(); + + xmlWriter.writeEndDocument(); + + file.close(); + +} + +void DataParserOutput::updateServerSettings(Settings* serverSettings) { QFile file(settingsName); file.open(QIODevice::WriteOnly); @@ -142,9 +177,6 @@ void DataParserOutput::createServerSettings(ServerSettings* serverSettings) xmlWriter.writeAttribute("Port",serverSettings->Port); xmlWriter.writeAttribute("Language","RUS"); xmlWriter.writeAttribute("AutoStart",QString::number(false)); - //xmlWriter.writeAttribute("DestPortMath","18003"); - //xmlWriter.writeAttribute("LocalPortMath","18004"); - //xmlWriter.writeAttribute("UseMathModel",QString::number(serverSettings->mathModelUse)); xmlWriter.writeEndElement(); diff --git a/Core/dataparseroutput.h b/Core/dataparseroutput.h index b7e0ab5..23850e5 100644 --- a/Core/dataparseroutput.h +++ b/Core/dataparseroutput.h @@ -17,7 +17,8 @@ public: explicit DataParserOutput(QObject *parent = 0); void createFileDataList(const QList& fileDataList,const QString& filename); void createAuthMessage(ClientAutorization *auth); - void createServerSettings(ServerSettings *serverSettings); + void createServerSettings(); + void updateServerSettings(Settings *serverSettings); void changeVersion(StreamingVersionData *versionData); void createAuthData(ServerAuthorization *serverAuth); void createAuthDataOffline(const QString& username,const QString& pass); diff --git a/Core/tcpclient.cpp b/Core/tcpclient.cpp index f4e5cf9..9d4222b 100644 --- a/Core/tcpclient.cpp +++ b/Core/tcpclient.cpp @@ -17,7 +17,7 @@ void TCPClient::initialize(RecognizeSystem *recognize,SendSystem *sendSystem) emit sigSendDebugLog(Tools::getTime() + " Client started"); } -void TCPClient::setConnect(ServerSettings *serverSettings) +void TCPClient::setConnect(Settings *serverSettings) { socket = new QTcpSocket(); qDebug() << "TCPCLient thread: " << thread(); diff --git a/Core/tcpclient.h b/Core/tcpclient.h index 8c6b2e5..551eeee 100644 --- a/Core/tcpclient.h +++ b/Core/tcpclient.h @@ -21,7 +21,7 @@ class TCPClient : public QObject public: explicit TCPClient(QObject *parent = 0); void initialize(RecognizeSystem *recognize,SendSystem *sendSystem); - void setConnect(ServerSettings *serverSettings); + void setConnect(Settings *serverSettings); ~TCPClient(){}; void setDisconnect(); bool getIsConnected() const; diff --git a/Data/Datas.h b/Data/Datas.h index 8f0942d..8e1b506 100644 --- a/Data/Datas.h +++ b/Data/Datas.h @@ -5,7 +5,7 @@ #include -class ServerSettings{ +class Settings{ public: QString Address; QString Port; diff --git a/StaticData/authData.xml b/StaticData/authData.xml new file mode 100644 index 0000000..7e0907e --- /dev/null +++ b/StaticData/authData.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/StaticData/clientHash.xml b/StaticData/clientHash.xml index c1ea42e..8a20643 100644 --- a/StaticData/clientHash.xml +++ b/StaticData/clientHash.xml @@ -1,169 +1,169 @@ - - - + + - + + - + - - - + + + - + - + - - + - + + - - + + - + + + - - - - - - - - + + - + - - + + + + + + - - - - - - + - + + + + + - - - + + - - + + + + - - - - - - - + + + + + - + - + - - + + - + + - - - + - - - - + + + - + + + - + + - + + - + + - - + - + - - - + + + @@ -205,35 +205,36 @@ + + - - - - - - - + + + + + + + - + - - + + - @@ -241,7 +242,7 @@ - + @@ -250,82 +251,81 @@ - + - + - - + + + - - - + + - - + - + - + - + + + - - - + - + + + - + - - - + - + - + - - + + + - + - @@ -334,35 +334,36 @@ + - - + + - + - + - + - + - + @@ -372,492 +373,491 @@ + - + - - - + + + - + - - - + - + + - - - - + + + + + - - + + - - + + - - - + + - + + - - - + + + - - + + - - + - + + - - + + - - - - + + + - - + + - - + + - + - + - + - - + + - - - - + + + + + - - - + + + - - - + + - - - + + + - - - - + + - + - + + - + + + - - - + + + - - - - + + - - - + + - + - + + - - - + + + - - + + + + - - - - + - - + + + + - - - + - + - + + - + - + - - - - + + + + - + - - + + - - + - - + + - + + + - - + + - - - - - - + + + + - - - + + + - + + - + + - - + - + - - + - + + + + - - - - + - + - + + + - + - + - - - - + - - - + + + + + - + + - + - - - - + + + + - - + + - - - - - - + + + + + - - + - - + + + - + - - + - - + + - - - + + + + - - + + @@ -866,515 +866,515 @@ - + - - + - + + - - + + - - + + + - - + + - - + - + + - - + - + - - + - + + + - - + - + - + + - - - - + + + - - + + + + - - - - + + + + + - - - - - + + - - - + + + + - - - + + + - - + + - + - - - - - + + + + + - + + - - - + + + - - + - - - + + + - - - + + + - + + - - - + + + - + + - - - - + - + + - + - - + - - + - + - - - - + + + + + - - - + + + - - - + + - + - + + - + - - + + - + - + - - + + + - - + + - - - - + + + - - + + + - + - + - - - - + - + + + + + - - - - - + + - - + - + + + + - - + + - + - - + - - - - + + + + + + - - - - + + + - - + - + - + + - + - - - + - + + - + - + + - - - - + + + + - + - - + + - - - + + + - + - - - + + + - + - - - + + + - - + + - - - - + - - - - + + + + + + + - - - + + + - - + - + + - + + - - @@ -1382,624 +1382,625 @@ + - + - - + + - - - + + - - + + + - - + - + + - - - + + - + + - - - - - + + + + + + - - - - + + + - - + - - + - - - + - + + + + + - - + + - - - + + + - - + + + - - - - - - - + - + + + + + + + - - - + - + - + + - - + - + - - - - - - + - + + + + + + - - + + - + + + + - - - + - - - + + - + - - - + + + - - - + + + + - - - + + + - + - - - + + + - - - - + + + - + - + + - + + + + + - - - + - - + - - - + + + + + - - - - - + + + - + - + - - + - + + + - + - - - - + + + + - - - - + + + + - - + + - - + - + - + + - - - - - + + + + - - + + + - - - + + + + - - - + + + - - - - - - + + - - + + - - + + + + - - + - - + + - + - + + - - - + + + - + - - - + + + - - - + + + - - + - + + - - + + - - - + + + + - - - + + - - - - + + - - + - + + + + - - + - - + + - - + + - - - - + + + - + + - - - - - - - + + + + + + - + + - + + - - - + + - - + + - + + - - - + + + + - - - - + + - - + + @@ -2008,1002 +2009,1002 @@ - + - + - - + + + - + - - - - - - - + + + + + + - - - + + - - + + - - + - - + + + + + - - - + - - + + + + + + - - - - - + - + + + - + - - + - + + + - + - - - - + + + + - + - - - - + - + - - - + + + + - + + + - - - - - - - - - + + - + + + + + + - - + - + + + + + - + + + + - - - - - - + - + + + + - - - - - + - + + - - + + - - - + - - - - - + + + + + + + - + - - + - - - - - + + + + + + - + - + - - + - - + + - - + + - - + + - + + - - - - - + + + - + + - + - + - - - + + + - - + + - + + - - - + + - + - + - + - - - - - - + + + + + + + - - + - - - - - - - + - - - + + + + + - - - - - - + + + + - + + + + + + - + - - + + + - - - + - - - - - - - + + + + + + + - + + - + + + - - - + + - - - - - - - - + + + + + + + - - - + + + - - + - - + + - - - - + - - + + + + + + + + - - + - + - + + - + - - - + + + - - - - + + + - - - + + + - + - + + + - - - - + + - + - - - + + + + - + + - - - - - - - - - - - + + + + + + + + + - - + + + - + - + - - + + - - - - - - + + + + - - + + + - + + - - + - - + + + + - - - + + - + - + + - - - - - - - - + + + + + + + - - - + + - + + - + - + + - + - - + - + - - - - - - - - + + + + + + + + - - - - + + + + - - + - - + + + - + + - - + - + - - + - - - - - - + + + + + + - - + + + + + - - - - + - + - - - - + + + + + + + - - - + - - - + + - - - + + + + - - - + - - - - + + + + + - - - - + + - - + + + - - + + + + + - - + - - + + + + + - - - + - - - - - - - - - - - + + + + + + + + + + - - + - + + - - + + + - - - + + - + - - + - - + + + + - - - - - - - - + + + + + + - - + + - - - - - + + + + + + - - - + + + - + + - - - + + + - - + + + - - - - - - + + - - - - - + + + + + - - - - + + + + + + - - + + + - - - + + + - - - - + - + + - + @@ -3017,86 +3018,85 @@ - + + - - - + - + + - - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + + - - + + - + - + - - + - + + - - - + + + - + + + - - - + - @@ -3105,85 +3105,87 @@ + + + + - - + - - - - - - + - + + + - - + + + - + - + + - + + - - - - - - - - - + + + + + + + + - - - - - + + + + - + + + + - - - - + + + - - + @@ -3192,9 +3194,9 @@ + - @@ -3202,3620 +3204,3619 @@ - - - + + + - + - + + - - + - - + + - - + + + - - - - + + + - - + + - + - + - + - + + - - - + + - + - - - - + - - - + + + + + + + - - - - - + + + - + + - - - + + - - + - + + - - - - - + + + + + + - + + - - - - + + - - - - + - + + - + + - + + - + + + - + + - - - + - + + - - - - - - + + + + + - - - - - - - + - + - + - + + - - - - - - - - - - + - + + + + + + + + + + + + - - + - + + - + - + + - - - - - - - - + - - - - - - - + + + + - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - + + + - + + - - - - + + + - - + + - - + + + - - + - + + - - + - - + - - - + + + + + - - - - + + + - + + + - + + - - - - + - - - + + + + - + + + - - - - - - + + + + - - - + + - + + + - - - - - - + + + + + - - - + - + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + - + - - - - - - - + + + - + + + + - - + - - - - - - + + + + + + + + + - - - - - - - + + + + + + + + - - - - - - - - + + + + + - + - - - + + + + - - - - - - - - - - - - - - + + + - - + + + + + + + + + + + - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + - - - - + + + + + + + + + - - - + - - + - - - - - - + + + + + + + + - - - - - + + - - + - + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + - - - - - + - - - + + + + - - - - - - - + + + + + - - + + + + + + - - + + - - - + + - - - - - - - - + + + + + + + + + + - - - - - - - + - - + + + - - - + + + + + + + + + - - - - - - + + + + + + - - - + + + - - - + + + - + - - - - + + - - + - - + + - - - + - + - + + + + - - - + + - + + - + - + + - - - - - + + + + + + - - - - + + + + + - - - - - - + + + + - - - - - - + + + - + + + - - - + + + - - - + - + - + - - + + - - - - - - - - + + + + + + + + - - - - + - - - - - + + + + + + + + + - - - - - - + + + - + + + + - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - - - - - - + + + + + - - + + - + - + + + + - - + - - - + + + + + - - - - + + + + + + + - - - - - - + - - - - - + + + + + + - + + + - - + - - + + - - - + + + - + + + + + - - - - + - - - - - - - + + + + + + + - - + - + - - + + - + + + + + + + - - - - - - - - - + + - + + + - - - - - - + + + + + + + + - - - + - + - - - - - - - - + + + + + - - + + + + + - - + - + + - - - - - + + + + - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + - - - - - + - - + - - - - - + + + + - - + + + + - - - - - - + + - - + + + + + + + + - - + + - - - + + - - + + - + + + + + + + + + + + + - - - - - - - - - - - - + - - - - - - - - - - + + + + + + + + + + + - - + - + - + + - - + + - + - + - - + + + + - - - - + - - - - - - + + + + + - + + + + + + - - - - - - - - + + + + + - - - - + - - - + + + - - + + - + + + + - + + - - - - - - - - - + + + + + + - + + + + + + - + - - + + - - - + + - - - + + + + + - - - - - + + - - - + - - + + - + + - - - - - - - - - - - - - - + + + - - - - - + + + + + + + + - + + + + + + + + + - - + - - + + + - - + - + + + - + - + + + + + + + - - - - - + + - + - - - - + + + + - - - - + + - + - - - - - + + + - - + + - + + + - - - - + - + + + - - - - - + - + + + + + - - + + + - - + - + + + + - - - + - - + - + + + + + - - - - + + + - - - + - + + - + + - + - - + - + - - - + - + - - - - - - - - + + + + + + + + - - - - + - + + + - - + + + + + + + - - - - - - - - + + + + - - + + - + + + + + + - + - - - - - + - - - - - + + - - + + + + + - - + + + + - + - - - + - + + + - + - - + + - - - - - + + - + - - + + + + - - - - - + + + + + - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - - + + + - - - - - - - + + + + + - - + + + + + - - - - - - + + - - + + + + + - - - - - + + + + + + + + - - - - - + + + - - - + - - - - - - - - - - + - - - + + + + + + + + + + + + - - - + + - + + + + + + + - - - - + - - + - - - - + + + + + - - + + + + - - - + - - + - + - - - - - + + + - + + + + - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - + + + - - - - + + + + + + + + + + + + + - - + + + + + - + + + - + + - - - - + + - - + - - + + + + + - - + + - - - - - - - - + + + + + + + - + - - - - + + + - + + + + + - - + - - - + - + + - + - + + - + + + - - - - + + - - - + - - + + - + - + - + - + + - + + + - - + - + + - + + - - - - + - - + + - - - + - + + - - - - - - - - - + + - + + + + + + - + - + + + + + - - - - + + - - - - - + + - - + + + + - + + - + - - - - - - - - - + + - + + + + + - - - - + + + + + + + + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + - + - + + + - - + - - + + - + - - + - + + + + + - - + - - - - - + + - + - - - - - + + + + + + + - - - - - + + + - - + + - - + + - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + - + + + + - - - - - - + + + - + + + + + - - + + - - - - - - + + + - + + + + - + + + + + + - - - - - + - - - - - - - - - - - - + + + + + + + + + + - - - + + + + + - - - - - - + + + + + + + + - - - - - - + - + - + - + + + + - - - + - - + + - - + + - + + + - - + - + + - + + - - - - - - - - + + + + + + - - - + - - + + + - - + + + + - + - - - - - - - - - - - - - - - - + + + + + + - + + + + + + + + + + - + + + - - - - - - - - - - - - - - - + + - + + + + + + + + + + + - - + + + + - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - + + - - + - - - - + - - + + + - + + + - - - - + + + + - - + - - - - - + + + + + + + - + - + - - + + - - - - - - + + + + + + - - + - - - - + + - + + - - - + - - + - + + + + + - + - - - + - + + + - - - - - - - - - + + + + + + - + + + + + - - - - - - - - - - + + + + + + + + - - - - - - - + + + + - + + + + + + + + - - - - - - - - + - - - + + + + + + + - - - - - - - - - - - + + - + + + + + + + + - - - + - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - - + + + - - - + + + + + + - - - - - + - - + + + + - + + + - - - - + - - - - + + - - - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + + - - - - + + + + + - - + - - - - + - - - - - - - - - + + + + + - - - + + + + + + + + + - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + - - - - + + + + - - - - - - - - - - - - - + + - + + + + + + + + + + + + + - - + + - - + + - - - - - - + + + + + + - + + - - + - - - - + + + + - + - - - + + + - + + + - - - - - - - + + - - - + - - - - - + + - - - - - - - - - + + + + + - - - - - + + + + + + + + + + + - - - - + + + + + + + + + + + - - - - - + + + + + + - - - - - - + + + + - - - + + + + - - - + + - - - - - - + + + + + + - + - - - + + + + - + + + + + + + + + - - - - - - - - - - + + - - - + + - - - - - - - - - + + + + + + + + + - - + - - - - - - - - - + + + + + + + + + + - - - + - + - - + + + + - - - + - + - - - + + + - - - - + + + + + + - - - + + + - - - + - - - - + + + - + + + - - - - - + + + + + - - - - + + - + + + + + - - - - - - + - + - - - - + + + + + + + + - - - - + + + + + - + - - - - - - - + + + + + + - + - - - - - - - + + + - + + + + + + - - + - - - - + + - - + + - + + - - + + + - - - - - + + + - + + - - - - - - - - - - - + - + + + + + + + + + + + - - - + + + + - - - - - - - - - - - - - - - - + + + - + + + + + + + + + + - - - - - - - + - - - + + + + + + + + + + + + - + - - + + - - + - - + - + + + + - - - - - - + + + + - - + - + + + + - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + - - + + + + + + + + + + + + + + + + + - - + - + + - + + + + - - - - - + - + - - - - - - - - + + + - + + + - + + + + - - - + + - - - - + - + + - + - + + - + - + - + - + - - - + - - + - - - - - - - - + + + + + + + + + + + - - - + + + - - - - - + + + + + + - + - - - - + - + + - - - - - - - - - + + + + + + + + - + - - + - - - - - - - - - - - + + + + + + + + + + + + - - + + - + + + + + - + + - - - - - - - + + - - - + - - + + + + + + + + - @@ -6823,2095 +6824,2095 @@ - - - - - - - + + + + - - + + + + - - - + + + - - - + + - + - + + + - - + + + - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + - + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + - + + + - - - - - - + + - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - + - - + + + - - + + + + - - - + - - + + - - - - + + + + + - - + + - + - - - - + - - + + - + + - + + + - - + - - - - - - - - + + + + - + + + + - - - - + + + + - - - + + + + + - - + - + - + + - - - + + - - - + + + + + - - - + + + - - - + + - - - + + + + - - + + - + - - + + - - - + + + - - - - + + - + - + - + + - - - - + + + - + + - - + + - + - - - - - + + + - + + + - + + - + - - + - - + + - - - + + + + - + + - - - - - + - - - + + - - + - + + + + + - - - + + - - + + - - - - + + + + + - - + + - - + - + - - - + + + + - - - - + + + - - + - + - - - + + + + + - + + - - - - - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + + - - - - - - - - + + + + + + + + + + - - - + - - - + - - - - - - + + + + + + + + + + - - - - - + + - - - - - - - + + + + + - + + + - - - - + + - + - + + - + - + + + - - - - + - + + + - - + - + - - - - - + - - - - - - - - - - - + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + - + + + - + + - + + + - - + + + - - - - - - - + + - + + + + + + + - - - + - - - + - - - + + + - - - + - + + + + - - + - - - - + + - + + + + + - - - - - + - - - - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - + + - - - - - - - - - + + + + + + + + + + + + - - - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + - - + + + - - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + - - - + + - - + - + - - + - + + + - + - + + - - - + + - - + - + - - - - - - - - + + + + + + - + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - + + + + - - - - - - + + - - - - - - + + + + + + + + + - - - - + - - - + + + - + + - - - - - + + + + + + - + - - - + + - + + - - - - - - - - - - - - - - - + + + - + + + + + + + + + + + + + - - - - - + - - - - - - - - - - - + + + - + + + + + + + + - - + + + + + + + - + + - - - - + - - + + - - - + + + + - + + - - - + - - + - - - - - - - - - - - - - - - - - - - - - + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + + + + + + + + - - - - - + + + + + - - - - + - - + + + + - - - + + + + - - - - - - - + + + - - - - - - - - + + + + + + - - + + + + + + - - - - - - + + + + + + + + + + + - - - - - + - - - - - + + - + + - - - - - - - - - - - - + + + - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + - + + - - + + + + + + + + - - - - - - - - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + - + + + + + + - - - - - + - + + + - - + + + - + + + - - - + + + + + - - - - - - + + + + - - - + + + + + - + - - - - - - - - - - + + + + - - + + + - - + - + + + + + - - - - - - + + + + + + + + - - - + - + + + - - + + + + - + - - - + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + - - - + + - - - - - - - - - - - + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - + - - + + - - - - - - - - - - + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - - - - - - - - - - - - - - - - + + - - - - - - - - + + - - - - - - + + + + + + + + + + + + + + + + + + + + - + + + - - - - - + + + - + + - + - - - - + + + - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + - - + + - - - - - - + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - + + + + + - - + + + - - - + + + + + + + + + + + + + + + + - - - - + + - - - - + + + + + - - + - - - - - - - - - + + - - + + + + + - - - + + - - + + + + + + + - - - - + + + - - + - + - - - - - - - + + + + + + + + + + - - - - - - - - - + - - - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + + - - - - - - - - - + + + + + + + + + + - + - - - - + + - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + + + - - - - + + + - - - - - - - - - + + - - - - - - + + - - - - - - + + + + + + + + - + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + - - - - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + - - - - - - + + + + + + + + + - - - - - - - - - + + - - - - - - + + + + + + + + + + + + + + + - diff --git a/StaticData/serverHash.xml b/StaticData/serverHash.xml index 8a6d406..c9d32fa 100644 --- a/StaticData/serverHash.xml +++ b/StaticData/serverHash.xml @@ -22,169 +22,169 @@ - - - + + + - + - - + - - + + - - - - - + + - - - + - - - - - - - - - - + - - + + + + + + + + + + - + + + + + + + + + + + + + - - + + + + + + - - - - - - + + + + + + - - - + + - + + - - + - - - - - + + + + + - + - + - - - + - - + - - + - + + - - + + + - + + - + - + + + - + - - - - - + + + - - - - + + + - - - - + - - - + + - - - + + - - - + + - - - + + + @@ -204,205 +204,211 @@ - - - - - + + + + + + + - + + + - - - - + + + + - - - - - - + - + + + - - - - - - - - - + - + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + - - + + + + - - - - - - - - - - + + + + + + + - + - + + - - - - + + + - - + + - - + - + + + - - - - - - + + - + + + - + - - - + + + - + + - - - + + - - + + - + - - + + @@ -410,56 +416,56 @@ - - - + + + - + - + - - + + - - - - + + + + - + + - - + + - @@ -471,20 +477,20 @@ - + - - - + + - + + @@ -493,920 +499,920 @@ - - + + - + - - + + - - + + + - + + - - - + - - - + + + - + + - + - + - + + - - - + + + - - + - + - - + + - + - + - + - - + - - + - + - + + - - - + + + - - - + + + + + - - - + + + - - + - + - + - - + + - + - - - + - - - + + + + + + + - - - - + - + + - - + - - - - + + + + + - - - + + + - - - + + + - + + - - + - - + - + - - - + + + + - + - - - - + - + + + - - + - + + - - - - - + + + + + + + - - + - + - - - - - + + + + + - - + - - - - + - + + + - - + - - - + + + + - - + + + - - - - + + + - - + - - - - - - - + + + + + + + - + + - + + - - - - - - - - + - + + + + + + - + - + - - + + + + + + - - + - - + - - - - - + + + + - + - - - + + + + - - - - + + - - + + + - - - + + + - + + - + - - - - - + + + - - + - + + + + - - + - - - + + + - - - - + + + + - + - + + - + + - - - - + - - + + + - - - + + + + - + - - + - + - - - + + + - - - - + + + + - - - - - + - + + - + + + + - - - - + + + - + - - - + + + - + + - + + + - - - + + - - - - - + + - + + + - + + - - - - + + + - + - - - + + - - - - + + + + + - + + + - - - - + - - - + + + + + - - - - + + + - - + - - + - + + + - + + - - - - + + + + - - + - - + + + + + + - - - - - - - + - + + - - + + - + + + - - + + - - + + - - + - - - + + - - + + + + + - - - - + - - - - - - - + + - + + + + + + - + + + - + - + - - + - - + + + - + + - - + - + - - + - - - + + + + - - - + + - - - + - + + - + + + - + + - + - - - - - - + + + + + - - - - - + + + + - - - + + + + - + - - + - + + - + + - - - - - + - + - - - + + - + + + - + + + - - - + + + @@ -1414,1619 +1420,1625 @@ - + - - - + - + + + + + + + - - - - - - - - + - + + + - + + + + - + - - - - - + - + + + + - + - - - - - + + + + - + + - - - + + + - + - - - + + + - + - - + + - - + + - - + + - - - - - - - - + + + + + + + + + + + - - - - - + + + - - - + + + - - - + + + - - - - - + + + + + - + - + - + - - - - + + + + - - + - + - - + - + + - - - + - + + - - - + + + + + - - + - - - + - - + + + + + - + - - - + + + - - - + + + - - - + + + - - - + + + + + - - - - - + + - - + + + - + - - - + - + - - - - - + + - - - - + + + + - - - + + + + + - - + + + - - - + - - + + - + + - - - + + + + + - + + + - - - + - - + - + + - - + + + - - - - + + + - - + + + + - - - - - - - + + + + - + + + - - - + + - - - - + + - - + + + + - + - - - + - + + - + - + + + - - - - + + - - + - - - + + - - + + + - - - + + - - - - - + + + + + + + - - + + - - - - - + + + + + - - + + + - + + - - - - + - - - + + + + - + + - - - + + + + - - - - + + + + - - - - + + + + + - - - - - - - + + + + + - + - - - + + + + - + + - - - - - - - - + + - + + + + - + - - - - + + + + + - + - - - + + + - - - + + + - - - - + + + - + - + - + + - - - + + + - - - - + - - + + + + + - - + + - + + - - - + + - - + + + - - - + - + + - - + - - - - - - - - - - + + + + + + + + + + + + - - + + - - - + + - + - - + + + - - - + - + - + - + - + - - + - - + + + + - - + - - - - + + + - - + + + + + - - - - - - + + - + + + - - - - + + + - + + + + - + - + + - - - - + + + + + - - - + - - + + - - - + - + + + + - + - - - + + - - - + - + + - - + - - + + - + + + - + - - - - + + - + + - - - - + + + + - - - - - + + + - + + - + + - - + - + - + + - - + + + - + + + - - - + - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - + + - - - + - + - + - - - + + + - - - - - + + - - + + + + + - + - + - - - - - - + + + + + + - - + + - + - + + + + + - - - - - - - - - - - - - + + + - + + + + + + - + + - + - - - - - + - - + + + + + + + + - - - - - - - + - - - - - - - - - + + + + - - - + + + + + + + - - + + + + + + + - - - - - - - - - - - + + + + + + + + + - - + - - - - - + + + + + + - - - - + + + + + + + - + - - - - - + + - - + + + + + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - + - - - - - - + + + + + - + + - - - - - + - + + + - - - + + + + + + - - - - - - - + + + + + + + - - - - + + + + + - - - - + + + - - - - + - + + + - - + - + + + - - + - - - + + + - - - + + - - - + - - + + + - - + - - + - + + + + + + + - - - + + + - - - + - - - - + + + + - - - + + - + + + + + - - - - - + - + - - - - + + + + + + - + - - - - + - + - - - + + + - - - - - - - + + + + + + + - - - - - - + + + - - + + + + - - + + + - - - - + + + + - + + + + - - - - + + - + + + - - + - - - - - - - - - + + - + + + - + + + + - + - + - - - - - + - + + + + - - + + + - - - + + + - - - - - - + + + + - - + + - + + + - + + - - + + - - - - - - - - + + + + + + + - + - + + - + - - - - - - + + + - - + + - + + + - + - - - - - - + + + + - - - + + + + + - - - - - + + + + - + + + + + + + + + - - - - + + + + - - + + - + @@ -3035,5881 +3047,5869 @@ - - - + + - - - - - - - - + + + - - - - + - + + + - - + - + + + - - - - - - + - + + + + + + - - - + + - + - - - + + + + - - - - - - - - + + + + + + - - - - - - + - - + - + - + + + - - - - - + - + + + + + + + + + - - - + + - + + + + + + - - - - - - - - + + + + + - - + + - - - - - + + + - - - + - + + + - - - - - + + + + + + + - - - - - + + + + - - + - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - + + + - + + + + + + + + + + + + + - - - + + + - - - - - + + - + + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + - - + + + + - + + + - + + - - - - + + + - + - + - + + - - - - - - + - - + + + + + - - - - - - - + + + + - + - - - - - + + - + + + + + - - - - - - - - - + + - - - - - - - - + + + + - - + + + + + + + + + + + + - - - + + + + + - - + + - - - - + + + - - - - + + - - + + + - + - + + - - + + - - - + + + + - + + - - + + - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + - + + + + + + - - - - - - + + + + + - - - - - + + - - - + - - - + + + + + + - - - - - - - - + - + + + + + + + + + + - - + - - - - - - - + + + + + - - - - - - - + + + + - + + + + + - - + + - - + + + + - - + + + - + + - - - - - + + + + + - - - + - - - - - - - - - + + + + + + + + + - - + + - - + - - - - + + - - - + + + - + + + + + + - - - - - - - - - - - + - + + + + + + + + + + - - - - - - + + - - - + - + + + - - - + + + - + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + - - - + + - - + + - - - - + - + + + + - - + - - + + + - + + - - - + - - - - - - - - - - - + + - - - - - - - + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + - - + + + + + - - - - - + + + - - - - + + - - + + - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + + + - - - - - - - - - - - + - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + - - + + + + + + + + + + + - - - + + + + - - - - - - + + + + + + + + + + - - - + + - - - - + + - - + - - - + - - - - - - - - + + + + + + + + + + + + + + + - + - - - - - + + - - - - + + - + + + - + - + + + - - - - - - - - - - - + + + + + + + - + - - - - - - - - + + + + + + + + - + + + + - - + + + + + - - - - - - + + + + - - - + - - + - - + + + + + + - + + - - - - + - - + + - - + + - - - - - + + + + + - - - - + - + - - + - - + + + + - - + + + + + - - - + - + - - - - - - - - - - - - - - - - + + + + + + + + + - + + + + + + + + + + - - + + - - + - + - - - + + + + + - - - - - - + + + + + - - - + + + + + - - + - - - - - - - - + + + + + + + + + + - - - - - - + - - + - + + + - - - - + + + + - - - - - - + + + + - + + - - - - - - - - + + + + + + + + + + - + - - + - - + + - + - - - - + + + + - - - - + - - - - + + + + + + + + + - - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + + + - - - - + - - - + - - + - - + + + + - - + + - - + + - - - - + + - + + + + - - + - + - - - + - - - + + + + + - + - + + - - - + - - - - - - + + + + + + + + - - - - + + - - + + + - - + + - - + + - - - - - - - - + + + + + + + + + + + - - - - - - - + + - - - - + + + + + + + + + + - - - - - - - - + + + + - - - - + + + + - - - + - - + + + - - + + + - - - - + - + - + + - - - + + - - - + + + + - - - - - + + + + + + + + - - + + - - + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + - - + + + + - - - - + + + + - - + + + - - + + + + + + + + - - - - - - - + + - - - + + - + + + + + - - - - + + + + - - - + + - - - - + + + + - - - - + + + + + - - - + + + + + + - - - - - - + + + - - - - - - - - + + + + + + + - - - - - + + + + + + + + - - - - - + + + + - + - - - - - + + + + + + - - - - - - - - + + + + + - - - - - + + + + - - - - - - - + + + + + + + - + + + + - - + + + - - - - - - + - - + + + + - - + + + + + - - - + + - + - - - + - - - - - + + + + - - + - - - - - + - + + + + + + - + + + - - + + - - + - - - - - - - - + + + + + + + + + - - - - - - + + - - - + + + - + - - - - + + + - - - + + + - + + + + + - - - + + + - + + - - - + + + - - - + + - - - - - - - - + + - + + + + + + - - - + + + - - - - - - - + + + + + - + + + + - - - - + + + + + + + - - - + - - + - + + + + - + - - - - + + - - - - - - - - + + + + + + - - + - - + + + + + + + - - - - - - - - + + - + - - + + - - + + - - - + - + + - + + + - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - - - + - - - - + + - + + - + - - - - - - + + + + + + - - - - - - + - - + + + + + + + + - - + + - - + - - + - - - - - - - - - - - - + - + + + + + + + + + + + + + - + + - + + - + + + + + + + - - - - - + - - - - - - + + + - - + - + - - + + - + + - - - - - - - - + + + + + + - + + + + + + - - - - - - - + + + + - - - + + + + - - - - - - + + - + + - - + + + - + + + + - - - - - - - - + + + + + + - - - - - - - - + + - + + + + + + - - + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + + - - + + - + + + + + + + + + - - - - - - - + + + - + + - - + - - - - - - + + + - + - - - - - + - - + + + + + + + + - - - + - - - + + + - - - - - - - - - + + + + + + + - - + + + - - - - - - + + + + + + - + + - + + + + - - - - - + - - - + - - - - + + - - - - + + + + + + + + + - + - - + - + + - - + - + + + - - + + + - - - - - - - - - - - - - - + + + - - + + + + + + + + + - + + + + + - - - - - - + + - + + - + - + + - + + + - - - - - + - + + + - - + - + + - - - - + - + + + + + - - - - + - - - + + + + + + + - - - - + - + + - - + + - - - + + - + - - + + - - + - + - + + + - - - - + + + + + - - - - + - - + + + + - + + + + + + - - - - - - - + + - - - + + - - + + + + - - - - - - - - - + + + + + + + + - - - - + - - - - - + + + + + + + + + - - - - - - + + + + + + + - - - - - - + + + - - - - + + + + + + - - - - - - - - - + + + + + + + + - - - - - - + - - + + + - - - - - + + + + - + - - - + + + + + + + + + + + - - - - + + + - + - - - + + + - - - - - - - + + + + + + + - - + - + - - - - - - - - + + + + + + + + - - + + - - - - - - - - - + + + + + + - - + + + + + - + + + + - - - - - + + + + + + - - - + + + + + - - - - - - - - + - - - - - + + - - + + - - + + + + + + + - + + - - - - + + + - - - + - - - + + + + + + - - - - + + + - + + + - - - - + - - - - - - - - - + + - + + + + + + - + - - + + - + + - - + + + - - - + - - + + - - + + + + - - - + + - + - + - + - - - - - + + + + + + + + + + + - - - - - + - - - - - + + + + + + + - - - - + + + - - - + - - + + - - - - + - - + - - + + + + + + + + - - - - - + - - - - + + + + + + - - - - + + - - + + + + + - - + - - + - - + + - - - - - + + + + + + - + - - - + - - - + + + + + + - - - - - - - - + + - + + + + + + - - + + + - - - - - + + + - + + + + - - - + + - + + - - - - - + + + + + - + - - + + + + - - - - - - + + - + - + - - + + + - - - + - + + + - + - - - - + + + + - - - - + + - - - + + + + - - - - + + - + - + - - + + + + + + - - - - - - - - - - + + + - + + + + - + - + - - - - + + + + + + + - - - - - - + + + + - - + + + + + + - - + + + + + - - - - - - - + + - + - - - + - - - - + + + + + - + - + - - + + - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + - - - - - + + + + - - - - - - + + + + + - + + + - - - + + - + - - - - - + + + - + + + + - - - - - - - - - - - + + + + + + + + + - + + - - - + + + - + + - - - + - + - + - - + + - + - + + - + - - - - - + + + - - + - - - + + + - - + - - + + + + + - - + - + - + + - - - - - - + + + + + + + + - - - - - - - - + + + - + + + + - - - + + - + + + - + - - - + - - - - + + - + + + - - - - - + - - - - - + + - + + + + + + + + - - - + + + - - - - - + + + + + + + + - - - - - - - - - - - - + + + + + - - - + + + + + + + + + + - - - - - - + + - - - - - - - + + + + + + + - - - - - + + + + + + - - - + + + - + - - - + + + - - + - - - + - - - - - - - - - - - + + - + + + + + + + + + + - + + + - - + - - - + + + - + + - - - + + + - - - - + + + + - - - - - - - - + + - - - - + + - + + + + + + + + - - + - + + - - - - + + + + + - - + - - + - - + + - + + - + + - - - - - - - + + - - + + + + + + + + + - - - + + - - - - + + - + + - - + - - + + + - - - + + + + + + - - - - + + + + - - - - - + - + + - + - + - - - + + + + + + - - + - - - - - - - - + + + - - + + + + + + + - - - - - - - + + + + - - - - - - - + + - - - + + + + + + + + + - + + - - + - + + + - + + + + - - - - + + + + + - - - - - - + + + + + - - - + + - - - - + + + + - - - - + + - + - + - + - - - + + + - + + - - - - - + + - + + - + + - - - - - - - - - - + - - + + + + + + + + + - - - - + + - + + + + + - - - - - + - + + + + - - - - - + + + + - - + - - + + + - + - - + - + + + - - - + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + - + + - - - - + - - + + + - + + + - - - - - - + + + + + + + - - - - - + + - + + + + + - - - - - + - + + - + - - - + + - + + + + + - - - - - + + + + - - - - + + + + - - - - - - + + + + + - - - + - + + - - + + + + + - - - - - + - + + + - + + - - + + + + + - - - - - + + + + + - - - + - - + - - - + - + - - + + + - + + + - + + + + + - - - - - - - + - - + + + + - - + + + - + + + - - - - - - - + - - - - + + + + + + + + + - - - - + + + - - - - + + + - - - - + + + + - + - - - + - - - - - - + + + + + + + + - + + + - - - - - + + + + - - - - - + + + - - + - + + - + - + - - + - - + + - + + - - + - - - + + + + + - - - + - + + - - - + + + - - - - - + + + + + + - - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - + + + + + + + + + + + + + + - + - + - + - + - + - - - + + - + + + + - - - + + + - - - + - - + + + - - - + + - + + - - + - + + - - - - - + - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - + + - - + + - - - + - + + - - - + + + + - + - - - + - - + + + - - + + - - - - - - + + + + + + + + + + - - - - - - + + + - - - - - - - + + + + - - - - + + + + + - + + - - - + + - - - - + + + + + + + + - + + - + + + - - - - - - - - - + + + + - + + - + - - - - + + + + - - - + - + + - + + + - + - - - - - + + - + - - + + - - - + - + + + + + + - - + - - + - - + + - + - - + + - - - + + + - + - - - + + + - + - - - - + + + + - - - + - - + - + + + - - - + + + + + - - + - - - - + + + - - - + + + + + + + - - - - - - + + - - - - + + + + + + - - + - - - - - + + - + + - + + + + - - + - - - + - + + - - - - - - + + + + + - - + + + + - + + + + + - - - - - + + - - + - - + - + + - - - - + + + + + - + - - - - - + + + - - - - + + + + + - + - - - - - + - + + + + - - - - - + + - - + + + - - - - - - - + + + - - - - + + + + + + + + + + - - - - - - + + + + + + + + - - - - + + - + + - - + - - - + + + + + - - + + - - - - + - - - + + + + + + + + - - - - - + - - + - - + + + + - - - + + - - - - - + + + + - - - + - + + + - - - - + + + + - + - + - - - + + + - - - + + + + + - - - - - - + + + + - + - - - + + + + + - - + - - + + + - - + + + + - - - - + - + + - - - - + + + - - + - + + - - + + - - + + + + + + + - - - - - - + + - - - - + + + - + - + + - - - - - + - + + + + - - + + - - - - + + + - + + + - - - - - + + - - + + + + + - - + - - + - + - + - - - - - - - - + + + + + - + + + - + - + - - - + - + + + + - + + - - - - - - + + - - + + - + + - + + + + - - - + - - - + + + - - + + + + + + - - + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + - - + + - + - - + + - - + + + + - - + - + - - + + + + + + - - - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - + - + - + - + - - - + + - + - + + + + + + + + - - - - - - - + + - - - + + + - - - + + + - - - - + - - - - - - - - - - + + + + + + + + + + + - - + + - - - - - - - + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + - + + + + - - - - - + + + + + - + - - + - + + + + - - + - - + + - - - - - + + + + - - - - + + - - - - + + + + - + + + + - - - + + + - + + - - - + - - + - + + - + - + + - - - + + + - - + - + - - + + + - + - - - - + + + - - - + + + + - - - - + + + + + - - + - - - - + + + - - - - - + + + + + + - + - - - + - + + + - - - - + + + + - + + + + - + - - - + - + + + + + + + - - - - - - - - - - + - - - - - - + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + - + + + - - - + + - + - - - - + - + + + + + + + - + + - - - - - - + + + - - + + + - - + - + + - - + + + + + - - + + + + - - - - + - - + + - + + + + - - - - + + - - - - - + + + + - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + - - - + - + + + + + - - + - - - - - + + + + - - + - + + - + + + - - - + - - - + - - + - - + + + + - - - - - - - + + + + + + - - - - - - - - + - + + + + + + + + + - - - - - - - + - - + + + + + + + + + + + + + - - - - + - - - - - - + + + + - - - - diff --git a/StaticData/settings.xml b/StaticData/settings.xml index c34738a..369e1a8 100644 --- a/StaticData/settings.xml +++ b/StaticData/settings.xml @@ -1,5 +1,5 @@ - - + + diff --git a/StaticData/streamingHash.xml b/StaticData/streamingHash.xml index adea3e4..9a89d8b 100644 --- a/StaticData/streamingHash.xml +++ b/StaticData/streamingHash.xml @@ -1,34 +1,35 @@ + + - - - - - - - + + + + + + + - + - - + + - @@ -36,7 +37,7 @@ - + @@ -45,82 +46,81 @@ - + - + - - + + + - - - + + - - + - + - + - + + + - - - + - + + + - + - - - + - + - + - - + + + - + - @@ -129,35 +129,36 @@ + - - + + - + - + - + - + - + @@ -167,492 +168,491 @@ + - + - - - + + + - + - - - + - + + - - - - + + + + + - - + + - - + + - - - + + - + + - - - + + + - - + + - - + - + + - - + + - - - - + + + - - + + - - + + - + - + - + - - + + - - - - + + + + + - - - + + + - - - + + - - - + + + - - - - + + - + - + + - + + + - - - + + + - - - - + + - - - + + - + - + + - - - + + + - - + + + + - - - - + - - + + + + - - - + - + - + + - + - + - - - - + + + + - + - - + + - - + - - + + - + + + - - + + - - - - - - + + + + - - - + + + - + + - + + - - + - + - - + - + + + + - - - - + - + - + + + - + - + - - - - + - - - + + + + + - + + - + - - - - + + + + - - + + - - - - - - + + + + + - - + - - + + + - + - - + - - + + - - - + + + + - - + + @@ -661,515 +661,515 @@ - + - - + - + + - - + + - - + + + - - + + - - + - + + - - + - + - - + - + + + - - + - + - + + - - - - + + + - - + + + + - - - - + + + + + - - - - - + + - - - + + + + - - - + + + - - + + - + - - - - - + + + + + - + + - - - + + + - - + - - - + + + - - - + + + - + + - - - + + + - + + - - - - + - + + - + - - + - - + - + - - - - + + + + + - - - + + + - - - + + - + - + + - + - - + + - + - + - - + + + - - + + - - - - + + + - - + + + - + - + - - - - + - + + + + + - - - - - + + - - + - + + + + - - + + - + - - + - - - - + + + + + + - - - - + + + - - + - + - + + - + - - - + - + + - + - + + - - - - + + + + - + - - + + - - - + + + - + - - - + + + - + - - - + + + - - + + - - - - + - - - - + + + + + + + - - - + + + - - + - + + - + + - - @@ -1177,624 +1177,625 @@ + - + - - + + - - - + + - - + + + - - + - + + - - - + + - + + - - - - - + + + + + + - - - - + + + - - + - - + - - - + - + + + + + - - + + - - - + + + - - + + + - - - - - - - + - + + + + + + + - - - + - + - + + - - + - + - - - - - - + - + + + + + + - - + + - + + + + - - - + - - - + + - + - - - + + + - - - + + + + - - - + + + - + - - - + + + - - - - + + + - + - + + - + + + + + - - - + - - + - - - + + + + + - - - - - + + + - + - + - - + - + + + - + - - - - + + + + - - - - + + + + - - + + - - + - + - + + - - - - - + + + + - - + + + - - - + + + + - - - + + + - - - - - - + + - - + + - - + + + + - - + - - + + - + - + + - - - + + + - + - - - + + + - - - + + + - - + - + + - - + + - - - + + + + - - - + + - - - - + + - - + - + + + + - - + - - + + - - + + - - - - + + + - + + - - - - - - - + + + + + + - + + - + + - - - + + - - + + - + + - - - + + + + - - - - + + - - + + @@ -1803,1002 +1804,1002 @@ - + - + - - + + + - + - - - - - - - + + + + + + - - - + + - - + + - - + - - + + + + + - - - + - - + + + + + + - - - - - + - + + + - + - - + - + + + - + - - - - + + + + - + - - - - + - + - - - + + + + - + + + - - - - - - - - - + + - + + + + + + - - + - + + + + + - + + + + - - - - - - + - + + + + - - - - - + - + + - - + + - - - + - - - - - + + + + + + + - + - - + - - - - - + + + + + + - + - + - - + - - + + - - + + - - + + - + + - - - - - + + + - + + - + - + - - - + + + - - + + - + + - - - + + - + - + - + - - - - - - + + + + + + + - - + - - - - - - - + - - - + + + + + - - - - - - + + + + - + + + + + + - + - - + + + - - - + - - - - - - - + + + + + + + - + + - + + + - - - + + - - - - - - - - + + + + + + + - - - + + + - - + - - + + - - - - + - - + + + + + + + + - - + - + - + + - + - - - + + + - - - - + + + - - - + + + - + - + + + - - - - + + - + - - - + + + + - + + - - - - - - - - - - - + + + + + + + + + - - + + + - + - + - - + + - - - - - - + + + + - - + + + - + + - - + - - + + + + - - - + + - + - + + - - - - - - - - + + + + + + + - - - + + - + + - + - + + - + - - + - + - - - - - - - - + + + + + + + + - - - - + + + + - - + - - + + + - + + - - + - + - - + - - - - - - + + + + + + - - + + + + + - - - - + - + - - - - + + + + + + + - - - + - - - + + - - - + + + + - - - + - - - - + + + + + - - - - + + - - + + + - - + + + + + - - + - - + + + + + - - - + - - - - - - - - - - - + + + + + + + + + + - - + - + + - - + + + - - - + + - + - - + - - + + + + - - - - - - - - + + + + + + - - + + - - - - - + + + + + + - - - + + + - + + - - - + + + - - + + + - - - - - - + + - - - - - + + + + + - - - - + + + + + + - - + + + - - - + + + - - - - + - + + - + @@ -2812,86 +2813,85 @@ - + + - - - + - + + - - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + + - - + + - + - + - - + - + + - - - + + + - + + + - - - + - @@ -2900,85 +2900,87 @@ + + + + - - + - - - - - - + - + + + - - + + + - + - + + - + + - - - - - - - - - + + + + + + + + - - - - - + + + + - + + + + - - - - + + + - - + @@ -2987,9 +2989,9 @@ + - @@ -2997,3620 +2999,3619 @@ - - - + + + - + - + + - - + - - + + - - + + + - - - - + + + - - + + - + - + - + - + + - - - + + - + - - - - + - - - + + + + + + + - - - - - + + + - + + - - - + + - - + - + + - - - - - + + + + + + - + + - - - - + + - - - - + - + + - + + - + + - + + + - + + - - - + - + + - - - - - - + + + + + - - - - - - - + - + - + - + + - - - - - - - - - - + - + + + + + + + + + + + + - - + - + + - + - + + - - - - - - - - + - - - - - - - + + + + - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - + + + - + + - - - - + + + - - + + - - + + + - - + - + + - - + - - + - - - + + + + + - - - - + + + - + + + - + + - - - - + - - - + + + + - + + + - - - - - - + + + + - - - + + - + + + - - - - - - + + + + + - - - + - + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + - + - - - - - - - + + + - + + + + - - + - - - - - - + + + + + + + + + - - - - - - - + + + + + + + + - - - - - - - - + + + + + - + - - - + + + + - - - - - - - - - - - - - - + + + - - + + + + + + + + + + + - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + - - - - + + + + + + + + + - - - + - - + - - - - - - + + + + + + + + - - - - - + + - - + - + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + - - - - - + - - - + + + + - - - - - - - + + + + + - - + + + + + + - - + + - - - + + - - - - - - - - + + + + + + + + + + - - - - - - - + - - + + + - - - + + + + + + + + + - - - - - - + + + + + + - - - + + + - - - + + + - + - - - - + + - - + - - + + - - - + - + - + + + + - - - + + - + + - + - + + - - - - - + + + + + + - - - - + + + + + - - - - - - + + + + - - - - - - + + + - + + + - - - + + + - - - + - + - + - - + + - - - - - - - - + + + + + + + + - - - - + - - - - - + + + + + + + + + - - - - - - + + + - + + + + - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - - - - - - + + + + + - - + + - + - + + + + - - + - - - + + + + + - - - - + + + + + + + - - - - - - + - - - - - + + + + + + - + + + - - + - - + + - - - + + + - + + + + + - - - - + - - - - - - - + + + + + + + - - + - + - - + + - + + + + + + + - - - - - - - - - + + - + + + - - - - - - + + + + + + + + - - - + - + - - - - - - - - + + + + + - - + + + + + - - + - + + - - - - - + + + + - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + - - - - - + - - + - - - - - + + + + - - + + + + - - - - - - + + - - + + + + + + + + - - + + - - - + + - - + + - + + + + + + + + + + + + - - - - - - - - - - - - + - - - - - - - - - - + + + + + + + + + + + - - + - + - + + - - + + - + - + - - + + + + - - - - + - - - - - - + + + + + - + + + + + + - - - - - - - - + + + + + - - - - + - - - + + + - - + + - + + + + - + + - - - - - - - - - + + + + + + - + + + + + + - + - - + + - - - + + - - - + + + + + - - - - - + + - - - + - - + + - + + - - - - - - - - - - - - - - + + + - - - - - + + + + + + + + - + + + + + + + + + - - + - - + + + - - + - + + + - + - + + + + + + + - - - - - + + - + - - - - + + + + - - - - + + - + - - - - - + + + - - + + - + + + - - - - + - + + + - - - - - + - + + + + + - - + + + - - + - + + + + - - - + - - + - + + + + + - - - - + + + - - - + - + + - + + - + - - + - + - - - + - + - - - - - - - - + + + + + + + + - - - - + - + + + - - + + + + + + + - - - - - - - - + + + + - - + + - + + + + + + - + - - - - - + - - - - - + + - - + + + + + - - + + + + - + - - - + - + + + - + - - + + - - - - - + + - + - - + + + + - - - - - + + + + + - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - - + + + - - - - - - - + + + + + - - + + + + + - - - - - - + + - - + + + + + - - - - - + + + + + + + + - - - - - + + + - - - + - - - - - - - - - - + - - - + + + + + + + + + + + + - - - + + - + + + + + + + - - - - + - - + - - - - + + + + + - - + + + + - - - + - - + - + - - - - - + + + - + + + + - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - + + + - - - - + + + + + + + + + + + + + - - + + + + + - + + + - + + - - - - + + - - + - - + + + + + - - + + - - - - - - - - + + + + + + + - + - - - - + + + - + + + + + - - + - - - + - + + - + - + + - + + + - - - - + + - - - + - - + + - + - + - + - + + - + + + - - + - + + - + + - - - - + - - + + - - - + - + + - - - - - - - - - + + - + + + + + + - + - + + + + + - - - - + + - - - - - + + - - + + + + - + + - + - - - - - - - - - + + - + + + + + - - - - + + + + + + + + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + - + - + + + - - + - - + + - + - - + - + + + + + - - + - - - - - + + - + - - - - - + + + + + + + - - - - - + + + - - + + - - + + - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + - + + + + - - - - - - + + + - + + + + + - - + + - - - - - - + + + - + + + + - + + + + + + - - - - - + - - - - - - - - - - - - + + + + + + + + + + - - - + + + + + - - - - - - + + + + + + + + - - - - - - + - + - + - + + + + - - - + - - + + - - + + - + + + - - + - + + - + + - - - - - - - - + + + + + + - - - + - - + + + - - + + + + - + - - - - - - - - - - - - - - - - + + + + + + - + + + + + + + + + + - + + + - - - - - - - - - - - - - - - + + - + + + + + + + + + + + - - + + + + - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - + + - - + - - - - + - - + + + - + + + - - - - + + + + - - + - - - - - + + + + + + + - + - + - - + + - - - - - - + + + + + + - - + - - - - + + - + + - - - + - - + - + + + + + - + - - - + - + + + - - - - - - - - - + + + + + + - + + + + + - - - - - - - - - - + + + + + + + + - - - - - - - + + + + - + + + + + + + + - - - - - - - - + - - - + + + + + + + - - - - - - - - - - - + + - + + + + + + + + - - - + - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - - + + + - - - + + + + + + - - - - - + - - + + + + - + + + - - - - + - - - - + + - - - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + + - - - - + + + + + - - + - - - - + - - - - - - - - - + + + + + - - - + + + + + + + + + - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + - - - - + + + + - - - - - - - - - - - - - + + - + + + + + + + + + + + + + - - + + - - + + - - - - - - + + + + + + - + + - - + - - - - + + + + - + - - - + + + - + + + - - - - - - - + + - - - + - - - - - + + - - - - - - - - - + + + + + - - - - - + + + + + + + + + + + - - - - + + + + + + + + + + + - - - - - + + + + + + - - - - - - + + + + - - - + + + + - - - + + - - - - - - + + + + + + - + - - - + + + + - + + + + + + + + + - - - - - - - - - - + + - - - + + - - - - - - - - - + + + + + + + + + - - + - - - - - - - - - + + + + + + + + + + - - - + - + - - + + + + - - - + - + - - - + + + - - - - + + + + + + - - - + + + - - - + - - - - + + + - + + + - - - - - + + + + + - - - - + + - + + + + + - - - - - - + - + - - - - + + + + + + + + - - - - + + + + + - + - - - - - - - + + + + + + - + - - - - - - - + + + - + + + + + + - - + - - - - + + - - + + - + + - - + + + - - - - - + + + - + + - - - - - - - - - - - + - + + + + + + + + + + + - - - + + + + - - - - - - - - - - - - - - - - + + + - + + + + + + + + + + - - - - - - - + - - - + + + + + + + + + + + + - + - - + + - - + - - + - + + + + - - - - - - + + + + - - + - + + + + - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + - - + + + + + + + + + + + + + + + + + - - + - + + - + + + + - - - - - + - + - - - - - - - - + + + - + + + - + + + + - - - + + - - - - + - + + - + - + + - + - + - + - + - - - + - - + - - - - - - - - + + + + + + + + + + + - - - + + + - - - - - + + + + + + - + - - - - + - + + - - - - - - - - - + + + + + + + + - + - - + - - - - - - - - - - - + + + + + + + + + + + + - - + + - + + + + + - + + - - - - - - - + + - - - + - - + + + + + + + + - @@ -6618,2095 +6619,2095 @@ - - - - - - - + + + + - - + + + + - - - + + + - - - + + - + - + + + - - + + + - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + - + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + - + + + - - - - - - + + - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - + - - + + + - - + + + + - - - + - - + + - - - - + + + + + - - + + - + - - - - + - - + + - + + - + + + - - + - - - - - - - - + + + + - + + + + - - - - + + + + - - - + + + + + - - + - + - + + - - - + + - - - + + + + + - - - + + + - - - + + - - - + + + + - - + + - + - - + + - - - + + + - - - - + + - + - + - + + - - - - + + + - + + - - + + - + - - - - - + + + - + + + - + + - + - - + - - + + - - - + + + + - + + - - - - - + - - - + + - - + - + + + + + - - - + + - - + + - - - - + + + + + - - + + - - + - + - - - + + + + - - - - + + + - - + - + - - - + + + + + - + + - - - - - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + + - - - - - - - - + + + + + + + + + + - - - + - - - + - - - - - - + + + + + + + + + + - - - - - + + - - - - - - - + + + + + - + + + - - - - + + - + - + + - + - + + + - - - - + - + + + - - + - + - - - - - + - - - - - - - - - - - + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + - + + + - + + - + + + - - + + + - - - - - - - + + - + + + + + + + - - - + - - - + - - - + + + - - - + - + + + + - - + - - - - + + - + + + + + - - - - - + - - - - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - + + - - - - - - - - - + + + + + + + + + + + + - - - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + - - + + + - - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + - - - + + - - + - + - - + - + + + - + - + + - - - + + - - + - + - - - - - - - - + + + + + + - + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - + + + + - - - - - - + + - - - - - - + + + + + + + + + - - - - + - - - + + + - + + - - - - - + + + + + + - + - - - + + - + + - - - - - - - - - - - - - - - + + + - + + + + + + + + + + + + + - - - - - + - - - - - - - - - - - + + + - + + + + + + + + - - + + + + + + + - + + - - - - + - - + + - - - + + + + - + + - - - + - - + - - - - - - - - - - - - - - - - - - - - - + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + + + + + + + + - - - - - + + + + + - - - - + - - + + + + - - - + + + + - - - - - - - + + + - - - - - - - - + + + + + + - - + + + + + + - - - - - - + + + + + + + + + + + - - - - - + - - - - - + + - + + - - - - - - - - - - - - + + + - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + - + + - - + + + + + + + + - - - - - - - - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + - + + + + + + - - - - - + - + + + - - + + + - + + + - - - + + + + + - - - - - - + + + + - - - + + + + + - + - - - - - - - - - - + + + + - - + + + - - + - + + + + + - - - - - - + + + + + + + + - - - + - + + + - - + + + + - + - - - + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + - - - + + - - - - - - - - - - - + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - + - - + + - - - - - - - - - - + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - - - - - - - - - - - - - - - - + + - - - - - - - - + + - - - - - - + + + + + + + + + + + + + + + + + + + + - + + + - - - - - + + + - + + - + - - - - + + + - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + - - + + - - - - - - + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - + + + + + - - + + + - - - + + + + + + + + + + + + + + + + - - - - + + - - - - + + + + + - - + - - - - - - - - - + + - - + + + + + - - - + + - - + + + + + + + - - - - + + + - - + - + - - - - - - - + + + + + + + + + + - - - - - - - - - + - - - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + + - - - - - - - - - + + + + + + + + + + - + - - - - + + - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + + + - - - - + + + - - - - - - - - - + + - - - - - - + + - - - - - - + + + + + + + + - + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + - - - - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + - - - - - - + + + + + + + + + - - - - - - - - - + + - - - - - - + + + + + + + + + + + + + + + - diff --git a/StaticData/temp.xml b/StaticData/temp.xml index 5f67476..ed93f70 100644 --- a/StaticData/temp.xml +++ b/StaticData/temp.xml @@ -1,2 +1,2 @@ - + diff --git a/Widgets/entrywidget.cpp b/Widgets/entrywidget.cpp index 77f6b35..27b2c33 100644 --- a/Widgets/entrywidget.cpp +++ b/Widgets/entrywidget.cpp @@ -65,21 +65,7 @@ void EntryWidget::on_saveServerButton_clicked() emit sigSaveServerSettings(); } -ServerSettings *EntryWidget::getServerSettings() -{ - ServerSettings *data = new ServerSettings; - QString server = ui->serverInputField->text(); - QString port = ui->portInputField->text(); - //bool checked = ui->mathModelUsecheckBox->isChecked(); - - data->Address = server; - data->Port = port; - data->mathModelUse = true; - - return data; -} - -void EntryWidget::fillSettings(ServerSettings *settings) +void EntryWidget::fillSettings(Settings *settings) { ui->serverInputField->setText(settings->Address); ui->portInputField->setText(settings->Port); diff --git a/Widgets/entrywidget.h b/Widgets/entrywidget.h index 67b17bc..8f1876f 100644 --- a/Widgets/entrywidget.h +++ b/Widgets/entrywidget.h @@ -20,11 +20,9 @@ public: void showLoginWidget(bool flag); void disconnectState(); - void fillSettings(ServerSettings *settings); + void fillSettings(Settings *settings); void isActive(bool flag); bool getLoginWidgetIsHidden(); - - ServerSettings *getServerSettings(); ClientAutorization* getAuthData(); signals: diff --git a/Widgets/updatenotifywidget.cpp b/Widgets/updatenotifywidget.cpp index 2516aeb..6d5cfb3 100644 --- a/Widgets/updatenotifywidget.cpp +++ b/Widgets/updatenotifywidget.cpp @@ -72,11 +72,7 @@ void UpdateNotifyWidget::showWithFill() { clearList(); - if(!versionContainer->getLocalVersionData()->getIsChangeable()) - { - showTryChangeBase(); - } - else if(!versionContainer->getServerVersionData()->getIsChangeable()) + if(!versionContainer->getServerVersionData()->getIsChangeable()) { showTryChangeBase(); } diff --git a/coremanager.cpp b/coremanager.cpp index 5075f2c..44d6e5b 100644 --- a/coremanager.cpp +++ b/coremanager.cpp @@ -17,10 +17,13 @@ CoreManager::CoreManager(QObject *parent) : resourceManager = new ResourceManager; postProcessorSystem = new PostProcessorSystem; client = new Client; + settings = new Settings; } void CoreManager::initialize(WidgetManager *widgetManager,QThread *workerThread) { + createNewServerSettings(); + this->workerThread = workerThread; this->widgetManager = widgetManager; @@ -44,19 +47,18 @@ void CoreManager::initialize(WidgetManager *widgetManager,QThread *workerThread) void CoreManager::start() { - saveServerSettingsWithConnect(); checkAppAvailable(); } void CoreManager::loadStaticData() { - ServerSettings *currentSettings = dataParser->getClientSettings(); - setLanguage(currentSettings->Language); + settings = dataParser->getSettings(); + setLanguage(settings->Language); setLocalVersion(); - externalExecuter->setIsAutoStart(currentSettings->isAutoStart); + externalExecuter->setIsAutoStart(settings->isAutoStart); bool appAvailable = externalExecuter->findApp(); widgetManager->setAppAvailable(appAvailable); - emit sigSetLoadSettings(currentSettings); + emit sigSetLoadSettings(settings); } void CoreManager::binding() @@ -68,7 +70,8 @@ void CoreManager::binding() connect(this,&CoreManager::sigSendPacketType,sendSystem,&SendSystem::sendPacketType,Qt::AutoConnection); connect(this,&CoreManager::sigSendCheckUpdate,sendSystem,&SendSystem::sendCheckHash,Qt::AutoConnection); connect(this,&CoreManager::sigSendXMLAnswer,sendSystem,&SendSystem::xmlAnswer,Qt::AutoConnection); - connect(this,&CoreManager::sigSendAutorization,sendSystem,&SendSystem::sendClientAutorization); + connect(this,&CoreManager::sigSendAutorization,sendSystem,&SendSystem::sendClientAutorization,Qt::AutoConnection); + connect(this,&CoreManager::sigGetClientSettings,dataParser,&DataParser::getSettings,Qt::DirectConnection); connect(this,&CoreManager::sigSendUpdateToServer,updateController,&UpdateController::checkCanUpdate,Qt::AutoConnection); connect(this,&CoreManager::sigGetConnected,tcpClient,&TCPClient::getIsConnected); @@ -106,6 +109,7 @@ void CoreManager::binding() connect(sendSystem,&SendSystem::sigSend,this,&CoreManager::calcUpdateProgress,Qt::AutoConnection); connect(sendSystem,&SendSystem::sigGetXmlAnswer,dataParserOutput,&DataParserOutput::xmlAnswer_notify,Qt::DirectConnection); + } void CoreManager::initializeSystems() @@ -123,7 +127,7 @@ void CoreManager::initializeSystems() screenChecker->check(); - emit sigSetConnect(dataParser->getClientSettings()); + emit sigSetConnect(dataParser->getSettings()); } void CoreManager::initializeWidgets() @@ -178,14 +182,20 @@ void CoreManager::serverBlocked() void CoreManager::setServerVersion(StreamingVersionData *version) { widgetManager->getMainWindow()->setServerVersion(version); + + if (version->getViewName() == settings->versionData.getViewName()) + { + settings->versionData.setIsChangeable(version->getIsChangeable()); + versionContainer->getLocalVersionData()->setIsChangeable(version->getIsChangeable()); + dataParserOutput->updateServerSettings(settings); + } } void CoreManager::setLocalVersion() { - ServerSettings *currentSettings = dataParser->getClientSettings(); StreamingVersionData *version = new StreamingVersionData; - version->setName(currentSettings->LocalVersionName); - version->setIsChangeable(currentSettings->versionData.getIsChangeable()); + version->setName(settings->LocalVersionName); + version->setIsChangeable(settings->versionData.getIsChangeable()); versionContainer->setLocalVersionData(version); widgetManager->getMainWindow()->setClientVersionName(versionContainer->getLocalVersion()); @@ -198,7 +208,7 @@ void CoreManager::checkLoginResult(ServerAuthorization *auth) widgetManager->activateLoadingAnimation(true); checkAccessType(auth->AccessType); dataParserOutput->createAuthData(auth); - setLocalVersion(); + //setLocalVersion(); widgetManager->setLoginSuccess(); widgetManager->getMainWindow()->setClientVersionName(versionContainer->getLocalVersion()); client->setLogin(auth->ClientName); @@ -361,9 +371,8 @@ void CoreManager::saveServerSettingsWithConnect() EntryWidget *entryWidget = widgetManager->getEntryWidget(); entryWidget->isActive(false); - ServerSettings *settings = entryWidget->getServerSettings(); - settings->LocalVersionName = dataParser->getClientSettings()->LocalVersionName; - dataParserOutput->createServerSettings(settings); + settings->LocalVersionName = dataParser->getSettings()->LocalVersionName; + dataParserOutput->updateServerSettings(settings); if(tcpClient->getIsConnected()) { @@ -377,6 +386,11 @@ void CoreManager::saveServerSettingsWithConnect() emit sigSetConnect(settings); } +void CoreManager::createNewServerSettings() +{ + dataParserOutput->createServerSettings(); +} + void CoreManager::checkAppAvailable() { bool isAvailable = externalExecuter->findApp(); diff --git a/coremanager.h b/coremanager.h index c843562..4cfecae 100644 --- a/coremanager.h +++ b/coremanager.h @@ -54,15 +54,16 @@ signals: void sigInitializeClient(RecognizeSystem *recognize,SendSystem *sendSystem); void sigSendPacketType(PacketType packetType); void sigSendXMLAnswer(QString answer); - void sigSetConnect(ServerSettings* serverSettings); + void sigSetConnect(Settings* serverSettings); void sigCalculateHash(); void sigSendAutorization(); void sigSendCheckUpdate(); bool sigGetConnected(); void sigSendUpdateToServer(); + Settings *sigGetClientSettings(); - void sigSetLoadSettings(ServerSettings *serverSettings); + void sigSetLoadSettings(Settings *serverSettings); private: QTranslator translator; @@ -79,6 +80,7 @@ private: ResourceManager *resourceManager; PostProcessorSystem *postProcessorSystem; Client *client; + Settings *settings; WidgetManager *widgetManager; @@ -106,6 +108,7 @@ private: void checkUpdate(); void setInlineDebug(QString text); + void createNewServerSettings(); }; #endif // COREMANAGER_H diff --git a/mainwindow.cpp b/mainwindow.cpp index 2142564..c46ad61 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -327,7 +327,7 @@ void MainWindow::addWidgetToInteractiveGroup(EntryWidget *entryWidget) this->entryWidget = entryWidget; } -void MainWindow::setLoadSettings(ServerSettings *serverSettings) +void MainWindow::setLoadSettings(Settings *serverSettings) { ui->retranslateUi(this); diff --git a/mainwindow.h b/mainwindow.h index 74dbd61..769ddb7 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -29,7 +29,7 @@ public: void initialize(ResourceManager *resourceManager); void addWidgetToChangeGroup(CommonButtonGroupWidget *commonWidgetGroup); void addWidgetToInteractiveGroup(EntryWidget *entryWidget); - void setLoadSettings(ServerSettings *serverSettings); + void setLoadSettings(Settings *serverSettings); void setLoginSuccessState(); void setLoginFailedState(); void setClientVersionName(const QString &versionName); diff --git a/resource/Icons/planeCustom.png b/resource/Icons/planeCustom.png index 257b4075af8cafe74dcc9c0d162e4faf9dbec4f9..7a9ea2cbd4121ff91389fc9fc309a766cd98d5e5 100644 GIT binary patch literal 15212 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 PX8}@T@}f0A3Vea`*dxn!ivNOyt`f*?kH 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 diff --git a/resource/Icons/planeCustomIco.ico b/resource/Icons/planeCustomIco.ico index 0f62a0794c18c278304a6d404c22ff902fcf1f17..4eaf7c74606bca81b1738ec545657a3a8a5dffd1 100644 GIT binary patch literal 15942 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 U^aY!Nli(mJF*(s1VS~W`2Vp%9B>(^b literal 7905 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 T*RO-O(}0@teWeNotKk0uMBqgZ diff --git a/widgetmanager.cpp b/widgetmanager.cpp index a5e351d..9c93d48 100644 --- a/widgetmanager.cpp +++ b/widgetmanager.cpp @@ -35,7 +35,7 @@ void WidgetManager::binding() connect(commonButtonGroupWidget,&CommonButtonGroupWidget::sigUpdateCommonWidget,mainWindow,&MainWindow::slotCommonWidgetState); connect(mainWindow,&MainWindow::sigShowSettings,this,&WidgetManager::showSettings,Qt::AutoConnection); } -void WidgetManager::slotSetLoadSettings(ServerSettings *settings) +void WidgetManager::slotSetLoadSettings(Settings *settings) { mainWindow->setLoadSettings(settings); entryWidget->fillSettings(settings); diff --git a/widgetmanager.h b/widgetmanager.h index bcb4841..8ee65ac 100644 --- a/widgetmanager.h +++ b/widgetmanager.h @@ -49,7 +49,7 @@ public: void slotInlineDebug(const QString &text); public slots: void showSettings(bool isActive); - void slotSetLoadSettings(ServerSettings *settings); + void slotSetLoadSettings(Settings *settings); void slotActivateLoadAnimation(bool flag); signals: