diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2020-03-05 20:18:18 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2020-03-05 20:18:18 +0000 |
| commit | 01b6aa0f318e347d882af7b5787648f6c4be9c8b (patch) | |
| tree | d6f9378407e0f71ff324f0c0af667569e7a9e94c /src | |
| parent | c07409a2c6cb205ed46b401efc46b78ab6334405 (diff) | |
| download | qmmp-01b6aa0f318e347d882af7b5787648f6c4be9c8b.tar.gz qmmp-01b6aa0f318e347d882af7b5787648f6c4be9c8b.tar.bz2 qmmp-01b6aa0f318e347d882af7b5787648f6c4be9c8b.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/qmmpui/uiloader.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
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<QmmpUiPluginCache*> *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)) { |