unified project for clist_modern

git-svn-id: http://svn.miranda-ng.org/main/trunk@14473 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

22 files changed, 0 insertions, 3115 deletions

diff --git a/plugins/Clist_modern/src/hdr/modern_awaymsg.h b/plugins/Clist_modern/src/hdr/modern_awaymsg.h
deleted file mode 100644
index d99be87d2e..0000000000
--- a/plugins/Clist_modern/src/hdr/modern_awaymsg.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*

-

-Miranda NG: the free IM client for Microsoft* Windows*

-

-Copyright (с) 2012-15 Miranda NG project (http://miranda-ng.org),

-Copyright (c) 2000-08 Miranda ICQ/IM project,

-all portions of this codebase are copyrighted to the people

-listed in contributors.txt.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-

-*/

-

-/*

-*	Author Artem Shpynov aka FYR

-*   Copyright 2000-2008 Artem Shpynov

-*/

-

-#pragma once

-//////////////////////////////////////////////////////////////////////////

-// Module to Request Away Messages

-

-void InitAwayMsgModule();

-void UninitAwayMsgModule();

-void amRequestAwayMsg(MCONTACT hContact);

diff --git a/plugins/Clist_modern/src/hdr/modern_cache_funcs.h b/plugins/Clist_modern/src/hdr/modern_cache_funcs.h
deleted file mode 100644
index f1b228f215..0000000000
--- a/plugins/Clist_modern/src/hdr/modern_cache_funcs.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*

-

-Miranda NG: the free IM client for Microsoft* Windows*

-

-Copyright (с) 2012-15 Miranda NG project (http://miranda-ng.org),

-Copyright (c) 2000-08 Miranda ICQ/IM project,

-all portions of this codebase are copyrighted to the people

-listed in contributors.txt.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-

-Created by Pescuma

-

-*/

-#pragma once

-

-#ifndef __CACHE_FUNCS_H__

-# define __CACHE_FUNCS_H__

-

-#include "modern_clc.h"

-#include "modern_commonprototypes.h"

-

-void Cache_GetText(ClcData *dat, ClcContact *contact, BOOL forceRenew);

-void Cache_GetFirstLineText(ClcData *dat, ClcContact *contact);

-void Cache_GetSecondLineText(SHORTDATA *dat, ClcCacheEntry *pdnce);

-void Cache_GetThirdLineText(SHORTDATA *dat, ClcCacheEntry *pdnce);

-void Cache_GetAvatar(ClcData *dat, ClcContact *contact);

-void Cache_GetTimezone(ClcData *dat, MCONTACT hContact);

-int Cache_GetLineText(ClcCacheEntry *pdnce, int type, LPTSTR text, int text_size, TCHAR *variable_text, BOOL xstatus_has_priority,

-	BOOL show_status_if_no_away, BOOL show_listening_if_no_away, BOOL use_name_and_message_for_xstatus,

-	BOOL pdnce_time_show_only_if_different);

-

-void amRequestAwayMsg(MCONTACT hContact);

-

-#endif // __CACHE_FUNCS_H__

diff --git a/plugins/Clist_modern/src/hdr/modern_clc.h b/plugins/Clist_modern/src/hdr/modern_clc.h
deleted file mode 100644
index 7f6c2cb894..0000000000
--- a/plugins/Clist_modern/src/hdr/modern_clc.h
+++ /dev/null
@@ -1,451 +0,0 @@
-/*

-

-Miranda NG: the free IM client for Microsoft* Windows*

-

-Copyright (с) 2012-15 Miranda NG project (http://miranda-ng.org),

-Copyright (c) 2000-08 Miranda ICQ/IM project,

-all portions of this codebase are copyrighted to the people

-listed in contributors.txt.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-

-#pragma once

-

-#ifndef _CLC_H_

-#define _CLC_H_

-#include "modern_image_array.h"

-#include "m_xpTheme.h"

-

-#include "modern_defsettings.h"

-#include "modern_clist.h"

-

-// Новый формат настроек.

-#define TRAY_ICON_MODE_GLOBAL		1

-#define TRAY_ICON_MODE_ACC			2

-#define TRAY_ICON_MODE_CYCLE		4

-#define	TRAY_ICON_MODE_ALL			8

-

-#define NIIF_INTERN_UNICODE 0x00000100

-

-#define SETTING_STATE_HIDDEN      0

-#define SETTING_STATE_MINIMIZED   1

-#define SETTING_STATE_NORMAL      2

-

-#define SETTING_BRINGTOFRONT_DEFAULT 0

-

-#define SETTING_AVATAR_OVERLAY_TYPE_NORMAL 0

-#define SETTING_AVATAR_OVERLAY_TYPE_PROTOCOL 1

-#define SETTING_AVATAR_OVERLAY_TYPE_CONTACT 2

-

-#define HCONTACT_ISGROUP    0x80000000

-#define HCONTACT_ISINFO     0xFFFF0000

-

-#define MAXSTATUSMSGLEN		256

-

-#define INTM_NAMECHANGED     (WM_USER+10)

-#define INTM_ICONCHANGED     (WM_USER+11)

-#define INTM_GROUPCHANGED    (WM_USER+12)

-#define INTM_GROUPSCHANGED   (WM_USER+13)

-#define INTM_CONTACTADDED    (WM_USER+14)

-#define INTM_CONTACTDELETED  (WM_USER+15)

-#define INTM_HIDDENCHANGED   (WM_USER+16)

-#define INTM_INVALIDATE      (WM_USER+17)

-#define INTM_APPARENTMODECHANGED (WM_USER+18)

-#define INTM_SETINFOTIPHOVERTIME (WM_USER+19)

-#define INTM_NOTONLISTCHANGED   (WM_USER+20)

-#define INTM_RELOADOPTIONS   (WM_USER+21)

-#define INTM_NAMEORDERCHANGED (WM_USER+22)

-#define INTM_IDLECHANGED         (WM_USER+23)

-#define INTM_SCROLLBARCHANGED (WM_USER+24)

-#define INTM_PROTOCHANGED (WM_USER+25)

-#define INTM_STATUSMSGCHANGED	(WM_USER+26)

-#define INTM_STATUSCHANGED	(WM_USER+27)

-#define INTM_AVATARCHANGED	(WM_USER+28)

-#define INTM_TIMEZONECHANGED	(WM_USER+29)

-

-#define CLBF_TILEVTOROWHEIGHT        0x0100

-

-#define TIMERID_RENAME				10

-#define TIMERID_DRAGAUTOSCROLL		11

-#define TIMERID_INFOTIP				13

-#define TIMERID_REBUILDAFTER		14

-#define TIMERID_DELAYEDRESORTCLC	15

-#define TIMERID_SUBEXPAND			21

-#define TIMERID_INVALIDATE			22

-#define TIMERID_INVALIDATE_FULL		25

-#define TIMERID_RECALCSCROLLBAR		26

-

-#define TIMERID_FIRST	TIMERID_RENAME

-#define TIMERID_LAST	TIMERID_RECALCSCROLLBAR

-

-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_STATUSBAR_PROTONAME 21

-#define FONTID_EVENTAREA	22

-#define FONTID_VIEMODES		23

-#define FONTID_MODERN_MAX 23

-

-#define DROPTARGET_OUTSIDE    0

-#define DROPTARGET_ONSELF     1

-#define DROPTARGET_ONNOTHING  2

-#define DROPTARGET_ONGROUP    3

-#define DROPTARGET_ONCONTACT  4

-#define DROPTARGET_INSERTION  5

-#define DROPTARGET_ONMETACONTACT  6

-#define DROPTARGET_ONSUBCONTACT  7

-

-ClcGroup;

-

-#define CONTACTF_ONLINE    1

-#define CONTACTF_INVISTO   2

-#define CONTACTF_VISTO     4

-#define CONTACTF_NOTONLIST 8

-#define CONTACTF_CHECKED   16

-#define CONTACTF_IDLE      32

-//#define CONTACTF_STATUSMSG 64

-

-#define AVATAR_POS_DONT_HAVE -1

-#define AVATAR_POS_ANIMATED -2

-

-#define TEXT_PIECE_TYPE_TEXT   0

-#define TEXT_PIECE_TYPE_SMILEY 1

-

-#define DRAGSTAGE_NOTMOVED  0

-#define DRAGSTAGE_ACTIVE    1

-#define DRAGSTAGEM_STAGE    0x00FF

-#define DRAGSTAGEF_MAYBERENAME  0x8000

-#define DRAGSTAGEF_OUTSIDE      0x4000

-#define DRAGSTAGEF_SKIPRENAME   0x2000

-

-#define ITEM_AVATAR 0

-#define ITEM_ICON 1

-#define ITEM_TEXT 2

-#define ITEM_EXTRA_ICONS 3

-#define ITEM_CONTACT_TIME 4

-#define NUM_ITEM_TYPE 5

-

-#define TEXT_EMPTY -1

-#define TEXT_STATUS 0

-#define TEXT_NICKNAME 1

-#define TEXT_STATUS_MESSAGE 2

-#define TEXT_TEXT 3

-#define TEXT_CONTACT_TIME 4

-#define TEXT_LISTENING_TO 5

-

-#define TEXT_TEXT_MAX_LENGTH 1024

-

-typedef struct tagClcContactTextPiece

-{

-	int type;

-	int len;

-	union

-	{

-		struct

-		{

-			int start_pos;

-		};

-		struct

-		{

-			HICON smiley;

-			int smiley_width;

-			int smiley_height;

-		};

-	};

-} ClcContactTextPiece;

-

-enum {

-	CIT_PAINT_END = 0, //next items are invalids

-	CIT_AVATAR,		  //	1

-	CIT_ICON,		  //	2

-	CIT_TEXT,		  //	3  //the contact name or group name

-	CIT_SUBTEXT1,	  //	4  //the second line for contact or group counter for groups

-	CIT_SUBTEXT2,	  //	5

-	CIT_TIME,		  //	6

-	CIT_CHECKBOX,	  //	7

-	CIT_SELECTION,	  //	8

-	CIT_EXTRA = 64	  //use bit compare for extra icon, the mask &0x3F will return number of extra icon

-};

-

-struct tContactItems

-{

-	BYTE itemType;	   //one of above CIT_ definitions

-	RECT itemRect;

-};

-

-struct ClcContact : public ClcContactBase

-{

-	ClcContact *subcontacts;

-	BYTE SubAllocated;

-	BYTE SubExpanded;

-	BYTE isSubcontact;

-	//	int status;

-	BOOL image_is_special;

-	int avatar_pos;

-	avatarCacheEntry *avatar_data;

-	SIZE avatar_size;

-	CSmileyString ssText;

-

-	// For hittest

-	int pos_indent;

-	RECT pos_check;

-	RECT pos_avatar;

-	RECT pos_icon;

-	RECT pos_label;

-	RECT pos_rename_rect;

-	RECT pos_contact_time;

-	RECT pos_extra[EXTRA_ICON_COUNT];

-	DWORD lastPaintCounter;

-	BYTE bContactRate;

-

-	// For extended layout

-	BYTE ext_nItemsNum;

-	BOOL ext_fItemsValid;

-	tContactItems ext_mpItemsDesc[EXTRA_ICON_COUNT + 10];  //up to 10 items

-

-	__forceinline bool isChat() const

-	{

-		return (type == CLCIT_CONTACT) && (db_get_b(hContact, proto, "ChatRoom", 0) != 0);

-	}

-};

-

-struct ClcModernFontInfo {

-	HFONT hFont;

-	int fontHeight, changed;

-	COLORREF colour;

-	BYTE effect;

-	COLORREF effectColour1;

-	COLORREF effectColour2;

-};

-

-struct ClcData : public ClcDataBase

-{

-	BYTE HiLightMode;

-	BYTE doubleClickExpand;

-	int MetaIgnoreEmptyExtra;

-	BYTE expandMeta;

-	BYTE IsMetaContactsEnabled;

-	time_t last_tick_time;

-	BOOL force_in_dialog;

-	int subIndent;

-	int rightMargin;

-	HBITMAP hMenuBackground;

-	DWORD MenuBkColor, MenuBkHiColor, MenuTextColor, MenuTextHiColor;

-	int MenuBmpUse;

-

-	// Row height

-	int *row_heights;

-	int row_heights_size;

-	int row_heights_allocated;

-

-	// Avatar cache

-	IMAGE_ARRAY_DATA avatar_cache;

-

-	// Row

-	int row_min_heigh;

-	int row_border;

-	int row_before_group_space;

-

-	BOOL row_variable_height;

-	BOOL row_align_left_items_to_left;

-	BOOL row_align_right_items_to_right;

-	int row_items[NUM_ITEM_TYPE];

-	BOOL row_hide_group_icon;

-	BYTE row_align_group_mode;

-

-	// Avatar

-	BOOL avatars_show;

-	BOOL avatars_draw_border;

-	COLORREF avatars_border_color;

-	BOOL avatars_round_corners;

-	BOOL avatars_use_custom_corner_size;

-	int avatars_custom_corner_size;

-	BOOL avatars_ignore_size_for_row_height;

-	BOOL avatars_draw_overlay;

-	int avatars_overlay_type;

-

-	int avatars_maxheight_size;

-	int avatars_maxwidth_size;

-

-	// Icon

-	BOOL icon_hide_on_avatar;

-	BOOL icon_draw_on_avatar_space;

-	BOOL icon_ignore_size_for_row_height;

-

-	// Contact time

-	BOOL contact_time_show;

-	BOOL contact_time_show_only_if_different;

-

-	// Text

-	BOOL text_rtl;

-	BOOL text_align_right;

-	BOOL text_replace_smileys;

-	BOOL text_resize_smileys;

-	int text_smiley_height;

-	BOOL text_use_protocol_smileys;

-	BOOL text_ignore_size_for_row_height;

-

-	// First line

-	BOOL first_line_draw_smileys;

-	BOOL first_line_append_nick;

-

-	// Second line

-	BOOL second_line_show;

-	int second_line_top_space;

-	BOOL second_line_draw_smileys;

-	int second_line_type;

-	TCHAR second_line_text[TEXT_TEXT_MAX_LENGTH];

-	BOOL second_line_xstatus_has_priority;

-	BOOL second_line_show_status_if_no_away;

-	BOOL second_line_show_listening_if_no_away;

-	BOOL second_line_use_name_and_message_for_xstatus;

-

-	// Third line

-	BOOL third_line_show;

-	int third_line_top_space;

-	BOOL third_line_draw_smileys;

-	int third_line_type;

-	TCHAR third_line_text[TEXT_TEXT_MAX_LENGTH];

-	BOOL third_line_xstatus_has_priority;

-	BOOL third_line_show_status_if_no_away;

-	BOOL third_line_show_listening_if_no_away;

-	BOOL third_line_use_name_and_message_for_xstatus;

-	struct ClcModernFontInfo fontModernInfo[FONTID_MODERN_MAX + 1];

-	HWND hWnd;

-	BYTE menuOwnerType;

-	int menuOwnerID;

-	DWORD m_paintCouter; //range is enoght to 49 days if painting will occure each one millisecond

-	BYTE useMetaIcon;

-	BYTE drawOverlayedStatus;

-	int nInsertionLevel;

-

-	BYTE dbbMetaHideExtra;

-	BYTE dbbBlendInActiveState;

-	BYTE dbbBlend25;

-

-	XPTHANDLE hCheckBoxTheme;

-	BYTE bCompactMode;

-};

-

-struct SHORTDATA

-{

-	HWND    hWnd;

-	BOOL    contact_time_show_only_if_different;

-	int     text_smiley_height;

-	BOOL    text_replace_smileys;

-	BOOL    text_use_protocol_smileys;

-

-	// Second line

-	BOOL    second_line_show;

-	BOOL    second_line_draw_smileys;

-	int     second_line_type;

-	TCHAR   second_line_text[TEXT_TEXT_MAX_LENGTH];

-	BOOL    second_line_xstatus_has_priority;

-	BOOL    second_line_show_status_if_no_away;

-	BOOL    second_line_show_listening_if_no_away;

-	BOOL    second_line_use_name_and_message_for_xstatus;

-

-	// Third line

-	BOOL    third_line_show;

-	BOOL    third_line_draw_smileys;

-	int     third_line_type;

-	TCHAR   third_line_text[TEXT_TEXT_MAX_LENGTH];

-	BOOL    third_line_xstatus_has_priority;

-	BOOL    third_line_show_status_if_no_away;

-	BOOL    third_line_show_listening_if_no_away;

-	BOOL    third_line_use_name_and_message_for_xstatus;

-};

-

-typedef struct tagOVERLAYICONINFO

-{

-	char *name;

-	char *description;

-	int id;

-	int listID;

-} OVERLAYICONINFO;

-

-//clc.c

-void    ClcOptionsChanged(void);

-

-//clcidents.c

-int     cliGetRowsPriorTo(ClcGroup *group, ClcGroup *subgroup, int contactIndex);

-int     FindItem(HWND hwnd, ClcData *dat, DWORD hItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible, BOOL isIgnoreSubcontacts);

-int     cliGetRowByIndex(ClcData *dat, int testindex, ClcContact **contact, ClcGroup **subgroup);

-HANDLE  ContactToHItem(ClcContact *contact);

-HANDLE  ContactToItemHandle(ClcContact *contact, DWORD *nmFlags);

-void    ClearRowByIndexCache();

-

-//clcitems.c

-ClcGroup *cli_AddGroup(HWND hwnd, ClcData *dat, const TCHAR *szName, DWORD flags, int groupId, int calcTotalMembers);

-void    cli_FreeGroup(ClcGroup *group);

-int     cli_AddInfoItemToGroup(ClcGroup *group, int flags, const TCHAR *pszText);

-void    cliRebuildEntireList(HWND hwnd, ClcData *dat);

-void    cli_DeleteItemFromTree(HWND hwnd, MCONTACT hItem);

-void    cli_AddContactToTree(HWND hwnd, ClcData *dat, MCONTACT hContact, int updateTotalCount, int checkHideOffline);

-void    cli_SortCLC(HWND hwnd, ClcData *dat, int useInsertionSort);

-int     GetNewSelection(ClcGroup *group, int selection, int direction);

-

-//clcmsgs.c

-LRESULT cli_ProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wParam, LPARAM lParam);

-

-//clcutils.c

-void    cliRecalcScrollBar(HWND hwnd, ClcData *dat);

-void    cliBeginRenameSelection(HWND hwnd, ClcData *dat);

-int     cliHitTest(HWND hwnd, ClcData *dat, int testx, int testy, ClcContact **contact, ClcGroup **group, DWORD *flags);

-void    cliScrollTo(HWND hwnd, ClcData *dat, int desty, int noSmooth);

-int     GetDropTargetInformation(HWND hwnd, ClcData *dat, POINT pt);

-void    LoadCLCOptions(HWND hwnd, ClcData *dat, BOOL bFirst);

-

-

-//clcpaint.c

-void    CLCPaint_cliPaintClc(HWND hwnd, ClcData *dat, HDC hdc, RECT *rcPaint);

-

-//clcopts.c

-int     ClcOptInit(WPARAM wParam, LPARAM lParam);

-DWORD   GetDefaultExStyle(void);

-void    GetFontSetting(int i, LOGFONT *lf, COLORREF *colour, BYTE *effect, COLORREF *eColour1, COLORREF *eColour2);

-

-//clistsettings.c

-TCHAR * GetContactDisplayNameW(MCONTACT hContact, int mode);

-

-//groups.c

-TCHAR*  GetGroupNameTS(int idx, DWORD* pdwFlags);

-int     RenameGroupT(WPARAM groupID, LPARAM newName);

-

-int     GetContactCachedStatus(MCONTACT hContact);

-char   *GetContactCachedProtocol(MCONTACT hContact);

-

-#endif /* _CLC_H_ */

diff --git a/plugins/Clist_modern/src/hdr/modern_clcpaint.h b/plugins/Clist_modern/src/hdr/modern_clcpaint.h
deleted file mode 100644
index 879452125f..0000000000
--- a/plugins/Clist_modern/src/hdr/modern_clcpaint.h
+++ /dev/null
@@ -1,188 +0,0 @@
-#ifndef modern_clcpaint_h__

-#define modern_clcpaint_h__

-

-extern class CLCPaint g_clcPainter;

-class CLCPaint

-{

-

-public:

-	CLCPaint();

-	~CLCPaint() {};

-

-	CLINTERFACE void   cliPaintClc(HWND hwnd, ClcData *dat, HDC hdc, RECT *rcPaint);

-	CLINTERFACE tPaintCallbackProc PaintCallbackProc(HWND hWnd, HDC hDC, RECT *rcPaint, HRGN rgn, DWORD dFlags, void * CallBackData);

-

-	BOOL   IsForegroundWindow(HWND hWnd);

-	HFONT  ChangeToFont(HDC hdc, ClcData *dat, int id, int *fontHeight);

-	int    GetBasicFontID(ClcContact *contact);

-	void   GetTextSize(SIZE *text_size, HDC hdcMem, RECT free_row_rc, TCHAR *szText, SortedList *plText, UINT uTextFormat, int smiley_height);

-	void   AddParam(MODERNMASK *mpModernMask, DWORD dwParamHash, const char* szValue, DWORD dwValueHash);

-	BOOL   CheckMiniMode(ClcData *dat, BOOL selected);

-

-private:

-	static const int HORIZONTAL_SPACE;

-	static const int EXTRA_CHECKBOX_SPACE;

-	static const int EXTRA_SPACE;

-	static const int SELECTION_BORDER;

-	static const int MIN_TEXT_WIDTH;

-	static const int BUF2SIZE;

-

-	static const BYTE GIM_SELECTED_AFFECT;

-	static const BYTE GIM_HOT_AFFECT;

-	static const BYTE GIM_TEMP_AFFECT;

-	static const BYTE GIM_IDLE_AFFECT;

-	static const BYTE GIM_EXTRAICON_AFFECT;

-	static const BYTE GIM_STATUSICON_AFFECT;

-	static const BYTE GIM_AVATAR_AFFECT;

-

-	enum tagenumHASHINDEX

-	{

-		hi_Module = 0,

-		hi_ID,

-		hi_Type,

-		hi_Open,

-		hi_IsEmpty,

-		hi_SubPos,

-		hi_Protocol,

-		hi_RootGroup,

-		hi_Status,

-		hi_HasAvatar,

-		hi_GroupPos,

-		hi_Selected,

-		hi_Hot,

-		hi_Odd,

-		hi_Indent,

-		hi_Index,

-		hi_Name,

-		hi_Group,

-		hi_True,

-		hi_False,

-		hi_ONLINE,

-		hi_AWAY,

-		hi_DND,

-		hi_NA,

-		hi_OCCUPIED,

-		hi_FREECHAT,

-		hi_INVISIBLE,

-		hi_OUTTOLUNCH,

-		hi_ONTHEPHONE,

-		hi_IDLE,

-		hi_OFFLINE,

-		hi_Row,

-		hi_CL,

-		hi_SubContact,

-		hi_MetaContact,

-		hi_Contact,

-		hi_Divider,

-		hi_Info,

-		hi_First_Single,

-		hi_First,

-		hi_Middle,

-		hi_Mid,

-		hi_Single,

-		hi_Last,

-		hi_Rate,

-		hi_None,

-		hi_Low,

-		hi_Medium,

-		hi_High,

-		hi_State,

-		hi_stActive,

-		hi_stInactive,

-		//ADD new item above here

-		hi_LastItem

-	} enumHASHINDEX;

-	static const char * HASHTEXT[hi_LastItem];

-	static DWORD HASH[hi_LastItem];

-

-	void _FillQuickHash();

-	void _SetHotTrackColour(HDC hdc, ClcData *dat);

-	int  _GetStatusOnlineness(int status);

-	int  _GetGeneralisedStatus();

-	int  _GetRealStatus(ClcContact *pContact, int nStatus);

-	RECT _GetRectangle(ClcData *dat, RECT *row_rc, RECT *free_row_rc, int *left_pos, int *right_pos, BOOL left, int real_width, int width, int height, int horizontal_space);

-	void _DrawTextSmiley(HDC hdcMem, RECT *free_rc, SIZE * text_size, TCHAR *szText, int start, int len, SortedList *plText, UINT uTextFormat, BOOL ResizeSizeSmiley);

-	void _AddParameter(MODERNMASK *mpModernMask, MASKPARAM * lpParam);

-	void _AddParamShort(MODERNMASK *mpModernMask, DWORD dwParamIndex, DWORD dwValueIndex);

-	void _FillParam(MASKPARAM * lpParam, DWORD dwParamHash, const char* szValue, DWORD dwValueHash);

-	MODERNMASK* _GetCLCContactRowBackModernMask(ClcGroup *group, ClcContact *Drawing, int indent, int index, BOOL selected, BOOL hottrack, ClcData *dat);

-	void _RTLRect(RECT *rect, int width);

-	void _PaintRowItemsEx(HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT row_rc, RECT free_row_rc, int selected, int hottrack);

-	void _DrawStatusIcon(ClcContact *Drawing, ClcData *dat, int iImage, HDC hdcMem, int x, int y, int cx, int cy, DWORD colorbg, DWORD colorfg, int mode);

-	BOOL _DrawNonEnginedBackground(HDC hdcMem, RECT *rcPaint, RECT clRect, ClcData *dat);

-	void _PaintClc(HWND hwnd, ClcData *dat, HDC hdc, RECT *rcPaint);

-	void _StoreItemPos(ClcContact *contact, int ItemType, RECT *rc);

-	void _CalcItemsPos(HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT *in_row_rc, RECT *in_free_row_rc, int left_pos, int right_pos, int selected);

-	BOOL __IsVisible(RECT *firtRect, RECT *secondRect);

-	void _GetBlendMode(IN ClcData *dat, IN ClcContact *Drawing, IN BOOL selected, IN BOOL hottrack, IN BOOL bFlag, OUT COLORREF * OutColourFg, OUT int * OutMode);

-	void _DrawContactItems(HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT *row_rc, RECT *free_row_rc, int selected, int hottrack, RECT *rcPaint);

-	void _PaintRowItems(HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT row_rc, RECT free_row_rc, int left_pos, int right_pos, int selected, int hottrack, RECT *rcPaint);

-

-	void _DrawContactAvatar(HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT *row_rc, int& selected, int& hottrack, RECT *prcItem);

-	void _DrawContactIcon(HDC hdcMem, ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT *prcItem);

-	void _DrawContactText(HDC hdcMem, ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT *prcItem, UINT uTextFormat);

-	void _DrawContactSubText(HDC hdcMem, ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT *prcItem, UINT uTextFormat, BYTE itemType);

-	void _DrawContactTime(HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT *prcItem);

-	void _DrawContactExtraIcon(HDC hdcMem, ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT *rc, int iImage);

-	void _DrawContactSelection(HDC hdcMem, ClcData *dat, int& selected, int& hottrack, RECT *rcPaint, RECT *prcItem);

-	void _DrawContactLine(HDC hdcMem, ClcContact *Drawing, RECT *free_row_rc, RECT *rcPaint, RECT& text_rc);

-

-	int _rcWidth(RECT *rc) { return rc->right - rc->left; }

-	int _rcHeight(RECT *rc) { return rc->bottom - rc->top; }

-

-private:

-	enum enDrawMode

-	{

-		DM_LAYERED = 1,        // Draw normal skin on 32 bit with alpha layer

-		DM_NON_LAYERED = 2,        // Draw skinnable, but does not take care about alpha       

-		DM_CLASSIC = 4,        // Old style draw for classic

-		DM_CONTROL = 8,        // Draw as control according to windows color scheme

-		DM_FLOAT = 16,       // Float mode 

-		DM_GRAY = 32,       // Grayed mode

-		DM_GREYALTERNATE = 64,       // Gray odd lines

-		DM_DRAW_OFFSCREEN = DM_FLOAT | DM_CONTROL | DM_NON_LAYERED | DM_CLASSIC,

-	};

-

-	inline int _DetermineDrawMode(HWND hWnd, ClcData *dat);

-

-	struct _PaintContext

-	{

-		enum

-		{

-			release_none = 0,

-			release_hdcmem2 = 1,

-			release_hdcmem = 2

-		};

-		HDC hdcMem;

-		HDC hdcMem2;

-

-		HBITMAP hBmpOsb2;

-		HBITMAP oldbmp2;

-

-		HBITMAP hBmpOsb;

-		HBITMAP oldbmp;

-

-		HBRUSH   hBrushAlternateGrey;

-		COLORREF tmpbkcolour;

-		COLORREF tmpforecolour;

-

-		DWORD fRelease;

-		_PaintContext(HDC _hdcMem = NULL) :

-			hdcMem(_hdcMem), hdcMem2(NULL),

-			hBmpOsb2(NULL), oldbmp2(NULL),

-			hBmpOsb(NULL), oldbmp(NULL),

-			hBrushAlternateGrey(NULL),

-			tmpbkcolour(0), tmpforecolour(0),

-			fRelease(release_none) {};

-	};

-

-	inline void _PreparePaintContext(ClcData *dat, HDC hdc, int paintMode, RECT& clRect, _PaintContext& pc);

-	inline void _DrawBackground(HWND hWnd, ClcData *dat, int paintMode, RECT* rcPaint, RECT& clRect, _PaintContext& pc);

-	inline void _DrawLines(HWND hWnd, ClcData *dat, int paintMode, RECT* rcPaint, RECT& clRect, _PaintContext& pc);

-	inline void _DrawInsertionMark(ClcData *dat, RECT& clRect, _PaintContext& pc);

-	inline void _CopyPaintToDest(HDC hdc, int paintMode, RECT* rcPaint, _PaintContext& pc);

-	inline void _FreePaintContext(_PaintContext& pc);

-};

-

-

-#endif // modern_clcpaint_h__

diff --git a/plugins/Clist_modern/src/hdr/modern_clist.h b/plugins/Clist_modern/src/hdr/modern_clist.h
deleted file mode 100644
index 13bf41d6ad..0000000000
--- a/plugins/Clist_modern/src/hdr/modern_clist.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*

-

-Miranda NG: the free IM client for Microsoft* Windows*

-

-Copyright (с) 2012-15 Miranda NG project (http://miranda-ng.org),

-Copyright (c) 2000-08 Miranda ICQ/IM project,

-all portions of this codebase are copyrighted to the people

-listed in contributors.txt.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-

-#pragma once

-

-#ifndef _CLIST_H_

-#define _CLIST_H_

-

-void LoadContactTree(void);

-HTREEITEM GetTreeItemByHContact(MCONTACT hContact);

-void cli_ChangeContactIcon(MCONTACT hContact, int iIcon, int add);

-int GetContactInfosForSort(MCONTACT hContact, char **Proto, TCHAR **Name, int *Status);

-

-///////////////////////////////////////////////////////////////////////////////

-

-class CSmileyString

-{

-public:

-	SortedList*	plText;

-	int			iMaxSmileyHeight;

-

-	CSmileyString() : plText(NULL), iMaxSmileyHeight(0) {};

-	CSmileyString(const CSmileyString& ssIn)

-	{

-		_CopySmileyList(ssIn.plText);

-		iMaxSmileyHeight = ssIn.iMaxSmileyHeight;

-	}

-

-	CSmileyString& operator= (const CSmileyString& ssIn)

-	{

-		DestroySmileyList();

-		_CopySmileyList(ssIn.plText);

-		iMaxSmileyHeight = ssIn.iMaxSmileyHeight;

-		return *this;

-	}

-

-	~CSmileyString()

-	{

-		DestroySmileyList();

-	}

-

-	void ReplaceSmileys(struct SHORTDATA *dat, ClcCacheEntry *pdnce, TCHAR *szText, BOOL replace_smileys);

-

-	/**	Destroy smiley list */

-	void DestroySmileyList();

-	/**  Copy Smiley List */

-	void _CopySmileyList(SortedList *plInput);

-	void AddListeningToIcon(SHORTDATA *dat, TCHAR *szText);

-

-};

-

-///////////////////////////////////////////////////////////////////////////////

-

-struct ClcCacheEntry : public ClcCacheEntryBase

-{

-	int      m_cache_nNoHiddenOffline;

-

-	int      m_cache_nStatus;

-	char*    m_cache_cszProto;

-	bool     m_bProtoNotExists, m_bIsSub;

-	bool     isUnknown;

-

-	int      ApparentMode;

-	int      NotOnList;

-	int      IdleTS;

-	void*    ClcContact;

-	int      IsExpanded;

-

-	TCHAR*   szSecondLineText;

-	CSmileyString ssSecondLine;

-

-	TCHAR*   szThirdLineText;

-	CSmileyString ssThirdLine;

-

-	HANDLE   hTimeZone;

-	DWORD    dwLastMsgTime;

-

-	void     getName(void);

-	void     freeName(void);

-};

-

-///////////////////////////////////////////////////////////////////////////////

-

-#define CLVM_FILTER_PROTOS			1

-#define CLVM_FILTER_GROUPS			2

-#define CLVM_FILTER_STATUS			4

-#define CLVM_FILTER_VARIABLES		8

-#define CLVM_STICKY_CONTACTS		16

-#define CLVM_FILTER_STICKYSTATUS	32

-#define CLVM_FILTER_LASTMSG			64

-#define CLVM_FILTER_LASTMSG_OLDERTHAN 128

-#define CLVM_FILTER_LASTMSG_NEWERTHAN 256

-

-#define CLVM_PROTOGROUP_OP		1

-#define CLVM_GROUPSTATUS_OP		2

-#define CLVM_AUTOCLEAR			4

-#define CLVM_INCLUDED_UNGROUPED 8

-#define CLVM_USELASTMSG			16

-

-#define CLVM_USEGROUPS			32

-#define CLVM_DONOTUSEGROUPS		64

-

-//changes the 'use groups' flag and call CLUI    v0.8.0.16+

-//wParam=newValue

-//lParam=0

-//returns 0 on success, nonzero on failure

-//newValue is 0 to not use gruops, 1 to use groups

-//or -1 to toggle the value

-#define MS_CLIST_SETUSEGROUPS  "CList/SetUseGroups"

-

-

-#if defined(_UNICODE)

-#define CLVM_MODULE "CLVM_W"

-#else

-#define CLVM_MODULE "CLVM"

-#endif

-

-#define GROUPF_SHOWOFFLINE 0x40

-

-#endif

diff --git a/plugins/Clist_modern/src/hdr/modern_clui.h b/plugins/Clist_modern/src/hdr/modern_clui.h
deleted file mode 100644
index b9301670c2..0000000000
--- a/plugins/Clist_modern/src/hdr/modern_clui.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/*

-

-Miranda NG: the free IM client for Microsoft* Windows*

-

-Copyright (с) 2012-15 Miranda NG project (http://miranda-ng.org),

-Copyright (c) 2000-08 Miranda ICQ/IM project,

-all portions of this codebase are copyrighted to the people

-listed in contributors.txt.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-

-#ifndef modern_clui_h__

-#define modern_clui_h__

-

-#include "windowsX.h"

-#define HANDLE_MESSAGE( _message, _fn)    \

-	case (_message): return This->_fn((_message), (wParam), (lParam))

-

-class CLUI

-{

-public:

-	static HWND   m_hWnd;

-	static CLUI * m_pCLUI;

-	static BOOL   m_fMainMenuInited;

-

-private:

-	CLUI();			// is protected use InitClui to initialize instead

-

-public:

-	~CLUI();

-

-	static HRESULT InitClui()         { m_pCLUI = new CLUI(); return S_OK; };

-	static CLUI *  GetClui()          { return m_pCLUI; }

-	static BOOL    IsMainMenuInited() { return CLUI::m_fMainMenuInited; }

-

-	CLINTERFACE void cliOnCreateClc();

-

-	EVENTHOOK(OnEvent_ModulesLoaded);

-	EVENTHOOK(OnEvent_ContactMenuPreBuild);

-	EVENTHOOK(OnEvent_FontReload);

-

-	SERVICE(Service_ShowMainMenu);

-	SERVICE(Service_ShowStatusMenu);

-	SERVICE(Service_Menu_ShowContactAvatar);

-	SERVICE(Service_Menu_HideContactAvatar);

-

-	static LRESULT CALLBACK cli_ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

-	{

-		CLUI * This = m_pCLUI;

-		if (!m_hWnd) m_hWnd = hwnd;

-

-		BOOL bHandled = FALSE;

-		LRESULT lRes = This->PreProcessWndProc(msg, wParam, lParam, bHandled);

-		if (bHandled) return lRes;

-

-		switch (msg)

-		{

-			HANDLE_MESSAGE(WM_NCCREATE, OnNcCreate);

-			HANDLE_MESSAGE(WM_CREATE, OnCreate);

-			HANDLE_MESSAGE(UM_CREATECLC, OnCreateClc);

-			HANDLE_MESSAGE(UM_SETALLEXTRAICONS, OnSetAllExtraIcons);

-			HANDLE_MESSAGE(WM_INITMENU, OnInitMenu);

-			HANDLE_MESSAGE(WM_SIZE, OnSizingMoving);

-			HANDLE_MESSAGE(WM_SIZING, OnSizingMoving);

-			HANDLE_MESSAGE(WM_MOVE, OnSizingMoving);

-			HANDLE_MESSAGE(WM_EXITSIZEMOVE, OnSizingMoving);

-			HANDLE_MESSAGE(WM_WINDOWPOSCHANGING, OnSizingMoving);

-			HANDLE_MESSAGE(WM_DISPLAYCHANGE, OnSizingMoving);

-			HANDLE_MESSAGE(WM_THEMECHANGED, OnThemeChanged);

-			HANDLE_MESSAGE(WM_DWMCOMPOSITIONCHANGED, OnDwmCompositionChanged);

-			HANDLE_MESSAGE(UM_UPDATE, OnUpdate);

-			HANDLE_MESSAGE(WM_NCACTIVATE, OnNcPaint);

-			HANDLE_MESSAGE(WM_PRINT, OnNcPaint);

-			HANDLE_MESSAGE(WM_NCPAINT, OnNcPaint);

-			HANDLE_MESSAGE(WM_ERASEBKGND, OnEraseBkgnd);

-			HANDLE_MESSAGE(WM_PAINT, OnPaint);

-			HANDLE_MESSAGE(WM_LBUTTONDOWN, OnLButtonDown);

-			HANDLE_MESSAGE(WM_PARENTNOTIFY, OnParentNotify);

-			HANDLE_MESSAGE(WM_SETFOCUS, OnSetFocus);

-			HANDLE_MESSAGE(WM_TIMER, OnTimer);

-			HANDLE_MESSAGE(WM_ACTIVATE, OnActivate);

-			HANDLE_MESSAGE(WM_SETCURSOR, OnSetCursor);

-			HANDLE_MESSAGE(WM_MOUSEACTIVATE, OnMouseActivate);

-			HANDLE_MESSAGE(WM_NCLBUTTONDOWN, OnNcLButtonDown);

-			HANDLE_MESSAGE(WM_NCLBUTTONDBLCLK, OnNcLButtonDblClk);

-			HANDLE_MESSAGE(WM_NCHITTEST, OnNcHitTest);

-			HANDLE_MESSAGE(WM_SHOWWINDOW, OnShowWindow);

-			HANDLE_MESSAGE(WM_SYSCOMMAND, OnSysCommand);

-			HANDLE_MESSAGE(WM_KEYDOWN, OnKeyDown);

-			HANDLE_MESSAGE(WM_GETMINMAXINFO, OnGetMinMaxInfo);

-			HANDLE_MESSAGE(WM_MOVING, OnMoving);

-			HANDLE_MESSAGE(WM_NOTIFY, OnNotify);

-			HANDLE_MESSAGE(WM_CONTEXTMENU, OnContextMenu);

-			HANDLE_MESSAGE(WM_MEASUREITEM, OnMeasureItem);

-			HANDLE_MESSAGE(WM_DRAWITEM, OnDrawItem);

-			HANDLE_MESSAGE(WM_DESTROY, OnDestroy);

-		default:

-			return This->DefCluiWndProc(msg, wParam, lParam);

-		}

-	}

-

-

-	//////////////////////////////////////////////////////////////////////////

-	// METHODS

-	//

-private:

-	HRESULT CreateCLC();

-	HRESULT FillAlphaChannel(HDC hDC, RECT* prcParent);

-	HRESULT SnappingToEdge(WINDOWPOS * lpWindowPos);

-	HRESULT LoadDllsRuntime();

-	HRESULT RegisterAvatarMenu();  // TODO move to CLC class

-	HRESULT CreateCluiFrames();

-	HRESULT CreateCLCWindow(const HWND parent);

-	HRESULT CreateUIFrames();

-

-	LRESULT DefCluiWndProc(UINT msg, WPARAM wParam, LPARAM lParam)

-	{

-		return corecli.pfnContactListWndProc(m_hWnd, msg, wParam, lParam);

-	}

-

-	// MessageMap

-	LRESULT PreProcessWndProc(UINT msg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);

-	LRESULT OnSizingMoving(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnThemeChanged(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnDwmCompositionChanged(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnUpdate(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnInitMenu(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnNcPaint(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnEraseBkgnd(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnNcCreate(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnPaint(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnCreate(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnSetAllExtraIcons(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnCreateClc(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnLButtonDown(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnParentNotify(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnSetFocus(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnTimer(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnStatusBarUpdateTimer(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnAutoAlphaTimer(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnSmoothAlphaTransitionTimer(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnDelayedSizingTimer(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnBringOutTimer(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnBringInTimer(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnUpdateBringTimer(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnActivate(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnSetCursor(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnMouseActivate(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnNcLButtonDown(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnNcLButtonDblClk(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnNcHitTest(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnShowWindow(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnSysCommand(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnKeyDown(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnGetMinMaxInfo(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnMoving(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnNotify(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnListSizeChangeNotify(NMCLISTCONTROL *pnmc);

-	LRESULT OnClickNotify(NMCLISTCONTROL *pnmc);

-	LRESULT OnContextMenu(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnMeasureItem(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnDrawItem(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnDestroy(UINT msg, WPARAM wParam, LPARAM lParam);

-

-protected:

-	HMODULE m_hDwmapiDll;

-

-	enum { SNAPTOEDGESENSIVITY = 30 };

-};

-

-#endif // modern_clui_h__
\ No newline at end of file
diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
deleted file mode 100644
index 9192a73d2d..0000000000
--- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h
+++ /dev/null
@@ -1,355 +0,0 @@
-#ifndef commonheaders_h__

-#define commonheaders_h__

-

-/*

-

-Miranda NG: the free IM client for Microsoft* Windows*

-

-Copyright (с) 2012-15 Miranda NG project (http://miranda-ng.org),

-Copyright (c) 2000-08 Miranda ICQ/IM project,

-all portions of this codebase are copyrighted to the people

-listed in contributors.txt.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-

-#pragma once

-

-#ifndef DB_USEHELPERFUNCTIONS		// to supress static inline db helpers

-#define DB_NOHELPERFUNCTIONS

-#endif

-

-#ifndef _CRT_SECURE_NO_WARNINGS

-#define _CRT_SECURE_NO_WARNINGS		// to suppress secure warnings in VC2005

-#endif

-

-#ifndef _CRT_SECURE_NO_DEPRECATE	// to suppress secure deprecate warnings in VC2005

-#define _CRT_SECURE_NO_DEPRECATE

-#endif

-

-#if defined (_DEBUG)

-#define TRACE(str)  { log0(str); }

-#else

-#define TRACE(str)

-#endif

-

-#if defined (_DEBUG)

-#define TRACEVAR(str,n) { log1(str,n); }

-#else

-#define TRACEVAR(str,n)

-#endif

-

-#if defined (_DEBUG)

-#define TRACET(str) OutputDebugString(str)

-#else

-#define TRACET(str)

-#endif

-

-#define SERVICE(serviceproc)         static INT_PTR serviceproc(WPARAM wParam, LPARAM lParam)

-#define EVENTHOOK(eventhookproc)     static int eventhookproc(WPARAM wParam, LPARAM lParam)

-#define CLINTERFACE                  static

-

-#include <windows.h>

-#include <Shlwapi.h>

-#include <vssym32.h>

-#include <UxTheme.h>

-#include <malloc.h>

-#include <time.h>

-#include <stddef.h>

-#include <io.h>

-#include <math.h>

-#include <stdio.h>

-

-#include <newpluginapi.h>

-#include <m_system_cpp.h>

-#include <win2k.h>

-#include <m_database.h>

-#include <m_langpack.h>

-#include <m_options.h>

-#include <m_protosvc.h>

-#include <m_clist.h>

-#include <m_skin.h>

-#include <m_contacts.h>

-#include <m_avatars.h>

-#include <m_icolib.h>

-#include <m_fontservice.h>

-#include <m_timezones.h>

-#include <m_extraicons.h>

-#include <m_xstatus.h>

-#include <m_cluiframes.h>

-#include <m_modernopt.h>

-#include <m_netlib.h>

-

-#include <m_toptoolbar.h>

-#include <m_metacontacts.h>

-#include <m_variables.h>

-#include <m_smileyadd.h>

-#include <m_folders.h>

-

-#include "modern_global_structure.h"

-#include "modern_clc.h"

-#include "modern_clist.h"

-#include "CLUIFrames/cluiframes.h"

-#include "modern_rowheight_funcs.h"

-#include "modern_cache_funcs.h"

-#include "modern_log.h"

-#include "../resource.h"

-

-#define DEFAULT_SKIN_FOLDER		"Skins\\Modern contact list"

-extern TCHAR SkinsFolder[MAX_PATH];

-

-//macros to free data and set it pointer to NULL

-#define mir_free_and_nil(x) {mir_free((void*)x); x=NULL;}

-// shared vars

-

-#define CLUI_FRAME_AUTOHIDENOTIFY  512

-#define CLUI_FRAME_SHOWALWAYS      1024

-

-#ifndef CS_DROPSHADOW

-#define CS_DROPSHADOW 0x00020000

-#endif

-

-#define MENU_MIRANDAMENU            0xFFFF1234

-#define MENU_STATUSMENU             0xFFFF1235

-#define MENU_MINIMIZE               0xFFFF1236

-

-#define UM_CREATECLC                (WM_USER+1)

-#define UM_SETALLEXTRAICONS         (WM_USER+2)

-#define UM_UPDATE                   (WM_USER+50)

-

-// Define constants for CLUI_SizingOnBorder SC_SIZE

-

-#define SCF_NONE    0

-#define SCF_LEFT    1

-#define SCF_RIGHT   2

-#define SCF_TOP     3

-#define SCF_BOTTOM  6

-

-char* __cdecl strstri(char *a, const char *b);

-

-//  Register of plugin's user

-//

-//  wParam = (WPARAM)szSetting - string that describes a user

-//           format: Category/ModuleName,

-//           eg: "Contact list background/CLUI",

-//               "Status bar background/StatusBar"

-//  lParam = (LPARAM)dwFlags

-//

-#define MS_BACKGROUNDCONFIG_REGISTER "ModernBkgrCfg/Register"

-

-//

-//  Notification about changed background

-//  wParam = ModuleName

-//  lParam = 0

-#define ME_BACKGROUNDCONFIG_CHANGED "ModernBkgrCfg/Changed"

-

-HBITMAP ske_CreateDIB32(int cx, int cy);

-

-void InitDisplayNameCache(void);

-void FreeDisplayNameCache();

-int CLUI_ShowWindowMod(HWND hwnd, int cmd);

-

-void MakeButtonSkinned(HWND hWnd);

-

-#ifndef LWA_COLORKEY

-#define LWA_COLORKEY            0x00000001

-#endif

-

-#ifndef AC_SRC_ALPHA

-#define AC_SRC_ALPHA            0x01

-#endif

-

-#define strsetA(a,b) {if (a) mir_free_and_nill(a); a=mir_strdup(b);}

-#define strsetT(a,b) {if (a) mir_free_and_nill(a); a=mir_tstrdup(b);}

-

-extern void TRACE_ERROR();

-extern BOOL DebugDeleteObject(HGDIOBJ a);

-extern void IvalidateDisplayNameCache(DWORD mode);

-

-extern LIST<ClcCacheEntry> clistCache;

-

-HICON LoadSmallIcon(HINSTANCE hInstance, int idx);

-BOOL DestroyIcon_protect(HICON icon);

-

-#ifndef ETDT_ENABLETAB

-#define ETDT_DISABLE        0x00000001

-#define ETDT_ENABLE         0x00000002

-#define ETDT_USETABTEXTURE  0x00000004

-#define ETDT_ENABLETAB      (ETDT_ENABLE  | ETDT_USETABTEXTURE)

-#endif

-

-enum

-{

-	STATE_DLL_LOADING = 0,

-	STATE_CLUI_LOADING,

-	STATE_NORMAL,

-	STATE_PREPARETOEXIT,

-	STATE_EXITING

-};

-

-#define MirandaLoading() ((g_CluiData.bSTATE<STATE_NORMAL))

-#define MirandaExiting() ((g_CluiData.bSTATE>STATE_NORMAL))

-

-char * strdupn(const char * src, int len);

-

-#define SORTBY_NAME	   0

-#define SORTBY_STATUS  1

-#define SORTBY_LASTMSG 2

-#define SORTBY_PROTO   3

-#define SORTBY_RATE    4

-#define SORTBY_NAME_LOCALE 5

-#define SORTBY_NOTHING	10

-

-#define DT_FORCENATIVERENDER   0x10000000

-

-#define _BOOL(a) (a != 0)

-

-/* modern_animated_avatars.c */

-int AniAva_InitModule();								   // HAVE TO BE AFTER GDI+ INITIALIZED

-int AniAva_UnloadModule();

-int AniAva_UpdateOptions();								   //reload options, //hot enable/disable engine

-

-int AniAva_AddAvatar(MCONTACT hContact, TCHAR * szFilename, int width, int heigth);  // adds avatars to be displayed

-int AniAva_SetAvatarPos(MCONTACT hContact, RECT *rc, int overlayIdx, BYTE bAlpha);	   // update avatars pos

-int AniAva_InvalidateAvatarPositions(MCONTACT hContact);	   // reset positions of avatars to be drawn (still be painted at same place)

-int AniAva_RemoveInvalidatedAvatars();					   // all avatars without validated position will be stop painted and probably removed

-int AniAva_RemoveAvatar(MCONTACT hContact);				   // remove avatar

-int AniAva_RedrawAllAvatars(BOOL updateZOrder);			   // request to repaint all

-void AniAva_UpdateParent();

-int AniAva_RenderAvatar(MCONTACT hContact, HDC hdcMem, RECT *rc);

-

-#define CCI_NAME            1

-#define CCI_GROUP          (1<<1)

-#define CCI_PROTO          (1<<2)

-#define CCI_STATUS         (1<<3)

-#define CCI_LINES          (1<<4)

-#define CCI_HIDDEN         (1<<4)

-#define CCI_NOHIDEOFFLINE  (1<<5)

-#define CCI_NOPROTO        (1<<6)

-#define CCI_HIDESUBCONTACT (1<<7)

-#define CCI_I              (1<<8)

-#define CCI_APPARENT       (1<<9)

-#define CCI_NOTONLIST      (1<<10)

-#define CCI_IDLETS         (1<<11)

-#define CCI_CCONTACT       (1<<12)

-#define CCI_EXPAND         (1<<13)

-#define CCI_UNKNOWN        (1<<14)

-#define CCI_TIME           (1<<15)

-#define CCI_OTHER         ~( CCI_NAME|CCI_GROUP|CCI_PROTO|CCI_STATUS|CCI_LINES|CCI_TIME )

-#define CCI_ALL            (0xFFFFFFFF)

-

-void CListSettings_FreeCacheItemData(ClcCacheEntry *pDst);

-int CLUI_SyncGetPDNCE(WPARAM wParam, LPARAM lParam);

-WORD pdnce___GetStatus(ClcCacheEntry *pdnce);

-

-/* move to list module */

-typedef void(*ItemDestuctor)(void*);

-

-#ifdef __cplusplus

-const ROWCELL * rowAddCell(ROWCELL* &, int);

-void rowDeleteTree(ROWCELL *cell);

-BOOL rowParse(ROWCELL* &cell, ROWCELL* parent, char *tbuf, int &hbuf, int &sequence, ROWCELL** RowTabAccess);

-void rowSizeWithReposition(ROWCELL* &root, int width);

-#endif

-

-#define UNPACK_POINT(X) { (short)LOWORD(X), (short)HIWORD(X) }

-

-//////////////////////////////////////////////////////////////////////////

-// Specific class for quick implementation of map<string, *> list

-// with some more fast searching it is

-// hash_map alternative - for  faked hash search;

-// the items are stored no by char* key but both int(hash),char*.

-// have items sorted in map firstly via hash, secondly via string

-// the method is case insensitive

-// To use this simple define like

-// 	typedef std::map<HashStringKeyNoCase, _Type > map_Type;

-//	map_Type myMap;

-// and access it as usual via simpe char* indexing:

-//  myList[ "first"  ]=_Type_value;

-//  myList[ "second" ]=_Type_value;

-//  _Type a = myList[ "second"];

-

-class HashStringKeyNoCase

-{

-public:

-

-	HashStringKeyNoCase(const char* szKey)

-	{

-		_strKey = _strdup(szKey);

-		_CreateHashKey();

-	}

-

-	HashStringKeyNoCase(const HashStringKeyNoCase& hsKey)

-	{

-		_strKey = _strdup(hsKey._strKey);

-		_dwKey = hsKey._dwKey;

-	}

-

-	HashStringKeyNoCase& operator= (const HashStringKeyNoCase& hsKey)

-	{

-		_strKey = _strdup(hsKey._strKey);

-		_dwKey = hsKey._dwKey;

-	}

-

-#ifdef _UNICODE

-	HashStringKeyNoCase(const wchar_t* szKey)

-	{

-		int codepage = 0;

-		int cbLen = WideCharToMultiByte(codepage, 0, szKey, -1, NULL, 0, NULL, NULL);

-		char* result = (char*)malloc(cbLen + 1);

-		WideCharToMultiByte(codepage, 0, szKey, -1, result, cbLen, NULL, NULL);

-		result[cbLen] = 0;

-

-		_strKey = result;

-		_CreateHashKey();

-	}

-#endif

-

-	~HashStringKeyNoCase()

-	{

-		free(_strKey);

-		_strKey = NULL;

-		_dwKey = 0;

-	}

-

-private:

-	char*   _strKey;

-	DWORD   _dwKey;

-

-	void  _CreateHashKey()

-	{

-		_strKey = _strupr(_strKey);

-		_dwKey = mod_CalcHash(_strKey);

-	}

-

-public:

-	bool operator< (const HashStringKeyNoCase& second) const

-	{

-		if (this->_dwKey != second._dwKey)

-			return (this->_dwKey < second._dwKey);

-		else

-			return (mir_strcmp(this->_strKey, second._strKey) < 0); // already maked upper so in any case - will be case insensitive

-	}

-

-	struct HashKeyLess

-	{

-		bool operator() (const HashStringKeyNoCase& first, const HashStringKeyNoCase& second) const

-		{

-			return (first < second);

-		}

-	};

-};

-

-#endif // commonheaders_h__

diff --git a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
deleted file mode 100644
index 7ea8b2d8dc..0000000000
--- a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
+++ /dev/null
@@ -1,323 +0,0 @@
-#pragma once

-

-#ifndef _COMMONPROTOTYPES

-#define _COMMONPROTOTYPES

-

-#ifndef commonheaders_h__

-#error "hdr/modern_commonheaders.h have to be including first"

-#endif

-

-#include "modern_commonheaders.h"  //TO DO: Move contents of this file to commonheaders.h

-#include "modern_clist.h"

-#include "CLUIFrames/cluiframes.h"

-#include "modern_row.h"

-#include "modern_skinengine.h"

-#include "modern_skinselector.h"

-#include "modern_statusbar.h"

-

-#define SKIN  "ModernSkin"

-

-extern PLUGININFOEX pluginInfo;

-extern CLIST_INTERFACE * pcli;

-extern CLIST_INTERFACE corecli;

-

-//Global variables

-extern int ON_SETALLEXTRAICON_CYCLE;

-extern FRAMEWND *g_pfwFrames;

-extern int g_nFramesCount;

-extern RECT g_rcEdgeSizingRect;

-extern FRAMEWND *wndFrameEventArea;

-extern ROWCELL * gl_RowTabAccess[];

-extern ROWCELL * gl_RowRoot;

-extern HIMAGELIST hAvatarOverlays;

-extern int  g_nTitleBarHeight;

-extern BOOL g_bTransparentFlag;

-extern HIMAGELIST g_himlCListClc;

-extern BOOL g_mutex_bSizing;

-extern BOOL LOCK_RECALC_SCROLLBAR;

-extern HIMAGELIST g_himlCListClc;

-extern BYTE nameOrder[];

-extern SortedList lContactsCache;

-extern BOOL g_flag_bOnModulesLoadedCalled;

-extern SKINOBJECTSLIST g_SkinObjectList;

-extern CURRWNDIMAGEDATA * g_pCachedWindow;

-extern BOOL g_mutex_bLockUpdating;

-extern STATUSBARDATA g_StatusBarData;

-extern SKINOBJECTSLIST g_SkinObjectList;

-extern CURRWNDIMAGEDATA * g_pCachedWindow;

-extern char * g_szConnectingProto;

-extern BOOL g_mutex_bLockUpdating;

-extern int  g_mutex_nCalcRowHeightLock;

-extern int  g_mutex_bOnTrayRightClick;

-extern BOOL g_flag_bPostWasCanceled;

-extern BOOL g_flag_bFullRepaint;

-extern BOOL g_bMultiConnectionMode;

-extern BYTE g_bCalledFromShowHide;

-extern HICON g_hListeningToIcon;

-extern HWND g_hCLUIOptionsWnd;

-extern BOOL g_bTransparentFlag;

-extern HINSTANCE g_hInst, g_hMirApp;

-extern BOOL g_mutex_bChangingMode;

-extern UINT g_dwMainThreadID;

-extern HANDLE g_hAwayMsgThread, g_hGetTextAsyncThread, g_hSmoothAnimationThread;

-extern HWND g_hwndViewModeFrame;

-extern BYTE gl_TrimText;

-

-/************************************************************************/

-/*                              TYPE DEFS                               */

-/************************************************************************/

-

-typedef INT_PTR(*PSYNCCALLBACKPROC)(WPARAM, LPARAM);

-

-/************************************************************************/

-/*                              PROTOTYPES                              */

-/************************************************************************/

-

-

-/* CLCItems */

-BOOL CLCItems_IsShowOfflineGroup(ClcGroup* group);

-

-/* CListMod */

-int CListMod_HideWindow();

-

-/* CLUI */

-HANDLE  RegisterIcolibIconHandle(char * szIcoID, char *szSectionName, char * szDescription, TCHAR * tszDefaultFile, int iDefaultIndex, HINSTANCE hDefaultModule, int iDefaultResource);

-void    CLUI_UpdateAeroGlass();

-void    CLUI_ChangeWindowMode();

-BOOL    CLUI_CheckOwnedByClui(HWND hwnd);

-INT_PTR CLUI_GetConnectingIconService(WPARAM wParam, LPARAM lParam);

-int     CLUI_HideBehindEdge();

-int     CLUI_IconsChanged(WPARAM, LPARAM);

-int     CLUI_IsInMainWindow(HWND hwnd);

-int     CLUI_OnSkinLoad(WPARAM wParam, LPARAM lParam);

-int     CLUI_ReloadCLUIOptions();

-int     CLUI_ShowFromBehindEdge();

-int     CLUI_SizingGetWindowRect(HWND hwnd, RECT *rc);

-int     CLUI_SizingOnBorder(POINT, int);

-int     CLUI_SmoothAlphaTransition(HWND hwnd, BYTE GoalAlpha, BOOL wParam);

-int     CLUI_TestCursorOnBorders();

-int     CLUI_UpdateTimer();

-void    CLUI_UpdateLayeredMode();

-UINT_PTR CLUI_SafeSetTimer(HWND hwnd, int ID, int Timeout, TIMERPROC proc);

-

-/* CLUIServices */

-int     CLUIUnreadEmailCountChanged(WPARAM wParam, LPARAM lParam);

-

-/* GDIPlus */

-BOOL    GDIPlus_AlphaBlend(HDC hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, HDC hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, BLENDFUNCTION * blendFunction);

-HBITMAP GDIPlus_LoadGlyphImage(const TCHAR *szFileName);

-

-/* EventArea */

-void    EventArea_ConfigureEventArea();

-

-/* ModernSkinButton */

-int     ModernSkinButton_AddButton(HWND parent, char * ID, char * CommandService, char * StateDefService, char * HandeService, int Left, int Top, int Right, int Bottom, DWORD AlignedTo, TCHAR * Hint, char * DBkey, char * TypeDef, int MinWidth, int MinHeight);

-int     ModernSkinButtonLoadModule();

-int     ModernSkinButton_ReposButtons(HWND parent, BYTE draw, RECT *r);

-int     ModernSkinButtonUnloadModule(WPARAM, LPARAM);

-

-/* RowHeight */

-int     RowHeight_CalcRowHeight(ClcData *dat, HWND hwnd, ClcContact *contact, int item);

-

-/* SkinEngine */

-BOOL    ske_AlphaBlend(HDC hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, HDC hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, BLENDFUNCTION blendFunction);

-void    ske_ApplyTranslucency(void);

-int     ske_BltBackImage(HWND destHWND, HDC destDC, RECT *BltClientRect);

-HBITMAP ske_CreateDIB32(int cx, int cy);

-HBITMAP ske_CreateDIB32Point(int cx, int cy, void ** bits);

-HRGN    ske_CreateOpaqueRgn(BYTE Level, bool Opaque);

-HICON   ske_CreateJoinedIcon(HICON hBottom, HICON hTop, BYTE alpha);

-int     ske_DrawImageAt(HDC hdc, RECT *rc);

-BOOL    ske_DrawIconEx(HDC hdc, int xLeft, int yTop, HICON hIcon, int cxWidth, int cyWidth, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags);

-int     ske_DrawNonFramedObjects(BOOL Erase, RECT *r);

-BOOL    ske_DrawText(HDC hdc, LPCTSTR lpString, int nCount, RECT *lpRect, UINT format);

-LPSKINOBJECTDESCRIPTOR   ske_FindObjectByName(const char * szName, BYTE objType, SKINOBJECTSLIST* Skin);

-HBITMAP ske_GetCurrentWindowImage();

-int     ske_GetFullFilename(TCHAR *buf, const TCHAR *file, TCHAR *skinfolder, BOOL madeAbsolute);

-int     ske_GetSkinFolder(TCHAR *szFileName, char * t2);

-BOOL    ske_ImageList_DrawEx(HIMAGELIST himl, int i, HDC hdcDst, int x, int y, int dx, int dy, COLORREF rgbBk, COLORREF rgbFg, UINT fStyle);

-HICON   ske_ImageList_GetIcon(HIMAGELIST himl, int i);

-int     ske_JustUpdateWindowImageRect(RECT *rty);

-HBITMAP ske_LoadGlyphImage(const TCHAR *szFileName);

-HRESULT SkinEngineLoadModule();

-void    ske_LoadSkinFromDB(void);

-int     ske_LoadSkinFromIniFile(TCHAR*, BOOL);

-TCHAR*  ske_ParseText(TCHAR *stzText);

-int     ske_PrepareImageButDontUpdateIt(RECT *r);

-int     ske_ReCreateBackImage(BOOL Erase, RECT *w);

-int     ske_RedrawCompleteWindow();

-bool    ske_ResetTextEffect(HDC);

-bool    ske_SelectTextEffect(HDC hdc, BYTE EffectID, DWORD FirstColor, DWORD SecondColor);

-INT_PTR ske_Service_DrawGlyph(WPARAM wParam, LPARAM lParam);

-BOOL    ske_SetRectOpaque(HDC memdc, RECT *fr, BOOL force = FALSE);

-BOOL    ske_SetRgnOpaque(HDC memdc, HRGN hrgn, BOOL force = FALSE);

-BOOL    ske_TextOut(HDC hdc, int x, int y, LPCTSTR lpString, int nCount);

-int     ske_UnloadGlyphImage(HBITMAP hbmp);

-int     SkinEngineUnloadModule();

-int     ske_UpdateWindowImage();

-int     ske_UpdateWindowImageRect(RECT *lpRect);

-int     ske_ValidateFrameImageProc(RECT *r);

-

-/* CLUIFrames.c PROXIED */

-

-int CLUIFrames_ActivateSubContainers(BOOL wParam);

-int CLUIFrames_OnClistResize_mod(WPARAM wParam, LPARAM lParam);

-int CLUIFrames_OnMoving(HWND, RECT *);

-int CLUIFrames_OnShowHide(int mode);

-int CLUIFrames_SetLayeredMode(BOOL fLayeredMode, HWND hwnd);

-int CLUIFrames_SetParentForContainers(HWND parent);

-int CLUIFramesOnClistResize(WPARAM wParam, LPARAM lParam);

-

-FRAMEWND * FindFrameByItsHWND(HWND FrameHwnd);                  //cluiframes.c

-

-//int callProxied_DrawTitleBar(HDC hdcMem2,RECT *rect,int Frameid);

-int DrawTitleBar(HDC hdcMem2, RECT *rect, int Frameid);

-

-int FindFrameID(HWND FrameHwnd);

-int SetAlpha(BYTE Alpha);

-

-

-/* others TODO: move above */

-int     Docking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam);

-void    DrawBackGround(HWND hwnd, HDC mhdc, HBITMAP hBmpBackground, COLORREF bkColour, DWORD backgroundBmpUse);

-HRESULT BackgroundsLoadModule();

-int     BackgroundsUnloadModule();

-INT_PTR CALLBACK DlgTmplEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);   //RowTemplate.c

-BOOL    FindMenuHanleByGlobalID(HMENU hMenu, int globalID, struct _MenuItemHandles * dat);   //GenMenu.c

-BOOL    MatchMask(char *name, char *mask);                                    //mod_skin_selector.c

-char*   GetContactCachedProtocol(MCONTACT hContact);                                 //clistsettings.c

-char*   GetParamN(char *string, char *buf, int buflen, BYTE paramN, char Delim, BOOL SkipSpaces);  //mod_skin_selector.c

-WCHAR*  GetParamN(WCHAR *string, WCHAR *buf, int buflen, BYTE paramN, WCHAR Delim, BOOL SkipSpaces);

-DWORD   CompareContacts2_getLMTime(MCONTACT u);                                    //contact.c

-DWORD   mod_CalcHash(const char * a);                                          //mod_skin_selector.c

-HICON   cliGetIconFromStatusMode(MCONTACT hContact, const char *szProto, int status);            //clistmod.c

-HICON   GetMainStatusOverlay(int STATUS);                                       //clc.c

-int     __fastcall CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szStatus, ClcData *dat);  //clcitems.c

