aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-10 01:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-10-19 17:25:45 +02:00
commit 1e98eeaa0b
9 changed files with 68 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/CMakeModules/ConfigureChecks.cmake
View file

@ -40,7 +40,8 @@ MACRO(NL_CONFIGURE_CHECKS)
SET(NL_VERSION "${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}.${NL_VERSION_PATCH}.${REVISION}")
SET(NL_VERSION_RC "${NL_VERSION_MAJOR},${NL_VERSION_MINOR},${NL_VERSION_PATCH},${REVISION}")
SET(RYZOM_VERSION "${RYZOM_VERSION_MAJOR}.${RYZOM_VERSION_MINOR}.${RYZOM_VERSION_PATCH}.${REVISION}")
SET(RYZOM_VERSION_SHORT "${RYZOM_VERSION_MAJOR}.${RYZOM_VERSION_MINOR}.${RYZOM_VERSION_PATCH}")
SET(RYZOM_VERSION "${RYZOM_VERSION_SHORT}.${REVISION}")
SET(RYZOM_VERSION_RC "${RYZOM_VERSION_MAJOR},${RYZOM_VERSION_MINOR},${RYZOM_VERSION_PATCH},${REVISION}")
NOW(BUILD_DATE)

2
code/ryzom/client/src/CMakeLists.txt
View file

@ -65,7 +65,7 @@ IF(WITH_RYZOM_CLIENT)
SET(MACOSX_BUNDLE_GUI_IDENTIFIER "com.winchgate.Ryzom")
SET(MACOSX_BUNDLE_LONG_VERSION_STRING ${RYZOM_VERSION})
SET(MACOSX_BUNDLE_BUNDLE_NAME "Ryzom")
SET(MACOSX_BUNDLE_SHORT_VERSION_STRING ${RYZOM_VERSION})
SET(MACOSX_BUNDLE_SHORT_VERSION_STRING ${RYZOM_VERSION_SHORT})
SET(MACOSX_BUNDLE_BUNDLE_VERSION "1.0")
SET(MACOSX_BUNDLE_COPYRIGHT ${COPYRIGHT})
SET(RYZOM_OUTPUT_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${MACOSX_BUNDLE_BUNDLE_NAME}.app)

20
code/ryzom/tools/client/ryzom_installer/src/configfile.cpp
View file

@ -114,16 +114,26 @@ bool CConfigFile::load(const QString &filename)
settings.endGroup();
// only resize if added servers in local ryzom_installer.ini
int oldServersCount = m_servers.size();
CServers defaultServers = m_servers;
if (serversCount > oldServersCount) m_servers.resize(serversCount);
m_servers.resize(serversCount);
for (int i = oldServersCount; i < serversCount; ++i)
for (int i = 0; i < serversCount; ++i)
{
settings.beginGroup(QString("server_%1").arg(i));
CServer &server = m_servers[i];
settings.beginGroup(QString("server_%1").arg(i));
server.loadFromSettings(settings);
if (useDefaultValues)
{
// search server with same ID and use these values
server.loadFromServers(defaultServers);
}
else
{
server.loadFromSettings(settings);
}
settings.endGroup();
}

6
code/ryzom/tools/client/ryzom_installer/src/downloader.cpp
View file

@ -388,9 +388,13 @@ void CDownloader::onDownloadFinished()
emit downloadDone();
}
else if (status == 206)
{
if (m_listener) m_listener->operationContinue();
}
else
{
m_listener->operationFail(tr("HTTP error: %1").arg(status));
if (m_listener) m_listener->operationFail(tr("HTTP error: %1").arg(status));
}
}
}

1
code/ryzom/tools/client/ryzom_installer/src/operation.h
View file

@ -31,6 +31,7 @@ public:
virtual void operationProgress(qint64 current, const QString &filename) =0;
virtual void operationSuccess(qint64 total) =0;
virtual void operationFail(const QString &error) =0;
virtual void operationContinue() = 0;
virtual bool operationShouldStop() =0;
};

5
code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
View file

@ -1264,6 +1264,11 @@ void COperationDialog::operationFail(const QString &error)
emit fail(error);
}
void COperationDialog::operationContinue()
{
emit done();
}
bool COperationDialog::operationShouldStop()
{
QMutexLocker locker(&m_abortingMutex);

1
code/ryzom/tools/client/ryzom_installer/src/operationdialog.h
View file

@ -129,6 +129,7 @@ protected:
virtual void operationProgress(qint64 current, const QString &filename);
virtual void operationSuccess(qint64 total);
virtual void operationFail(const QString &error);
virtual void operationContinue();
virtual bool operationShouldStop();

32
code/ryzom/tools/client/ryzom_installer/src/server.cpp
View file

@ -52,6 +52,38 @@ void CServer::loadFromSettings(const QSettings &settings)
comments = settings.value("comments").toString();
}
void CServer::loadFromServers(const CServers &servers)
{
foreach(const CServer &server, servers)
{
if (server.id == id)
{
// found the same server
loadFromServer(server);
break;
}
}
}
void CServer::loadFromServer(const CServer &server)
{
// copy all members
id = server.id;
name = server.name;
displayUrl = server.displayUrl;
filesListUrl = server.filesListUrl;
dataDownloadUrl = server.dataDownloadUrl;
dataDownloadFilename = server.dataDownloadFilename;
dataCompressedSize = server.dataCompressedSize;
dataUncompressedSize = server.dataUncompressedSize;
clientDownloadUrl = server.clientDownloadUrl;
clientDownloadFilename = server.clientDownloadFilename;
clientFilename = server.clientFilename;
clientFilenameOld = server.clientFilenameOld;
configurationFilename = server.configurationFilename;
comments = server.comments;
}
void CServer::saveToSettings(QSettings &settings) const
{
settings.setValue("id", id);

8
code/ryzom/tools/client/ryzom_installer/src/server.h
View file

@ -19,6 +19,10 @@
#include "operation.h"
class CServer;
typedef QVector<CServer> CServers;
class CServer
{
public:
@ -44,6 +48,8 @@ public:
QString comments;
void loadFromSettings(const QSettings &settings);
void loadFromServers(const CServers &servers);
void loadFromServer(const CServer &server);
void saveToSettings(QSettings &settings) const;
// helpers
@ -55,6 +61,4 @@ public:
extern const CServer NoServer;
typedef QVector<CServer> CServers;
#endif