Release v0.6.27: menu and Alt access keys

This commit is contained in:
2026-11-02 01:23:33 +02:00
parent 22edece7cf
commit 738c81dce2
13 changed files with 138 additions and 114 deletions
+20 -17
View File
@@ -1453,28 +1453,28 @@ void App::recognizeEntry(std::wstring id)
void App::trayMenu()
{
HMENU menu = CreatePopupMenu();
AppendMenuW(menu, MF_STRING, 10, L"Clipboard history");
AppendMenuW(menu, MF_STRING, 24, L"Capture screen region…");
AppendMenuW(menu, MF_STRING, 11, L"Settings…");
AppendMenuW(menu, MF_STRING, 10, L"Clipboard &history");
AppendMenuW(menu, MF_STRING, 24, L"&Capture screen region…");
AppendMenuW(menu, MF_STRING, 11, L"&Settings…");
SetMenuDefaultItem(menu, 11, FALSE);
AppendMenuW(menu, MF_STRING, 12, L"Snippets…");
AppendMenuW(menu, MF_STRING, 13, L"Keyboard shortcuts…");
AppendMenuW(menu, MF_STRING, 12, L"S&nippets…");
AppendMenuW(menu, MF_STRING, 13, L"&Keyboard shortcuts…");
AppendMenuW(menu, MF_SEPARATOR, 0, nullptr);
AppendMenuW(menu, MF_STRING | (settings.awake ? MF_CHECKED : 0), 14, L"Keep screen awake");
AppendMenuW(menu, MF_STRING | (settings.awake ? MF_CHECKED : 0), 14, L"Keep screen a&wake");
HMENU pause = CreatePopupMenu();
AppendMenuW(pause, MF_STRING, 20, L"Resume");
AppendMenuW(pause, MF_STRING, 21, L"10 minutes");
AppendMenuW(pause, MF_STRING, 22, L"1 hour");
AppendMenuW(pause, MF_STRING, 23, L"Until restart");
AppendMenuW(menu, MF_POPUP, (UINT_PTR)pause, L"Pause clipboard history");
AppendMenuW(menu, MF_STRING, 15, L"Open data folder");
AppendMenuW(menu, MF_STRING, 18, L"View log…");
AppendMenuW(pause, MF_STRING, 20, L"&Resume");
AppendMenuW(pause, MF_STRING, 21, L"&10 minutes");
AppendMenuW(pause, MF_STRING, 22, L"1 &hour");
AppendMenuW(pause, MF_STRING, 23, L"&Until restart");
AppendMenuW(menu, MF_POPUP, (UINT_PTR)pause, L"&Pause clipboard history");
AppendMenuW(menu, MF_STRING, 15, L"&Open data folder");
AppendMenuW(menu, MF_STRING, 18, L"View &log…");
AppendMenuW(menu, MF_STRING | (updateRunning ? MF_GRAYED : 0), 19,
updateRunning ? L"Update (checking / preparing…)" :
availableUpdate.empty() ? L"Update" : L"Update (new version available)");
updateRunning ? L"&Update (checking / preparing…)" :
availableUpdate.empty() ? L"&Update" : L"&Update (new version available)");
AppendMenuW(menu, MF_SEPARATOR, 0, nullptr);
AppendMenuW(menu, MF_STRING, 16, L"About KSwitcher");
AppendMenuW(menu, MF_STRING, 17, L"Exit");
AppendMenuW(menu, MF_STRING, 16, L"&About KSwitcher");
AppendMenuW(menu, MF_STRING, 17, L"E&xit");
POINT pt;
GetCursorPos(&pt);
pasteTarget = GetForegroundWindow();
@@ -1837,6 +1837,9 @@ int App::execute()
if (popup != settingsWindow && IsDialogMessageW(popup, &msg))
continue;
}
// Preserve history-specific Enter/Shift+Enter and Ctrl+digit handling.
if (historyWindow && msg.message == WM_SYSCHAR && IsDialogMessageW(historyWindow, &msg))
continue;
if (settingsWindow && IsDialogMessageW(settingsWindow, &msg))
continue;
if (snippetsWindow && IsDialogMessageW(snippetsWindow, &msg))