From d2f9358fb78f8197b5d732e71ad457b150a49ec3 Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Tue, 26 Jul 2016 18:22:18 +0200
Subject: [PATCH] Changed: Use PNG icons under Linux, see #279

---
 code/ryzom/tools/client/ryzom_installer/src/configfile.cpp   | 4 +++-
 .../tools/client/ryzom_installer/src/operationdialog.cpp     | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp
index 63980e5fe..663eff3ea 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp
+++ b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp
@@ -97,9 +97,11 @@ void CProfile::createShortcuts() const
 	QString icon;
 
 #ifdef Q_OS_WIN32
+	// under Windows, icon is included in executable
 	icon = executable;
 #else
-	// TODO: Linux icon
+	// icon is in the same directory as client
+	icon = s.getDirectory() + "/ryzom_client.png";
 #endif
 
 	if (desktopShortcut)
diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
index 80b8c8f29..c24943f7d 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
+++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
@@ -718,6 +718,7 @@ void COperationDialog::copyInstaller()
 			QStringList filter;
 			filter << "msvcp100.dll";
 			filter << "msvcr100.dll";
+			filter << "ryzom_installer.png";
 
 			CFilesCopier copier(this);
 			copier.setIncludeFilter(filter);
@@ -756,9 +757,11 @@ void COperationDialog::copyInstaller()
 		QString icon;
 
 #ifdef Q_OS_WIN32
+		// under Windows, icon is included in executable
 		icon = executable;
 #else
-		// TODO: Linux icon
+		// icon is in the same directory as installer
+		icon = config->getInstallationDirectory() + "/ryzom_installer.png";
 #endif
 
 		createLink(shortcut, name, executable, "", icon, "");