summaryrefslogtreecommitdiff
path: root/plugins/TabSRMM/src
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/TabSRMM/src')
-rw-r--r--plugins/TabSRMM/src/chat_main.cpp2
-rw-r--r--plugins/TabSRMM/src/generic_msghandlers.cpp7
-rw-r--r--plugins/TabSRMM/src/globals.cpp3
-rw-r--r--plugins/TabSRMM/src/globals.h3
-rw-r--r--plugins/TabSRMM/src/hotkeyhandler.cpp1
-rw-r--r--plugins/TabSRMM/src/msgdialog.cpp46
-rw-r--r--plugins/TabSRMM/src/msgoptions.cpp3
-rw-r--r--plugins/TabSRMM/src/msgs.h305
8 files changed, 156 insertions, 214 deletions
diff --git a/plugins/TabSRMM/src/chat_main.cpp b/plugins/TabSRMM/src/chat_main.cpp
index 00c4806289..5150712a36 100644
--- a/plugins/TabSRMM/src/chat_main.cpp
+++ b/plugins/TabSRMM/src/chat_main.cpp
@@ -371,6 +371,8 @@ int Chat_Load()
g_chatApi.ShowRoom = stubShowRoom;
g_chatApi.OnLoadSettings = OnLoadSettings;
+ Srmm_CreateHotkey(TABSRMM_HK_SECTION_GENERIC, LPGEN("Send Message"));
+
// this operation is unsafe, that's why we restore the old pci state on exit
g_chatApi.DoSoundsFlashPopupTrayStuff = DoSoundsFlashPopupTrayStuff;
g_chatApi.IsHighlighted = IsHighlighted;
diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index 6e816b548c..33f53404b2 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -135,13 +135,6 @@ bool CMsgDialog::DM_GenericHotkeysCheck(MSG *message)
m_pContainer->OptionsDialog();
return true;
- case TABSRMM_HK_SEND:
- if (!(GetWindowLongPtr(m_message.GetHwnd(), GWL_STYLE) & ES_READONLY)) {
- PostMessage(m_hwnd, WM_COMMAND, IDOK, 0);
- return true;
- }
- break;
-
case TABSRMM_HK_TOGGLEINFOPANEL:
m_pPanel.setActive(!m_pPanel.isActive());
m_pPanel.showHide();
diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index 2e6e269b0f..1e495f0c33 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -120,9 +120,6 @@ void CGlobals::reloadSettings(bool fReloadSkins)
m_ncm.cbSize = sizeof(NONCLIENTMETRICS);
SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &m_ncm, 0);
- m_bSendOnShiftEnter = M.GetBool("sendonshiftenter", false);
- m_bSendOnEnter = M.GetBool(SRMSGSET_SENDONENTER, SRMSGDEFSET_SENDONENTER);
- m_bSendOnDblEnter = M.GetBool("SendOnDblEnter", false);
m_bAutoSwitchTabs = M.GetBool("autoswitchtabs", true);
m_iTabNameLimit = db_get_w(0, SRMSGMOD_T, "cut_at", 15);
m_bCutContactNameOnTabs = M.GetBool("cuttitle", false);
diff --git a/plugins/TabSRMM/src/globals.h b/plugins/TabSRMM/src/globals.h
index 22fa93b00f..1b68521a53 100644
--- a/plugins/TabSRMM/src/globals.h
+++ b/plugins/TabSRMM/src/globals.h
@@ -79,9 +79,6 @@ public:
// dynamic options, need reload when options change
int m_iTabNameLimit;
bool m_bAllowTab;
- bool m_bSendOnShiftEnter;
- bool m_bSendOnEnter;
- bool m_bSendOnDblEnter;
bool m_bAutoSwitchTabs;
bool m_bCutContactNameOnTabs;
bool m_bHideOnClose;
diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp
index 8137c49756..63420a6f0c 100644
--- a/plugins/TabSRMM/src/hotkeyhandler.cpp
+++ b/plugins/TabSRMM/src/hotkeyhandler.cpp
@@ -49,7 +49,6 @@ static HOTKEYDESC _hotkeydescs[] = {
{ "tabsrmm_clear", LPGEN("Clear message area"), TABSRMM_HK_SECTION_IM, nullptr, HOTKEYCODE(HOTKEYF_CONTROL, 'K'), 0, TABSRMM_HK_CLEARMSG },
{ "tabsrmm_sendlater", LPGEN("Toggle send later"), TABSRMM_HK_SECTION_IM, nullptr, HOTKEYCODE(HOTKEYF_CONTROL | HOTKEYF_SHIFT, 'S'), 0, TABSRMM_HK_TOGGLESENDLATER },
- { "tabsrmm_send", LPGEN("Send message"), TABSRMM_HK_SECTION_GENERIC, nullptr, 0, 0, TABSRMM_HK_SEND },
{ "tabsrmm_hist", LPGEN("Show message history"), TABSRMM_HK_SECTION_GENERIC, nullptr, HOTKEYCODE(HOTKEYF_ALT, 'H'), 0, TABSRMM_HK_HISTORY },
{ "tabsrmm_sendmenu", LPGEN("Show send menu"), TABSRMM_HK_SECTION_IM, nullptr, HOTKEYCODE(HOTKEYF_CONTROL, 'S'), 0, TABSRMM_HK_SENDMENU },
{ "tabsrmm_protomenu", LPGEN("Show protocol menu"), TABSRMM_HK_SECTION_IM, nullptr, HOTKEYCODE(HOTKEYF_CONTROL, 'P'), 0, TABSRMM_HK_PROTOMENU },
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index d008b50f8d..f10b41b967 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -313,7 +313,6 @@ CMsgDialog::CMsgDialog(int iDlgId, MCONTACT hContact) :
CSuper(g_plugin, iDlgId),
m_pPanel(this),
timerAwayMsg(this, 4),
- m_btnOk(this, IDOK),
m_btnAdd(this, IDC_ADD),
m_btnQuote(this, IDC_QUOTE),
m_btnCancelAdd(this, IDC_CANCELADD)
@@ -331,7 +330,6 @@ CMsgDialog::CMsgDialog(SESSION_INFO *si) :
CSuper(g_plugin, IDD_CHANNEL, si),
m_pPanel(this),
timerAwayMsg(this, 4),
- m_btnOk(this, IDOK),
m_btnAdd(this, IDC_ADD),
m_btnQuote(this, IDC_QUOTE),
m_btnCancelAdd(this, IDC_CANCELADD)
@@ -1505,6 +1503,7 @@ int CMsgDialog::OnFilter(MSGFILTER *pFilter)
RedrawWindow(m_hwnd, nullptr, nullptr, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN);
return _dlgReturn(m_hwnd, 1);
}
+
if (DM_GenericHotkeysCheck(&message)) {
m_bkeyProcessed = true;
return _dlgReturn(m_hwnd, 1);
@@ -1786,8 +1785,6 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
case WM_MOUSEWHEEL:
if (DM_MouseWheelHandler(wParam, lParam) == 0)
return 0;
-
- m_iLastEnterTime = 0;
break;
case EM_PASTESPECIAL:
@@ -1857,47 +1854,11 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
replaceStrW(m_wszSearchResult, nullptr);
}
- if (wParam == VK_RETURN) {
- if (m_bEditNotesActive)
- break;
-
- if (isShift) {
- if (PluginConfig.m_bSendOnShiftEnter) {
- PostMessage(m_hwnd, WM_COMMAND, IDOK, 0);
- return 0;
- }
- else break;
- }
- if ((isCtrl && !isShift) ^ (0 != PluginConfig.m_bSendOnEnter)) {
- PostMessage(m_hwnd, WM_COMMAND, IDOK, 0);
- return 0;
- }
- if (PluginConfig.m_bSendOnEnter || PluginConfig.m_bSendOnDblEnter) {
- if (isCtrl)
- break;
-
- if (PluginConfig.m_bSendOnDblEnter) {
- if (m_iLastEnterTime + 2 < time(0)) {
- m_iLastEnterTime = time(0);
- break;
- }
- else {
- m_message.SendMsg(WM_KEYDOWN, VK_BACK, 0);
- m_message.SendMsg(WM_KEYUP, VK_BACK, 0);
- PostMessage(m_hwnd, WM_COMMAND, IDOK, 0);
- return 0;
- }
- }
- PostMessage(m_hwnd, WM_COMMAND, IDOK, 0);
- return 0;
- }
- else break;
- }
- else m_iLastEnterTime = 0;
+ if (wParam == VK_RETURN && m_bEditNotesActive)
+ break;
if (isCtrl && !isAlt && !isShift) {
if (wParam == VK_UP || wParam == VK_DOWN) { // input history scrolling (ctrl-up / down)
- m_iLastEnterTime = 0;
m_cache->inputHistoryEvent(wParam);
return 0;
}
@@ -1912,7 +1873,6 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
case VK_END:
WPARAM wp = 0;
- m_iLastEnterTime = 0;
if (wParam == VK_UP)
wp = MAKEWPARAM(SB_LINEUP, 0);
else if (wParam == VK_PRIOR)
diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index 98199536a6..fce1efd134 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -476,9 +476,6 @@ static TOptionListGroup lvGroupsMsg[] =
static TOptionListItem lvItemsMsg[] =
{
- { 0, LPGENW("Send on Shift+Enter"), 0, LOI_TYPE_SETTING, (UINT_PTR)"sendonshiftenter", 1 },
- { 0, LPGENW("Send message on 'Enter'"), SRMSGDEFSET_SENDONENTER, LOI_TYPE_SETTING, (UINT_PTR)SRMSGSET_SENDONENTER, 1 },
- { 0, LPGENW("Send message on double 'Enter'"), 0, LOI_TYPE_SETTING, (UINT_PTR)"SendOnDblEnter", 1 },
{ 0, LPGENW("Minimize the message window on send"), SRMSGDEFSET_AUTOMIN, LOI_TYPE_SETTING, (UINT_PTR)SRMSGSET_AUTOMIN, 1 },
{ 0, LPGENW("Close the message window on send"), 0, LOI_TYPE_SETTING, (UINT_PTR)"AutoClose", 1 },
{ 0, LPGENW("Always flash contact list and tray icon for new messages"), 0, LOI_TYPE_SETTING, (UINT_PTR)"flashcl", 0 },
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index 1df4c26ae1..671fd02512 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -415,11 +415,6 @@ class CMsgDialog : public CSrmmBaseDialog
friend class CLogWindow;
friend class CProxyWindow;
- void BB_InitDlgButtons(void);
- void BB_RefreshTheme(void);
- BOOL BB_SetButtonsPos(void);
- void BB_RedrawButtons(void);
-
std::map<CustomButtonData *, bool> mapHidden;
__forceinline bool BB_IsDisplayed(CustomButtonData *cbd) const
@@ -427,160 +422,165 @@ class CMsgDialog : public CSrmmBaseDialog
return (!isChat() && cbd->m_bIMButton) || (isChat() && cbd->m_bChatButton);
}
- void CB_DestroyAllButtons(void);
- void CB_DestroyButton(uint32_t dwButtonCID, uint32_t dwFlags);
- void CB_ChangeButton(CustomButtonData *cbd);
-
- void DM_AddDivider(void);
- HWND DM_CreateClist(void);
- void DM_DismissTip(const POINT& pt);
- void DM_ErrorDetected(int type, int flag);
- void DM_EventAdded(WPARAM wParam, LPARAM lParam);
- void DM_FreeTheme(void);
- bool DM_GenericHotkeysCheck(MSG *message);
- void DM_HandleAutoSizeRequest(REQRESIZE *rr);
- void DM_InitRichEdit(void);
- void DM_InitTip(void);
- LRESULT DM_MouseWheelHandler(WPARAM wParam, LPARAM lParam);
- LRESULT DM_MsgWindowCmdHandler(UINT cmd, WPARAM wParam, LPARAM lParam);
- void DM_NotifyTyping(int mode);
- void DM_SetDBButtonStates();
- int DM_SplitterGlobalEvent(WPARAM wParam, LPARAM lParam);
- void DM_ThemeChanged(void);
- void DM_Typing(bool fForceOff);
- void DM_UpdateLastMessage(void) const;
-
- void AdjustBottomAvatarDisplay(void);
- void CalcDynamicAvatarSize(BITMAP *bminfo);
- void DetermineMinHeight(void);
- BOOL DoRtfToTags(CMStringW &pszText) const;
- void FindFirstEvent(void);
- int FindRTLLocale(void);
- void FlashOnClist(MEVENT hEvent, DBEVENTINFO *dbei);
- void FlashTab(bool bInvertMode);
- LRESULT GetSendButtonState();
- void GetSendFormat(void);
- HICON GetXStatusIcon() const;
- void HandlePasteAndSend(void);
- void Init(void);
- void LoadContactAvatar(void);
- void LoadOwnAvatar(void);
- void LoadSplitter(void);
- void PlayIncomingSound(void) const;
- LRESULT ProcessHotkeysByMsgFilter(const CCtrlBase &pCtrl, UINT msg, WPARAM wParam, LPARAM lParam);
- void SaveAvatarToFile(HBITMAP hbm, int isOwnPic);
- void SendHBitmapAsFile(HBITMAP hbmp) const;
- void ShowPopupMenu(const CCtrlBase&, POINT pt);
- void StreamEvents(MEVENT, int, bool);
- void UpdateWindowIcon(void);
- void UpdateWindowState(UINT msg);
- void VerifyProxy(void);
- LRESULT WMCopyHandler(UINT uMsg, WPARAM wParam, LPARAM lParam);
-
- uint16_t m_wStatus, m_wOldStatus;
- size_t m_iSendBufferSize;
- int m_iSendLength; // message length in utf-8 octets
- HICON m_hSmileyIcon;
- HWND m_hwndContactPic, m_hwndPanelPic, m_hwndPanelPicParent;
- UINT m_bbLSideWidth, m_bbRSideWidth;
- uint8_t kstate[256];
+ void BB_InitDlgButtons(void);
+ void BB_RefreshTheme(void);
+ BOOL BB_SetButtonsPos(void);
+ void BB_RedrawButtons(void);
+
+ void CB_DestroyAllButtons(void);
+ void CB_DestroyButton(uint32_t dwButtonCID, uint32_t dwFlags);
+ void CB_ChangeButton(CustomButtonData *cbd);
+
+ void DM_AddDivider(void);
+ HWND DM_CreateClist(void);
+ void DM_DismissTip(const POINT& pt);
+ void DM_ErrorDetected(int type, int flag);
+ void DM_EventAdded(WPARAM wParam, LPARAM lParam);
+ void DM_FreeTheme(void);
+ bool DM_GenericHotkeysCheck(MSG *message);
+ void DM_HandleAutoSizeRequest(REQRESIZE *rr);
+ void DM_InitRichEdit(void);
+ void DM_InitTip(void);
+ LRESULT DM_MouseWheelHandler(WPARAM wParam, LPARAM lParam);
+ LRESULT DM_MsgWindowCmdHandler(UINT cmd, WPARAM wParam, LPARAM lParam);
+ void DM_NotifyTyping(int mode);
+ void DM_SetDBButtonStates();
+ int DM_SplitterGlobalEvent(WPARAM wParam, LPARAM lParam);
+ void DM_ThemeChanged(void);
+ void DM_Typing(bool fForceOff);
+ void DM_UpdateLastMessage(void) const;
+
+ void AdjustBottomAvatarDisplay(void);
+ void CalcDynamicAvatarSize(BITMAP *bminfo);
+ void DetermineMinHeight(void);
+ BOOL DoRtfToTags(CMStringW &pszText) const;
+ void FindFirstEvent(void);
+ int FindRTLLocale(void);
+ void FlashOnClist(MEVENT hEvent, DBEVENTINFO *dbei);
+ void FlashTab(bool bInvertMode);
+ LRESULT GetSendButtonState();
+ void GetSendFormat(void);
+ HICON GetXStatusIcon() const;
+ void HandlePasteAndSend(void);
+ void Init(void);
+ void LoadContactAvatar(void);
+ void LoadOwnAvatar(void);
+ void LoadSplitter(void);
+ void PlayIncomingSound(void) const;
+ LRESULT ProcessHotkeysByMsgFilter(const CCtrlBase &pCtrl, UINT msg, WPARAM wParam, LPARAM lParam);
+ void SaveAvatarToFile(HBITMAP hbm, int isOwnPic);
+ void SendHBitmapAsFile(HBITMAP hbmp) const;
+ void ShowPopupMenu(const CCtrlBase&, POINT pt);
+ void StreamEvents(MEVENT, int, bool);
+ void UpdateWindowIcon(void);
+ void UpdateWindowState(UINT msg);
+ void VerifyProxy(void);
+ LRESULT WMCopyHandler(UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+ uint16_t m_wStatus, m_wOldStatus;
+ size_t m_iSendBufferSize;
+ int m_iSendLength; // message length in utf-8 octets
+ HICON m_hSmileyIcon;
+ HWND m_hwndContactPic, m_hwndPanelPic, m_hwndPanelPicParent;
+ UINT m_bbLSideWidth, m_bbRSideWidth;
+ uint8_t kstate[256];
- RECT m_rcNick, m_rcUIN, m_rcStatus, m_rcPic;
- int m_originalSplitterY;
- SIZE m_minEditBoxSize;
- uint32_t m_lastMessage;
- uint32_t m_dwTickLastEvent;
- HBITMAP m_hOwnPic;
- SIZE m_pic;
+ RECT m_rcNick, m_rcUIN, m_rcStatus, m_rcPic;
+ int m_originalSplitterY;
+ SIZE m_minEditBoxSize;
+ uint32_t m_lastMessage;
+ uint32_t m_dwTickLastEvent;
+ HBITMAP m_hOwnPic;
+ SIZE m_pic;
CMStringW m_szStatusText;
- HICON m_szStatusIcon;
- bool m_bStatusSet;
+ HICON m_szStatusIcon;
+ bool m_bStatusSet;
- bool m_bShowInfoAvatar, m_bShowUIElements;
- bool m_bFlashClist, m_bScrollingDisabled, m_bAwayMsgTimer;
- bool m_bDelayedSplitter, m_bWarnClose;
- bool m_bUseOffset;
- bool m_bkeyProcessed;
- bool m_fLimitedUpdate;
- bool m_bClrAdded;
- bool m_bInsertMode, m_bInitMode = true;
- bool m_bDeferredScroll, m_bDeferredRemakeLog;
- bool m_bWasBackgroundCreate;
-
- int m_iRealAvatarHeight;
- int m_iButtonBarReallyNeeds;
- uint32_t m_dwLastActivity;
- MEVENT m_hFlashingEvent;
- int m_SendFormat;
- LCID m_lcid;
- wchar_t m_lcID[10];
- int m_iPanelAvatarX, m_iPanelAvatarY;
- HWND m_hwndTip;
- uint32_t m_panelStatusCX;
- int m_textLen; // current text len
- LONG m_ipFieldHeight;
- WPARAM m_wParam; // used for "delayed" actions like moved splitters in minimized windows
- LPARAM m_lParam;
- int m_iHaveRTLLang;
+ bool m_bShowInfoAvatar, m_bShowUIElements;
+ bool m_bFlashClist, m_bScrollingDisabled, m_bAwayMsgTimer;
+ bool m_bDelayedSplitter, m_bWarnClose;
+ bool m_bUseOffset;
+ bool m_bkeyProcessed;
+ bool m_fLimitedUpdate;
+ bool m_bClrAdded;
+ bool m_bInsertMode, m_bInitMode = true;
+ bool m_bDeferredScroll, m_bDeferredRemakeLog;
+ bool m_bWasBackgroundCreate;
+
+ int m_iRealAvatarHeight;
+ int m_iButtonBarReallyNeeds;
+ uint32_t m_dwLastActivity;
+ MEVENT m_hFlashingEvent;
+ int m_SendFormat;
+ LCID m_lcid;
+ wchar_t m_lcID[10];
+ int m_iPanelAvatarX, m_iPanelAvatarY;
+ HWND m_hwndTip;
+ uint32_t m_panelStatusCX;
+ int m_textLen; // current text len
+ LONG m_ipFieldHeight;
+ WPARAM m_wParam; // used for "delayed" actions like moved splitters in minimized windows
+ LPARAM m_lParam;
+ int m_iHaveRTLLang;
- uint32_t m_iSplitterSaved;
- POINT m_ptTipActivation;
+ uint32_t m_iSplitterSaved;
+ POINT m_ptTipActivation;
protected:
- void GetMYUIN();
+ void GetMYUIN();
public:
- char *m_szProto;
- int m_iTabID;
- int m_iLogMode;
-
- bool m_bIsHistory, m_bNotOnList, m_bIsIdle;
- bool m_bActualHistory;
- bool m_bIsAutosizingInput;
- bool m_bCanFlashTab, m_bTabFlash;
- bool m_bEditNotesActive;
- bool m_bShowAvatar;
- bool m_bSaveBtn, m_bNeedCheckSize;
- bool m_bForcedClose;
- bool m_bErrorState;
- bool m_bDividerWanted, m_bDividerSet;
- bool m_bSplitterOverride;
- bool m_bRtlText;
- bool m_bLastParaDeleted;
-
- int m_sendMode;
- HKL m_hkl; // keyboard layout identifier
- uint32_t m_idle;
- uint32_t m_dwFlags;
- uint32_t m_dwUnread;
- HANDLE m_hTheme, m_hThemeIP, m_hThemeToolbar;
- HICON m_hXStatusIcon, m_hTabStatusIcon, m_hTabIcon, m_iFlashIcon, m_hTaskbarIcon, m_hClientIcon;
- MEVENT m_hDbEventFirst, m_hDbEventLast;
- HANDLE m_hTimeZone;
- MEVENT *m_hHistoryEvents;
- time_t m_lastEventTime;
- int m_iLastEventType;
- int m_iOpenJobs;
- int m_iInputAreaHeight = -1;
- int m_maxHistory, m_curHistory;
- int m_iCurrentQueueError;
- int m_iSplitterY, m_dynaSplitter;
- int m_savedSplitterY, m_savedDynaSplit;
- char *m_sendBuffer;
-
- wchar_t m_wszMyNickname[130];
- wchar_t m_wszStatus[50];
- wchar_t m_wszTitle[130]; // tab title...
- wchar_t m_myUin[80];
- wchar_t m_wszStatusBar[100];
- char m_szMicroLf[128];
-
- int m_iMultiSplit;
- int msgTop, rcLogBottom;
- bool m_bActivate, m_bWantPopup, m_bIsMeta;
-
- wchar_t *wszInitialText;
+ char* m_szProto;
+ int m_iTabID;
+ int m_iLogMode;
+
+ bool m_bIsHistory, m_bNotOnList, m_bIsIdle;
+ bool m_bActualHistory;
+ bool m_bIsAutosizingInput;
+ bool m_bCanFlashTab, m_bTabFlash;
+ bool m_bEditNotesActive;
+ bool m_bShowAvatar;
+ bool m_bSaveBtn, m_bNeedCheckSize;
+ bool m_bForcedClose;
+ bool m_bErrorState;
+ bool m_bDividerWanted, m_bDividerSet;
+ bool m_bSplitterOverride;
+ bool m_bRtlText;
+ bool m_bLastParaDeleted;
+
+ int m_sendMode;
+ HKL m_hkl; // keyboard layout identifier
+ uint32_t m_idle;
+ uint32_t m_dwFlags;
+ uint32_t m_dwUnread;
+ HANDLE m_hTheme, m_hThemeIP, m_hThemeToolbar;
+ HICON m_hXStatusIcon, m_hTabStatusIcon, m_hTabIcon, m_iFlashIcon, m_hTaskbarIcon, m_hClientIcon;
+ MEVENT m_hDbEventFirst, m_hDbEventLast;
+ HANDLE m_hTimeZone;
+ MEVENT* m_hHistoryEvents;
+ time_t m_lastEventTime;
+ int m_iLastEventType;
+ int m_iOpenJobs;
+ int m_iInputAreaHeight = -1;
+ int m_maxHistory, m_curHistory;
+ int m_iCurrentQueueError;
+ int m_iSplitterY, m_dynaSplitter;
+ int m_savedSplitterY, m_savedDynaSplit;
+ char* m_sendBuffer;
+
+ wchar_t m_wszMyNickname[130];
+ wchar_t m_wszStatus[50];
+ wchar_t m_wszTitle[130]; // tab title...
+ wchar_t m_myUin[80];
+ wchar_t m_wszStatusBar[100];
+ char m_szMicroLf[128];
+
+ int m_iMultiSplit;
+ int msgTop, rcLogBottom;
+ bool m_bActivate, m_bWantPopup, m_bIsMeta;
+
+ wchar_t* wszInitialText;
TOOLINFO ti;
CInfoPanel m_pPanel;
CProxyWindow *m_pWnd; // proxy window object (win7+, for taskbar support).
@@ -599,7 +599,7 @@ public:
SESSION_INFO *m_pLastSession;
CTimer timerAwayMsg;
- CCtrlButton m_btnOk, m_btnAdd, m_btnQuote, m_btnCancelAdd;
+ CCtrlButton m_btnAdd, m_btnQuote, m_btnCancelAdd;
public:
CMsgDialog(int dlgId, MCONTACT hContact);
@@ -817,8 +817,6 @@ struct TIconDescW
#define SRMSGDEFSET_AUTOPOPUP false
#define SRMSGSET_AUTOMIN "AutoMin"
#define SRMSGDEFSET_AUTOMIN 0
-#define SRMSGSET_SENDONENTER "SendOnEnter"
-#define SRMSGDEFSET_SENDONENTER true
#define SRMSGSET_MSGTIMEOUT "MessageTimeout"
#define SRMSGDEFSET_MSGTIMEOUT 30000
#define SRMSGSET_MSGTIMEOUT_MIN 5000 // minimum value (5 seconds)
@@ -1018,7 +1016,6 @@ struct SIDEBARITEM
#define TABSRMM_HK_CONTAINEROPTIONS 10
#define TABSRMM_HK_SENDFILE 12
#define TABSRMM_HK_QUOTEMSG 13
-#define TABSRMM_HK_SEND 14
#define TABSRMM_HK_CLEARMSG 15
#define TABARMM_HK_TOGGLEINFOPANEL 16
#define TABSRMM_HK_HISTORY 17
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 22:06:21 +0000