diff --git a/Core/dataparser.cpp b/Core/dataparser.cpp index e318060..55af069 100644 --- a/Core/dataparser.cpp +++ b/Core/dataparser.cpp @@ -100,8 +100,9 @@ void DataParser::createServerSettings(ServerSettings* serverSettings) } else { -// xmlWriter.writeStartElement("VersionData"); -// xmlWriter.writeAttribute("Version",serverSettings->LocalVersionName); + xmlWriter.writeStartElement("VersionData"); + xmlWriter.writeAttribute("Version",serverSettings->versionData.getViewName()); + xmlWriter.writeAttribute("isChangable",QString::number(serverSettings->versionData.getIsChangeable())); } xmlWriter.writeEndElement(); diff --git a/RRJClient.pro.user b/RRJClient.pro.user index 9f3805f..2814144 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 - 1 + 0 0 0 @@ -299,7 +299,7 @@ false true - D:/QT/BUILDS/RRJClient/Release64 + D:/QT/Projects/RRJClient 1 diff --git a/StaticData/clientHash.xml b/StaticData/clientHash.xml index 62a0a2b..897a32a 100644 --- a/StaticData/clientHash.xml +++ b/StaticData/clientHash.xml @@ -1,205 +1,2 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/StaticData/serverHash.xml b/StaticData/serverHash.xml index 01e5a23..f0879d2 100644 --- a/StaticData/serverHash.xml +++ b/StaticData/serverHash.xml @@ -23,8 +23,8 @@ - - + + @@ -43,149 +43,156 @@ - - - - - - + + + + + + + + - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - + + + diff --git a/StaticData/settings.xml b/StaticData/settings.xml index cbee759..4fa0f95 100644 --- a/StaticData/settings.xml +++ b/StaticData/settings.xml @@ -1,5 +1,5 @@ - + - - + + diff --git a/StaticData/streamingHash.xml b/StaticData/streamingHash.xml index 58d7c5a..897a32a 100644 --- a/StaticData/streamingHash.xml +++ b/StaticData/streamingHash.xml @@ -1,18 +1,2 @@ - - - - - - - - - - - - - - - - - + diff --git a/debug/RRJClient.exe b/debug/RRJClient.exe index e0a7f97..d0f1958 100644 Binary files a/debug/RRJClient.exe and b/debug/RRJClient.exe differ diff --git a/debug/dataparser.o b/debug/dataparser.o index 486bb9b..cc6f7f4 100644 Binary files a/debug/dataparser.o and b/debug/dataparser.o differ diff --git a/debug/mainwindow.o b/debug/mainwindow.o index 4d427da..8dbfbc0 100644 Binary files a/debug/mainwindow.o and b/debug/mainwindow.o differ diff --git a/mainwindow.cpp b/mainwindow.cpp index 1c40106..c3936aa 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -403,7 +403,6 @@ void MainWindow::saveServerSettingsWithConnect() entryWidget->loginIsActive(true); ui->offlineStartButton->show(); activateLoadingAnimation(false); - return; } //TODO: не заполняется 2 поля (автостарт и язык) ServerSettings *settings = entryWidget->getServerSettings();