From ecb177cadbcff850a16c4b9e306beb15f61ac6f9 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 4 Nov 2012 18:51:53 +0000 Subject: kernel extraicons, part II git-svn-id: http://svn.miranda-ng.org/main/trunk@2188 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_nicer/src/Include/clc.h | 54 ++++++++++++------------- plugins/Clist_nicer/src/Include/commonheaders.h | 2 +- plugins/Clist_nicer/src/Include/config.h | 2 +- plugins/Clist_nicer/src/Include/resource.h | 13 ------ 4 files changed, 28 insertions(+), 43 deletions(-) (limited to 'plugins/Clist_nicer/src/Include') diff --git a/plugins/Clist_nicer/src/Include/clc.h b/plugins/Clist_nicer/src/Include/clc.h index 3329cfa76a..eb1ea2b004 100644 --- a/plugins/Clist_nicer/src/Include/clc.h +++ b/plugins/Clist_nicer/src/Include/clc.h @@ -98,14 +98,14 @@ ClcGroup; #define ECF_SECONDLINE 2 struct ContactFloater { - struct ContactFloater *pNextFloater; + ContactFloater *pNextFloater; HWND hwnd; HDC hdc; HBITMAP hbm, hbmOld; HANDLE hContact; }; -typedef struct ContactFloater CONTACTFLOATER; +typedef ContactFloater CONTACTFLOATER; #define DSPF_CENTERSTATUSICON 1 #define DSPF_DIMIDLE 2 @@ -162,21 +162,21 @@ typedef struct DisplayProfileSet DISPLAYPROFILESET; struct TExtraCache { - BYTE iExtraImage[MAXEXTRACOLUMNS]; + WORD iExtraImage[MAXEXTRACOLUMNS]; HANDLE hContact; HANDLE hTimeZone; - DWORD iExtraValid; - BYTE valid; + DWORD iExtraValid; + BYTE valid; TCHAR *statusMsg; - BYTE bStatusMsgValid; - DWORD dwCFlags; - DWORD dwDFlags; // display flags for caching only - DWORD dwXMask; // local extra icon mask, calculated from CLN_xmask + BYTE bStatusMsgValid; + DWORD dwCFlags; + DWORD dwDFlags; // display flags for caching only + DWORD dwXMask; // local extra icon mask, calculated from CLN_xmask StatusItems_t *status_item, *proto_status_item; CONTACTFLOATER *floater; - DWORD dwLastMsgTime; - DWORD msgFrequency; - BOOL isChatRoom; + DWORD dwLastMsgTime; + DWORD msgFrequency; + BOOL isChatRoom; }; struct ClcContact : public ClcContactBase @@ -421,8 +421,8 @@ typedef struct { } protoMenu; //clcidents.c -int FindItem(HWND hwnd, struct ClcData *dat, HANDLE hItem, struct ClcContact **contact, ClcGroup **subgroup, int *isVisible); -HANDLE ContactToItemHandle(struct ClcContact *contact, DWORD *nmFlags); +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); @@ -437,7 +437,7 @@ void SetGroupExpand(HWND hwnd, struct ClcData *dat, ClcGroup *group, int newSta 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, struct ClcContact **contact, ClcGroup **group, DWORD *flags); +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); @@ -455,7 +455,7 @@ void RecalculateGroupCheckboxes(HWND hwnd, struct ClcData *dat); void SetGroupChildCheckboxes(ClcGroup *group, int checked); BYTE GetCachedStatusMsg(int iExtraCacheEntry, char *szProto); int __fastcall GetStatusOnlineness(int status); -void GetExtendedInfo(struct ClcContact *contact, struct ClcData *dat); +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); @@ -466,24 +466,24 @@ int FrameNCPaint(HWND hwnd, WNDPROC oldWndProc, WPARAM wParam, LPARAM lParam, BO void FreeProtocolData( void ); -void GetClientID(struct ClcContact *contact, char *client); +void GetClientID(ClcContact *contact, char *client); int LoadCLCButtonModule(void); void SetButtonStates(HWND hwnd); void ConfigureCLUIGeometry(int mode); void IcoLibReloadIcons(); -int CompareContacts(const struct ClcContact* p1, const struct ClcContact* p2); +int CompareContacts(const ClcContact* p1, const ClcContact* p2); void PaintNotifyArea(HDC hDC, RECT *rc); int AvatarChanged(WPARAM wParam, LPARAM lParam); void ConfigureFrame(); void ConfigureEventArea(HWND hwnd); void ClearIcons(int mode); void SkinDrawBg(HWND hwnd, HDC hdc); -int GetBasicFontID(struct ClcContact * contact); +int GetBasicFontID(ClcContact * contact); extern int __fastcall CLVM_GetContactHiddenStatus(HANDLE hContact, char *szStatus, struct ClcData *dat); void CreateViewModeFrame(); int GetExtraCache(HANDLE hContact, char *szProto); void ReloadExtraInfo(HANDLE hContact); -void LoadAvatarForContact(struct ClcContact *p); +void LoadAvatarForContact(ClcContact *p); void ApplyViewMode(const char *name); DWORD CalcXMask(HANDLE hContact); @@ -492,12 +492,12 @@ HWND ClcGetButtonWindow(int ctrlid); //clcpaint.c void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT *rcPaint); -void __inline PaintItem(HDC hdcMem, ClcGroup *group, struct ClcContact *contact, int indent, int y, struct ClcData *dat, int index, HWND hwnd, DWORD style, RECT *clRect, BOOL *bFirstNGdrawn, int groupCountsFontTopShift, int rowHeight); +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(struct ClcContact *contact, HANDLE hContact); -void RTL_DetectGroupName(struct ClcContact *group); +void RTL_DetectAndSet(ClcContact *contact, HANDLE hContact); +void RTL_DetectGroupName(ClcContact *group); void CLN_LoadAllIcons(BOOL mode); void ReloadSkinItemsToCache(); void SFL_RegisterWindowClass(), SFL_UnregisterWindowClass(); @@ -508,7 +508,7 @@ void SFL_SetSize(); void SFL_PaintNotifyArea(); void SFL_Update(HICON hIcon, int iIcon, HIMAGELIST hIml, const TCHAR *szText, BOOL refresh); -void FLT_Update(struct ClcData *dat, struct ClcContact *contact); +void FLT_Update(struct ClcData *dat, ClcContact *contact); int FLT_CheckAvail(); void FLT_Create(int iEntry); void FLT_SetSize(struct TExtraCache *centry, LONG width, LONG height); @@ -625,10 +625,8 @@ typedef struct _floatopts { BYTE trans, act_trans; BYTE radius; BYTE enabled; - BYTE def_hover_time; - WORD hover_time; + BYTE def_hover_time; + WORD hover_time; } FLOATINGOPTIONS; extern FLOATINGOPTIONS g_floatoptions; - - diff --git a/plugins/Clist_nicer/src/Include/commonheaders.h b/plugins/Clist_nicer/src/Include/commonheaders.h index 9d2c14f304..27f0da733b 100644 --- a/plugins/Clist_nicer/src/Include/commonheaders.h +++ b/plugins/Clist_nicer/src/Include/commonheaders.h @@ -206,7 +206,7 @@ extern ImageItem *g_glyphItem; #define MAX_REGS(_A_) (sizeof(_A_)/sizeof(_A_[0])) -typedef int (__cdecl *pfnDrawAvatar)(HDC hdcOrig, HDC hdcMem, RECT *rc, struct ClcContact *contact, int y, struct ClcData *dat, int selected, WORD cstatus, int rowHeight); +typedef int (__cdecl *pfnDrawAvatar)(HDC hdcOrig, HDC hdcMem, RECT *rc, ClcContact *contact, int y, struct ClcData *dat, int selected, WORD cstatus, int rowHeight); #define safe_sizeof(a) (sizeof((a)) / sizeof((a)[0])) diff --git a/plugins/Clist_nicer/src/Include/config.h b/plugins/Clist_nicer/src/Include/config.h index 4ee9983798..f84b2b8238 100644 --- a/plugins/Clist_nicer/src/Include/config.h +++ b/plugins/Clist_nicer/src/Include/config.h @@ -40,7 +40,7 @@ #define IS_THEMED (API::sysState.isThemed) #define IS_AERO (API::sysState.isAero) -typedef int (__cdecl *pfnDrawAvatar)(HDC hdcOrig, HDC hdcMem, RECT *rc, struct ClcContact *contact, int y, struct ClcData *dat, int selected, WORD cstatus, int rowHeight); +typedef int (__cdecl *pfnDrawAvatar)(HDC hdcOrig, HDC hdcMem, RECT *rc, ClcContact *contact, int y, struct ClcData *dat, int selected, WORD cstatus, int rowHeight); typedef BOOL (WINAPI *pfnSetLayeredWindowAttributes_t)(HWND, COLORREF, BYTE, DWORD); typedef BOOL (WINAPI *pfnUpdateLayeredWindow_t)(HWND, HDC, POINT *, SIZE *, HDC, POINT *, COLORREF, BLENDFUNCTION *, DWORD); typedef HMONITOR (WINAPI *pfnMonitorFromPoint_t)(POINT,DWORD); diff --git a/plugins/Clist_nicer/src/Include/resource.h b/plugins/Clist_nicer/src/Include/resource.h index e7224dd57d..121ebe07f8 100644 --- a/plugins/Clist_nicer/src/Include/resource.h +++ b/plugins/Clist_nicer/src/Include/resource.h @@ -26,7 +26,6 @@ #define IDC_HYPERLINKHAND 214 #define IDC_DROPUSER 215 #define IDD_OPT_CLUI 218 -#define IDD_OPT_XICONS 219 #define IDD_OPT_ICONS 220 #define IDD_OPT_CLC 228 #define IDD_OPT_CLCBKG 230 @@ -74,17 +73,8 @@ #define IDC_SETALLBUTTONSKINNED 1043 #define IDC_EVENTSONTOP 1044 #define IDC_FASTGRADIENT 1044 -#define IDC_EXTRA_ICON_EMAIL 1045 #define IDC_DONTSEPARATE 1045 -#define IDC_EXTRA_ICON_SMS 1047 -#define IDC_EXTRA_ICON_RES0 1054 -#define IDC_EXTRA_ICON_WEB 1055 #define IDC_FADEINOUT 1056 -#define IDC_EXTRA_ICON_ADV2 1057 -#define IDC_EXTRA_ICON_RES1 1058 -#define IDC_EXTRA_ICON_RES2 1059 -#define IDC_EXTRA_ICON_ADV3 1060 -#define IDC_EXTRAORDER 1061 #define IDC_FRAMEGAP 1064 #define IDC_FRAMEGAPSPIN 1065 #define IDC_CLIPBORDER 1066 @@ -108,7 +98,6 @@ #define IDC_HIDEOFFLINE 1081 #define IDC_CRIGHTSPIN 1081 #define IDC_HIDEOFFLINEOPTS 1082 -#define IDC_EXTRA_ICON_ADV4 1085 #define IDC_LEFTMARGINSPIN 1092 #define IDC_NOGROUPICON 1102 #define IDC_ONECLK 1105 @@ -130,8 +119,6 @@ #define IDC_STATIC22 1157 #define IDC_STATIC14 1157 #define IDC_STATIC15 1158 -#define IDC_EXTRA_ICON_CLIENT 1164 -#define IDC_EXTRA_ICON_ADV1 1166 #define IDC_SHOWGRIP 1169 #define IDC_SKINBACKGROUND 1170 #define IDC_FILLWALLPAPER 1171 -- cgit v1.2.3