Skip to content

Commit c9302f6

Browse files
ProperCodeProperCode
committed
1.3
1 parent 20f9508 commit c9302f6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1149
-24912
lines changed

‎Aspiring Keyboard/.vs/Aspiring Keyboard/FileContentIndex/30a1247d-0169-484d-b2e3-51da1644d9f1.vsidx‎

-150 KB
Binary file not shown.

‎Aspiring Keyboard/.vs/Aspiring Keyboard/FileContentIndex/b947d4fe-72c7-4f3e-93e7-069078267d37.vsidx‎

151 KB
Binary file not shown.

‎Aspiring Keyboard/.vs/Aspiring Keyboard/v17/.suo‎

1 KB
Binary file not shown.

‎Aspiring Keyboard/.vs/Aspiring Keyboard/v17/DocumentLayout.json‎

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
{
22
"Version": 1,
3-
"WorkspaceRootPath": "E:\\Informatyka\\[MOJE]\\_Projekty Desktop\\_Aspiring Keyboard\\[GITHUB]\\Aspiring Keyboard\\",
3+
"WorkspaceRootPath": "C:\\Users\\mikol\\Documents\\Visual Studio 2022\\Projects\\Aspiring Keyboard\\",
44
"Documents": [
55
{
6-
"AbsoluteMoniker": "D:0:0:{E838B6FF-73BD-42DA-966A-B1DD6E73D48F}|Aspiring Keyboard\\Aspiring Keyboard.csproj|e:\\informatyka\\[moje]\\_projekty desktop\\_aspiring keyboard\\[github]\\aspiring keyboard\\aspiring keyboard\\windowchangelog.xaml.cs||{8B382828-6202-11D1-8870-0000F87579D2}|",
7-
"RelativeMoniker": "D:0:0:{E838B6FF-73BD-42DA-966A-B1DD6E73D48F}|Aspiring Keyboard\\Aspiring Keyboard.csproj|solutionrelative:aspiring keyboard\\windowchangelog.xaml.cs||{8B382828-6202-11D1-8870-0000F87579D2}|"
8-
},
9-
{
10-
"AbsoluteMoniker": "D:0:0:{E838B6FF-73BD-42DA-966A-B1DD6E73D48F}|Aspiring Keyboard\\Aspiring Keyboard.csproj|E:\\Informatyka\\[MOJE]\\_Projekty Desktop\\_Aspiring Keyboard\\[GITHUB]\\Aspiring Keyboard\\aspiring keyboard\\mainwindow.xaml.cs||{8B382828-6202-11D1-8870-0000F87579D2}|",
6+
"AbsoluteMoniker": "D:0:0:{E838B6FF-73BD-42DA-966A-B1DD6E73D48F}|Aspiring Keyboard\\Aspiring Keyboard.csproj|C:\\Users\\mikol\\Documents\\Visual Studio 2022\\Projects\\Aspiring Keyboard\\aspiring keyboard\\mainwindow.xaml.cs||{8B382828-6202-11D1-8870-0000F87579D2}|",
117
"RelativeMoniker": "D:0:0:{E838B6FF-73BD-42DA-966A-B1DD6E73D48F}|Aspiring Keyboard\\Aspiring Keyboard.csproj|solutionrelative:aspiring keyboard\\mainwindow.xaml.cs||{8B382828-6202-11D1-8870-0000F87579D2}|"
128
},
139
{
14-
"AbsoluteMoniker": "D:0:0:{E838B6FF-73BD-42DA-966A-B1DD6E73D48F}|Aspiring Keyboard\\Aspiring Keyboard.csproj|E:\\Informatyka\\[MOJE]\\_Projekty Desktop\\_Aspiring Keyboard\\[GITHUB]\\Aspiring Keyboard\\Aspiring Keyboard\\MainWindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
15-
"RelativeMoniker": "D:0:0:{E838B6FF-73BD-42DA-966A-B1DD6E73D48F}|Aspiring Keyboard\\Aspiring Keyboard.csproj|solutionrelative:Aspiring Keyboard\\MainWindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}"
10+
"AbsoluteMoniker": "D:0:0:{E838B6FF-73BD-42DA-966A-B1DD6E73D48F}|Aspiring Keyboard\\Aspiring Keyboard.csproj|C:\\Users\\mikol\\Documents\\Visual Studio 2022\\Projects\\Aspiring Keyboard\\aspiring keyboard\\windowchangelog.xaml.cs||{8B382828-6202-11D1-8870-0000F87579D2}|",
11+
"RelativeMoniker": "D:0:0:{E838B6FF-73BD-42DA-966A-B1DD6E73D48F}|Aspiring Keyboard\\Aspiring Keyboard.csproj|solutionrelative:aspiring keyboard\\windowchangelog.xaml.cs||{8B382828-6202-11D1-8870-0000F87579D2}|"
1612
}
1713
],
1814
"DocumentGroupContainers": [
@@ -22,43 +18,33 @@
2218
"DocumentGroups": [
2319
{
2420
"DockedWidth": 200,
25-
"SelectedChildIndex": 0,
21+
"SelectedChildIndex": 1,
2622
"Children": [
2723
{
2824
"$type": "Document",
29-
"DocumentIndex": 0,
25+
"DocumentIndex": 1,
3026
"Title": "WindowChangelog.xaml.cs",
31-
"DocumentMoniker": "E:\\Informatyka\\[MOJE]\\_Projekty Desktop\\_Aspiring Keyboard\\[GITHUB]\\Aspiring Keyboard\\Aspiring Keyboard\\WindowChangelog.xaml.cs",
27+
"DocumentMoniker": "C:\\Users\\mikol\\Documents\\Visual Studio 2022\\Projects\\Aspiring Keyboard\\Aspiring Keyboard\\WindowChangelog.xaml.cs",
3228
"RelativeDocumentMoniker": "Aspiring Keyboard\\WindowChangelog.xaml.cs",
33-
"ToolTip": "E:\\Informatyka\\[MOJE]\\_Projekty Desktop\\_Aspiring Keyboard\\[GITHUB]\\Aspiring Keyboard\\Aspiring Keyboard\\WindowChangelog.xaml.cs",
29+
"ToolTip": "C:\\Users\\mikol\\Documents\\Visual Studio 2022\\Projects\\Aspiring Keyboard\\Aspiring Keyboard\\WindowChangelog.xaml.cs",
3430
"RelativeToolTip": "Aspiring Keyboard\\WindowChangelog.xaml.cs",
35-
"ViewState": "AQIAAAAAAAAAAAAAAAAAABMAAAAmAAAA",
31+
"ViewState": "AQIAAAAAAAAAAAAAAAAAABUAAAAqAAAA",
3632
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
3733
"WhenOpened": "2024-07-30T15:34:24.732Z",
3834
"EditorCaption": ""
3935
},
4036
{
4137
"$type": "Document",
42-
"DocumentIndex": 1,
38+
"DocumentIndex": 0,
4339
"Title": "MainWindow.xaml.cs",
44-
"DocumentMoniker": "E:\\Informatyka\\[MOJE]\\_Projekty Desktop\\_Aspiring Keyboard\\[GITHUB]\\Aspiring Keyboard\\Aspiring Keyboard\\MainWindow.xaml.cs",
40+
"DocumentMoniker": "C:\\Users\\mikol\\Documents\\Visual Studio 2022\\Projects\\Aspiring Keyboard\\Aspiring Keyboard\\MainWindow.xaml.cs",
4541
"RelativeDocumentMoniker": "Aspiring Keyboard\\MainWindow.xaml.cs",
46-
"ToolTip": "E:\\Informatyka\\[MOJE]\\_Projekty Desktop\\_Aspiring Keyboard\\[GITHUB]\\Aspiring Keyboard\\Aspiring Keyboard\\MainWindow.xaml.cs",
42+
"ToolTip": "C:\\Users\\mikol\\Documents\\Visual Studio 2022\\Projects\\Aspiring Keyboard\\Aspiring Keyboard\\MainWindow.xaml.cs",
4743
"RelativeToolTip": "Aspiring Keyboard\\MainWindow.xaml.cs",
48-
"ViewState": "AQIAAAAAAAAAAAAAAAAAABIAAAABAAAA",
44+
"ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
4945
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
50-
"WhenOpened": "2024-07-30T14:54:47.09Z"
51-
},
52-
{
53-
"$type": "Document",
54-
"DocumentIndex": 2,
55-
"Title": "MainWindow.xaml",
56-
"DocumentMoniker": "E:\\Informatyka\\[MOJE]\\_Projekty Desktop\\_Aspiring Keyboard\\[GITHUB]\\Aspiring Keyboard\\Aspiring Keyboard\\MainWindow.xaml",
57-
"RelativeDocumentMoniker": "Aspiring Keyboard\\MainWindow.xaml",
58-
"ToolTip": "E:\\Informatyka\\[MOJE]\\_Projekty Desktop\\_Aspiring Keyboard\\[GITHUB]\\Aspiring Keyboard\\Aspiring Keyboard\\MainWindow.xaml",
59-
"RelativeToolTip": "Aspiring Keyboard\\MainWindow.xaml",
60-
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
61-
"WhenOpened": "2024-07-30T14:54:47.105Z"
46+
"WhenOpened": "2024-07-30T14:54:47.09Z",
47+
"EditorCaption": ""
6248
}
6349
]
6450
}

‎Aspiring Keyboard/Aspiring Keyboard/Auxiliary methods.cs‎

Lines changed: 60 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ void restore_default_settings()
6565
CBlshift_action_b.SelectedItem = "Left click";
6666
CBrshift_action_b.SelectedItem = "Ctrl left click";
6767
CBlalt_action_b.SelectedItem = "Hold left";
68-
CBralt_action_b.SelectedItem = "Hold right";
68+
CBralt_action_b.SelectedItem = "Release left";
6969
CBlctrl_action_b.SelectedItem = "Double left click";
7070
CBrctrl_action_b.SelectedItem = "Move mouse";
7171

@@ -101,7 +101,7 @@ void restore_default_settings()
101101
TBfont_size.Text = "12";
102102
CHBsmart_mousegrid.IsChecked = true;
103103

104-
CBkeyboard_layout.SelectedIndex = 0;
104+
CBkeyboard_layout.SelectedIndex = 0; //Any layout
105105

106106
CHBrun_at_startup.IsChecked = false;
107107
CHBstart_minimized.IsChecked = false;
@@ -579,6 +579,10 @@ void set_values()
579579
else if (CBlshift_action_a.SelectedIndex == 9)
580580
left_shift_action_a = ActionX.hold_right;
581581
else if (CBlshift_action_a.SelectedIndex == 10)
582+
left_shift_action_a = ActionX.release_left;
583+
else if (CBlshift_action_a.SelectedIndex == 11)
584+
left_shift_action_a = ActionX.release_right;
585+
else if (CBlshift_action_a.SelectedIndex == 12)
582586
left_shift_action_a = ActionX.none;
583587

584588
if (CBrshift_action_a.SelectedIndex == 0)
@@ -602,6 +606,10 @@ void set_values()
602606
else if (CBrshift_action_a.SelectedIndex == 9)
603607
right_shift_action_a = ActionX.hold_right;
604608
else if (CBrshift_action_a.SelectedIndex == 10)
609+
right_shift_action_a = ActionX.release_left;
610+
else if (CBrshift_action_a.SelectedIndex == 11)
611+
right_shift_action_a = ActionX.release_right;
612+
else if (CBrshift_action_a.SelectedIndex == 12)
605613
right_shift_action_a = ActionX.none;
606614

607615
if (CBlshift_action_b.SelectedIndex == 0)
@@ -625,6 +633,10 @@ void set_values()
625633
else if (CBlshift_action_b.SelectedIndex == 9)
626634
left_shift_action_b = ActionX.hold_right;
627635
else if (CBlshift_action_b.SelectedIndex == 10)
636+
left_shift_action_b = ActionX.release_left;
637+
else if (CBlshift_action_b.SelectedIndex == 11)
638+
left_shift_action_b = ActionX.release_right;
639+
else if (CBlshift_action_b.SelectedIndex == 12)
628640
left_shift_action_b = ActionX.none;
629641

630642
if (CBrshift_action_b.SelectedIndex == 0)
@@ -648,6 +660,10 @@ void set_values()
648660
else if (CBrshift_action_b.SelectedIndex == 9)
649661
right_shift_action_b = ActionX.hold_right;
650662
else if (CBrshift_action_b.SelectedIndex == 10)
663+
right_shift_action_b = ActionX.release_left;
664+
else if (CBrshift_action_b.SelectedIndex == 11)
665+
right_shift_action_b = ActionX.release_right;
666+
else if (CBrshift_action_b.SelectedIndex == 12)
651667
right_shift_action_b = ActionX.none;
652668

653669
if (CBlalt_action_a.SelectedIndex == 0)
@@ -671,6 +687,10 @@ void set_values()
671687
else if (CBlalt_action_a.SelectedIndex == 9)
672688
left_alt_action_a = ActionX.hold_right;
673689
else if (CBlalt_action_a.SelectedIndex == 10)
690+
left_alt_action_a = ActionX.release_left;
691+
else if (CBlalt_action_a.SelectedIndex == 11)
692+
left_alt_action_a = ActionX.release_right;
693+
else if (CBlalt_action_a.SelectedIndex == 12)
674694
left_alt_action_a = ActionX.none;
675695

676696
if (CBralt_action_a.SelectedIndex == 0)
@@ -694,6 +714,10 @@ void set_values()
694714
else if (CBralt_action_a.SelectedIndex == 9)
695715
right_alt_action_a = ActionX.hold_right;
696716
else if (CBralt_action_a.SelectedIndex == 10)
717+
right_alt_action_a = ActionX.release_left;
718+
else if (CBralt_action_a.SelectedIndex == 11)
719+
right_alt_action_a = ActionX.release_right;
720+
else if (CBralt_action_a.SelectedIndex == 12)
697721
right_alt_action_a = ActionX.none;
698722

699723
if (CBlalt_action_b.SelectedIndex == 0)
@@ -717,6 +741,10 @@ void set_values()
717741
else if (CBlalt_action_b.SelectedIndex == 9)
718742
left_alt_action_b = ActionX.hold_right;
719743
else if (CBlalt_action_b.SelectedIndex == 10)
744+
left_alt_action_b = ActionX.release_left;
745+
else if (CBlalt_action_b.SelectedIndex == 11)
746+
left_alt_action_b = ActionX.release_right;
747+
else if (CBlalt_action_b.SelectedIndex == 12)
720748
left_alt_action_b = ActionX.none;
721749

722750
if (CBralt_action_b.SelectedIndex == 0)
@@ -740,6 +768,10 @@ void set_values()
740768
else if (CBralt_action_b.SelectedIndex == 9)
741769
right_alt_action_b = ActionX.hold_right;
742770
else if (CBralt_action_b.SelectedIndex == 10)
771+
right_alt_action_b = ActionX.release_left;
772+
else if (CBralt_action_b.SelectedIndex == 11)
773+
right_alt_action_b = ActionX.release_right;
774+
else if (CBralt_action_b.SelectedIndex == 12)
743775
right_alt_action_b = ActionX.none;
744776

745777
if (CBlctrl_action_a.SelectedIndex == 0)
@@ -763,6 +795,10 @@ void set_values()
763795
else if (CBlctrl_action_a.SelectedIndex == 9)
764796
left_ctrl_action_a = ActionX.hold_right;
765797
else if (CBlctrl_action_a.SelectedIndex == 10)
798+
left_ctrl_action_a = ActionX.release_left;
799+
else if (CBlctrl_action_a.SelectedIndex == 11)
800+
left_ctrl_action_a = ActionX.release_right;
801+
else if (CBlctrl_action_a.SelectedIndex == 12)
766802
left_ctrl_action_a = ActionX.none;
767803

768804
if (CBrctrl_action_a.SelectedIndex == 0)
@@ -786,6 +822,10 @@ void set_values()
786822
else if (CBrctrl_action_a.SelectedIndex == 9)
787823
right_ctrl_action_a = ActionX.hold_right;
788824
else if (CBrctrl_action_a.SelectedIndex == 10)
825+
right_ctrl_action_a = ActionX.release_left;
826+
else if (CBrctrl_action_a.SelectedIndex == 11)
827+
right_ctrl_action_a = ActionX.release_right;
828+
else if (CBrctrl_action_a.SelectedIndex == 12)
789829
right_ctrl_action_a = ActionX.none;
790830

791831
if (CBlctrl_action_b.SelectedIndex == 0)
@@ -809,6 +849,10 @@ void set_values()
809849
else if (CBlctrl_action_b.SelectedIndex == 9)
810850
left_ctrl_action_b = ActionX.hold_right;
811851
else if (CBlctrl_action_b.SelectedIndex == 10)
852+
left_ctrl_action_b = ActionX.release_left;
853+
else if (CBlctrl_action_b.SelectedIndex == 11)
854+
left_ctrl_action_b = ActionX.release_right;
855+
else if (CBlctrl_action_b.SelectedIndex == 12)
812856
left_ctrl_action_b = ActionX.none;
813857

814858
if (CBrctrl_action_b.SelectedIndex == 0)
@@ -832,6 +876,10 @@ void set_values()
832876
else if (CBrctrl_action_b.SelectedIndex == 9)
833877
right_ctrl_action_b = ActionX.hold_right;
834878
else if (CBrctrl_action_b.SelectedIndex == 10)
879+
right_ctrl_action_b = ActionX.release_left;
880+
else if (CBrctrl_action_b.SelectedIndex == 11)
881+
right_ctrl_action_b = ActionX.release_right;
882+
else if (CBrctrl_action_b.SelectedIndex == 12)
835883
right_ctrl_action_b = ActionX.none;
836884

837885
bool grid_size_changed = false;
@@ -1055,7 +1103,7 @@ void save_settings()
10551103
if (int.TryParse(TBdesired_figures_nr.Text, out trash) == false
10561104
|| int.Parse(TBdesired_figures_nr.Text) < 5
10571105
|| int.Parse(TBdesired_figures_nr.Text) > max_figures_nr)
1058-
throw new Exception("Desired figures number must be between 5 and "
1106+
throw new Exception("Desired figures number for current keyboard layout must be between 5 and "
10591107
+ max_figures_nr + ".");
10601108

10611109
if (int.TryParse(TBfont_size.Text, out trash) == false
@@ -1177,6 +1225,15 @@ void load_settings()
11771225
CHBsmart_mousegrid.IsChecked = smart_grid = bool.Parse(sr.ReadLine());
11781226

11791227
CBkeyboard_layout.SelectedIndex = int.Parse(sr.ReadLine());
1228+
1229+
if (CBkeyboard_layout.SelectedItem.ToString() == "US English / US International")
1230+
create_grid_alphabet_for_US_kl();
1231+
else
1232+
create_grid_alphabet_for_any_kl();
1233+
1234+
grid_symbols_limit = grid_alphabet.Count;
1235+
max_figures_nr = (int)Math.Pow((double)grid_symbols_limit, 2);
1236+
11801237
CHBcheck_for_updates.IsChecked = bool.Parse(sr.ReadLine());
11811238
CHBrun_at_startup.IsChecked = bool.Parse(sr.ReadLine());
11821239
CHBstart_minimized.IsChecked = bool.Parse(sr.ReadLine());

0 commit comments

Comments
 (0)