summaryrefslogtreecommitdiff
path: root/plugins/Clist_nicer/src/Include
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-07-02 19:41:38 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-07-02 19:41:38 +0000
commit092d9b814c8c2e523fa2a73c69fa26cda1a5c17f (patch)
tree254f1fa0e3876d7ef1736d4e062a52d23d51bf1b /plugins/Clist_nicer/src/Include
parent0e9e528e18ff63d46e5b3471d6fa12344b0d28b3 (diff)
unified project for clist_nicer
git-svn-id: http://svn.miranda-ng.org/main/trunk@14474 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_nicer/src/Include')
-rw-r--r--plugins/Clist_nicer/src/Include/Version.h14
-rw-r--r--plugins/Clist_nicer/src/Include/alphablend.h31
-rw-r--r--plugins/Clist_nicer/src/Include/clc.h522
-rw-r--r--plugins/Clist_nicer/src/Include/clist.h50
-rw-r--r--plugins/Clist_nicer/src/Include/commonheaders.h88
-rw-r--r--plugins/Clist_nicer/src/Include/config.h140
-rw-r--r--plugins/Clist_nicer/src/Include/extBackg.h97
-rw-r--r--plugins/Clist_nicer/src/Include/resource.h390
-rw-r--r--plugins/Clist_nicer/src/Include/rowheight_funcs.h74
9 files changed, 0 insertions, 1406 deletions
diff --git a/plugins/Clist_nicer/src/Include/Version.h b/plugins/Clist_nicer/src/Include/Version.h
deleted file mode 100644
index babd66c1bc..0000000000
--- a/plugins/Clist_nicer/src/Include/Version.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#define __MAJOR_VERSION 0
-#define __MINOR_VERSION 9
-#define __RELEASE_NUM 2
-#define __BUILD_NUM 4
-
-#include <stdver.h>
-
-#define __PLUGIN_NAME "Clist nicer"
-#define __FILENAME "Clist_nicer.dll"
-#define __DESCRIPTION "Displays contacts, event notifications, protocol status."
-#define __AUTHOR "Pixel, egoDust, cyreve, Nightwish"
-#define __AUTHOREMAIL ""
-#define __AUTHORWEB "http://miranda-ng.org/p/Clist_nicer/"
-#define __COPYRIGHT "Copyright 2000-2010 Miranda-IM project"
diff --git a/plugins/Clist_nicer/src/Include/alphablend.h b/plugins/Clist_nicer/src/Include/alphablend.h
deleted file mode 100644
index d5ce2225b1..0000000000
--- a/plugins/Clist_nicer/src/Include/alphablend.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-
-Miranda NG: the free IM client for Microsoft* Windows*
-
-Copyright (ñ) 2012-15 Miranda NG project (http://miranda-ng.org),
-Copyright (c) 2000-03 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.
-*/
-
-void __inline gradientVertical(UCHAR *ubRedFinal, UCHAR *ubGreenFinal, UCHAR *ubBlueFinal,
- ULONG ulBitmapHeight, UCHAR ubRed, UCHAR ubGreen, UCHAR ubBlue, UCHAR ubRed2,
- UCHAR ubGreen2, UCHAR ubBlue2, DWORD FLG_GRADIENT, BOOL transparent, UINT32 y, UCHAR *ubAlpha);
-
-void __inline gradientHorizontal( UCHAR *ubRedFinal, UCHAR *ubGreenFinal, UCHAR *ubBlueFinal,
- ULONG ulBitmapWidth, UCHAR ubRed, UCHAR ubGreen, UCHAR ubBlue, UCHAR ubRed2,
- UCHAR ubGreen2, UCHAR ubBlue2, DWORD FLG_GRADIENT, BOOL transparent, UINT32 x, UCHAR *ubAlpha); \ No newline at end of file
diff --git a/plugins/Clist_nicer/src/Include/clc.h b/plugins/Clist_nicer/src/Include/clc.h
deleted file mode 100644
index a196275b15..0000000000
--- a/plugins/Clist_nicer/src/Include/clc.h
+++ /dev/null
@@ -1,522 +0,0 @@
-/*
-
-Miranda NG: the free IM client for Microsoft* Windows*
-
-Copyright (ñ) 2012-15 Miranda NG project (http://miranda-ng.org),
-Copyright (c) 2000-03 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.
-*/
-
-#define INTM_XSTATUSCHANGED (WM_USER+26)
-#define INTM_METACHANGEDEVENT (WM_USER+27)
-#define INTM_CODEPAGECHANGED (WM_USER+28)
-#define INTM_AVATARCHANGED (WM_USER+30)
-#define INTM_STATUSMSGCHANGED (WM_USER+31)
-#define INTM_SORTCLC (WM_USER+32)
-#define INTM_STATUSCHANGED (WM_USER+33)
-#define INTM_METACHANGED (WM_USER+34)
-#define INTM_INVALIDATECONTACT (WM_USER+35)
-#define INTM_FORCESORT (WM_USER+36)
-
-#define DEFAULT_TITLEBAR_HEIGHT 18
-
-#define CLS_SKINNEDFRAME 0x0800 //this control will be the main contact list (v. 0.3.4.3+ 2004/11/02)
-
-#define TIMERID_RENAME 10
-#define TIMERID_DRAGAUTOSCROLL 11
-#define TIMERID_INFOTIP 13
-#define TIMERID_SORT 15
-#define TIMERID_REFRESH 18
-#define TIMERID_PAINT 19
-
-#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_STICKY 64
-#define CONTACTF_PRIORITY 128
-
-#define STATUSMSG_XSTATUSID 1
-#define STATUSMSG_XSTATUSNAME 2
-#define STATUSMSG_CLIST 4
-#define STATUSMSG_YIM 8
-#define STATUSMSG_GG 16
-#define STATUSMSG_XSTATUS 32
-
-#define STATUSMSG_NOTFOUND 0
-
-#define SMSG_MAXLEN 700
-
-#define EXTRAIMAGECACHESIZE 1000
-
-// extra cache contact flags
-
-#define ECF_RTLNICK 1
-#define ECF_RTLSTATUSMSG 2
-#define ECF_FORCEAVATAR 4
-#define ECF_HIDEAVATAR 8
-#define ECF_FORCEOVERLAY 16
-#define ECF_HIDEOVERLAY 32
-#define ECF_FORCELOCALTIME 64
-#define ECF_HIDELOCALTIME 128
-#define ECF_HASREALTIMEZONE 1024
-
-// other contact flags (struct ClCContact;
-
-#define ECF_AVATAR 1
-#define ECF_SECONDLINE 2
-
-#define DSPF_CENTERSTATUSICON 1
-#define DSPF_DIMIDLE 2
-#define DSPF_NOFFLINEAVATARS 4
-#define DSPF_SHOWLOCALTIME 8
-#define DSPF_LOCALTIMESELECTIVE 16
-#define DSPF_DONTSEPARATEOFFLINE 32
-#define DSPF_CENTERGROUPNAMES 64
-
-/* Extra icons settings */
-typedef struct _OrderTreeData
-{
- BYTE ID;
- const TCHAR * Name;
- BYTE Position;
- BOOL Visible;
- BOOL fReserved;
-} *PORDERTREEDATA, ORDERTREEDATA;
-
-struct TExtraCache
-{
- MCONTACT hContact;
- HANDLE hTimeZone;
- BYTE valid;
- TCHAR *statusMsg;
- BYTE bStatusMsgValid;
- DWORD dwCFlags;
- DWORD dwDFlags; // display flags for caching only
- StatusItems_t *status_item, *proto_status_item;
- DWORD dwLastMsgTime;
- DWORD msgFrequency;
- BOOL isChatRoom;
-};
-
-struct ClcContact : public ClcContactBase
-{
- BOOL bIsMeta;
- BYTE xStatus;
- int xStatusIcon;
- MCONTACT hSubContact;
- char *metaProto;
- DWORD codePage;
- WORD wStatus;
- int avatarLeft, extraIconRightBegin;
- int isRtl;
- DWORD cFlags;
- BYTE bSecondLine;
-
- avatarCacheEntry *ace;
- TExtraCache* pExtra;
-};
-
-#define DRAGSTAGE_NOTMOVED 0
-#define DRAGSTAGE_ACTIVE 1
-#define DRAGSTAGEM_STAGE 0x00FF
-#define DRAGSTAGEF_MAYBERENAME 0x8000
-#define DRAGSTAGEF_OUTSIDE 0x4000
-
-#define FONTID_CONTACTS 0
-#define FONTID_INVIS 1
-#define FONTID_OFFLINE 2
-#define FONTID_NOTONLIST 3
-#define FONTID_GROUPS 4
-#define FONTID_GROUPCOUNTS 5
-#define FONTID_DIVIDERS 6
-#define FONTID_OFFINVIS 7
-#define FONTID_STATUS 8
-#define FONTID_FRAMETITLE 9
-#define FONTID_EVENTAREA 10
-#define FONTID_TIMESTAMP 11
-#define FONTID_LAST FONTID_TIMESTAMP
-
-struct ClcData : public ClcDataBase
-{
- int *row_heights;
- int row_heights_size;
- int row_heights_allocated;
-
- int row_border;
- int min_row_heigh, group_row_height;
-
- int currentFontID;
- int rightMargin;
- BYTE SelectMode;
- BYTE isMultiSelect;
- HWND hwndParent;
- DWORD lastSort;
- BOOL bNeedPaint, bisEmbedded, bHideSubcontacts;
- DWORD lastRepaint;
- BOOL forceScroll;
- int oldSelection;
-};
-
-//#define CLUI_FRAME_SHOWTOPBUTTONS 1
-#define CLUI_FRAME_SHOWBOTTOMBUTTONS 2
-#define CLUI_SHOWCLIENTICONS 4
-//#define CLUI_SHOWVISI 8
-#define CLUI_FRAME_CLISTSUNKEN 16
-#define CLUI_SHOWXSTATUS 32
-#define CLUI_FRAME_BUTTONSFLAT 64
-#define CLUI_FRAME_BUTTONSCLASSIC 128
-#define CLUI_USEMETAICONS 256
-#define CLUI_FRAME_AUTOHIDENOTIFY 512
-#define CLUI_FRAME_USEXSTATUSASSTATUS 1024
-#define CLUI_STICKYEVENTS 2048
-#define CLUI_FRAME_SBARSHOW 4096
-#define CLUI_STATUSASTEXT 8192
-#define CLUI_FULLROWSELECT 16384
-#define CLUI_FRAME_EVENTAREASUNKEN 32768
-//#define CLUI_FRAME_BUTTONBARSUNKEN 65536
-#define CLUI_FRAME_AVATARS 0x20000
-#define CLUI_FRAME_AVATARSLEFT 0x40000
-#define CLUI_FRAME_GDIPLUS 0x80000
-#define CLUI_FRAME_AVATARBORDER 0x100000
-#define CLUI_FRAME_STATUSICONS 0x200000
-#define CLUI_FRAME_AVATARSRIGHTWITHNICK 0x400000
-#define CLUI_FRAME_TRANSPARENTAVATAR 0x800000
-#define CLUI_FRAME_ROUNDAVATAR 0x1000000
-#define CLUI_FRAME_ALWAYSALIGNNICK 0x2000000
-#define CLUI_FRAME_AVATARSRIGHT 0x4000000
-#define CLUI_FRAME_SHOWSTATUSMSG 0x8000000
-#define CLUI_FRAME_OVERLAYICONS 0x10000000
-#define CLUI_FRAME_SELECTIVEICONS 0x20000000
-#define CLUI_FRAME_ROUNDEDFRAME 0x40000000
-#define CLUI_FRAME_NOGROUPICON 0x80000000
-
-#define MULTIROW_NEVER 0
-#define MULTIROW_ALWAYS 1
-#define MULTIROW_IFSPACE 2
-#define MULTIROW_IFNEEDED 3
-
-#define CLC_GROUPALIGN_LEFT 0
-#define CLC_GROUPALIGN_RIGHT 1
-#define CLC_GROUPALIGN_AUTO 2
-
-struct TCluiData {
- DWORD dwFlags;
- DWORD topOffset, bottomOffset;
- int statusBarHeight;
- int soundsOff;
- BYTE tabSRMM_Avail;
- BYTE bAvatarServiceAvail;
- HICON hIconConnecting;
- DWORD winFlags;
- DWORD winFlagsEx;
- int notifyActive;
- int hIconNotify;
- HMENU hMenuNotify;
- int iLastEventAdded;
- int wNextMenuID;
- MCONTACT hUpdateContact;
- DWORD sortTimer;
- BOOL forceResize;
- BOOL neeedSnap;
- COLORREF avatarBorder;
- HBRUSH hBrushAvatarBorder, hBrushColorKey;
- HBRUSH hBrushCLCBk;
- DWORD avatarRadius;
- int avatarSize;
- BOOL bForceRefetchOnPaint;
- BYTE dualRowMode;
- BYTE avatarPadding;
- BYTE cornerRadius;
- BYTE isTransparent;
- BYTE alpha, autoalpha;
- BYTE fadeinout;
- BYTE autosize;
- BYTE gapBetweenFrames;
- BYTE titleBarHeight;
- BYTE bClipBorder, bRowSpacing;
- HBITMAP bmpBackground, hbmBgOld, hbmBg;
- HBITMAP hbmToolbar, hbmToolbarOld;
- HDC hdcBg;
- HDC hdcPic;
- HDC hdcToolbar;
- HBITMAP hbmPicOld;
- BITMAP bminfoBg;
- SIZE dcSize;
- POINT ptW;
- BOOL bWallpaperMode;
- BOOL bNoOfflineAvatars;
- BOOL bEventAreaEnabled;
- BOOL bFullTransparent;
- BOOL bDblClkAvatars;
- BOOL bApplyIndentToBg;
- BOOL bEqualSections;
- DWORD bFilterEffective;
- BOOL bCenterStatusIcons;
- BOOL bSkinnedToolbar;
- BOOL bSkinnedStatusBar;
- BOOL bUsePerProto;
- BOOL bOverridePerStatusColors;
- BOOL bDontSeparateOffline;
- TCHAR groupFilter[2048];
- char protoFilter[2048];
- char varFilter[2048];
- DWORD lastMsgFilter;
- char current_viewmode[256], old_viewmode[256];
- BYTE boldHideOffline;
- DWORD statusMaskFilter;
- DWORD stickyMaskFilter;
- DWORD filterFlags;
- COLORREF colorkey;
- BOOL bMetaEnabled;
- BOOL bSecIMAvail;
- BOOL bNoTrayTips;
- BOOL bShowLocalTime;
- BOOL bShowLocalTimeSelective;
- BOOL bShowXStatusOnSbar;
- BOOL bLayeredHack;
- HPEN hPen3DBright, hPen3DDark;
- BYTE bSkinnedButtonMode;
- BYTE bFirstRun;
- BYTE bUseDCMirroring;
- BYTE bCLeft, bCRight, bCTop, bCBottom;
- BYTE fullyInited;
- BYTE bAutoExpandGroups;
- SIZE szOldCTreeSize;
- BYTE bWantFastGradients, bUseFastGradients;
- BYTE sortOrder[3];
- BYTE bGroupAlign;
- BYTE bSkinnedScrollbar;
- DWORD langPackCP;
- BOOL fOnDesktop;
- int group_padding;
- DWORD t_now;
- BOOL realTimeSaving;
- TCHAR tszProfilePath[MAX_PATH];
- FILETIME ft;
- SYSTEMTIME st;
-};
-
-#define SORTBY_NAME 1
-#define SORTBY_PROTO 2
-#define SORTBY_STATUS 3
-#define SORTBY_LASTMSG 4
-#define SORTBY_FREQUENCY 5
-#define SORTBY_PRIOCONTACTS 6
-
-struct IconDesc
-{
- char *szName;
- char *szDesc;
- int uId; // icon ID
-};
-
-struct NotifyMenuItemExData
-{
- MCONTACT hContact;
- int iIcon; // icon index in the image list
- HICON hIcon; // corresponding icon handle
- MEVENT hDbEvent;
-};
-
-// #define NOTIFY_HEIGHT 24
-
-struct CluiTopButton
-{
- int ctrlid;
- char *pszButtonID, *pszButtonDn, *pszButtonName;
- int isPush, isVis, isAction;
- HANDLE hButton;
- HWND hwndButton;
-};
-
-struct TrayIconInfo
-{
- union
- {
- HICON hIcon;
- int iIcon;
- };
-};
-
-struct protoMenu
-{
- char protoName[50];
- UINT menuID;
- BOOL added;
- HICON hIcon;
-};
-
-// clcidents.c
-int FindItem(HWND hwnd, struct ClcData *dat, HANDLE hItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible);
-HANDLE ContactToItemHandle(ClcContact *contact, DWORD *nmFlags);
-
-// clcitems.c
-void RebuildEntireList(HWND hwnd, struct ClcData *dat);
-DWORD INTSORT_GetLastMsgTime(MCONTACT hContact);
-
-// clcmsgs.c
-LRESULT ProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPARAM wParam, LPARAM lParam);
-
-// clcutils.c
-void SetGroupExpand(HWND hwnd, struct ClcData *dat, ClcGroup *group, int newState);
-void DoSelectionDefaultAction(HWND hwnd, struct ClcData *dat);
-int FindRowByText(HWND hwnd, struct ClcData *dat, const TCHAR *text, int prefixOk);
-void BeginRenameSelection(HWND hwnd, struct ClcData *dat);
-int HitTest(HWND hwnd, struct ClcData *dat, int testx, int testy, ClcContact **contact, ClcGroup **group, DWORD *flags);
-void ScrollTo(HWND hwnd, struct ClcData *dat, int desty, int noSmooth);
-void RecalcScrollBar(HWND hwnd, struct ClcData *dat);
-size_t MY_pathToRelative(const TCHAR *pSrc, TCHAR *pOut);
-size_t MY_pathToAbsolute(const TCHAR *pSrc, TCHAR *pOut);
-
-#define DROPTARGET_OUTSIDE 0
-#define DROPTARGET_ONSELF 1
-#define DROPTARGET_ONNOTHING 2
-#define DROPTARGET_ONGROUP 3
-#define DROPTARGET_ONCONTACT 4
-#define DROPTARGET_INSERTION 5
-int GetDropTargetInformation(HWND hwnd, struct ClcData *dat, POINT pt);
-void LoadClcOptions(HWND hwnd, struct ClcData *dat, BOOL bFirst);
-void RecalculateGroupCheckboxes(HWND hwnd, struct ClcData *dat);
-void SetGroupChildCheckboxes(ClcGroup *group, int checked);
-BYTE GetCachedStatusMsg(TExtraCache* p, char *szProto);
-int __fastcall GetStatusOnlineness(int status);
-void GetExtendedInfo(ClcContact *contact, struct ClcData *dat);
-extern LRESULT CALLBACK NewStatusBarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
-void HideShowNotifyFrame();
-DWORD GetCLUIWindowStyle(BYTE style);
-void ApplyCLUIBorderStyle();
-
-int FrameNCCalcSize(HWND hwnd, WNDPROC oldWndProc, WPARAM wParam, LPARAM lParam, BOOL hasTitleBar);
-int FrameNCPaint(HWND hwnd, WNDPROC oldWndProc, WPARAM wParam, LPARAM lParam, BOOL hasTitleBar);
-
-void FreeProtocolData( void );
-
-void GetClientID(ClcContact *contact, char *client);
-int LoadCLCButtonModule(void);
-void SetButtonStates();
-void ConfigureCLUIGeometry(int mode);
-void IcoLibReloadIcons();
-int CompareContacts(const ClcContact* p1, const ClcContact* p2);
-void PaintNotifyArea(HDC hDC, RECT *rc);
-int AvatarChanged(WPARAM wParam, LPARAM lParam);
-void ConfigureFrame();
-void ConfigureEventArea();
-void ClearIcons(int mode);
-void SkinDrawBg(HWND hwnd, HDC hdc);
-int GetBasicFontID(ClcContact * contact);
-extern int __fastcall CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szStatus, struct ClcData *dat);
-void CreateViewModeFrame();
-int GetExtraCache(MCONTACT hContact, char *szProto);
-void ReloadExtraInfo(MCONTACT hContact);
-void LoadAvatarForContact(ClcContact *p);
-void ApplyViewMode(const char *name);
-
-void ClcSetButtonState(int ctrlId, int status);
-HWND ClcGetButtonWindow(int ctrlid);
-
-// clcpaint.c
-void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT *rcPaint);
-void __inline PaintItem(HDC hdcMem, ClcGroup *group, ClcContact *contact, int indent, int y, struct ClcData *dat, int index, HWND hwnd, DWORD style, RECT *clRect, BOOL *bFirstNGdrawn, int groupCountsFontTopShift, int rowHeight);
-void Reload3dBevelColors();
-void ReloadThemedOptions();
-void SetButtonToSkinned();
-void RTL_DetectAndSet(ClcContact *contact, MCONTACT hContact);
-void RTL_DetectGroupName(ClcContact *group);
-void CLN_LoadAllIcons(BOOL mode);
-void ReloadSkinItemsToCache();
-
-// clcopts.c
-int ClcOptInit(WPARAM wParam, LPARAM lParam);
-void GetFontSetting(int i, LOGFONTA *lf, COLORREF *colour);
-void CluiProtocolStatusChanged(int, const char*);
-
-void LoadSkinItemToCache(struct TExtraCache *cEntry);
-
-// Docking.c
-
-int Docking_IsDocked(WPARAM wParam, LPARAM lParam);
-
-// Buttons
-
-#define BUTTONSETIMLICON (WM_USER+20)
-#define BUTTONSETSKINNED (WM_USER+21)
-#define BUTTONSETBTNITEM (WM_USER+22)
-#define BUTTONSETTTBUTTON (WM_USER+23)
-
-// Menus
-
-void IMG_DeleteItems();
-int CoolSB_SetupScrollBar();
-
-#define NIIF_INTERN_UNICODE 0x00000100
-
-#define SETTING_WINDOWSTYLE_DEFAULT 0
-
-#define SETTING_TRAYICON_SINGLE 0
-#define SETTING_TRAYICON_CYCLE 1
-#define SETTING_TRAYICON_MULTI 2
-
-#define SETTING_STATE_HIDDEN 0
-#define SETTING_STATE_MINIMIZED 1
-#define SETTING_STATE_NORMAL 2
-
-#define SETTING_BRINGTOFRONT_DEFAULT 0
-
-#define SETTING_WINDOWSTYLE_TOOLWINDOW 1
-#define SETTING_WINDOWSTYLE_THINBORDER 2
-#define SETTING_WINDOWSTYLE_NOBORDER 3
-
-#define CLCHT_ONAVATAR 0x2000
-#define CLCHT_ONITEMSPACE 0x4000
-
-#define CLM_SETEXTRAIMAGEINT (CLM_FIRST+101)
-#define CLM_SETSTICKY (CLM_FIRST+100)
-#define CLM_ISMULTISELECT (CLM_FIRST+102)
-#define CLM_SETEXTRAIMAGEINTMETA (CLM_FIRST+104)
-#define CLM_GETSTATUSMSG (CLM_FIRST+105)
-#define CLM_SETHIDESUBCONTACTS (CLM_FIRST+106)
-#define CLM_TOGGLEPRIORITYCONTACT (CLM_FIRST+107)
-#define CLM_QUERYPRIORITYCONTACT (CLM_FIRST+108)
-
-#define IDC_RESETMODES 110
-#define IDC_SELECTMODE 108
-#define IDC_CONFIGUREMODES 109
-
-#define NR_CLIENTS 40
-
-typedef BOOL (WINAPI *PGF)(HDC, PTRIVERTEX, ULONG, PVOID, ULONG, ULONG);
-
-#define IDC_STBHIDEOFFLINE IDC_TBHIDEOFFLINE - 20
-#define IDC_STBHIDEGROUPS IDC_TBHIDEGROUPS - 20
-#define IDC_STBSOUND IDC_TBSOUND - 20
-#define IDC_STBFINDANDADD IDC_TBFINDANDADD - 20
-#define IDC_STBOPTIONS IDC_TBOPTIONS - 20
-#define IDC_STBMINIMIZE IDC_TBMINIMIZE - 20
-#define IDC_STABSRMMSLIST IDC_TABSRMMSLIST - 20
-#define IDC_STABSRMMMENU IDC_TABSRMMMENU - 20
-#define IDC_STBSELECTVIEWMODE IDC_TBSELECTVIEWMODE - 20
-#define IDC_STBCLEARVIEWMODE IDC_TBCLEARVIEWMODE - 20
-#define IDC_STBCONFIGUREVIEWMODE IDC_TBCONFIGUREVIEWMODE - 20
-#define IDC_STBTOPMENU IDC_TBTOPMENU - 20
-#define IDC_STBTOPSTATUS IDC_TBTOPSTATUS - 20
-#define IDC_STBFOLDER IDC_TBFOLDER - 20
-#define IDC_STBPOPUP IDC_TBPOPUP - 20
-#define IDC_STBACCOUNTS IDC_TBACCOUNTS - 20
diff --git a/plugins/Clist_nicer/src/Include/clist.h b/plugins/Clist_nicer/src/Include/clist.h
deleted file mode 100644
index 6f9a0622ed..0000000000
--- a/plugins/Clist_nicer/src/Include/clist.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-
-Miranda NG: the free IM client for Microsoft* Windows*
-
-Copyright (ñ) 2012-15 Miranda NG project (http://miranda-ng.org),
-Copyright (c) 2000-03 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.
-*/
-
-void LoadContactTree(void);
-int IconFromStatusMode(const char *szProto, int status, MCONTACT hContact, HICON *phIcon);
-HTREEITEM GetTreeItemByHContact(MCONTACT hContact);
-void SortContacts(void);
-
-#define CLUIINTM_REDRAW (WM_USER+100)
-#define CLUIINTM_STATUSBARUPDATE (WM_USER+101)
-#define CLUIINTM_REMOVEFROMTASKBAR (WM_USER+102)
-
-#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_MODULE "CLVM_W"
diff --git a/plugins/Clist_nicer/src/Include/commonheaders.h b/plugins/Clist_nicer/src/Include/commonheaders.h
deleted file mode 100644
index a7cd57a950..0000000000
--- a/plugins/Clist_nicer/src/Include/commonheaders.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-
-Miranda NG: the free IM client for Microsoft* Windows*
-
-Copyright (ñ) 2012-15 Miranda NG project (http://miranda-ng.org),
-Copyright (c) 2000-03 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.
-*/
-
-#define _CRT_SECURE_NO_WARNINGS
-
-#undef FASTCALL
-
-#define TSAPI __stdcall
-#define FASTCALL __fastcall
-
-#include <windows.h>
-#include <windowsx.h>
-#include <shlwapi.h>
-#include <Richedit.h>
-
-#include <uxtheme.h>
-#include <vssym32.h>
-#include <time.h>
-
-#include <newpluginapi.h>
-#include <win2k.h>
-#include <m_clist.h>
-#include <m_database.h>
-#include <m_system_cpp.h>
-#include <m_langpack.h>
-#include <m_avatars.h>
-#include <m_button.h>
-#include <m_options.h>
-#include <m_protosvc.h>
-#include <m_skin.h>
-#include <m_addcontact.h>
-#include <m_timezones.h>
-#include <m_cluiframes.h>
-#include <m_clui.h>
-#include <m_icolib.h>
-#include <m_fontservice.h>
-#include <m_xstatus.h>
-#include <m_extraicons.h>
-#include <m_string.h>
-
-#include <m_metacontacts.h>
-#include <m_cln_skinedit.h>
-
-#include "resource.h"
-#include "Version.h"
-#include "extbackg.h"
-#include "clc.h"
-#include "config.h"
-#include "clist.h"
-#include "alphablend.h"
-#include "rowheight_funcs.h"
-
-// shared vars
-extern HINSTANCE g_hInst;
-extern LONG g_cxsmIcon, g_cysmIcon;
-extern LIST<StatusItems_t> arStatusItems;
-extern ImageItem *g_glyphItem;
-
-extern CLIST_INTERFACE coreCli;
-
-typedef int (__cdecl *pfnDrawAvatar)(HDC hdcOrig, HDC hdcMem, RECT *rc, ClcContact *contact, int y, struct ClcData *dat, int selected, WORD cstatus, int rowHeight);
-
-BOOL __forceinline GetItemByStatus(int status, StatusItems_t *retitem);
-
-void DrawAlpha(HDC hdcwnd, PRECT rc, DWORD basecolor, int alpha, DWORD basecolor2, BOOL transparent, BYTE FLG_GRADIENT, BYTE FLG_CORNER, DWORD BORDERSTYLE, ImageItem *item);
-
-void CustomizeButton(HWND hWnd, bool bIsSkinned, bool bIsThemed, bool bIsFlat = false, bool bIsTTButton = false);
diff --git a/plugins/Clist_nicer/src/Include/config.h b/plugins/Clist_nicer/src/Include/config.h
deleted file mode 100644
index c833107fe3..0000000000
--- a/plugins/Clist_nicer/src/Include/config.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-
-Miranda NG: the free IM client for Microsoft* Windows*
-
-Copyright (ñ) 2012-15 Miranda NG project (http://miranda-ng.org),
-Copyright (c) 2000-03 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.
-*/
-
-#include <stdexcept>
-
-#ifndef __CONFIG_H_
-#define __CONFIG_H_
-
-#define DEFAULT_MODULE "Clist"
-
-#define IS_THEMED (API::sysState.isThemed)
-#define IS_AERO (API::sysState.isAero)
-
-typedef HRESULT (WINAPI *pfnDwmExtendFrameIntoClientArea_t)(HWND hwnd, const MARGINS *margins);
-typedef HRESULT (WINAPI *pfnDwmIsCompositionEnabled_t)(BOOL *);
-
-class CRTException : public std::runtime_error
-{
-public:
- CRTException(const char *szMsg, const TCHAR *szParam);
- ~CRTException() {}
-
- void display() const;
-
-private:
- TCHAR m_szParam[MAX_PATH];
-};
-
-class cfg
-{
-public:
- static DWORD getDword(const MCONTACT hContact, const char *szModule, const char *szSetting, DWORD uDefault);
- static DWORD getDword(const char *szModule, const char *szSetting, DWORD uDefault);
- static DWORD getDword(const char *szSetting, DWORD uDefault);
-
- static WORD getWord(const MCONTACT hContact, const char *szModule, const char *szSetting, WORD uDefault);
- static WORD getWord(const char *szModule, const char *szSetting, WORD uDefault);
- static WORD getWord(const char *szSetting, WORD uDefault);
-
- static int getByte(const MCONTACT hContact, const char *szModule, const char *szSetting, int uDefault);
- static int getByte(const char *szModule, const char *szSetting, int uDefault);
- static int getByte(const char *szSetting, int uDefault);
-
- static INT_PTR getTString(const MCONTACT hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv);
- static INT_PTR getString(const MCONTACT hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv);
-
- static INT_PTR writeDword(const MCONTACT hContact, const char *szModule, const char *szSetting, DWORD value);
- static INT_PTR writeDword(const char *szModule, const char *szSetting, DWORD value);
-
- static INT_PTR writeWord(const MCONTACT hContact, const char *szModule, const char *szSetting, WORD value);
- static INT_PTR writeWord(const char *szModule, const char *szSetting, WORD value);
-
- static INT_PTR writeByte(const MCONTACT hContact, const char *szModule, const char *szSetting, BYTE value);
- static INT_PTR writeByte(const char *szModule, const char *szSetting, BYTE value);
-
- static INT_PTR writeTString(const MCONTACT hContact, const char *szModule, const char *szSetting, const TCHAR *st);
- static INT_PTR writeString(const MCONTACT hContact, const char *szModule, const char *szSetting, const char *st);
-
- static TExtraCache* getCache(const MCONTACT hContact, const char *szProto);
-
-public:
- static TCluiData dat;
- static ClcData* clcdat;
-
- static LIST<TExtraCache> arCache;
-
- static bool shutDown;
-};
-
-struct TSysConfig {
- bool isVistaPlus;
- bool isSevenPlus;
-};
-
-struct TSysState {
- bool isThemed;
- bool isAero;
- bool isDwmActive;
-};
-
-class API
-{
-public:
- static void onInit ();
- static void updateState ();
-
- static void Ex_CopyEditToClipboard (HWND hWnd);
- static INT_PTR CALLBACK Ex_DlgProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
- static void Ex_Handler ();
- static int Ex_ShowDialog (EXCEPTION_POINTERS *ep, const char *szFile, int line, TCHAR* szReason, bool fAllowContinue);
-
- static pfnDwmExtendFrameIntoClientArea_t pfnDwmExtendFrameIntoClientArea;
- static pfnDwmIsCompositionEnabled_t pfnDwmIsCompositionEnabled;
-
- static TSysConfig sysConfig;
- static TSysState sysState;
-
- static EXCEPTION_RECORD exRecord;
- static CONTEXT exCtx;
- static LRESULT exLastResult;
- static char exSzFile[MAX_PATH];
- static TCHAR exReason[256];
- static int exLine;
- static bool exAllowContinue;
-
- static HMODULE hDwm;
-};
-
-
-class Utils
-{
-public:
- static void TSAPI enableDlgControl(const HWND hwnd, UINT id, BOOL fEnable);
- static void TSAPI showDlgControl(const HWND hwnd, UINT id, int showCmd);
- static HMODULE loadSystemLibrary(const TCHAR* szFilename, bool useGetHandle = false);
-
-};
-
-#endif /* __CONFIG_H_*/
diff --git a/plugins/Clist_nicer/src/Include/extBackg.h b/plugins/Clist_nicer/src/Include/extBackg.h
deleted file mode 100644
index 9b98c283ee..0000000000
--- a/plugins/Clist_nicer/src/Include/extBackg.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-
-Miranda NG: the free IM client for Microsoft* Windows*
-
-Copyright (ñ) 2012-15 Miranda NG project (http://miranda-ng.org),
-Copyright (c) 2000-03 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.
-*/
-
-#define ID_EXTBKIDLE 40081
-#define ID_EXTBKEXPANDEDGROUP 40082
-#define ID_EXTBKCOLLAPSEDDGROUP 40083
-#define ID_EXTBKEMPTYGROUPS 40084
-#define ID_EXTBKFIRSTITEM 40085
-#define ID_EXTBKSINGLEITEM 40086
-#define ID_EXTBKLASTITEM 40087
-
-
-#define ID_EXTBKFIRSTITEM_NG 40088
-#define ID_EXTBKSINGLEITEM_NG 40089
-#define ID_EXTBKLASTITEM_NG 40090
-
-#define ID_EXTBKEVEN_CNTCTPOS 40091
-#define ID_EXTBKODD_CNTCTPOS 40092
-
-#define ID_EXTBKSELECTION 40093
-#define ID_EXTBKHOTTRACK 40094
-#define ID_EXTBKFRAMETITLE 40095
-#define ID_EXTBKEVTAREA 40096
-#define ID_EXTBKSTATUSBAR 40097
-#define ID_EXTBKBUTTONBAR 40098
-#define ID_EXTBKBUTTONSPRESSED 40099
-#define ID_EXTBKBUTTONSNPRESSED 40100
-#define ID_EXTBKBUTTONSMOUSEOVER 40101
-#define ID_EXTBKTBBUTTONSPRESSED 40102
-#define ID_EXTBKTBBUTTONSNPRESSED 40103
-#define ID_EXTBKTBBUTTONMOUSEOVER 40104
-#define ID_EXTBKSTATUSFLOATER 40105
-#define ID_EXTBKOWNEDFRAMEBORDER 40106
-#define ID_EXTBKOWNEDFRAMEBORDERTB 40107
-#define ID_EXTBKAVATARFRAME 40108
-#define ID_EXTBKAVATARFRAMEOFFLINE 40109
-#define ID_EXTBKSCROLLBACK 40110
-#define ID_EXTBKSCROLLBACKLOWER 40111
-#define ID_EXTBKSCROLLTHUMB 40112
-#define ID_EXTBKSCROLLTHUMBHOVER 40113
-#define ID_EXTBKSCROLLTHUMBPRESSED 40114
-#define ID_EXTBKSCROLLBUTTON 40115
-#define ID_EXTBKSCROLLBUTTONHOVER 40116
-#define ID_EXTBKSCROLLBUTTONPRESSED 40117
-#define ID_EXTBKSCROLLARROWUP 40118
-#define ID_EXTBKSCROLLARROWDOWN 40119
-#define ID_EXTBK_LAST_D 40119
-
-#define ID_EXTBKSEPARATOR 40200
-
-BOOL CheckItem(int item, HWND hwndDlg);
-BOOL isValidItem(void);
-void extbk_export(const TCHAR *file);
-void extbk_import(const TCHAR *file, HWND hwndDlg);
-
-void LoadExtBkSettingsFromDB();
-void IMG_LoadItems();
-void __fastcall IMG_RenderImageItem(HDC hdc, ImageItem *item, RECT *rc);
-void IMG_InitDecoder();
-void LoadPerContactSkins(const TCHAR *file);
-
-static void SaveCompleteStructToDB();
-StatusItems_t *GetProtocolStatusItem(const char *szProto);
-
-void OnListItemsChange(HWND hwndDlg);
-
-void UpdateStatusStructSettingsFromOptDlg(HWND hwndDlg, int index);
-
-void SaveNonStatusItemsSettings(HWND hwndDlg);
-
-void FillItemList(HWND hwndDlg);
-void FillOptionDialogByCurrentSel(HWND hwndDlg);
-void ReActiveCombo(HWND hwndDlg);
-//BOOL __fastcall GetItemByStatus(int status, StatusItems_t *retitem);
-
-void FillOptionDialogByStatusItem(HWND hwndDlg, StatusItems_t *item);
diff --git a/plugins/Clist_nicer/src/Include/resource.h b/plugins/Clist_nicer/src/Include/resource.h
deleted file mode 100644
index abb763ae2e..0000000000
--- a/plugins/Clist_nicer/src/Include/resource.h
+++ /dev/null
@@ -1,390 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by ..\res\resource.rc
-//
-#define IDD_OPT_VIEWMODES 1
-#define IDD_OPT_SKIN 4
-#define IDD_QUICKIGNORE 5
-#define IDD_OPT 6
-#define IDD_EXCEPTION 20
-#define IDD_OPTIONSDIALOG 101
-#define IDD_CLNABOUT 102
-#define IDD_OPT_CLIST 126
-#define IDI_ADDGROUP 143
-#define IDI_CLIST 146
-#define IDI_OPTIONS 163
-#define IDI_DELETE 175
-#define IDI_CLVM_OPTIONS 176
-#define IDI_CLVM_SELECT 177
-#define IDR_CONTEXT 180
-#define IDC_DROP 183
-#define IDR_CLISTMENU 199
-#define IDI_BLANK 200
-#define IDI_ADDCONTACT 210
-#define IDC_HYPERLINKHAND 214
-#define IDC_DROPUSER 215
-#define IDD_OPT_CLUI 218
-#define IDD_OPT_ICONS 220
-#define IDD_OPT_CLC 228
-#define IDD_OPT_CLCBKG 230
-#define IDD_OPT_SBAR 234
-#define IDD_DELETECONTACT 254
-#define IDD_OPT_DSPADVANCED 301
-#define IDD_OPT_DSPITEMS 302
-#define IDD_OPT_DSPGROUPS 303
-#define IDC_ACTIVEPERC 1000
-#define IDC_OPTIONSTAB 1000
-#define IDC_ALWAYSSTATUS 1009
-#define IDC_APPLY 1011
-#define IDC_AUTOSIZE 1013
-#define IDC_AUTOSIZEUPWARD 1014
-#define IDC_AVATARSIZESPIN 1015
-#define IDC_SKINMODE 1020
-#define IDC_FULLTRANSPARENT 1020
-#define IDC_STATUSICONSCENTERED 1020
-#define IDC_NOTRAYINFOTIPS 1020
-#define IDC_SHOWXSTATUS 1020
-#define IDC_AUTOCLEAR 1020
-#define IDC_FLT_SIMPLELAYOUT 1020
-#define IDC_USESKIN 1020
-#define IDC_IGN_MSGEVENTS 1020
-#define IDC_AUTOCLEARVAL 1021
-#define IDC_MARKLOCKED 1021
-#define IDC_IGN_FILEEVENTS 1021
-#define IDC_AUTOCLEARSPIN 1022
-#define IDC_IGN_URLEVENTS 1022
-#define IDC_LASTMSG 1023
-#define IDC_IGN_AUTH 1023
-#define IDC_IGN_ADD 1024
-#define IDC_CONFIRMDELETE 1025
-#define IDC_IGN_ONLINE 1025
-#define IDC_IGN_ALWAYSONLINE 1026
-#define IDC_IGN_ALWAYSOFFLINE 1027
-#define IDC_IGN_PRIORITY 1028
-#define IDC_DISABLEGROUPS 1030
-#define IDC_DROPSHADOW 1035
-#define IDC_EQUALSELECTION 1040
-#define IDC_USEPERPROTO 1041
-#define IDC_OVERRIDEPERSTATUSCOLOR 1042
-#define IDC_EVENTAREASUNKEN 1043
-#define IDC_SETALLBUTTONSKINNED 1043
-#define IDC_EVENTSONTOP 1044
-#define IDC_FASTGRADIENT 1044
-#define IDC_DONTSEPARATE 1045
-#define IDC_FADEINOUT 1056
-#define IDC_FRAMEGAP 1064
-#define IDC_FRAMEGAPSPIN 1065
-#define IDC_CLIPBORDER 1066
-#define IDC_FULLROWSELECT 1067
-#define IDC_CLIPBORDERSPIN 1067
-#define IDC_LOCALTIME 1068
-#define IDC_CLEFT 1070
-#define IDC_CLEFTSPIN 1071
-#define IDC_GREYOUT 1072
-#define IDC_CTOP 1072
-#define IDC_ONTOP 1074
-#define IDC_SHOWMAINMENU 1075
-#define IDC_CLIENTDRAG 1076
-#define IDC_HIDEEMPTYGROUPS 1077
-#define IDC_CTOPSPIN 1077
-#define IDC_CBOTTOM 1078
-#define IDC_CBOTTOMSPIN 1079
-#define IDC_CRIGHT 1080
-#define IDC_HIDEOFFLINE 1081
-#define IDC_CRIGHTSPIN 1081
-#define IDC_HIDEOFFLINEOPTS 1082
-#define IDC_LEFTMARGINSPIN 1092
-#define IDC_NOGROUPICON 1102
-#define IDC_ONECLK 1105
-#define IDC_RIGHTMARGIN 1121
-#define IDC_ROWGAP 1122
-#define IDC_TRANSPARENT 1124
-#define IDC_ROWHEIGHT 1125
-#define IDC_TRANSINACTIVE 1126
-#define IDC_GROUPROWHEIGHT 1126
-#define IDC_TRANSACTIVE 1128
-#define IDC_PROFILELIST 1134
-#define IDC_CLASSLIST 1135
-#define IDC_SELBLEND 1140
-#define IDC_SHOWBOTTOMBUTTONS 1148
-#define IDC_STATIC11 1154
-#define IDC_STATIC12 1155
-#define IDC_STATIC21 1156
-#define IDC_STATIC13 1156
-#define IDC_STATIC22 1157
-#define IDC_STATIC14 1157
-#define IDC_STATIC15 1158
-#define IDC_SHOWGRIP 1169
-#define IDC_SKINBACKGROUND 1170
-#define IDC_FILLWALLPAPER 1171
-#define IDC_SHOWMETA 1172
-#define IDC_CENTERGROUPNAMES 1173
-#define IDC_APPLYINDENTBG 1174
-#define IDC_COPYRIGHT 1178
-#define IDC_VERSION 1179
-#define IDC_SHOWSTATUSICONS 1180
-#define IDC_BROWSE 1184
-#define IDC_INACTIVEPERC 1187
-#define IDC_SHOWSTATUSMSG 1188
-#define IDC_SHOWLOCALTIME 1189
-#define IDC_SHOWLOCALTIMEONLYWHENDIFFERENT 1191
-#define IDC_TITLETEXT 1196
-#define IDC_EXCEPTION_DETAILS 1200
-#define IDC_COPY_EXCEPTION 1201
-#define IDC_EX_REASON 1202
-#define IDC_TILEH 1208
-#define IDC_WHITERECT 1225
-#define IDC_AUTOHIDE 1235
-#define IDC_HIDETIME 1236
-#define IDC_ALWAYSHIDEONTASKBAR 1237
-#define IDC_IMPORT 1241
-#define IDC_MAXSIZEHEIGHT 1254
-#define IDC_MAXSIZESPIN 1255
-#define IDC_BKGCOLOUR 1269
-#define IDC_FILENAME 1271
-#define IDC_SCROLL 1277
-#define IDC_PROPORTIONAL 1278
-#define IDC_SMOOTHTIME 1283
-#define IDC_SMOOTHTIMESPIN 1284
-#define IDC_ROWHEIGHTSPIN 1286
-#define IDC_GROUPROWHEIGHTSPIN 1287
-#define IDC_GREYOUTOPTS 1288
-#define IDC_GROUPINDENT 1289
-#define IDC_GROUPINDENTSPIN 1290
-#define IDC_LEFTMARGIN 1291
-#define IDC_RIGHTMARGINSPIN 1294
-#define IDC_ROWGAPSPIN 1295
-#define IDC_STRETCHH 1298
-#define IDC_STRETCHV 1299
-#define IDC_TILEV 1301
-#define IDC_DONTCYCLE 1315
-#define IDC_PRIMARYSTATUS 1316
-#define IDC_CYCLE 1317
-#define IDC_CYCLETIME 1318
-#define IDC_CYCLETIMESPIN 1319
-#define IDC_HIDETIMESPIN 1320
-#define IDC_MULTITRAY 1321
-#define IDC_ALWAYSMULTI 1322
-#define IDC_SHOWICON 1323
-#define IDC_SORTTHEN 1323
-#define IDC_SHOWPROTO 1324
-#define IDC_SORTFINALLY 1324
-#define IDC_SHOWSTATUS 1325
-#define IDC_EQUALSECTIONS 1326
-#define IDC_SHOWSBAR 1329
-#define IDC_RIGHTMIRANDA 1330
-#define IDC_RIGHTSTATUS 1331
-#define IDC_STCLISTGROUP 1350
-#define IDC_DISABLEDRAGDROP 1351
-#define IDC_NOTEDITLABELS 1352
-#define IDC_SHOWSELALWAYS 1353
-#define IDC_TRACKSELECT 1354
-#define IDC_SHOWGROUPCOUNTS 1355
-#define IDC_HIDECOUNTSWHENEMPTY 1356
-#define IDC_DIVIDERONOFF 1357
-#define IDC_NOTNOTRANSLUCENTSEL 1358
-#define IDC_LINEWITHGROUPS 1359
-#define IDC_QUICKSEARCHVISONLY 1360
-#define IDC_SORTGROUPSALPHA 1361
-#define IDC_NOTNOSMOOTHSCROLLING 1362
-#define IDC_BITMAP 1363
-#define IDC_STWINDOWGROUP 1364
-#define IDC_STATIC01 1365
-#define IDC_SORTPRIMARY 1420
-#define IDC_HIDE 1534
-#define IDC_TOPLINE 1535
-#define IDC_BRINGTOFRONT 1579
-#define IDC_LOGO 1591
-#define IDC_BLINKTIME 1607
-#define IDC_BLINKSPIN 1608
-#define IDC_DISABLEBLINK 1609
-#define IDC_IDLE 1610
-#define IDC_SBPANELBEVEL 1611
-#define IDC_DBLCLKAVATARS 1611
-#define IDC_XSTATUSASSTATUS 1611
-#define IDC_NOSCROLLBAR 1613
-#define IDC_ADDVIEWMODE 1633
-#define IDC_SKINFILESELECT 1633
-#define IDC_IGN_ALL 1633
-#define IDC_EXPORT 1634
-#define IDC_DELETEVIEWMODE 1634
-#define IDC_IGN_NONE 1634
-#define IDC_RELOAD 1635
-#define IDC_IGN_ADDPERMANENTLY 1635
-#define IDC_DSP_LOADDEFAULT 1636
-#define IDC_ONDESKTOP 1657
-#define IDC_WINCOLOUR 1659
-#define IDC_ICONBLINK 1660
-#define IDC_APPLYLASTVIEWMODE 1661
-#define IDC_IGNORESELFORGROUPS 1722
-#define IDC_CLISTAVATARS 1729
-#define IDC_ALIGNMENT 1730
-#define IDC_AVATARSBORDER 1732
-#define IDC_AVATARBORDERCLR 1733
-#define IDC_AVATARSROUNDED 1734
-#define IDC_DUALROWMODE 1735
-#define IDC_CLISTALIGN 1737
-#define IDC_CLISTSUNKEN 1738
-#define IDC_EVENTAREAAUTOHIDE 1740
-#define IDC_RADIUS 1742
-#define IDC_RADIUSSPIN 1743
-#define IDC_ALWAYSALIGNNICK 1744
-#define IDC_SELECTIVEICONS 1746
-#define IDC_OVERLAYICONS 1747
-#define IDC_AVATARHEIGHT 1748
-#define IDC_NOAVATARSOFFLINE 1749
-#define IDC_CORNERRAD 1751
-#define IDC_CORNERSPIN 1752
-#define IDC_AVATARPADDING 1753
-#define IDC_GRPTOPPADDING 1753
-#define IDC_AVATARPADDINGSPIN 1754
-#define IDC_GRPPADDINGSPIN 1754
-#define IDC_LASTITEMPADDING 1755
-#define IDC_LASTITEMPADDINGSPIN 1756
-#define IDC_TBHIDEOFFLINE 1800
-#define IDC_TBHIDEGROUPS 1801
-#define IDC_TBSOUND 1802
-#define IDC_TBFINDANDADD 1803
-#define IDC_TBOPTIONS 1804
-#define IDC_TBMINIMIZE 1805
-#define IDC_TBMENU 1806
-#define IDC_TBGLOBALSTATUS 1807
-#define IDC_TABSRMMSLIST 1808
-#define IDC_TABSRMMMENU 1809
-#define IDC_TBSELECTVIEWMODE 1810
-#define IDC_ROUNDEDBORDER 1810
-#define IDC_TBCLEARVIEWMODE 1811
-#define IDC_TBCONFIGUREVIEWMODE 1812
-#define IDC_TBTOPMENU 1813
-#define IDC_TBTOPSTATUS 1814
-#define IDC_TBFOLDER 1815
-#define IDC_TBPOPUP 1816
-#define IDC_TBACCOUNTS 1817
-#define IDC_TBFIRSTUID 1820
-#define IDC_NOTIFYBUTTON 1900
-#define IDC_CLNICER 2002
-#define IDC_SUPPORT 2003
-#define IDI_OVL_OFFLINE 2050
-#define IDI_OVL_ONLINE 2051
-#define IDI_OVL_AWAY 2052
-#define IDI_OVL_DND 2053
-#define IDI_OVL_NA 2054
-#define IDI_OVL_OCCUPIED 2055
-#define IDI_OVL_INVISIBLE 2057
-#define IDI_OVL_ONTHEPHONE 2058
-#define IDI_OVL_OUTTOLUNCH 2059
-#define IDI_HIDEOFFLINE 2100
-#define IDI_HIDEGROUPS 2101
-#define IDI_SOUNDSON 2102
-#define IDI_FINDANDADD 2103
-#define IDI_TBOPTIONS 2104
-#define IDI_MINIMIZE 2105
-#define IDI_SOUNDSOFF 2106
-#define IDI_TABSRMMSESSIONLIST 2107
-#define IDI_TABSRMMMENU 2108
-#define IDI_PROTOCONNECTING 2111
-#define IDI_TBTOPMENU 2112
-#define IDI_TBACCOUNTS 2113
-#define IDC_FLT_DEFHOVERTIME 2200
-#define IDC_CLUIFRAMESBDR 25492
-#define IDC_FLT_PADLEFTSPIN 25494
-#define IDC_FLT_PADLEFT 25495
-#define IDC_GROUPALIGN 25499
-#define IDC_BORDERSTYLE 25501
-#define IDC_CURVIEWMODE2 25503
-#define ID_ICQ_EXIT 40001
-#define IDC_STATIC7 40002
-#define POPUP_HIDEEMPTYGROUPS 40003
-#define POPUP_NEWSUBGROUP 40004
-#define POPUP_HIDEOFFLINE 40005
-#define POPUP_GROUPHIDEOFFLINE 40006
-#define POPUP_HIDEOFFLINEROOT 40007
-#define POPUP_DISABLEGROUPS 40008
-#define IDC_VIEWMODES 40010
-#define IDC_PROTOCOLS 40011
-#define IDC_GROUPS 40012
-#define IDC_STATUSMODES 40013
-#define IDC_NEWVIEMODE 40014
-#define POPUP_HIDEMIRANDA 40017
-#define IDC_TAB 40017
-#define IDC_STATIC1 40018
-#define IDC_STATIC2 40019
-#define IDC_STATIC3 40020
-#define IDC_STATIC16 40021
-#define IDC_STATIC4 40022
-#define IDC_STATIC5 40023
-#define IDC_CLIST 40025
-#define IDC_STATIC8 40026
-#define IDC_STATIC9 40027
-#define POPUP_BUTTONS 40028
-#define IDC_CLEARALL 40028
-#define POPUP_FRAME 40029
-#define IDC_STATIC10 40029
-#define IDC_PROTOGROUPOP 40030
-#define POPUP_MOVEMARKEDHERE 40031
-#define IDC_GROUPSTATUSOP 40031
-#define IDC_LASTMESSAGEOP 40032
-#define ID_BUTTONS_ONLINE 40033
-#define IDC_SKINFILE 40034
-#define IDC_LASTMESSAGEUNIT 40034
-#define IDC_FLT_AVATARS 40036
-#define IDC_HIDECONTACT 40036
-#define IDC_FLT_DUALROWS 40037
-#define IDC_FLT_EXTRAICONS 40038
-#define ID_TRAY_HIDE 40038
-#define ID_TRAY_EXIT 40039
-#define IDC_FLT_SYNCED 40039
-#define POPUP_SHOWMETAICONS 40040
-#define IDC_FLT_AUTOHIDE 40040
-#define IDC_FLT_FILLSTD 40041
-#define IDC_FLT_PADRIGHT 40043
-#define IDC_LASTMSGVALUE 40043
-#define IDC_FLT_PADRIGHTSPIN 40044
-#define IDC_FLT_PADTOP 40045
-#define IDC_SKINFILENAME 40045
-#define IDC_FLT_PADTOPSPIN 40046
-#define IDC_SELECTSKINFILE 40046
-#define IDC_FLT_PADBOTTOM 40047
-#define IDC_RELOADSKIN 40047
-#define IDC_FLT_PADBOTTOMSPIN 40048
-#define IDC_UNLOAD 40048
-#define POPUP_NEWGROUP 40050
-#define IDC_SECONDLINEMODE 40050
-#define POPUP_SHOWSTATUSICONS 40051
-#define IDC_OVERLAYICON 40051
-#define IDC_SHOWLOCALTIME1 40052
-#define POPUP_RENAMEGROUP 40052
-#define POPUP_DELETEGROUP 40053
-#define IDC_DSP_ADD -25483
-#define IDC_DSP_DELETE 40054
-#define IDC_FLT_ENABLED 40054
-#define IDC_DSP_RENAME 40055
-#define IDC_FLT_OPACITY 40055
-#define IDC_DSP_APPLY 40056
-#define IDC_FLT_ACTIVEOPACITY 40056
-#define IDC_FLT_WIDTH 40058
-#define IDC_AVATARDISPMODE 40059
-#define IDC_FLT_WIDTHSPIN 40059
-#define IDC_FLT_SNAP 40060
-#define IDC_FLT_ACTIVEOPACITYVALUE 40061
-#define IDC_FLT_BORDER 40062
-#define IDC_FLT_ROUNDED 40063
-#define IDC_FLT_RADIUS 40065
-#define IDC_FLT_RADIUSSPIN 40066
-#define IDC_FLT_HOVERTIME 40067
-#define IDC_RESETXICONS 40067
-#define IDC_FLT_SHOWTOOLTIPS 40068
-#define IDC_FLT_HOVERTIMESPIN 40069
-#define IDC_FLT_OPACITYVALUE 40070
-#define IDC_FLT_BORDERCOLOUR 40072
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 10
-#define _APS_NEXT_COMMAND_VALUE 40061
-#define _APS_NEXT_CONTROL_VALUE 40066
-#define _APS_NEXT_SYMED_VALUE 40154
-#endif
-#endif
diff --git a/plugins/Clist_nicer/src/Include/rowheight_funcs.h b/plugins/Clist_nicer/src/Include/rowheight_funcs.h
deleted file mode 100644
index 60a0998e1c..0000000000
--- a/plugins/Clist_nicer/src/Include/rowheight_funcs.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef __ROWHEIGHT_FUNCS_H__
-# define __ROWHEIGHT_FUNCS_H__
-
-#define ROW_SPACE_BEETWEEN_LINES 0
-#define ICON_HEIGHT 16
-
-class RowHeight
-{
-public:
- static BOOL Alloc(ClcData *dat, int size);
- static BOOL Init(ClcData *dat);
- static void Free(ClcData *dat);
- static void Clear(ClcData *dat);
-
- // Calc and store max row height
- static int getMaxRowHeight(ClcData *dat, const HWND hwnd);
-
- // Calc and store row height
- static int getRowHeight(ClcData *dat, ClcContact* contact, int item, DWORD style)
- {
- if (!Alloc(dat, item + 1))
- return -1;
-
- int height = dat->fontInfo[GetBasicFontID(contact)].fontHeight;
-
- if (!dat->bisEmbedded) {
- if (contact->bSecondLine != MULTIROW_NEVER && contact->bSecondLine != MULTIROW_IFSPACE && contact->type == CLCIT_CONTACT) {
- if ((contact->bSecondLine == MULTIROW_ALWAYS || ((cfg::dat.dwFlags & CLUI_FRAME_SHOWSTATUSMSG && contact->bSecondLine == MULTIROW_IFNEEDED) && (contact->xStatus > 0 || contact->pExtra->bStatusMsgValid > STATUSMSG_XSTATUSID))))
- height += (dat->fontInfo[FONTID_STATUS].fontHeight + cfg::dat.avatarPadding);
- }
-
- // Avatar size
- if (contact->cFlags & ECF_AVATAR && contact->type == CLCIT_CONTACT && contact->ace != NULL && !(contact->ace->dwFlags & AVS_HIDEONCLIST))
- height = max(height, cfg::dat.avatarSize + cfg::dat.avatarPadding);
- }
-
- // Checkbox size
- if ((style & CLS_CHECKBOXES && contact->type == CLCIT_CONTACT) ||
- (style & CLS_GROUPCHECKBOXES && contact->type == CLCIT_GROUP) ||
- (contact->type == CLCIT_INFO && contact->flags & CLCIIF_CHECKBOX)) {
- height = max(height, dat->checkboxSize);
- }
-
- //height += 2 * dat->row_border;
- // Min size
- height = max(height, contact->type == CLCIT_GROUP ? dat->group_row_height : dat->min_row_heigh);
- height += cfg::dat.bRowSpacing;
-
- dat->row_heights[item] = height;
- //contact->iRowHeight = item;
-
- return height;
- }
-
- // Calc and store row height for all itens in the list
- static void calcRowHeights (ClcData *dat, HWND hwnd);
-
- // Calc item top Y (using stored data)
- static int getItemTopY (ClcData *dat, int item);
-
- // Calc item bottom Y (using stored data)
- static int getItemBottomY (ClcData *dat, int item);
-
- // Calc total height of rows (using stored data)
- static int getTotalHeight (ClcData *dat);
-
- // Return the line that pos_y is at or -1 (using stored data). Y start at 0
- static int hitTest (ClcData *dat, int pos_y);
-
- // Returns the height of the chosen row
- static int getHeight (ClcData *dat, int item);
-};
-
-#endif // __ROWHEIGHT_FUNCS_H__