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

Changed: Display current operation

Browse source
This commit is contained in:
kervala 2016-05-16 14:50:53 +02:00
parent 145bfbc426
commit c1e93a754d
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -286,8 +286,8 @@ void COperationDialog::copyServerFiles()
// default server // default server
const CServer &server = config->getServer(); const CServer &server = config->getServer();
// default profile m_currentOperation = QApplication::tr("Copy client files needed for server %1").arg(server.name);
const CProfile &configuration = config->getProfile(); m_currentOperationProgressFormat = QApplication::tr("Copying %1...");
QStringList serverFiles; QStringList serverFiles;
serverFiles << "cfg"; serverFiles << "cfg";
@ -297,9 +297,6 @@ void COperationDialog::copyServerFiles()
serverFiles << "unpack"; serverFiles << "unpack";
serverFiles << "client_default.cfg"; serverFiles << "client_default.cfg";
m_currentOperation = QApplication::tr("Copying client files needed for server %1...").arg(server.name);
m_currentOperationProgressFormat = QApplication::tr("Copying %1...");
CFilesCopier copier(this); CFilesCopier copier(this);
copier.setSourceDirectory(config->getSrcServerDirectory()); copier.setSourceDirectory(config->getSrcServerDirectory());
copier.setDesinationDirectory(config->getInstallationDirectory() + "/" + server.id); copier.setDesinationDirectory(config->getInstallationDirectory() + "/" + server.id);
@ -323,6 +320,9 @@ void COperationDialog::copyProfileFiles()
// default profile // default profile
const CProfile &profile = config->getProfile(); const CProfile &profile = config->getProfile();
m_currentOperation = QApplication::tr("Copy old profile to new location");
m_currentOperationProgressFormat = QApplication::tr("Copying %1...");
QStringList profileFiles; QStringList profileFiles;
profileFiles << "cache"; profileFiles << "cache";
profileFiles << "save"; profileFiles << "save";
@ -351,8 +351,10 @@ void COperationDialog::extractBnpClient()
// default server // default server
const CServer &server = config->getServer(); const CServer &server = config->getServer();
// default profile m_currentOperation = QApplication::tr("Extract client to new location");
const CProfile &profile = config->getProfile(); m_currentOperationProgressFormat = QApplication::tr("Extracting %1...");
QString destinationDirectory = config->getInstallationDirectory() + "/" + server.id;
CFilesExtractor extractor(this); CFilesExtractor extractor(this);
extractor.setSourceFile(config->getSrcServerClientBNPFullPath()); extractor.setSourceFile(config->getSrcServerClientBNPFullPath());
@ -367,8 +369,8 @@ void COperationDialog::cleanFiles()
// default server // default server
const CServer &server = config->getServer(); const CServer &server = config->getServer();
// default profile m_currentOperation = QApplication::tr("Clean obsolete files");
const CProfile &profile = config->getProfile(); m_currentOperationProgressFormat = QApplication::tr("Deleting %1...");
CFilesCleaner cleaner(this); CFilesCleaner cleaner(this);
cleaner.setDirectory(config->getInstallationDirectory() + "/" + server.id); cleaner.setDirectory(config->getInstallationDirectory() + "/" + server.id);