napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[keyboard] Add test for Turkish F variant

Browse Source 
- test keyboard lookup for "tr" - "f" variations
- add data mapping "tr" - "f" to legacy keymap "trf"

FIXES #1397
This commit is contained in:
Adriaan de Groot 2020-09-09 12:11:50 +02:00
parent aeffbac9cd
commit 633186778b
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/keyboard/Tests.cpp
View File

@ -42,6 +42,9 @@ KeyboardLayoutTests::testSimpleLayoutLookup_data()
QTest::addColumn< QString >( "vconsole" ); QTest::addColumn< QString >( "vconsole" );
QTest::newRow( "us" ) << QString( "us" ) << QString() << QString() << QString( "us" ); QTest::newRow( "us" ) << QString( "us" ) << QString() << QString() << QString( "us" );
QTest::newRow( "turkish default" ) << QString( "tr" ) << QString() << QString() << QString( "trq" );
QTest::newRow( "turkish alt-q" ) << QString( "tr" ) << QString() << QString( "alt" ) << QString( "trq" );
QTest::newRow( "turkish f" ) << QString( "tr" ) << QString() << QString( "f" ) << QString( "trf" );
} }

8
src/modules/keyboard/kbd-model-map
View File

@ -12,6 +12,13 @@
# #
# Updates: # Updates:
# - 2018-09-26 Added "Austrian" keyboard (de at). Issue #1035 # - 2018-09-26 Added "Austrian" keyboard (de at). Issue #1035
# - 2020-09-09 Added "Turkish F" keyboard. Issue #1397
#
# Note that keyboard variants should be listed from least to most-specific
# within a layout. Keyboard lookups only consider a subsequent
# line if it has a strictly better match than previous ones:
# listing specific variants early can mean a poor match with them
# is not overridden by a poor match with a later generic variant.
# #
# Generated from system-config-keyboard's model list # Generated from system-config-keyboard's model list
# consolelayout xlayout xmodel xvariant xoptions # consolelayout xlayout xmodel xvariant xoptions
@ -19,6 +26,7 @@ sg ch pc105 de_nodeadkeys terminate:ctrl_alt_bksp
nl nl pc105 - terminate:ctrl_alt_bksp nl nl pc105 - terminate:ctrl_alt_bksp
mk-utf mk,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll mk-utf mk,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
trq tr pc105 - terminate:ctrl_alt_bksp trq tr pc105 - terminate:ctrl_alt_bksp
trf tr pc105 f terminate:ctrl_alt_bksp
uk gb pc105 - terminate:ctrl_alt_bksp uk gb pc105 - terminate:ctrl_alt_bksp
is-latin1 is pc105 - terminate:ctrl_alt_bksp is-latin1 is pc105 - terminate:ctrl_alt_bksp
de de pc105 - terminate:ctrl_alt_bksp de de pc105 - terminate:ctrl_alt_bksp