From 84932349d8a832c0a0b19092160a92d3110d6914 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 15 Jun 2012 17:24:17 +0000 Subject: adaptation of clist nicer for TTB, part I git-svn-id: http://svn.miranda-ng.org/main/trunk@431 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_nicer/INCLUDE/clc.h | 28 ++-------------------------- plugins/Clist_nicer/INCLUDE/clist.h | 8 +++++++- plugins/Clist_nicer/INCLUDE/resource.h | 8 -------- 3 files changed, 9 insertions(+), 35 deletions(-) (limited to 'plugins/Clist_nicer/INCLUDE') diff --git a/plugins/Clist_nicer/INCLUDE/clc.h b/plugins/Clist_nicer/INCLUDE/clc.h index 561be4a759..8cd4a5b8d7 100644 --- a/plugins/Clist_nicer/INCLUDE/clc.h +++ b/plugins/Clist_nicer/INCLUDE/clc.h @@ -290,7 +290,7 @@ struct ClcData { int oldSelection; }; -#define CLUI_FRAME_SHOWTOPBUTTONS 1 +//#define CLUI_FRAME_SHOWTOPBUTTONS 1 #define CLUI_FRAME_SHOWBOTTOMBUTTONS 2 #define CLUI_SHOWCLIENTICONS 4 #define CLUI_SHOWVISI 8 @@ -306,7 +306,7 @@ struct ClcData { #define CLUI_STATUSASTEXT 8192 #define CLUI_FULLROWSELECT 16384 #define CLUI_FRAME_EVENTAREASUNKEN 32768 -#define CLUI_FRAME_BUTTONBARSUNKEN 65536 +//#define CLUI_FRAME_BUTTONBARSUNKEN 65536 #define CLUI_FRAME_AVATARS 0x20000 #define CLUI_FRAME_AVATARSLEFT 0x40000 #define CLUI_FRAME_GDIPLUS 0x80000 @@ -340,18 +340,12 @@ struct TCluiData { DWORD dwFlags; DWORD topOffset, bottomOffset; int statusBarHeight; - int soundsOff; BYTE tabSRMM_Avail; - BYTE IcoLib_Avail; BYTE bMetaAvail; - BYTE bFontServiceAvail; BYTE bAvatarServiceAvail; HICON hIconVisible, hIconInvisible, hIconChatactive, hIconConnecting; - DWORD dwButtonHeight, dwButtonWidth; - DWORD toolbarVisibility; DWORD winFlags; DWORD winFlagsEx; - HMENU hMenuButtons; int notifyActive; int hIconNotify; HMENU hMenuNotify; @@ -463,23 +457,8 @@ struct NotifyMenuItemExData { HANDLE hDbEvent; }; -#define BUTTON_HEIGHT_D 21 -#define BUTTON_WIDTH_D 21 // #define NOTIFY_HEIGHT 24 -#define TOPBUTTON_PUSH 1 -#define TOPBUTTON_SENDONDOWN 2 - -struct CluiTopButton { - HWND hwnd; - HICON hIcon, hAltIcon; - UINT id, idIcon, idAltIcon; - char *szIcoLibIcon, *szIcoLibAltIcon; - DWORD flags; - DWORD visibilityOrder; - TCHAR *szTooltip; -}; - struct TrayIconInfo { union { HICON hIcon; @@ -569,7 +548,6 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT *rcPaint); void __inline PaintItem(HDC hdcMem, struct 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 Reload3dBevelColors(); void ReloadThemedOptions(); -void CreateButtonBar(HWND hWnd); void SetButtonToSkinned(); void RTL_DetectAndSet(struct ClcContact *contact, HANDLE hContact); void RTL_DetectGroupName(struct ClcContact *group); @@ -612,8 +590,6 @@ int Docking_IsDocked(WPARAM wParam, LPARAM lParam); // Menus -int ClcSoundHook(WPARAM wParam, LPARAM lParam); - void IMG_DeleteItems(); int CoolSB_SetupScrollBar(); diff --git a/plugins/Clist_nicer/INCLUDE/clist.h b/plugins/Clist_nicer/INCLUDE/clist.h index 79f0a29ec8..a4d956ba3c 100644 --- a/plugins/Clist_nicer/INCLUDE/clist.h +++ b/plugins/Clist_nicer/INCLUDE/clist.h @@ -47,4 +47,10 @@ void SortContacts(void); #define CLVM_INCLUDED_UNGROUPED 8 #define CLVM_USELASTMSG 16 -#define CLVM_MODULE "CLVM_W" +#if defined(_UNICODE) + #define CLVM_MODULE "CLVM_W" +#else + #define CLVM_MODULE "CLVM" +#endif + + diff --git a/plugins/Clist_nicer/INCLUDE/resource.h b/plugins/Clist_nicer/INCLUDE/resource.h index d309029f7b..a2b1f5a072 100644 --- a/plugins/Clist_nicer/INCLUDE/resource.h +++ b/plugins/Clist_nicer/INCLUDE/resource.h @@ -242,7 +242,6 @@ #define IDC_AVATARBORDERCLR 1733 #define IDC_AVATARSROUNDED 1734 #define IDC_DUALROWMODE 1735 -#define IDC_SHOWBUTTONBAR 1736 #define IDC_CLISTALIGN 1737 #define IDC_CLISTSUNKEN 1738 #define IDC_EVENTAREAAUTOHIDE 1740 @@ -339,7 +338,6 @@ #define IDC_STATIC5 40023 #define IDC_CLIST 40025 #define IDC_STATIC8 40026 -#define POPUP_TOOLBAR 40027 #define IDC_STATIC9 40027 #define POPUP_BUTTONS 40028 #define IDC_CLEARALL 40028 @@ -350,14 +348,10 @@ #define IDC_GROUPSTATUSOP 40031 #define IDC_LASTMESSAGEOP 40032 #define ID_BUTTONS_ONLINE 40033 -#define ID_BUTTONBAR_INCREASEBUTTONSIZE 40034 #define IDC_SKINFILE 40034 #define IDC_LASTMESSAGEUNIT 40034 -#define ID_BUTTONBAR_DECREASEBUTTONSIZE 40035 -#define ID_BUTTONBAR_FLATBUTTONS 40036 #define IDC_FLT_AVATARS 40036 #define IDC_HIDECONTACT 40036 -#define ID_BUTTONBAR_NOVISUALSTYLES 40037 #define IDC_FLT_DUALROWS 40037 #define IDC_FLT_EXTRAICONS 40038 #define ID_TRAY_HIDE 40038 @@ -377,7 +371,6 @@ #define IDC_RELOADSKIN 40047 #define IDC_FLT_PADBOTTOMSPIN 40048 #define IDC_UNLOAD 40048 -#define ID_BUTTONBAR_DRAWSUNKENFRAME 40049 #define POPUP_NEWGROUP 40050 #define IDC_SECONDLINEMODE 40050 #define POPUP_SHOWSTATUSICONS 40051 @@ -386,7 +379,6 @@ #define POPUP_RENAMEGROUP 40052 #define POPUP_DELETEGROUP 40053 #define IDC_DSP_ADD -25483 -#define ID_BUTTONBAR_SKINNEDTOOLBAR 40054 #define IDC_DSP_DELETE 40054 #define IDC_FLT_ENABLED 40054 #define IDC_DSP_RENAME 40055 -- cgit v1.2.3