-int     BgStatusBarChange(WPARAM wParam, LPARAM lParam);                              //clcopts.c

-int     ClcDoProtoAck(MCONTACT wParam, ACKDATA *ack);                                 //clc.c

-int     ModernSkinButtonDeleteAll();                                                   //modernbutton.c

-int     GetContactCachedStatus(MCONTACT hContact);                                 //clistsettings.c

-int     GetContactIconC(ClcCacheEntry *cacheEntry);                           //clistmod.c

-int     GetContactIndex(ClcGroup *group, ClcContact *contact);               //clcidents.c

-int     GetStatusForContact(MCONTACT hContact, char *szProto);                           //clistsettings.c

-int     InitCustomMenus(void);                                                //clistmenus.c

-int     LoadMoveToGroup();                                                   //movetogroup.c

-int     LoadStatusBarData();                                                //modern_statusbar.c

-int     MenuModulesLoaded(WPARAM wParam, LPARAM lParam);                              //clistmenu.c

-int     MenuModulesShutdown(WPARAM wParam, LPARAM lParam);                           //clistmenu.c

-int     MenuProcessCommand(WPARAM wParam, LPARAM lParam);                           //clistmenu.c

-int     OnFrameTitleBarBackgroundChange(WPARAM wParam, LPARAM lParam);                  //cluiframes.c

