aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-12-24 09:58:46 +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-04 12:04:23 +02:00
commit e4d156be08
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp
View file

@ -106,7 +106,7 @@ void CInstallDialog::onAnotherLocationBrowseButtonClicked()
if (CConfigFile::getInstance()->isRyzomInstalledIn(directory)) break; if (CConfigFile::getInstance()->isRyzomInstalledIn(directory)) break;
QMessageBox::StandardButton res = QMessageBox::warning(this, tr("Unable to find Ryzom"), tr("Unable to find Ryzom in selected directory. Please choose another one or cancel.")); QMessageBox::StandardButton res = QMessageBox::warning(this, tr("Unable to find Ryzom"), tr("Unable to find Ryzom in selected directory. Please choose another one or cancel."));
} }
m_anotherDirectory = directory; m_anotherDirectory = directory;
@ -154,7 +154,7 @@ void CInstallDialog::accept()
if (freeSpace < server.dataUncompressedSize) if (freeSpace < server.dataUncompressedSize)
{ {
QMessageBox::StandardButton res = QMessageBox::warning(this, tr("Not enough free disk space"), tr("You don't have enough free space on this disk, please make more space or choose a directory on another disk.")); QMessageBox::StandardButton res = QMessageBox::warning(this, tr("Not enough free disk space"), tr("You don't have enough free space on this disk, please make more space or choose a directory on another disk."));
return; return;
} }
@ -186,10 +186,14 @@ void CInstallDialog::accept()
return; return;
} }
if (!isDirectoryEmpty(m_dstDirectory, true)) // if reinstalling in same directory, don't check if directory is empty
if (m_dstDirectory != CConfigFile::getInstance()->getNewInstallationDirectory())
{ {
QMessageBox::StandardButton res = QMessageBox::warning(this, tr("Directory not empty"), tr("This directory is not empty, please choose another one.")); if (!isDirectoryEmpty(m_dstDirectory, true))
return; {
QMessageBox::StandardButton res = QMessageBox::warning(this, tr("Directory not empty"), tr("This directory is not empty, please choose another one."));
return;
}
} }
if (oldDirectoryRadioButton->isChecked()) if (oldDirectoryRadioButton->isChecked())

12
code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp
View file

@ -122,7 +122,7 @@ void CMigrateDialog::accept()
// compare with exact size of current directory // compare with exact size of current directory
if (freeSpace < getDirectorySize(m_currentDirectory, true)) if (freeSpace < getDirectorySize(m_currentDirectory, true))
{ {
QMessageBox::StandardButton res = QMessageBox::warning(this, tr("Not enough free disk space"), tr("You don't have enough free space on this disk, please make more space or choose a directory on another disk.")); QMessageBox::StandardButton res = QMessageBox::warning(this, tr("Not enough free disk space"), tr("You don't have enough free space on this disk, please make more space or choose a directory on another disk."));
return; return;
} }
@ -154,10 +154,14 @@ void CMigrateDialog::accept()
return; return;
} }
if (!isDirectoryEmpty(m_dstDirectory, true)) // if reinstalling in same directory, don't check if directory is empty
if (m_dstDirectory != CConfigFile::getInstance()->getNewInstallationDirectory())
{ {
QMessageBox::StandardButton res = QMessageBox::warning(this, tr("Directory not empty"), tr("This directory is not empty, please choose another one.")); if (!isDirectoryEmpty(m_dstDirectory, true))
return; {
QMessageBox::StandardButton res = QMessageBox::warning(this, tr("Directory not empty"), tr("This directory is not empty, please choose another one."));
return;
}
} }
CConfigFile::getInstance()->setSrcServerDirectory(m_currentDirectory); CConfigFile::getInstance()->setSrcServerDirectory(m_currentDirectory);