- more SRMM buttons went to mir_app;

- history button handler also moved to mir_app;

8 files changed, 75 insertions, 79 deletions

diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp
index 00d2d4ad99..c2b527e629 100644
--- a/src/core/stdmsg/src/chat_window.cpp
+++ b/src/core/stdmsg/src/chat_window.cpp
@@ -208,7 +208,6 @@ LRESULT CALLBACK CChatRoomDlg::MessageSubclassProc(HWND hwnd, UINT msg, WPARAM w
 					SendMessage(hwndDlg, GC_SWITCHTAB, 0, (int)wParam - (int)VK_NUMPAD1);
 
 			if (wParam == VK_TAB && !isCtrl && !isShift) { // tab-autocomplete
-				wchar_t *pszText = nullptr;
 				LRESULT lResult = (LRESULT)SendMessage(hwnd, EM_GETSEL, 0, 0);
 
 				SendMessage(hwnd, WM_SETREDRAW, FALSE, 0);
@@ -221,14 +220,14 @@ LRESULT CALLBACK CChatRoomDlg::MessageSubclassProc(HWND hwnd, UINT msg, WPARAM w
 				gtl.codepage = CP_ACP;
 				int iLen = SendMessage(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0);
 				if (iLen > 0) {
-					pszText = (wchar_t *)mir_alloc(sizeof(wchar_t)*(iLen + 100));
+					wchar_t *pszText = (wchar_t *)mir_alloc(sizeof(wchar_t)*(iLen + 100));
 
 					GETTEXTEX gt = {};
 					gt.cb = iLen + 99;
 					gt.flags = GT_DEFAULT;
 					gt.codepage = 1200;
-
 					SendMessage(hwnd, EM_GETTEXTEX, (WPARAM)&gt, (LPARAM)pszText);
+
 					while (start > 0 && pszText[start - 1] != ' ' && pszText[start - 1] != 13 && pszText[start - 1] != VK_TAB)
 						start--;
 					while (end < iLen && pszText[end] != ' ' && pszText[end] != 13 && pszText[end - 1] != VK_TAB)
@@ -282,11 +281,6 @@ LRESULT CALLBACK CChatRoomDlg::MessageSubclassProc(HWND hwnd, UINT msg, WPARAM w
 				return TRUE;
 			}
 
-			if (wParam == 0x48 && isCtrl && !isAlt) { // ctrl-h (history)
-				pDlg->onClick_History(&pDlg->m_btnHistory);
-				return TRUE;
-			}
-
 			if (wParam == 0x4f && isCtrl && !isAlt) { // ctrl-o (options)
 				pDlg->onClick_Options(&pDlg->m_btnChannelMgr);
 				return TRUE;
@@ -695,10 +689,6 @@ CChatRoomDlg::CChatRoomDlg(SESSION_INFO *si) :
 	m_log(this, IDC_LOG),
 
 	m_btnOk(this, IDOK),
-
-	m_btnHistory(this, IDC_HISTORY),
-	m_btnNickList(this, IDC_SHOWNICKLIST),
-	m_btnChannelMgr(this, IDC_CHANMGR),
 	
 	m_splitterX(this, IDC_SPLITTERX),
 	m_splitterY(this, IDC_SPLITTERY)
@@ -712,7 +702,6 @@ CChatRoomDlg::CChatRoomDlg(SESSION_INFO *si) :
 	m_btnOk.OnClick = Callback(this, &CChatRoomDlg::onClick_Ok);
 
 	m_btnFilter.OnClick = Callback(this, &CChatRoomDlg::onClick_Filter);
-	m_btnHistory.OnClick = Callback(this, &CChatRoomDlg::onClick_History);
 	m_btnChannelMgr.OnClick = Callback(this, &CChatRoomDlg::onClick_Options);
 	m_btnNickList.OnClick = Callback(this, &CChatRoomDlg::onClick_NickList);
 
@@ -812,16 +801,6 @@ void CChatRoomDlg::onClick_Filter(CCtrlButton *pButton)
 		RedrawLog();
 }
 
-void CChatRoomDlg::onClick_History(CCtrlButton *pButton)
-{
-	if (!pButton->Enabled())
-		return;
-
-	MODULEINFO *pInfo = pci->MM_FindModule(m_si->pszModule);
-	if (pInfo)
-		ShellExecute(m_hwnd, nullptr, pci->GetChatLogsFilename(m_si, 0), nullptr, nullptr, SW_SHOW);
-}
-
 void CChatRoomDlg::onClick_NickList(CCtrlButton *pButton)
 {
 	if (!pButton->Enabled() || m_si->iType == GCW_SERVER)
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index ec6b384b59..1b3896ee31 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -1320,10 +1320,6 @@ INT_PTR CSrmmWindow::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 			}

 			break;

 

-		case IDC_HISTORY:

-			CallService(MS_HISTORY_SHOWCONTACTHISTORY, m_hContact, 0);

-			break;

-

 		case IDC_DETAILS:

 			CallService(MS_USERINFO_SHOWDIALOG, m_hContact, 0);

 			break;

diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index e81d16e3a9..906b0270a4 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -307,7 +307,7 @@ int RegisterToolbarIcons(WPARAM, LPARAM)
 	Srmm_AddButton(&bbd);

 

 	bbd.bbbFlags |= BBBF_ISCHATBUTTON | BBBF_ISRSIDEBUTTON;

-	bbd.dwButtonID = IDC_HISTORY;

+	bbd.dwButtonID = IDC_SRMM_HISTORY;

 	bbd.dwDefPos = 40;

 	bbd.hIcon = Skin_GetIconHandle(SKINICON_OTHER_HISTORY);

 	bbd.pwszText = LPGENW("&History");

diff --git a/src/core/stdmsg/src/resource.h b/src/core/stdmsg/src/resource.h
index d07e2b302a..bd06f80531 100644
--- a/src/core/stdmsg/src/resource.h
+++ b/src/core/stdmsg/src/resource.h
@@ -70,11 +70,8 @@
 #define IDC_AUTOMIN                     1005

 #define IDC_DONOTSTEALFOCUS             1006

 #define IDC_SPLITTERY                   1008

-#define IDC_CHANMGR                     1014

-#define IDC_SHOWNICKLIST                1016

 #define IDC_CHECKBOXES                  1018

 #define IDC_NICKLISTBKG                 1021

-#define IDC_HISTORY                     1022

 #define IDC_NICKROW                     1024

 #define IDC_LOGLIMIT                    1024

 #define IDC_NICKROW2                    1025

diff --git a/src/core/stdmsg/src/stdafx.h b/src/core/stdmsg/src/stdafx.h
index c665cbb2b8..750bbefcf5 100644
--- a/src/core/stdmsg/src/stdafx.h
+++ b/src/core/stdmsg/src/stdafx.h
@@ -218,7 +218,6 @@ class CChatRoomDlg : public CSrmmBaseDialog
 	CCtrlEdit m_message, m_log;

 	CCtrlListBox m_nickList;

 	CCtrlButton m_btnOk;

-	CCtrlButton m_btnChannelMgr, m_btnNickList, m_btnHistory;

 	CSplitter m_splitterX, m_splitterY;

 

 	HWND getCaptionWindow() const

@@ -253,7 +252,6 @@ public:
 	void onClick_Ok(CCtrlButton*);

 

 	void onClick_Filter(CCtrlButton*);

-	void onClick_History(CCtrlButton*);

 	void onClick_Options(CCtrlButton*);

 	void onClick_NickList(CCtrlButton*);

 

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index d7637765fe..08d7355403 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -430,3 +430,4 @@ Chat_UpdateOptions @418 NONAME
 ?onClick_Color@CSrmmBaseDialog@@IAEXPAVCCtrlButton@@@Z @432 NONAME

 ?RefreshButtonStatus@CSrmmBaseDialog@@IAEXXZ @433 NONAME

 ?ProcessHotkeys@CSrmmBaseDialog@@IAE_NH_N00@Z @434 NONAME

+?onClick_History@CSrmmBaseDialog@@IAEXPAVCCtrlButton@@@Z @435 NONAME

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index a158a3409b..380bc88347 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -430,3 +430,4 @@ Chat_UpdateOptions @418 NONAME
 ?onClick_Color@CSrmmBaseDialog@@IEAAXPEAVCCtrlButton@@@Z @432 NONAME

 ?RefreshButtonStatus@CSrmmBaseDialog@@IEAAXXZ @433 NONAME

 ?ProcessHotkeys@CSrmmBaseDialog@@IEAA_NH_N00@Z @434 NONAME

+?onClick_History@CSrmmBaseDialog@@IEAAXPEAVCCtrlButton@@@Z @435 NONAME

diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp
index 6299bb6bf0..faf40ef1b3 100644
--- a/src/mir_app/src/srmm_base.cpp
+++ b/src/mir_app/src/srmm_base.cpp
@@ -24,15 +24,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "stdafx.h"
 
 #include "chat.h"
+#include <m_history.h>
 
 extern HCURSOR g_hCurHyperlinkHand;
 
 CSrmmBaseDialog::CSrmmBaseDialog(HINSTANCE hInst, int idDialog, SESSION_INFO *si)
 	: CDlgBase(hInst, idDialog),
 	m_btnFilter(this, IDC_SRMM_FILTER),
+	m_btnHistory(this, IDC_SRMM_HISTORY),
+	m_btnNickList(this, IDC_SRMM_NICKLIST),
+	m_btnChannelMgr(this, IDC_SRMM_CHANMGR),
+
 	m_btnColor(this, IDC_SRMM_COLOR),
 	m_btnBkColor(this, IDC_SRMM_BKGCOLOR),
 	m_btnBold(this, IDC_SRMM_BOLD),
+
 	m_btnItalic(this, IDC_SRMM_ITALICS),
 	m_btnUnderline(this, IDC_SRMM_UNDERLINE),
 
@@ -50,6 +56,8 @@ CSrmmBaseDialog::CSrmmBaseDialog(HINSTANCE hInst, int idDialog, SESSION_INFO *si
 	m_btnBkColor.OnClick = Callback(this, &CSrmmBaseDialog::onClick_BkColor);
 	m_btnBold.OnClick = m_btnItalic.OnClick = m_btnUnderline.OnClick = Callback(this, &CSrmmBaseDialog::onClick_BIU);
 
+	m_btnHistory.OnClick = Callback(this, &CSrmmBaseDialog::onClick_History);
+
 	if (si) {
 		m_hContact = si->hContact;
 
@@ -69,8 +77,9 @@ CSrmmBaseDialog::CSrmmBaseDialog(HINSTANCE hInst, int idDialog, SESSION_INFO *si
 
 CSrmmBaseDialog::CSrmmBaseDialog(const CSrmmBaseDialog&) :
 	CDlgBase(0, 0),
-	m_btnColor(0, 0), m_btnBkColor(0, 0), m_btnFilter(0, 0),
-	m_btnBold(0, 0), m_btnItalic(0, 0), m_btnUnderline(0, 0)
+	m_btnColor(0, 0), m_btnBkColor(0, 0),
+	m_btnBold(0, 0), m_btnItalic(0, 0), m_btnUnderline(0, 0),
+	m_btnFilter(0, 0), m_btnChannelMgr(0, 0), m_btnHistory(0, 0), m_btnNickList(0, 0)
 {
 }
 
@@ -309,58 +318,73 @@ void CSrmmBaseDialog::onClick_BIU(CCtrlButton *pButton)
 	m_pEntry->SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);
 }
 
-/////////////////////////////////////////////////////////////////////////////////////////
-
-bool CSrmmBaseDialog::ProcessHotkeys(int key, bool /*isShift*/, bool isCtrl, bool isAlt)
+void CSrmmBaseDialog::onClick_History(CCtrlButton *pButton)
 {
-	if (key == VK_F4 && isCtrl && !isAlt) { // ctrl-F4 (close tab)
-		CloseTab();
-		return true;
-	}
-
-	if (key == VK_ESCAPE && !isCtrl && !isAlt) { // Esc (close tab)
-		CloseTab();
-		return true;
-	}
-
-	if (key == 0x42 && isCtrl && !isAlt) { // ctrl-b (bold)
-		m_btnBold.Push(!m_btnBold.IsPushed());
-		onClick_BIU(&m_btnBold);
-		return true;
-	}
-
-	if (key == 0x49 && isCtrl && !isAlt) { // ctrl-i (italics)
-		m_btnItalic.Push(!m_btnItalic.IsPushed());
-		onClick_BIU(&m_btnItalic);
-		return true;
-	}
+	if (!pButton->Enabled())
+		return;
 
-	if (key == 0x55 && isCtrl && !isAlt) { // ctrl-u (paste clean text)
-		m_btnUnderline.Push(!m_btnUnderline.IsPushed());
-		onClick_BIU(&m_btnUnderline);
-		return true;
+	if (m_si != nullptr) {
+		MODULEINFO *pInfo = chatApi.MM_FindModule(m_si->pszModule);
+		if (pInfo)
+			ShellExecute(m_hwnd, nullptr, chatApi.GetChatLogsFilename(m_si, 0), nullptr, nullptr, SW_SHOW);
 	}
+	else CallService(MS_HISTORY_SHOWCONTACTHISTORY, m_hContact, 0);
+}
 
-	if (key == 0x4b && isCtrl && !isAlt) { // ctrl-k (paste clean text)
-		m_btnColor.Push(!m_btnColor.IsPushed());
-		onClick_Color(&m_btnColor);
-		return true;
-	}
+/////////////////////////////////////////////////////////////////////////////////////////
 
-	if (key == 0x4c && isCtrl && !isAlt) { // ctrl-l (paste clean text)
-		m_btnBkColor.Push(!m_btnBkColor.IsPushed());
-		onClick_BkColor(&m_btnBkColor);
+bool CSrmmBaseDialog::ProcessHotkeys(int key, bool isShift, bool isCtrl, bool isAlt)
+{
+	// Esc (close tab)
+	if (key == VK_ESCAPE && !isShift && !isCtrl && !isAlt) {
+		CloseTab();
 		return true;
 	}
 
-	if (key == VK_SPACE && isCtrl && !isAlt) { // ctrl-space (paste clean text)
-		m_btnBold.Push(false); onClick_BIU(&m_btnBold);
-		m_btnItalic.Push(false); onClick_BIU(&m_btnItalic);
-		m_btnUnderline.Push(false); onClick_BIU(&m_btnUnderline);
-
-		m_btnColor.Push(false); onClick_Color(&m_btnColor);
-		m_btnBkColor.Push(false); onClick_BkColor(&m_btnBkColor);
-		return true;
+	if (isCtrl && !isAlt) {
+		switch (key) {
+		case VK_SPACE: // ctrl-space (paste clean text)
+			m_btnBold.Push(false); onClick_BIU(&m_btnBold);
+			m_btnItalic.Push(false); onClick_BIU(&m_btnItalic);
+			m_btnUnderline.Push(false); onClick_BIU(&m_btnUnderline);
+
+			m_btnColor.Push(false); onClick_Color(&m_btnColor);
+			m_btnBkColor.Push(false); onClick_BkColor(&m_btnBkColor);
+			return true;
+
+		case 0x42: // ctrl-b (bold)
+			m_btnBold.Push(!m_btnBold.IsPushed());
+			onClick_BIU(&m_btnBold);
+			return true;
+
+		case 0x48: // ctrl-h (history)
+			onClick_History(&m_btnHistory);
+			return true;
+
+		case 0x49: // ctrl-i (italics)
+			m_btnItalic.Push(!m_btnItalic.IsPushed());
+			onClick_BIU(&m_btnItalic);
+			return true;
+
+		case 0x4b: // ctrl-k (paste clean text)
+			m_btnColor.Push(!m_btnColor.IsPushed());
+			onClick_Color(&m_btnColor);
+			return true;
+
+		case 0x4c: // ctrl-l (back color)
+			m_btnBkColor.Push(!m_btnBkColor.IsPushed());
+			onClick_BkColor(&m_btnBkColor);
+			return true;
+
+		case 0x55: // ctrl-u (underlining)
+			m_btnUnderline.Push(!m_btnUnderline.IsPushed());
+			onClick_BIU(&m_btnUnderline);
+			return true;
+
+		case VK_F4: // ctrl-F4 (close tab)
+			CloseTab();
+			return true;
+		}
 	}
 
 	return false;