- unused settings removed;

- code cleaning.

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

8 files changed, 47 insertions, 58 deletions

diff --git a/plugins/Clist_modern/src/cluiframes.cpp b/plugins/Clist_modern/src/cluiframes.cpp
index 7acf5e11b7..5dafc9d4fd 100644
--- a/plugins/Clist_modern/src/cluiframes.cpp
+++ b/plugins/Clist_modern/src/cluiframes.cpp
@@ -88,7 +88,7 @@ static COLORREF sttSelBkColour;
 static BOOL sttBkUseWinColours;

 

 BYTE AlignCOLLIconToLeft; //will hide frame icon

-COLORREF sttGetColor(char * module, char * color, COLORREF defColor);

+

 //for old multiwindow

 #define MPCF_CONTEXTFRAMEMENU		3

 POINT ptOld;

@@ -2352,9 +2352,9 @@ int OnFrameTitleBarBackgroundChange(WPARAM, LPARAM)
 	{

 		AlignCOLLIconToLeft = db_get_b(NULL, "FrameTitleBar", "AlignCOLLIconToLeft", CLCDEFAULT_COLLICONTOLEFT);

 

-		sttBkColour = sttGetColor("FrameTitleBar", "BkColour", CLCDEFAULT_BKCOLOUR);

+		sttBkColour = cliGetColor("FrameTitleBar", "BkColour", CLCDEFAULT_BKCOLOUR);

 		sttBkUseWinColours = db_get_b(NULL, "FrameTitleBar", "UseWinColours", CLCDEFAULT_USEWINDOWSCOLOURS);

-		sttSelBkColour = sttGetColor("FrameTitleBar", "TextColour", CLCDEFAULT_TEXTCOLOUR);

+		sttSelBkColour = cliGetColor("FrameTitleBar", "TextColour", CLCDEFAULT_TEXTCOLOUR);

 		

 		if (sttBmpBackground) {

 			DeleteObject(sttBmpBackground);

@@ -2522,8 +2522,7 @@ int DrawTitleBar(HDC hdcMem2, RECT *rect, int Frameid)
 					xpt_DrawThemeBackground(_hFrameTitleTheme, hdcMem, WP_SMALLCAPTION, state, &rc, &rc);

 					bThemed = TRUE;

 				}

-				else

-					DrawBackGround(g_pfwFrames[pos].TitleBar.hwnd, hdcMem, sttBmpBackground, sttBkColour, sttBackgroundBmpUse);

+				else DrawBackGround(g_pfwFrames[pos].TitleBar.hwnd, hdcMem, sttBmpBackground, sttBkColour, sttBackgroundBmpUse);

 			}

 			else if (!g_CluiData.fLayered) {

 				ske_BltBackImage(g_pfwFrames[pos].TitleBar.hwnd, hdcMem, &rc);

diff --git a/plugins/Clist_modern/src/modern_clc.h b/plugins/Clist_modern/src/modern_clc.h
index 59cd0b910b..ab94c5def0 100644
--- a/plugins/Clist_modern/src/modern_clc.h
+++ b/plugins/Clist_modern/src/modern_clc.h
@@ -339,47 +339,48 @@ typedef struct tagOVERLAYICONINFO
 	int listID;

 } OVERLAYICONINFO;

 

-//clc.c

-void    ClcOptionsChanged(void);

+// clc.c

+void ClcOptionsChanged(void);

 

-//clcidents.c

-int     cliGetRowsPriorTo(ClcGroup *group, ClcGroup *subgroup, int contactIndex);

-int     FindItem(HWND hwnd, ClcData *dat, DWORD hItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible, bool isIgnoreSubcontacts);

-int     cliGetRowByIndex(ClcData *dat, int testindex, ClcContact **contact, ClcGroup **subgroup);

+// clcidents.c

+int  cliGetRowsPriorTo(ClcGroup *group, ClcGroup *subgroup, int contactIndex);

+int  FindItem(HWND hwnd, ClcData *dat, DWORD hItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible, bool isIgnoreSubcontacts);

+int  cliGetRowByIndex(ClcData *dat, int testindex, ClcContact **contact, ClcGroup **subgroup);

 

-//clcitems.c

-void    cliRebuildEntireList(HWND hwnd, ClcData *dat);

-void    cli_AddContactToTree(HWND hwnd, ClcData *dat, MCONTACT hContact, int updateTotalCount, int checkHideOffline);

-void    cli_SortCLC(HWND hwnd, ClcData *dat, int useInsertionSort);

-int     GetNewSelection(ClcGroup *group, int selection, int direction);

+// clcitems.c

+void cliRebuildEntireList(HWND hwnd, ClcData *dat);

