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

4 files changed, 22 insertions, 32 deletions

diff --git a/plugins/Clist_modern/src/modern_clc.h b/plugins/Clist_modern/src/modern_clc.h
index b40cb9c8f3..967d6b17aa 100644
--- a/plugins/Clist_modern/src/modern_clc.h
+++ b/plugins/Clist_modern/src/modern_clc.h
@@ -68,31 +68,28 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 void clcSetDelayTimer(UINT_PTR uIDEvent, HWND hwnd, int nDelay = -1);

 

-#define FONTID_CONTACTS    0

-#define FONTID_INVIS       1

-#define FONTID_OFFLINE     2

-#define FONTID_NOTONLIST   3

-#define FONTID_OPENGROUPS      4

-#define FONTID_OPENGROUPCOUNTS 5

-#define FONTID_DIVIDERS    6

-#define FONTID_OFFINVIS    7

-#define FONTID_SECONDLINE  8

-#define FONTID_THIRDLINE   9

-#define FONTID_AWAY			10

-#define FONTID_DND			11

-#define FONTID_NA			12

-#define FONTID_OCCUPIED		13

-#define FONTID_CHAT			14

-#define FONTID_INVISIBLE	15

-#define FONTID_PHONE		16

-#define FONTID_LUNCH		17

-#define FONTID_CONTACT_TIME	18

-#define FONTID_CLOSEDGROUPS 19

-#define FONTID_CLOSEDGROUPCOUNTS 20

+#define FONTID_CONTACTS             0

+#define FONTID_INVIS                1

+#define FONTID_OFFLINE              2

+#define FONTID_NOTONLIST            3

+#define FONTID_OPENGROUPS           4

+#define FONTID_OPENGROUPCOUNTS      5

+#define FONTID_DIVIDERS             6

+#define FONTID_OFFINVIS             7

+#define FONTID_SECONDLINE           8

+#define FONTID_THIRDLINE            9

+#define FONTID_AWAY                10

+#define FONTID_DND                 11

+#define FONTID_NA                  12

+#define FONTID_OCCUPIED            13

+#define FONTID_INVISIBLE           15

+#define FONTID_CONTACT_TIME        18

+#define FONTID_CLOSEDGROUPS        19

+#define FONTID_CLOSEDGROUPCOUNTS   20

 #define FONTID_STATUSBAR_PROTONAME 21

-#define FONTID_EVENTAREA	22

-#define FONTID_VIEMODES		23

-#define FONTID_MODERN_MAX 23

+#define FONTID_EVENTAREA           22

+#define FONTID_VIEMODES            23

+#define FONTID_MODERN_MAX          23

 

 #define DROPTARGET_ONMETACONTACT  6

 #define DROPTARGET_ONSUBCONTACT  7

diff --git a/plugins/Clist_modern/src/modern_clcmsgs.cpp b/plugins/Clist_modern/src/modern_clcmsgs.cpp
index 3f6da485a2..79aaedf31f 100644
--- a/plugins/Clist_modern/src/modern_clcmsgs.cpp
+++ b/plugins/Clist_modern/src/modern_clcmsgs.cpp
@@ -87,10 +87,7 @@ LRESULT cli_ProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wP
 			dat->fontModernInfo[FONTID_DND].colour = lParam;

 			dat->fontModernInfo[FONTID_NA].colour = lParam;

 			dat->fontModernInfo[FONTID_OCCUPIED].colour = lParam;

-			dat->fontModernInfo[FONTID_CHAT].colour = lParam;

 			dat->fontModernInfo[FONTID_INVISIBLE].colour = lParam;

-			dat->fontModernInfo[FONTID_PHONE].colour = lParam;

-			dat->fontModernInfo[FONTID_LUNCH].colour = lParam;

 			dat->fontModernInfo[FONTID_CONTACT_TIME].colour = lParam;

 			break;

 		case FONTID_OPENGROUPS:

diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp
index 07bb701d71..790ae94055 100644
--- a/plugins/Clist_modern/src/modern_clcopts.cpp
+++ b/plugins/Clist_modern/src/modern_clcopts.cpp
@@ -74,10 +74,7 @@ static fontOptionsList[] =
 	{ FIDF_CLASSGENERAL, FONTID_DND, CLCGROUP, LPGENW("Do not disturb contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },

 	{ FIDF_CLASSGENERAL, FONTID_NA, CLCGROUP, LPGENW("Not available contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },

 	{ FIDF_CLASSGENERAL, FONTID_OCCUPIED, CLCGROUP, LPGENW("Occupied contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },

-	{ FIDF_CLASSGENERAL, FONTID_CHAT, CLCGROUP, LPGENW("Free for chat contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },

 	{ FIDF_CLASSGENERAL, FONTID_INVISIBLE, CLCGROUP, LPGENW("Invisible contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },

-	{ FIDF_CLASSGENERAL, FONTID_PHONE, CLCGROUP, LPGENW("On the phone contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },

-	{ FIDF_CLASSGENERAL, FONTID_LUNCH, CLCGROUP, LPGENW("Out to lunch contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },

 	{ FIDF_CLASSGENERAL, FONTID_OFFLINE, CLCGROUP, LPGENW("Offline contacts"), DEFAULT_GREYCOLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },

 	{ FIDF_CLASSGENERAL, FONTID_INVIS, CLCGROUP, LPGENW("Online contacts to whom you have a different visibility"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },

 	{ FIDF_CLASSGENERAL, FONTID_OFFINVIS, CLCGROUP, LPGENW("Offline contacts to whom you have a different visibility"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },

diff --git a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
index 8adc019b4e..f9e3497a45 100644
--- a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
+++ b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
@@ -324,8 +324,7 @@ BOOL RowHeights_Alloc(ClcData *dat, int size)
 

 static int contact_fonts[] = {

 	FONTID_CONTACTS, FONTID_INVIS, FONTID_OFFLINE, FONTID_NOTONLIST, FONTID_OFFINVIS,

-	FONTID_AWAY, FONTID_DND, FONTID_NA, FONTID_OCCUPIED, FONTID_CHAT, FONTID_INVISIBLE,

-	FONTID_PHONE, FONTID_LUNCH };

+	FONTID_AWAY, FONTID_DND, FONTID_NA, FONTID_OCCUPIED, FONTID_INVISIBLE };

 

 static int other_fonts[] = { FONTID_OPENGROUPS, FONTID_OPENGROUPCOUNTS, FONTID_CLOSEDGROUPS, FONTID_CLOSEDGROUPCOUNTS, FONTID_DIVIDERS, FONTID_CONTACT_TIME };