From ae8e9d41f8b5cfb121d39143c31a8e19c0a4b9c1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 9 Jun 2018 14:12:20 +0300 Subject: SmileyAdd: obsolete option "Enable smileys" removed, because now we can control toolbar buttons for all plugins from the Options - Message sessions - toolbar --- plugins/SmileyAdd/res/resource.rc | 9 +++------ plugins/SmileyAdd/src/dlgboxsubclass.cpp | 6 ++---- plugins/SmileyAdd/src/options.cpp | 11 ----------- plugins/SmileyAdd/src/options.h | 1 - plugins/SmileyAdd/src/resource.h | 1 - 5 files changed, 5 insertions(+), 23 deletions(-) (limited to 'plugins') diff --git a/plugins/SmileyAdd/res/resource.rc b/plugins/SmileyAdd/res/resource.rc index 4d0e2c94c6..b17c9ec673 100644 --- a/plugins/SmileyAdd/res/resource.rc +++ b/plugins/SmileyAdd/res/resource.rc @@ -63,12 +63,9 @@ BEGIN LTEXT "Minimum smiley height",IDC_STATIC,198,148,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,145,36 - CONTROL "Enable smileys",IDC_INPUTSMILEYS,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,15,226,130,8 - CONTROL "Don't replace at cursor",IDC_DCURSORSMILEY,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,15,237,130,8 - GROUPBOX "Built-in message dialog support",IDC_STATIC,155,213,162,36 - LTEXT "Smiley button",IDC_STATIC,161,226,72,8 - COMBOBOX IDC_SMLBUT,249,226,60,35,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Input area",IDC_STATIC,6,213,310,36 + CONTROL "Enable smileys",IDC_INPUTSMILEYS,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,15,226,291,8 + CONTROL "Don't replace at cursor",IDC_DCURSORSMILEY,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,15,237,291,8 CONTROL "Surround inserted smiley with spaces",IDC_APPENDSPACES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,170,220,11 CONTROL "Use first smiley for selection size",IDC_SCALEALLSMILEYS, diff --git a/plugins/SmileyAdd/src/dlgboxsubclass.cpp b/plugins/SmileyAdd/src/dlgboxsubclass.cpp index e24678d6ad..f8adf3d796 100644 --- a/plugins/SmileyAdd/src/dlgboxsubclass.cpp +++ b/plugins/SmileyAdd/src/dlgboxsubclass.cpp @@ -27,16 +27,14 @@ struct MsgWndData : public MZeroedObject { HWND hwnd, hwndLog, hwndInput; int idxLastChar; - bool doSmileyReplace, doSmileyButton; + bool doSmileyReplace; MCONTACT hContact; char ProtocolName[52]; void CreateSmileyButton(void) { - doSmileyButton = opt.ButtonStatus != 0; - SmileyPackType *SmileyPack = GetSmileyPack(ProtocolName, hContact); - doSmileyButton &= SmileyPack != nullptr && SmileyPack->VisibleSmileyCount() != 0; + bool doSmileyButton = SmileyPack != nullptr && SmileyPack->VisibleSmileyCount() != 0; doSmileyReplace = true; diff --git a/plugins/SmileyAdd/src/options.cpp b/plugins/SmileyAdd/src/options.cpp index 60d5cf8b92..7c1e1ebe69 100644 --- a/plugins/SmileyAdd/src/options.cpp +++ b/plugins/SmileyAdd/src/options.cpp @@ -132,10 +132,6 @@ BOOL OptionsDialogType::DialogProcedure(UINT msg, WPARAM wParam, LPARAM lParam) if (HIWORD(wParam) == BN_CLICKED) SetChanged(); break; - case IDC_SMLBUT: - if (HIWORD(wParam) == CBN_SELCHANGE) - SetChanged(); - break; case IDC_MAXCUSTSMSZ: case IDC_MINSMSZ: @@ -357,10 +353,6 @@ void OptionsDialogType::InitDialog(void) CheckDlgButton(m_hwndDialog, IDC_HQSCALING, opt.HQScaling ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(m_hwndDialog, IDC_SORTING_HORIZONTAL, opt.HorizontalSorting ? BST_CHECKED : BST_UNCHECKED); - SendDlgItemMessage(m_hwndDialog, IDC_SMLBUT, CB_ADDSTRING, 0, (LPARAM)TranslateT("Hide")); - 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_USEPHYSPROTO), !opt.UseOneForAll); SendDlgItemMessage(m_hwndDialog, IDC_MAXCUSTSPIN, UDM_SETRANGE32, 0, 99); @@ -425,7 +417,6 @@ void OptionsDialogType::ApplyChanges(void) opt.HQScaling = IsDlgButtonChecked(m_hwndDialog, IDC_HQSCALING) == BST_CHECKED; opt.HorizontalSorting = IsDlgButtonChecked(m_hwndDialog, IDC_SORTING_HORIZONTAL) == BST_CHECKED; - opt.ButtonStatus = (unsigned)SendDlgItemMessage(m_hwndDialog, IDC_SMLBUT, CB_GETCURSEL, 0, 0); opt.MaxCustomSmileySize = GetDlgItemInt(m_hwndDialog, IDC_MAXCUSTSMSZ, nullptr, FALSE); opt.MinSmileySize = GetDlgItemInt(m_hwndDialog, IDC_MINSMSZ, nullptr, FALSE); @@ -545,7 +536,6 @@ void OptionsType::Save(void) db_set_b(NULL, MODULENAME, "DCursorSmiley", DCursorSmiley); db_set_b(NULL, MODULENAME, "DisableCustom", DisableCustom); db_set_b(NULL, MODULENAME, "HQScaling", HQScaling); - db_set_b(NULL, MODULENAME, "ButtonStatus", (BYTE)ButtonStatus); db_set_dw(NULL, MODULENAME, "MaxCustomSmileySize", MaxCustomSmileySize); db_set_dw(NULL, MODULENAME, "MinSmileySize", MinSmileySize); db_set_b(NULL, MODULENAME, "HorizontalSorting", HorizontalSorting); @@ -567,7 +557,6 @@ void OptionsType::Load(void) DisableCustom = db_get_b(NULL, MODULENAME, "DisableCustom", FALSE) != 0; HQScaling = db_get_b(NULL, MODULENAME, "HQScaling", FALSE) != 0; - ButtonStatus = db_get_b(NULL, MODULENAME, "ButtonStatus", 1); SelWndBkgClr = db_get_dw(NULL, MODULENAME, "SelWndBkgClr", GetSysColor(COLOR_WINDOW)); MaxCustomSmileySize = db_get_dw(NULL, MODULENAME, "MaxCustomSmileySize", 0); MinSmileySize = db_get_dw(NULL, MODULENAME, "MinSmileySize", 0); diff --git a/plugins/SmileyAdd/src/options.h b/plugins/SmileyAdd/src/options.h index 7ffa3f0b94..73d1769186 100644 --- a/plugins/SmileyAdd/src/options.h +++ b/plugins/SmileyAdd/src/options.h @@ -40,7 +40,6 @@ public: bool DisableCustom; bool HQScaling; bool HorizontalSorting; - unsigned ButtonStatus; unsigned SelWndBkgClr; unsigned MaxCustomSmileySize; unsigned MinSmileySize; diff --git a/plugins/SmileyAdd/src/resource.h b/plugins/SmileyAdd/src/resource.h index 533c9326ee..85958c8f8b 100644 --- a/plugins/SmileyAdd/src/resource.h +++ b/plugins/SmileyAdd/src/resource.h @@ -26,7 +26,6 @@ #define IDC_NEWCATEGORY 1058 #define IDC_ADDCATEGORY 1059 #define IDC_DELETECATEGORY 1060 -#define IDC_SMLBUT 1061 #define IDC_MAXCUSTSMSZ 1062 #define IDC_MAXCUSTSPIN 1063 #define IDC_MINSMSZ 1064 -- cgit v1.2.3