IgnoreState: moved to m_gui

2 files changed, 70 insertions, 73 deletions

diff --git a/plugins/IgnoreState/src/options.cpp b/plugins/IgnoreState/src/options.cpp
index 3dc51d64a8..d662672517 100644
--- a/plugins/IgnoreState/src/options.cpp
+++ b/plugins/IgnoreState/src/options.cpp
@@ -20,85 +20,66 @@
 

 #include "stdafx.h"

 

-#define MS_SKINENG_DRAWICONEXFIX "SkinEngine/DrawIconEx_Fix"

-

-static bool bInitializing;

-

-INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+COptDialog::COptDialog() :

+	CDlgBase(g_plugin, IDD_IGNORE_OPT),

+	m_tvFilter(this, IDC_FILTER),

+	m_chkIgnoreAll(this, IDC_IGNORE_IGNOREALL)

 {

-	HWND hTree = GetDlgItem(hwndDlg, IDC_FILTER);

-

-	switch (msg) {

-	case WM_INITDIALOG:

-		TranslateDialogDefault(hwndDlg);

-		bInitializing = true;

-		fill_filter();

-

-		SetWindowLongPtr(hTree, GWL_STYLE, GetWindowLongPtr(hTree, GWL_STYLE) | TVS_NOHSCROLL);

-		{

-			HIMAGELIST himlButtonIcons = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 2, 2);

-			TreeView_SetImageList(hTree, himlButtonIcons, TVSIL_NORMAL);

-			TreeView_DeleteAllItems(hTree);

+	m_chkIgnoreAll.OnChange = Callback(this, &COptDialog::OnIgnoreAllChange);

+}

 

-			for (int i = 2; i < nII; i++) { // we don`t need it IGNORE_ALL and IGNORE_MESSAGE

-				TVINSERTSTRUCT tvis = {};

-				int index = ImageList_AddIcon(himlButtonIcons, Skin_LoadIcon(ii[i].icon));

-				tvis.hParent = nullptr;

-				tvis.hInsertAfter = TVI_LAST;

-				tvis.item.mask = TVIF_PARAM | TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_STATE;

-				tvis.item.lParam = ii[i].type;

-				tvis.item.pszText = TranslateW(ii[i].name);

-				tvis.item.iImage = tvis.item.iSelectedImage = index;

-				HTREEITEM hti = TreeView_InsertItem(hTree, &tvis);

-				TreeView_SetCheckState(hTree, hti, checkState(ii[i].type));

-			}

+bool COptDialog::OnInitDialog()

+{

+	fill_filter();

+	SetWindowLongPtr(m_tvFilter.GetHwnd(), GWL_STYLE, GetWindowLongPtr(m_tvFilter.GetHwnd(), GWL_STYLE) | TVS_NOHSCROLL);

+	{

+		HIMAGELIST himlButtonIcons = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 2, 2);

+		m_tvFilter.SetImageList(himlButtonIcons, TVSIL_NORMAL);

+		m_tvFilter.DeleteAllItems();

+

+		for (int i = 2; i < nII; i++) { // we don`t need it IGNORE_ALL and IGNORE_MESSAGE

+			TVINSERTSTRUCT tvis = {};

+			int index = ImageList_AddIcon(himlButtonIcons, Skin_LoadIcon(ii[i].icon));

+			tvis.hParent = nullptr;

+			tvis.hInsertAfter = TVI_LAST;

+			tvis.item.mask = TVIF_PARAM | TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_STATE;

+			tvis.item.lParam = ii[i].type;

+			tvis.item.pszText = TranslateW(ii[i].name);

+			tvis.item.iImage = tvis.item.iSelectedImage = index;

+			HTREEITEM hti = m_tvFilter.InsertItem(&tvis);

+			m_tvFilter.SetCheckState(hti, checkState(ii[i].type));

 		}

+	}

 

-		CheckDlgButton(hwndDlg, IDC_IGNORE_IGNOREALL, bUseMirandaSettings ? BST_CHECKED : BST_UNCHECKED);

-		EnableWindow(GetDlgItem(hwndDlg, IDC_FILTER), !bUseMirandaSettings);

+	m_chkIgnoreAll.SetState(bUseMirandaSettings);

+	m_tvFilter.Enable(!bUseMirandaSettings);

 

-		bInitializing = false;

-		return TRUE;

+	return true;

+}

 

-	case WM_COMMAND:

-		switch (LOWORD(wParam)) {

-		case IDC_IGNORE_IGNOREALL:

-			EnableWindow(GetDlgItem(hwndDlg, IDC_FILTER), BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_IGNORE_IGNOREALL));

-			SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

-			break;

-		}

-		break;

+void COptDialog::OnIgnoreAllChange(CCtrlBase*)

+{

+	m_tvFilter.Enable(!m_chkIgnoreAll.GetState());

+}

 

-	case WM_NOTIFY:

-		switch (((LPNMHDR)lParam)->idFrom) {

-		case 0:

-			switch (((LPNMHDR)lParam)->code) {

-			case PSN_APPLY:

-			{

-				DWORD flags = 0;

-				TVITEM tvi;

-				tvi.mask = TVIF_HANDLE | TBIF_LPARAM;

-				tvi.hItem = TreeView_GetRoot(hTree); //check ignore all

-				while (tvi.hItem) {

-					TreeView_GetItem(hTree, &tvi);

-					if (TreeView_GetCheckState(hTree, tvi.hItem)) flags |= 1 << (tvi.lParam - 1);

-					tvi.hItem = TreeView_GetNextSibling(hTree, tvi.hItem);

-				}

-				g_plugin.setDword("Filter", flags);

+bool COptDialog::OnApply()

+{

+	DWORD flags = 0;

+	TVITEMEX tvi;

+	tvi.mask = TVIF_HANDLE | TBIF_LPARAM;

+	tvi.hItem = m_tvFilter.GetRoot(); //check ignore all

+	while (tvi.hItem) {

+		m_tvFilter.GetItem(&tvi);

+		if (m_tvFilter.GetCheckState(tvi.hItem)) flags |= 1 << (tvi.lParam - 1);

+		tvi.hItem = m_tvFilter.GetNextSibling(tvi.hItem);

+	}

+	g_plugin.setDword("Filter", flags);

 

-				bUseMirandaSettings = IsDlgButtonChecked(hwndDlg, IDC_IGNORE_IGNOREALL) ? 1 : 0;

-				g_plugin.setByte("UseMirandaSettings", bUseMirandaSettings);

+	bUseMirandaSettings = m_chkIgnoreAll.GetState();

+	g_plugin.setByte("UseMirandaSettings", bUseMirandaSettings);

 

-				fill_filter();

-			}

-			}

-		case IDC_FILTER:

-			if (((LPNMHDR)lParam)->code == NM_CLICK)

-				SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

-			break;

-		}

-	}

-	return FALSE;

+	fill_filter();

+	return true;

 }

 

 int onOptInitialise(WPARAM wParam, LPARAM)

@@ -106,9 +87,8 @@ int onOptInitialise(WPARAM wParam, LPARAM)
 	OPTIONSDIALOGPAGE odp = {};

 	odp.flags = ODPF_BOLDGROUPS;

 	odp.szGroup.a = LPGEN("Icons");

-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_IGNORE_OPT);

 	odp.szTitle.a = LPGEN("Ignore State");

-	odp.pfnDlgProc = DlgProcOptions;

+	odp.pDialog = new COptDialog;

 	g_plugin.addOptions(wParam, &odp);

 	return 0;

 }

diff --git a/plugins/IgnoreState/src/stdafx.h b/plugins/IgnoreState/src/stdafx.h
index 9020364783..056dc3a602 100644
--- a/plugins/IgnoreState/src/stdafx.h
+++ b/plugins/IgnoreState/src/stdafx.h
@@ -33,6 +33,7 @@
 #include <m_options.h>

 #include <m_langpack.h>

 #include <m_extraicons.h>

+#include <m_gui.h>

 

 #include "resource.h"

 #include "version.h"

@@ -61,10 +62,26 @@ static byte bUseMirandaSettings;
 

 void applyExtraImage(MCONTACT hContact);

 

-int onOptInitialise(WPARAM wParam, LPARAM lParam);

+int onOptInitialise(WPARAM wParam, LPARAM);

 BOOL checkState(int type);

 VOID fill_filter();

 

 extern HANDLE hExtraIcon;

 

+class COptDialog : public CDlgBase

+{

+private:

+	CCtrlTreeView m_tvFilter;

+	CCtrlCheck m_chkIgnoreAll;

+

+protected:

+	bool OnInitDialog() override;

+	bool OnApply() override;

+

+	void OnIgnoreAllChange(CCtrlBase*);

+

+public:

+	COptDialog();

+};

+

 #endif //COMMHEADERS_H