-int     QueueAllFramesUpdating(bool);                                          //cluiframes.c

-int     RecursiveDeleteMenu(HMENU hMenu);                                       //clistmenus.c

-int     ModernSkinButtonRedrawAll();                                                //modern_button.c

-int     RegisterButtonByParce(char * ObjectName, char * Params);                     //mod_skin_selector.c

-int     RestoreAllContactData(ClcData *dat);                                 //cache_funcs.c

-

-int     SkinSelector_DeleteMask(MODERNMASK *mm);                                 //mod_skin_selector.c

-int     StoreAllContactData(ClcData *dat);                                 //cache_func.c

-INT_PTR ToggleHideOffline(WPARAM wParam, LPARAM lParam);                              //contact.c

-INT_PTR ToggleGroups(WPARAM wParam, LPARAM lParam);                                 //contact.c

-INT_PTR SetUseGroups(WPARAM wParam, LPARAM lParam);                                 //contact.c

-INT_PTR ToggleSounds(WPARAM wParam, LPARAM lParam);                                 //contact.c

-void    ClcOptionsChanged();                                                //clc.c

-void    Docking_GetMonitorRectFromWindow(HWND hWnd, RECT *rc);                        //Docking.c

-void    DrawAvatarImageWithGDIp(HDC hDestDC, int x, int y, DWORD width, DWORD height, HBITMAP hbmp, int x1, int y1, DWORD width1, DWORD height1, DWORD flag, BYTE alpha);   //gdiplus.cpp

