marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

envmanager: stop loading mobile config when desktop one should be

Browse source
This commit is contained in:
Luis Büchi 2025-10-28 03:21:13 +01:00
parent 02dc2006d1
commit 90abaad9c8
2 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
envmanager/settings.cpp
View file

@ -24,6 +24,8 @@ const QString MOBILE_KSMSERVERRC_FILE = u"plasma-mobile/ksmserverrc"_s;
const QString MOBILE_KDEGLOBALS_FILE = u"plasma-mobile/kdeglobals"_s; const QString MOBILE_KDEGLOBALS_FILE = u"plasma-mobile/kdeglobals"_s;
const QString MOBILE_APPLICATIONS_BLACKLIST_FILE = u"plasma-mobile/applications-blacklistrc"_s; const QString MOBILE_APPLICATIONS_BLACKLIST_FILE = u"plasma-mobile/applications-blacklistrc"_s;
const QString DESKTOP_KWINRC_FILE = u"kwinrc"_s;
Settings::Settings(QObject *parent) Settings::Settings(QObject *parent)
: QObject{parent} : QObject{parent}
, m_isMobilePlatform{KRuntimePlatform::runtimePlatform().contains(u"phone"_s)} , m_isMobilePlatform{KRuntimePlatform::runtimePlatform().contains(u"phone"_s)}
@ -52,10 +54,10 @@ void Settings::applyConfiguration()
void Settings::loadSavedConfiguration() void Settings::loadSavedConfiguration()
{ {
// kwinrc (legacy, we only write in the plasma-mobile/kwinrc file now) // kwinrc (legacy, we only write in the plasma-mobile/kwinrc file now)
auto originalKwinrcConfig = KSharedConfig::openConfig(u"kwinrc"_s, KConfig::SimpleConfig); auto originalKwinrcConfig = KSharedConfig::openConfig(DESKTOP_KWINRC_FILE, KConfig::SimpleConfig);
loadKeys(u"kwinrc"_s, originalKwinrcConfig, getKwinrcSettings(m_mobileConfig)); loadKeys(DESKTOP_KWINRC_FILE, originalKwinrcConfig, getKwinrcSettings(m_mobileConfig));
originalKwinrcConfig->sync(); originalKwinrcConfig->sync();
reloadKWinConfig(); reloadKWinConfig(originalKwinrcConfig);
// kdeglobals (legacy, we only write in the plasma-mobile/kdeglobals file now) // kdeglobals (legacy, we only write in the plasma-mobile/kdeglobals file now)
auto originalKdeglobalsConfig = KSharedConfig::openConfig(u"kdeglobals"_s, KConfig::SimpleConfig); auto originalKdeglobalsConfig = KSharedConfig::openConfig(u"kdeglobals"_s, KConfig::SimpleConfig);
@ -73,11 +75,11 @@ void Settings::applyMobileConfiguration()
auto kwinSettings = getKwinrcSettings(m_mobileConfig); auto kwinSettings = getKwinrcSettings(m_mobileConfig);
setOptionsImmutable(false, MOBILE_KWINRC_FILE, kwinSettings); setOptionsImmutable(false, MOBILE_KWINRC_FILE, kwinSettings);
auto kwinrc = kwinrcConfig(); auto kwinrc = KSharedConfig::openConfig(MOBILE_KWINRC_FILE, KConfig::SimpleConfig);
writeKeys(MOBILE_KWINRC_FILE, kwinrc, kwinSettings); writeKeys(MOBILE_KWINRC_FILE, kwinrc, kwinSettings);
writeKeys(MOBILE_KWINRC_FILE, kwinrc, KWINRC_DEFAULT_SETTINGS); // only write, don't make immutable writeKeys(MOBILE_KWINRC_FILE, kwinrc, KWINRC_DEFAULT_SETTINGS); // only write, don't make immutable
kwinrc->sync(); kwinrc->sync();
reloadKWinConfig(); reloadKWinConfig(kwinrc);
setOptionsImmutable(true, MOBILE_KWINRC_FILE, kwinSettings); setOptionsImmutable(true, MOBILE_KWINRC_FILE, kwinSettings);
} }
@ -188,12 +190,7 @@ const QString Settings::loadSavedConfigSetting(KSharedConfig::Ptr &config, const
return value; return value;
} }
KSharedConfig::Ptr Settings::kwinrcConfig() const void Settings::reloadKWinConfig(KSharedConfig::Ptr kwinrc)
{
return KSharedConfig::openConfig(MOBILE_KWINRC_FILE, KConfig::SimpleConfig);
}
void Settings::reloadKWinConfig()
{ {
// Reload config // Reload config
QDBusMessage reloadMessage = QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig"); QDBusMessage reloadMessage = QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
@ -201,7 +198,7 @@ void Settings::reloadKWinConfig()
// Effects need to manually be loaded/unloaded in a live KWin session. // Effects need to manually be loaded/unloaded in a live KWin session.
KConfigGroup pluginsGroup{kwinrcConfig(), QStringLiteral("Plugins")}; KConfigGroup pluginsGroup{kwinrc, QStringLiteral("Plugins")};
for (const auto &effect : KWIN_EFFECTS) { for (const auto &effect : KWIN_EFFECTS) {
// Read from the config whether the effect is enabled (settings are suffixed with "Enabled", ex. blurEnabled) // Read from the config whether the effect is enabled (settings are suffixed with "Enabled", ex. blurEnabled)

3
envmanager/settings.h
View file

@ -34,8 +34,7 @@ private:
void saveConfigSetting(const QString &fileName, const QString &group, const QString &key, const QVariant value); void saveConfigSetting(const QString &fileName, const QString &group, const QString &key, const QVariant value);
const QString loadSavedConfigSetting(KSharedConfig::Ptr &config, const QString &fileName, const QString &group, const QString &key, bool write = true); const QString loadSavedConfigSetting(KSharedConfig::Ptr &config, const QString &fileName, const QString &group, const QString &key, bool write = true);
KSharedConfig::Ptr kwinrcConfig() const; void reloadKWinConfig(KSharedConfig::Ptr kwinrc);
void reloadKWinConfig();
// whether this is Plasma Mobile // whether this is Plasma Mobile
bool m_isMobilePlatform; bool m_isMobilePlatform;