- skinning for a frame

- human-readable protocol names
- code cleaning

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

1 files changed, 192 insertions, 255 deletions

diff --git a/plugins/Utils/mir_options.cpp b/plugins/Utils/mir_options.cpp
index ad3322e38a..8062c1180e 100644
--- a/plugins/Utils/mir_options.cpp
+++ b/plugins/Utils/mir_options.cpp
@@ -36,10 +36,8 @@ Boston, MA 02111-1307, USA.
 #include "mir_options.h"

 #include "mir_memory.h"

 

-

 #define SIZEOF(_A_) ( sizeof(_A_) / sizeof(_A_[0]))

 

-

 static TCHAR* MyDBGetContactSettingTString(HANDLE hContact, char* module, char* setting, TCHAR* out, size_t len, TCHAR *def)

 {

 	DBVARIANT dbv = {0};

@@ -66,102 +64,82 @@ static TCHAR dbPath[MAX_PATH] = {0};		// database profile path (read at startup
 

 static int PathIsAbsolute(const TCHAR *path)

 {

-    if ( !path || !(lstrlen(path) > 2))

-        return 0;

-    if ((path[1]==_T(':') && path[2]==_T('\\')) || (path[0]==_T('\\')&&path[1]==_T('\\'))) 

+	if ( !path || !(lstrlen(path) > 2))

+		return 0;

+	if ((path[1]==_T(':') && path[2]==_T('\\')) || (path[0]==_T('\\')&&path[1]==_T('\\'))) 

 		return 1;

-    return 0;

+	return 0;

 }

 

 static void PathToRelative(TCHAR *pOut, size_t outSize, const TCHAR *pSrc)

 {

-    if ( !PathIsAbsolute(pSrc)) 

-	{

+	if ( !PathIsAbsolute(pSrc)) 

 		lstrcpyn(pOut, pSrc, (int)outSize);

-    }

-    else 

-	{

-		if (dbPath[0] == _T('\0'))

-		{

+	else {

+		if (dbPath[0] == _T('\0')) {

 			char tmp[1024];

-		    CallService(MS_DB_GETPROFILEPATH, SIZEOF(tmp), (LPARAM) tmp);

+			CallService(MS_DB_GETPROFILEPATH, SIZEOF(tmp), (LPARAM) tmp);

 			mir_sntprintf(dbPath, SIZEOF(dbPath), _T(TCHAR_STR_PARAM) _T("\\"), tmp);

 		}

 

 		size_t len = lstrlen(dbPath);

-        if (_tcsnicmp(pSrc, dbPath, len)) 

-		{

-            mir_sntprintf(pOut, outSize, _T("%s"), pSrc + len);

-        }

-        else 

-		{

-            lstrcpyn(pOut, pSrc, (int)outSize);

-        }

-    }

+		if (_tcsnicmp(pSrc, dbPath, len)) 

+			mir_sntprintf(pOut, outSize, _T("%s"), pSrc + len);

+		else 

+			lstrcpyn(pOut, pSrc, (int)outSize);

+	}

 }

 

 static void PathToAbsolute(TCHAR *pOut, size_t outSize, const TCHAR *pSrc)

 {

-    if (PathIsAbsolute(pSrc) || !isalnum(pSrc[0])) 

-	{

-        lstrcpyn(pOut, pSrc, (int)outSize);

-    }

-    else 

-	{

+	if (PathIsAbsolute(pSrc) || !isalnum(pSrc[0])) 

+		lstrcpyn(pOut, pSrc, (int)outSize);

+	else {

 		if (dbPath[0] == _T('\0'))

 		{

 			char tmp[1024];

-		    CallService(MS_DB_GETPROFILEPATH, SIZEOF(tmp), (LPARAM) tmp);

+			CallService(MS_DB_GETPROFILEPATH, SIZEOF(tmp), (LPARAM) tmp);

 			mir_sntprintf(dbPath, SIZEOF(dbPath), _T(TCHAR_STR_PARAM) _T("\\"), tmp);

 		}

 

-        mir_sntprintf(pOut, outSize, _T("%s%s"), dbPath, pSrc);

-    }

+		mir_sntprintf(pOut, outSize, _T("%s%s"), dbPath, pSrc);

+	}

 }

 

-

 static void LoadOpt(OptPageControl *ctrl, char *module)

 {

 	if (ctrl->var == NULL)

 		return;

 	

-	switch(ctrl->type)

-	{

-		case CONTROL_CHECKBOX:

-		{

-			*((BYTE *) ctrl->var) = DBGetContactSettingByte(NULL, module, ctrl->setting, ctrl->dwDefValue);

-			break;

-		}

-		case CONTROL_SPIN:

-		{

-			*((WORD *) ctrl->var) = DBGetContactSettingWord(NULL, module, ctrl->setting, ctrl->dwDefValue);

-			break;

-		}

-		case CONTROL_COLOR:

-		{

-			*((COLORREF *) ctrl->var) = (COLORREF) DBGetContactSettingDword(NULL, module, ctrl->setting, ctrl->dwDefValue);

-			break;

-		}

-		case CONTROL_RADIO:

-		{

-			*((WORD *) ctrl->var) = DBGetContactSettingWord(NULL, module, ctrl->setting, ctrl->dwDefValue);

-			break;

-		}

-		case CONTROL_COMBO:

-		{

-			*((WORD *) ctrl->var) = DBGetContactSettingWord(NULL, module, ctrl->setting, ctrl->dwDefValue);

-			break;

-		}

-		case CONTROL_PROTOCOL_LIST:

-		{

-			break;

-		}

-		case CONTROL_TEXT:

-		{

-			MyDBGetContactSettingTString(NULL, module, ctrl->setting, ((TCHAR *) ctrl->var), min(ctrl->max <= 0 ? 1024 : ctrl->max, 1024), ctrl->tszDefValue == NULL ? NULL : TranslateTS(ctrl->tszDefValue));

-			break;

-		}

-		case CONTROL_PASSWORD:

+	switch(ctrl->type) {

+	case CONTROL_CHECKBOX:

+		*((BYTE *) ctrl->var) = db_get_b(NULL, module, ctrl->setting, ctrl->dwDefValue);

+		break;

+

+	case CONTROL_SPIN:

+		*((WORD *) ctrl->var) = DBGetContactSettingWord(NULL, module, ctrl->setting, ctrl->dwDefValue);

+		break;

+

+	case CONTROL_COLOR:

+		*((COLORREF *) ctrl->var) = (COLORREF) DBGetContactSettingDword(NULL, module, ctrl->setting, ctrl->dwDefValue);

+		break;

+

+	case CONTROL_RADIO:

+		*((WORD *) ctrl->var) = DBGetContactSettingWord(NULL, module, ctrl->setting, ctrl->dwDefValue);

+		break;

+

+	case CONTROL_COMBO:

+		*((WORD *) ctrl->var) = DBGetContactSettingWord(NULL, module, ctrl->setting, ctrl->dwDefValue);

+		break;

+

+	case CONTROL_PROTOCOL_LIST:

+		break;

+

+	case CONTROL_TEXT:

+		MyDBGetContactSettingTString(NULL, module, ctrl->setting, ((TCHAR *) ctrl->var), min(ctrl->max <= 0 ? 1024 : ctrl->max, 1024), ctrl->tszDefValue == NULL ? NULL : TranslateTS(ctrl->tszDefValue));

+		break;

+

+	case CONTROL_PASSWORD:

 		{

 			char tmp[1024];

 			tmp[0]=0;

@@ -181,140 +159,121 @@ static void LoadOpt(OptPageControl *ctrl, char *module)
 			char *var = (char *) ctrl->var;

 			int size = min(ctrl->max <= 0 ? 1024 : ctrl->max, 1024);

 			lstrcpynA(var, tmp, size);

-			break;

-		}

-		case CONTROL_INT:

-		{

-			*((int *) ctrl->var) = (int) DBGetContactSettingDword(NULL, module, ctrl->setting, ctrl->dwDefValue);

-			break;

 		}

-		case CONTROL_FILE:

+		break;

+

+	case CONTROL_INT:

+		*((int *) ctrl->var) = (int) DBGetContactSettingDword(NULL, module, ctrl->setting, ctrl->dwDefValue);

+		break;

+

+	case CONTROL_FILE:

 		{

 			TCHAR tmp[1024];

 			MyDBGetContactSettingTString(NULL, module, ctrl->setting, tmp, 1024, ctrl->tszDefValue == NULL ? NULL : ctrl->tszDefValue);

 			PathToAbsolute(((TCHAR *) ctrl->var), min(ctrl->max <= 0 ? 1024 : ctrl->max, 1024), tmp);

-			break;

-		}

-		case CONTROL_COMBO_TEXT:

-		case CONTROL_COMBO_ITEMDATA:

-		{

-			MyDBGetContactSettingTString(NULL, module, ctrl->setting, ((TCHAR *) ctrl->var), min(ctrl->max <= 0 ? 1024 : ctrl->max, 1024), ctrl->tszDefValue == NULL ? NULL : TranslateTS(ctrl->tszDefValue));

-			break;

 		}

+		break;

+

+	case CONTROL_COMBO_TEXT:

+	case CONTROL_COMBO_ITEMDATA:

+		MyDBGetContactSettingTString(NULL, module, ctrl->setting, ((TCHAR *) ctrl->var), min(ctrl->max <= 0 ? 1024 : ctrl->max, 1024), ctrl->tszDefValue == NULL ? NULL : TranslateTS(ctrl->tszDefValue));

+		break;

 	}

 }

 

 void LoadOpts(OptPageControl *controls, int controlsSize, char *module)

 {

 	for (int i = 0 ; i < controlsSize ; i++)

-	{

 		LoadOpt(&controls[i], module);

-	}

 }

 

-

-

 INT_PTR CALLBACK SaveOptsDlgProc(OptPageControl *controls, int controlsSize, char *module, HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	switch (msg)

-	{

-		case WM_INITDIALOG:

+	switch (msg) {

+	case WM_INITDIALOG:

+		TranslateDialogDefault(hwndDlg);

 		{

-			TranslateDialogDefault(hwndDlg);

-

-			for (int i = 0 ; i < controlsSize ; i++)

-			{

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

 				OptPageControl *ctrl = &controls[i];

 

 				if (GetDlgItem(hwndDlg, ctrl->nID) == NULL)

 					continue;

 

-				switch(ctrl->type)

-				{

-					case CONTROL_CHECKBOX:

-					{

-						CheckDlgButton(hwndDlg, ctrl->nID, DBGetContactSettingByte(NULL, module, ctrl->setting, ctrl->dwDefValue) == 1 ? BST_CHECKED : BST_UNCHECKED);

-						break;

-					}

-					case CONTROL_SPIN:

-					{

-						SendDlgItemMessage(hwndDlg, ctrl->nIDSpin, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, ctrl->nID),0);

-						SendDlgItemMessage(hwndDlg, ctrl->nIDSpin, UDM_SETRANGE, 0, MAKELONG(ctrl->max, ctrl->min));

-						SendDlgItemMessage(hwndDlg, ctrl->nIDSpin, UDM_SETPOS,0, MAKELONG(DBGetContactSettingWord(NULL, module, ctrl->setting, ctrl->dwDefValue), 0));

-						break;

-					}

-					case CONTROL_COLOR:

-					{

-						SendDlgItemMessage(hwndDlg, ctrl->nID, CPM_SETCOLOUR, 0, (COLORREF) DBGetContactSettingDword(NULL, module, ctrl->setting, ctrl->dwDefValue));

-						break;

-					}

-					case CONTROL_RADIO:

-					{

-						CheckDlgButton(hwndDlg, ctrl->nID, DBGetContactSettingWord(NULL, module, ctrl->setting, ctrl->dwDefValue) == ctrl->value ? BST_CHECKED : BST_UNCHECKED);

-						break;

-					}

-					case CONTROL_COMBO:

-					{

-						SendDlgItemMessage(hwndDlg, ctrl->nID, CB_SETCURSEL, DBGetContactSettingWord(NULL, module, ctrl->setting, ctrl->dwDefValue), 0);

-						break;

-					}

-					case CONTROL_PROTOCOL_LIST:

+				switch(ctrl->type) {

+				case CONTROL_CHECKBOX:

+					CheckDlgButton(hwndDlg, ctrl->nID, db_get_b(NULL, module, ctrl->setting, ctrl->dwDefValue) == 1 ? BST_CHECKED : BST_UNCHECKED);

+					break;

+

+				case CONTROL_SPIN:

+					SendDlgItemMessage(hwndDlg, ctrl->nIDSpin, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, ctrl->nID),0);

+					SendDlgItemMessage(hwndDlg, ctrl->nIDSpin, UDM_SETRANGE, 0, MAKELONG(ctrl->max, ctrl->min));

+					SendDlgItemMessage(hwndDlg, ctrl->nIDSpin, UDM_SETPOS,0, MAKELONG(DBGetContactSettingWord(NULL, module, ctrl->setting, ctrl->dwDefValue), 0));

+					break;

+

+				case CONTROL_COLOR:

+					SendDlgItemMessage(hwndDlg, ctrl->nID, CPM_SETCOLOUR, 0, (COLORREF) DBGetContactSettingDword(NULL, module, ctrl->setting, ctrl->dwDefValue));

+					break;

+

+				case CONTROL_RADIO:

+					CheckDlgButton(hwndDlg, ctrl->nID, DBGetContactSettingWord(NULL, module, ctrl->setting, ctrl->dwDefValue) == ctrl->value ? BST_CHECKED : BST_UNCHECKED);

+					break;

+

+				case CONTROL_COMBO:

+					SendDlgItemMessage(hwndDlg, ctrl->nID, CB_SETCURSEL, DBGetContactSettingWord(NULL, module, ctrl->setting, ctrl->dwDefValue), 0);

+					break;

+

+				case CONTROL_PROTOCOL_LIST:

 					{

 						// Fill list view

 						HWND hwndProtocols = GetDlgItem(hwndDlg, ctrl->nID);

 						LVCOLUMN lvc;

 						LVITEM lvi;

-						

+

 						ListView_SetExtendedListViewStyle(hwndProtocols, LVS_EX_CHECKBOXES);

-						

+

 						ZeroMemory(&lvc, sizeof(lvc));

 						lvc.mask = LVCF_FMT;

 						lvc.fmt = LVCFMT_IMAGE | LVCFMT_LEFT;

 						ListView_InsertColumn(hwndProtocols, 0, &lvc);

-						

+

 						ZeroMemory(&lvi, sizeof(lvi));

 						lvi.mask = LVIF_TEXT | LVIF_PARAM;

 						lvi.iSubItem = 0;

 						lvi.iItem = 1000;

-						

+

 						PROTOACCOUNT **protos;

 						int count;

 

 						BOOL hasAccounts = ServiceExists(MS_PROTO_ENUMACCOUNTS);

-

 						if (hasAccounts)

 							CallService(MS_PROTO_ENUMACCOUNTS, (WPARAM)&count, (LPARAM)&protos);

 						else

 							CallService(MS_PROTO_ENUMPROTOCOLS, (WPARAM)&count, (LPARAM)&protos);

-						

-						for (int i = 0; i < count; i++)

-						{

+

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

 							if (protos[i]->type != PROTOTYPE_PROTOCOL)

 								continue;

 

 							if (protos[i]->szModuleName == NULL || protos[i]->szModuleName[0] == '\0')

 								continue;

-							

+

 							if (ctrl->allowProtocol != NULL && !ctrl->allowProtocol(protos[i]->szModuleName))

 								continue;

 

 							TCHAR *name;

 							if (hasAccounts)

-							{

 								name = mir_tstrdup(protos[i]->tszAccountName);

-							}

-							else

-							{

+							else {

 								char szName[128];

 								CallProtoService(protos[i]->szModuleName, PS_GETNAME, sizeof(szName), (LPARAM)szName);

 								name = mir_a2t(szName);

 							}

-							

+

 							char *setting = (char *) mir_alloc(128 * sizeof(char));

 							mir_snprintf(setting, 128, ctrl->setting, protos[i]->szModuleName);

 

-							BOOL show = (BOOL)DBGetContactSettingByte(NULL, module, setting, ctrl->dwDefValue);

-							

+							BOOL show = (BOOL)db_get_b(NULL, module, setting, ctrl->dwDefValue);

+

 							lvi.lParam = (LPARAM)setting;

 							lvi.pszText = TranslateTS(name);

 							lvi.iItem = ListView_InsertItem(hwndProtocols, &lvi);

@@ -322,26 +281,25 @@ INT_PTR CALLBACK SaveOptsDlgProc(OptPageControl *controls, int controlsSize, cha
 

 							mir_free(name);

 						}

-						

+

 						ListView_SetColumnWidth(hwndProtocols, 0, LVSCW_AUTOSIZE);

 						ListView_Arrange(hwndProtocols, LVA_ALIGNLEFT | LVA_ALIGNTOP);

-						break;

 					}

-					case CONTROL_TEXT:

+					break;

+				case CONTROL_TEXT:

 					{

 						TCHAR tmp[1024];

 						SetDlgItemText(hwndDlg, ctrl->nID, MyDBGetContactSettingTString(NULL, module, ctrl->setting, tmp, 1024, ctrl->tszDefValue == NULL ? NULL : TranslateTS(ctrl->tszDefValue)));

 						SendDlgItemMessage(hwndDlg, ctrl->nID, EM_LIMITTEXT, min(ctrl->max <= 0 ? 1024 : ctrl->max, 1024), 0);

-						break;

 					}

-					case CONTROL_PASSWORD:

+					break;

+				case CONTROL_PASSWORD:

 					{

 						char tmp[1024];

 						tmp[0]=0;

 

 						DBVARIANT dbv = {0};

-						if ( !DBGetContactSettingString(NULL, module, ctrl->setting, &dbv))

-						{

+						if ( !DBGetContactSettingString(NULL, module, ctrl->setting, &dbv)) {

 							lstrcpynA(tmp, dbv.pszVal, SIZEOF(tmp));

 							DBFreeVariant(&dbv);

 						}

@@ -353,16 +311,16 @@ INT_PTR CALLBACK SaveOptsDlgProc(OptPageControl *controls, int controlsSize, cha
 

 						SetDlgItemTextA(hwndDlg, ctrl->nID, tmp);

 						SendDlgItemMessage(hwndDlg, ctrl->nID, EM_LIMITTEXT, min(ctrl->max <= 0 ? 1024 : ctrl->max, 1024), 0);

-						break;

 					}

-					case CONTROL_INT:

+					break;

+				case CONTROL_INT:

 					{

 						DWORD var = DBGetContactSettingDword(NULL, module, ctrl->setting, ctrl->dwDefValue);

 						SetDlgItemInt(hwndDlg, ctrl->nID, var, ctrl->min <= 0);

 						SendDlgItemMessage(hwndDlg, ctrl->nID, EM_LIMITTEXT, 9, 0);

-						break;

 					}

-					case CONTROL_FILE:

+					break;

+				case CONTROL_FILE:

 					{

 						TCHAR tmp[1024];

 						MyDBGetContactSettingTString(NULL, module, ctrl->setting, tmp, 1024, ctrl->tszDefValue == NULL ? NULL : ctrl->tszDefValue);

@@ -371,16 +329,16 @@ INT_PTR CALLBACK SaveOptsDlgProc(OptPageControl *controls, int controlsSize, cha
 

 						SetDlgItemText(hwndDlg, ctrl->nID, abs);

 						SendDlgItemMessage(hwndDlg, ctrl->nID, EM_LIMITTEXT, min(ctrl->max <= 0 ? 1024 : ctrl->max, 1024), 0);

-						break;

 					}

-					case CONTROL_COMBO_TEXT:

+					break;

+				case CONTROL_COMBO_TEXT:

 					{

 						TCHAR tmp[1024];

 						MyDBGetContactSettingTString(NULL, module, ctrl->setting, tmp, 1024, ctrl->tszDefValue == NULL ? NULL : TranslateTS(ctrl->tszDefValue));

 						SendDlgItemMessage(hwndDlg, ctrl->nID, CB_SELECTSTRING, 0, (WPARAM) tmp);

-						break;

 					}

-					case CONTROL_COMBO_ITEMDATA:

+					break;

+				case CONTROL_COMBO_ITEMDATA:

 					{

 						TCHAR tmp[1024];

 						MyDBGetContactSettingTString(NULL, module, ctrl->setting, tmp, 1024, ctrl->tszDefValue == NULL ? NULL : TranslateTS(ctrl->tszDefValue));

@@ -394,131 +352,115 @@ INT_PTR CALLBACK SaveOptsDlgProc(OptPageControl *controls, int controlsSize, cha
 						}

 						if (i < count)

 							SendDlgItemMessage(hwndDlg, ctrl->nID, CB_SETCURSEL, i, 0);

-						break;

 					}

+					break;

 				}

 			}

 			break;

 		}

-		case WM_COMMAND:

+	case WM_COMMAND:

 		{

-			for (int i = 0 ; i < controlsSize ; i++)

-			{

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

 				OptPageControl *ctrl = &controls[i];

 

-				if (LOWORD(wParam) == ctrl->nID)

-				{

-					switch(ctrl->type)

-					{

-						case CONTROL_TEXT:

-						case CONTROL_SPIN:

-						case CONTROL_INT:

-						case CONTROL_PASSWORD:

-						{

-							// Don't make apply enabled during buddy set

-							if (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus())

-								return 0;

+				if (LOWORD(wParam) == ctrl->nID) {

+					switch(ctrl->type) {

+					case CONTROL_TEXT:

+					case CONTROL_SPIN:

+					case CONTROL_INT:

+					case CONTROL_PASSWORD:

+						// Don't make apply enabled during buddy set

+						if (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus())

+							return 0;

 

-							break;

-						}

-						case CONTROL_COMBO_ITEMDATA:

-						case CONTROL_COMBO_TEXT:

-						case CONTROL_COMBO:

-						{

-							if (HIWORD(wParam) != CBN_SELCHANGE || (HWND)lParam != GetFocus())

-								return 0;

+						break;

 

-							break;

-						}

+					case CONTROL_COMBO_ITEMDATA:

+					case CONTROL_COMBO_TEXT:

+					case CONTROL_COMBO:

+						if (HIWORD(wParam) != CBN_SELCHANGE || (HWND)lParam != GetFocus())

+							return 0;

+						break;

 					}

 

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

 				}

 			}

-

-			break;

 		}

-		case WM_NOTIFY:

+		break;

+

+	case WM_NOTIFY:

 		{

 			LPNMHDR lpnmhdr = (LPNMHDR)lParam;

-

-			if (lpnmhdr->idFrom == 0 && lpnmhdr->code == PSN_APPLY)

-			{

-				for (int i = 0 ; i < controlsSize ; i++)

-				{

+			if (lpnmhdr->idFrom == 0 && lpnmhdr->code == PSN_APPLY) {

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

 					OptPageControl *ctrl = &controls[i];

 

 					if (GetDlgItem(hwndDlg, ctrl->nID) == NULL)

 						continue;

 

-					switch(ctrl->type)

-					{

-						case CONTROL_CHECKBOX:

-						{

-							DBWriteContactSettingByte(NULL, module, ctrl->setting, (BYTE) IsDlgButtonChecked(hwndDlg, ctrl->nID));

-							break;

-						}

-						case CONTROL_SPIN:

-						{

-							DBWriteContactSettingWord(NULL, module, ctrl->setting, (WORD) SendDlgItemMessage(hwndDlg, ctrl->nIDSpin, UDM_GETPOS, 0, 0));

-							break;

-						}

-						case CONTROL_COLOR:

-						{

-							DBWriteContactSettingDword(NULL, module, ctrl->setting, (DWORD) SendDlgItemMessage(hwndDlg, ctrl->nID, CPM_GETCOLOUR, 0, 0));

-							break;

-						}

-						case CONTROL_RADIO:

-						{

-							if (IsDlgButtonChecked(hwndDlg, ctrl->nID))

-								DBWriteContactSettingWord(NULL, module, ctrl->setting, (BYTE) ctrl->value);

-							break;

-						}

-						case CONTROL_COMBO:

-						{

-							DBWriteContactSettingWord(NULL, module, ctrl->setting, (WORD) SendDlgItemMessage(hwndDlg, ctrl->nID, CB_GETCURSEL, 0, 0));

-							break;

-						}

-						case CONTROL_PROTOCOL_LIST:

+					switch(ctrl->type) {

+					case CONTROL_CHECKBOX:

+						DBWriteContactSettingByte(NULL, module, ctrl->setting, (BYTE) IsDlgButtonChecked(hwndDlg, ctrl->nID));

+						break;

+

+					case CONTROL_SPIN:

+						DBWriteContactSettingWord(NULL, module, ctrl->setting, (WORD) SendDlgItemMessage(hwndDlg, ctrl->nIDSpin, UDM_GETPOS, 0, 0));

+						break;

+

+					case CONTROL_COLOR:

+						DBWriteContactSettingDword(NULL, module, ctrl->setting, (DWORD) SendDlgItemMessage(hwndDlg, ctrl->nID, CPM_GETCOLOUR, 0, 0));

+						break;

+

+					case CONTROL_RADIO:

+						if (IsDlgButtonChecked(hwndDlg, ctrl->nID))

+							DBWriteContactSettingWord(NULL, module, ctrl->setting, (BYTE) ctrl->value);

+						break;

+

+					case CONTROL_COMBO:

+						DBWriteContactSettingWord(NULL, module, ctrl->setting, (WORD) SendDlgItemMessage(hwndDlg, ctrl->nID, CB_GETCURSEL, 0, 0));

+						break;

+

+					case CONTROL_PROTOCOL_LIST:

 						{

 							LVITEM lvi = {0};

 							HWND hwndProtocols = GetDlgItem(hwndDlg, ctrl->nID);

 							int i;

-							

+

 							lvi.mask = (UINT) LVIF_PARAM;

-							

+

 							for (i = 0; i < ListView_GetItemCount(hwndProtocols); i++)

 							{

 								lvi.iItem = i;

 								ListView_GetItem(hwndProtocols, &lvi);

-								

+

 								char *setting = (char *)lvi.lParam;

 								DBWriteContactSettingByte(NULL, module, setting, (BYTE)ListView_GetCheckState(hwndProtocols, i));

 							}

-							break;

 						}

-						case CONTROL_TEXT:

+						break;

+

+					case CONTROL_TEXT:

 						{

 							TCHAR tmp[1024];

 							GetDlgItemText(hwndDlg, ctrl->nID, tmp, SIZEOF(tmp));

 							DBWriteContactSettingTString(NULL, module, ctrl->setting, tmp);

-							break;

 						}

-						case CONTROL_PASSWORD:

+						break;

+

+					case CONTROL_PASSWORD:

 						{

 							char tmp[1024];

 							GetDlgItemTextA(hwndDlg, ctrl->nID, tmp, SIZEOF(tmp));

 

-							if (ctrl->var != NULL)

-							{

+							if (ctrl->var != NULL) {

 								char *var = (char *) ctrl->var;

 								int size = min(ctrl->max <= 0 ? 1024 : ctrl->max, 1024);

 								lstrcpynA(var, tmp, size);

 							}

 

-							if (ctrl->checkboxID != 0 && !IsDlgButtonChecked(hwndDlg, ctrl->checkboxID))

-							{

-								DBDeleteContactSetting(NULL, module, ctrl->setting);

+							if (ctrl->checkboxID != 0 && !IsDlgButtonChecked(hwndDlg, ctrl->checkboxID)) {

+								db_unset(NULL, module, ctrl->setting);

 								continue;

 							}

 

@@ -528,7 +470,7 @@ INT_PTR CALLBACK SaveOptsDlgProc(OptPageControl *controls, int controlsSize, cha
 							// Don't load from DB

 							continue;

 						}

-						case CONTROL_INT:

+					case CONTROL_INT:

 						{

 							BOOL trans;

 							int val = GetDlgItemInt(hwndDlg, ctrl->nID, &trans, ctrl->min <= 0);

@@ -539,48 +481,46 @@ INT_PTR CALLBACK SaveOptsDlgProc(OptPageControl *controls, int controlsSize, cha
 							if (ctrl->min != 0)

 								val = max(val, ctrl->min);

 							DBWriteContactSettingDword(NULL, module, ctrl->setting, val);

-							break;

 						}

-						case CONTROL_FILE:

+						break;

+					case CONTROL_FILE:

 						{

 							TCHAR tmp[1024];

 							GetDlgItemText(hwndDlg, ctrl->nID, tmp, 1024);

 							TCHAR rel[1024];

 							PathToRelative(rel, 1024, tmp);

 							DBWriteContactSettingTString(NULL, module, ctrl->setting, rel);

-							break;

 						}

-						case CONTROL_COMBO_TEXT:

+						break;

+					case CONTROL_COMBO_TEXT:

 						{

 							TCHAR tmp[1024];

 							GetDlgItemText(hwndDlg, ctrl->nID, tmp, 1024);

 							DBWriteContactSettingTString(NULL, module, ctrl->setting, tmp);

-							break;

 						}

-						case CONTROL_COMBO_ITEMDATA:

+						break;

+					case CONTROL_COMBO_ITEMDATA:

 						{

 							int sel = SendDlgItemMessage(hwndDlg, ctrl->nID, CB_GETCURSEL, 0, 0);

 							DBWriteContactSettingTString(NULL, module, ctrl->setting, (TCHAR *) SendDlgItemMessage(hwndDlg, ctrl->nID, CB_GETITEMDATA, (WPARAM) sel, 0));

-							break;

 						}

+						break;

 					}

 

 					LoadOpt(ctrl, module);

 				}

-				

+

 				return TRUE;

 			}

 			else if (lpnmhdr->idFrom != 0 && lpnmhdr->code == LVN_ITEMCHANGED)

 			{

 				// Changed for protocols

-				for (int i = 0 ; i < controlsSize ; i++)

-				{

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

 					OptPageControl *ctrl = &controls[i];

 

-					if (ctrl->type == CONTROL_PROTOCOL_LIST && ctrl->nID == lpnmhdr->idFrom)

-					{

+					if (ctrl->type == CONTROL_PROTOCOL_LIST && ctrl->nID == lpnmhdr->idFrom) {

 						NMLISTVIEW *nmlv = (NMLISTVIEW *)lParam;

-						

+

 						if (IsWindowVisible(GetDlgItem(hwndDlg, ctrl->nID)) && ((nmlv->uNewState ^ nmlv->uOldState) & LVIS_STATEIMAGEMASK))

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

 

@@ -590,27 +530,24 @@ INT_PTR CALLBACK SaveOptsDlgProc(OptPageControl *controls, int controlsSize, cha
 			}

 			break;

 		}

-		case WM_DESTROY:

+	case WM_DESTROY:

 		{

-			for (int i = 0 ; i < controlsSize ; i++)

-			{

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

 				OptPageControl *ctrl = &controls[i];

 

 				if (GetDlgItem(hwndDlg, ctrl->nID) == NULL)

 					continue;

 

-				switch(ctrl->type)

-				{

-					case CONTROL_PROTOCOL_LIST:

+				switch(ctrl->type) {

+				case CONTROL_PROTOCOL_LIST:

 					{

 						LVITEM lvi = {0};

 						HWND hwndProtocols = GetDlgItem(hwndDlg, ctrl->nID);

 						int i;

-						

+

 						lvi.mask = (UINT) LVIF_PARAM;

-						

-						for (i = 0; i < ListView_GetItemCount(hwndProtocols); i++)

-						{

+

+						for (i = 0; i < ListView_GetItemCount(hwndProtocols); i++) {

 							lvi.iItem = i;

 							ListView_GetItem(hwndProtocols, &lvi);

 							mir_free((char *) lvi.lParam);