Skip to content
This repository was archived by the owner on Nov 25, 2023. It is now read-only.

Feature/update key categories #56

Merged
Invvard merged 10 commits into from
Apr 8, 2019
Merged

Feature/update key categories #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
681ccc8
Add the missing 'Nordic' key category
Invvard Apr 7, 2019
b20336a
Update key definitions
Invvard Apr 7, 2019
c17a1b7
Update key definition processor
Invvard Apr 7, 2019
6387e78
Remove the 'German' mention
Invvard Apr 7, 2019
75b8612
Add the 'no' hint for the Nordic category
Invvard Apr 7, 2019
c034741
Update displaying characters
Invvard Apr 7, 2019
4c24b5d
Update key definitions
Invvard Apr 7, 2019
ffc963c
Merge branch 'master' into feature/update-key-categories
Invvard Apr 7, 2019
0d013f9
Fix unit test
Invvard Apr 7, 2019
300896c
Merge branch 'feature/update-key-categories' of https://github.com/In…
Invvard Apr 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/InvvardDev.EZLayoutDisplay.Console/KeyDefinitionProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ private void WriteJsonFile(List<KeyDefinition> keyDefinitions)

break;
case "DE_SQ2":
label = "German \\u00B2";
label = "\\u00B2";

break;
case "FR_EACU":
Expand All @@ -338,23 +338,23 @@ private void WriteJsonFile(List<KeyDefinition> keyDefinitions)

break;
case "DE_SS":
label = "German \\u00DF";
label = "\\u00DF";

break;
case "DE_AE":
label = "German \\u00C6";
label = "\\u00C4";

break;
case "DE_UE":
label = "German \\u00DC";
label = "\\u00DC";

break;
case "DE_OE":
label = "German \\u00D6";
label = "\\u00D6";

break;
case "DE_CIRC":
label = "German \\u005E";
label = "\\u005E\\u00B0";

break;
case "NO_HALF":
Expand Down Expand Up @@ -395,7 +395,7 @@ private void WriteJsonFile(List<KeyDefinition> keyDefinitions)

break;
case "DE_RING":
label = "German \\u00B0";
label = "\\u00B0";

break;
case "FR_UMLT":
Expand All @@ -415,11 +415,11 @@ private void WriteJsonFile(List<KeyDefinition> keyDefinitions)

break;
case "DE_PARA":
label = "German \\u00A7";
label = "\\u00A7";

break;
case "DE_EURO":
label = "German \\u20AC";
label = "\\u20AC";

break;
case "FR_EURO":
Expand All @@ -432,15 +432,15 @@ private void WriteJsonFile(List<KeyDefinition> keyDefinitions)

break;
case "DE_ACUT":
label = "German \\u00B4";
label = "\\u00B4\\u0060";

break;
case "ES_ACUT":
label = "\\u00B4";

break;
case "DE_SQ3":
label = "German \\u00B3";
label = "\\u00B3";

break;
case "NO_LCBR":
Expand Down
4 changes: 4 additions & 0 deletions src/InvvardDev.EZLayoutDisplay.Desktop/Helper/EZLayoutMaker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,10 @@ private EZKey PrepareKeyLabels(ErgodoxKey ergodoxKey)
case KeyCategory.Spanish:
key.InternationalHint = "es";

break;
case KeyCategory.Nordic:
key.InternationalHint = "no";

break;
}

Expand Down
1 change: 1 addition & 0 deletions src/InvvardDev.EZLayoutDisplay.Desktop/Model/Enum/KeyCategory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public enum KeyCategory
French,
German,
Spanish,
Nordic,
NumPad,
Other,
Punct,
Expand Down
2 changes: 1 addition & 1 deletion src/InvvardDev.EZLayoutDisplay.Desktop/Properties/keyDefinitions.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/InvvardDev.EZLayoutDisplay.Tests/Helper/EZLayoutMakerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ [ InlineData("KC_PAUSE", "Pause", KeyCategory.Other) ]
[ InlineData("KC_AT", "@", KeyCategory.ShiftedPunct) ]
[ InlineData("KC_SYSTEM_POWER", "Power", KeyCategory.System) ]
[ InlineData("FR_AMP", "&", KeyCategory.French) ]
[ InlineData("NO_LESS", "<", KeyCategory.German) ]
[ InlineData("NO_LESS", "<", KeyCategory.Nordic) ]
[ InlineData("ES_PLUS", "+", KeyCategory.Spanish) ]
public void PrepareEZLayout_KeyCategoryWithSimpleLabel(string keyCode, string expectedLabel, KeyCategory expectedCategory)
{
Expand Down