From 001832de6c20442ae98cdf2ab52a61556e9b0085 Mon Sep 17 00:00:00 2001 From: Sergey Bolhovskoy Date: Fri, 24 Apr 2015 06:47:35 +0000 Subject: =?UTF-8?q?SmileyAdd:=20change=20=E2=80=98Use=20per=20protocol=20g?= =?UTF-8?q?lobal=20smiley=20packs=E2=80=99=20option=20logic=20Copyright=20?= =?UTF-8?q?update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.miranda-ng.org/main/trunk@13062 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SmileyAdd/src/options.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'plugins/SmileyAdd/src/options.cpp') diff --git a/plugins/SmileyAdd/src/options.cpp b/plugins/SmileyAdd/src/options.cpp index f0c971cac2..5fb0abf771 100644 --- a/plugins/SmileyAdd/src/options.cpp +++ b/plugins/SmileyAdd/src/options.cpp @@ -1,5 +1,6 @@ /* -Miranda SmileyAdd Plugin +Miranda NG SmileyAdd Plugin +Copyright (C) 2012 - 2015 Miranda NG project (http://miranda-ng.org) Copyright (C) 2005 - 2011 Boris Krasnovskiy All Rights Reserved Copyright (C) 2003 - 2004 Rein-Peter de Boer @@ -131,6 +132,11 @@ BOOL OptionsDialogType::DialogProcedure(UINT msg, WPARAM wParam, LPARAM lParam) break; case IDC_USESTDPACK: + if (HIWORD(wParam) == BN_CLICKED) { + BOOL en = IsDlgButtonChecked(m_hwndDialog, IDC_USESTDPACK) == BST_CHECKED; + EnableWindow(GetDlgItem(m_hwndDialog, IDC_USEPHYSPROTO), en); + } // no break! + case IDC_USEPHYSPROTO: if (HIWORD(wParam) == BN_CLICKED) { PopulateSmPackList(); SetChanged(); @@ -159,7 +165,6 @@ BOOL OptionsDialogType::DialogProcedure(UINT msg, WPARAM wParam, LPARAM lParam) break; case IDC_SPACES: - case IDC_USEPHYSPROTO: case IDC_SCALETOTEXTHEIGHT: case IDC_APPENDSPACES: case IDC_SMLBUT: @@ -316,6 +321,7 @@ long OptionsDialogType::GetSelProto(HTREEITEM hItem) void OptionsDialogType::PopulateSmPackList(void) { bool useOne = IsDlgButtonChecked(m_hwndDialog, IDC_USESTDPACK) == BST_UNCHECKED; + bool usePhysProto = IsDlgButtonChecked(m_hwndDialog, IDC_USEPHYSPROTO) == BST_CHECKED; HWND hLstView = GetDlgItem(m_hwndDialog, IDC_CATEGORYLIST); @@ -329,8 +335,10 @@ void OptionsDialogType::PopulateSmPackList(void) tvi.item.stateMask = TVIS_STATEIMAGEMASK | TVIS_SELECTED; SmileyCategoryListType::SmileyCategoryVectorType& smc = *tmpsmcat.GetSmileyCategoryList(); - for (int i=0; i < smc.getCount(); i++) { - if (!useOne || !smc[i].IsProto()) { + for (int i=0; i < smc.getCount(); i++) { + bool visiblecat = usePhysProto ? !smc[i].IsAcc() : !smc[i].IsPhysProto(); + bool visible = useOne ? !smc[i].IsProto() : visiblecat; + if (visible) { tvi.item.pszText = (TCHAR*)smc[i].GetDisplayName().c_str(); if (!smc[i].IsProto()) { tvi.item.iImage = 0; @@ -377,6 +385,7 @@ void OptionsDialogType::InitDialog(void) 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); SendDlgItemMessage(m_hwndDialog, IDC_MAXCUSTSPIN, UDM_SETPOS, 0, opt.MaxCustomSmileySize); -- cgit v1.2.3