slightly refactored MRA

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

1 files changed, 159 insertions, 186 deletions

diff --git a/protocols/MRA/Mra_options.cpp b/protocols/MRA/Mra_options.cpp
index 137b347f1c..e85405b859 100644
--- a/protocols/MRA/Mra_options.cpp
+++ b/protocols/MRA/Mra_options.cpp
@@ -1,238 +1,211 @@
 #include "Mra.h"

 

-

-

-INT_PTR CALLBACK	DlgProcOptsAccount		(HWND hWndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

-INT_PTR CALLBACK	DlgProcOptsConnections	(HWND hWndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

-

-

-

-int OptInit(WPARAM wParam,LPARAM lParam)

+INT_PTR CALLBACK DlgProcOptsAccount(HWND hWndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	OPTIONSDIALOGPAGE odp={0};

-	odp.cbSize = sizeof(odp);

-	odp.hInstance = masMraSettings.hInstance;

-	odp.pszTitle = PROTOCOL_NAMEA;

-	odp.pszGroup = LPGEN("Network");

-	odp.flags = ODPF_BOLDGROUPS;

-

-	odp.pszTab = LPGEN("Account");

-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ACCOUNT);

-	odp.pfnDlgProc = DlgProcOptsAccount;

-	Options_AddPage(wParam, &odp);

-

-	odp.pszTab = LPGEN("Connections");

-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CONNECTIONS);

-	odp.pfnDlgProc = DlgProcOptsConnections;

-	Options_AddPage(wParam, &odp);

-

-	odp.pszTab = LPGEN("Anti spam");

-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ANTISPAM);

-	odp.pfnDlgProc = MraAntiSpamDlgProcOpts;

-	Options_AddPage(wParam, &odp);

-

-	odp.pszTab = LPGEN("Files");

-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FILES);

-	odp.pfnDlgProc = MraFilesQueueDlgProcOpts;

-	Options_AddPage(wParam, &odp);

+	CMraProto *ppro = (CMraProto*)GetWindowLongPtr(hWndDlg, GWLP_USERDATA);

+	WCHAR szBuff[MAX_EMAIL_LEN];

 

-	odp.pszTab = LPGEN("Avatars");

-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_AVATRS);

-	odp.pfnDlgProc = MraAvatarsQueueDlgProcOpts;

-	Options_AddPage(wParam, &odp);

-

-	MraPopupOptInit(wParam,lParam);

-	return 0;

-}

-

-

-

-INT_PTR CALLBACK DlgProcOptsAccount(HWND hWndDlg,UINT msg,WPARAM wParam,LPARAM lParam)

