cleanup

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

1 files changed, 231 insertions, 231 deletions

diff --git a/plugins/Popup/src/opt_skins.cpp b/plugins/Popup/src/opt_skins.cpp
index 409e906ab4..c4bfb60fba 100644
--- a/plugins/Popup/src/opt_skins.cpp
+++ b/plugins/Popup/src/opt_skins.cpp
@@ -2,9 +2,9 @@
 Popup Plus plugin for Miranda IM

 

 Copyright	© 2002 Luca Santarelli,

-			© 2004-2007 Victor Pavlychko

-			© 2010 MPK

-			© 2010 Merlin_de

+© 2004-2007 Victor Pavlychko

+© 2010 MPK

+© 2010 Merlin_de

 

 This program is free software; you can redistribute it and/or

 modify it under the terms of the GNU General Public License

@@ -73,11 +73,11 @@ static void updatePreviewImage(HWND hwndBox)
 

 	POPUPDATA2 ppd;

 	memset(&ppd, 0, sizeof(ppd));

-	ppd.cbSize		= sizeof(ppd);

-	ppd.flags		= PU2_TCHAR;

-	ppd.lchIcon		= LoadSkinnedIcon(SKINICON_STATUS_ONLINE);

-	ppd.lptzTitle	= TranslateT("Skin preview");

-	ppd.lptzText	= TranslateT("Just take a look at this skin... ;)");

+	ppd.cbSize = sizeof(ppd);

+	ppd.flags = PU2_TCHAR;

+	ppd.lchIcon = LoadSkinnedIcon(SKINICON_STATUS_ONLINE);

+	ppd.lptzTitle = TranslateT("Skin preview");

+	ppd.lptzText = TranslateT("Just take a look at this skin... ;)");

 

 	POPUPOPTIONS customOptions = PopupOptions;

 	customOptions.DynamicResize = FALSE;

@@ -180,18 +180,18 @@ int  SkinOptionList_AddSkin(OPTTREE_OPTION* &options, int *OptionsCount, int pos
 			if (!skin->getFlagName(i))

 				continue;

 			*OptionsCount += 1;

-			options = (OPTTREE_OPTION*)mir_realloc(options,sizeof(OPTTREE_OPTION)*(*OptionsCount));

-			options[pos].dwFlag			= (DWORD)(1 << (i-1));

-			options[pos].groupId		= OPTTREE_CHECK;

-			options[pos].iconIndex		= 0;

-			options[pos].pszSettingName	= mir_tstrdup(_T("Skin options"));

-			options[pos].pszOptionName	= (LPTSTR)mir_alloc(sizeof(TCHAR)*(

-				mir_tstrlen(options[pos].pszSettingName)+

-				mir_strlen(skin->getFlagName(i)) +10 ));

+			options = (OPTTREE_OPTION*)mir_realloc(options, sizeof(OPTTREE_OPTION)*(*OptionsCount));

+			options[pos].dwFlag = (DWORD)(1 << (i - 1));

+			options[pos].groupId = OPTTREE_CHECK;

+			options[pos].iconIndex = 0;

+			options[pos].pszSettingName = mir_tstrdup(_T("Skin options"));

+			options[pos].pszOptionName = (LPTSTR)mir_alloc(sizeof(TCHAR)*(

+				mir_tstrlen(options[pos].pszSettingName) +

+				mir_strlen(skin->getFlagName(i)) + 10));

 			wsprintf(options[pos].pszOptionName, _T("%s/%hs"), options[pos].pszSettingName, skin->getFlagName(i)); // !!!!!!!!!!!!!

-			options[pos].bState			= skin->getFlag(i) ? TRUE : FALSE;

-			options[pos].Data			= i;	// skin flag index

-			*dwGlobalOptions |= skin->getFlag(i) ? (1 << (i-1)) : 0;

+			options[pos].bState = skin->getFlag(i) ? TRUE : FALSE;

+			options[pos].Data = i;	// skin flag index

+			*dwGlobalOptions |= skin->getFlag(i) ? (1 << (i - 1)) : 0;

 			pos++;

 		}

 	}

