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

Commit f2c8586

Browse files
vladzahariavladzaharia
committed
Misc fixes
1 parent 0e48aa2 commit f2c8586

File tree

14 files changed

+602
-77
lines changed

14 files changed

+602
-77
lines changed

‎src/InvvardDev.EZLayoutDisplay.Desktop/Helper/EZLayoutMaker.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public EZLayout PrepareEZLayout(ErgodoxLayout ergodoxLayout)
2727
Logger.TraceMethod();
2828
Logger.DebugInputParam(nameof(ergodoxLayout), ergodoxLayout);
2929

30-
var ezLayout = new EZLayout { HashId = ergodoxLayout.HashId, Name = ergodoxLayout.Title };
30+
var ezLayout = new EZLayout { HashId = ergodoxLayout.HashId, Name = ergodoxLayout.Title, Geometry = ergodoxLayout.Geometry };
3131

3232
var ergodoxLayers = ergodoxLayout.Revision.Layers ?? ergodoxLayout.Revision.Layers;
3333

‎src/InvvardDev.EZLayoutDisplay.Desktop/Model/EZLayout.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ public class EZLayout
1414
/// </summary>
1515
public string Name { get; set; }
1616

17+
/// <summary>
18+
/// Gets or sets the geometry.
19+
/// </summary>
20+
public string Geometry { get; set; }
21+
1722
/// <summary>
1823
/// Gets or sets the layout list of layers.
1924
/// </summary>

‎src/InvvardDev.EZLayoutDisplay.Desktop/Model/Enum/KeyCategory.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,5 @@ public enum KeyCategory
3030
Spacing,
3131
Spanish,
3232
System,
33-
Transparent,
3433
}
3534
}

‎src/InvvardDev.EZLayoutDisplay.Desktop/Properties/Resources.Designer.cs‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/InvvardDev.EZLayoutDisplay.Desktop/Properties/Resources.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,10 @@
124124
<data name="layoutDefinition" type="System.Resources.ResXFileRef, System.Windows.Forms">
125125
<value>layoutdefinition.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
126126
</data>
127-
<data name="layoutDefinition.ergodox" type="System.Resources.ResXFileRef, System.Windows.Forms">
127+
<data name="layoutDefinition_ergodox" type="System.Resources.ResXFileRef, System.Windows.Forms">
128128
<value>layoutdefinition_ergodox.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
129129
</data>
130-
<data name="layoutDefinition.moonlander" type="System.Resources.ResXFileRef, System.Windows.Forms">
130+
<data name="layoutDefinition_moonlander" type="System.Resources.ResXFileRef, System.Windows.Forms">
131131
<value>layoutdefinition_moonlander.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
132132
</data>
133133
</root>

