From 041ce03f0935c1e11ba8dd7c497ffab93af1c896 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 4 Apr 2016 13:15:26 +0200 Subject: [PATCH] Keyboard shortcuts changed to: - ZRCola Compose: Win+Z => Win+F5 - Send composed: Ctrl+Enter => F5 - ZRCola Decompose: Win+Shift+Z => Win+F6 - Send decomposed: Ctrl+Enter => F6 - Cancel (de)composition: Esc --- ZRCola/zrcolafrm.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ZRCola/zrcolafrm.cpp b/ZRCola/zrcolafrm.cpp index 7a4b939..2e58987 100644 --- a/ZRCola/zrcolafrm.cpp +++ b/ZRCola/zrcolafrm.cpp @@ -54,16 +54,17 @@ wxZRColaFrame::wxZRColaFrame() : m_panel->m_decomposed->SetFocus(); // Register global hotkey(s). - if (!RegisterHotKey(wxZRColaHKID_INVOKE_COMPOSE, MOD_WIN, 'Z')) - wxMessageBox(_("ZRCola keyboard shortcut Win+Z could not be registered. Some functionality will not be available."), _("Warning"), wxOK | wxICON_WARNING); - if (!RegisterHotKey(wxZRColaHKID_INVOKE_DECOMPOSE, MOD_WIN | MOD_SHIFT, 'Z')) - wxMessageBox(_("ZRCola keyboard shortcut Win+Shift+Z could not be registered. Some functionality will not be available."), _("Warning"), wxOK | wxICON_WARNING); + if (!RegisterHotKey(wxZRColaHKID_INVOKE_COMPOSE, wxMOD_WIN, VK_F5)) + wxMessageBox(_("ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."), _("Warning"), wxOK | wxICON_WARNING); + if (!RegisterHotKey(wxZRColaHKID_INVOKE_DECOMPOSE, wxMOD_WIN, VK_F6)) + wxMessageBox(_("ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."), _("Warning"), wxOK | wxICON_WARNING); // Register frame specific hotkey(s). { - wxAcceleratorEntry entries[2]; - entries[0].Set(wxACCEL_CTRL , WXK_RETURN, wxID_SEND); - entries[1].Set(wxACCEL_NORMAL, WXK_ESCAPE, wxID_SEND_ABORT); + wxAcceleratorEntry entries[3]; + entries[0].Set(wxACCEL_NORMAL, WXK_F5 , wxID_SEND_COMPOSED); + entries[1].Set(wxACCEL_NORMAL, WXK_F6 , wxID_SEND_DECOMPOSED); + entries[2].Set(wxACCEL_NORMAL, WXK_ESCAPE, wxID_SEND_ABORT); SetAcceleratorTable(wxAcceleratorTable(_countof(entries), entries)); } }