From 84dea261268b1fa92ecc0023551fdcd1ae50d6ae Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 16 May 2016 14:50:53 +0200 Subject: [PATCH] Changed: Display current operation --- .../ryzom_installer/src/operationdialog.cpp | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp index f9b2b6f7c..f7f953d6c 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp @@ -286,8 +286,8 @@ void COperationDialog::copyServerFiles() // default server const CServer &server = config->getServer(); - // default profile - const CProfile &configuration = config->getProfile(); + m_currentOperation = QApplication::tr("Copy client files needed for server %1").arg(server.name); + m_currentOperationProgressFormat = QApplication::tr("Copying %1..."); QStringList serverFiles; serverFiles << "cfg"; @@ -297,9 +297,6 @@ void COperationDialog::copyServerFiles() serverFiles << "unpack"; 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); copier.setSourceDirectory(config->getSrcServerDirectory()); copier.setDesinationDirectory(config->getInstallationDirectory() + "/" + server.id); @@ -323,6 +320,9 @@ void COperationDialog::copyProfileFiles() // default profile const CProfile &profile = config->getProfile(); + m_currentOperation = QApplication::tr("Copy old profile to new location"); + m_currentOperationProgressFormat = QApplication::tr("Copying %1..."); + QStringList profileFiles; profileFiles << "cache"; profileFiles << "save"; @@ -351,8 +351,10 @@ void COperationDialog::extractBnpClient() // default server const CServer &server = config->getServer(); - // default profile - const CProfile &profile = config->getProfile(); + m_currentOperation = QApplication::tr("Extract client to new location"); + m_currentOperationProgressFormat = QApplication::tr("Extracting %1..."); + + QString destinationDirectory = config->getInstallationDirectory() + "/" + server.id; CFilesExtractor extractor(this); extractor.setSourceFile(config->getSrcServerClientBNPFullPath()); @@ -367,8 +369,8 @@ void COperationDialog::cleanFiles() // default server const CServer &server = config->getServer(); - // default profile - const CProfile &profile = config->getProfile(); + m_currentOperation = QApplication::tr("Clean obsolete files"); + m_currentOperationProgressFormat = QApplication::tr("Deleting %1..."); CFilesCleaner cleaner(this); cleaner.setDirectory(config->getInstallationDirectory() + "/" + server.id);