clist nicer+, part III, final:

- standard icons (visible, invisible, chat active) removed from clist due to duplicates;
- icon clicks work again;
- fix for double extra icons drawing;
- tons of various cleanups

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

3 files changed, 7 insertions, 14 deletions

diff --git a/plugins/Clist_nicer/src/Include/clc.h b/plugins/Clist_nicer/src/Include/clc.h
index 1936dfcd3b..0b968796ab 100644
--- a/plugins/Clist_nicer/src/Include/clc.h
+++ b/plugins/Clist_nicer/src/Include/clc.h
@@ -53,8 +53,8 @@
 #define TIMERID_PAINT          19

 

 #define CONTACTF_ONLINE    1

-#define CONTACTF_INVISTO   2

-#define CONTACTF_VISTO     4

+//#define CONTACTF_INVISTO   2

+//#define CONTACTF_VISTO     4

 #define CONTACTF_NOTONLIST 8

 #define CONTACTF_CHECKED   16

 #define CONTACTF_IDLE      32

@@ -84,8 +84,6 @@
 #define ECF_HIDEOVERLAY 32

 #define ECF_FORCELOCALTIME 64

 #define ECF_HIDELOCALTIME 128

-#define ECF_FORCEVISIBILITY 256

-#define ECF_HIDEVISIBILITY  512

 #define ECF_HASREALTIMEZONE 1024

 

 // other contact flags (struct ClCContact;

@@ -197,7 +195,7 @@ struct ClcData : public ClcDataBase
 //#define CLUI_FRAME_SHOWTOPBUTTONS 1

 #define CLUI_FRAME_SHOWBOTTOMBUTTONS 2

 #define CLUI_SHOWCLIENTICONS 4

-#define CLUI_SHOWVISI 8

+//#define CLUI_SHOWVISI 8

 #define CLUI_FRAME_CLISTSUNKEN 16

 #define CLUI_SHOWXSTATUS 32

 #define CLUI_FRAME_BUTTONSFLAT 64

@@ -248,7 +246,7 @@ struct TCluiData {
 	BYTE tabSRMM_Avail;

 	BYTE bMetaAvail;

 	BYTE bAvatarServiceAvail;

-	HICON hIconVisible, hIconInvisible, hIconChatactive, hIconConnecting;

+	HICON hIconConnecting;

 	DWORD winFlags;

 	DWORD winFlagsEx;

 	int notifyActive;

@@ -520,7 +518,6 @@ int CoolSB_SetupScrollBar();
 #define SETTING_WINDOWSTYLE_THINBORDER 2

 #define SETTING_WINDOWSTYLE_NOBORDER 3

 

-#define CLCHT_ONITEMEXTRAEX  0x1000  //on an extra icon, HIBYTE(HIWORD()) says which

 #define CLCHT_ONAVATAR       0x2000

 #define CLCHT_ONITEMSPACE     0x4000

 

diff --git a/plugins/Clist_nicer/src/Include/resource.h b/plugins/Clist_nicer/src/Include/resource.h
index a6f229e4f8..56fa48d236 100644
--- a/plugins/Clist_nicer/src/Include/resource.h
+++ b/plugins/Clist_nicer/src/Include/resource.h
@@ -131,7 +131,6 @@
 #define IDC_INACTIVEPERC                1187

 #define IDC_SHOWSTATUSMSG               1188

 #define IDC_SHOWLOCALTIME               1189

-#define IDC_SHOWVISIBILITY              1190

 #define IDC_SHOWLOCALTIMEONLYWHENDIFFERENT 1191

 #define IDC_TITLETEXT                   1196

 #define IDC_EXCEPTION_DETAILS           1200

@@ -275,7 +274,6 @@
 #define IDI_OVL_DND                     2053

 #define IDI_OVL_NA                      2054

 #define IDI_OVL_OCCUPIED                2055

-#define IDI_OVL_FREEFORCHAT             2056

 #define IDI_OVL_INVISIBLE               2057

 #define IDI_OVL_ONTHEPHONE              2058

 #define IDI_OVL_OUTTOLUNCH              2059

@@ -288,8 +286,6 @@
 #define IDI_SOUNDSOFF                   2106

 #define IDI_TABSRMMSESSIONLIST          2107

 #define IDI_TABSRMMMENU                 2108

-#define IDI_CLVISIBLE                   2109

-#define IDI_CLINVISIBLE                 2110

 #define IDI_PROTOCONNECTING             2111

 #define IDI_TBTOPMENU                   2112

 #define IDI_TBACCOUNTS                  2113

@@ -318,7 +314,7 @@
 #define IDC_STATIC1                     40018

 #define IDC_STATIC2                     40019

 #define IDC_STATIC3                     40020

-#define POPUP_VISIBILITY                40021

+//#define POPUP_VISIBILITY                40021

 #define IDC_STATIC16                    40021

 #define IDC_STATIC4                     40022

 #define IDC_STATIC5                     40023

diff --git a/plugins/Clist_nicer/src/Include/rowheight_funcs.h b/plugins/Clist_nicer/src/Include/rowheight_funcs.h
index b7e69382d4..89bc2f4ad2 100644
--- a/plugins/Clist_nicer/src/Include/rowheight_funcs.h
+++ b/plugins/Clist_nicer/src/Include/rowheight_funcs.h
@@ -25,12 +25,12 @@ public:
 	    //if (contact->iRowHeight == item)

 	    //    return(dat->row_heights[item]);

 

-	    if (!Alloc(dat, item + 1))

+	    if ( !Alloc(dat, item + 1))

 			return -1;

 

 	    height = dat->fontInfo[GetBasicFontID(contact)].fontHeight;

 

-	    if (!dat->bisEmbedded) {

+	    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 || cfg::eCache[contact->extraCacheEntry].bStatusMsgValid > STATUSMSG_XSTATUSID))))

 	                height += (dat->fontInfo[FONTID_STATUS].fontHeight + cfg::dat.avatarPadding);