From 92dee4809d57f97421578a4421e7d9745c369f9a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 14 Aug 2020 17:50:10 +0300 Subject: fixes #2526 (SmileyAdd: remove "Disable stickers" option) --- plugins/SmileyAdd/res/resource.rc | 7 +++---- plugins/SmileyAdd/src/options.cpp | 4 ---- plugins/SmileyAdd/src/options.h | 1 - plugins/SmileyAdd/src/resource.h | 2 -- plugins/SmileyAdd/src/services.cpp | 4 +--- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/plugins/SmileyAdd/res/resource.rc b/plugins/SmileyAdd/res/resource.rc index 741c458182..b8c9bc9fa7 100644 --- a/plugins/SmileyAdd/res/resource.rc +++ b/plugins/SmileyAdd/res/resource.rc @@ -52,15 +52,14 @@ BEGIN "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,16,115,198,12,WS_EX_RTLREADING CONTROL "Scale smiley to text height",IDC_SCALETOTEXTHEIGHT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,127,147,10 - CONTROL "Disable stickers",IDC_DISABLECUSTOM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,137,147,10 - CONTROL "High quality smiley scaling",IDC_HQSCALING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,148,148,10 + CONTROL "High quality smiley scaling",IDC_HQSCALING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,137,148,10 CONTROL "Animate",IDC_ANIMATEDLG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,218,116,91,10 EDITTEXT IDC_MAXCUSTSMSZ,165,128,30,14,ES_RIGHT | ES_NUMBER CONTROL "",IDC_MAXCUSTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,182,129,11,12 - LTEXT "Maximum sticker height",IDC_STATIC,198,132,115,8 + LTEXT "Maximum sticker height",IDC_STATIC,198,131,115,8 EDITTEXT IDC_MINSMSZ,165,144,30,14,ES_RIGHT | ES_NUMBER CONTROL "",IDC_MINSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,182,145,11,12 - LTEXT "Minimum smiley height",IDC_STATIC,198,148,115,8 + LTEXT "Minimum smiley height",IDC_STATIC,198,147,115,8 GROUPBOX "Smiley selector",IDC_STATIC,6,160,310,52 CONTROL "Animate",IDC_ANIMATESEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,218,200,85,10 GROUPBOX "Input area",IDC_STATIC,6,213,310,36 diff --git a/plugins/SmileyAdd/src/options.cpp b/plugins/SmileyAdd/src/options.cpp index f8c6183803..20ec3f99be 100644 --- a/plugins/SmileyAdd/src/options.cpp +++ b/plugins/SmileyAdd/src/options.cpp @@ -37,7 +37,6 @@ void OptionsType::Save(void) g_plugin.setByte("AnimateDlg", AnimateDlg); g_plugin.setByte("InputSmileys", InputSmileys); g_plugin.setByte("DCursorSmiley", DCursorSmiley); - g_plugin.setByte("DisableCustom", DisableCustom); g_plugin.setByte("HQScaling", HQScaling); g_plugin.setDword("MaxCustomSmileySize", MaxCustomSmileySize); g_plugin.setDword("MinSmileySize", MinSmileySize); @@ -57,7 +56,6 @@ void OptionsType::Load(void) AnimateDlg = g_plugin.getByte("AnimateDlg", TRUE) != 0; InputSmileys = g_plugin.getByte("InputSmileys", TRUE) != 0; DCursorSmiley = g_plugin.getByte("DCursorSmiley", FALSE) != 0; - DisableCustom = g_plugin.getByte("DisableCustom", FALSE) != 0; HQScaling = g_plugin.getByte("HQScaling", FALSE) != 0; SelWndBkgClr = g_plugin.getDword("SelWndBkgClr", GetSysColor(COLOR_WINDOW)); @@ -318,7 +316,6 @@ public: CheckDlgButton(m_hwnd, IDC_ANIMATEDLG, opt.AnimateDlg ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(m_hwnd, IDC_INPUTSMILEYS, opt.InputSmileys ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(m_hwnd, IDC_DCURSORSMILEY, opt.DCursorSmiley ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(m_hwnd, IDC_DISABLECUSTOM, opt.DisableCustom ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(m_hwnd, IDC_HQSCALING, opt.HQScaling ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(m_hwnd, IDC_SORTING_HORIZONTAL, opt.HorizontalSorting ? BST_CHECKED : BST_UNCHECKED); @@ -382,7 +379,6 @@ public: opt.AnimateDlg = IsDlgButtonChecked(m_hwnd, IDC_ANIMATEDLG) == BST_CHECKED; opt.InputSmileys = IsDlgButtonChecked(m_hwnd, IDC_INPUTSMILEYS) == BST_CHECKED; opt.DCursorSmiley = IsDlgButtonChecked(m_hwnd, IDC_DCURSORSMILEY) == BST_CHECKED; - opt.DisableCustom = IsDlgButtonChecked(m_hwnd, IDC_DISABLECUSTOM) == BST_CHECKED; opt.HQScaling = IsDlgButtonChecked(m_hwnd, IDC_HQSCALING) == BST_CHECKED; opt.HorizontalSorting = IsDlgButtonChecked(m_hwnd, IDC_SORTING_HORIZONTAL) == BST_CHECKED; diff --git a/plugins/SmileyAdd/src/options.h b/plugins/SmileyAdd/src/options.h index 25704cf7b1..a080d317c6 100644 --- a/plugins/SmileyAdd/src/options.h +++ b/plugins/SmileyAdd/src/options.h @@ -37,7 +37,6 @@ public: bool AnimateDlg; bool InputSmileys; bool DCursorSmiley; - bool DisableCustom; bool HQScaling; bool HorizontalSorting; unsigned SelWndBkgClr; diff --git a/plugins/SmileyAdd/src/resource.h b/plugins/SmileyAdd/src/resource.h index 85958c8f8b..f3b1188d87 100644 --- a/plugins/SmileyAdd/src/resource.h +++ b/plugins/SmileyAdd/src/resource.h @@ -20,8 +20,6 @@ #define IDC_USESTDPACK 1049 #define IDC_USEPHYSPROTO 1050 #define IDC_ANIMATEDLG 1051 -#define IDC_DISABLECUSTOM 1052 -#define IDC_DISABLECUSTOM2 1053 #define IDC_HQSCALING 1053 #define IDC_NEWCATEGORY 1058 #define IDC_ADDCATEGORY 1059 diff --git a/plugins/SmileyAdd/src/services.cpp b/plugins/SmileyAdd/src/services.cpp index 8437604db8..bf3cbf472a 100644 --- a/plugins/SmileyAdd/src/services.cpp +++ b/plugins/SmileyAdd/src/services.cpp @@ -28,7 +28,7 @@ SmileyPackType* GetSmileyPack(const char *proto, MCONTACT hContact, SmileyPackCT { hContact = DecodeMetaContact(hContact); if (smlc) - *smlc = opt.DisableCustom ? nullptr : g_SmileyPackCStore.GetSmileyPack(hContact); + *smlc = g_SmileyPackCStore.GetSmileyPack(hContact); if (proto != nullptr && IsBadStringPtrA(proto, 10)) return nullptr; @@ -357,8 +357,6 @@ INT_PTR ReloadPack(WPARAM, LPARAM lParam) INT_PTR LoadContactSmileys(WPARAM, LPARAM lParam) { - if (opt.DisableCustom) return 0; - SMADD_CONT *cont = (SMADD_CONT*)lParam; switch (cont->type) { -- cgit v1.2.3