- main menu icon excluded from toolbar_icons.dll, it's grabbed via SKIN_OTHER_MAINMENU instead;

- code cleaning

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

9 files changed, 64 insertions, 68 deletions

diff --git a/plugins/Clist_modern/icons_pack/res/ICONS.rc b/plugins/Clist_modern/icons_pack/res/ICONS.rc
index 81ff1c381a..ad64ded7e2 100644
--- a/plugins/Clist_modern/icons_pack/res/ICONS.rc
+++ b/plugins/Clist_modern/icons_pack/res/ICONS.rc
@@ -26,9 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //

 

 // Icon with lowest ID value placed first to ensure application icon

-// remains consistent on all systems.                  

-                    

-IDI_MAINMENU         ICON         "icon_mainmenu.ico"

+// remains consistent on all systems.

+

 IDI_STATUSMENU       ICON         "icon_statusmenu.ico"

 IDI_HIDEOFFLINE      ICON         "icon_hideoffline.ico"

 IDI_SHOWOFFLINE      ICON         "icon_showoffline.ico"

@@ -48,7 +47,7 @@ IDI_ACCMGR           ICON         "icon_accmgr.ico"
 // String Table

 //

 

-STRINGTABLE 

+STRINGTABLE

 BEGIN

    IDS_IDENTIFY            "# Tool bar icons #"

 END

@@ -57,5 +56,3 @@ END
 

 #endif    // English (U.S.) resources

 /////////////////////////////////////////////////////////////////////////////

-

-

diff --git a/plugins/Clist_modern/icons_pack/res/icon_mainmenu.ico b/plugins/Clist_modern/icons_pack/res/icon_mainmenu.ico
deleted file mode 100644
index 7ddd742bd5..0000000000
--- a/plugins/Clist_modern/icons_pack/res/icon_mainmenu.ico
+++ /dev/null
diff --git a/plugins/Clist_modern/icons_pack/src/icon_resource.h b/plugins/Clist_modern/icons_pack/src/icon_resource.h
index c9f5c0f94a..bc5c15280b 100644
--- a/plugins/Clist_modern/icons_pack/src/icon_resource.h
+++ b/plugins/Clist_modern/icons_pack/src/icon_resource.h
@@ -2,7 +2,6 @@
 // Microsoft Developer Studio generated include file.

 // Used by resources.rc

 //

-#define IDI_MAINMENU                    100

 #define IDI_STATUSMENU	                105

 #define IDI_HIDEOFFLINE                 110

 #define IDI_SHOWOFFLINE                 111

@@ -21,7 +20,7 @@
 

 #define IDS_IDENTIFY					10

 // Next default values for new objects

-// 

+//

 #ifdef APSTUDIO_INVOKED

 #ifndef APSTUDIO_READONLY_SYMBOLS

 #define _APS_NEXT_RESOURCE_VALUE        190

diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp
index 9ad29ca52d..ef494d5e06 100644
--- a/plugins/Clist_modern/src/modern_clcpaint.cpp
+++ b/plugins/Clist_modern/src/modern_clcpaint.cpp
@@ -1422,7 +1422,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact
 							adr.radius = round_radius;

 							adr.alpha = blendmode;

 

-							CallService( MS_AV_DRAWAVATAR, 0, ( LPARAM ) &adr );

