aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-10 01:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source
This commit is contained in:
kervala 2016-07-26 18:23:35 +02:00
parent f81a367111
commit 7ce529452f
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -97,9 +97,11 @@ void CProfile::createShortcuts() const
QString icon; QString icon;
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
// under Windows, icon is included in executable
icon = executable; icon = executable;
#else #else
// TODO: Linux icon // icon is in the same directory as client
icon = s.getDirectory() + "/ryzom_client.png";
#endif #endif
if (desktopShortcut) if (desktopShortcut)
@ -453,6 +455,11 @@ QString CConfigFile::getMenuDirectory() const
bool CConfigFile::has64bitsOS() bool CConfigFile::has64bitsOS()
{ {
#ifdef Q_OS_WIN32
// 64 bits only supported under Vista and up
if (QSysInfo::windowsVersion() < QSysInfo::WV_VISTA) return false;
#endif
return QSysInfo::currentCpuArchitecture() == "x86_64"; return QSysInfo::currentCpuArchitecture() == "x86_64";
} }

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

@ -54,7 +54,6 @@ CInstallDialog::CInstallDialog():QDialog()
updateDestinationText(); updateDestinationText();
// check whether OS architecture is 32 or 64 bits // check whether OS architecture is 32 or 64 bits
// TODO: 64 bits client only supported under Vista+
if (CConfigFile::has64bitsOS()) if (CConfigFile::has64bitsOS())
{ {
clientArchGroupBox->setVisible(true); clientArchGroupBox->setVisible(true);

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

@ -51,7 +51,6 @@ CMigrateDialog::CMigrateDialog():QDialog()
updateDestinationText(); updateDestinationText();
// check whether OS architecture is 32 or 64 bits // check whether OS architecture is 32 or 64 bits
// TODO: 64 bits client only supported under Vista+
if (CConfigFile::has64bitsOS()) if (CConfigFile::has64bitsOS())
{ {
clientArchGroupBox->setVisible(true); clientArchGroupBox->setVisible(true);

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

@ -718,6 +718,7 @@ void COperationDialog::copyInstaller()
QStringList filter; QStringList filter;
filter << "msvcp100.dll"; filter << "msvcp100.dll";
filter << "msvcr100.dll"; filter << "msvcr100.dll";
filter << "ryzom_installer.png";
CFilesCopier copier(this); CFilesCopier copier(this);
copier.setIncludeFilter(filter); copier.setIncludeFilter(filter);
@ -756,9 +757,11 @@ void COperationDialog::copyInstaller()
QString icon; QString icon;
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
// under Windows, icon is included in executable
icon = executable; icon = executable;
#else #else
// TODO: Linux icon // icon is in the same directory as installer
icon = config->getInstallationDirectory() + "/ryzom_installer.png";
#endif #endif
createLink(shortcut, name, executable, "", icon, ""); createLink(shortcut, name, executable, "", icon, "");