another common clist option moved to the core

2 files changed, 4 insertions, 90 deletions

diff --git a/plugins/Clist_blind/src/clcopts.cpp b/plugins/Clist_blind/src/clcopts.cpp
index 36a8b33532..522cd62d9b 100644
--- a/plugins/Clist_blind/src/clcopts.cpp
+++ b/plugins/Clist_blind/src/clcopts.cpp
@@ -30,14 +30,13 @@ wchar_t* MyDBGetContactSettingTString(MCONTACT hContact, char* module, char* set
 #define DBFONTF_ITALIC     2

 #define DBFONTF_UNDERLINE  4

 

-struct CheckBoxToStyleEx_t

+struct

 {

 	int id;

 	DWORD flag;

 	int not;

 }

-

-static const checkBoxToStyleEx[] =

+static checkBoxToStyleEx[] =

 {

 	{ IDC_TRACKSELECT, CLS_EX_TRACKSELECT, 0 },

 	{ IDC_SHOWGROUPCOUNTS, CLS_EX_SHOWGROUPCOUNTS, 0 },

@@ -48,66 +47,6 @@ static const checkBoxToStyleEx[] =
 	{ IDC_NOTNOSMOOTHSCROLLING, CLS_EX_NOSMOOTHSCROLLING, 1 }

 };

 

-struct CheckBoxValues_t

-{

-	DWORD  style;

-	wchar_t* szDescr;

-};

-

-static const struct CheckBoxValues_t greyoutValues[] = {

-	{ GREYF_UNFOCUS,  LPGENW("Not focused")   },

-	{ MODEF_OFFLINE,  LPGENW("Offline")       },

-	{ PF2_ONLINE,     LPGENW("Online")        },

-	{ PF2_SHORTAWAY,  LPGENW("Away")          },

-	{ PF2_LONGAWAY,   LPGENW("Not available") },

-	{ PF2_LIGHTDND,   LPGENW("Occupied")      },

-	{ PF2_HEAVYDND,   LPGENW("Do not disturb")},

-	{ PF2_FREECHAT,   LPGENW("Free for chat") },

-	{ PF2_INVISIBLE,  LPGENW("Invisible")     },

-};

-

-static const struct CheckBoxValues_t offlineValues[] = {

-	{ MODEF_OFFLINE,  LPGENW("Offline")       },

-	{ PF2_ONLINE,     LPGENW("Online")        },

-	{ PF2_SHORTAWAY,  LPGENW("Away")          },

-	{ PF2_LONGAWAY,   LPGENW("Not available") },

-	{ PF2_LIGHTDND,   LPGENW("Occupied")      },

-	{ PF2_HEAVYDND,   LPGENW("Do not disturb")},

-	{ PF2_FREECHAT,   LPGENW("Free for chat") },

-	{ PF2_INVISIBLE,  LPGENW("Invisible")     },

-};

-

-static void FillCheckBoxTree(HWND hwndTree, const struct CheckBoxValues_t *values, int nValues, DWORD style)

-{

-	TVINSERTSTRUCT tvis;

-	tvis.hParent = nullptr;

-	tvis.hInsertAfter = TVI_LAST;

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

-	for (int i = 0; i < nValues; i++) {

-		tvis.item.lParam = values[i].style;

-		tvis.item.pszText = TranslateW( values[i].szDescr );

-		tvis.item.stateMask = TVIS_STATEIMAGEMASK;

-		tvis.item.state = INDEXTOSTATEIMAGEMASK((style & tvis.item.lParam) != 0 ? 2 : 1);

-		TreeView_InsertItem( hwndTree, &tvis);

-}	}

-

-static DWORD MakeCheckBoxTreeFlags(HWND hwndTree)

-{

-	DWORD flags = 0;

-	TVITEM tvi;

-

-	tvi.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE;

-	tvi.hItem = TreeView_GetRoot(hwndTree);

-	while (tvi.hItem) {

-		TreeView_GetItem(hwndTree, &tvi);

-		if (((tvi.state & TVIS_STATEIMAGEMASK) >> 12 == 2))

-			flags |= tvi.lParam;

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

-	}

-	return flags;

-}

-

-

 static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	wchar_t tmp[1024];

@@ -115,8 +54,6 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 	switch (msg) {

 	case WM_INITDIALOG:

 		TranslateDialogDefault(hwndDlg);

-		SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_HIDEOFFLINEOPTS), GWL_STYLE,

-			GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_HIDEOFFLINEOPTS), GWL_STYLE) | TVS_NOHSCROLL | TVS_CHECKBOXES);

 		{

 			DWORD exStyle = db_get_dw(0, "CLC", "ExStyle", Clist_GetDefaultExStyle());

 			for (auto &it : checkBoxToStyleEx)

@@ -137,8 +74,6 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 		SendDlgItemMessage(hwndDlg, IDC_GROUPINDENTSPIN, UDM_SETPOS, 0,

 			MAKELONG(db_get_b(0, "CLC", "GroupIndent", CLCDEFAULT_GROUPINDENT), 0));

 		EnableWindow(GetDlgItem(hwndDlg, IDC_SMOOTHTIME), IsDlgButtonChecked(hwndDlg, IDC_NOTNOSMOOTHSCROLLING));

-		FillCheckBoxTree(GetDlgItem(hwndDlg, IDC_HIDEOFFLINEOPTS), offlineValues, _countof(offlineValues),

-			db_get_dw(0, "CLC", "OfflineModes", CLCDEFAULT_OFFLINEMODES));

 

 		SetDlgItemText(hwndDlg, IDC_T_CONTACT, MyDBGetContactSettingTString(NULL, "CLC", "TemplateContact", tmp, 1024, TranslateT("%name% [%status% %protocol%] %status_message%")));

 		SendDlgItemMessage(hwndDlg, IDC_T_CONTACT, EM_LIMITTEXT, 256, 0);

@@ -149,9 +84,7 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 		SetDlgItemText(hwndDlg, IDC_T_INFO, MyDBGetContactSettingTString(NULL, "CLC", "TemplateInfo", tmp, 1024, TranslateT("Info: %s")));

 		SendDlgItemMessage(hwndDlg, IDC_T_INFO, EM_LIMITTEXT, 256, 0);

 		return TRUE;

-	case WM_VSCROLL:

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

-		break;

+

 	case WM_COMMAND:

 		if (LOWORD(wParam) == IDC_NOTNOSMOOTHSCROLLING)

 			EnableWindow(GetDlgItem(hwndDlg, IDC_SMOOTHTIME), IsDlgButtonChecked(hwndDlg, IDC_NOTNOSMOOTHSCROLLING));

@@ -163,26 +96,9 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 			return 0;

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

 		break;

+

 	case WM_NOTIFY:

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

-		case IDC_HIDEOFFLINEOPTS:

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

-				TVHITTESTINFO hti;

-				hti.pt.x = (short)LOWORD(GetMessagePos());

-				hti.pt.y = (short)HIWORD(GetMessagePos());

-				ScreenToClient(((LPNMHDR)lParam)->hwndFrom, &hti.pt);

-				if (TreeView_HitTest(((LPNMHDR)lParam)->hwndFrom, &hti))

-					if (hti.flags & TVHT_ONITEMSTATEICON) {

-						TVITEM tvi;

-						tvi.mask = TVIF_HANDLE | TVIF_IMAGE | TVIF_SELECTEDIMAGE;

-						tvi.hItem = hti.hItem;

-						TreeView_GetItem(((LPNMHDR)lParam)->hwndFrom, &tvi);

-						tvi.iImage = tvi.iSelectedImage = tvi.iImage == 1 ? 2 : 1;

-						TreeView_SetItem(((LPNMHDR)lParam)->hwndFrom, &tvi);

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

-					}

-			}

