Stabilize module settings grouping#91
Merged
kissetfall merged 2 commits intoJul 19, 2026
Merged
Conversation
IgorArkhipov
force-pushed
the
igor/module-settings-grouping-fix
branch
from
July 17, 2026 21:05
ea91e43 to
a772434
Compare
IgorArkhipov
force-pushed
the
igor/module-settings-grouping-fix
branch
from
July 18, 2026 13:33
a772434 to
9a9a462
Compare
kissetfall
requested changes
Jul 18, 2026
kissetfall
left a comment
Member
There was a problem hiding this comment.
The word-based classification works for the current rmk-eh definitions, but two issues need to be corrected before merge.
- Coalesce side groups across tabs. The new classifier can admit an existing Left Modules tab and a generic controller tab containing a Left Mode field, producing two Left groups. The current side selector renders both with the same localized Left half label and displays only one group at a time, making settings indistinguishable and effectively hiding part of that side. The parser should guarantee at most one Left and one Right group, or the state/UI must explicitly represent multiple named groups per side. Please add a regression test with multiple tabs contributing fields to the same side and verify every field remains accessible.
- Reuse the existing settings_title_words helper instead of adding the identical module_setting_words implementation in the same owning module.
Please retain regression coverage for the current K04 Left, Right, and Auto Layer definitions.
Contributor
Author
|
Addressed in 837d684.
|
kissetfall
approved these changes
Jul 19, 2026
kissetfall
left a comment
Member
There was a problem hiding this comment.
Re-reviewed head 837d684 against current main. The requested coalescing and helper reuse are implemented in the owning parser, all side fields remain reachable, and the regression covers multi-tab Left, Right, and Auto Layer grouping. Local validation passed: 226/226 tests, Clippy, i18n, rustfmt, diff-check, and release build. CI is 4/4 green.
This was referenced Jul 19, 2026
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
EN
Problem
Module settings classification relied on broad title substrings and created one group per firmware tab. Names such as
Brightness Modulescould be mistaken for right-controller settings, while a tab containing both left and right controller fields could not preserve side ownership reliably.Fix
left,right, andmodulesubstrings.side,module_side, ormoduleSidemetadata when firmware provides it.This PR complements the diagnostics work in #88 without duplicating it.
Verification
cargo test --locked --all-targets: 195 passed.cargo test module_settings_groups: 5 passed.cargo clippy --locked --all-targets: passed with existing repository warnings.python3 scripts/check_i18n.py: passed.rustfmt --checkandgit diff --check: passed.TARGET=aarch64-apple-darwin scripts/build_macos_app.sh: arm64 app, DMG, and ZIP built; plist and code-signature validation passed.RU
Проблема
Группировка настроек модулей опиралась на широкие совпадения подстрок в заголовках и создавала одну группу на вкладку прошивки. Например,
Brightness Modulesмогла ошибочно определяться как настройки правого контроллера, а вкладка с полями левого и правого контроллеров не сохраняла принадлежность сторон надежно.Исправление
left,rightиmoduleиспользуются нормализованные отдельные слова.side,module_sideилиmoduleSide.PR дополняет диагностическую работу в #88, не дублируя ее.
Проверка
cargo test --locked --all-targets: прошли 195 тестов.cargo test module_settings_groups: прошли 5 тестов.cargo clippy --locked --all-targets: прошел с существующими предупреждениями репозитория.python3 scripts/check_i18n.py: прошел.rustfmt --checkиgit diff --check: прошли.TARGET=aarch64-apple-darwin scripts/build_macos_app.sh: собраны arm64-приложение, DMG и ZIP; plist и подпись прошли проверку.