aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-12-29 20:30:54 +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-09 19:53:31 +02:00
commit aefaa8f098
3 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -593,6 +593,11 @@ bool CConfigFile::areRyzomDataInstalledIn(const QString &directory) const
QDir dir(directory); QDir dir(directory);
#ifdef Q_OS_MAC
// under OS X, data are in Ryzom.app/Contents/Resources
if (!dir.cd("Ryzom.app") || !dir.cd("Contents") || !dir.cd("Resources")) return false;
#endif
// directory doesn't exist // directory doesn't exist
if (!dir.exists()) return false; if (!dir.exists()) return false;
@ -643,6 +648,11 @@ bool CConfigFile::isRyzomClientInstalledIn(const QString &directory) const
{ {
// client 3.0+ // client 3.0+
#ifdef Q_OS_MAC
// under OS X, client_default.cfg is in Ryzom.app/Contents/Resources
if (!dir.cd("Ryzom.app") || !dir.cd("Contents") || !dir.cd("Resources")) return false;
#endif
// client_default.cfg doesn't exist // client_default.cfg doesn't exist
if (!dir.exists("client_default.cfg")) return false; if (!dir.exists("client_default.cfg")) return false;

4
code/ryzom/tools/client/ryzom_installer/src/filesextractor.cpp
View file

@ -467,6 +467,10 @@ bool CFilesExtractor::extract7z()
error = QApplication::tr("7zip decoder doesn't support this archive"); error = QApplication::tr("7zip decoder doesn't support this archive");
break; break;
case SZ_ERROR_INPUT_EOF:
error = QApplication::tr("Errors in 7z file");
break;
case SZ_ERROR_FAIL: case SZ_ERROR_FAIL:
// error already defined // error already defined
break; break;

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

@ -547,9 +547,16 @@ void COperationDialog::extractDownloadedData()
m_currentOperation = tr("Extracting data required by server %1...").arg(server.name); m_currentOperation = tr("Extracting data required by server %1...").arg(server.name);
QString dest = server.getDirectory();
#ifdef Q_OS_MAC
// under OS X, data should be uncompressed in Ryzom.app/Contents/Resources
dest += "/Ryzom.app/Contents/Resources";
#endif
CFilesExtractor extractor(this); CFilesExtractor extractor(this);
extractor.setSourceFile(config->getInstallationDirectory() + "/" + server.dataDownloadFilename); extractor.setSourceFile(config->getInstallationDirectory() + "/" + server.dataDownloadFilename);
extractor.setDestinationDirectory(server.getDirectory()); extractor.setDestinationDirectory(dest);
if (extractor.exec()) if (extractor.exec())
{ {