much less crazy way to organize clist data

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

2 files changed, 8 insertions, 63 deletions

diff --git a/plugins/Clist_nicer/INCLUDE/clc.h b/plugins/Clist_nicer/INCLUDE/clc.h
index eedb76fc43..879fc52553 100644
--- a/plugins/Clist_nicer/INCLUDE/clc.h
+++ b/plugins/Clist_nicer/INCLUDE/clc.h
@@ -127,7 +127,8 @@ typedef struct _OrderTreeData
 	BOOL  fReserved;

 } *PORDERTREEDATA, ORDERTREEDATA;

 

-struct DisplayProfile {

+struct DisplayProfile

+{

 	DWORD   dwFlags;

 	DWORD   dwExtraImageMask;

 	int     exIconScale;

@@ -159,7 +160,8 @@ typedef struct DisplayProfileSet DISPLAYPROFILESET;
 

 #define DSP_PROFILES_MODULE "CLN_DspProfiles"           // db module for display profiles

 

-struct TExtraCache {

+struct TExtraCache

+{

 	BYTE iExtraImage[MAXEXTRACOLUMNS];

 	HANDLE hContact;

 	HANDLE hTimeZone;

@@ -177,29 +179,12 @@ struct TExtraCache {
 	BOOL  isChatRoom;

 };

 

-struct ClcContact {

-	BYTE type;

-	BYTE flags;

-	union {

-		struct {

-			WORD iImage;

-			HANDLE hContact;

-		};

-		struct {

-			WORD groupId;

-			struct ClcGroup *group;

-		};

-	};

-	BYTE iExtraImage[MAXEXTRACOLUMNS];

-	TCHAR szText[120 - MAXEXTRACOLUMNS];

-	char * proto;    // MS_PROTO_GETBASEPROTO

-

-	// inherited from standard

+struct ClcContact : public ClcContactBase

+{

 	BOOL bIsMeta;

 	HANDLE hSubContact;

 	BYTE xStatus;

 	char *metaProto;

-	//int clientId;

 	DWORD codePage;

 	struct avatarCacheEntry *ace;

 	WORD wStatus;

@@ -208,7 +193,6 @@ struct ClcContact {
 	int isRtl;

 	DWORD cFlags;

 	BYTE  bSecondLine;

-	//int iRowHeight;   // index into the row height table (for caching)

 };

 

 #define DRAGSTAGE_NOTMOVED  0

@@ -231,46 +215,8 @@ struct ClcContact {
 #define FONTID_TIMESTAMP   11

 #define FONTID_LAST        FONTID_TIMESTAMP

 

-struct ClcData {

-	struct ClcGroup list;

-	int max_row_height;

-	int yScroll;

-	int selection;

-	struct ClcFontInfo fontInfo[FONTID_MAX + 1];

-	int scrollTime;

-	HIMAGELIST himlHighlight;

-	int groupIndent;

-	TCHAR szQuickSearch[128];

-	int iconXSpace;

-	HWND hwndRenameEdit;

-	COLORREF bkColour, selBkColour, selTextColour, hotTextColour, quickSearchColour;

-	int iDragItem, iInsertionMark;

-	int dragStage;

-	POINT ptDragStart;

-	int dragAutoScrolling;

-	int dragAutoScrollHeight;

-	int leftMargin;

-	int insertionMarkHitHeight;

-	HBITMAP hBmpBackground;

-	int backgroundBmpUse, bkChanged;

-	int iHotTrack;

-	int gammaCorrection;

-	DWORD greyoutFlags;           //see m_clc.h

-	DWORD offlineModes;

-	DWORD exStyle;

-	POINT ptInfoTip;

-	int infoTipTimeout;

-	HANDLE hInfoTipItem;

-	HIMAGELIST himlExtraColumns;

-	int extraColumnsCount;

-	int extraColumnSpacing;

-	int checkboxSize;

-	int showSelAlways;

-	int showIdle;

-	int noVScrollbar;

-	int useWindowsColours;

-	BOOL bNeedSort;

-

+struct ClcData : public ClcDataBase

+{

 	int *row_heights;

 	int row_heights_size;

 	int row_heights_allocated;

diff --git a/plugins/Clist_nicer/INCLUDE/commonheaders.h b/plugins/Clist_nicer/INCLUDE/commonheaders.h
index 6a2e363544..91de256f0a 100644
--- a/plugins/Clist_nicer/INCLUDE/commonheaders.h
+++ b/plugins/Clist_nicer/INCLUDE/commonheaders.h
@@ -62,7 +62,6 @@
 #include <win2k.h>

 #include <m_clist.h>

 #include <m_clistint.h>

-#include <m_clc.h>

 #include <m_clui.h>

 #include <m_plugins.h>

 #include <m_system.h>