From 9530e3218193fa0882ccb4d8940be23c509d967b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 8 Jun 2018 18:06:21 +0300 Subject: SmileyAdd: obsolete option "Enable built-in message dialog support" removed --- plugins/SmileyAdd/src/dlgboxsubclass.cpp | 31 ++++++------------------------- plugins/SmileyAdd/src/options.cpp | 13 ------------- plugins/SmileyAdd/src/options.h | 3 +-- plugins/SmileyAdd/src/resource.h | 5 ++--- plugins/SmileyAdd/src/version.h | 4 ++-- 5 files changed, 11 insertions(+), 45 deletions(-) (limited to 'plugins/SmileyAdd/src') diff --git a/plugins/SmileyAdd/src/dlgboxsubclass.cpp b/plugins/SmileyAdd/src/dlgboxsubclass.cpp index 5e6397aef0..e24678d6ad 100644 --- a/plugins/SmileyAdd/src/dlgboxsubclass.cpp +++ b/plugins/SmileyAdd/src/dlgboxsubclass.cpp @@ -50,8 +50,6 @@ struct MsgWndData : public MZeroedObject bbd.pszModuleName = MODULENAME; if (!doSmileyButton) bbd.bbbFlags = BBBF_DISABLED; - else if (!opt.PluginSupportEnabled) - bbd.bbbFlags = BBBF_HIDDEN; Srmm_SetButtonState(hContact, &bbd); } }; @@ -90,31 +88,14 @@ static LRESULT CALLBACK MessageDlgSubclass(HWND hwnd, UINT uMsg, WPARAM wParam, dat->CreateSmileyButton(); LRESULT result = mir_callNextSubclass(hwnd, MessageDlgSubclass, uMsg, wParam, lParam); - if (!opt.PluginSupportEnabled) - return result; - switch (uMsg) { - case WM_DESTROY: - { - mir_cslock lck(csWndList); - int ind = g_MsgWndList.getIndex((MsgWndData*)&hwnd); - if (ind != -1) { - delete g_MsgWndList[ind]; - g_MsgWndList.remove(ind); - } - } - break; - - case DM_REMAKELOG: - if (dat->doSmileyReplace) { - SmileyPackCType *smcp; - SmileyPackType *SmileyPack = GetSmileyPack(dat->ProtocolName, dat->hContact, &smcp); - if (SmileyPack != nullptr) { - static const CHARRANGE sel = { 0, LONG_MAX }; - ReplaceSmileys(dat->hwndLog, SmileyPack, smcp, sel, false, false, false); - } + if (uMsg == WM_DESTROY) { + mir_cslock lck(csWndList); + int ind = g_MsgWndList.getIndex((MsgWndData*)&hwnd); + if (ind != -1) { + delete g_MsgWndList[ind]; + g_MsgWndList.remove(ind); } - break; } return result; diff --git a/plugins/SmileyAdd/src/options.cpp b/plugins/SmileyAdd/src/options.cpp index ce7176f040..60d5cf8b92 100644 --- a/plugins/SmileyAdd/src/options.cpp +++ b/plugins/SmileyAdd/src/options.cpp @@ -104,14 +104,6 @@ BOOL OptionsDialogType::DialogProcedure(UINT msg, WPARAM wParam, LPARAM lParam) } break; - case IDC_PLUGENABLED: - if (HIWORD(wParam) == BN_CLICKED) { - BOOL en = IsDlgButtonChecked(m_hwndDialog, IDC_PLUGENABLED) == BST_CHECKED; - EnableWindow(GetDlgItem(m_hwndDialog, IDC_SMLBUT), en); - SetChanged(); - } - break; - case IDC_ADDCATEGORY: if (HIWORD(wParam) == BN_CLICKED) AddCategory(); @@ -350,7 +342,6 @@ void OptionsDialogType::InitDialog(void) { TranslateDialogDefault(m_hwndDialog); - CheckDlgButton(m_hwndDialog, IDC_PLUGENABLED, opt.PluginSupportEnabled ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(m_hwndDialog, IDC_SPACES, opt.EnforceSpaces ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(m_hwndDialog, IDC_SCALETOTEXTHEIGHT, opt.ScaleToTextheight ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(m_hwndDialog, IDC_USESTDPACK, opt.UseOneForAll ? BST_UNCHECKED : BST_CHECKED); @@ -370,7 +361,6 @@ void OptionsDialogType::InitDialog(void) SendDlgItemMessage(m_hwndDialog, IDC_SMLBUT, CB_ADDSTRING, 0, (LPARAM)TranslateT("Show")); SendDlgItemMessage(m_hwndDialog, IDC_SMLBUT, CB_SETCURSEL, opt.ButtonStatus, 0); - EnableWindow(GetDlgItem(m_hwndDialog, IDC_SMLBUT), opt.PluginSupportEnabled); EnableWindow(GetDlgItem(m_hwndDialog, IDC_USEPHYSPROTO), !opt.UseOneForAll); SendDlgItemMessage(m_hwndDialog, IDC_MAXCUSTSPIN, UDM_SETRANGE32, 0, 99); @@ -420,7 +410,6 @@ void OptionsDialogType::ApplyChanges(void) ProcessAllInputAreas(true); CloseSmileys(); - opt.PluginSupportEnabled = IsDlgButtonChecked(m_hwndDialog, IDC_PLUGENABLED) == BST_CHECKED; opt.EnforceSpaces = IsDlgButtonChecked(m_hwndDialog, IDC_SPACES) == BST_CHECKED; opt.ScaleToTextheight = IsDlgButtonChecked(m_hwndDialog, IDC_SCALETOTEXTHEIGHT) == BST_CHECKED; opt.UseOneForAll = IsDlgButtonChecked(m_hwndDialog, IDC_USESTDPACK) == BST_UNCHECKED; @@ -543,7 +532,6 @@ void OptionsDialogType::ShowSmileyPreview(void) void OptionsType::Save(void) { - db_set_b(NULL, MODULENAME, "PluginSupportEnabled", PluginSupportEnabled); db_set_b(NULL, MODULENAME, "EnforceSpaces", EnforceSpaces); db_set_b(NULL, MODULENAME, "ScaleToTextheight", ScaleToTextheight); db_set_b(NULL, MODULENAME, "UseOneForAll", UseOneForAll); @@ -565,7 +553,6 @@ void OptionsType::Save(void) void OptionsType::Load(void) { - PluginSupportEnabled = db_get_b(NULL, MODULENAME, "PluginSupportEnabled", TRUE) != 0; EnforceSpaces = db_get_b(NULL, MODULENAME, "EnforceSpaces", FALSE) != 0; ScaleToTextheight = db_get_b(NULL, MODULENAME, "ScaleToTextheight", FALSE) != 0; UseOneForAll = db_get_b(NULL, MODULENAME, "UseOneForAll", TRUE) != 0; diff --git a/plugins/SmileyAdd/src/options.h b/plugins/SmileyAdd/src/options.h index 130493177e..7ffa3f0b94 100644 --- a/plugins/SmileyAdd/src/options.h +++ b/plugins/SmileyAdd/src/options.h @@ -26,7 +26,6 @@ int SmileysOptionsInitialize(WPARAM wParam, LPARAM lParam); class OptionsType { public: - bool PluginSupportEnabled; bool EnforceSpaces; bool ScaleToTextheight; bool UseOneForAll; @@ -39,7 +38,7 @@ public: bool InputSmileys; bool DCursorSmiley; bool DisableCustom; - bool HQScaling; + bool HQScaling; bool HorizontalSorting; unsigned ButtonStatus; unsigned SelWndBkgClr; diff --git a/plugins/SmileyAdd/src/resource.h b/plugins/SmileyAdd/src/resource.h index 98bf81d17e..533c9326ee 100644 --- a/plugins/SmileyAdd/src/resource.h +++ b/plugins/SmileyAdd/src/resource.h @@ -1,11 +1,10 @@ //{{NO_DEPENDENCIES}} -// Включаемый файл, созданный в Microsoft Visual C++. -// Используется D:\Others\SVN\MirandaNG\trunk\plugins\SmileyAdd\res\resource.rc +// Microsoft Visual C++ generated include file. +// Used by w:\miranda-ng\plugins\SmileyAdd\res\resource.rc // #define IDI_SMILINGICON 124 #define IDD_OPT_SMILEYS 245 #define IDC_CATEGORYLIST 1017 -#define IDC_PLUGENABLED 1019 #define IDC_INPUTSMILEYS 1020 #define IDC_DCURSORSMILEY 1021 #define IDC_LIBNAME 1023 diff --git a/plugins/SmileyAdd/src/version.h b/plugins/SmileyAdd/src/version.h index 486043ea5f..9c84ae074d 100644 --- a/plugins/SmileyAdd/src/version.h +++ b/plugins/SmileyAdd/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0 #define __MINOR_VERSION 3 -#define __RELEASE_NUM 0 -#define __BUILD_NUM 2 +#define __RELEASE_NUM 1 +#define __BUILD_NUM 0 #include -- cgit v1.2.3