-{

-	switch(msg){

+	switch (msg) {

 	case WM_INITDIALOG:

-		{

-			WCHAR szBuff[MAX_PATH];

-			//SIZE_T dwBuffSize;

+		TranslateDialogDefault(hWndDlg);

+		SetWindowLongPtr(hWndDlg, GWLP_USERDATA, lParam);

+		ppro = (CMraProto*)lParam;

 

-			TranslateDialogDefault(hWndDlg);

+		if ( ppro->mraGetStaticStringW(NULL, "e-mail", szBuff, SIZEOF(szBuff), NULL))

+			SET_DLG_ITEM_TEXTW(hWndDlg, IDC_LOGIN, szBuff);

+

+		SET_DLG_ITEM_TEXTW(hWndDlg, IDC_PASSWORD, (LPWSTR)L"");

+		return TRUE;

 

-			if (DB_Mra_GetStaticStringW(NULL,"e-mail",szBuff,SIZEOF(szBuff),NULL))

-			{

-				SET_DLG_ITEM_TEXTW(hWndDlg,IDC_LOGIN,szBuff);

-			}

-			

-			SET_DLG_ITEM_TEXTW(hWndDlg,IDC_PASSWORD,(LPWSTR)L"");

-			//if (GetPassDB((LPSTR)szBuff,SIZEOF(szBuff),&dwBuffSize))

-			//{//bit of a security hole here, since it's easy to extract a password from an edit box

-			//	SET_DLG_ITEM_TEXTA(hWndDlg,IDC_PASSWORD,(LPSTR)szBuff);

-			//	SecureZeroMemory(szBuff,sizeof(szBuff));

-			//}

-		}

-		return(TRUE);

 	case WM_COMMAND:

 		switch (LOWORD(wParam)) {

 		case IDC_NEW_ACCOUNT_LINK:

-			CallService(MS_UTILS_OPENURL,TRUE,(LPARAM)MRA_REGISTER_URL);

-			return(TRUE);

+			CallService(MS_UTILS_OPENURL, TRUE, (LPARAM)MRA_REGISTER_URL);

+			return TRUE;

+

 		case IDC_LOOKUPLINK:

-			CallService(MS_UTILS_OPENURL,TRUE,(LPARAM)MRA_FORGOT_PASSWORD_URL);

-			return(TRUE);

+			CallService(MS_UTILS_OPENURL, TRUE, (LPARAM)MRA_FORGOT_PASSWORD_URL);

+			return TRUE;

 		}

-		if ((LOWORD(wParam)==IDC_LOGIN || LOWORD(wParam)==IDC_PASSWORD) && (HIWORD(wParam)!=EN_CHANGE || (HWND)lParam!=GetFocus())) return 0;

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

+		if ((LOWORD(wParam) == IDC_LOGIN || LOWORD(wParam) == IDC_PASSWORD) && (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus()))

+			return 0;

+

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

 		break;

+

 	case WM_NOTIFY:

-		switch(((LPNMHDR)lParam)->code){

+		switch (((LPNMHDR)lParam)->code) {

 		case PSN_APPLY:

-			{

-				WCHAR szBuff[MAX_EMAIL_LEN];

-

-				GET_DLG_ITEM_TEXT(hWndDlg,IDC_LOGIN,szBuff,SIZEOF(szBuff));

-				DB_Mra_SetStringW(NULL,"e-mail",szBuff);

+			GET_DLG_ITEM_TEXT(hWndDlg, IDC_LOGIN, szBuff, SIZEOF(szBuff));

+			ppro->mraSetStringW(NULL, "e-mail", szBuff);

 

-				if (GET_DLG_ITEM_TEXTA(hWndDlg,IDC_PASSWORD,(LPSTR)szBuff,SIZEOF(szBuff))) 

-				{

-					SetPassDB((LPSTR)szBuff,lstrlenA((LPSTR)szBuff));

-					SecureZeroMemory(szBuff,sizeof(szBuff));

-				}

+			if (GET_DLG_ITEM_TEXTA(hWndDlg, IDC_PASSWORD, (LPSTR)szBuff, SIZEOF(szBuff))) {

+				ppro->SetPassDB((LPSTR)szBuff, lstrlenA((LPSTR)szBuff));

+				SecureZeroMemory(szBuff, sizeof(szBuff));

 			}

-			return(TRUE);

+			return TRUE;

 		}

 		break;

 	}

-return(FALSE);

+	return FALSE;

 }

 

 

-INT_PTR CALLBACK DlgProcOptsConnections(HWND hWndDlg,UINT msg,WPARAM wParam,LPARAM lParam)

+INT_PTR CALLBACK DlgProcOptsConnections(HWND hWndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	switch(msg){

-	case WM_INITDIALOG:

-		{

-			WCHAR szBuff[MAX_PATH];

+	CMraProto *ppro = (CMraProto*)GetWindowLongPtr(hWndDlg, GWLP_USERDATA);

+	WCHAR szBuff[MAX_PATH];

 

-			TranslateDialogDefault(hWndDlg);

+	switch (msg) {

+	case WM_INITDIALOG:

+		TranslateDialogDefault(hWndDlg);

+		SetWindowLongPtr(hWndDlg, GWLP_USERDATA, lParam);

+		ppro = (CMraProto*)lParam;

+

+		if (ppro->mraGetStaticStringW(NULL, "Server", szBuff, SIZEOF(szBuff), NULL))

+			SET_DLG_ITEM_TEXT(hWndDlg, IDC_SERVER, szBuff);

+		else

+			SET_DLG_ITEM_TEXTA(hWndDlg, IDC_SERVER, MRA_DEFAULT_SERVER);

+

+		SetDlgItemInt(hWndDlg, IDC_SERVERPORT, ppro->mraGetWord(NULL, "ServerPort", MRA_DEFAULT_SERVER_PORT), FALSE);

+		// if set SSL proxy, setting will ignored

+

+		//CHECK_DLG_BUTTON(hWndDlg, IDC_KEEPALIVE, mraGetByte(NULL, "keepalive", 0));

+		CHECK_DLG_BUTTON(hWndDlg, IDC_AUTO_ADD_CONTACTS_TO_SERVER, ppro->mraGetByte(NULL, "AutoAddContactsToServer", MRA_DEFAULT_AUTO_ADD_CONTACTS_TO_SERVER));

+		CHECK_DLG_BUTTON(hWndDlg, IDC_AUTO_AUTH_REQ_ON_LOGON, ppro->mraGetByte(NULL, "AutoAuthRequestOnLogon", MRA_DEFAULT_AUTO_AUTH_REQ_ON_LOGON));

+		CHECK_DLG_BUTTON(hWndDlg, IDC_AUTO_AUTH_GRAND_IN_CLIST, ppro->mraGetByte(NULL, "AutoAuthGrandUsersInCList", MRA_DEFAULT_AUTO_AUTH_GRAND_IN_CLIST));

+		CHECK_DLG_BUTTON(hWndDlg, IDC_AUTO_AUTH_GRAND_NEW_USERS, ppro->mraGetByte(NULL, "AutoAuthGrandNewUsers", MRA_DEFAULT_AUTO_AUTH_GRAND_NEW_USERS));

+		CHECK_DLG_BUTTON(hWndDlg, IDC_AUTO_AUTH_GRAND_NEW_USERS_DISABLE_SPAM_CHECK, ppro->mraGetByte(NULL, "AutoAuthGrandNewUsersDisableSPAMCheck", MRA_DEFAULT_AUTO_AUTH_GRAND_NEW_USERS_DISABLE_SPAM_CHECK));

+		EnableWindow(GetDlgItem(hWndDlg, IDC_AUTO_AUTH_GRAND_NEW_USERS_DISABLE_SPAM_CHECK), IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_AUTO_AUTH_GRAND_NEW_USERS));

+

+		CHECK_DLG_BUTTON(hWndDlg, IDC_SLOWSEND, ppro->mraGetByte(NULL, "SlowSend", MRA_DEFAULT_SLOW_SEND));

+		CHECK_DLG_BUTTON(hWndDlg, IDC_INCREMENTAL_NEW_MAIL_NOTIFY, ppro->mraGetByte(NULL, "IncrementalNewMailNotify", MRA_DEFAULT_INC_NEW_MAIL_NOTIFY));

+		CHECK_DLG_BUTTON(hWndDlg, IDC_TRAYICON_NEW_MAIL_NOTIFY, ppro->mraGetByte(NULL, "TrayIconNewMailNotify", MRA_DEFAULT_TRAYICON_NEW_MAIL_NOTIFY));

+		CHECK_DLG_BUTTON(hWndDlg, IDC_TRAYICON_NEW_MAIL_NOTIFY_CLICK_TO_INBOX, ppro->mraGetByte(NULL, "TrayIconNewMailClkToInbox", MRA_DEFAULT_TRAYICON_NEW_MAIL_CLK_TO_INBOX));

+		EnableWindow(GetDlgItem(hWndDlg, IDC_TRAYICON_NEW_MAIL_NOTIFY_CLICK_TO_INBOX), ppro->mraGetByte(NULL, "TrayIconNewMailNotify", MRA_DEFAULT_TRAYICON_NEW_MAIL_NOTIFY));

+

+		CHECK_DLG_BUTTON(hWndDlg, IDC_HIDE_MENU_ITEMS_FOR_NON_MRA, ppro->mraGetByte(NULL, "HideMenuItemsForNonMRAContacts", MRA_DEFAULT_HIDE_MENU_ITEMS_FOR_NON_MRA));

+

+		CHECK_DLG_BUTTON(hWndDlg, IDC_RTF_RECEIVE_ENABLE, ppro->mraGetByte(NULL, "RTFReceiveEnable", MRA_DEFAULT_RTF_RECEIVE_ENABLE));

+		EnableWindow(GetDlgItem(hWndDlg, IDC_RTF_RECEIVE_ENABLE), (BOOL)(masMraSettings.lpfnUncompress != NULL));

+

+		CHECK_DLG_BUTTON(hWndDlg, IDC_RTF_SEND_ENABLE, ppro->mraGetByte(NULL, "RTFSendEnable", MRA_DEFAULT_RTF_SEND_ENABLE));

+		EnableWindow(GetDlgItem(hWndDlg, IDC_RTF_SEND_ENABLE), (BOOL)(masMraSettings.lpfnCompress2 != NULL));

+		EnableWindow(GetDlgItem(hWndDlg, IDC_RTF_SEND_SMART), ppro->mraGetByte(NULL, "RTFSendEnable", MRA_DEFAULT_RTF_SEND_ENABLE) && masMraSettings.lpfnCompress2);

+		EnableWindow(GetDlgItem(hWndDlg, IDC_BUTTON_FONT), ppro->mraGetByte(NULL, "RTFSendEnable", MRA_DEFAULT_RTF_SEND_ENABLE) && masMraSettings.lpfnCompress2);

+		EnableWindow(GetDlgItem(hWndDlg, IDC_RTF_BGCOLOUR), ppro->mraGetByte(NULL, "RTFSendEnable", MRA_DEFAULT_RTF_SEND_ENABLE) && masMraSettings.lpfnCompress2);

+		SEND_DLG_ITEM_MESSAGE(hWndDlg, IDC_RTF_BGCOLOUR, CPM_SETCOLOUR, 0, ppro->mraGetDword(NULL, "RTFBackgroundColour", MRA_DEFAULT_RTF_BACKGROUND_COLOUR));

+		return TRUE;

 

-			if (DB_Mra_GetStaticStringW(NULL,"Server",szBuff,SIZEOF(szBuff),NULL))

-			{

-				SET_DLG_ITEM_TEXT(hWndDlg,IDC_SERVER,szBuff);

-			}else{

-				SET_DLG_ITEM_TEXTA(hWndDlg,IDC_SERVER,MRA_DEFAULT_SERVER);

-			}

-			SetDlgItemInt(hWndDlg,IDC_SERVERPORT,DB_Mra_GetWord(NULL,"ServerPort",MRA_DEFAULT_SERVER_PORT),FALSE);

-			// if set SSL proxy, setting will ignored

-			

-			//CHECK_DLG_BUTTON(hWndDlg, IDC_KEEPALIVE,DB_Mra_GetByte(NULL,"keepalive",0));

-			CHECK_DLG_BUTTON(hWndDlg,IDC_AUTO_ADD_CONTACTS_TO_SERVER,DB_Mra_GetByte(NULL,"AutoAddContactsToServer",MRA_DEFAULT_AUTO_ADD_CONTACTS_TO_SERVER));

-			CHECK_DLG_BUTTON(hWndDlg,IDC_AUTO_AUTH_REQ_ON_LOGON,DB_Mra_GetByte(NULL,"AutoAuthRequestOnLogon",MRA_DEFAULT_AUTO_AUTH_REQ_ON_LOGON));

-			CHECK_DLG_BUTTON(hWndDlg,IDC_AUTO_AUTH_GRAND_IN_CLIST,DB_Mra_GetByte(NULL,"AutoAuthGrandUsersInCList",MRA_DEFAULT_AUTO_AUTH_GRAND_IN_CLIST));

-			CHECK_DLG_BUTTON(hWndDlg,IDC_AUTO_AUTH_GRAND_NEW_USERS,DB_Mra_GetByte(NULL,"AutoAuthGrandNewUsers",MRA_DEFAULT_AUTO_AUTH_GRAND_NEW_USERS));

-			CHECK_DLG_BUTTON(hWndDlg,IDC_AUTO_AUTH_GRAND_NEW_USERS_DISABLE_SPAM_CHECK,DB_Mra_GetByte(NULL,"AutoAuthGrandNewUsersDisableSPAMCheck",MRA_DEFAULT_AUTO_AUTH_GRAND_NEW_USERS_DISABLE_SPAM_CHECK));

-			EnableWindow(GetDlgItem(hWndDlg,IDC_AUTO_AUTH_GRAND_NEW_USERS_DISABLE_SPAM_CHECK),IS_DLG_BUTTON_CHECKED(hWndDlg,IDC_AUTO_AUTH_GRAND_NEW_USERS));

-

-			CHECK_DLG_BUTTON(hWndDlg,IDC_SLOWSEND,DB_Mra_GetByte(NULL,"SlowSend",MRA_DEFAULT_SLOW_SEND));

-			CHECK_DLG_BUTTON(hWndDlg,IDC_INCREMENTAL_NEW_MAIL_NOTIFY,DB_Mra_GetByte(NULL,"IncrementalNewMailNotify",MRA_DEFAULT_INC_NEW_MAIL_NOTIFY));

-			CHECK_DLG_BUTTON(hWndDlg,IDC_TRAYICON_NEW_MAIL_NOTIFY,DB_Mra_GetByte(NULL,"TrayIconNewMailNotify",MRA_DEFAULT_TRAYICON_NEW_MAIL_NOTIFY));

-			CHECK_DLG_BUTTON(hWndDlg,IDC_TRAYICON_NEW_MAIL_NOTIFY_CLICK_TO_INBOX,DB_Mra_GetByte(NULL,"TrayIconNewMailClkToInbox",MRA_DEFAULT_TRAYICON_NEW_MAIL_CLK_TO_INBOX));

-			EnableWindow(GetDlgItem(hWndDlg,IDC_TRAYICON_NEW_MAIL_NOTIFY_CLICK_TO_INBOX),DB_Mra_GetByte(NULL,"TrayIconNewMailNotify",MRA_DEFAULT_TRAYICON_NEW_MAIL_NOTIFY));

-			

-			CHECK_DLG_BUTTON(hWndDlg,IDC_HIDE_MENU_ITEMS_FOR_NON_MRA,DB_Mra_GetByte(NULL,"HideMenuItemsForNonMRAContacts",MRA_DEFAULT_HIDE_MENU_ITEMS_FOR_NON_MRA));

-		

-			CHECK_DLG_BUTTON(hWndDlg,IDC_RTF_RECEIVE_ENABLE,DB_Mra_GetByte(NULL,"RTFReceiveEnable",MRA_DEFAULT_RTF_RECEIVE_ENABLE));

-			EnableWindow(GetDlgItem(hWndDlg,IDC_RTF_RECEIVE_ENABLE),(BOOL)(masMraSettings.lpfnUncompress!=NULL));

-			

-			CHECK_DLG_BUTTON(hWndDlg,IDC_RTF_SEND_ENABLE,DB_Mra_GetByte(NULL,"RTFSendEnable",MRA_DEFAULT_RTF_SEND_ENABLE));

-			EnableWindow(GetDlgItem(hWndDlg,IDC_RTF_SEND_ENABLE),(BOOL)(masMraSettings.lpfnCompress2!=NULL));

-			EnableWindow(GetDlgItem(hWndDlg,IDC_RTF_SEND_SMART),(DB_Mra_GetByte(NULL,"RTFSendEnable",MRA_DEFAULT_RTF_SEND_ENABLE) && masMraSettings.lpfnCompress2));

-			EnableWindow(GetDlgItem(hWndDlg,IDC_BUTTON_FONT),(DB_Mra_GetByte(NULL,"RTFSendEnable",MRA_DEFAULT_RTF_SEND_ENABLE) && masMraSettings.lpfnCompress2));

-			EnableWindow(GetDlgItem(hWndDlg,IDC_RTF_BGCOLOUR),(DB_Mra_GetByte(NULL,"RTFSendEnable",MRA_DEFAULT_RTF_SEND_ENABLE) && masMraSettings.lpfnCompress2));

-			SEND_DLG_ITEM_MESSAGE(hWndDlg,IDC_RTF_BGCOLOUR,CPM_SETCOLOUR,0,DB_Mra_GetDword(NULL,"RTFBackgroundColour",MRA_DEFAULT_RTF_BACKGROUND_COLOUR));

-		}

-		return(TRUE);

 	case WM_COMMAND:

-		switch(LOWORD(wParam)) {

+		switch (LOWORD(wParam)) {

 		case IDC_BUTTON_DEFAULT:

-			SET_DLG_ITEM_TEXTA(hWndDlg,IDC_SERVER,MRA_DEFAULT_SERVER);

-			SetDlgItemInt(hWndDlg,IDC_SERVERPORT,MRA_DEFAULT_SERVER_PORT,FALSE);

+			SET_DLG_ITEM_TEXTA(hWndDlg, IDC_SERVER, MRA_DEFAULT_SERVER);

+			SetDlgItemInt(hWndDlg, IDC_SERVERPORT, MRA_DEFAULT_SERVER_PORT, FALSE);

 			break;

 		case IDC_AUTO_AUTH_GRAND_NEW_USERS:

-			EnableWindow(GetDlgItem(hWndDlg,IDC_AUTO_AUTH_GRAND_NEW_USERS_DISABLE_SPAM_CHECK),IS_DLG_BUTTON_CHECKED(hWndDlg,IDC_AUTO_AUTH_GRAND_NEW_USERS));

+			EnableWindow(GetDlgItem(hWndDlg, IDC_AUTO_AUTH_GRAND_NEW_USERS_DISABLE_SPAM_CHECK), IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_AUTO_AUTH_GRAND_NEW_USERS));

 			break;

 		case IDC_TRAYICON_NEW_MAIL_NOTIFY:

-			EnableWindow(GetDlgItem(hWndDlg,IDC_TRAYICON_NEW_MAIL_NOTIFY_CLICK_TO_INBOX),IS_DLG_BUTTON_CHECKED(hWndDlg,IDC_TRAYICON_NEW_MAIL_NOTIFY));

+			EnableWindow(GetDlgItem(hWndDlg, IDC_TRAYICON_NEW_MAIL_NOTIFY_CLICK_TO_INBOX), IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_TRAYICON_NEW_MAIL_NOTIFY));

 			break;

 		case IDC_RTF_SEND_ENABLE:

-			EnableWindow(GetDlgItem(hWndDlg,IDC_RTF_SEND_SMART),IS_DLG_BUTTON_CHECKED(hWndDlg,IDC_RTF_SEND_ENABLE));

-			EnableWindow(GetDlgItem(hWndDlg,IDC_BUTTON_FONT),IS_DLG_BUTTON_CHECKED(hWndDlg,IDC_RTF_SEND_ENABLE));

-			EnableWindow(GetDlgItem(hWndDlg,IDC_RTF_BGCOLOUR),IS_DLG_BUTTON_CHECKED(hWndDlg,IDC_RTF_SEND_ENABLE));

+			EnableWindow(GetDlgItem(hWndDlg, IDC_RTF_SEND_SMART), IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_RTF_SEND_ENABLE));

+			EnableWindow(GetDlgItem(hWndDlg, IDC_BUTTON_FONT), IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_RTF_SEND_ENABLE));

+			EnableWindow(GetDlgItem(hWndDlg, IDC_RTF_BGCOLOUR), IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_RTF_SEND_ENABLE));

 			break;

 		case IDC_BUTTON_FONT:

 			{

-				LOGFONT lf={0};

-				CHOOSEFONT cf={0};

-

-				cf.lStructSize=sizeof(cf);

-				cf.lpLogFont=&lf;

-				cf.rgbColors=DB_Mra_GetDword(NULL,"RTFFontColour",MRA_DEFAULT_RTF_FONT_COLOUR);

-				cf.Flags=(CF_SCREENFONTS|CF_EFFECTS|CF_FORCEFONTEXIST|CF_INITTOLOGFONTSTRUCT);

-				if (DB_Mra_GetContactSettingBlob(NULL,"RTFFont",&lf,sizeof(LOGFONT),NULL)==FALSE)

-				{

-					HDC hDC=GetDC(NULL);// kegl

-					lf.lfCharSet=MRA_DEFAULT_RTF_FONT_CHARSET;

-					lf.lfHeight=-MulDiv(MRA_DEFAULT_RTF_FONT_SIZE,GetDeviceCaps(hDC,LOGPIXELSY),72);

-					lstrcpynW(lf.lfFaceName,MRA_DEFAULT_RTF_FONT_NAME,LF_FACESIZE);

-					ReleaseDC(NULL,hDC);

+				LOGFONT lf = {0};

+				CHOOSEFONT cf = {0};

+

+				cf.lStructSize = sizeof(cf);

+				cf.lpLogFont = &lf;

+				cf.rgbColors = ppro->mraGetDword(NULL, "RTFFontColour", MRA_DEFAULT_RTF_FONT_COLOUR);

+				cf.Flags = (CF_SCREENFONTS|CF_EFFECTS|CF_FORCEFONTEXIST|CF_INITTOLOGFONTSTRUCT);

+				if (ppro->mraGetContactSettingBlob(NULL, "RTFFont", &lf, sizeof(LOGFONT), NULL) == FALSE) {

+					HDC hDC = GetDC(NULL);// kegl

+					lf.lfCharSet = MRA_DEFAULT_RTF_FONT_CHARSET;

+					lf.lfHeight = -MulDiv(MRA_DEFAULT_RTF_FONT_SIZE, GetDeviceCaps(hDC, LOGPIXELSY), 72);

+					lstrcpynW(lf.lfFaceName, MRA_DEFAULT_RTF_FONT_NAME, LF_FACESIZE);

+					ReleaseDC(NULL, hDC);

 				}

 

-				if (ChooseFont(&cf))

-				{

-					/*HDC hDC=GetDC(NULL);

-					DWORD dwFontSize;

-					dwFontSize=-MulDiv(lf.lfHeight,72,GetDeviceCaps(hDC,LOGPIXELSY));

-					dwFontSize+=((dwFontSize+4)/8);//MulDiv(dwFontSize,GetDeviceCaps(hDC,PHYSICALWIDTH),72);

-					ReleaseDC(NULL,hDC);*/

-

-					DB_Mra_WriteContactSettingBlob(NULL,"RTFFont",&lf,sizeof(LOGFONT));

-					DB_Mra_SetDword(NULL,"RTFFontColour",cf.rgbColors);

+				if (ChooseFont(&cf)) {

+					ppro->mraWriteContactSettingBlob(NULL, "RTFFont", &lf, sizeof(LOGFONT));

+					ppro->mraSetDword(NULL, "RTFFontColour", cf.rgbColors);

 				}

 			}

 			break;

 		}

 

-		if ((LOWORD(wParam)==IDC_SERVER || LOWORD(wParam)==IDC_SERVERPORT) && (HIWORD(wParam)!=EN_CHANGE || (HWND)lParam!=GetFocus())) return(FALSE);

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

+		if ((LOWORD(wParam) == IDC_SERVER || LOWORD(wParam) == IDC_SERVERPORT) && (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus())) return FALSE;

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

 		break;

 	case WM_NOTIFY:

-		switch(((LPNMHDR)lParam)->code){

+		switch (((LPNMHDR)lParam)->code) {

 		case PSN_APPLY:

-			{

-				WCHAR szBuff[MAX_PATH];

-

-				GET_DLG_ITEM_TEXT(hWndDlg,IDC_SERVER,szBuff,SIZEOF(szBuff));

-				DB_Mra_SetStringW(NULL,"Server",szBuff);

-				DB_Mra_SetWord(NULL,"ServerPort",(WORD)GetDlgItemInt(hWndDlg,IDC_SERVERPORT,NULL,FALSE));

-				DB_Mra_SetByte(NULL,"AutoAddContactsToServer",IS_DLG_BUTTON_CHECKED(hWndDlg,IDC_AUTO_ADD_CONTACTS_TO_SERVER));

-				DB_Mra_SetByte(NULL,"AutoAuthRequestOnLogon",IS_DLG_BUTTON_CHECKED(hWndDlg,IDC_AUTO_AUTH_REQ_ON_LOGON));

-				DB_Mra_SetByte(NULL,"AutoAuthGrandUsersInCList",IS_DLG_BUTTON_CHECKED(hWndDlg,IDC_AUTO_AUTH_GRAND_IN_CLIST));

-				DB_Mra_SetByte(NULL,"AutoAuthGrandNewUsers",IS_DLG_BUTTON_CHECKED(hWndDlg,IDC_AUTO_AUTH_GRAND_NEW_USERS));

-				DB_Mra_SetByte(NULL,"AutoAuthGrandNewUsersDisableSPAMCheck",IS_DLG_BUTTON_CHECKED(hWndDlg,IDC_AUTO_AUTH_GRAND_NEW_USERS_DISABLE_SPAM_CHECK));

-

-				DB_Mra_SetByte(NULL,"SlowSend",IS_DLG_BUTTON_CHECKED(hWndDlg,IDC_SLOWSEND));

-				DB_Mra_SetByte(NULL,"IncrementalNewMailNotify",IS_DLG_BUTTON_CHECKED(hWndDlg,IDC_INCREMENTAL_NEW_MAIL_NOTIFY));

-				DB_Mra_SetByte(NULL,"TrayIconNewMailNotify",IS_DLG_BUTTON_CHECKED(hWndDlg,IDC_TRAYICON_NEW_MAIL_NOTIFY));

-				DB_Mra_SetByte(NULL,"TrayIconNewMailClkToInbox",IS_DLG_BUTTON_CHECKED(hWndDlg,IDC_TRAYICON_NEW_MAIL_NOTIFY_CLICK_TO_INBOX));

-

-				DB_Mra_SetByte(NULL,"HideMenuItemsForNonMRAContacts",IS_DLG_BUTTON_CHECKED(hWndDlg,IDC_HIDE_MENU_ITEMS_FOR_NON_MRA));

-

-				DB_Mra_SetByte(NULL,"RTFReceiveEnable",IS_DLG_BUTTON_CHECKED(hWndDlg,IDC_RTF_RECEIVE_ENABLE));

-				DB_Mra_SetByte(NULL,"RTFSendEnable",IS_DLG_BUTTON_CHECKED(hWndDlg,IDC_RTF_SEND_ENABLE));

-				DBWriteContactSettingDword(NULL,PROTOCOL_NAMEA,"RTFBackgroundColour",SEND_DLG_ITEM_MESSAGE(hWndDlg,IDC_RTF_BGCOLOUR,CPM_GETCOLOUR,0,0));

-			}

-			return(TRUE);

+			GET_DLG_ITEM_TEXT(hWndDlg, IDC_SERVER, szBuff, SIZEOF(szBuff));

+			ppro->mraSetStringW(NULL, "Server", szBuff);

+			ppro->mraSetWord(NULL, "ServerPort", (WORD)GetDlgItemInt(hWndDlg, IDC_SERVERPORT, NULL, FALSE));

+			ppro->mraSetByte(NULL, "AutoAddContactsToServer", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_AUTO_ADD_CONTACTS_TO_SERVER));

+			ppro->mraSetByte(NULL, "AutoAuthRequestOnLogon", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_AUTO_AUTH_REQ_ON_LOGON));

+			ppro->mraSetByte(NULL, "AutoAuthGrandUsersInCList", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_AUTO_AUTH_GRAND_IN_CLIST));

+			ppro->mraSetByte(NULL, "AutoAuthGrandNewUsers", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_AUTO_AUTH_GRAND_NEW_USERS));

+			ppro->mraSetByte(NULL, "AutoAuthGrandNewUsersDisableSPAMCheck", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_AUTO_AUTH_GRAND_NEW_USERS_DISABLE_SPAM_CHECK));

