Chat: common code moved to mir_app

2 files changed, 1 insertions, 44 deletions

diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp
index 6205fd01b5..a33d411064 100644
--- a/src/core/stdmsg/src/chat_window.cpp
+++ b/src/core/stdmsg/src/chat_window.cpp
@@ -32,38 +32,6 @@ void CMsgDialog::LoadSettings()
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-static void __cdecl phase2(SESSION_INFO *si)
-{
-	Sleep(30);
-	if (si && si->pDlg)
-		si->pDlg->RedrawLog2();
-}
-
-void CMsgDialog::RedrawLog()
-{
-	m_si->LastTime = 0;
-	if (m_si->pLog) {
-		LOGINFO * pLog = m_si->pLog;
-		if (m_si->iEventCount > 60) {
-			int index = 0;
-			while (index < 59) {
-				if (pLog->next == nullptr)
-					break;
-
-				pLog = pLog->next;
-				if (m_si->iType != GCW_CHATROOM || !m_bFilterEnabled || (m_iLogFilterFlags & pLog->iType) != 0)
-					index++;
-			}
-			StreamInEvents(pLog, true);
-			mir_forkThread<SESSION_INFO>(phase2, m_si);
-		}
-		else StreamInEvents(m_si->pLogEnd, true);
-	}
-	else ClearLog();
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-
 void CMsgDialog::ShowFilterMenu()
 {
 	HWND hwnd = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_FILTER), m_hwnd, FilterWndProc, (LPARAM)this);
@@ -88,15 +56,6 @@ void CMsgDialog::UpdateOptions()
 	m_btnNickList.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bNicklistEnabled ? IDI_NICKLIST : IDI_NICKLIST2, FALSE));
 	m_btnFilter.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bFilterEnabled ? IDI_FILTER : IDI_FILTER2, FALSE));
 
-	MODULEINFO *mi = m_si->pMI;
-	EnableWindow(m_btnBold.GetHwnd(), mi->bBold);
-	EnableWindow(m_btnItalic.GetHwnd(), mi->bItalics);
-	EnableWindow(m_btnUnderline.GetHwnd(), mi->bUnderline);
-	EnableWindow(m_btnColor.GetHwnd(), mi->bColor);
-	EnableWindow(m_btnBkColor.GetHwnd(), mi->bBkgColor);
-	if (m_si->iType == GCW_CHATROOM)
-		EnableWindow(m_btnChannelMgr.GetHwnd(), mi->bChanMgr);
-
 	HICON hIcon = ImageList_GetIcon(Clist_GetImageList(), GetImageId(), ILD_TRANSPARENT);
 	SendMessage(m_pOwner->m_hwndStatus, SB_SETICON, 0, (LPARAM)hIcon);
 	DestroyIcon(hIcon);
@@ -129,8 +88,7 @@ void CMsgDialog::UpdateOptions()
 	m_nickList.SendMsg(LB_SETITEMHEIGHT, 0, height > font ? height : font);
 	InvalidateRect(m_nickList.GetHwnd(), nullptr, TRUE);
 
-	Resize();
-	RedrawLog2();
+	CSuper::UpdateOptions();
 }
 
 void CMsgDialog::UpdateStatusBar()
diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h
index e1e83a8fd3..5a876ac547 100644
--- a/src/core/stdmsg/src/msgs.h
+++ b/src/core/stdmsg/src/msgs.h
@@ -137,7 +137,6 @@ public:
 	void CloseTab() override;

 	bool IsActive() const override;

 	void LoadSettings() override;

-	void RedrawLog() override;

 	void ScrollToBottom() override;

 	void SetStatusText(const wchar_t *, HICON) override;

 	void StreamInEvents(LOGINFO *lin, bool bRedraw) override;