Adriaan de Groot
71e0081fce
[keyboard] SPDX-tagging
2020-10-30 22:31:42 +01:00
Adriaan de Groot
8457a00ad0
[keyboard] Fix group-switcher multiplying
...
FIXES #1556
2020-10-30 11:05:15 +01:00
Adriaan de Groot
cd9c0ea781
[keyboard] Reduce debugging output
2020-10-28 17:00:12 +01:00
Adriaan de Groot
2e5301c5c9
[keyboard] Simplify back down to lambdas
...
- With debugging and untangling done, the lambdas are simple
and short, so return to using them. One point of improvement
might be to give the models suitable slots themselves,
to avoid even this indirection.
2020-10-28 16:54:08 +01:00
Adriaan de Groot
0bf28b0b94
[keyboard] Sanity in setCurrentIndex() parameters
2020-10-28 16:47:52 +01:00
Adriaan de Groot
9e141636c5
[keyboard] Tidy up the debugging output, add docs
2020-10-28 16:40:43 +01:00
Adriaan de Groot
14a76a386a
[keyboard] Replace broken-ish variants model with k-v list
...
- Use the just-refactored XKBListModel to store the xkb key-value
pairs for variants, drop most of the complicated implementation,
store just a single list of values.
2020-10-28 16:29:52 +01:00
Adriaan de Groot
d536173d66
[keyboard] Factor out a 2-column k-v list
2020-10-28 16:29:52 +01:00
Adriaan de Groot
5afe54132b
[keyboard] Use the models from Config
...
- Remove code that is duplicated in Config.
- Hook up UI for physical keyboard model, and back.
- For now, introduce some named slots with debugging output.
This makes debugging a lot easier since we have function names
to work with rather than anonymous lambdas
2020-10-28 16:01:38 +01:00
Adriaan de Groot
168be02c96
[keyboard] Hook up the model-selection again
2020-10-28 14:03:46 +01:00
Adriaan de Groot
87aafb2442
[keyboard] Tear up connections between widgets and model
2020-10-28 13:57:57 +01:00
Adriaan de Groot
193efe1710
[keyboard] Restore the notion of PC105 default index
2020-10-28 13:57:57 +01:00
Adriaan de Groot
6aedf4401f
[keyboard] Apply coding style
2020-10-28 13:41:34 +01:00
Adriaan de Groot
365a2ad6fd
[keyboard] Re-do the keyboard physical models model from scratch
2020-10-28 13:41:21 +01:00
Adriaan de Groot
a1c70b46a1
[keyboard] Typo in comment
2020-10-28 13:06:43 +01:00
Adriaan de Groot
5f1d7b2e8d
[keyboard] Rename UI widgets to make code clearer
2020-10-28 10:38:51 +01:00
Adriaan de Groot
d464e98e89
[keyboard] Move remaining variables to Config
...
- Config already *has* everythind, but drop the useless copies
and duplicated code from the Page
- Plug the models model into the Page
- While here, document the model / layout / variant distinctions
The code doesn't fill the UI properly, and the drop-down
for the models combobox is not right, but at least the data
is shared.
2020-10-28 01:25:42 +01:00
Adriaan de Groot
fe5757c7d1
[keyboard] Matching of layouts is very suspect
2020-10-28 01:07:49 +01:00
Adriaan de Groot
4f0d6a8f25
Merge branch 'calamares' into fix-keyboardq
2020-10-28 00:04:40 +01:00
Artem Grinev
4434e85d4d
[keyboard] Simplified variable name
2020-10-27 20:53:20 +03:00
Artem Grinev
3552233bf1
[keyboard] Minor logic rework
2020-10-27 20:48:18 +03:00
Artem Grinev
6667ea834f
[keyboard] Adjusted indents
2020-10-27 20:42:49 +03:00
Artem Grinev
996c82160e
[keyboard] fixed typo
2020-10-27 20:38:04 +03:00
Adriaan de Groot
4a3273d634
[keyboard] Remove superfluous variable (set to true, never changed)
2020-10-27 16:59:22 +01:00
Artem Grinev
bfc60ad2cf
[keyboard] Implemented X11 config writing for additional layout
2020-10-27 18:59:10 +03:00
Artem Grinev
0dd027af90
[keyboard] Fixed condition bug
2020-10-27 18:59:10 +03:00
Artem Grinev
19b1fb3358
[keyboard] Added explanatory comment for xkbmap_query_grp_option
2020-10-27 18:59:10 +03:00
Artem Grinev
384b1ba8c6
[keyboard] Swapped primary and additional layouts in selection
2020-10-27 18:59:10 +03:00
Artem Grinev
354dc1613a
[keyboard] Removed unnecessary repacking in xkbmap_layout_args
2020-10-27 18:59:10 +03:00
Artem Grinev
09b5e42734
[keyboard] Minor additional layout info rework
2020-10-27 18:59:10 +03:00
Artem Grinev
17b9647016
[keyboard] Support for additional layout if current layout is not ASCII-
...
capable in live system
2020-10-27 18:59:10 +03:00
Adriaan de Groot
0947cd8354
[keyboard] Migrate to Config::onActivate() which is badly-named
2020-10-27 16:12:36 +01:00
Adriaan de Groot
0ffa500432
[keyboard] Remove unused code
...
- this has already migrated to Config but had not been removed locally
2020-10-27 15:56:50 +01:00
Adriaan de Groot
35a2bd3f0f
[keyboard] Use Config's own finalize()
2020-10-27 15:55:29 +01:00
Adriaan de Groot
14c079d1d6
[keyboard] Replace own copy of status by the one from Config
2020-10-27 15:53:59 +01:00
Adriaan de Groot
acb5190217
[keyboard] Use Config methods rather than own copy
...
- this continues the port of the keyboard module to use the Config
object, which was horribly botched earlier.
2020-10-27 15:51:48 +01:00
Adriaan de Groot
679f613955
[keyboard] Rename mysterious Config::init() to descriptive name
2020-10-27 15:48:51 +01:00
Adriaan de Groot
c7c7e6a6c1
[keyboard] Move configuration to the Config object
...
- information from the configuration file -> Config object
- job creation -> Config object
Ignore keyboardq for now.
2020-10-14 15:50:21 +02:00
Adriaan de Groot
0f6602cad7
[keyboard] Improve xkb parsing
2020-10-14 15:50:21 +02:00
Adriaan de Groot
ec42e3294f
[keyboard] Refactor argument-lists for setxkbmap
...
- separate functions for model, and layout+variant settings
2020-10-14 15:50:21 +02:00
Adriaan de Groot
b54273f904
[keyboard] Move all the keyboard (AbstractList)Models to the models file
2020-10-14 15:50:21 +02:00
Adriaan de Groot
a955791766
Apply coding style globally again
2020-10-12 14:27:01 +02:00
Adriaan de Groot
6b07bdf6ed
[keyboard] Do not use deprecated Qt4-era indexChanged for text
2020-09-22 23:51:35 +02:00
Adriaan de Groot
2878c474c5
Warnings-- (~T() override)
...
Change all the places that had
virtual ~T() override
to the less redundant form without override.
2020-09-22 22:49:30 +02:00
Adriaan de Groot
2126be6d6d
Warnings-- (~T() override)
...
Consistently use
~T() override;
in class declarations (so no virtual in front, and avoid
warnings due to the missing override in back).
2020-09-22 22:40:52 +02:00
Adriaan de Groot
7d5a209dd0
[modules] Warnings-- in tests (~Test() override)
2020-09-22 22:37:55 +02:00
Adriaan de Groot
8b22786bd2
Merge branch 'issue-1397' into calamares
...
Document keyboard change for Turkish F layout, and document
the keyboard configuration value better, with alternate
path used in e.g. openSUSE
FIXES #1397
2020-09-09 12:21:48 +02:00
Adriaan de Groot
633186778b
[keyboard] Add test for Turkish F variant
...
- test keyboard lookup for "tr" - "f" variations
- add data mapping "tr" - "f" to legacy keymap "trf"
FIXES #1397
2020-09-09 12:11:50 +02:00
Adriaan de Groot
aeffbac9cd
CMake: add resources to tests
...
Some tests -- notably the keyboard module -- need to have the
QRC for the module loaded as well (e.g. because of data in the
QRC). Add a RESOURCES parameter to calamares_add_test()
like calamares_add_plugin() already has, to build the
resources into the test.
Keyboard test now passes, since it was missing the data for
lookups before.
2020-09-09 11:58:56 +02:00
Adriaan de Groot
2aece7ff1b
[keyboard] Warn if QRC is not available
2020-09-09 11:47:50 +02:00