Commit 283dff91 authored by Andrey Butirsky's avatar Andrey Butirsky
Browse files

fix: [2/2] Keyboard Layout applet: layout Name doesn't fit if variant is set

Variants are now stored separate from layouts in their own config entry.

P-D commit:
fix: [1/2] Keyboard Layout applet: layout Name doesn't fit if variant is set
parent cea27813
......@@ -175,13 +175,14 @@ xkb_keymap *Xkb::loadKeymapFromConfig()
const KConfigGroup config = m_config->group("Layout");
const QByteArray model = config.readEntry("Model", "pc104").toLocal8Bit();
const QByteArray layout = config.readEntry("LayoutList", "").toLocal8Bit();
const QByteArray variant = config.readEntry("VariantList").toLatin1();
const QByteArray options = config.readEntry("Options", "").toLocal8Bit();
xkb_rule_names ruleNames = {
.rules = nullptr,
.model = model.constData(),
.layout = layout.constData(),
.variant = nullptr,
.variant = variant.constData(),
.options = options.constData()
};
applyEnvironmentRules(ruleNames);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment