fixes #1963 (Remove Free for Chat, On the Phone and Out to Lunch statuses completely)

6 files changed, 16 insertions, 32 deletions

diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp
index 9ef0c5d109..92f5503a22 100644
--- a/plugins/Clist_nicer/src/clcopts.cpp
+++ b/plugins/Clist_nicer/src/clcopts.cpp
@@ -67,13 +67,11 @@ struct CheckBoxValues_t {
 

 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") }, { PF2_OUTTOLUNCH, LPGENW("Out to lunch") }, { PF2_ONTHEPHONE, LPGENW("On the phone") }

+	{ PF2_LONGAWAY, LPGENW("Not available") }, { PF2_LIGHTDND, LPGENW("Occupied") }, { PF2_HEAVYDND, LPGENW("Do not disturb") }, { 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") },

-	{ PF2_OUTTOLUNCH, LPGENW("Out to lunch") }, { PF2_ONTHEPHONE, LPGENW("On the phone") }

+	{ PF2_LIGHTDND, LPGENW("Occupied") }, { PF2_HEAVYDND, LPGENW("Do not disturb") }, { PF2_INVISIBLE, LPGENW("Invisible") }

 };

 

 static UINT sortCtrlIDs[] = { IDC_SORTPRIMARY, IDC_SORTTHEN, IDC_SORTFINALLY, 0 };

diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp
index 1bdeca1db5..5274ffa3f3 100644
--- a/plugins/Clist_nicer/src/clcpaint.cpp
+++ b/plugins/Clist_nicer/src/clcpaint.cpp
@@ -490,7 +490,7 @@ set_bg_l:
 		StatusItems_t *sitem, *sfirstitem, *ssingleitem, *slastitem, *slastitem_NG,

 			*sfirstitem_NG, *ssingleitem_NG, *sevencontact_pos, *soddcontact_pos, *pp_item;

 

-		if (cstatus >= ID_STATUS_OFFLINE && cstatus <= ID_STATUS_OUTTOLUNCH) {

+		if (cstatus >= ID_STATUS_OFFLINE && cstatus <= ID_STATUS_MAX) {

 			BYTE perstatus_ignored;

 

 			if ((flags & CONTACTF_IDLE) && !arStatusItems[ID_EXTBKIDLE - ID_STATUS_OFFLINE]->IGNORED)

@@ -1105,7 +1105,7 @@ bgskipped:
 			//	SetTextColor(hdcMem, dat->selTextColour);

 			rcContent.bottom = y + rowHeight;

 

-			if (cstatus >= ID_STATUS_OFFLINE && cstatus <= ID_STATUS_OUTTOLUNCH) {

+			if (cstatus >= ID_STATUS_OFFLINE && cstatus <= ID_STATUS_MAX) {

 				BYTE smsgValid = cEntry->bStatusMsgValid;

 

 				if ((dwFlags & CLUI_FRAME_SHOWSTATUSMSG && smsgValid > STATUSMSG_XSTATUSID) || smsgValid == STATUSMSG_XSTATUSNAME)

diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp
index c524c64a9a..182e2970be 100644
--- a/plugins/Clist_nicer/src/clui.cpp
+++ b/plugins/Clist_nicer/src/clui.cpp
@@ -795,7 +795,7 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 		ConfigureCLUIGeometry(0);
 		CluiProtocolStatusChanged(0, nullptr);
 
-		for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++)
+		for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_MAX; i++)
 			statusNames[i - ID_STATUS_OFFLINE] = Clist_GetStatusModeDescription(i, 0);
 
 		//delay creation of CLC so that it can get the status icons right the first time (needs protocol modules loaded)
diff --git a/plugins/Clist_nicer/src/contact.cpp b/plugins/Clist_nicer/src/contact.cpp
index 3303b45919..9b97456527 100644
--- a/plugins/Clist_nicer/src/contact.cpp
+++ b/plugins/Clist_nicer/src/contact.cpp
@@ -36,10 +36,7 @@ statusModeOrder[] =
 	{ ID_STATUS_DND, 110 },

 	{ ID_STATUS_NA, 450 },

 	{ ID_STATUS_OCCUPIED, 100 },

-	{ ID_STATUS_FREECHAT, 0 },

 	{ ID_STATUS_INVISIBLE, 20 },

-	{ ID_STATUS_ONTHEPHONE, 150 },

-	{ ID_STATUS_OUTTOLUNCH, 425 }

 };

 

 static int GetContactStatus(MCONTACT hContact)

diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp
index 2181f18511..0357fe0d22 100644
--- a/plugins/Clist_nicer/src/extBackg.cpp
+++ b/plugins/Clist_nicer/src/extBackg.cpp
@@ -68,22 +68,10 @@ static StatusItems_t _StatusItems[] = {
 	CLCDEFAULT_GRADIENT,CLCDEFAULT_CORNER,

 	CLCDEFAULT_COLOR, CLCDEFAULT_COLOR2, CLCDEFAULT_COLOR2_TRANSPARENT, CLCDEFAULT_TEXTCOLOR, CLCDEFAULT_ALPHA, CLCDEFAULT_MRGN_LEFT,

 	CLCDEFAULT_MRGN_TOP, CLCDEFAULT_MRGN_RIGHT, CLCDEFAULT_MRGN_BOTTOM, CLCDEFAULT_IGNORE

-	}, {"Free for chat", "EXBK_FFC", ID_STATUS_FREECHAT,

-	CLCDEFAULT_GRADIENT,CLCDEFAULT_CORNER,

-	CLCDEFAULT_COLOR, CLCDEFAULT_COLOR2, CLCDEFAULT_COLOR2_TRANSPARENT, CLCDEFAULT_TEXTCOLOR, CLCDEFAULT_ALPHA, CLCDEFAULT_MRGN_LEFT,

-	CLCDEFAULT_MRGN_TOP, CLCDEFAULT_MRGN_RIGHT, CLCDEFAULT_MRGN_BOTTOM, CLCDEFAULT_IGNORE

 	}, {"Invisible", "EXBK_Invisible", ID_STATUS_INVISIBLE,

 	CLCDEFAULT_GRADIENT,CLCDEFAULT_CORNER,

 	CLCDEFAULT_COLOR, CLCDEFAULT_COLOR2, CLCDEFAULT_COLOR2_TRANSPARENT, CLCDEFAULT_TEXTCOLOR, CLCDEFAULT_ALPHA, CLCDEFAULT_MRGN_LEFT,

 	CLCDEFAULT_MRGN_TOP, CLCDEFAULT_MRGN_RIGHT, CLCDEFAULT_MRGN_BOTTOM, CLCDEFAULT_IGNORE

-	}, {"On the phone", "EXBK_OTP", ID_STATUS_ONTHEPHONE,

-	CLCDEFAULT_GRADIENT,CLCDEFAULT_CORNER,

-	CLCDEFAULT_COLOR, CLCDEFAULT_COLOR2, CLCDEFAULT_COLOR2_TRANSPARENT, CLCDEFAULT_TEXTCOLOR, CLCDEFAULT_ALPHA, CLCDEFAULT_MRGN_LEFT,

-	CLCDEFAULT_MRGN_TOP, CLCDEFAULT_MRGN_RIGHT, CLCDEFAULT_MRGN_BOTTOM, CLCDEFAULT_IGNORE

-	}, {"Out to lunch", "EXBK_OTL", ID_STATUS_OUTTOLUNCH,

-	CLCDEFAULT_GRADIENT,CLCDEFAULT_CORNER,

-	CLCDEFAULT_COLOR, CLCDEFAULT_COLOR2, CLCDEFAULT_COLOR2_TRANSPARENT, CLCDEFAULT_TEXTCOLOR, CLCDEFAULT_ALPHA, CLCDEFAULT_MRGN_LEFT,

-	CLCDEFAULT_MRGN_TOP, CLCDEFAULT_MRGN_RIGHT, CLCDEFAULT_MRGN_BOTTOM, CLCDEFAULT_IGNORE

 	}, {"Idle", "EXBK_IDLE", ID_EXTBKIDLE,

 	CLCDEFAULT_GRADIENT,CLCDEFAULT_CORNER,

 	CLCDEFAULT_COLOR, CLCDEFAULT_COLOR2, CLCDEFAULT_COLOR2_TRANSPARENT, CLCDEFAULT_TEXTCOLOR, CLCDEFAULT_ALPHA, CLCDEFAULT_MRGN_LEFT,

diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp
index 055eaa91a2..727897455e 100644
--- a/plugins/Clist_nicer/src/viewmodes.cpp
+++ b/plugins/Clist_nicer/src/viewmodes.cpp
@@ -115,7 +115,7 @@ static void ShowPage(HWND hwnd, int page)
 

 static int UpdateClistItem(MCONTACT hContact, DWORD mask)

 {

-	for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++)

+	for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_MAX; i++)

 		SendDlgItemMessage(sttClvmHwnd, IDC_CLIST, CLM_SETEXTRAIMAGE, hContact, MAKELONG(i - ID_STATUS_OFFLINE,

 		(1 << (i - ID_STATUS_OFFLINE)) & mask ? i - ID_STATUS_OFFLINE : nullImage));

 

@@ -126,7 +126,7 @@ static DWORD GetMaskForItem(HANDLE hItem)
 {

 	DWORD dwMask = 0;

 

-	for (int i = 0; i <= ID_STATUS_OUTTOLUNCH - ID_STATUS_OFFLINE; i++)

+	for (int i = 0; i <= ID_STATUS_MAX - ID_STATUS_OFFLINE; i++)

 		dwMask |= (SendDlgItemMessage(sttClvmHwnd, IDC_CLIST, CLM_GETEXTRAIMAGE, (WPARAM)hItem, i) == nullImage ? 0 : 1 << i);

 

 	return dwMask;

@@ -142,13 +142,14 @@ static void UpdateStickies()
 		UpdateClistItem(hItem, (localMask == 0 || localMask == sttStickyStatusMask) ? sttStickyStatusMask : localMask);

 	}

 

-	for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++)

-		SendDlgItemMessage(sttClvmHwnd, IDC_CLIST, CLM_SETEXTRAIMAGE, (WPARAM)hInfoItem, MAKELONG(i - ID_STATUS_OFFLINE, (1 << (i - ID_STATUS_OFFLINE)) & sttStickyStatusMask ? i - ID_STATUS_OFFLINE : ID_STATUS_OUTTOLUNCH - ID_STATUS_OFFLINE + 1));

+	for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_MAX; i++)

+		SendDlgItemMessage(sttClvmHwnd, IDC_CLIST, CLM_SETEXTRAIMAGE, (WPARAM)hInfoItem, 

+			MAKELONG(i - ID_STATUS_OFFLINE, (1 << (i - ID_STATUS_OFFLINE)) & sttStickyStatusMask ? i - ID_STATUS_OFFLINE : MAX_STATUS_COUNT));

 

 	HANDLE hItem = (HANDLE)SendDlgItemMessage(sttClvmHwnd, IDC_CLIST, CLM_GETNEXTITEM, CLGN_ROOT, 0);

 	hItem = (HANDLE)SendDlgItemMessage(sttClvmHwnd, IDC_CLIST, CLM_GETNEXTITEM, CLGN_NEXTGROUP, (LPARAM)hItem);

 	while (hItem) {

-		for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++)

+		for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_MAX; i++)

 			SendDlgItemMessage(sttClvmHwnd, IDC_CLIST, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELONG(i - ID_STATUS_OFFLINE, nullImage));

 		hItem = (HANDLE)SendDlgItemMessage(sttClvmHwnd, IDC_CLIST, CLM_GETNEXTITEM, CLGN_NEXTGROUP, (LPARAM)hItem);

 	}

@@ -205,7 +206,7 @@ static int FillDialog(HWND hwnd)
 	lvc.fmt = LVCFMT_IMAGE | LVCFMT_LEFT;

 	ListView_InsertColumn(hwndList, 0, &lvc);

 

-	for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++) {

+	for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_MAX; i++) {

 		item.pszText = TranslateW(Clist_GetStatusModeDescription(i, 0));

 		item.iItem = i - ID_STATUS_OFFLINE;

 		ListView_InsertItem(hwndList, &item);

@@ -358,7 +359,7 @@ void SaveState()
 	}

 

 	HWND hwndList = GetDlgItem(sttClvmHwnd, IDC_STATUSMODES);

-	for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++)

+	for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_MAX; i++)

 		if (ListView_GetCheckState(hwndList, i - ID_STATUS_OFFLINE))

 			statusMask |= (1 << (i - ID_STATUS_OFFLINE));

 

@@ -496,7 +497,7 @@ void UpdateFilters()
 

 	{

 		HWND hwndList = GetDlgItem(sttClvmHwnd, IDC_STATUSMODES);

-		for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++) {

+		for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_MAX; i++) {

 			if ((1 << (i - ID_STATUS_OFFLINE)) & statusMask)

 				ListView_SetCheckState(hwndList, i - ID_STATUS_OFFLINE, TRUE)

 			else

@@ -546,7 +547,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			EnableThemeDialogTexture(hwndDlg, ETDT_ENABLETAB);

 

 		himlViewModes = ImageList_Create(16, 16, ILC_MASK | ILC_COLOR32, 12, 0);

-		for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++)

+		for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_MAX; i++)

 			ImageList_AddIcon(himlViewModes, Skin_LoadProtoIcon(nullptr, i));

 		{

 			HICON hIcon = (HICON)LoadImage(g_plugin.getInst(), MAKEINTRESOURCE(IDI_MINIMIZE), IMAGE_ICON, 16, 16, 0);

@@ -573,7 +574,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		Utils::enableDlgControl(hwndDlg, IDC_ADDVIEWMODE, FALSE);

 

 		SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETEXTRAIMAGELIST, 0, (LPARAM)himlViewModes);

-		SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETEXTRACOLUMNS, ID_STATUS_OUTTOLUNCH - ID_STATUS_OFFLINE, 0);

+		SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETEXTRACOLUMNS, ID_STATUS_MAX - ID_STATUS_OFFLINE, 0);

 		{

 			CLCINFOITEM cii = { 0 };

 			cii.cbSize = sizeof(cii);