-void    FreeRowCell();                                                      //RowHeight

-void    InitGdiPlus();                                                      //gdiplus.cpp

-void    InvalidateDNCEbyPointer(MCONTACT hContact, ClcCacheEntry *pdnce, int SettingType);  //clistsettings.c

-void    ShutdownGdiPlus();                                                   //gdiplus.cpp

-void    UninitCustomMenus();                                                //clistmenus.c

-void    UnloadAvatarOverlayIcon();                                             //clc.c

-void    UnLoadContactListModule();                                             //clistmod.c

-void    UpdateAllAvatars(ClcData *dat);                                    //cache_func.c

-

-void ApplyViewMode(const char *Name, bool onlySelector = false);

-void SaveViewMode(const char *name, const TCHAR *szGroupFilter, const char *szProtoFilter, DWORD statusMask, DWORD stickyStatusMask, unsigned int options, unsigned int stickies, unsigned int operators, unsigned int lmdat);

-

-//cluiframes.c

-void    gtaRenewText(MCONTACT hContact);

-int     ExtraImage_ExtraIDToColumnNum(int extra);

-

-int     LoadSkinButtonModule();

-void    UninitSkinHotKeys();

-void    GetDefaultFontSetting(int i, LOGFONTA *lf, COLORREF *colour);

-int     CLUI_OnSkinLoad(WPARAM wParam, LPARAM lParam);

-HRESULT CluiLoadModule();

-HRESULT PreLoadContactListModule();

-HRESULT ClcLoadModule();

-HRESULT ToolbarLoadModule();

-HRESULT ToolbarButtonLoadModule();

-void    ToolbarButtonUnloadModule();

-

-// INTERFACES

-

-void    cliCheckCacheItem(ClcCacheEntry *pdnce);

-void    cliFreeCacheItem(ClcCacheEntry *p);

-void    cliRebuildEntireList(HWND hwnd, ClcData *dat);

-void    cliRecalcScrollBar(HWND hwnd, ClcData *dat);

-void    CLUI_cliOnCreateClc(void);

-int     cli_AddItemToGroup(ClcGroup *group, int iAboveItem);

-int     cli_AddInfoItemToGroup(ClcGroup *group, int flags, const TCHAR *pszText);

-int     cliGetGroupContentsCount(ClcGroup *group, int visibleOnly);

-int     cliFindRowByText(HWND hwnd, ClcData *dat, const TCHAR *text, int prefixOk);

-int     cliGetRowsPriorTo(ClcGroup *group, ClcGroup *subgroup, int contactIndex);

-int     cli_IconFromStatusMode(const char *szProto, int nStatus, MCONTACT hContact);

-int     cli_GetContactIcon(MCONTACT hContact);

-int     cli_RemoveEvent(MCONTACT hContact, MEVENT hDbEvent);

-void    cli_AddContactToTree(HWND hwnd, ClcData *dat, MCONTACT hContact, int updateTotalCount, int checkHideOffline);

-void    cli_DeleteItemFromTree(HWND hwnd, MCONTACT hItem);

-void    cli_FreeContact(ClcContact*);

-void    cli_FreeGroup(ClcGroup*);

-TCHAR*   cli_GetGroupCountsText(ClcData *dat, ClcContact *contact);

-void    cli_ChangeContactIcon(MCONTACT hContact, int iIcon, int add);

-void    cli_SetContactCheckboxes(ClcContact*, int);

-LRESULT cli_ProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wParam, LPARAM lParam);

-struct  CListEvent* cliCreateEvent(void);

-struct  CListEvent* cli_AddEvent(CLISTEVENT *cle);

-LRESULT CALLBACK cli_ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

-int     cliShowHide(WPARAM wParam, LPARAM lParam);

-BOOL    CLUI__cliInvalidateRect(HWND hWnd, CONST RECT* lpRect, BOOL bErase);

-int     cliCompareContacts(const ClcContact *contact1, const ClcContact *contact2);

-int     cliFindItem(HWND hwnd, ClcData *dat, DWORD dwItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible);

-int     cliTrayIconPauseAutoHide(WPARAM wParam, LPARAM lParam);

-void    cliCluiProtocolStatusChanged(int status, const char * proto);

-HMENU   cliBuildGroupPopupMenu(ClcGroup *group);