+

+			ppro->mraSetByte(NULL, "SlowSend", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_SLOWSEND));

+			ppro->mraSetByte(NULL, "IncrementalNewMailNotify", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_INCREMENTAL_NEW_MAIL_NOTIFY));

+			ppro->mraSetByte(NULL, "TrayIconNewMailNotify", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_TRAYICON_NEW_MAIL_NOTIFY));

+			ppro->mraSetByte(NULL, "TrayIconNewMailClkToInbox", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_TRAYICON_NEW_MAIL_NOTIFY_CLICK_TO_INBOX));

+

+			ppro->mraSetByte(NULL, "HideMenuItemsForNonMRAContacts", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_HIDE_MENU_ITEMS_FOR_NON_MRA));

+

+			ppro->mraSetByte(NULL, "RTFReceiveEnable", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_RTF_RECEIVE_ENABLE));

+			ppro->mraSetByte(NULL, "RTFSendEnable", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_RTF_SEND_ENABLE));

+			ppro->mraSetDword(NULL, "RTFBackgroundColour", SEND_DLG_ITEM_MESSAGE(hWndDlg, IDC_RTF_BGCOLOUR, CPM_GETCOLOUR, 0, 0));

+			return TRUE;

 		}

 		break;

 	}

-return(FALSE);