+							CallService( MS_AV_DRAWAVATAR, 0, (LPARAM) &adr );

 							}

 							else

 							*/

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index b9094b3a25..9459856ce4 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -1669,8 +1669,10 @@ static BOOL FileExists(TCHAR * tszFilename)
 

 HANDLE RegisterIcolibIconHandle(char * szIcoID, char *szSectionName,  char * szDescription, TCHAR * tszDefaultFile, int iDefaultIndex, HINSTANCE hDefaultModuleInst, int iDefaultResource )

 {

+	if (hDefaultModuleInst == NULL)

+		return LoadSkinnedIconHandle(iDefaultResource);

+

 	TCHAR fileFull[MAX_PATH] = {0};

-	HANDLE hIcolibItem = NULL;

 

 	SKINICONDESC sid = { sizeof(sid) };

 	sid.cx = sid.cy = 16;

@@ -1678,27 +1680,22 @@ HANDLE RegisterIcolibIconHandle(char * szIcoID, char *szSectionName,  char * szD
 	sid.pszName = szIcoID;

 	sid.flags |= SIDF_PATH_TCHAR;

 	sid.pszDescription = szDescription;

+	sid.ptszDefaultFile = fileFull;

 

-	if (tszDefaultFile)

-	{

-		CallService( MS_UTILS_PATHTOABSOLUTET, ( WPARAM )tszDefaultFile, ( LPARAM )fileFull );

-		if ( !FileExists(fileFull)) fileFull[0] = _T('\0');

+	if (tszDefaultFile) {

+		CallService(MS_UTILS_PATHTOABSOLUTET, (WPARAM)tszDefaultFile, (LPARAM)fileFull);

+		if ( !FileExists(fileFull))

+			fileFull[0] = _T('\0');

 	}

+	

 	if (fileFull[0] != _T('\0'))

-	{

-		sid.ptszDefaultFile = fileFull;

 		sid.iDefaultIndex = iDefaultIndex;

-		sid.hDefaultIcon = NULL;

-	}

-	else

-	{

-		sid.pszDefaultFile = NULL;

-		sid.iDefaultIndex = 0;

-		sid.hDefaultIcon = LoadSmallIcon( hDefaultModuleInst, MAKEINTRESOURCE(iDefaultResource));

+	else {

+		GetModuleFileName(hDefaultModuleInst, fileFull, SIZEOF(fileFull));

+		sid.iDefaultIndex = iDefaultResource;

 	}

-	hIcolibItem = Skin_AddIcon(&sid);

-	if ( sid.hDefaultIcon )	DestroyIcon(sid.hDefaultIcon);

-	return hIcolibItem;

+

+	return Skin_AddIcon(&sid);

 }

 

 // MAIN WINPROC MESSAGE HANDLERS

diff --git a/plugins/Clist_modern/src/modern_cluiframes.cpp b/plugins/Clist_modern/src/modern_cluiframes.cpp
index 37c0a574e0..ee1fc86397 100644
--- a/plugins/Clist_modern/src/modern_cluiframes.cpp
+++ b/plugins/Clist_modern/src/modern_cluiframes.cpp
@@ -3926,31 +3926,31 @@ int CLUIFrameOnModulesUnload(WPARAM wParam,LPARAM lParam)
 	//

 	//if (MirandaExiting()) return 0;

 	if ( !_hmiVisible) return 0;

-	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )_hmiVisible, 1 );

-	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )_hmiTBVisible, 1 );

-	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )_hmiLock, 1 );

-	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )_hmiColl, 1 );

-	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )_hmiFloating, 1 );

-	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )_hmiAlignTop, 1 );

-	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )_hmiAlignClient, 1 );

-	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )_hmiAlignBottom, 1 );

-	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )_hmiBorder, 1 );

-	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )_hmiAlignRoot, 1 );

-

-

-	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )_hmiPosUp, 1 );

-	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )_hmiPosDown, 1 );

-	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )_hmiPosRoot, 1 );

-

-

-	CallService( MO_REMOVEMENUITEM, ( LPARAM )_hmiVisible, 1 );

-	CallService( MO_REMOVEMENUITEM, ( LPARAM )_hmiTBVisible, 1 );

-	CallService( MO_REMOVEMENUITEM, ( LPARAM )_hmiLock, 1 );

-	CallService( MO_REMOVEMENUITEM, ( LPARAM )_hmiColl, 1 );

-	CallService( MO_REMOVEMENUITEM, ( LPARAM )_hmiFloating, 1 );

-	CallService( MO_REMOVEMENUITEM, ( LPARAM )_hmiBorder, 1 );

-	CallService( MO_REMOVEMENUITEM, ( LPARAM )_hmiAlignRoot, 1 );

-	CallService( MO_REMOVEMENUITEM, ( LPARAM )_hmiPosRoot, 1 );

+	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiVisible, 1 );

+	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiTBVisible, 1 );

+	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiLock, 1 );

+	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiColl, 1 );

+	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiFloating, 1 );

+	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignTop, 1 );

+	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignClient, 1 );

