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

Changed: Use PNG icons under Linux, see #279

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-07-26 18:22:18 +02:00
parent e5db49b990
commit 30aa93d55a
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
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)

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, "");