+	return FALSE;

 }

 

+int CMraProto::OnOptionsInit(WPARAM wParam, LPARAM lParam)

+{

+	OPTIONSDIALOGPAGE odp = {0};

+	odp.cbSize = sizeof(odp);

+	odp.dwInitParam = (LPARAM)this;

+	odp.hInstance = masMraSettings.hInstance;

+	odp.pszTitle = m_szModuleName;

+	odp.pszGroup = LPGEN("Network");

+	odp.flags = ODPF_BOLDGROUPS;

+

+	odp.pszTab = LPGEN("Account");

+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ACCOUNT);

+	odp.pfnDlgProc = DlgProcOptsAccount;

+	Options_AddPage(wParam, &odp);

+

+	odp.pszTab = LPGEN("Connections");

+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CONNECTIONS);

+	odp.pfnDlgProc = DlgProcOptsConnections;

+	Options_AddPage(wParam, &odp);

+

+	odp.pszTab = LPGEN("Anti spam");

+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ANTISPAM);

+	odp.pfnDlgProc = MraAntiSpamDlgProcOpts;

+	Options_AddPage(wParam, &odp);

+

+	odp.pszTab = LPGEN("Files");

+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FILES);

+	odp.pfnDlgProc = MraFilesQueueDlgProcOpts;

+	Options_AddPage(wParam, &odp);

+

+	odp.pszTab = LPGEN("Avatars");

+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_AVATRS);

+	odp.pfnDlgProc = MraAvatarsQueueDlgProcOpts;

+	Options_AddPage(wParam, &odp);

+

+	OnPopupOptInit(wParam, lParam);

+	return 0;

+}