+	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignBottom, 1 );

+	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiBorder, 1 );

+	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignRoot, 1 );

+

+

+	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiPosUp, 1 );

+	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiPosDown, 1 );

+	CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiPosRoot, 1 );

+

+

+	CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiVisible, 1 );

+	CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiTBVisible, 1 );

+	CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiLock, 1 );

+	CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiColl, 1 );

+	CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiFloating, 1 );

+	CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiBorder, 1 );

+	CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiAlignRoot, 1 );

+	CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiPosRoot, 1 );

 

 	_hmiVisible = 0;

 	return 0;

diff --git a/plugins/Clist_modern/src/modern_skinengine.cpp b/plugins/Clist_modern/src/modern_skinengine.cpp
index 8e70268998..c1656b3f26 100644
--- a/plugins/Clist_modern/src/modern_skinengine.cpp
+++ b/plugins/Clist_modern/src/modern_skinengine.cpp
@@ -1973,7 +1973,7 @@ HBITMAP ske_LoadGlyphImage_Png2Dib(char * szFilename)
 		param.pSource = ppMap;

 		param.cbSourceSize = cbFileSize;

 		param.pResult = &pDib;

-		if ( CallService( MS_PNG2DIB, 0, ( LPARAM )&param ))

+		if ( CallService( MS_PNG2DIB, 0, (LPARAM)&param ))

 			pDibBits = ( BYTE* )( pDib+1 );

 		else

 			cbFileSize = 0;

diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp
index c4ed9b7707..a814462aa9 100644
--- a/plugins/Clist_modern/src/modern_skinopt.cpp
+++ b/plugins/Clist_modern/src/modern_skinopt.cpp
@@ -335,8 +335,8 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 						sd = ( SkinListData* )nmtv->itemNew.lParam;

 						{

 							TCHAR buf[MAX_PATH];

-							CallService( MS_UTILS_PATHTORELATIVET, ( WPARAM )sd->File, ( LPARAM )buf );

-							SendDlgItemMessage( hwndDlg, IDC_EDIT_SKIN_FILENAME, WM_SETTEXT, 0, ( LPARAM )buf );

+							CallService( MS_UTILS_PATHTORELATIVET, (WPARAM)sd->File, (LPARAM)buf );

+							SendDlgItemMessage( hwndDlg, IDC_EDIT_SKIN_FILENAME, WM_SETTEXT, 0, (LPARAM)buf );

 						}

 						{

 							TCHAR prfn[MAX_PATH] = {0};

@@ -345,7 +345,7 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 							GetPrivateProfileString( _T( "Skin_Description_Section" ), _T( "Preview" ), _T( "" ), imfn, SIZEOF( imfn ), sd->File );

 							IniParser::GetSkinFolder( sd->File, skinfolder );

 							_sntprintf( prfn, SIZEOF( prfn ), _T("%s\\%s"), skinfolder, imfn );

-							CallService( MS_UTILS_PATHTOABSOLUTET, ( WPARAM )prfn, ( LPARAM ) imfn );

+							CallService( MS_UTILS_PATHTOABSOLUTET, (WPARAM)prfn, (LPARAM) imfn );

 							char * imfn_ch = mir_t2a( imfn ); 

 							hPreviewBitmap = ske_LoadGlyphImage( imfn_ch );

 							mir_free( imfn_ch );

@@ -393,16 +393,16 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 							}

 							ShowWindow( GetDlgItem( hwndDlg, IDC_PREVIEW ), SW_HIDE );

 							ShowWindow( GetDlgItem( hwndDlg, IDC_STATIC_INFO ), SW_SHOW );

-							SendDlgItemMessage( hwndDlg, IDC_STATIC_INFO, WM_SETTEXT, 0, ( LPARAM )text );

