TabSRMM: Make shortcuts for "send menu" and "proto menu" customizable

git-svn-id: http://svn.miranda-ng.org/main/trunk@17082 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 38 insertions, 34 deletions

diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp
index 95f41152be..ca05fe22c8 100644
--- a/plugins/TabSRMM/src/hotkeyhandler.cpp
+++ b/plugins/TabSRMM/src/hotkeyhandler.cpp
@@ -52,6 +52,8 @@ static HOTKEYDESC _hotkeydescs[] = {
 	{ 0, "tabsrmm_send", LPGEN("Send message"), TABSRMM_HK_SECTION_GENERIC, 0, 0, TABSRMM_HK_SEND },

 	{ 0, "tabsrmm_emot", LPGEN("Smiley selector"), TABSRMM_HK_SECTION_GENERIC, 0, HOTKEYCODE(HOTKEYF_ALT, 'E'), TABSRMM_HK_EMOTICONS },

 	{ 0, "tabsrmm_hist", LPGEN("Show message history"), TABSRMM_HK_SECTION_GENERIC, 0, HOTKEYCODE(HOTKEYF_ALT, 'H'), TABSRMM_HK_HISTORY },

+	{ 0, "tabsrmm_sendmenu", LPGEN("Show send menu"), TABSRMM_HK_SECTION_IM, 0, HOTKEYCODE(HOTKEYF_CONTROL, 'S'), TABSRMM_HK_SENDMENU },

+	{ 0, "tabsrmm_protomenu", LPGEN("Show protocol menu"), TABSRMM_HK_SECTION_IM, 0, HOTKEYCODE(HOTKEYF_CONTROL, 'P'), TABSRMM_HK_PROTOMENU },

 	{ 0, "tabsrmm_umenu", LPGEN("Show user menu"), TABSRMM_HK_SECTION_IM, 0, HOTKEYCODE(HOTKEYF_ALT, 'D'), TABSRMM_HK_USERMENU },

 	{ 0, "tabsrmm_udet", LPGEN("Show user details"), TABSRMM_HK_SECTION_IM, 0, HOTKEYCODE(HOTKEYF_ALT, 'U'), TABSRMM_HK_USERDETAILS },

 	{ 0, "tabsrmm_tbar", LPGEN("Toggle toolbar"), TABSRMM_HK_SECTION_GENERIC, 0, HOTKEYCODE(HOTKEYF_ALT | HOTKEYF_SHIFT, 'T'), TABSRMM_HK_TOGGLETOOLBAR },

diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index c62da21742..2bff3d0ad3 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -1688,6 +1688,12 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 						case TABSRMM_HK_USERMENU:

 							SendMessage(hwndDlg, WM_COMMAND, IDC_PROTOCOL, 0);

 							return _dlgReturn(hwndDlg, 1);

+						case TABSRMM_HK_SENDMENU:

+							SendMessage(hwndDlg, WM_COMMAND, IDC_SENDMENU, IDC_SENDMENU);

+							return _dlgReturn(hwndDlg, 1);

+						case TABSRMM_HK_PROTOMENU:

+							SendMessage(hwndDlg, WM_COMMAND, IDC_PROTOMENU, IDC_PROTOMENU);

+							return _dlgReturn(hwndDlg, 1);

 						case TABSRMM_HK_USERDETAILS:

 							SendMessage(hwndDlg, WM_COMMAND, MAKELONG(IDC_NAME, BN_CLICKED), 0);

 							return _dlgReturn(hwndDlg, 1);

@@ -1767,13 +1773,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 							case 23:                // ctrl - w

 								PostMessage(hwndDlg, WM_CLOSE, 1, 0);

 								break;

-							case 19:

-								PostMessage(hwndDlg, WM_COMMAND, IDC_SENDMENU, IDC_SENDMENU);

-								break;

-							case 16:

-								PostMessage(hwndDlg, WM_COMMAND, IDC_PROTOMENU, IDC_PROTOMENU);

-								break;

-							case 20:

+							case 20:                // ctrl - t

 								PostMessage(hwndDlg, WM_COMMAND, IDC_TOGGLETOOLBAR, 1);

 								break;

 							}

diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index c2e9059467..3df0bc4185 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -917,33 +917,35 @@ struct TABSRMM_SessionInfo {
  * core hotkey service ids

  */

 

-#define TABSRMM_HK_LASTUNREAD 2

-#define TABSRMM_HK_LASTRECENT 4

-#define TABSRMM_HK_PASTEANDSEND 8

-#define TABSRMM_HK_SETUSERPREFS 9

-#define TABSRMM_HK_CONTAINEROPTIONS 10

-#define TABSRMM_HK_NUDGE 11

-#define TABSRMM_HK_SENDFILE 12

-#define TABSRMM_HK_QUOTEMSG 13

-#define TABSRMM_HK_SEND 14

-#define TABSRMM_HK_EMOTICONS 15

-#define TABARMM_HK_TOGGLEINFOPANEL 16

-#define TABSRMM_HK_HISTORY 17

-#define TABSRMM_HK_TOGGLETOOLBAR 18

-#define TABSRMM_HK_TOGGLEMULTISEND 19

-#define TABSRMM_HK_TOGGLERTL 20

-#define TABSRMM_HK_USERMENU 21

-#define TABSRMM_HK_USERDETAILS 22

-#define TABSRMM_HK_TOGGLEINFOPANEL 23

-#define TABSRMM_HK_CLEARLOG 24

-#define TABSRMM_HK_EDITNOTES 25

-#define TABSRMM_HK_TOGGLESENDLATER 26

-#define TABSRMM_HK_TOGGLESIDEBAR 27

-#define TABSRMM_HK_CHANNELMGR	 28

-#define TABSRMM_HK_FILTERTOGGLE  29

-#define TABSRMM_HK_LISTTOGGLE	 30

-#define TABSRMM_HK_MUC_SHOWSERVER 31

-#define TABSRMM_HK_CLOSE_OTHER 32

+#define TABSRMM_HK_LASTUNREAD		2

+#define TABSRMM_HK_LASTRECENT		4

+#define TABSRMM_HK_PASTEANDSEND		8

+#define TABSRMM_HK_SETUSERPREFS		9

+#define TABSRMM_HK_CONTAINEROPTIONS	10

+#define TABSRMM_HK_NUDGE 			11

+#define TABSRMM_HK_SENDFILE			12

+#define TABSRMM_HK_QUOTEMSG			13

+#define TABSRMM_HK_SEND				14

+#define TABSRMM_HK_EMOTICONS		15

+#define TABARMM_HK_TOGGLEINFOPANEL	16

+#define TABSRMM_HK_HISTORY			17

+#define TABSRMM_HK_TOGGLETOOLBAR	18

+#define TABSRMM_HK_TOGGLEMULTISEND	19

+#define TABSRMM_HK_TOGGLERTL		20

+#define TABSRMM_HK_USERMENU			21

+#define TABSRMM_HK_USERDETAILS		22

+#define TABSRMM_HK_TOGGLEINFOPANEL	23

+#define TABSRMM_HK_CLEARLOG			24

+#define TABSRMM_HK_EDITNOTES		25

+#define TABSRMM_HK_TOGGLESENDLATER	26

+#define TABSRMM_HK_TOGGLESIDEBAR	27

+#define TABSRMM_HK_CHANNELMGR		28

+#define TABSRMM_HK_FILTERTOGGLE		29

+#define TABSRMM_HK_LISTTOGGLE		30

+#define TABSRMM_HK_MUC_SHOWSERVER	31

+#define TABSRMM_HK_CLOSE_OTHER		32

+#define TABSRMM_HK_SENDMENU			33

+#define TABSRMM_HK_PROTOMENU		34

 

 #define TABSRMM_HK_SECTION_IM LPGEN("Message windows - IM")

 #define TABSRMM_HK_SECTION_GENERIC LPGEN("Message windows - all")