diff options
| author | George Hazan <george.hazan@gmail.com> | 2024-11-06 21:50:28 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2024-11-06 21:50:33 +0300 |
| commit | 4a2cef86ce94901c4e696804140f92701a38ebce (patch) | |
| tree | 90eb26c8c4e4f2238ac3431b45c697d959f76503 | |
| parent | 6519378609ad60abeff0d43531ed88d499a43528 (diff) | |
rest of hardcoded hotkeys removed in StdMsg & Scriver
| -rw-r--r-- | plugins/Scriver/src/msgdialog.cpp | 22 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgdialog.cpp | 15 | ||||
| -rw-r--r-- | src/mir_app/src/srmm_main.cpp | 6 |
3 files changed, 3 insertions, 40 deletions
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index e5ff6b545a..e424cf3d41 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -736,28 +736,6 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam) replaceStrW(m_wszSearchQuery, nullptr);
replaceStrW(m_wszSearchResult, nullptr);
}
-
- if (wParam == 0x46 && isCtrl && !isAlt) { // ctrl-f (toggle filter)
- m_btnFilter.Click();
- return TRUE;
- }
-
- if (wParam == 0x4e && isCtrl && !isAlt) { // ctrl-n (nicklist)
- if (m_btnNickList.Enabled())
- m_btnNickList.Click();
- return TRUE;
- }
-
- if (wParam == 0x48 && isCtrl && !isAlt) { // ctrl-h (history)
- m_btnHistory.Click();
- return TRUE;
- }
-
- if (wParam == 0x4f && isCtrl && !isAlt) { // ctrl-o (options)
- if (m_btnChannelMgr.Enabled())
- m_btnChannelMgr.Click();
- return TRUE;
- }
}
if (ProcessHotkeys(wParam, isShift, isCtrl, isAlt))
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index a4d182eaa0..79de2343a0 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -875,21 +875,6 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam) }
if (isChat()) {
- if (wParam == 0x46 && isCtrl && !isAlt) { // ctrl-f (toggle filter)
- m_btnFilter.Click();
- return TRUE;
- }
-
- if (wParam == 0x4e && isCtrl && !isAlt) { // ctrl-n (nicklist)
- m_btnNickList.Click();
- return TRUE;
- }
-
- if (wParam == 0x4f && isCtrl && !isAlt) { // ctrl-o (options)
- m_btnChannelMgr.Click();
- return TRUE;
- }
-
if (wParam == VK_TAB && isShift && !isCtrl) { // SHIFT-TAB (go to nick list)
SetFocus(m_nickList.GetHwnd());
return TRUE;
diff --git a/src/mir_app/src/srmm_main.cpp b/src/mir_app/src/srmm_main.cpp index be3b847489..cfa14a0ba5 100644 --- a/src/mir_app/src/srmm_main.cpp +++ b/src/mir_app/src/srmm_main.cpp @@ -184,9 +184,9 @@ static HOTKEYDESC srmmHotkeys[] = { { "srmm_bkcolor", LPGEN("Toggle back color"), BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_CONTROL, 'L'), 0, SRMM_HK_BKCOLOR }, { "srmm_clear", LPGEN("Clear formatting"), BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_CONTROL, VK_SPACE), 0, SRMM_HK_CLEAR }, { "srmm_history", LPGEN("Open history window"), BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_CONTROL, 'H'), 0, SRMM_HK_HISTORY}, - { "srmm_cmgr", LPGEN("Channel manager"), BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_SHIFT | HOTKEYF_CONTROL, 'C'), 0, SRMM_HK_CHANNELMGR }, - { "srmm_filter", LPGEN("Toggle filter"), BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_SHIFT | HOTKEYF_CONTROL, 'F'), 0, SRMM_HK_FILTERTOGGLE }, - { "srmm_nicklist", LPGEN("Toggle nick list"), BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_SHIFT | HOTKEYF_CONTROL, 'N'), 0, SRMM_HK_LISTTOGGLE }, + { "srmm_cmgr", LPGEN("Channel manager"), BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_CONTROL, 'O'), 0, SRMM_HK_CHANNELMGR }, + { "srmm_filter", LPGEN("Toggle filter"), BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_CONTROL, 'F'), 0, SRMM_HK_FILTERTOGGLE }, + { "srmm_nicklist", LPGEN("Toggle nick list"), BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_CONTROL, 'N'), 0, SRMM_HK_LISTTOGGLE }, }; int LoadSrmmModule() |