-void    cliInvalidateDisplayNameCacheEntry(MCONTACT hContact);

-void    cliCheckCacheItem(ClcCacheEntry *pdnce);

-void    cli_SaveStateAndRebuildList(HWND hwnd, ClcData *dat);

-void    CLUI_cli_LoadCluiGlobalOpts(void);

-INT_PTR cli_TrayIconProcessMessage(WPARAM wParam, LPARAM lParam);

-BOOL    CLUI__cliInvalidateRect(HWND hWnd, CONST RECT* lpRect, BOOL bErase);

-int		cliTrayIconInit(HWND hwnd);

-int		cliTrayCalcChanged(const char *szChangedProto, int averageMode, int netProtoCount);

-

-ClcContact*    cliCreateClcContact(void);

-ClcCacheEntry* cliCreateCacheItem(MCONTACT hContact);

-ClcCacheEntry* cliGetCacheEntry(MCONTACT hContact);

-

-#define WM_DWMCOMPOSITIONCHANGED  0x031E

-

-#define DWM_BB_ENABLE               0x00000001

-#define DWM_BB_BLURREGION            0x00000002

-#define DWM_BB_TRANSITIONONMAXIMIZED   0x00000004

-struct DWM_BLURBEHIND

-{

-	DWORD dwFlags;

-	BOOL fEnable;

-	HRGN hRgnBlur;

-	BOOL fTransitionOnMaximized;

-};

-extern HRESULT(WINAPI *g_proc_DWMEnableBlurBehindWindow)(HWND hWnd, DWM_BLURBEHIND *pBlurBehind);

-

-extern tPaintCallbackProc CLCPaint_PaintCallbackProc(HWND hWnd, HDC hDC, RECT *rcPaint, HRGN rgn, DWORD dFlags, void * CallBackData);

-

-/* SkinEngine.c */

-

-

-BYTE SkinDBGetContactSettingByte(MCONTACT hContact, const char* szSection, const char*szKey, BYTE bDefault);

-

-extern OVERLAYICONINFO g_pAvatarOverlayIcons[ID_STATUS_OUTTOLUNCH - ID_STATUS_OFFLINE + 1];

-extern OVERLAYICONINFO g_pStatusOverlayIcons[ID_STATUS_OUTTOLUNCH - ID_STATUS_OFFLINE + 1];

-

-

-#endif

diff --git a/plugins/Clist_modern/src/hdr/modern_defsettings.h b/plugins/Clist_modern/src/hdr/modern_defsettings.h
deleted file mode 100644
index 92c9bd2784..0000000000
--- a/plugins/Clist_modern/src/hdr/modern_defsettings.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/*

-

-Miranda NG: the free IM client for Microsoft* Windows*

-

-Copyright (с) 2012-15 Miranda NG project (http://miranda-ng.org),

-Copyright (c) 2000-08 Miranda ICQ/IM project,

-Copyright 2007 Artem Shpynov

-

-all portions of this codebase are copyrighted to the people

-listed in contributors.txt.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-

-/////////////////////////////////////////////////////////////////////////

-/// This file contains default settings value predefinitions

-//////////////////////////////////////////////////////////////////////////

-

-#pragma once

-

-#define SETTING_TOOLWINDOW_DEFAULT              1 //"CList","ToolWindow"

-#define SETTING_ONTOP_DEFAULT                   0 //"CList","OnTop"

-#define SETTING_MIN2TRAY_DEFAULT                1 //"CList","Min2Tray"

-#define SETTING_HIDEOFFLINE_DEFAULT             0 //"CList", "HideOffline"

-#define SETTING_HIDEEMPTYGROUPS_DEFAULT         0 //"CList","HideEmptyGroups"

-#define SETTING_USEGROUPS_DEFAULT               1 //"CList","UseGroups"

-#define SETTING_PLACEOFFLINETOROOT_DEFAULT      0 //"CList","PlaceOfflineToRoot"

-#define SETTING_DISABLETRAYFLASH_DEFAULT        0 //! "CList","DisableTrayFlash"

-#define SETTING_ICONFLASHTIME_DEFAULT         550 //! "CList","IconFlashTime"

-#define SETTING_THINBORDER_DEFAULT              0 //! "CList","ThinBorder"

-#define SETTING_NOBORDER_DEFAULT                0 //! "CList","NoBorder"

-#define SETTING_WINDOWSHADOW_DEFAULT            0 //! "CList","WindowShadow"

-#define SETTING_ONDESKTOP_DEFAULT               0 //! "CList","OnDesktop"

-#define SETTING_DISABLEWORKINGSET_DEFAULT       1 //! "CList","DisableWorkingSet"

-#define SETTING_NOICONBLINF_DEFAULT             0 //! "CList","NoIconBlink"

-#define SETTING_ALWAYSVISICON_DEFAULT           0 //! "CList","AlwaysShowAlwaysVisIcon"

-

-#define SETTING_SHOWMAINMENU_DEFAULT            1 //"CLUI","ShowMainMenu"

-#define SETTING_SHOWCAPTION_DEFAULT             1 //"CLUI","ShowCaption"

-#define SETTING_CLIENTDRAG_DEFAULT              1 //"CLUI","ClientAreaDrag"

-#define SETTING_SHOWSBAR_DEFAULT                1 //! "CLUI","ShowSBar"

-#define SETTING_SBARPERPROTO_DEFAULT            0 //! "CLUI","SBarPerProto"

-#define SETTING_USECONNECTINGICON_DEFAULT       1 //! "CLUI","UseConnectingIcon"

-#define SETTING_SHOWXSTATUS_DEFAULT             6 //! "CLUI","ShowXStatus"

-#define SETTING_SHOWUNREADEMAILS_DEFAULT        0 //! "CLUI","ShowUnreadEmails"

-#define SETTING_SBARSHOW_DEFAULT                3 //! "CLUI","SBarShow"

-#define SETTING_SBARACCOUNTISCUSTOM_DEFAULT     0 //! "CLUI","AccountIsCustom"

-#define SETTING_SBARHIDEACCOUNT_DEFAULT         0 //! "CLUI","HideAccount"

-#define SETTING_SBARRIGHTCLK_DEFAULT            0 //! "CLUI","SBarRightClk"

-#define SETTING_EQUALSECTIONS_DEFAULT           0 //! "CLUI","EqualSections"

-#define SETTING_LEFTOFFSET_DEFAULT              0 //! "CLUI","LeftOffset"

-#define SETTING_RIGHTOFFSET_DEFAULT             0 //! "CLUI","RightOffset

-#define SETTING_TOPOFFSET_DEFAULT               0 //! "CLUI","TopOffset"

-#define SETTING_BOTTOMOFFSET_DEFAULT            0 //! "CLUI","BottomOffset

-#define SETTING_SPACEBETWEEN_DEFAULT            0 //! "CLUI","SpaceBetween"

-#define SETTING_ALIGN_DEFAULT                   0 //! "CLUI","Align"

-#define SETTING_VALIGN_DEFAULT                  1 //! "CLUI","VAlign"

-#define SETTING_PADDINGLEFT_DEFAULT				0 //! "CLUI","PaddingLeft_*"

-#define SETTING_PADDINGRIGHT_DEFAULT			0 //! "CLUI","PaddingRight_*"

-#define SETTING_DRAGTOSCROLL_DEFAULT            0 //! "CLUI","DragToScroll"

-#define SETTING_AUTOSIZE_DEFAULT                0 //! "CLUI","AutoSize"

-#define SETTING_LOCKSIZE_DEFAULT                0 //! "CLUI","LockSize"

-#define SETTING_MINHEIGTH_DEFAULT               0 //! "CLUI","MinHeight"

-#define SETTING_MINWIDTH_DEFAULT               18 //! "CLUI","MinWidth"

-#define SETTING_MAXSIZEHEIGHT_DEFAULT          75 //! "CLUI","MaxSizeHeight"

-#define SETTING_MINSIZEHEIGHT_DEFAULT          10 //! "CLUI","MinSizeHeight"

-#define SETTING_AUTOSIZEUPWARD_DEFAULT          0 //! "CLUI","AutoSizeUpward"

-#define SETTING_SNAPTOEDGES_DEFAULT             1 //! "CLUI","SnapToEdges"

-#define SETTING_DOCKTOSIDES_DEFAULT				1 //! "CLUI","DockToSides",

-

-#define SETTING_PROTOSPERLINE_DEFAULT           0 //! "CLUI","StatusBarProtosPerLine"

-#define SETTING_TEXTEFFECTID_DEFAULT         0xFF //! "StatusBar","TextEffectID"

-#define SETTING_TEXTEFFECTCOLOR1_DEFAULT        0 //! "StatusBar","TextEffectColor1"

-#define SETTING_TEXTEFFECTCOLOR2_DEFAULT        0 //! "StatusBar","TextEffectColor2"

-#define SETTING_SBHILIGHTMODE_DEFAULT           0 //! "StatusBar","HiLightMode"

-#define SETTING_HIDETOOLTIPTIME_DEFAULT      5000 //! "CLUIFrames","HideToolTipTime"

-

-#define SETTING_EXTRA_ICON_EMAIL_DEFAULT        0 //!

-#define SETTING_EXTRA_ICON_PROTO_DEFAULT        0 //!

-#define SETTING_EXTRA_ICON_SMS_DEFAULT          0 //!

-#define SETTING_EXTRA_ICON_ADV1_DEFAULT         1 //!

-#define SETTING_EXTRA_ICON_ADV2_DEFAULT         1 //!

-#define SETTING_EXTRA_ICON_WEB_DEFAULT          0 //!

-#define SETTING_EXTRA_ICON_CLIENT_DEFAULT       1 //!

-#define SETTING_EXTRA_ICON_VISMODE_DEFAULT      1 //!

-#define SETTING_EXTRA_ICON_ADV3_DEFAULT         1 //!

-#define SETTING_EXTRA_ICON_ADV4_DEFAULT         1 //!

-

-#define SETTING_EXTRACOLUMNSPACE_DEFAULT       18 //! "CLUI","ExtraColumnSpace"

-

-#define SETTING_HIDEBEHIND_DEFAULT              0 //! "ModernData","HideBehind" //(0-none, 1-leftedge, 2-rightedge)

-#define SETTING_BEHINDEDGE_DEFAULT              0 //! "ModernData", "BehindEdge"

-#define SETTING_SHOWDELAY_DEFAULT               3 //! "ModernData","ShowDelay"

-#define SETTING_HIDEDELAY_DEFAULT               3 //! "ModernData","HideDelay"

-#define SETTING_HIDEBEHINDBORDERSIZE_DEFAULT    0 //! "ModernData","HideBehindBorderSize"

-#define SETTING_AEROGLASS_DEFAULT               1 //! "ModernData","AeroGlass"

-

-#define SETTING_ROUNDCORNERS_DEFAULT            0 //! "CLC","RoundCorners"

-#define SETTING_GAPFRAMES_DEFAULT               1 //! "CLUIFrames","GapBetweenFrames"

-#define SETTING_GAPTITLEBAR_DEFAULT             1 //! "CLUIFrames","GapBetweenTitleBar"

-#define SETTING_LEFTCLIENTMARIGN_DEFAULT        0 //! "CLUI","LeftClientMargin"

-#define SETTING_RIGHTCLIENTMARIGN_DEFAULT       0 //! "CLUI","RightClientMargin"

-#define SETTING_TOPCLIENTMARIGN_DEFAULT         0 //! "CLUI","TopClientMargin"

-#define SETTING_BOTTOMCLIENTMARIGN_DEFAULT      0 //! "CLUI","BottomClientMargin"

-#define SETTING_KEYCOLOR_DEFAULT   RGB(255,0,255) //! "ModernSettings","KeyColor"

-#define SETTING_LINEUNDERMENU_DEFAULT           0 //! "CLUI","LineUnderMenu"

-#define SETTING_SHOWONSTART_DEFAULT             0 //! "CList","ShowOnStart"

-

-#define SETTING_INTERNALAWAYMSGREQUEST_DEFAULT   1 //"ModernData","InternalAwayMsgDiscovery"

-#define SETTING_REMOVEAWAYMSGFOROFFLINE_DEFAULT  1 //"ModernData","RemoveAwayMessageForOffline"

-#define SETTING_FILTERSEARCH_DEFAULT			 0 //"ModernData","FilterSearch"

-#define SETTING_METAAVOIDDBLCLICK_DEFAULT        1 //"CLC","MetaDoubleClick"

-#define SETTING_METAIGNOREEMPTYEXTRA_DEFAULT     1 //"CLC","MetaIgnoreEmptyExtra"

-#define SETTING_METAHIDEEXTRA_DEFAULT            0 //"CLC","MetaHideExtra"

-#define SETTING_METAEXPANDING_DEFAULT            1 //"CLC","MetaExpanding"

-#define SETTING_USEMETAICON_DEFAULT              1 //"CLC","Meta"

-#define SETTING_DRAWOVERLAYEDSTATUS_DEFAULT      3 //todo replace by contstants

-

-

-#define SETTING_SORTBY1_DEFAULT        SORTBY_RATE //"CList","SortBy1"

-#define SETTING_SORTBY2_DEFAULT        SORTBY_NAME //"CList","SortBy2"

-#define SETTING_SORTBY3_DEFAULT      SORTBY_STATUS //"CList","SortBy3"

-

-#define SETTING_PLACEOOFLINETOROOT_DEFAULT       0 //"CList","PlaceOfflineToRoot"

-#define SETTING_NOOFFLINEBOTTOM_DEFAULT          0 //"CList","NoOfflineBottom"

-#define SETTING_HIDEOFFLINEATROOT_DEFAULT        0 //"CLC","HideOfflineRoot"

-#define SETTING_HILIGHTMODE_DEFAULT              0 //todo replace by constant //"CLC","HiLightMode"

-

-#define SETTING_DISABLESKIN_DEFAULT              0 //"ModernData","DisableEngine"

-#define SETTING_ENABLELAYERING_DEFAULT           1 //! "ModernData","EnableLayering"

-#define SETTING_COMPACTMODE_DEFAULT              0 //"CLC","CompactMode"

-

-#define SETTING_EVENTAREAMODE_DEFAULT            1 //autohide todo replace by const //"CLUI","EventArea"

-#define SETTING_SHOWEVENTAREAFRAME_DEFAULT       1 //"CLUI","ShowEventArea"

-

-#define SETTING_TRAYOPTION_DEFAULT              15 //show combined icon

-#define SETTING_FADEIN_DEFAULT                   0 //"CLUI","FadeInOut"

-

-//////////////////////////////////////////////////////////////////////////

-// ROW SETTINGS

-#define SETTING_ROWBORDER_DEFAULT                1 //"CList","RowBorder"

-#define SETTING_ROW_ADVANCEDLAYOUT_DEFAULT       0 //"ModernData","UseAdvancedRowLayout"

-#define SETTING_ROW_ROWBORDER_DEFAULT            1 //"CList","RowBorder"

-#define SETTING_VARIABLEROWHEIGHT_DEFAULT        1 //"CList","VariableRowHeight"

-#define SETTING_ALIGNLEFTTOLEFT_DEFAULT          0 //"CList","AlignLeftItemsToLeft"

-#define SETTING_ALIGNRIGHTORIGHT_DEFAULT         1 //"CList","AlignRightItemsToRight"

-#define SETTING_HIDEGROUPSICON_DEFAULT           0 //"CList","HideGroupsIcon"

-#define SETTING_ALIGNGROPCAPTION_DEFAULT         0 //left todo replace by const //"CList","AlignGroupCaptions"

-#define SETTINS_ROWITEMORDER_DEFAULT              {ITEM_AVATAR, ITEM_ICON, ITEM_TEXT, ITEM_EXTRA_ICONS, ITEM_CONTACT_TIME}

-

-#define SETTINGS_SHOWAVATARS_DEFAULT             1 //"CList","AvatarsShow"

-#define SETTINGS_AVATARDRAWBORDER_DEFAULT        0 //"CList","AvatarsDrawBorders"

-#define SETTINGS_AVATARBORDERCOLOR_DEFAULT       RGB(0,0,0) //"CList","AvatarsBorderColor"

-#define SETTINGS_AVATARROUNDCORNERS_DEFAULT      0 //"CList","AvatarsRoundCorners"

-#define SETTINGS_AVATARUSECUTOMCORNERSIZE_DEFAULT   0 //"CList","AvatarsUseCustomCornerSize"

-#define SETTINGS_AVATARCORNERSIZE_DEFAULT           4 //"CList","AvatarsCustomCornerSize"

-#define SETTINGS_AVATARIGNORESIZEFORROW_DEFAULT  0 //"CList","AvatarsIgnoreSizeForRow"

-#define SETTINGS_AVATARDRAWOVERLAY_DEFAULT       0 //"CList","AvatarsDrawOverlay"

-#define SETTINGS_AVATAROVERLAYTYPE_DEFAULT       SETTING_AVATAR_OVERLAY_TYPE_NORMAL

-#define SETTING_AVATARHEIGHT_DEFAULT            24 //"CList","AvatarsSize"

-#define SETTING_AVATARWIDTH_DEFAULT             24 //"CList","AvatarsWidth"

-#define SETTINGS_AVATARINSEPARATE_DEFAULT		0 //"CList","AvatarsInSeparateWnd",

-

-#define SETTING_HIDEICONONAVATAR_DEFAULT            0 //"CList","IconHideOnAvatar"

-#define SETTING_ICONONAVATARPLACE_DEFAULT               0 //"CList","IconDrawOnAvatarSpace"

-#define SETTING_ICONIGNORESIZE_DEFAULT            0 //"CList","IconIgnoreSizeForRownHeight"

-#define SETTING_SHOWTIME_DEFAULT                          0 //"CList","ContactTimeShow"

-#define SETTING_SHOWTIMEIFDIFF_DEFAULT            1 //"CList","ContactTimeShowOnlyIfDifferent"

-

-#define SETTING_TEXT_RTL_DEFAULT                          0 //"CList","TextRTL"

-#define SETTING_TEXT_RIGHTALIGN_DEFAULT               0 //"CList","TextAlignToRight"

-#define SETTING_TEXT_SMILEY_DEFAULT                     1 //"CList","TextReplaceSmileys"

-#define SETTING_TEXT_RESIZESMILEY_DEFAULT               1 //"CList","TextResizeSmileys"

-#define SETTING_TEXT_PROTOSMILEY_DEFAULT              1 //"CList","TextUseProtocolSmileys"

-#define SETTING_TEXT_IGNORESIZE_DEFAULT               0 //"CList","TextIgnoreSizeForRownHeight"

-

-#define SETTING_FIRSTLINE_SMILEYS_DEFAULT             1 //"CList","FirstLineDrawSmileys"

-#define SETTING_FIRSTLINE_APPENDNICK_DEFAULT          0 //"CList","FirstLineAppendNick"

-#define SETTING_FIRSTLINE_TRIMTEXT_DEFAULT        1 //"CList","TrimText"

-

-#define SETTING_SECONDLINE_SHOW_DEFAULT                   1 //"CList","SecondLineShow"

-#define SETTING_SECONDLINE_TOPSPACE_DEFAULT           2 //"CList","SecondLineTopSpace"

-#define SETTING_SECONDLINE_SMILEYS_DEFAULT              1 //"CList","SecondLineDrawSmileys"

-#define SETTING_SECONDLINE_TYPE_DEFAULT                   TEXT_STATUS_MESSAGE //"CList","SecondLineType"

-#define SETTING_SECONDLINE_XSTATUS_DEFAULT              1 //"CList","SecondLineXStatusHasPriority"

-#define SETTING_SECONDLINE_XSTATUSNAMETEXT_DEFAULT    0 //"CList","SecondLineUseNameAndMessageForXStatus"

-#define SETTING_SECONDLINE_STATUSIFNOAWAY_DEFAULT         1 //"CList","SecondLineShowStatusIfNoAway"

-#define SETTING_SECONDLINE_LISTENINGIFNOAWAY_DEFAULT    1 //"CList","SecondLineShowListeningIfNoAway"

-

-#define SETTING_THIRDLINE_SHOW_DEFAULT                    0 //"CList","ThirdLineShow"

-#define SETTING_THIRDLINE_TOPSPACE_DEFAULT            2 //"CList","ThirdLineTopSpace"

-#define SETTING_THIRDLINE_SMILEYS_DEFAULT                 0 //"CList","ThirdLineDrawSmileys"

-#define SETTING_THIRDLINE_TYPE_DEFAULT                    TEXT_STATUS_MESSAGE //"CList","ThirdLineType"

-#define SETTING_THIRDLINE_XSTATUS_DEFAULT                 1 //"ThirdLineXStatusHasPriority"

-#define SETTING_THIRDLINE_XSTATUSNAMETEXT_DEFAULT         0 //"ThirdLineUseNameAndMessageForXStatus"

-#define SETTING_THIRDLINE_STATUSIFNOAWAY_DEFAULT          0 //"CList","ThirdLineShowStatusIfNoAway"

-#define SETTING_THIRDLINE_LISTENINGIFNOAWAY_DEFAULT   0 //"ThirdLineShowListeningIfNoAway"

-

-#define SETTING_TRANSPARENT_DEFAULT               0 //"CList","Transparent"

-#define SETTING_AUTOALPHA_DEFAULT                   150 //"CList","AutoAlpha"

-#define SETTING_CONFIRMDELETE_DEFAULT             1 //"CList","ConfirmDelete"

-#define SETTING_AUTOHIDE_DEFAULT                    0 //"CList","AutoHide"

-#define SETTING_HIDETIME_DEFAULT                    30 //"CList","HideTime"

-#define SETTING_CYCLETIME_DEFAULT                   4 //"CList","CycleTime"

-#define SETTING_TRAYICON_DEFAULT                    SETTING_TRAYICON_SINGLE //"CList","TrayIcon"

-#define SETTING_ALWAYSSTATUS_DEFAULT              0 //"CList","AlwaysStatus"

-

-#define SETTING_BLENDINACTIVESTATE_DEFAULT  0 //"CLC","BlendInActiveState"

-

-#define CLCDEFAULT_MODERN_SELTEXTCOLOUR     (g_CluiData.fDisableSkinEngine?GetSysColor(COLOR_HIGHLIGHTTEXT):RGB(0,0,128))

-#define CLCDEFAULT_MODERN_HOTTEXTCOLOUR     (g_CluiData.fDisableSkinEngine ? CLCDEFAULT_MODERN_SELTEXTCOLOUR : RGB(0,0,255))

-#define CLCDEFAULT_MODERN_QUICKSEARCHCOLOUR RGB(255,255,0)

-#define CLCDEFAULT_NOVSCROLL         0 //"CLC","NoVScrollBar"

-#define CLCDEFAULT_INFOTIPTIME       750 //"! "CLC","InfoTipHoverTime"

-#define CLCDEFAULT_COLLICONTOLEFT    0 //"! "FrameTitleBar","AlignCOLLIconToLeft"

-

-#define SKIN_OFFSET_TOP_DEFAULT      0 //! "ModernSkin","SizeMarginOffset_Top"

-#define SKIN_OFFSET_BOTTOM_DEFAULT   0 //! "ModernSkin","SizeMarginOffset_Bottom"

-#define SKIN_OFFSET_LEFT_DEFAULT     0 //! "ModernSkin","SizeMarginOffset_Left"

-#define SKIN_OFFSET_RIGHT_DEFAULT    0 //! "ModernSkin","SizeMarginOffset_Right"

-#define SKIN_SPACEBEFOREGROUP_DEFAULT 0 //! "ModernSkin","SpaceBeforeGroup"

-

-#define SETTINGS_BARBTNWIDTH_DEFAULT	22 //"ModernToolBar", "option_Bar0_BtnWidth"

-#define SETTINGS_BARBTNHEIGHT_DEFAULT	22 //"ModernToolBar", "option_Bar0_BtnHeight"

-#define SETTINGS_BARBTNSPACE_DEFAULT	0  //"ModernToolBar", "option_Bar0_BtnSpace"

-#define SETTINGS_BARAUTOSIZE_DEFAULT	1  //"ModernToolBar", "option_Bar0_Autosize"

-#define SETTINGS_BARMULTILINE_DEFAULT	1  //"ModernToolBar", "option_Bar0_Multiline"

-

-#define SETTING_ENABLESOUNDS_DEFAULT 1 // !"Skin", "UseSound",

diff --git a/plugins/Clist_modern/src/hdr/modern_effectenum.h b/plugins/Clist_modern/src/hdr/modern_effectenum.h
deleted file mode 100644
index b15c4a1f11..0000000000
--- a/plugins/Clist_modern/src/hdr/modern_effectenum.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#pragma once

-

-typedef signed char sbyte;

-typedef struct _MODERNEFFECTMATRIX

-{

-	sbyte matrix[25];

-	BYTE  topEffect;

-	BYTE  leftEffect;

-	BYTE  rightEffect;

-	BYTE  bottomEffect;

-	BYTE  cycleCount;	  //low 7 bits

-}MODERNEFFECTMATRIX;

-

-typedef  struct _MODERNEFFECT

-{

-	BYTE EffectID;

-	MODERNEFFECTMATRIX EffectMatrix;

-	DWORD EffectColor1;

-	DWORD EffectColor2;

-}MODERNEFFECT;

-

-#ifdef _EFFECTENUM_FULL_H

-TCHAR * ModernEffectNames[] =

-#else

-TCHAR * _ModernEffectNames[] =

-#endif

-{

-	_T("Shadow at left"),

-	_T("Shadow at right"),

-	_T("Outline"),

-	_T("Outline smooth"),

-	_T("Smooth bump"),

-	_T("Contour thin"),

-	_T("Contour heavy"),

-};

-

-#ifdef _EFFECTENUM_FULL_H

-MODERNEFFECTMATRIX ModernEffectsEnum[] = {

-	{   //Shadow at Left

-		{ 0, 0, 0, 0, 0,

-		0, 4, 16, 4, 4,

-		0, 16, 64, 32, 16,

-		0, 4, 32, 32, 16,

-		0, 4, 16, 16, 16 }, 2, 2, 2, 2, 1 },

-		{   //Shadow at Right

-			{ 0, 0, 0, 0, 0,

-			4, 4, 16, 4, 0,

-			16, 32, 64, 16, 0,

-			16, 32, 32, 4, 0,

-			16, 16, 16, 4, 0 }, 2, 2, 2, 2, 1 },

-			{   //Outline

-				{ 0, 0, 0, 0, 0,

-				0, 16, 16, 16, 0,

-				0, 16, 32, 16, 0,

-				0, 16, 16, 16, 0,

-				0, 0, 0, 0, 0 }, 1, 1, 1, 1, 1 },

-

-				{  //Outline smooth

-					{ 4, 4, 4, 4, 4,

-					4, 8, 8, 8, 4,

-					4, 8, 32, 8, 4,

-					4, 8, 8, 8, 4,

-					4, 4, 4, 4, 4 }, 2, 2, 2, 2, 1 },

-

-					{  //Smooth bump

-						{ -2, 2, 2, 2, 2,

-						-2, -16, 16, 16, 2,

-						-2, -16, 48, 16, 2,

-						-2, -16, -16, 16, 2,

-						-2, -2, -2, -2, -2 }, 2, 2, 2, 2, 1 + 0x80 },

-						{  //Contour thin

-							{ 0, 0, 0, 0, 0,

-							0, 48, 64, 48, 0,

-							0, 64, 64, 64, 0,

-							0, 48, 64, 48, 0,

-							0, 0, 0, 0, 0 }, 1, 1, 1, 1, 1 },

-							{  //Contour heavy

-								{ 8, 16, 16, 16, 8,

-								16, 64, 64, 64, 16,

-								16, 64, 64, 64, 16,

-								16, 64, 64, 64, 16,

-								8, 16, 16, 16, 8 }, 2, 2, 2, 2, 1 },

-

-};

-#endif

-#ifdef _EFFECTENUM_FULL_H

-#define MAXPREDEFINEDEFFECTS sizeof(ModernEffectNames)/sizeof(ModernEffectNames[0])

-#else

-#define MAXPREDEFINEDEFFECTS sizeof(_ModernEffectNames)/sizeof(_ModernEffectNames[0])

-extern TCHAR * ModernEffectNames[];

-#endif

-extern BOOL SkinEngine_ResetTextEffect(HDC);

-extern BOOL SkinEngine_SelectTextEffect(HDC hdc, BYTE EffectID, DWORD FirstColor, DWORD SecondColor);
\ No newline at end of file
diff --git a/plugins/Clist_modern/src/hdr/modern_gettextasync.h b/plugins/Clist_modern/src/hdr/modern_gettextasync.h
deleted file mode 100644
index c53039da71..0000000000
--- a/plugins/Clist_modern/src/hdr/modern_gettextasync.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once

-void InitCacheAsync();

-

-void gtaRenewText(MCONTACT hContact);

-int  gtaAddRequest(ClcData *dat, MCONTACT hContact);

-void gtaShutdown(void);

diff --git a/plugins/Clist_modern/src/hdr/modern_global_structure.h b/plugins/Clist_modern/src/hdr/modern_global_structure.h
deleted file mode 100644
index a7da9383ac..0000000000
--- a/plugins/Clist_modern/src/hdr/modern_global_structure.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#pragma once

-

-#ifndef modern_global_structure_h__

-#define modern_global_structure_h__

-

-typedef struct tagCLUIDATA

-{

-	/************************************

-	**         Global variables       **

-	************************************/

