From 184cd43257454bccf56104a6e9f6ba39e2df0359 Mon Sep 17 00:00:00 2001
From: Felix Kauselmann <2039670+selmf@users.noreply.github.com>
Date: Wed, 3 Jan 2018 20:20:51 +0100
Subject: [PATCH] Set application icons for X11 based systems

---
 YACReader/main.cpp        | 19 +++++++++++--------
 YACReaderLibrary/main.cpp |  9 ++++++---
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/YACReader/main.cpp b/YACReader/main.cpp
index 3d9a0ec0..ebe4312f 100644
--- a/YACReader/main.cpp
+++ b/YACReader/main.cpp
@@ -85,12 +85,15 @@ int main(int argc, char * argv[])
 
 	app.setApplicationName("YACReader");
 	app.setOrganizationName("YACReader");
-    app.setAttribute(Qt::AA_UseHighDpiPixmaps);
-	//simple command line parser
+  app.setAttribute(Qt::AA_UseHighDpiPixmaps);
+  if (QIcon::hasThemeIcon("YACReader")) {
+    app.setWindowIcon(QIcon::fromTheme("YACReader"));
+  }
+  //simple command line parser
 	//will be replaced by QCommandLineParser in the future
 	QStringList optlist;
 	QStringList arglist;
-	
+
 	if (argc > 1)
 	{
 		//extract options and arguments
@@ -118,7 +121,7 @@ int main(int argc, char * argv[])
 			}
 		}
 	}
-	
+
 	QString destLog = YACReader::getSettingsPath()+"/yacreader.log";
 	QDir().mkpath(YACReader::getSettingsPath());
 
@@ -133,11 +136,11 @@ int main(int argc, char * argv[])
 
 	QTranslator translator;
 	QString sufix = QLocale::system().name();
-#if defined Q_OS_UNIX && !defined Q_OS_MAC	
+#if defined Q_OS_UNIX && !defined Q_OS_MAC
 	translator.load(QString(DATADIR)+"/yacreader/languages/yacreader_"+sufix);
 #else
 	translator.load(QCoreApplication::applicationDirPath()+"/languages/yacreader_"+sufix);
-#endif	
+#endif
 	app.installTranslator(&translator);
 	MainWindowViewer * mwv = new MainWindowViewer();
 
@@ -145,7 +148,7 @@ int main(int argc, char * argv[])
 	//if we have a valid request, open it - if not, load normally
 	if (argc > 1)
 	{
-		if (!optlist.filter("--comicId=").isEmpty() && !optlist.filter("--libraryId=").isEmpty())	
+		if (!optlist.filter("--comicId=").isEmpty() && !optlist.filter("--libraryId=").isEmpty())
 		{
 			if (arglist.count()>1)
 			{
@@ -168,7 +171,7 @@ int main(int argc, char * argv[])
     delete mwv;
 
 	//Configuration::getConfiguration().save();
-	
+
 	YACReader::exitCheck(ret);
 
 #ifdef Q_OS_MAC
diff --git a/YACReaderLibrary/main.cpp b/YACReaderLibrary/main.cpp
index 92226127..9e78a797 100644
--- a/YACReaderLibrary/main.cpp
+++ b/YACReaderLibrary/main.cpp
@@ -158,6 +158,9 @@ int main( int argc, char ** argv )
   app.setApplicationVersion(VERSION);
 
   app.setAttribute(Qt::AA_UseHighDpiPixmaps);
+  if (QIcon::hasThemeIcon("YACReaderLibrary")) {
+    app.setWindowIcon(QIcon::fromTheme("YACReaderLibrary"));
+  }
 
   QString destLog = YACReader::getSettingsPath()+"/yacreaderlibrary.log";
   QDir().mkpath(YACReader::getSettingsPath());
@@ -179,11 +182,11 @@ int main( int argc, char ** argv )
   translator.load(QCoreApplication::applicationDirPath()+"/languages/yacreaderlibrary_"+sufix);
 #endif
   app.installTranslator(&translator);
-  
+
   QTranslator viewerTranslator;
 #if defined Q_OS_UNIX && !defined Q_OS_MAC
   viewerTranslator.load(QString(DATADIR)+"/yacreader/languages/yacreader_"+sufix);
-#else  
+#else
   viewerTranslator.load(QCoreApplication::applicationDirPath()+"/languages/yacreader_"+sufix);
 #endif
   app.installTranslator(&viewerTranslator);
@@ -193,7 +196,7 @@ int main( int argc, char ** argv )
 #ifdef SERVER_RELEASE
   QSettings * settings = new QSettings(YACReader::getSettingsPath()+"/YACReaderLibrary.ini",QSettings::IniFormat); //TODO unificar la creaci�n del fichero de config con el servidor
   settings->beginGroup("libraryConfig");
-  
+
   s = new Startup();
 
   if(settings->value(SERVER_ON,true).toBool())