@@ -200,17 +200,17 @@ int  SkinOptionList_AddSkin(OPTTREE_OPTION* &options, int *OptionsCount, int pos
 

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

 

-static LPTSTR mainOption [] = {

+static LPTSTR mainOption[] = {

 	LPGENT("Show clock"),

 	LPGENT("Drop shadow effect"),

 	LPGENT("Drop shadow effect")_T("/")LPGENT("non rectangular"),

 	LPGENT("Enable Aero Glass (Vista+)"),

 	LPGENT("Use Windows colors"),

-	LPGENT("Use advanced text render")};

+	LPGENT("Use advanced text render") };

 

 int SkinOptionList_AddMain(OPTTREE_OPTION* &options, int *OptionsCount, int pos, DWORD *dwGlobalOptions)

 {

-	for (int i=0; i < SIZEOF(mainOption); i++) {

+	for (int i = 0; i < SIZEOF(mainOption); i++) {

 		BOOL bCheck = 0;

 		switch (i) {

 		case 0:

@@ -241,26 +241,26 @@ int SkinOptionList_AddMain(OPTTREE_OPTION* &options, int *OptionsCount, int pos,
 			break;

 		}

 		*OptionsCount += 1;

-		options = (OPTTREE_OPTION*)mir_realloc(options,sizeof(OPTTREE_OPTION)*(*OptionsCount));

-		options[pos].dwFlag		= (1 << i);

-		options[pos].groupId	= OPTTREE_CHECK;

-		options[pos].iconIndex	= 0;

+		options = (OPTTREE_OPTION*)mir_realloc(options, sizeof(OPTTREE_OPTION)*(*OptionsCount));

+		options[pos].dwFlag = (1 << i);

+		options[pos].groupId = OPTTREE_CHECK;

+		options[pos].iconIndex = 0;

 		options[pos].pszSettingName = mir_tstrdup(LPGENT("Global settings"));

-		options[pos].pszOptionName	= (LPTSTR)mir_alloc(sizeof(TCHAR)*(

-			mir_tstrlen(options[pos].pszSettingName)+

+		options[pos].pszOptionName = (LPTSTR)mir_alloc(sizeof(TCHAR)*(

+			mir_tstrlen(options[pos].pszSettingName) +

 			mir_tstrlen(mainOption[i]) + 10));

 		wsprintf(options[pos].pszOptionName, _T("%s/%s"), options[pos].pszSettingName, mainOption[i]); // !!!!!!!!!!!!!

-		options[pos].bState			= bCheck;

+		options[pos].bState = bCheck;

 		pos++;

 	}

 	return pos;

 }

 

-bool SkinOptionList_Update (OPTTREE_OPTION* &options, int *OptionsCount, HWND hwndDlg) {

+bool SkinOptionList_Update(OPTTREE_OPTION* &options, int *OptionsCount, HWND hwndDlg) {

 	if (options) {

 		int index = -1;

 		OptTree_ProcessMessage(hwndDlg, WM_DESTROY, 0, 0, &index, IDC_SKIN_LIST_OPT, options, *OptionsCount);

-		for (int i=0; i < *OptionsCount; ++i) {

+		for (int i = 0; i < *OptionsCount; ++i) {

 			mir_free(options[i].pszOptionName);

 			mir_free(options[i].pszSettingName);

 		}

@@ -280,7 +280,7 @@ bool SkinOptionList_Update (OPTTREE_OPTION* &options, int *OptionsCount, HWND hw
 

 	// check "Skin options" state 

 	char prefix[128];

-	mir_snprintf(prefix, SIZEOF(prefix),"skin.%S", PopupOptions.SkinPack);

+	mir_snprintf(prefix, SIZEOF(prefix), "skin.%S", PopupOptions.SkinPack);

 	OptTree_SetOptions(hwndDlg, IDC_SKIN_LIST_OPT, options, *OptionsCount,

 		db_get_dw(NULL, MODULNAME, prefix, dwSkinOptions), _T("Skin options"));

 

@@ -293,14 +293,14 @@ bool SkinOptionList_Update (OPTTREE_OPTION* &options, int *OptionsCount, HWND hw
 

 void LoadOption_Skins() {

 	// skin pack

-	PopupOptions.SkinPack				= (LPTSTR)DBGetContactSettingStringX(NULL,MODULNAME, "SkinPack", "* Popup Classic",DBVT_TCHAR);

+	PopupOptions.SkinPack = (LPTSTR)DBGetContactSettingStringX(NULL, MODULNAME, "SkinPack", "* Popup Classic", DBVT_TCHAR);

 	// more Skin options

-	PopupOptions.DisplayTime			= db_get_b(NULL,MODULNAME, "DisplayTime", TRUE);

-	PopupOptions.DropShadow				= db_get_b(NULL,MODULNAME, "DropShadow", TRUE);

-	PopupOptions.EnableFreeformShadows	= db_get_b(NULL,MODULNAME, "EnableShadowRegion", 1);

-	PopupOptions.EnableAeroGlass		= db_get_b(NULL,MODULNAME, "EnableAeroGlass", 1);

-	PopupOptions.UseWinColors			= db_get_b(NULL,MODULNAME, "UseWinColors", FALSE);

-	PopupOptions.UseMText				= db_get_b(NULL,MODULNAME, "UseMText", TRUE);

+	PopupOptions.DisplayTime = db_get_b(NULL, MODULNAME, "DisplayTime", TRUE);

+	PopupOptions.DropShadow = db_get_b(NULL, MODULNAME, "DropShadow", TRUE);

+	PopupOptions.EnableFreeformShadows = db_get_b(NULL, MODULNAME, "EnableShadowRegion", 1);

+	PopupOptions.EnableAeroGlass = db_get_b(NULL, MODULNAME, "EnableAeroGlass", 1);

+	PopupOptions.UseWinColors = db_get_b(NULL, MODULNAME, "UseWinColors", FALSE);

+	PopupOptions.UseMText = db_get_b(NULL, MODULNAME, "UseMText", TRUE);

 }

 

 INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

@@ -322,22 +322,22 @@ INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 			}

 			else if (mir_tstrcmp(skinOptions[index].pszSettingName, _T("Global settings")) == 0) {

 				switch (skinOptions[index].dwFlag) {

-				case (1 << 0):

+				case (1 << 0) :

 					PopupOptions.DisplayTime = skinOptions[index].bState;

 					break;

-				case (1 << 1):

+				case (1 << 1) :

 					PopupOptions.DropShadow = skinOptions[index].bState;

 					break;

-				case (1 << 2):

+				case (1 << 2) :

 					PopupOptions.EnableFreeformShadows = skinOptions[index].bState;

 					break;

-				case (1 << 3):

+				case (1 << 3) :

 					PopupOptions.EnableAeroGlass = skinOptions[index].bState;

 					break;

-				case (1 << 4):

+				case (1 << 4) :

 					PopupOptions.UseWinColors = skinOptions[index].bState;

 					break;

-				case (1 << 5):

+				case (1 << 5) :

 					PopupOptions.UseMText = skinOptions[index].bState;

 					break;

 				}

@@ -349,127 +349,127 @@ INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 

 	switch (msg) {

 	case WM_INITDIALOG:

-		{

-			HWND		hCtrl	= NULL;

-			DWORD		dwIndex	= 0;

+	{

+		HWND		hCtrl = NULL;

+		DWORD		dwIndex = 0;

 

-			// Skin List

-			hCtrl = GetDlgItem(hwndDlg, IDC_SKINLIST);

-			ListBox_ResetContent(hCtrl);

-			for (const Skins::SKINLIST *sl = skins.getSkinList(); sl; sl = sl->next)

-			{

-				dwIndex = ListBox_AddString(hCtrl, sl->name);

-				ListBox_SetItemData(hCtrl, dwIndex, sl->name);

-			}

-			ListBox_SetCurSel(hCtrl, ListBox_FindString(hCtrl, 0, PopupOptions.SkinPack));

+		// Skin List

+		hCtrl = GetDlgItem(hwndDlg, IDC_SKINLIST);

+		ListBox_ResetContent(hCtrl);

+		for (const Skins::SKINLIST *sl = skins.getSkinList(); sl; sl = sl->next)

+		{

+			dwIndex = ListBox_AddString(hCtrl, sl->name);

+			ListBox_SetItemData(hCtrl, dwIndex, sl->name);

+		}

+		ListBox_SetCurSel(hCtrl, ListBox_FindString(hCtrl, 0, PopupOptions.SkinPack));

 

-			// Skin List reload button

-			SendDlgItemMessage(hwndDlg, IDC_BTN_RELOAD, BUTTONSETASFLATBTN, TRUE, 0);

-			SendDlgItemMessage(hwndDlg, IDC_BTN_RELOAD, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_OPT_RELOAD,0));

-			SendDlgItemMessage(hwndDlg, IDC_BTN_RELOAD, BUTTONADDTOOLTIP, (WPARAM)Translate("Refresh List"), 0);

+		// Skin List reload button

+		SendDlgItemMessage(hwndDlg, IDC_BTN_RELOAD, BUTTONSETASFLATBTN, TRUE, 0);

+		SendDlgItemMessage(hwndDlg, IDC_BTN_RELOAD, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_OPT_RELOAD, 0));

+		SendDlgItemMessage(hwndDlg, IDC_BTN_RELOAD, BUTTONADDTOOLTIP, (WPARAM)Translate("Refresh List"), 0);

 

-			// Skin Option List

-			SkinOptionList_Update (skinOptions, &skinOptionsCount, hwndDlg);

+		// Skin Option List

+		SkinOptionList_Update(skinOptions, &skinOptionsCount, hwndDlg);

 

-			// PreviewBox

-			mir_subclassWindow(GetDlgItem(hwndDlg, IDC_PREVIEWBOX), WndProcPreviewBox);

-			updatePreviewImage(GetDlgItem(hwndDlg, IDC_PREVIEWBOX));

+		// PreviewBox

+		mir_subclassWindow(GetDlgItem(hwndDlg, IDC_PREVIEWBOX), WndProcPreviewBox);

+		updatePreviewImage(GetDlgItem(hwndDlg, IDC_PREVIEWBOX));

 

-			// hooks

-			hhkFontsReload = HookEventMessage(ME_FONT_RELOAD, hwndDlg, WM_USER);

+		// hooks

+		hhkFontsReload = HookEventMessage(ME_FONT_RELOAD, hwndDlg, WM_USER);

 

-			TranslateDialogDefault(hwndDlg);

-			bDlgInit = true;

-		}

-		return TRUE;

+		TranslateDialogDefault(hwndDlg);

+		bDlgInit = true;

+	}

+	return TRUE;

 

 	case WM_USER:

 		updatePreviewImage(GetDlgItem(hwndDlg, IDC_PREVIEWBOX));

 		return TRUE;

 

 	case WM_COMMAND:

-		{

-			HWND hCtrl	= NULL;

-			UINT idCtrl	= LOWORD(wParam);

-			switch (HIWORD(wParam)) {

-			case BN_KILLFOCUS:		// Button controls

-			case BN_SETFOCUS:		// Button controls

-				return TRUE;

+	{

+		HWND hCtrl = NULL;

+		UINT idCtrl = LOWORD(wParam);

+		switch (HIWORD(wParam)) {

+		case BN_KILLFOCUS:		// Button controls

+		case BN_SETFOCUS:		// Button controls

+			return TRUE;

+			break;

+		case BN_CLICKED:		// Button controls

+			switch (idCtrl) {

+			case IDC_PREVIEW:

+				PopupPreview();

 				break;

-			case BN_CLICKED:		// Button controls

-				switch(idCtrl) {

-				case IDC_PREVIEW:

-					PopupPreview();

-					break;

 

-				case IDC_BTN_RELOAD:

-					{

-						DWORD  dwIndex	= 0;

-						TCHAR  szNewSkin[128];

-						LPTSTR pszOldSkin = mir_tstrdup(PopupOptions.SkinPack);

-						skins.load();

-						hCtrl = GetDlgItem(hwndDlg, IDC_SKINLIST);

-						ListBox_ResetContent(hCtrl);

-						for (const Skins::SKINLIST *sl = skins.getSkinList(); sl; sl = sl->next)

-						{

-							dwIndex = ListBox_AddString(hCtrl, sl->name);

-							ListBox_SetItemData(hCtrl, dwIndex, sl->name);

-						}

-						ListBox_SetCurSel(hCtrl, ListBox_FindString(hCtrl, 0, PopupOptions.SkinPack));

-						// make shure we have select skin (ListBox_SetCurSel may be fail)

-						ListBox_GetText(hCtrl, ListBox_GetCurSel(hCtrl), &szNewSkin);

-						if (mir_tstrcmp(pszOldSkin, szNewSkin) != 0) {

-							mir_free(PopupOptions.SkinPack);

-							PopupOptions.SkinPack = mir_tstrdup(szNewSkin);

-						}

-						mir_free(pszOldSkin);

-

-						const PopupSkin *skin = 0;

-						if (skin = skins.getSkin(PopupOptions.SkinPack)) {

-							// update Skin Option List from reload SkinPack

-							bDlgInit = false;

-							bDlgInit = SkinOptionList_Update (skinOptions, &skinOptionsCount, hwndDlg);

-						}

-

-						SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

-					}// end IDC_BTN_RELOAD:

-					break;

-				case IDC_GETSKINS:

-					CallService(MS_UTILS_OPENURL,0,(LPARAM)"http://miranda-ng.org/addons/category/13");

-					break;

-				}// end switch(idCtrl)

-				updatePreviewImage(GetDlgItem(hwndDlg, IDC_PREVIEWBOX));

-				break;

-			case CBN_SELCHANGE:		// combo box controls

-				switch(idCtrl) {

-				case IDC_SKINLIST:

-					{

-						// Skin list change

-						mir_free(PopupOptions.SkinPack);

-						PopupOptions.SkinPack = mir_tstrdup((TCHAR *)SendDlgItemMessage(

-							hwndDlg,

-							IDC_SKINLIST,

-							LB_GETITEMDATA,

-							(WPARAM)SendDlgItemMessage(hwndDlg, IDC_SKINLIST, LB_GETCURSEL,0,0),

-							0));

-						const PopupSkin *skin = 0;

-						if (skin = skins.getSkin(PopupOptions.SkinPack)) {

-							mir_free(PopupOptions.SkinPack);

-							PopupOptions.SkinPack = mir_tstrdup(skin->getName());

-

-							// update Skin Option List

-							bDlgInit = false;

-							bDlgInit = SkinOptionList_Update (skinOptions, &skinOptionsCount, hwndDlg);

-						}

-						updatePreviewImage(GetDlgItem(hwndDlg, IDC_PREVIEWBOX));

-					}

-					SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

-					break;

-				}// end switch(idCtrl)

+			case IDC_BTN_RELOAD:

+			{

+				DWORD  dwIndex = 0;

+				TCHAR  szNewSkin[128];

+				LPTSTR pszOldSkin = mir_tstrdup(PopupOptions.SkinPack);

+				skins.load();

+				hCtrl = GetDlgItem(hwndDlg, IDC_SKINLIST);

+				ListBox_ResetContent(hCtrl);

+				for (const Skins::SKINLIST *sl = skins.getSkinList(); sl; sl = sl->next)

+				{

+					dwIndex = ListBox_AddString(hCtrl, sl->name);

+					ListBox_SetItemData(hCtrl, dwIndex, sl->name);

+				}

+				ListBox_SetCurSel(hCtrl, ListBox_FindString(hCtrl, 0, PopupOptions.SkinPack));

+				// make shure we have select skin (ListBox_SetCurSel may be fail)

+				ListBox_GetText(hCtrl, ListBox_GetCurSel(hCtrl), &szNewSkin);

+				if (mir_tstrcmp(pszOldSkin, szNewSkin) != 0) {

+					mir_free(PopupOptions.SkinPack);

+					PopupOptions.SkinPack = mir_tstrdup(szNewSkin);

+				}

+				mir_free(pszOldSkin);

+

+				const PopupSkin *skin = 0;

+				if (skin = skins.getSkin(PopupOptions.SkinPack)) {

+					// update Skin Option List from reload SkinPack

+					bDlgInit = false;

+					bDlgInit = SkinOptionList_Update(skinOptions, &skinOptionsCount, hwndDlg);

+				}

+

+				SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

+			}// end IDC_BTN_RELOAD:

+			break;

+			case IDC_GETSKINS:

+				CallService(MS_UTILS_OPENURL, 0, (LPARAM)"http://miranda-ng.org/addons/category/13");

 				break;

-			}// end switch (HIWORD(wParam))

+			}// end switch(idCtrl)

+			updatePreviewImage(GetDlgItem(hwndDlg, IDC_PREVIEWBOX));

 			break;

-		}//  end WM_COMMAND

+		case CBN_SELCHANGE:		// combo box controls

+			switch (idCtrl) {

+			case IDC_SKINLIST:

+			{

+				// Skin list change

+				mir_free(PopupOptions.SkinPack);

+				PopupOptions.SkinPack = mir_tstrdup((TCHAR *)SendDlgItemMessage(

+					hwndDlg,

+					IDC_SKINLIST,

+					LB_GETITEMDATA,

+					(WPARAM)SendDlgItemMessage(hwndDlg, IDC_SKINLIST, LB_GETCURSEL, 0, 0),

+					0));

+				const PopupSkin *skin = 0;

+				if (skin = skins.getSkin(PopupOptions.SkinPack)) {

+					mir_free(PopupOptions.SkinPack);

+					PopupOptions.SkinPack = mir_tstrdup(skin->getName());

+

+					// update Skin Option List

+					bDlgInit = false;

+					bDlgInit = SkinOptionList_Update(skinOptions, &skinOptionsCount, hwndDlg);

+				}

+				updatePreviewImage(GetDlgItem(hwndDlg, IDC_PREVIEWBOX));

+			}

+			SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

+			break;

+			}// end switch(idCtrl)

+			break;

+		}// end switch (HIWORD(wParam))

+		break;

+	}//  end WM_COMMAND

 

 	case WM_NOTIFY:

 		if (!bDlgInit) return FALSE;

@@ -480,23 +480,23 @@ INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 				LoadOption_Skins();

 				return TRUE;

 

-			case PSN_APPLY: 

-				{

-					// skin pack

-					db_set_ts(NULL, MODULNAME, "SkinPack", PopupOptions.SkinPack);

-					// skin options

-					const PopupSkin *skin = 0;

-					if (skin = skins.getSkin(PopupOptions.SkinPack))

-						skin->saveOpts();

-					skins.freeAllButActive();

-					// more Skin options

-					db_set_b(NULL, MODULNAME, "DisplayTime", PopupOptions.DisplayTime);

-					db_set_b(NULL, MODULNAME, "DropShadow", PopupOptions.DropShadow);

-					db_set_b(NULL, MODULNAME, "EnableShadowRegion", PopupOptions.EnableFreeformShadows);

-					db_set_b(NULL, MODULNAME, "EnableAeroGlass", PopupOptions.EnableAeroGlass);

-					db_set_b(NULL, MODULNAME, "UseMText", PopupOptions.UseMText);

-				}// end PSN_APPLY:

-				return TRUE;

+			case PSN_APPLY:

+			{

+				// skin pack

+				db_set_ts(NULL, MODULNAME, "SkinPack", PopupOptions.SkinPack);

+				// skin options

+				const PopupSkin *skin = 0;

+				if (skin = skins.getSkin(PopupOptions.SkinPack))

+					skin->saveOpts();

+				skins.freeAllButActive();

+				// more Skin options

+				db_set_b(NULL, MODULNAME, "DisplayTime", PopupOptions.DisplayTime);

+				db_set_b(NULL, MODULNAME, "DropShadow", PopupOptions.DropShadow);

+				db_set_b(NULL, MODULNAME, "EnableShadowRegion", PopupOptions.EnableFreeformShadows);

+				db_set_b(NULL, MODULNAME, "EnableAeroGlass", PopupOptions.EnableAeroGlass);

+				db_set_b(NULL, MODULNAME, "UseMText", PopupOptions.UseMText);

+			}// end PSN_APPLY:

+			return TRUE;

 			}// switch (((LPNMHDR)lParam)->code)

 			break;

 		}// end switch (((LPNMHDR)lParam)->idFrom)

@@ -510,7 +510,7 @@ INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		}

 		if (hhkFontsReload) UnhookEvent(hhkFontsReload);

 		if (skinOptions) {

-			for (int i=0; i < skinOptionsCount; ++i) {

+			for (int i = 0; i < skinOptionsCount; ++i) {

 				mir_free(skinOptions[i].pszOptionName);

 				mir_free(skinOptions[i].pszSettingName);

 			}

@@ -529,72 +529,72 @@ static void BoxPreview_OnPaint(HWND hwnd, HDC mydc, int mode)
 

 	switch (mode) {

 	case 0:

-		{ //  Avatar

-			HDC hdcAvatar = CreateCompatibleDC(mydc);

-			HBITMAP hbmSave = (HBITMAP)SelectObject(hdcAvatar, hbmNoAvatar);

-			GetClientRect(hwnd, &rc);

-			BITMAP bmp;

-			GetObject(hbmNoAvatar, sizeof(bmp), &bmp);

-			StretchBlt(mydc, 0, 0, rc.right, rc.bottom, hdcAvatar, 0, 0, abs(bmp.bmWidth), abs(bmp.bmHeight), SRCCOPY);

-			SelectObject(hdcAvatar, hbmSave);

-			DeleteDC(hdcAvatar);

-			HRGN rgn = CreateRoundRectRgn(0, 0, rc.right, rc.bottom, 2 * PopupOptions.avatarRadius, 2 * PopupOptions.avatarRadius);

-			FrameRgn(mydc, rgn, (HBRUSH)GetStockObject(BLACK_BRUSH), 1, 1);

-			DeleteObject(rgn);

-			break;

-		}

-	case 1:

-		{ //  Opacity

-			HBRUSH hbr = CreateSolidBrush(fonts.clBack);

-			HFONT hfnt = (HFONT)SelectObject(mydc, fonts.title);

-			GetClientRect(hwnd, &rc);

-			FillRect(mydc, &rc, hbr);

-			DrawIconEx(mydc, 10, (rc.bottom-rc.top-16)/2, IcoLib_GetIcon(ICO_POPUP_ON,0), 16, 16, 0, hbr, DI_NORMAL);

-			SetBkMode(mydc, TRANSPARENT);

-			GetClientRect(hwnd, &rc);

-			rc.left += 30; //  10+16+4 -- icon

-			rc.right -= (rc.right-rc.left)/3;

-			rc.bottom -= (rc.bottom-rc.top)/3;

-			DrawText(mydc, _T(MODULNAME_LONG), -1, &rc, DT_CENTER | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER);

-			GetClientRect(hwnd, &rc);

-			rc.left += 30; //  10+16+4 -- icon

-			rc.left += (rc.right-rc.left)/3;

-			rc.top += (rc.bottom-rc.top)/3;

-			DrawText(mydc, _T(MODULNAME_LONG), -1, &rc, DT_CENTER | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER);

-			GetClientRect(hwnd, &rc);

-			FrameRect(mydc, &rc, (HBRUSH)GetStockObject(BLACK_BRUSH));

-			SelectObject(mydc, hfnt);

-			DeleteObject(hbr);

-		}

+	{ //  Avatar

+		HDC hdcAvatar = CreateCompatibleDC(mydc);

+		HBITMAP hbmSave = (HBITMAP)SelectObject(hdcAvatar, hbmNoAvatar);

+		GetClientRect(hwnd, &rc);

+		BITMAP bmp;

+		GetObject(hbmNoAvatar, sizeof(bmp), &bmp);

+		StretchBlt(mydc, 0, 0, rc.right, rc.bottom, hdcAvatar, 0, 0, abs(bmp.bmWidth), abs(bmp.bmHeight), SRCCOPY);

+		SelectObject(hdcAvatar, hbmSave);

+		DeleteDC(hdcAvatar);

+		HRGN rgn = CreateRoundRectRgn(0, 0, rc.right, rc.bottom, 2 * PopupOptions.avatarRadius, 2 * PopupOptions.avatarRadius);

+		FrameRgn(mydc, rgn, (HBRUSH)GetStockObject(BLACK_BRUSH), 1, 1);

+		DeleteObject(rgn);

 		break;

+	}

+	case 1:

+	{ //  Opacity

+		HBRUSH hbr = CreateSolidBrush(fonts.clBack);

+		HFONT hfnt = (HFONT)SelectObject(mydc, fonts.title);

+		GetClientRect(hwnd, &rc);

+		FillRect(mydc, &rc, hbr);

+		DrawIconEx(mydc, 10, (rc.bottom - rc.top - 16) / 2, IcoLib_GetIcon(ICO_POPUP_ON, 0), 16, 16, 0, hbr, DI_NORMAL);

+		SetBkMode(mydc, TRANSPARENT);

+		GetClientRect(hwnd, &rc);

+		rc.left += 30; //  10+16+4 -- icon

+		rc.right -= (rc.right - rc.left) / 3;

+		rc.bottom -= (rc.bottom - rc.top) / 3;

+		DrawText(mydc, _T(MODULNAME_LONG), -1, &rc, DT_CENTER | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER);

+		GetClientRect(hwnd, &rc);

+		rc.left += 30; //  10+16+4 -- icon

+		rc.left += (rc.right - rc.left) / 3;

+		rc.top += (rc.bottom - rc.top) / 3;

+		DrawText(mydc, _T(MODULNAME_LONG), -1, &rc, DT_CENTER | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER);

+		GetClientRect(hwnd, &rc);

+		FrameRect(mydc, &rc, (HBRUSH)GetStockObject(BLACK_BRUSH));

+		SelectObject(mydc, hfnt);

+		DeleteObject(hbr);

+	}

+	break;

 

 	case 2:

-		{ //  Position

-			HBRUSH hbr = CreateSolidBrush(GetSysColor(COLOR_WINDOW));

-			GetClientRect(hwnd, &rc);

-			FillRect(mydc, &rc, hbr);

-			DeleteObject(hbr);

-

-			hbr = CreateSolidBrush(GetSysColor(COLOR_HIGHLIGHT));

-			GetClientRect(hwnd, &rc);

-			rc.right -= 100;

-			rc.top += 100;

-			FillRect(mydc, &rc, hbr);

-			DeleteObject(hbr);

-

-			HPEN hpen = (HPEN)SelectObject(mydc, CreatePen(PS_DOT, 1, RGB(0,0,0)));

-			MoveToEx(mydc,   0, 100, NULL);

-			LineTo  (mydc, 201, 100);

-			MoveToEx(mydc, 100,   0, NULL);

-			LineTo  (mydc, 100, 201);

-			DeleteObject(SelectObject(mydc, hpen));

-

-			HRGN hrgn = CreateRectRgn(0,0,0,0);

-			GetWindowRgn(hwnd, hrgn);

-			FrameRgn(mydc, hrgn, (HBRUSH)GetStockObject(BLACK_BRUSH), 1, 1);

-			DeleteObject(hrgn);

-		}

-		break;

+	{ //  Position

+		HBRUSH hbr = CreateSolidBrush(GetSysColor(COLOR_WINDOW));

+		GetClientRect(hwnd, &rc);

+		FillRect(mydc, &rc, hbr);

+		DeleteObject(hbr);

+

+		hbr = CreateSolidBrush(GetSysColor(COLOR_HIGHLIGHT));

+		GetClientRect(hwnd, &rc);

+		rc.right -= 100;

+		rc.top += 100;

+		FillRect(mydc, &rc, hbr);

+		DeleteObject(hbr);

+

+		HPEN hpen = (HPEN)SelectObject(mydc, CreatePen(PS_DOT, 1, RGB(0, 0, 0)));

+		MoveToEx(mydc, 0, 100, NULL);

+		LineTo(mydc, 201, 100);

+		MoveToEx(mydc, 100, 0, NULL);

+		LineTo(mydc, 100, 201);

+		DeleteObject(SelectObject(mydc, hpen));

+

+		HRGN hrgn = CreateRectRgn(0, 0, 0, 0);

+		GetWindowRgn(hwnd, hrgn);

+		FrameRgn(mydc, hrgn, (HBRUSH)GetStockObject(BLACK_BRUSH), 1, 1);

+		DeleteObject(hrgn);

+	}

+	break;

 	}

 }