‎src/InvvardDev.EZLayoutDisplay.Desktop/Properties/keyDefinitions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,7 @@
781781
{
782782
"code": "KC_TRANSPARENT",
783783
"label": "",
784-
"category": "Transparent"
784+
"category": "Other"
785785
},
786786
{
787787
"code": "KC_BSPACE",

‎src/InvvardDev.EZLayoutDisplay.Desktop/Properties/layoutDefinition.json‎

Lines changed: 77 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[
22
{
3-
"x": ".5",
3+
"x": "0",
44
"y": "0",
5-
"width": "1",
5+
"width": "1.5",
66
"voffset": ".37"
77
},
88
{
@@ -40,9 +40,9 @@
4040
"voffset": ".24"
4141
},
4242
{
43-
"x": ".5",
43+
"x": "0",
4444
"y": "1",
45-
"width": "1",
45+
"width": "1.5",
4646
"voffset": ".37"
4747
},
4848
{
@@ -78,12 +78,12 @@
7878
"x": "6.5",
7979
"y": "1",
8080
"voffset": ".24",
81-
"height": "1"
81+
"height": "1.5"
8282
},
8383
{
84-
"x": ".5",
84+
"x": "0",
8585
"y": "2",
86-
"width": "1",
86+
"width": "1.5",
8787
"voffset": ".37"
8888
},
8989
{
@@ -116,15 +116,9 @@
116116
"glow": "true"
117117
},
118118
{
119-
"x": "6.5",
120-
"y": "2",
121-
"voffset": ".24",
122-
"height": "1"
123-
},
124-
{
125-
"x": ".5",
119+
"x": "0",
126120
"y": "3",
127-
"width": "1",
121+
"width": "1.5",
128122
"voffset": ".37"
129123
},
130124
{
@@ -156,6 +150,12 @@
156150
"voffset": ".24",
157151
"glow": "true"
158152
},
153+
{
154+
"x": "6.5",
155+
"y": "3",
156+
"voffset": "-.26",
157+
"height": "1.5"
158+
},
159159
{
160160
"x": ".5",
161161
"y": "4",
@@ -187,33 +187,49 @@
187187
},
188188
{
189189
"x": "7.5",
190-
"y": "3.5",
191-
"width": "2",
190+
"y": "3",
191+
"height": "1",
192192
"hoffset": ".37",
193193
"voffset": ".87",
194194
"rotate": "30"
195195
},
196+
{
197+
"x": "8.5",
198+
"y": "3",
199+
"height": "1",
200+
"hoffset": ".24",
201+
"voffset": "1.37",
202+
"rotate": "30"
203+
},
204+
{
205+
"x": "8.5",
206+
"y": "4",
207+
"height": "1",
208+
"hoffset": "-.26",
209+
"voffset": "1.24",
210+
"rotate": "30"
211+
},
196212
{
197213
"x": "6.5",
198-
"y": "4.5",
199-
"height": "1.5",
214+
"y": "4",
215+
"height": "2",
200216
"voffset": ".24",
201217
"rotate": "30"
202218
},
203219
{
204220
"x": "7.5",
205-
"y": "4.5",
206-
"height": "1.5",
221+
"y": "4",
222+
"height": "2",
207223
"hoffset": "-.13",
208224
"voffset": ".74",
209225
"rotate": "30"
210226
},
211227
{
212228
"x": "8.5",
213-
"y": "4.5",
214-
"height": "1.5",
215-
"hoffset": "-.26",
216-
"voffset": "1.24",
229+
"y": "5",
230+
"height": "1",
231+
"hoffset": "-.76",
232+
"voffset": "1.11",
217233
"rotate": "30"
218234
},
219235
{
@@ -253,14 +269,14 @@
253269
{
254270
"x": "18",
255271
"y": "0",
256-
"width": "1",
272+
"width": "1.5",
257273
"voffset": ".37"
258274
},
259275
{
260276
"x": "12",
261277
"y": "1",
262278
"voffset": ".24",
263-
"height": "1"
279+
"height": "1.5"
264280
},
265281
{
266282
"x": "13",
@@ -294,20 +310,14 @@
294310
{
295311
"x": "18",
296312
"y": "1",
297-
"width": "1",
313+
"width": "1.5",
298314
"voffset": ".37"
299315
},
300-
{
301-
"x": "12",
302-
"y": "2",
303-
"voffset": ".24",
304-
"glow": "true"
305-
},
306316
{
307317
"x": "13",
308318
"y": "2",
309319
"voffset": ".24",
310-
"height": "1"
320+
"glow": "true"
311321
},
312322
{
313323
"x": "14",
@@ -335,9 +345,15 @@
335345
{
336346
"x": "18",
337347
"y": "2",
338-
"width": "1",
348+
"width": "1.5",
339349
"voffset": ".37"
340350
},
351+
{
352+
"x": "12",
353+
"y": "3",
354+
"voffset": "-.26",
355+
"height": "1.5"
356+
},
341357
{
342358
"x": "13",
343359
"y": "3",
@@ -370,7 +386,7 @@
370386
{
371387
"x": "18",
372388
"y": "3",
373-
"width": "1",
389+
"width": "1.5",
374390
"voffset": ".37"
375391
},
376392
{
@@ -406,34 +422,51 @@
406422
"x": "10",
407423
"y": "3",
408424
"height": "1",
409-
"width": "2",
410425
"hoffset": "-.24",
411426
"voffset": "1.37",
412427
"rotate": "-30",
413428
"origin": "1,0"
414429
},
430+
{
431+
"x": "11",
432+
"y": "3",
433+
"height": "1",
434+
"hoffset": "-.37",
435+
"voffset": ".87",
436+
"rotate": "-30",
437+
"origin": "1,0"
438+
},
415439
{
416440
"x": "10",
417-
"y": "4.5",
418-
"height": "1.5",
441+
"y": "4",
442+
"height": "1",
419443
"hoffset": ".26",
420444
"voffset": "1.24",
421445
"rotate": "-30",
422446
"origin": "1,0"
423447
},
448+
{
449+
"x": "10",
450+
"y": "5",
451+
"height": "1",
452+
"hoffset": ".76",
453+
"voffset": "1.11",
454+
"rotate": "-30",
455+
"origin": "1,0"
456+
},
424457
{
425458
"x": "11",
426-
"y": "4.5",
427-
"height": "1.5",
459+
"y": "4",
460+
"height": "2",
428461
"hoffset": ".13",
429462
"voffset": ".74",
430463
"rotate": "-30",
431464
"origin": "1,0"
432465
},
433466
{
434467
"x": "12",
435-
"y": "4.5",
436-
"height": "1.5",
468+
"y": "4",
469+
"height": "2",
437470
"voffset": ".24",
438471
"rotate": "-30",
439472
"origin": "1,0"

0 commit comments

Comments
 (0)