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

Changed: Specify server to process

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-06-14 19:54:51 +02:00
parent 38285cd8dc
commit b7f60f740b
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -421,8 +421,7 @@ void COperationDialog::downloadData()
{ {
CConfigFile *config = CConfigFile::getInstance(); CConfigFile *config = CConfigFile::getInstance();
// default server const CServer &server = config->getServer(m_currentServerId);
const CServer &server = config->getServer();
m_currentOperation = QApplication::tr("Download data required by server %1").arg(server.name); m_currentOperation = QApplication::tr("Download data required by server %1").arg(server.name);
m_currentOperationProgressFormat = QApplication::tr("Downloading %1..."); m_currentOperationProgressFormat = QApplication::tr("Downloading %1...");
@ -439,8 +438,7 @@ void COperationDialog::downloadClient()
{ {
CConfigFile *config = CConfigFile::getInstance(); CConfigFile *config = CConfigFile::getInstance();
// default server const CServer &server = config->getServer(m_currentServerId);
const CServer &server = config->getServer();
m_currentOperation = QApplication::tr("Download client required by server %1").arg(server.name); m_currentOperation = QApplication::tr("Download client required by server %1").arg(server.name);
m_currentOperationProgressFormat = QApplication::tr("Downloading %1..."); m_currentOperationProgressFormat = QApplication::tr("Downloading %1...");
@ -476,7 +474,7 @@ void COperationDialog::copyDataFiles()
CConfigFile *config = CConfigFile::getInstance(); CConfigFile *config = CConfigFile::getInstance();
// default server // default server
const CServer &server = config->getServer(); const CServer &server = config->getServer(m_currentServerId);
m_currentOperation = QApplication::tr("Copy data files required by server %1").arg(server.name); m_currentOperation = QApplication::tr("Copy data files required by server %1").arg(server.name);
m_currentOperationProgressFormat = QApplication::tr("Copying %1..."); m_currentOperationProgressFormat = QApplication::tr("Copying %1...");

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

@ -126,6 +126,7 @@ protected:
OperationType m_operation; OperationType m_operation;
SUninstallComponents m_components; SUninstallComponents m_components;
QString m_currentServerId;
}; };
#endif #endif