Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: downloadData and downloadClient methods

Browse source
This commit is contained in:
kervala 2016-05-16 14:49:18 +02:00
parent 40cb337c68
commit a75d70b8bc
2 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -97,7 +97,7 @@ void COperationDialog::processNextStep()
break; break;
case CConfigFile::DownloadData: case CConfigFile::DownloadData:
m_downloader->prepareFile(config->expandVariables(server.dataDownloadUrl), config->getInstallationDirectory() + "/" + config->expandVariables(server.dataDownloadFilename) + ".part"); downloadData();
break; break;
case CConfigFile::ExtractDownloadedData: case CConfigFile::ExtractDownloadedData:
@ -105,7 +105,7 @@ void COperationDialog::processNextStep()
break; break;
case CConfigFile::DownloadClient: case CConfigFile::DownloadClient:
m_downloader->prepareFile(config->expandVariables(server.clientDownloadUrl), config->getInstallationDirectory() + "/" + config->expandVariables(server.clientDownloadFilename) + ".part"); downloadClient();
break; break;
case CConfigFile::ExtractDownloadedClient: case CConfigFile::ExtractDownloadedClient:
@ -248,7 +248,33 @@ void COperationDialog::onProgressFail(const QString &error)
void COperationDialog::onDone() void COperationDialog::onDone()
{ {
processNextStep(); if (!operationShouldStop()) processNextStep();
}
void COperationDialog::downloadData()
{
CConfigFile *config = CConfigFile::getInstance();
// default server
const CServer &server = config->getServer();
m_currentOperation = QApplication::tr("Download data required for server %1").arg(server.name);
m_currentOperationProgressFormat = QApplication::tr("Downloading %1...");
m_downloader->prepareFile(config->expandVariables(server.dataDownloadUrl), config->getInstallationDirectory() + "/" + config->expandVariables(server.dataDownloadFilename) + ".part");
}
void COperationDialog::downloadClient()
{
CConfigFile *config = CConfigFile::getInstance();
// default server
const CServer &server = config->getServer();
m_currentOperation = QApplication::tr("Download client required for server %1").arg(server.name);
m_currentOperationProgressFormat = QApplication::tr("Downloading %1...");
m_downloader->prepareFile(config->expandVariables(server.clientDownloadUrl), config->getInstallationDirectory() + "/" + config->expandVariables(server.clientDownloadFilename) + ".part");
} }
void COperationDialog::copyServerFiles() void COperationDialog::copyServerFiles()

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

@ -82,6 +82,8 @@ protected:
void processNextStep(); void processNextStep();
// operations // operations
void downloadData();
void downloadClient();
void copyServerFiles(); void copyServerFiles();
void copyProfileFiles(); void copyProfileFiles();
void extractBnpClient(); void extractBnpClient();