-

-	// NotifyArea menu

-	HMENU  hMenuNotify;

-	WORD   wNextMenuID;

-	int    iIconNotify;

-	BOOL   bEventAreaEnabled;

-	BOOL   bNotifyActive;

-	DWORD  dwFlags;

-	int    hIconNotify;

-	MCONTACT hUpdateContact;

-

-	// Contact List View Mode

-	TCHAR  groupFilter[2048];

-	char   protoFilter[2048];

-	char   varFilter[2048];

-	DWORD  lastMsgFilter;

-	char   current_viewmode[256], old_viewmode[256];

-	BYTE   boldHideOffline;

-	BYTE   bOldUseGroups;

-	DWORD  statusMaskFilter;

-	DWORD  stickyMaskFilter;

-	DWORD  filterFlags;

-	DWORD  bFilterEffective;

-	DWORD  t_now;

-

-	// Modern Global Variables

-	BOOL   fDisableSkinEngine;

-	BOOL   fOnDesktop;

-	BOOL   fSmoothAnimation;

-	BOOL   fLayered;

-	BOOL   fDocked;

-	BOOL   fSortNoOfflineBottom;

-	BOOL   fAutoSize;

-	BOOL   fAeroGlass;

-	HRGN   hAeroGlassRgn;

-

-	BOOL   mutexPreventDockMoving;

-	BOOL   mutexOnEdgeSizing;

-	BOOL   mutexPaintLock;

-

-	BYTE   bCurrentAlpha;

-	BYTE   bSTATE;

-	BYTE   bBehindEdgeSettings;

-	BYTE   bSortByOrder[3];

-

-	signed char nBehindEdgeState;

-

-	DWORD  dwKeyColor;

-

-	HWND   hwndEventFrame;

-

-	int    LeftClientMargin;

-	int    RightClientMargin;

-	int    TopClientMargin;

-	int    BottomClientMargin;

-

-	BOOL   bInternalAwayMsgDiscovery;

-	BOOL   bRemoveAwayMessageForOffline;

-

-	//hEventHandles

-

-	HANDLE hEventBkgrChanged;

-	HANDLE hEventPreBuildTrayMenu;

-	HANDLE hEventPreBuildGroupMenu;

-	HANDLE hEventPreBuildSubGroupMenu;

-	HANDLE hEventStatusBarShowToolTip;

-	HANDLE hEventStatusBarHideToolTip;

-	HANDLE hEventSkinServicesCreated;

-

-	int    nGapBetweenTitlebar;

-} CLUIDATA;

-

-EXTERN_C CLUIDATA g_CluiData;

-

-#endif // modern_global_structure_h__

diff --git a/plugins/Clist_modern/src/hdr/modern_image_array.h b/plugins/Clist_modern/src/hdr/modern_image_array.h
deleted file mode 100644
index 00056edae0..0000000000
--- a/plugins/Clist_modern/src/hdr/modern_image_array.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*

-

-Miranda NG: the free IM client for Microsoft* Windows*

-