+							SendDlgItemMessage( hwndDlg, IDC_STATIC_INFO, WM_SETTEXT, 0, (LPARAM)text );

 						}					

 					}

 					else

 					{

 						//no selected

-						SendDlgItemMessage( hwndDlg, IDC_EDIT_SKIN_FILENAME, WM_SETTEXT, 0, ( LPARAM )TranslateT( "Select skin from list" ));

+						SendDlgItemMessage( hwndDlg, IDC_EDIT_SKIN_FILENAME, WM_SETTEXT, 0, (LPARAM)TranslateT( "Select skin from list" ));

 						EnableWindow( GetDlgItem( hwndDlg, IDC_BUTTON_APPLY_SKIN ), FALSE );

 						EnableWindow( GetDlgItem( hwndDlg, IDC_BUTTON_INFO ), FALSE );

-						SendDlgItemMessage( hwndDlg, IDC_STATIC_INFO, WM_SETTEXT, 0, ( LPARAM )TranslateT( "Please select skin to apply" ));

+						SendDlgItemMessage( hwndDlg, IDC_STATIC_INFO, WM_SETTEXT, 0, (LPARAM)TranslateT( "Please select skin to apply" ));

 						ShowWindow( GetDlgItem( hwndDlg, IDC_PREVIEW ), SW_HIDE );

 					}

 					ShowWindow( GetDlgItem( hwndDlg, IDC_PREVIEW ), hPreviewBitmap?SW_SHOW:SW_HIDE );

@@ -477,7 +477,7 @@ HTREEITEM FillAvailableSkinList( HWND hwndDlg )
 	TCHAR *SkinsFolder = DBGetStringT( NULL, "ModernData", "SkinsFolder" );

 	if ( !SkinsFolder ) SkinsFolder = mir_tstrdup( _T("Skins"));

 

-	CallService( MS_UTILS_PATHTOABSOLUTET, ( WPARAM )SkinsFolder, ( LPARAM )path );

+	CallService( MS_UTILS_PATHTOABSOLUTET, (WPARAM)SkinsFolder, (LPARAM)path );

 	mir_free_and_nil( SkinsFolder );

 

 	AddSkinToList( hwndDlg, TranslateT( "Default Skin" ), _T("%Default Skin%"));

