added unity icons support

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6471 90c681e8-e032-0410-971d-27865f9a5e38

5 files changed, 78 insertions, 3 deletions

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index c7986bf31..329f2d486 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -32,10 +32,11 @@ SET(app_SRCS
     main.cpp
     qmmpstarter.cpp
     lxdesupport.cpp
+    unitysupport.cpp
     qmmpapplication.cpp
 )
 
-SET(app_HDRS lxdesupport.h)
+SET(app_HDRS lxdesupport.h unitysupport.h)
 
 SET(app_RCCS images/images.qrc translations/qmmp_locales.qrc)
 
diff --git a/src/app/app.pro b/src/app/app.pro
index 7b7a58e94..cf1e8e546 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -3,14 +3,16 @@ include(../../qmmp.pri)
 HEADERS += qmmpstarter.h \
            builtincommandlineoption.h \
     lxdesupport.h \
-    qmmpapplication.h
+    qmmpapplication.h \
+    unitysupport.h
 
 SOURCES += \
            qmmpstarter.cpp \
            builtincommandlineoption.cpp \
     lxdesupport.cpp \
     main.cpp \
-    qmmpapplication.cpp
+    qmmpapplication.cpp \
+    unitysupport.cpp
 
 
 
diff --git a/src/app/qmmpstarter.cpp b/src/app/qmmpstarter.cpp
index ddbeabd56..eea15a242 100644
--- a/src/app/qmmpstarter.cpp
+++ b/src/app/qmmpstarter.cpp
@@ -38,6 +38,7 @@
 #include <qmmpui/qmmpuisettings.h>
 #include "qmmpstarter.h"
 #include "lxdesupport.h"
+#include "unitysupport.h"
 #include "builtincommandlineoption.h"
 
 #ifdef Q_OS_WIN
@@ -180,6 +181,8 @@ void QMMPStarter::startPlayer()
 
     //load lxde icons
     LXDESupport::load();
+    //Unity icons
+    UnitySupport::load();
 #endif
 
     //prepare libqmmp and libqmmpui libraries for usage
diff --git a/src/app/unitysupport.cpp b/src/app/unitysupport.cpp
new file mode 100644
index 000000000..40b16a45f
--- /dev/null
+++ b/src/app/unitysupport.cpp
@@ -0,0 +1,36 @@
+/***************************************************************************
+ *   Copyright (C) 2016 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+ ***************************************************************************/
+
+#include <QProcess>
+#include <QIcon>
+#include "unitysupport.h"
+
+void UnitySupport::load()
+{
+    if(qgetenv("XDG_CURRENT_DESKTOP") != "Unity" && qgetenv("XDG_CURRENT_DESKTOP") != "GNOME")
+        return;
+
+    QProcess process;
+    process.start("dconf read /org/gnome/desktop/interface/icon-theme");
+    process.waitForFinished(3000);
+    QString iconTheme = QString::fromLocal8Bit(process.readAllStandardOutput().trimmed());
+    if(!iconTheme.isEmpty())
+        QIcon::setThemeName(iconTheme.remove("'"));
+}
diff --git a/src/app/unitysupport.h b/src/app/unitysupport.h
new file mode 100644
index 000000000..ac49c2127
--- /dev/null
+++ b/src/app/unitysupport.h
@@ -0,0 +1,33 @@
+/***************************************************************************
+ *   Copyright (C) 2016 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+ ***************************************************************************/
+
+#ifndef UNITYSUPPORT_H
+#define UNITYSUPPORT_H
+
+/**
+    @author Ilya Kotov <forkotov02@hotmail.ru>
+*/
+class UnitySupport
+{
+public:
+    static void load();
+};
+
+#endif // UNITYSUPPORT_H