- Optionally support Qxt global shortcuts for Qt-only (Qt4) Linux, and Windows, builds.

- Move media-keys setting into shortcuts page.

gui/settings.cpp

@@ -29,6 +29,7 @@
 #include "itemview.h"
 #include "mpdparseutils.h"
 #include "utils.h"
+#include "mediakeys.h"
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KGlobal>
 #include <KDE/KConfig>
@@ -525,12 +526,14 @@ QStringList Settings::hiddenPages()
     return GET_STRINGLIST("hiddenPages", def);
 }
 
-#if !defined Q_OS_WIN && !defined ENABLE_KDE_SUPPORT
-bool Settings::gnomeMediaKeys()
+QString Settings::mediaKeysIface()
 {
-    return GET_BOOL("gnomeMediaKeys", true);
+    #if defined Q_OS_WIN
+    return GET_STRING("mediaKeysIface", MediaKeys::toString(MediaKeys::QxtInterface));
+    #else
+    return GET_STRING("mediaKeysIface", MediaKeys::toString(MediaKeys::GnomeInteface));
+    #endif
 }
-#endif
 
 #ifdef ENABLE_DEVICES_SUPPORT
 bool Settings::overwriteSongs()
@@ -1015,12 +1018,10 @@ void Settings::saveHiddenPages(const QStringList &v)
     SET_VALUE_MOD(hiddenPages)
 }
 
-#if !defined Q_OS_WIN && !defined ENABLE_KDE_SUPPORT
-void Settings::saveGnomeMediaKeys(bool v)
+void Settings::saveMediaKeysIface(const QString &v)
 {
-    SET_VALUE_MOD(gnomeMediaKeys)
+    SET_VALUE_MOD(mediaKeysIface)
 }
-#endif
 
 #ifdef ENABLE_DEVICES_SUPPORT
 void Settings::saveOverwriteSongs(bool v)