@@ -490,7 +490,7 @@ HTREEITEM FillAvailableSkinList( HWND hwndDlg )
 		skinfile = DBGetStringT( NULL, SKIN, "SkinFile" );

 		if ( skinfile )

 		{

-			CallService( MS_UTILS_PATHTOABSOLUTET, ( WPARAM )skinfile, ( LPARAM )skinfull );

+			CallService( MS_UTILS_PATHTOABSOLUTET, (WPARAM)skinfile, (LPARAM)skinfull );

 			res = AddSkinToListFullName( hwndDlg, skinfull );

 

 			mir_free( skinfile );

@@ -602,7 +602,7 @@ HTREEITEM AddItemToTree( HWND hTree, TCHAR * folder, TCHAR * itemName, void * da
 	TCHAR * ptr;

 	TCHAR * ptrE;

 	BOOL ext = FALSE;

-	CallService( MS_UTILS_PATHTORELATIVET, ( WPARAM )folder, ( LPARAM )path );

+	CallService( MS_UTILS_PATHTORELATIVET, (WPARAM)folder, (LPARAM)path );

 	ptrE = path;

 	while ( *ptrE != _T('\\') && *ptrE != _T('\0') && *ptrE != _T(':')) ptrE++;

 	if ( *ptrE == _T('\\'))

@@ -631,7 +631,7 @@ HTREEITEM AddItemToTree( HWND hTree, TCHAR * folder, TCHAR * itemName, void * da
 					tvis.item.mask = TVIF_PARAM|TVIF_TEXT|TVIF_PARAM;

 					tvis.item.pszText = ptr;

 					{

-						tvis.item.lParam = ( LPARAM )NULL;

+						tvis.item.lParam = (LPARAM)NULL;

 					}

 					cItem = TreeView_InsertItem( hTree, &tvis );

 

@@ -651,7 +651,7 @@ HTREEITEM AddItemToTree( HWND hTree, TCHAR * folder, TCHAR * itemName, void * da
 		tvis.hInsertAfter = TVI_SORT;

 		tvis.item.mask = TVIF_PARAM|TVIF_TEXT|TVIF_PARAM;

 		tvis.item.pszText = itemName;

-		tvis.item.lParam = ( LPARAM )data;

+		tvis.item.lParam = (LPARAM)data;

 		return TreeView_InsertItem( hTree, &tvis );

 	}

 	else

@@ -668,7 +668,7 @@ INT_PTR SvcActiveSkin(WPARAM wParam, LPARAM lParam)
 	TCHAR skinfull[MAX_PATH];

 	skinfile = DBGetStringT( NULL, SKIN, "SkinFile" );

 	if ( skinfile ) {

-		CallService( MS_UTILS_PATHTOABSOLUTET, ( WPARAM )skinfile, ( LPARAM )skinfull );

+		CallService( MS_UTILS_PATHTOABSOLUTET, (WPARAM)skinfile, (LPARAM)skinfull );

 		mir_free(skinfile);

 		return (INT_PTR)mir_tstrdup(skinfull);

 	}

@@ -722,7 +722,7 @@ INT_PTR SvcPreviewSkin(WPARAM wParam, LPARAM lParam)
 		GetPrivateProfileString( _T( "Skin_Description_Section" ), _T( "Preview" ), _T( "" ), imfn, SIZEOF( imfn ), (LPCTSTR)lParam );

 		IniParser::GetSkinFolder((LPCTSTR)lParam, skinfolder );

 		_sntprintf( prfn, SIZEOF( prfn ), _T("%s\\%s"), skinfolder, imfn );

-		CallService( MS_UTILS_PATHTOABSOLUTET, ( WPARAM )prfn, ( LPARAM ) imfn );

+		CallService( MS_UTILS_PATHTOABSOLUTET, (WPARAM)prfn, (LPARAM) imfn );

 		char * imfn_ch = mir_t2a( imfn ); 

 		hPreviewBitmap = ske_LoadGlyphImage( imfn_ch );

 		mir_free( imfn_ch );

diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp
index 26683dceee..5e3c00e496 100644
--- a/plugins/Clist_modern/src/modern_toolbar.cpp
+++ b/plugins/Clist_modern/src/modern_toolbar.cpp
@@ -68,14 +68,17 @@ static int Modern_InitButtons(WPARAM, LPARAM)
 			tbb.pszTooltipDn = LPGEN(BTNS[i].pszTooltipDn);

 

 			char buf[255];

-			mir_snprintf(buf,SIZEOF(buf),"%s%s%s", TTB_OPTDIR, BTNS[i].pszButtonID, "_dn");

-			tbb.hIconHandleUp = RegisterIcolibIconHandle( buf, "Toolbar", BTNS[i].pszTooltipUp, _T("icons\\toolbar_icons.dll"),-BTNS[i].icoDefIdx, g_hInst, BTNS[i].defResource );

+			if (i != 0) {

+				mir_snprintf(buf,SIZEOF(buf),"%s%s%s", TTB_OPTDIR, BTNS[i].pszButtonID, "_dn");

+				tbb.hIconHandleUp = RegisterIcolibIconHandle(buf, "Toolbar", BTNS[i].pszTooltipUp, _T("icons\\toolbar_icons.dll"),-BTNS[i].icoDefIdx, g_hInst, BTNS[i].defResource);

+			}

+			else tbb.hIconHandleUp = RegisterIcolibIconHandle(buf, "Toolbar", BTNS[i].pszTooltipUp, NULL, 0, NULL, SKINICON_OTHER_MAINMENU);

 

 			if (BTNS[i].pszTooltipDn) {

 				tbb.dwFlags |= TTBBF_ASPUSHBUTTON;

 

 				mir_snprintf(buf,SIZEOF(buf),"%s%s%s", TTB_OPTDIR, BTNS[i].pszButtonID, "_up");

-				tbb.hIconHandleDn = RegisterIcolibIconHandle( buf, "Toolbar", BTNS[i].pszTooltipDn, _T("icons\\toolbar_icons.dll"),-(BTNS[i].icoDefIdx+1), g_hInst, BTNS[i].defResource2 );

+				tbb.hIconHandleDn = RegisterIcolibIconHandle(buf, "Toolbar", BTNS[i].pszTooltipDn, _T("icons\\toolbar_icons.dll"),-(BTNS[i].icoDefIdx+1), g_hInst, BTNS[i].defResource2 );

 			}

 			else tbb.hIconHandleDn = NULL;

 		}