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: Allow user to change the vkbd

Browse source 
Currently the vkbd setting (to maliit) is immutable, preventing users
from selecting different input methods. Loosen the envmanager setting so
that it's just a default value, which can be overriden by users.
This commit is contained in:
Devin Lin 2025-07-02 00:45:02 -04:00
parent f5e2a9b71e
commit 8fa5d1e053
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
envmanager/config.h
View file

@ -13,7 +13,7 @@
#include <KConfigGroup> #include <KConfigGroup>
#include <KSharedConfig> #include <KSharedConfig>
// applications-blacklistrc // .config/applications-blacklistrc
// NOTE: we only write these entries if they are not already defined in the config // NOTE: we only write these entries if they are not already defined in the config
const QMap<QString, QMap<QString, QVariant>> APPLICATIONS_BLACKLIST_DEFAULT_SETTINGS = { const QMap<QString, QMap<QString, QVariant>> APPLICATIONS_BLACKLIST_DEFAULT_SETTINGS = {
{"Applications", {"Applications",
@ -26,13 +26,20 @@ const QMap<QString, QMap<QString, QVariant>> APPLICATIONS_BLACKLIST_DEFAULT_SETT
"waydroid.com.android.inputmethod.latin,waydroid.com.android.settings,waydroid.org.lineageos.eleven,waydroid.org.lineageos.etar," "waydroid.com.android.inputmethod.latin,waydroid.com.android.settings,waydroid.org.lineageos.eleven,waydroid.org.lineageos.etar,"
"waydroid.org.lineageos.jelly,waydroid.org.lineageos.recorder,wordview"}}}}; "waydroid.org.lineageos.jelly,waydroid.org.lineageos.recorder,wordview"}}}};
// kdeglobals // .config/plasma-mobile/kdeglobals - non-immutable settings:
// NOTE: we only write these entries if they are not already defined in the config
const QMap<QString, QMap<QString, QVariant>> KDEGLOBALS_DEFAULT_SETTINGS = {{"General", {{"BrowserApplication", "angelfish"}}}}; const QMap<QString, QMap<QString, QVariant>> KDEGLOBALS_DEFAULT_SETTINGS = {{"General", {{"BrowserApplication", "angelfish"}}}};
// .config/plasma-mobile/kdeglobals - immutable settings:
const QMap<QString, QMap<QString, QVariant>> KDEGLOBALS_SETTINGS = {{"KDE", {{"LookAndFeelPackage", "org.kde.breeze.mobile"}}}}; const QMap<QString, QMap<QString, QVariant>> KDEGLOBALS_SETTINGS = {{"KDE", {{"LookAndFeelPackage", "org.kde.breeze.mobile"}}}};
// plasma-mobile/kwinrc // .config/plasma-mobile/kwinrc - non-immutable settings:
const QMap<QString, QMap<QString, QVariant>> KWINRC_DEFAULT_SETTINGS = {
{"Wayland",
{
{"InputMethod", "/usr/share/applications/com.github.maliit.keyboard.desktop"} // ensure maliit is our default vkbd
}}};
// .config/plasma-mobile/kwinrc - immutable settings:
QMap<QString, QMap<QString, QVariant>> getKwinrcSettings(KSharedConfig::Ptr m_mobileConfig) QMap<QString, QMap<QString, QVariant>> getKwinrcSettings(KSharedConfig::Ptr m_mobileConfig)
{ {
auto group = KConfigGroup{m_mobileConfig, QStringLiteral("General")}; auto group = KConfigGroup{m_mobileConfig, QStringLiteral("General")};
@ -54,7 +61,6 @@ QMap<QString, QMap<QString, QVariant>> getKwinrcSettings(KSharedConfig::Ptr m_mo
}}, }},
{"Wayland", {"Wayland",
{ {
{"InputMethod", "/usr/share/applications/com.github.maliit.keyboard.desktop"}, // ensure maliit is our vkbd
{"VirtualKeyboardEnabled", true} // enable vkbd {"VirtualKeyboardEnabled", true} // enable vkbd
}}, }},
{"org.kde.kdecoration2", {"org.kde.kdecoration2",
@ -73,5 +79,5 @@ QMap<QString, QMap<QString, QVariant>> getKwinrcSettings(KSharedConfig::Ptr m_mo
const QList<QString> KWIN_EFFECTS = {"blur", "mobiletaskswitcher", "screenedge"}; const QList<QString> KWIN_EFFECTS = {"blur", "mobiletaskswitcher", "screenedge"};
const QList<QString> KWIN_SCRIPTS = {"convergentwindows"}; const QList<QString> KWIN_SCRIPTS = {"convergentwindows"};
// plasma-mobile/ksmserver // .config/plasma-mobile/ksmserver - immutable settings:
const QMap<QString, QMap<QString, QVariant>> KSMSERVER_SETTINGS = {{"General", {{"loginMode", "emptySession"}}}}; const QMap<QString, QMap<QString, QVariant>> KSMSERVER_SETTINGS = {{"General", {{"loginMode", "emptySession"}}}};

1
envmanager/settings.cpp
View file

@ -80,6 +80,7 @@ void Settings::applyMobileConfiguration()
auto kwinrc = kwinrcConfig(); auto kwinrc = kwinrcConfig();
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
kwinrc->sync(); kwinrc->sync();
reloadKWinConfig(); reloadKWinConfig();