-			break;

 		case 0:

 			if (((LPNMHDR)lParam)->code == PSN_APPLY) {

 				int i;

@@ -193,7 +109,6 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 

 				db_set_dw(0, "CLC", "ExStyle", exStyle);

 				db_set_b(0, "CLC", "ShowIdle", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_IDLE) ? 1 : 0));

-				db_set_dw(0, "CLC", "OfflineModes", MakeCheckBoxTreeFlags(GetDlgItem(hwndDlg, IDC_HIDEOFFLINEOPTS)));

 				db_set_b(0, "CLC", "LeftMargin",

 					(BYTE)SendDlgItemMessage(hwndDlg, IDC_LEFTMARGINSPIN, UDM_GETPOS, 0, 0));

 				db_set_w(0, "CLC", "ScrollTime",

diff --git a/plugins/Clist_blind/src/resource.h b/plugins/Clist_blind/src/resource.h
index ab9eeb7a16..5d59bb030e 100644
--- a/plugins/Clist_blind/src/resource.h
+++ b/plugins/Clist_blind/src/resource.h
@@ -72,7 +72,6 @@
 #define IDC_SCRIPT                      1300

 #define IDC_TILEV                       1301

 #define IDC_GAMMACORRECT                1302

-#define IDC_HIDEOFFLINEOPTS             1308

 #define IDC_DONTCYCLE                   1315

 #define IDC_PRIMARYSTATUS               1316

 #define IDC_CYCLE                       1317