Merge tag 'upstream/4.10.0.4' into packaging/openkylin/nile
4.10.0.4-release
This commit is contained in:
commit
17267acfed
|
@ -178,7 +178,7 @@ void GlobalSetting::initGlobalSettings()
|
||||||
|
|
||||||
void GlobalSetting::initUSDSetting()
|
void GlobalSetting::initUSDSetting()
|
||||||
{
|
{
|
||||||
m_cache.insert(IsLiteMode, true);
|
m_cache.insert(IsLiteMode, false);
|
||||||
|
|
||||||
const QString service = QStringLiteral("org.ukui.SettingsDaemon");
|
const QString service = QStringLiteral("org.ukui.SettingsDaemon");
|
||||||
const QString path = QStringLiteral("/GlobalSignal");
|
const QString path = QStringLiteral("/GlobalSignal");
|
||||||
|
@ -200,7 +200,7 @@ void GlobalSetting::initUSDSetting()
|
||||||
void GlobalSetting::onSysModeChanged(QMap<QString, QVariant> map)
|
void GlobalSetting::onSysModeChanged(QMap<QString, QVariant> map)
|
||||||
{
|
{
|
||||||
if (map.contains("animation")) {
|
if (map.contains("animation")) {
|
||||||
m_cache.insert(IsLiteMode, (map.value("animation").toString() == "off"));
|
m_cache.insert(IsLiteMode, (map.value("animation").toString() == QStringLiteral("lite")));
|
||||||
Q_EMIT styleChanged(IsLiteMode);
|
Q_EMIT styleChanged(IsLiteMode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue