fixes #4756 (Плагины сообшений: отдать доступность кнопок форматирования полностью на откуп протоколу)

6 files changed, 2 insertions, 9 deletions

diff --git a/plugins/Scriver/res/resource.rc b/plugins/Scriver/res/resource.rc
index eaff37e35c..6ccda73dc8 100644
--- a/plugins/Scriver/res/resource.rc
+++ b/plugins/Scriver/res/resource.rc
@@ -45,8 +45,6 @@ BEGIN
     CONTROL         "Remember unsent messages",IDC_SAVEDRAFTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,103,293,10

     CONTROL         "Delete temporary contacts on closing",IDC_DELTEMP,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,114,293,10

-    CONTROL         "Allow BBCode formatting in outgoing messages",IDC_SEND_FORMAT,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,126,293,10

     LTEXT           "Show warning when message has not been received after",IDC_STATIC,6,145,201,8

     EDITTEXT        IDC_SECONDS,213,143,35,12,ES_RIGHT | ES_NUMBER

     CONTROL         "",IDC_SECONDSSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,239,143,11,13

diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index 3778b66d69..e5ff6b545a 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -92,7 +92,6 @@ CMsgDialog::CMsgDialog(MCONTACT hContact, bool bIncoming) :
 	SetParent(GetParentWindow(m_hContact, isChat()));

 	m_pParent = (ParentWindowData *)GetWindowLongPtr(m_hwndParent, GWLP_USERDATA);

 

-	m_bSendFormat = g_plugin.bSendFormat;

 	m_btnOk.OnClick = Callback(this, &CMsgDialog::onClick_Ok);

 

 	timerType.OnEvent = Callback(this, &CMsgDialog::onType);

diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp
index 473929fa5d..7e6dddeccb 100644
--- a/plugins/Scriver/src/msgoptions.cpp
+++ b/plugins/Scriver/src/msgoptions.cpp
@@ -243,7 +243,7 @@ class CMainOptionsDlg : public CBaseOptionDlg
 

 	CCtrlSpin spinTimeout;

 	CCtrlCheck chkAutoMin, chkAutoPopup, chkCascade, chkSavePerContact, chkStayMinimized;

-	CCtrlCheck chkSaveDrafts, chkDelTemp, chkHideContainer, chkSendFormat;

+	CCtrlCheck chkSaveDrafts, chkDelTemp, chkHideContainer;

 	CCtrlTreeView m_tree;

 

 public:

@@ -255,7 +255,6 @@ public:
 		chkCascade(this, IDC_CASCADE),

 		chkDelTemp(this, IDC_DELTEMP),

 		chkAutoPopup(this, IDC_AUTOPOPUP),

-		chkSendFormat(this, IDC_SEND_FORMAT),

 		chkSaveDrafts(this, IDC_SAVEDRAFTS),

 		chkHideContainer(this, IDC_HIDECONTAINERS),

 		chkStayMinimized(this, IDC_STAYMINIMIZED),

@@ -265,7 +264,6 @@ public:
 		CreateLink(chkCascade, g_plugin.bCascade);

 		CreateLink(chkAutoMin, g_plugin.bAutoMin);

 		CreateLink(chkAutoPopup, g_plugin.bAutoPopup);

-		CreateLink(chkSendFormat, g_plugin.bSendFormat);

 		CreateLink(chkSaveDrafts, g_plugin.bSaveDrafts);

 		CreateLink(chkHideContainer, g_plugin.bHideContainer);

 		CreateLink(chkStayMinimized, g_plugin.bStayMinimized);

diff --git a/plugins/Scriver/src/resource.h b/plugins/Scriver/src/resource.h
index 7b8c990c7f..70a16de120 100644
--- a/plugins/Scriver/src/resource.h
+++ b/plugins/Scriver/src/resource.h
@@ -128,7 +128,6 @@
 #define IDC_NOTIFYBALLOON               1608

 #define IDC_DELTEMP                     1609

 #define IDC_DELTEMP2                    1610

-#define IDC_SEND_FORMAT                 1610

 #define IDC_AVATARSUPPORT               1611

 #define IDC_LIMITNAMES                  1615

 #define IDC_TRANSPARENCY                1616

diff --git a/plugins/Scriver/src/srmm.cpp b/plugins/Scriver/src/srmm.cpp
index 268a3bda76..242673aefa 100644
--- a/plugins/Scriver/src/srmm.cpp
+++ b/plugins/Scriver/src/srmm.cpp
@@ -56,7 +56,6 @@ CMPlugin::CMPlugin() :
 	bAutoClose(SRMM_MODULE, "AutoClose", false),

 	bAutoPopup(SRMM_MODULE, "AutoPopupMsg", false),

 	bSaveDrafts(SRMM_MODULE, "SaveDrafts", false),

-	bSendFormat(SRMM_MODULE, "SendFormat", false),

 	bTypingUnknown(SRMM_MODULE, "UnknownTyping", false),

 	bHideContainer(SRMM_MODULE, "HideContainers", false),

 	bStayMinimized(SRMM_MODULE, "StayMinimized", false),

diff --git a/plugins/Scriver/src/stdafx.h b/plugins/Scriver/src/stdafx.h
index 15de6bab32..731e44ad23 100644
--- a/plugins/Scriver/src/stdafx.h
+++ b/plugins/Scriver/src/stdafx.h
@@ -76,7 +76,7 @@ struct CMPlugin : public PLUGIN<CMPlugin>
 	CMOption<uint8_t> bUseTransparency, bTopmost, bAutoClose, bTypingNew, bTypingUnknown;

 	CMOption<uint8_t> bShowTitleBar, bShowStatusBar, bShowToolBar, bShowInfoBar;

 	CMOption<uint8_t> bShowAvatar, bShowProgress, bShowIcons, bShowTime, bShowSeconds, bShowDate, bLongDate, bRelativeDate;

-	CMOption<uint8_t>	bGroupMessages, bMarkFollowups, bMsgOnNewline, bDrawLines, bHideNames, bIndentText, bSendFormat;

+	CMOption<uint8_t>	bGroupMessages, bMarkFollowups, bMsgOnNewline, bDrawLines, bHideNames, bIndentText;

 	CMOption<uint8_t> bUseTabs, bLimitTabs, bLimitChatTabs, bLimitNames, bSeparateChats, bTabCloseButton, bHideOneTab, bTabsAtBottom, bSwitchToActive;

 	CMOption<uint8_t> bShowTyping, bShowTypingWin, bShowTypingTray, bShowTypingClist, bShowTypingSwitch;

 	CMOption<uint8_t> iFlashCount, iHistoryMode;