-Copyright (с) 2012-15 Miranda NG project (http://miranda-ng.org),

-Copyright (c) 2000-08 Miranda ICQ/IM project,

-all portions of this codebase are copyrighted to the people

-listed in contributors.txt.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-

-Created by Pescuma

-*/

-

-#pragma once

-

-#ifndef __IMAGE_ARRAY_H__

-# define __IMAGE_ARRAY_H__

-

-#include <windows.h>

-

-

-struct IMAGE_ARRAY_DATA_NODE

-{

-	int width;

-	int height;

-};

-

-struct IMAGE_ARRAY_DATA

-{

-	// Configuration

-	BOOL width_based;

-	int grow_step;

-	HDC hdc;

-

-	// Img data

-	HBITMAP img;

-	int width;

-	int height;

-	void *lpBits;

-

-	// Array

-	IMAGE_ARRAY_DATA_NODE *nodes;

-	int nodes_size;

-	int nodes_allocated_size;

-};

-

-

-// Initialize data

-void ImageArray_Initialize(IMAGE_ARRAY_DATA *iad, BOOL width_based, int grow_step);

-

-// Free data but keep config

-void ImageArray_Clear(IMAGE_ARRAY_DATA *iad);

-

-// Free data

-// If keep_bitmap is TRUE, doesn't delete de bitmap and return its handle. Else, return NULL

-HBITMAP ImageArray_Free(IMAGE_ARRAY_DATA *iad, BOOL keep_bitmap);

-

-// Add image to the list (return the index of the image or -1 on error)

-// If pos == -1, add to the end of the list

-int ImageArray_AddImage(IMAGE_ARRAY_DATA *iad, HBITMAP hBmp, int pos);

-

-// Change an image in the list (return TRUE on success)

-BOOL ImageArray_ChangeImage(IMAGE_ARRAY_DATA *iad, HBITMAP hBmp, int pos);

-

-// Remove an image

-BOOL ImageArray_RemoveImage(IMAGE_ARRAY_DATA *iad, int pos);

-

-// Draw an image

-BOOL ImageArray_DrawImage(IMAGE_ARRAY_DATA *iad, int pos, HDC hdcDest, int nXDest, int nYDest, BYTE Alpha);

-

-#endif // __IMAGE_ARRAY_H__

diff --git a/plugins/Clist_modern/src/hdr/modern_log.h b/plugins/Clist_modern/src/hdr/modern_log.h
deleted file mode 100644
index b96eaafd65..0000000000
--- a/plugins/Clist_modern/src/hdr/modern_log.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once

-

-#ifndef __LOG_H__

-# define __LOG_H__

-

-#ifdef _DEBUG

-

-void Log(const char *file, int line, const char *fmt, ...);

-#define log0(s)  Log(__FILE__,__LINE__,s)

-#define log1(s,a)  Log(__FILE__,__LINE__,s,a)

-

-#else

-

-#define log0(s)

-#define log1(s,a)

-

-#endif

-

-#endif // __LOG_H__
\ No newline at end of file
diff --git a/plugins/Clist_modern/src/hdr/modern_row.h b/plugins/Clist_modern/src/hdr/modern_row.h
deleted file mode 100644
index ad84c94071..0000000000
--- a/plugins/Clist_modern/src/hdr/modern_row.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef modern_row_h__

-#define modern_row_h__

-

-#pragma once

-

-

-// Types of cells

-#define TC_TEXT1 1

-#define TC_TEXT2 2

-#define TC_TEXT3 3

-#define TC_STATUS 4

-#define TC_AVATAR 5

-#define TC_EXTRA 6

-#define TC_EXTRA1 7

-#define TC_EXTRA2 8

-#define TC_EXTRA3 9

-#define TC_EXTRA4 10

-#define TC_EXTRA5 11

-#define TC_EXTRA6 12

-#define TC_EXTRA7 13

-#define TC_EXTRA8 14

-#define TC_EXTRA9 15

-#define TC_TIME 16

-#define TC_SPACE 17

-#define TC_FIXED 18

-

-

-#define TC_ELEMENTSCOUNT 18

-

-// Containers

-#define TC_ROOT 50

-#define TC_ROW 51

-#define TC_COL 52

-#define TC_FLOAT 53

-

-// Alignes

-#define TC_LEFT 0

-#define TC_HCENTER 100

-#define TC_RIGHT 101

-

-#define TC_TOP 0

-#define TC_VCENTER 102

-#define TC_BOTTOM 103

-

-// Sizes

-#define TC_WIDTH 104

-#define TC_HEIGHT 105

-

-

-

-// Структура, описывающая контейнер элемента контакта

-//

-typedef struct tagRowCell

-{

-	int cont;			// Тип контейнера - контакт, сторока, столбец

-	int type;			// Тип элемента, содержащегося в контейнере, если 0 - пустой контейнер

-	int halign;			// Горизонтальное выравнивание внутри контейнера

-	int valign;			// Вертикальное выравнивание внутри контейнера

-

-	int	w;				// Ширина элемента контакта, для текстовых полей игнорируется

-	int	h;				// Высота элемента котнакта

-

-	BOOL sizing;		// Параметр, показывающий наличие текстовых полей в дочерних контейнерах

-	BOOL layer;			// Параметр, показывающий, что контейнер образует новый слой

-

-	BOOL hasfixed;    // Параметр показывающий что есть вложенные фиксированные элементы

-	BOOL fitwidth;    // Параметр указывающий что последний элемент заполняет все оставшееся 

-	// Пространство (расстягивает родителя.оверлей)

-

-	int fixed_width;

-	int full_width;

-

-	RECT r;					// Прямоугольник для рисования элемента

-	struct tagRowCell * next;		// Поле связи 

-	struct tagRowCell * child;		// Поле связи см. файл описания

-}

-ROWCELL, *pROWCELL;

-

-// Структура для доступа к контейнерам элемента контакта внутри дерева опивания

-#ifndef _CPPCODE

-int cppCalculateRowHeight(ROWCELL	*RowRoot);

-void cppCalculateRowItemsPos(ROWCELL	*RowRoot, int width);

-ROWCELL *cppInitModernRow(ROWCELL	** tabAccess);

-void cppDeleteTree(ROWCELL	* RowRoot);

-#endif

-

-#endif // modern_row_h__
\ No newline at end of file
diff --git a/plugins/Clist_modern/src/hdr/modern_rowheight_funcs.h b/plugins/Clist_modern/src/hdr/modern_rowheight_funcs.h
deleted file mode 100644
index 439355e405..0000000000
--- a/plugins/Clist_modern/src/hdr/modern_rowheight_funcs.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*

-

-Miranda NG: the free IM client for Microsoft* Windows*

-

-Copyright (с) 2012-15 Miranda NG project (http://miranda-ng.org),

-Copyright (c) 2000-08 Miranda ICQ/IM project,

-all portions of this codebase are copyrighted to the people

-listed in contributors.txt.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-

-Created by Pescuma

-*/

-

-#pragma once

-

-#ifndef __ROWHEIGHT_FUNCS_H__

-# define __ROWHEIGHT_FUNCS_H__

-

-#include "modern_clc.h"

-

-#define ROW_SPACE_BEETWEEN_LINES 2

-#define ICON_HEIGHT 16

-#define ICON_WIDTH	16

-

-

-

-BOOL RowHeights_Initialize(ClcData *dat);

-void RowHeights_Free(ClcData *dat);

-void RowHeights_Clear(ClcData *dat);

-

-BOOL RowHeights_Alloc(ClcData *dat, int size);

-

-// Calc and store max row height

-int RowHeights_GetMaxRowHeight(ClcData *dat, HWND hwnd);

-

-// Calc and store row height

-int RowHeights_GetRowHeight(ClcData *dat, HWND hwnd, ClcContact *contact, int item);

-

-// Calc and store row height for all itens in the list

-void RowHeights_CalcRowHeights(ClcData *dat, HWND hwnd);

-

-// Calc item top Y (using stored data)

-int cliGetRowTopY(ClcData *dat, int item);

-

-// Calc item bottom Y (using stored data)

-int cliGetRowBottomY(ClcData *dat, int item);

-

-// Calc total height of rows (using stored data)

-int cliGetRowTotalHeight(ClcData *dat);

-

-// Return the line that pos_y is at or -1 (using stored data). Y start at 0

-int cliRowHitTest(ClcData *dat, int pos_y);

-

-// Returns the height of the chosen row

-int cliGetRowHeight(ClcData *dat, int item);

-

-#endif // __ROWHEIGHT_FUNCS_H__

diff --git a/plugins/Clist_modern/src/hdr/modern_skinengine.h b/plugins/Clist_modern/src/hdr/modern_skinengine.h
deleted file mode 100644
index 70b7a9b838..0000000000
--- a/plugins/Clist_modern/src/hdr/modern_skinengine.h
+++ /dev/null
@@ -1,124 +0,0 @@
-#pragma once

-

-#ifndef ske_H_INC

-#define ske_H_INC

-

-#include "modern_skinselector.h"

-#include "modern_commonprototypes.h"

-

-/* Definitions */

-#define GetAValue(argb)((BYTE)((argb)>>24))

-

-#define DEFAULTSKINSECTION  "ModernSkin"

-

-

-

-#define MAX_BUFF_SIZE       255*400

-#define MAXSN_BUFF_SIZE     255*1000

-

-/* External variables */

-

-/* Structs */

-

-struct SKINOBJECTSLIST

-{

-	DWORD dwObjLPReserved;

-	DWORD dwObjLPAlocated;

-	TCHAR *szSkinPlace;

-	LISTMODERNMASK	*pMaskList;

-	SKINOBJECTDESCRIPTOR  *pObjects;

-	SortedList *pTextList;

-};

-

-struct GLYPHIMAGE

-{

-	TCHAR  *szFileName;

-	DWORD   dwLoadedTimes;

-	HBITMAP hGlyph;

-	BYTE    isSemiTransp;

-};

-

-typedef GLYPHIMAGE *LPGLYPHIMAGE;

-

-struct CURRWNDIMAGEDATA

-{

-	HDC hImageDC;

-	HDC hBackDC;

-	HDC hScreenDC;

-	HBITMAP hImageDIB, hImageOld;

-	HBITMAP hBackDIB, hBackOld;

-	BYTE * hImageDIBByte;

-	BYTE * hBackDIBByte;

-	int Width, Height;

-};

-

-struct EFFECTSSTACKITEM

-{

-	HDC hdc;

-	BYTE EffectID;

-	DWORD FirstColor;

-	DWORD SecondColor;

-};

-

-class IniParser

-{

-public:

-	enum {

-		FLAG_WITH_SETTINGS = 0,

-		FLAG_ONLY_OBJECTS = 1,

-	};

-

-	enum { IT_UNKNOWN, IT_FILE, IT_RESOURCE };

-

-	typedef HRESULT(*ParserCallback_t)(const char * szSection, const char * szKey, const char * szValue, IniParser * This);

-

-	IniParser(TCHAR * szFileName, BYTE flags = FLAG_WITH_SETTINGS);

-	IniParser(HINSTANCE hInst, const char *resourceName, const char *resourceType, BYTE flags = FLAG_ONLY_OBJECTS);

-	~IniParser();

-

-	bool CheckOK() { return _isValid; }

-	HRESULT Parse(ParserCallback_t pLineCallBackProc, LPARAM lParam);

-

-	static HRESULT WriteStrToDb(const char * szSection, const char * szKey, const char * szValue, IniParser * This);

-	static int GetSkinFolder(IN const TCHAR * szFileName, OUT TCHAR * pszFolderName);

-

-private:

-	// common

-	enum { MAX_LINE_LEN = 512 };

-	int		 _eType;

-	bool	_isValid;

-	char *	_szSection;

-	ParserCallback_t _pLineCallBackProc;

-	BOOL   _SecCheck;

-	int		_nLine;

-

-	void _DoInit();

-	BOOL _DoParseLine(char * szLine);

-

-	// Processing File

-	HRESULT _DoParseFile();

-	FILE *	_hFile;

-

-	// Processing resource

-	void _LoadResourceIni(HINSTANCE hInst, const char *  resourceName, const char * resourceType);

-	HRESULT _DoParseResource();

-	const char * _RemoveTailings(const char * szLine, size_t& len);

-

-	HGLOBAL _hGlobalRes;

-	DWORD   _dwSizeOfRes;

-	char *	_pPosition;

-

-	BYTE _Flags;

-

-

-};

-

-

-int ske_UnloadSkin(SKINOBJECTSLIST * Skin);

-int ske_AddDescriptorToSkinObjectList(SKINOBJECTDESCRIPTOR *lpDescr, SKINOBJECTSLIST* Skin);

-INT_PTR ske_Service_DrawGlyph(WPARAM wParam, LPARAM lParam);

-

-

-

-#endif

-

diff --git a/plugins/Clist_modern/src/hdr/modern_skinselector.h b/plugins/Clist_modern/src/hdr/modern_skinselector.h
deleted file mode 100644
index 16e6a574d0..0000000000
--- a/plugins/Clist_modern/src/hdr/modern_skinselector.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*

-

-Miranda NG: the free IM client for Microsoft* Windows*

-

-Copyright (с) 2012-15 Miranda NG project (http://miranda-ng.org),

-Copyright (c) 2000-08 Miranda ICQ/IM project,

-all portions of this codebase are copyrighted to the people

-listed in contributors.txt.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-#pragma once

-

-#ifndef M_MOD_SKIN_SELECTOR_H_INC

-#define M_MOD_SKIN_SELECTOR_H_INC

-

-#include "newpluginapi.h"

-#include "modern_commonheaders.h"

-

-#define MAXVALUE 20

-

-#define MPF_EQUAL		1

-#define MPF_DIFF		2

-#define MPF_NOT_EQUAL	( MPF_DIFF|MPF_EQUAL )

-#define MPF_HASHED		4

-

-struct MASKPARAM

-{

-	DWORD	dwId;

-	BYTE	bMaskParamFlag;

-	char*	szName;

-	DWORD	dwValueHash;

-	char*	szValue;

-};

-

-struct MODERNMASK

-{

-	MASKPARAM*	    pl_Params;

-	DWORD				dwParamCnt;

-	union

-	{

-		void*			pObject;

-		char*			szObjectName;

-	};

-	DWORD				dwMaskId;

-	BOOL				bObjectFound;

-};

-

-struct LISTMODERNMASK

-{

-	MODERNMASK*	pl_Masks;

-	DWORD			dwMaskCnt;

-};

-

-/// PROTOTYPES

-int AddModernMaskToList(MODERNMASK *mm, LISTMODERNMASK *mmTemplateList);

-int AddStrModernMaskToList(DWORD maskID, char *szStr, char *objectName, LISTMODERNMASK *mmTemplateList);

-int SortMaskList(LISTMODERNMASK *mmList);

-

-int DeleteMaskByItID(DWORD mID, LISTMODERNMASK *mmTemplateList);

-int ClearMaskList(LISTMODERNMASK *mmTemplateList);

-int ExchangeMasksByID(DWORD mID1, DWORD mID2, LISTMODERNMASK *mmTemplateList);

-

-int ParseToModernMask(MODERNMASK *mm, char *szText);

-BOOL CompareModernMask(MODERNMASK *mmValue, MODERNMASK *mmTemplate);

-BOOL CompareStrWithModernMask(char * szValue, MODERNMASK *mmTemplate);

-MODERNMASK * FindMaskByStr(char * szValue, LISTMODERNMASK * mmTemplateList);

-DWORD mod_CalcHash(const char * a);

-char * ModernMaskToString(MODERNMASK *mm, char *buf, UINT bufsize);

-int RegisterObjectByParce(char * ObjectName, char *Params);

-SKINOBJECTDESCRIPTOR* skin_FindObjectByRequest(char *szValue, LISTMODERNMASK *mmTemplateList);

-SKINOBJECTDESCRIPTOR* skin_FindObjectByMask(MODERNMASK *mm, LISTMODERNMASK *mmTemplateList);

-TCHAR * GetParamNT(char * string, TCHAR * buf, int buflen, BYTE paramN, char Delim, BOOL SkipSpaces);

-int SkinDrawGlyphMask(HDC hdc, RECT *rcSize, RECT *rcClip, MODERNMASK *ModernMask);

-#endif

diff --git a/plugins/Clist_modern/src/hdr/modern_static_clui.h b/plugins/Clist_modern/src/hdr/modern_static_clui.h
deleted file mode 100644
index 8aea29123b..0000000000
--- a/plugins/Clist_modern/src/hdr/modern_static_clui.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-
-Miranda NG: the free IM client for Microsoft* Windows*
-
-Copyright (с) 2012-15 Miranda NG project (http://miranda-ng.org),
-Copyright (c) 2000-08 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
-listed in contributors.txt.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-/************************************************************************/
-/**     FILE CONTAINS HEADER PART FOR .../modernb/clui.c file          **/
-/**                                                                    **/
-/**         !!!  DO NOT INCLUDE IN TO OTHER FILES  !!!                 **/
-/************************************************************************/
-
-/* Definitions */
-#pragma once
-
-#define TM_AUTOALPHA                1
-#define TM_DELAYEDSIZING            2
-#define TM_BRINGOUTTIMEOUT          3
-#define TM_BRINGINTIMEOUT           4
-#define TM_UPDATEBRINGTIMER         5
-#define TM_SMOTHALPHATRANSITION     20
-#define TM_WINDOWUPDATE             100
-#define TM_STATUSBARUPDATE          200
-
-#define MS_CLUI_SHOWMAINMENU    "CList/ShowMainMenu"
-#define MS_CLUI_SHOWSTATUSMENU  "CList/ShowStatusMenu"
-
-#define AC_SRC_NO_PREMULT_ALPHA     0x01
-#define AC_SRC_NO_ALPHA             0x02
-#define AC_DST_NO_PREMULT_ALPHA     0x10
-#define AC_DST_NO_ALPHA             0x20
-
-#define ANIMATION_STEP              40
-
-#define AEROGLASS_MINALPHA          24
-
-/* Declaration of prototypes in other modules */
-
-int ClcUnloadModule();
-int ClcGetShortData(ClcData* pData, SHORTDATA *pShortData);
-int ClcEnterDragToScroll(HWND hwnd, int Y);
-
-int CListMod_ContactListShutdownProc(WPARAM wParam, LPARAM lParam);
-int CListMod_HideWindow(HWND hwndContactList, int mode);
-
-int CListSettings_GetCopyFromCache(ClcCacheEntry *pDest, DWORD flag);
-int CListSettings_SetToCache(ClcCacheEntry *pSrc, DWORD flag);
-
-int CLUIServices_LoadModule(void);
-INT_PTR CLUIServices_SortList(WPARAM wParam, LPARAM lParam);
-
-void Docking_GetMonitorRectFromWindow(HWND hWnd, RECT *rc);
-
-int EventArea_Create(HWND hCluiWnd);
-
-int ExtraImage_ExtraIDToColumnNum(int extra);
-
-void GroupMenus_Init();
-
-int ModernSkinButtonLoadModule();
-int ModernSkinButton_ReposButtons(HWND parent, BYTE draw, RECT *r);
-
-void ske_ApplyTranslucency();
-HBITMAP ske_CreateDIB32(int cx, int cy);
-HBITMAP ske_CreateDIB32Point(int cx, int cy, void ** bits);
-int ske_JustUpdateWindowImage();
-void ske_LoadSkinFromDB(void);
-int ske_RedrawCompleteWindow();
-int ske_UpdateWindowImage();
-int ske_ValidateFrameImageProc(RECT *r);
-
-HWND StatusBar_Create(HWND parent);
-
-void RowHeight_InitModernRow();
-
-int UnhookAll();
-
-/* Module function prototypes */
-
-int CLUI_IsInMainWindow(HWND hwnd);
-int CLUI_SizingOnBorder(POINT pt, int size);
-int CLUI_SmoothAlphaTransition(HWND hwnd, BYTE GoalAlpha, BOOL wParam);
-int CLUI_TestCursorOnBorders();
-
-static int CLUI_SmoothAlphaThreadTransition();
-
-/*      structs         */
-
-struct CHECKFILLING
-{
-	HDC hDC;
-	RECT rcRect;
-};
-
-int CheckFramesPos(RECT *wr);			//cluiframes.c
-int CLUIFrames_ApplyNewSizes(int mode); //cluiframes.c
-int CLUIFrames_GetTotalHeight();		//cluiframes.c
-int CLUIFrames_RepaintSubContainers();  //cluiframes.c
-int CLUIFramesGetMinHeight();			//cluiframes.c
-
-int SizeFramesByWindowRect(RECT *r, HDWP * PosBatch, int mode);	//cluiframes.c
-
-int InitSkinHotKeys();
-BOOL amWakeThread();
-BOOL gtaWakeThread();
-void CreateViewModeFrame();
diff --git a/plugins/Clist_modern/src/hdr/modern_static_cluiframes_service.h b/plugins/Clist_modern/src/hdr/modern_static_cluiframes_service.h
deleted file mode 100644
index 7a4ce4007a..0000000000
--- a/plugins/Clist_modern/src/hdr/modern_static_cluiframes_service.h
+++ /dev/null
@@ -1,235 +0,0 @@
-//////////////////////////////////////////////////////////////////////////

-// WARNING

-//////////////////////////////////////////////////////////////////////////

-// TO BE INCLUDED ONLY TO modern_cluiframes.cpp

-//////////////////////////////////////////////////////////////////////////

-

-static int _us_DoSetFramePaintProc(WPARAM wParam, LPARAM lParam);

-static int _us_DoAddFrame(WPARAM wParam, LPARAM lParam);

-static int _us_DoRemoveFrame(WPARAM wParam, LPARAM lParam);

-static int _us_DoSetFrameOptions(WPARAM wParam, LPARAM lParam);

-static INT_PTR _us_DoGetFrameOptions(WPARAM wParam, LPARAM lParam);

-static int _us_DoUpdateFrame(WPARAM wParam, LPARAM lParam);

-static int _us_DoShowHideFrameTitle(WPARAM wParam, LPARAM lParam);

-static int _us_DoShowTitles(WPARAM wParam, LPARAM lParam);

-static int _us_DoHideTitles(WPARAM wParam, LPARAM lParam);

-static int _us_DoShowHideFrame(WPARAM wParam, LPARAM lParam);

-static int _us_DoShowAllFrames(WPARAM wParam, LPARAM lParam);

-static int _us_DoLockFrame(WPARAM wParam, LPARAM lParam);

-static int _us_DoCollapseFrame(WPARAM wParam, LPARAM lParam);

-static int _us_DoSetFrameBorder(WPARAM wParam, LPARAM lParam);

-static int _us_DoSetFrameAlign(WPARAM wParam, LPARAM lParam);

-static int _us_DoMoveFrame(WPARAM wParam, LPARAM lParam);

-static int _us_DoMoveFrameUp(WPARAM wParam, LPARAM lParam);

-static int _us_DoMoveFrameDown(WPARAM wParam, LPARAM lParam);

-static int _us_DoAlignFrameTop(WPARAM wParam, LPARAM lParam);

-static int _us_DoAlignFrameClient(WPARAM wParam, LPARAM lParam);

-static int _us_DoAlignFrameBottom(WPARAM wParam, LPARAM lParam);

-static int _us_DoSetFrameFloat(WPARAM wParam, LPARAM lParam);

-

-enum {

-	CFM_FIRST_MGS = WM_USER + 0x2FF,

-

-	CFM_SETFRAMEPAINTPROC,

-	CFM_ADDFRAME,

-	CFM_REMOVEFRAME,

-	CFM_SETFRAMEOPTIONS,

-	CFM_GETFRAMEOPTIONS,

-	CFM_UPDATEFRAME,

-	CFM_SHOWHIDEFRAMETITLE,

-	CFM_SHOWTITLES,

-	CFM_HIDETITLES,

-	CFM_SHOWHIDEFRAME,

-	CFM_SHOWALL,

-	CFM_LOCKFRAME,

-	CFM_COLLAPSEFRAME,

-	CFM_SETFRAMEBORDER,

-	CFM_SETFRAMEALIGN,

-	CFM_MOVEFRAME,

-	CFM_MOVEFRAMEUP,

-	CFM_MOVEFRAMEDOWN,

-	CFM_ALIGNFRAMETOP,

-	CFM_ALIGNFRAMEBOTTOM,

-	CFM_ALIGNFRAMECLIENT,

-	CFM_SETFRAMEFLOAT,

-

-	CFM_LAST_MSG

-};

-

-#define CLM_PROCESS( msg, proc ) case msg: result = proc( wParam, lParam); break;

-

-BOOL CALLBACK ProcessCLUIFrameInternalMsg(HWND, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT& result)

-{

-	if (msg <= CFM_FIRST_MGS || msg >= CFM_LAST_MSG)

-		return FALSE;

-

-	switch (msg) {

-		CLM_PROCESS(CFM_SETFRAMEPAINTPROC, _us_DoSetFramePaintProc);

-		CLM_PROCESS(CFM_ADDFRAME, _us_DoAddFrame);

-		CLM_PROCESS(CFM_REMOVEFRAME, _us_DoRemoveFrame);

-		CLM_PROCESS(CFM_SETFRAMEOPTIONS, _us_DoSetFrameOptions);

-		CLM_PROCESS(CFM_GETFRAMEOPTIONS, _us_DoGetFrameOptions);

-		CLM_PROCESS(CFM_UPDATEFRAME, _us_DoUpdateFrame);

-		CLM_PROCESS(CFM_SHOWHIDEFRAMETITLE, _us_DoShowHideFrameTitle);

-		CLM_PROCESS(CFM_SHOWTITLES, _us_DoShowTitles);

-		CLM_PROCESS(CFM_HIDETITLES, _us_DoHideTitles);

-		CLM_PROCESS(CFM_SHOWHIDEFRAME, _us_DoShowHideFrame);

-		CLM_PROCESS(CFM_SHOWALL, _us_DoShowAllFrames);

-		CLM_PROCESS(CFM_LOCKFRAME, _us_DoLockFrame);

-		CLM_PROCESS(CFM_COLLAPSEFRAME, _us_DoCollapseFrame);

-		CLM_PROCESS(CFM_SETFRAMEBORDER, _us_DoSetFrameBorder);

-		CLM_PROCESS(CFM_SETFRAMEALIGN, _us_DoSetFrameAlign);

-		CLM_PROCESS(CFM_MOVEFRAME, _us_DoMoveFrame);

-		CLM_PROCESS(CFM_MOVEFRAMEUP, _us_DoMoveFrameUp);

-		CLM_PROCESS(CFM_MOVEFRAMEDOWN, _us_DoMoveFrameDown);

-		CLM_PROCESS(CFM_ALIGNFRAMETOP, _us_DoAlignFrameTop);

-		CLM_PROCESS(CFM_ALIGNFRAMEBOTTOM, _us_DoAlignFrameClient);

-		CLM_PROCESS(CFM_ALIGNFRAMECLIENT, _us_DoAlignFrameBottom);

-		CLM_PROCESS(CFM_SETFRAMEFLOAT, _us_DoSetFrameFloat);

-	default:

-		return FALSE;   // Not Handled

-	}

-	return TRUE;

-}

-

-static INT_PTR CLUIFrames_SetFramePaintProc(WPARAM wParam, LPARAM lParam)

-{

-	return (pcli->hwndContactList) ? SendMessage(pcli->hwndContactList, CFM_SETFRAMEPAINTPROC, wParam, lParam) : 0;

-}

-

-static INT_PTR CLUIFrames_AddFrame(WPARAM wParam, LPARAM lParam)

-{

-	return (pcli->hwndContactList) ? SendMessage(pcli->hwndContactList, CFM_ADDFRAME, wParam, lParam) : 0;

-}

-

-static INT_PTR CLUIFrames_RemoveFrame(WPARAM wParam, LPARAM lParam)

-{

-	return (pcli->hwndContactList) ? SendMessage(pcli->hwndContactList, CFM_REMOVEFRAME, wParam, lParam) : 0;

-}

-

-static INT_PTR CLUIFrames_SetFrameOptions(WPARAM wParam, LPARAM lParam)

-{

-	return (pcli->hwndContactList) ? SendMessage(pcli->hwndContactList, CFM_SETFRAMEOPTIONS, wParam, lParam) : 0;

-}

-

-static INT_PTR CLUIFrames_GetFrameOptions(WPARAM wParam, LPARAM lParam)

-{

-	return (pcli->hwndContactList) ? SendMessage(pcli->hwndContactList, CFM_GETFRAMEOPTIONS, wParam, lParam) : 0;

-}

-

-static INT_PTR CLUIFrames_UpdateFrame(WPARAM wParam, LPARAM lParam)

-{

-	return (pcli->hwndContactList) ? SendMessage(pcli->hwndContactList, CFM_UPDATEFRAME, wParam, lParam) : 0;

-}

-

-static INT_PTR CLUIFrames_ShowHideFrameTitle(WPARAM wParam, LPARAM lParam)

-{

-	return (pcli->hwndContactList) ? SendMessage(pcli->hwndContactList, CFM_SHOWHIDEFRAMETITLE, wParam, lParam) : 0;

-}

-

-static INT_PTR CLUIFrames_ShowTitles(WPARAM wParam, LPARAM lParam)

-{

-	return (pcli->hwndContactList) ? SendMessage(pcli->hwndContactList, CFM_SHOWTITLES, wParam, lParam) : 0;

-}

-

-static INT_PTR CLUIFrames_HideTitles(WPARAM wParam, LPARAM lParam)

-{

-	return (pcli->hwndContactList) ? SendMessage(pcli->hwndContactList, CFM_HIDETITLES, wParam, lParam) : 0;

-}

-

-static INT_PTR CLUIFrames_ShowHideFrame(WPARAM wParam, LPARAM lParam)

-{

-	return (pcli->hwndContactList) ? SendMessage(pcli->hwndContactList, CFM_SHOWHIDEFRAME, wParam, lParam) : 0;

-}

-

-static INT_PTR CLUIFrames_ShowAllFrames(WPARAM wParam, LPARAM lParam)

-{

-	return (pcli->hwndContactList) ? SendMessage(pcli->hwndContactList, CFM_SHOWALL, wParam, lParam) : 0;

-}

-

-static INT_PTR CLUIFrames_LockFrame(WPARAM wParam, LPARAM lParam)

-{

-	return (pcli->hwndContactList) ? SendMessage(pcli->hwndContactList, CFM_LOCKFRAME, wParam, lParam) : 0;

-}

-

-static INT_PTR CLUIFrames_CollapseFrame(WPARAM wParam, LPARAM lParam)

-{

-	return (pcli->hwndContactList) ? SendMessage(pcli->hwndContactList, CFM_COLLAPSEFRAME, wParam, lParam) : 0;

-}

-

-static INT_PTR CLUIFrames_SetFrameBorder(WPARAM wParam, LPARAM lParam)

-{

-	return (pcli->hwndContactList) ? SendMessage(pcli->hwndContactList, CFM_SETFRAMEBORDER, wParam, lParam) : 0;

-}

-

-static INT_PTR CLUIFrames_SetFrameAlign(WPARAM wParam, LPARAM lParam)

-{

-	return (pcli->hwndContactList) ? SendMessage(pcli->hwndContactList, CFM_SETFRAMEALIGN, wParam, lParam) : 0;

-}

-

-static INT_PTR CLUIFrames_MoveFrame(WPARAM wParam, LPARAM lParam)

-{

-	return (pcli->hwndContactList) ? SendMessage(pcli->hwndContactList, CFM_MOVEFRAME, wParam, lParam) : 0;

-}

-

-static INT_PTR CLUIFrames_MoveFrameUp(WPARAM wParam, LPARAM lParam)

-{

-	return (pcli->hwndContactList) ? SendMessage(pcli->hwndContactList, CFM_MOVEFRAMEUP, wParam, lParam) : 0;

-}

-

-static INT_PTR CLUIFrames_MoveFrameDown(WPARAM wParam, LPARAM lParam)

-{

-	return (pcli->hwndContactList) ? SendMessage(pcli->hwndContactList, CFM_MOVEFRAMEDOWN, wParam, lParam) : 0;

-}

-

-static INT_PTR CLUIFrames_AlignFrameTop(WPARAM wParam, LPARAM lParam)

-{

-	return (pcli->hwndContactList) ? SendMessage(pcli->hwndContactList, CFM_ALIGNFRAMETOP, wParam, lParam) : 0;

-}

-

-static INT_PTR CLUIFrames_AlignFrameClient(WPARAM wParam, LPARAM lParam)

-{

-	return (pcli->hwndContactList) ? SendMessage(pcli->hwndContactList, CFM_ALIGNFRAMEBOTTOM, wParam, lParam) : 0;

-}

-

-static INT_PTR CLUIFrames_AlignFrameBottom(WPARAM wParam, LPARAM lParam)

-{

-	return (pcli->hwndContactList) ? SendMessage(pcli->hwndContactList, CFM_ALIGNFRAMECLIENT, wParam, lParam) : 0;

-}

-

-static INT_PTR CLUIFrames_SetFrameFloat(WPARAM wParam, LPARAM lParam)

-{

-	return (pcli->hwndContactList) ? SendMessage(pcli->hwndContactList, CFM_SETFRAMEFLOAT, wParam, lParam) : 0;

-}

-

-static void CreateCluiFramesServices()

-{

-	CreateServiceFunction(MS_SKINENG_REGISTERPAINTSUB, CLUIFrames_SetFramePaintProc);

-	CreateServiceFunction(MS_CLIST_FRAMES_ADDFRAME, CLUIFrames_AddFrame);

-	CreateServiceFunction(MS_CLIST_FRAMES_REMOVEFRAME, CLUIFrames_RemoveFrame);

-

-	CreateServiceFunction(MS_CLIST_FRAMES_SETFRAMEOPTIONS, CLUIFrames_SetFrameOptions);

-	CreateServiceFunction(MS_CLIST_FRAMES_GETFRAMEOPTIONS, CLUIFrames_GetFrameOptions);

-	CreateServiceFunction(MS_CLIST_FRAMES_UPDATEFRAME, CLUIFrames_UpdateFrame);

-

-	CreateServiceFunction(MS_CLIST_FRAMES_SHFRAMETITLEBAR, CLUIFrames_ShowHideFrameTitle);

-	CreateServiceFunction(MS_CLIST_FRAMES_SHOWALLFRAMESTB, CLUIFrames_ShowTitles);

-	CreateServiceFunction(MS_CLIST_FRAMES_HIDEALLFRAMESTB, CLUIFrames_HideTitles);

-	CreateServiceFunction(MS_CLIST_FRAMES_SHFRAME, CLUIFrames_ShowHideFrame);

-	CreateServiceFunction(MS_CLIST_FRAMES_SHOWALLFRAMES, CLUIFrames_ShowAllFrames);

-

-	CreateServiceFunction(MS_CLIST_FRAMES_ULFRAME, CLUIFrames_LockFrame);

-	CreateServiceFunction(MS_CLIST_FRAMES_UCOLLFRAME, CLUIFrames_CollapseFrame);

-	CreateServiceFunction(MS_CLIST_FRAMES_SETUNBORDER, CLUIFrames_SetFrameBorder);

-

-	CreateServiceFunction(CLUIFRAMESSETALIGN, CLUIFrames_SetFrameAlign);

-	CreateServiceFunction(CLUIFRAMESMOVEUPDOWN, CLUIFrames_MoveFrame);

-	CreateServiceFunction(CLUIFRAMESMOVEUP, CLUIFrames_MoveFrameUp);

-	CreateServiceFunction(CLUIFRAMESMOVEDOWN, CLUIFrames_MoveFrameDown);

-

-	CreateServiceFunction(CLUIFRAMESSETALIGNALTOP, CLUIFrames_AlignFrameTop);

-	CreateServiceFunction(CLUIFRAMESSETALIGNALCLIENT, CLUIFrames_AlignFrameClient);

-	CreateServiceFunction(CLUIFRAMESSETALIGNALBOTTOM, CLUIFrames_AlignFrameBottom);

-

-	CreateServiceFunction(CLUIFRAMESSETFLOATING, CLUIFrames_SetFrameFloat);

-}

diff --git a/plugins/Clist_modern/src/hdr/modern_statusbar.h b/plugins/Clist_modern/src/hdr/modern_statusbar.h
deleted file mode 100644
index 2ac385b6d4..0000000000
--- a/plugins/Clist_modern/src/hdr/modern_statusbar.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#pragma once

-

-#ifndef modern_statusbar_h__

-#define modern_statusbar_h__

-

-#include "modern_commonprototypes.h"

-#include "m_xpTheme.h"

-

-int ModernDrawStatusBar(HWND hwnd, HDC hDC);

-int ModernDrawStatusBarWorker(HWND hWnd, HDC hDC);

-

-typedef struct tagSTATUSBARDATA

-{

-	BOOL  sameWidth;

-	RECT  rectBorders;

-	BYTE  extraspace;

-	BYTE  Align;

-	BYTE  VAlign;

-	bool  bShowProtoIcon;

-	bool  bShowProtoName;

-	bool  bShowStatusName;

-	bool  bConnectingIcon;

-	HFONT BarFont;

-	DWORD fontColor;

-	BYTE  TextEffectID;

-	DWORD TextEffectColor1;

-	DWORD TextEffectColor2;

-	BYTE  xStatusMode;     // 0-only main, 1-xStatus, 2-main as overlay

-	BYTE  nProtosPerLine;

-	bool  bShowProtoEmails;

-

-	HBITMAP hBmpBackground;

-	COLORREF bkColour;

-	DWORD backgroundBmpUse;

-	BOOL  bkUseWinColors;

-

-	XPTHANDLE hTheme;

-

-	BOOL perProtoConfig;

-	BYTE SBarRightClk;

-

-} STATUSBARDATA;

-

-#endif // modern_statusbar_h__

diff --git a/plugins/Clist_modern/src/hdr/modern_sync.h b/plugins/Clist_modern/src/hdr/modern_sync.h
deleted file mode 100644
index 0b5a827f11..0000000000
--- a/plugins/Clist_modern/src/hdr/modern_sync.h
+++ /dev/null
@@ -1,90 +0,0 @@
-#ifndef modern_sync_h__

-#define modern_sync_h__

-

-typedef INT_PTR(*PSYNCCALLBACKPROC)(WPARAM, LPARAM);

-

-int SyncCall(void * vproc, int count, ...);

-

-// Experimental sync caller

-

-int DoCall(PSYNCCALLBACKPROC pfnProc, WPARAM wParam, LPARAM lParam);

-

-// Have to be here due to MS Visual C++ does not support 'export' keyword

-

-// 3 params

-

-template<class RET, class A, class B, class C> class PARAMS3

-{

-	typedef RET(*proc_t)(A, B, C);

-	proc_t _proc;  A _a; B _b; C _c; RET _ret;

-

-public:

-	PARAMS3(proc_t __proc, A __a, B __b, C __c) : _proc(__proc), _a(__a), _b(__b), _c(__c){};

-	static int DoSyncCall(WPARAM, LPARAM lParam)

-	{

-		PARAMS3 * params = (PARAMS3 *)lParam;

-		params->_ret = params->_proc(params->_a, params->_b, params->_c);

-		return 0;

-	};

-	RET GetResult() { return _ret; }

-};

-

-template< class RET, class Ap, class Bp, class Cp, class A, class B, class C> RET Sync(RET(*proc)(Ap, Bp, Cp), A a, B b, C c)

-{

-	PARAMS3<RET, Ap, Bp, Cp> params(proc, a, b, c);

-	DoCall((PSYNCCALLBACKPROC)PARAMS3<RET, Ap, Bp, Cp>::DoSyncCall, 0, (LPARAM)&params);

-	return params.GetResult();

-};

-

-

-// 2 params

-

-template<class RET, class A, class B> class PARAMS2

-{

-	typedef RET(*proc_t)(A, B);

-	proc_t _proc;  A _a; B _b; RET _ret;

-

-public:

-	PARAMS2(proc_t __proc, A __a, B __b) : _proc(__proc), _a(__a), _b(__b){};

-	static int DoSyncCall(WPARAM, LPARAM lParam)

-	{

-		PARAMS2 * params = (PARAMS2 *)lParam;

-		params->_ret = params->_proc(params->_a, params->_b);

-		return 0;

-	};

-	RET GetResult() { return _ret; }

-};

-

-template< class RET, class Ap, class Bp, class A, class B> RET Sync(RET(*proc)(Ap, Bp), A a, B b)

-{

-	PARAMS2<RET, Ap, Bp> params(proc, a, b);

-	DoCall((PSYNCCALLBACKPROC)PARAMS2<RET, Ap, Bp>::DoSyncCall, 0, (LPARAM)&params);

-	return params.GetResult();

-};

-

-

-// 1 param

-template<class RET, class A> class PARAMS1

-{

-	typedef RET(*proc_t)(A);

-	proc_t _proc;  A _a; RET _ret;

-

-public:

-	PARAMS1(proc_t __proc, A __a) : _proc(__proc), _a(__a){};

-	static int DoSyncCall(WPARAM, LPARAM lParam)

-	{

-		PARAMS1 * params = (PARAMS1 *)lParam;

-		params->_ret = params->_proc(params->_a);

-		return 0;

-	};

-	RET GetResult() { return _ret; }

-};

-

-template< class RET, class Ap, class A> RET Sync(RET(*proc)(Ap), A a)

-{

-	PARAMS1<RET, Ap> params(proc, a);

-	DoCall((PSYNCCALLBACKPROC)PARAMS1<RET, Ap>::DoSyncCall, 0, (LPARAM)&params);

-	return params.GetResult();

-};

-

-#endif // modern_sync_h__
\ No newline at end of file