+void cli_AddContactToTree(HWND hwnd, ClcData *dat, MCONTACT hContact, int updateTotalCount, int checkHideOffline);

+void cli_SortCLC(HWND hwnd, ClcData *dat, int useInsertionSort);

+int  GetNewSelection(ClcGroup *group, int selection, int direction);

 

-//clcmsgs.c

+// clcmsgs.c

 LRESULT cli_ProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wParam, LPARAM lParam);

 

-//clcutils.c

-void    cliRecalcScrollBar(HWND hwnd, ClcData *dat);

-void    cliBeginRenameSelection(HWND hwnd, ClcData *dat);

-int     cliHitTest(HWND hwnd, ClcData *dat, int testx, int testy, ClcContact **contact, ClcGroup **group, DWORD *flags);

-void    cliScrollTo(HWND hwnd, ClcData *dat, int desty, int noSmooth);

-int     GetDropTargetInformation(HWND hwnd, ClcData *dat, POINT pt);

-void    LoadCLCOptions(HWND hwnd, ClcData *dat, BOOL bFirst);

+// clcutils.c

+void cliRecalcScrollBar(HWND hwnd, ClcData *dat);

+void cliBeginRenameSelection(HWND hwnd, ClcData *dat);

+int  cliHitTest(HWND hwnd, ClcData *dat, int testx, int testy, ClcContact **contact, ClcGroup **group, DWORD *flags);

+void cliScrollTo(HWND hwnd, ClcData *dat, int desty, int noSmooth);

+int  GetDropTargetInformation(HWND hwnd, ClcData *dat, POINT pt);

+void LoadCLCOptions(HWND hwnd, ClcData *dat, BOOL bFirst);

 

+COLORREF cliGetColor(char *module, char *color, COLORREF defColor);

 

-//clcpaint.c

-void    CLCPaint_cliPaintClc(HWND hwnd, ClcData *dat, HDC hdc, RECT *rcPaint);

+// clcpaint.c

+void CLCPaint_cliPaintClc(HWND hwnd, ClcData *dat, HDC hdc, RECT *rcPaint);

 

-//clcopts.c

-int     ClcOptInit(WPARAM wParam, LPARAM lParam);

-DWORD   GetDefaultExStyle(void);

-void    GetFontSetting(int i, LOGFONT *lf, COLORREF *colour, BYTE *effect, COLORREF *eColour1, COLORREF *eColour2);

+// clcopts.c

+int   ClcOptInit(WPARAM wParam, LPARAM lParam);

+DWORD GetDefaultExStyle(void);

+void  GetFontSetting(int i, LOGFONT *lf, COLORREF *colour, BYTE *effect, COLORREF *eColour1, COLORREF *eColour2);

 

-//clistsettings.c

-TCHAR * GetContactDisplayNameW(MCONTACT hContact, int mode);

+// clistsettings.c

+TCHAR* GetContactDisplayNameW(MCONTACT hContact, int mode);

 

-//groups.c

-TCHAR*  GetGroupNameTS(int idx, DWORD* pdwFlags);

-int     RenameGroupT(WPARAM groupID, LPARAM newName);

+// groups.c

+TCHAR* GetGroupNameTS(int idx, DWORD* pdwFlags);

+int    RenameGroupT(WPARAM groupID, LPARAM newName);

 

-int     GetContactCachedStatus(MCONTACT hContact);

+int    GetContactCachedStatus(MCONTACT hContact);

 

 #endif /* _CLC_H_ */

diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp
index 81c4142a91..bce1166c21 100644
--- a/plugins/Clist_modern/src/modern_clcopts.cpp
+++ b/plugins/Clist_modern/src/modern_clcopts.cpp
@@ -106,8 +106,6 @@ struct ColourOptionsList {
 

 static struct ColourOptionsList colourOptionsList[] = {

 	{ "CLC", "BkColour", CLCGROUP, LPGENT("Background"), CLCDEFAULT_BKCOLOUR },

-	{ "CLC", "Rows_BkColour", CLCLINESGROUP, LPGENT("Background"), CLCDEFAULT_BKCOLOUR },

-	{ "CLC", "Frames_BkColour", CLCFRAMESGROUP, LPGENT("Background"), CLCDEFAULT_BKCOLOUR },

 

 	{ "CLC", "HotTextColour", CLCCOLOURSGROUP, LPGENT("Hot text"), CLCDEFAULT_MODERN_HOTTEXTCOLOUR },

 	{ "CLC", "SelTextColour", CLCCOLOURSGROUP, LPGENT("Selected text"), CLCDEFAULT_MODERN_SELTEXTCOLOUR },

@@ -116,7 +114,6 @@ static struct ColourOptionsList colourOptionsList[] = {
 	{ "Menu", "TextColour", CLCCOLOURSGROUP, LPGENT("Menu text"), CLCDEFAULT_TEXTCOLOUR },

 	{ "Menu", "SelTextColour", CLCCOLOURSGROUP, LPGENT("Selected menu text"), CLCDEFAULT_MODERN_SELTEXTCOLOUR },

 	{ "FrameTitleBar", "TextColour", CLCCOLOURSGROUP, LPGENT("Frame title text"), CLCDEFAULT_TEXTCOLOUR },

-	{ "StatusBar", "TextColour", CLCCOLOURSGROUP, LPGENT("Status bar text"), CLCDEFAULT_TEXTCOLOUR },

 	{ "ModernSettings", "KeyColor", CLCCOLOURSGROUP, LPGENT("3rd party frames transparent back color"), SETTING_KEYCOLOR_DEFAULT }

 };

 

diff --git a/plugins/Clist_modern/src/modern_clcutils.cpp b/plugins/Clist_modern/src/modern_clcutils.cpp
index fa95b706b5..b5d01c3a08 100644
--- a/plugins/Clist_modern/src/modern_clcutils.cpp
+++ b/plugins/Clist_modern/src/modern_clcutils.cpp
@@ -413,7 +413,7 @@ int GetDropTargetInformation(HWND hwnd, ClcData *dat, POINT pt)
 	return DROPTARGET_ONCONTACT;

 }

 

-COLORREF sttGetColor(char *module, char *color, COLORREF defColor)

+COLORREF cliGetColor(char *module, char *color, COLORREF defColor)

 {

 	BOOL useWinColor = db_get_b(NULL, module, "UseWinColours", CLCDEFAULT_USEWINDOWSCOLOURS);

 	if (useWinColor) return defColor;

@@ -603,11 +603,11 @@ void LoadCLCOptions(HWND hwnd, ClcData *dat, BOOL bFirst)
 	if (dat->hMenuBackground) { DeleteObject(dat->hMenuBackground); dat->hMenuBackground = NULL; }

 

 	if (g_CluiData.fDisableSkinEngine) {

-		dat->MenuBkColor = sttGetColor("Menu", "BkColour", CLCDEFAULT_BKCOLOUR);

-		dat->MenuBkHiColor = sttGetColor("Menu", "SelBkColour", CLCDEFAULT_SELBKCOLOUR);

+		dat->MenuBkColor = cliGetColor("Menu", "BkColour", CLCDEFAULT_BKCOLOUR);

+		dat->MenuBkHiColor = cliGetColor("Menu", "SelBkColour", CLCDEFAULT_SELBKCOLOUR);

 

-		dat->MenuTextColor = sttGetColor("Menu", "TextColour", CLCDEFAULT_TEXTCOLOUR);

-		dat->MenuTextHiColor = sttGetColor("Menu", "SelTextColour", CLCDEFAULT_MODERN_SELTEXTCOLOUR);

+		dat->MenuTextColor = cliGetColor("Menu", "TextColour", CLCDEFAULT_TEXTCOLOUR);

+		dat->MenuTextHiColor = cliGetColor("Menu", "SelTextColour", CLCDEFAULT_MODERN_SELTEXTCOLOUR);

 

 		if (db_get_b(NULL, "Menu", "UseBitmap", CLCDEFAULT_USEBITMAP)) {

 			ptrT tszBitmap(db_get_tsa(NULL, "Menu", "BkBitmap"));

diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp
index 078f80432d..8bb268aae1 100644
--- a/plugins/Clist_modern/src/modern_clistevents.cpp
+++ b/plugins/Clist_modern/src/modern_clistevents.cpp
@@ -239,9 +239,7 @@ static BOOL sttDrawEventAreaBackground(HWND hwnd, HDC hdc, RECT *rect)
 	return TRUE;

 }

 

-COLORREF sttGetColor(char * module, char * color, COLORREF defColor); //clcutils

-

-static int  ehhEventAreaBackgroundSettingsChanged(WPARAM, LPARAM)

+static int ehhEventAreaBackgroundSettingsChanged(WPARAM, LPARAM)

 {

 	if (event_area.hBmpBackground) {

 		DeleteObject(event_area.hBmpBackground);

@@ -249,7 +247,7 @@ static int  ehhEventAreaBackgroundSettingsChanged(WPARAM, LPARAM)
 	}

 

 	if (g_CluiData.fDisableSkinEngine) {

-		event_area.bkColour = sttGetColor("EventArea", "BkColour", CLCDEFAULT_BKCOLOUR);

+		event_area.bkColour = cliGetColor("EventArea", "BkColour", CLCDEFAULT_BKCOLOUR);

 		if (db_get_b(NULL, "EventArea", "UseBitmap", CLCDEFAULT_USEBITMAP)) {

 			ptrT tszBitmap(db_get_tsa(NULL, "EventArea", "BkBitmap"));

 			if (tszBitmap != NULL)

diff --git a/plugins/Clist_modern/src/modern_statusbar.cpp b/plugins/Clist_modern/src/modern_statusbar.cpp
index 6c272b4202..b5521a6c89 100644
--- a/plugins/Clist_modern/src/modern_statusbar.cpp
+++ b/plugins/Clist_modern/src/modern_statusbar.cpp
@@ -13,8 +13,6 @@ POINT lastpnt;
 HWND hModernStatusBar = NULL;

 HANDLE hFramehModernStatusBar = NULL;

 

-COLORREF sttGetColor(char * module, char * color, COLORREF defColor);

-

 #define DBFONTF_BOLD       1

 #define DBFONTF_ITALIC     2

 #define DBFONTF_UNDERLINE  4

@@ -106,7 +104,7 @@ int LoadStatusBarData()
 	if (g_StatusBarData.hBmpBackground) { DeleteObject(g_StatusBarData.hBmpBackground); g_StatusBarData.hBmpBackground = NULL; }

 

 	if (g_CluiData.fDisableSkinEngine) {

-		g_StatusBarData.bkColour = sttGetColor("StatusBar", "BkColour", CLCDEFAULT_BKCOLOUR);

+		g_StatusBarData.bkColour = cliGetColor("StatusBar", "BkColour", CLCDEFAULT_BKCOLOUR);

 		if (db_get_b(NULL, "StatusBar", "UseBitmap", CLCDEFAULT_USEBITMAP)) {

 			ptrT tszBitmapName(db_get_tsa(NULL, "StatusBar", "BkBitmap"));

 			if (tszBitmapName)

diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp
index 25678f1b6c..a17eb50726 100644
--- a/plugins/Clist_modern/src/modern_toolbar.cpp
+++ b/plugins/Clist_modern/src/modern_toolbar.cpp
@@ -108,8 +108,6 @@ struct
 }

 static tbdat = { NULL, CLCDEFAULT_BKCOLOUR, CLCDEFAULT_BKBMPUSE, CLCDEFAULT_USEWINDOWSCOLOURS };

 

-COLORREF sttGetColor(char * module, char * color, COLORREF defColor);

-

 static int ehhToolBarSettingsChanged(WPARAM hContact, LPARAM lParam)

 {

 	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;

@@ -138,7 +136,7 @@ static int ehhToolBarBackgroundSettingsChanged(WPARAM, LPARAM)
 	}

 

 	if (g_CluiData.fDisableSkinEngine) {

-		tbdat.mtb_bkColour = sttGetColor("ToolBar", "BkColour", CLCDEFAULT_BKCOLOUR);

+		tbdat.mtb_bkColour = cliGetColor("ToolBar", "BkColour", CLCDEFAULT_BKCOLOUR);

 		if (db_get_b(NULL, "ToolBar", "UseBitmap", CLCDEFAULT_USEBITMAP)) {

 			ptrT tszBitmapName(db_get_tsa(NULL, "ToolBar", "BkBitmap"));

 			if (tszBitmapName)

diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index 29c2b1ac77..4e9b144911 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -1157,9 +1157,7 @@ static BOOL sttDrawViewModeBackground(HWND hwnd, HDC hdc, RECT *rect)
 	return TRUE;

 }

 

-COLORREF sttGetColor(char * module, char * color, COLORREF defColor); //clcutils

-

-static int  ehhViewModeBackgroundSettingsChanged(WPARAM, LPARAM)

+static int ehhViewModeBackgroundSettingsChanged(WPARAM, LPARAM)

 {

 	if (view_mode.hBmpBackground) {

 		DeleteObject(view_mode.hBmpBackground);

@@ -1167,7 +1165,7 @@ static int  ehhViewModeBackgroundSettingsChanged(WPARAM, LPARAM)
 	}

 

 	if (g_CluiData.fDisableSkinEngine) {

-		view_mode.bkColour = sttGetColor("ViewMode", "BkColour", CLCDEFAULT_BKCOLOUR);

+		view_mode.bkColour = cliGetColor("ViewMode", "BkColour", CLCDEFAULT_BKCOLOUR);

 		if (db_get_b(NULL, "ViewMode", "UseBitmap", CLCDEFAULT_USEBITMAP)) {

 			ptrT tszBitmapName(db_get_tsa(NULL, "ViewMode", "BkBitmap"));

 			if (tszBitmapName)