hrynco/hrynco-kswitcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 45 Wiki Activity

Release v0.6.28: typo correction, partial sync and selection diagnostics

Browse Source
This commit is contained in:
Anatolii Hrynchuk
2026-11-02 11:19:13 +02:00
parent 738c81dce2
commit 55993c0f90
23 changed files with 676 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui.cpp
+39 -7
View File
@@ -1112,6 +1112,25 @@ LRESULT CALLBACK autoOptionsProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
draft.autoExcluded = parseCommaList(value(w, 404));
draft.autoPrefixChars = value(w, 408);
draft.autoSuffixChars = value(w, 409);
draft.autoReplace = checked(w, 414);
draft.autoTypos = checked(w, 415);
draft.autoReplacements.clear();
std::wistringstream replacements(lower(value(w, 416)));
std::wstring line;
auto trim = [](std::wstring text)
{
auto first = text.find_first_not_of(L" \t\r\n");
return first == text.npos ? std::wstring{} : text.substr(first, text.find_last_not_of(L" \t\r\n") - first + 1);
};
while (std::getline(replacements, line))
{
if (trim(line).empty()) continue;
auto equals = line.find(L'=');
if (equals == line.npos)
throw std::runtime_error("Enter one replacement per line: typo=correction");
if (!draft.autoReplacements.emplace(trim(line.substr(0, equals)), trim(line.substr(equals + 1))).second)
throw std::runtime_error("Each replacement typo must occur only once");
}
if (draft.autoLanguages.size() < 2)
throw std::runtime_error("Select at least two languages");
validateSettings(draft);
@@ -1123,6 +1142,9 @@ LRESULT CALLBACK autoOptionsProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
view->settings->draft.autoMinLength = draft.autoMinLength;
view->settings->draft.autoPrefixChars = draft.autoPrefixChars;
view->settings->draft.autoSuffixChars = draft.autoSuffixChars;
view->settings->draft.autoReplace = draft.autoReplace;
view->settings->draft.autoTypos = draft.autoTypos;
view->settings->draft.autoReplacements = std::move(draft.autoReplacements);
DestroyWindow(w);
}
catch (const std::exception &e)
@@ -1153,8 +1175,8 @@ LRESULT CALLBACK autoOptionsProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
}
void showAutoOptions(HWND parent, SettingsView *v)
{
HWND w = makeWindow(*v->app, L"KSwitcher.AutoOptions", L"Automatic layout correction", autoOptionsProc,
560, 680);
HWND w = makeWindow(*v->app, L"KSwitcher.AutoOptions", L"Automatic correction", autoOptionsProc,
560, 880);
windowLayoutState(w)->autoOptions = true;
SetWindowLongPtrW(w, GWLP_HWNDPARENT, (LONG_PTR)parent);
SetWindowLongPtrW(w, GWLP_USERDATA, (LONG_PTR) new AutoOptionsView{parent, v});
@@ -1192,10 +1214,20 @@ void showAutoOptions(HWND parent, SettingsView *v)
value(w, 408, v->draft.autoPrefixChars);
value(w, 409, v->draft.autoSuffixChars);
label(w, L"Enter punctuation without spaces or separators. These characters are kept.", 18, 530, 525);
button(w, L"Open dictionary &folder", 407, 18, 562, 220);
label(w, L"After editing files, click OK here, then Save in Settings to reload.", 18, 600, 525);
button(w, L"&OK", IDOK, 326, 632, 100);
button(w, L"&Cancel", IDCANCEL, 440, 632, 100);
checkbox(w, L"Use custom &replacements (take priority over dictionaries)", 414, 18, 562, 524);
check(w, 414, v->draft.autoReplace);
label(w, L"One pair per line: typo=correction (same language, letters only)", 18, 592, 525);
edit(w, 416, 18, 618, 524, 70, ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL | ES_WANTRETURN);
std::wstring pairs;
for (const auto &[from, to] : v->draft.autoReplacements) pairs += from + L"=" + to + L"\r\n";
value(w, 416, pairs);
checkbox(w, L"Correct spelling &typos using dictionaries (experimental)", 415, 18, 700, 524);
check(w, 415, v->draft.autoTypos);
label(w, L"Single edits, 4+ letters; ambiguous words are left unchanged.", 18, 730, 525);
button(w, L"Open dictionary &folder", 407, 18, 762, 220);
label(w, L"Click OK, then Save in Settings. Enable automatic correction there.", 18, 800, 525);
button(w, L"&OK", IDOK, 326, 832, 100);
button(w, L"&Cancel", IDCANCEL, 440, 832, 100);
RECT initial{};
GetWindowRect(w, &initial);
initial.right += scale(w, 200);
@@ -1672,7 +1704,7 @@ void showSettings(App &app, bool visible)
hotkeyEdit(app, w, 210 + i, 540, 44 + i * 30, 220);
}
checkbox(w, L"Open editor after screen capt&ure", 209, 420, 224, 340);
checkbox(w, L"Automatically correct layout (e&xperimental)", 207, 18, 210, 395);
checkbox(w, L"Automatic correction (e&xperimental)", 207, 18, 210, 395);
label(w, L"Layout cycle — top to bottom", 18, 240, 400);
control(w, L"LISTBOX", L"", WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_BORDER, 220,
18, 262, 470, 172);