From 01b6aa0f318e347d882af7b5787648f6c4be9c8b Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Thu, 5 Mar 2020 20:18:18 +0000 Subject: using qsui as default ui under wayland session git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9269 90c681e8-e032-0410-971d-27865f9a5e38 --- src/qmmpui/uiloader.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/qmmpui/uiloader.cpp b/src/qmmpui/uiloader.cpp index af3856454..8a3ef0c7a 100644 --- a/src/qmmpui/uiloader.cpp +++ b/src/qmmpui/uiloader.cpp @@ -23,6 +23,10 @@ #include "qmmpuiplugincache_p.h" #include "uiloader.h" +#ifndef QMMP_DEFAULT_UI +#define QMMP_DEFAULT_UI "skinned" +#endif + QList *UiLoader::m_cache = nullptr; void UiLoader::loadPlugins() @@ -101,10 +105,13 @@ UiFactory *UiLoader::selected() { loadPlugins(); QSettings settings (Qmmp::configFile(), QSettings::IniFormat); -#ifdef QMMP_DEFAULT_UI - QString name = settings.value("Ui/current_plugin", QMMP_DEFAULT_UI).toString(); +#ifdef Q_OS_UNIX + QString defaultUi = QMMP_DEFAULT_UI; + if(defaultUi == QLatin1String("skinned") && qgetenv("XDG_SESSION_TYPE") == "wayland") + defaultUi = "qsui"; + QString name = settings.value("Ui/current_plugin", defaultUi).toString(); #else - QString name = settings.value("Ui/current_plugin", "skinned").toString(); + QString name = settings.value("Ui/current_plugin", QMMP_DEFAULT_UI).toString(); #endif for(QmmpUiPluginCache *item : qAsConst(*m_cache)) { -- cgit v1.2.3-13-gbd6f