From 4a86731399f158e08ec272fe9a5fc0f0fa0dbad6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 24 Oct 2024 20:31:35 +0300 Subject: =?UTF-8?q?fixes=20#4756=20(=D0=9F=D0=BB=D0=B0=D0=B3=D0=B8=D0=BD?= =?UTF-8?q?=D1=8B=20=D1=81=D0=BE=D0=BE=D0=B1=D1=88=D0=B5=D0=BD=D0=B8=D0=B9?= =?UTF-8?q?:=20=D0=BE=D1=82=D0=B4=D0=B0=D1=82=D1=8C=20=D0=B4=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D1=83=D0=BF=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=BA=D0=BD?= =?UTF-8?q?=D0=BE=D0=BF=D0=BE=D0=BA=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D0=BD=D0=BE=D1=81=D1=82=D1=8C=D1=8E=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BE=D1=82=D0=BA=D1=83=D0=BF=20=D0=BF=D1=80=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D0=BA=D0=BE=D0=BB=D1=83)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/stdmsg/res/resource.rc | 2 -- src/core/stdmsg/src/msgdialog.cpp | 1 - src/core/stdmsg/src/msgoptions.cpp | 4 +--- src/core/stdmsg/src/resource.h | 1 - src/core/stdmsg/src/srmm.cpp | 1 - src/core/stdmsg/src/stdafx.h | 2 +- src/mir_app/src/srmm_base.cpp | 4 +--- 7 files changed, 3 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/core/stdmsg/res/resource.rc b/src/core/stdmsg/res/resource.rc index e5f80a1d86..b269bcbe14 100644 --- a/src/core/stdmsg/res/resource.rc +++ b/src/core/stdmsg/res/resource.rc @@ -56,8 +56,6 @@ BEGIN CONTROL "Show character count",IDC_CHARCOUNT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,173,289,8 CONTROL "Show toolbar buttons on top row",IDC_SHOWBUTTONLINE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,185,289,8 - CONTROL "Allow BBCode formatting in outgoing messages",IDC_SEND_FORMAT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,198,289,8 LTEXT "Show warning when message has not been received after",IDC_STATIC,8,213,211,8 EDITTEXT IDC_SECONDS,223,211,25,12,ES_AUTOHSCROLL LTEXT "seconds",IDC_STATIC,253,213,44,8 diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index 5e8c39785f..a4d182eaa0 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -55,7 +55,6 @@ CMsgDialog::CMsgDialog(CTabbedWindow *pOwner, MCONTACT hContact) : m_autoClose = 0; m_forceResizable = true; m_bNoActivate = g_plugin.bDoNotStealFocus; - m_bSendFormat = g_plugin.bSendFormat; g_arDialogs.insert(this); diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp index a73eaf6d40..2eae075286 100644 --- a/src/core/stdmsg/src/msgoptions.cpp +++ b/src/core/stdmsg/src/msgoptions.cpp @@ -147,7 +147,7 @@ class COptionMainDlg : public CDlgBase { CCtrlEdit edtNFlash, edtAvatarH, edtSecs; CCtrlCheck chkAutoMin, chkAutoClose, chkSavePerContact, chkDoNotStealFocus, chkStatusWin; - CCtrlCheck chkDelTemp, chkCascade, chkCharCount, chkCtrlSupport, chkSendFormat; + CCtrlCheck chkDelTemp, chkCascade, chkCharCount, chkCtrlSupport; CCtrlCheck chkAvatar, chkLimitAvatar; CCtrlCheck chkShowSend, chkShowButtons; @@ -199,7 +199,6 @@ public: chkAutoClose(this, IDC_AUTOCLOSE), chkCharCount(this, IDC_CHARCOUNT), chkStatusWin(this, IDC_STATUSWIN), - chkSendFormat(this, IDC_SEND_FORMAT), chkLimitAvatar(this, IDC_LIMITAVATARH), chkShowButtons(this, IDC_SHOWBUTTONLINE), chkCtrlSupport(this, IDC_CTRLSUPPORT), @@ -226,7 +225,6 @@ public: CreateLink(chkAutoClose, g_plugin.bAutoClose); CreateLink(chkShowSend, g_plugin.bSendButton); CreateLink(chkCharCount, g_plugin.bShowReadChar); - CreateLink(chkSendFormat, g_plugin.bSendFormat); CreateLink(chkStatusWin, g_plugin.bUseStatusWinIcon); CreateLink(chkShowButtons, g_plugin.bShowButtons); CreateLink(chkCtrlSupport, g_plugin.bCtrlSupport); diff --git a/src/core/stdmsg/src/resource.h b/src/core/stdmsg/src/resource.h index f5de2ae35b..a07a6b7bb6 100644 --- a/src/core/stdmsg/src/resource.h +++ b/src/core/stdmsg/src/resource.h @@ -81,7 +81,6 @@ #define IDC_SHOWBUTTONLINE 1042 #define IDC_LOADUNREAD 1043 #define IDC_SHOWBUTTONLINE2 1043 -#define IDC_SEND_FORMAT 1043 #define IDC_LOADCOUNT 1044 #define IDC_LOADTIMEN 1045 #define IDC_LOADTIMESPIN 1046 diff --git a/src/core/stdmsg/src/srmm.cpp b/src/core/stdmsg/src/srmm.cpp index fef28a5a02..63d7e2481f 100644 --- a/src/core/stdmsg/src/srmm.cpp +++ b/src/core/stdmsg/src/srmm.cpp @@ -64,7 +64,6 @@ CMPlugin::CMPlugin() : bAutoClose(SRMM_MODULE, "AutoClose", false), bShowNames(SRMM_MODULE, "ShowNames", false), bShowFormat(SRMM_MODULE, "ShowFormatting", true), - bSendFormat(SRMM_MODULE, "SendFormat", false), bSendButton(SRMM_MODULE, "UseSendButton", false), bCtrlSupport(SRMM_MODULE, "SupportCtrlUpDn", true), bShowReadChar(SRMM_MODULE, "ShowCharCount", false), diff --git a/src/core/stdmsg/src/stdafx.h b/src/core/stdmsg/src/stdafx.h index bfdf282fe5..27a9c076e3 100644 --- a/src/core/stdmsg/src/stdafx.h +++ b/src/core/stdmsg/src/stdafx.h @@ -162,7 +162,7 @@ struct CMPlugin : public PLUGIN // private chat log options CMOption bShowButtons, bSendButton, bShowTyping, bShowTypingWin, bShowTypingTray, bShowTypingClist; CMOption bShowIcons, bShowTime, bShowDate, bShowAvatar, bShowNames, bShowSecs, bShowReadChar; - CMOption bAutoClose, bAutoMin, bTypingNew, bTypingUnknown, bCtrlSupport, bShowFormat, bSendFormat; + CMOption bAutoClose, bAutoMin, bTypingNew, bTypingUnknown, bCtrlSupport, bShowFormat; CMOption bSavePerContact, bDoNotStealFocus, bCascade, bDeleteTempCont, bUseStatusWinIcon, bAutoCopy; CMOption bLimitAvatarHeight; diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp index 66a7fb9d86..b53ca52b13 100644 --- a/src/mir_app/src/srmm_base.cpp +++ b/src/mir_app/src/srmm_base.cpp @@ -546,9 +546,7 @@ bool CSrmmBaseDialog::OnInitDialog() // three buttons below are initiated inside this call, so button creation must precede subclassing Srmm_CreateToolbarIcons(this, isChat() ? BBBF_ISCHATBUTTON : BBBF_ISIMBUTTON); - if ((CallContactService(m_hContact, PS_GETCAPS, PFLAGNUM_4) & PF4_SERVERFORMATTING) == 0) - m_bSendFormat = false; - + m_bSendFormat = ((CallContactService(m_hContact, PS_GETCAPS, PFLAGNUM_4) & PF4_SERVERFORMATTING) != 0); if (!m_bSendFormat) { m_btnBold.Disable(); m_btnItalic.Disable(); -- cgit v1.2.3