Msg_Export: fix for the options dialog

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

3 files changed, 351 insertions, 528 deletions

diff --git a/plugins/Msg_Export/src/Version.h b/plugins/Msg_Export/src/Version.h
index f6dc30ea18..b70d3bcc9e 100644
--- a/plugins/Msg_Export/src/Version.h
+++ b/plugins/Msg_Export/src/Version.h
@@ -1,7 +1,7 @@
 #define __MAJOR_VERSION           3

 #define __MINOR_VERSION           1

 #define __RELEASE_NUM             1

-#define __BUILD_NUM               4

+#define __BUILD_NUM               5

 

 #include <stdver.h>

 

diff --git a/plugins/Msg_Export/src/options.cpp b/plugins/Msg_Export/src/options.cpp
index 1ed9ad9931..8d88d4f9ca 100755
--- a/plugins/Msg_Export/src/options.cpp
+++ b/plugins/Msg_Export/src/options.cpp
@@ -1,20 +1,20 @@
-

-//This file is part of Msg_Export a Miranda IM plugin

-//Copyright (C)2002 Kennet Nielsen ( http://sourceforge.net/projects/msg-export/ )

+/////////////////////////////////////////////////////////////////////////////////////////

+// This file is part of Msg_Export a Miranda IM plugin

+// Copyright (C)2002 Kennet Nielsen ( http://sourceforge.net/projects/msg-export/ )

 //

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

-//modify it under the terms of the GNU General Public License

-//as published by the Free Software Foundation; either

-//version 2 of the License, or (at your option) any later version.

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

+// modify it under the terms of the GNU General Public License

+// as published by the Free Software Foundation; either

+// version 2 of the License, or (at your option) any later version.

 //

-//This program is distributed in the hope that it will be useful,

-//but WITHOUT ANY WARRANTY; without even the implied warranty of

-//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-//GNU General Public License for more details.

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

 //

-//You should have received a copy of the GNU General Public License

-//along with this program; if not, write to the Free Software

-//Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 

 #include "stdafx.h"

 

@@ -25,7 +25,7 @@
 // width in pixels of the UIN column in the List Ctrl

 const int nUINColWitdh = 80;

 // width in pixels of the UIN column in the List Ctrl

-const int nProtoColWitdh = 40;

+const int nProtoColWitdh = 100;

 

 

 // Used to controle the sending of the PSM_CHANGED to miranda

@@ -68,9 +68,9 @@ public:
 		db_event_get(hDbEvent, &dbei);

 		time = dbei.timestamp;

 	}

+

 	bool operator <(const CLDBEvent& rOther) const

-	{

-		return time < rOther.time;

+	{	return time < rOther.time;

 	}

 };

 

@@ -97,8 +97,7 @@ int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort)
 	if (lParamSort == 2)

 		return _DBGetString((MCONTACT)lParam1, "Protocol", "p", _T("")).compare(_DBGetString((MCONTACT)lParam2, "Protocol", "p", _T("")));

 

-	if (lParamSort == 3)

-	{

+	if (lParamSort == 3) {

 		DWORD dwUin1 = db_get_dw((MCONTACT)lParam1, _DBGetStringA((MCONTACT)lParam1, "Protocol", "p", "").c_str(), "UIN", 0);

 		DWORD dwUin2 = db_get_dw((MCONTACT)lParam2, _DBGetStringA((MCONTACT)lParam2, "Protocol", "p", "").c_str(), "UIN", 0);

 		if (dwUin1 == dwUin2)

@@ -110,7 +109,6 @@ int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort)
 	return 0;

 }

 

-

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

 // Member Function : DialogProc

 // Type            : Global

@@ -134,13 +132,12 @@ INT_PTR CALLBACK __stdcall DialogProc(
 	LPARAM /*lParam*/  // second message parameter

 	)

 {

-	switch (uMsg)

-	{

+	switch (uMsg) {

 	case WM_INITDIALOG:

-	{

-		TranslateDialogDefault(hwndDlg);

-		return TRUE;

-	}

+		{

+			TranslateDialogDefault(hwndDlg);

+			return TRUE;

+		}

 	}

 	return FALSE;

 }

@@ -171,8 +168,7 @@ int nExportCompleatList(HWND hParent, bool bOnlySelected)
 	else

 		nContacts = nTotalContacts;

 

-	if (!hMapUser || nContacts <= 0)

-	{

+	if (!hMapUser || nContacts <= 0) {

 		MessageBox(hParent, TranslateT("No contacts found to export"), MSG_BOX_TITEL, MB_OK);

 		return 0;

 	}

@@ -185,36 +181,29 @@ int nExportCompleatList(HWND hParent, bool bOnlySelected)
 

 	SetWindowText(hStatus, TranslateT("Reading database information (Phase 1 of 2)"));

 

-	{ // position and show proigrassbar dialog 

-

-		RECT rParrent;

-		RECT rDlg;

-		if (GetWindowRect(hParent, &rParrent) && GetWindowRect(hDlg, &rDlg))

-		{

-			int x = ((rParrent.right + rParrent.left) / 2) - ((rDlg.right - rDlg.left) / 2);

-			int y = ((rParrent.bottom + rParrent.top) / 2) - ((rDlg.bottom - rDlg.top) / 2);

-			SetWindowPos(hDlg, 0, x, y, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW);

-		}

-		else

-			ShowWindow(hDlg, SW_SHOWNORMAL);

+	// position and show proigrassbar dialog 

+	RECT rParrent, rDlg;

+	if (GetWindowRect(hParent, &rParrent) && GetWindowRect(hDlg, &rDlg)) {

+		int x = ((rParrent.right + rParrent.left) / 2) - ((rDlg.right - rDlg.left) / 2);

+		int y = ((rParrent.bottom + rParrent.top) / 2) - ((rDlg.bottom - rDlg.top) / 2);

+		SetWindowPos(hDlg, 0, x, y, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW);

 	}

+	else ShowWindow(hDlg, SW_SHOWNORMAL);

 

 	// map with list to stored all DB history before it is exported 

 	map<tstring, list< CLDBEvent >, less<tstring> > AllEvents;

-

-	{ // reading from the database !!! 

+	{ 

+		// reading from the database !!! 

 		LVITEM sItem = { 0 };

 		sItem.mask = LVIF_PARAM;

 

-		for (int nCur = 0; nCur < nTotalContacts; nCur++)

-		{

+		for (int nCur = 0; nCur < nTotalContacts; nCur++) {

 			if (bOnlySelected)

 				if (!(ListView_GetItemState(hMapUser, nCur, LVIS_SELECTED) & LVIS_SELECTED))

 					continue;

 

 			sItem.iItem = nCur;

-			if (!ListView_GetItem(hMapUser, &sItem))

-			{

+			if (!ListView_GetItem(hMapUser, &sItem)) {

 				MessageBox(hParent, TranslateT("Failed to export at least one contact"), MSG_BOX_TITEL, MB_OK);

 				continue;

 			}

@@ -232,40 +221,29 @@ int nExportCompleatList(HWND hParent, bool bOnlySelected)
 			SendMessage(hProg, PBM_SETPOS, nCur, 0);

 			RedrawWindow(hDlg, NULL, NULL, RDW_ALLCHILDREN | RDW_UPDATENOW);

 		}

-

-		/*

-				if (hContact )

-				MessageBox( hParent, LPGENT("Failed to export at least one contact"),MSG_BOX_TITEL,MB_OK);

-				*/

 	}

 

+	// window text update 

+	SetWindowText(hStatus, TranslateT("Sorting and writing database information (Phase 2 of 2)"));

+	SendMessage(hProg, PBM_SETRANGE, 0, MAKELPARAM(0, AllEvents.size()));

+	SendMessage(hProg, PBM_SETPOS, 0, 0);

 

-	{ // window text update 

+	// time to write to files !!!

+	map<tstring, list< CLDBEvent >, less<tstring> >::iterator FileIterator;

 

-		SetWindowText(hStatus, TranslateT("Sorting and writing database information (Phase 2 of 2)"));

-		SendMessage(hProg, PBM_SETRANGE, 0, MAKELPARAM(0, AllEvents.size()));

-		SendMessage(hProg, PBM_SETPOS, 0, 0);

-	}

+	int nCur = 0;

+	for (FileIterator = AllEvents.begin(); FileIterator != AllEvents.end(); ++FileIterator) {

+		(FileIterator->second).sort(); // Sort is preformed here !!

+		// events with same time will not be swaped, they will 

+		// remain in there original order

 

-	{ // time to write to files !!!

-		map<tstring, list< CLDBEvent >, less<tstring> >::iterator FileIterator;

-

-		int nCur = 0;

-		for (FileIterator = AllEvents.begin(); FileIterator != AllEvents.end(); ++FileIterator)

-		{

-			(FileIterator->second).sort(); // Sort is preformed here !!

-			// events with same time will not be swaped, they will 

-			// remain in there original order

-

-			list< CLDBEvent >::const_iterator iterator;

-			for (iterator = FileIterator->second.begin(); iterator != FileIterator->second.end(); ++iterator)

-			{

-				MEVENT hDbEvent = (*iterator).hDbEvent;

-				nExportEvent((WPARAM)(*iterator).hUser, (LPARAM)hDbEvent);

-			}

-			SendMessage(hProg, PBM_SETPOS, ++nCur, 0);

-			RedrawWindow(hDlg, NULL, NULL, RDW_ALLCHILDREN | RDW_UPDATENOW);

+		list< CLDBEvent >::const_iterator iterator;

+		for (iterator = FileIterator->second.begin(); iterator != FileIterator->second.end(); ++iterator) {

+			MEVENT hDbEvent = (*iterator).hDbEvent;

+			nExportEvent((WPARAM)(*iterator).hUser, (LPARAM)hDbEvent);

 		}

+		SendMessage(hProg, PBM_SETPOS, ++nCur, 0);

+		RedrawWindow(hDlg, NULL, NULL, RDW_ALLCHILDREN | RDW_UPDATENOW);

 	}

 

 	DestroyWindow(hDlg);

@@ -288,13 +266,10 @@ int nExportCompleatList(HWND hParent, bool bOnlySelected)
 void SetToDefault(HWND hParent)

 {

 	HWND hMapUser = GetDlgItem(hParent, IDC_MAP_USER_LIST);

-

 	int nContacts = ListView_GetItemCount(hMapUser);

 

 	if (!hMapUser || nContacts <= 0)

-	{

 		return;

-	}

 

 	TCHAR szTemp[500];

 	if (!GetDlgItemText(hParent, IDC_DEFAULT_FILE, szTemp, _countof(szTemp)))

@@ -302,8 +277,7 @@ void SetToDefault(HWND hParent)
 

 	LVITEM sItem = { 0 };

 

-	for (int nCur = 0; nCur < nContacts; nCur++)

-	{

+	for (int nCur = 0; nCur < nContacts; nCur++) {

 		if (!(ListView_GetItemState(hMapUser, nCur, LVIS_SELECTED) & LVIS_SELECTED))

 			continue;

 

@@ -320,8 +294,7 @@ void SetToDefault(HWND hParent)
 		sItem.pszText = (TCHAR*)sFileName.c_str();

 		ListView_SetItem(hMapUser, &sItem);

 

-		if (!bUnaplyedChanges)

-		{

+		if (!bUnaplyedChanges) {

 			bUnaplyedChanges = TRUE;

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

 		}

@@ -348,16 +321,12 @@ BOOL bApplyChanges(HWND hwndDlg)
 	TCHAR szTemp[500];

 

 	int nTmp = GetDlgItemInt(hwndDlg, IDC_MAX_CLOUMN_WIDTH, &bTrans, TRUE);

-	if (!bTrans || nTmp < 5)

-	{

+	if (!bTrans || nTmp < 5) {

 		mir_sntprintf(szTemp, TranslateT("Max line width must be at least %d"), 5);

 		MessageBox(hwndDlg, szTemp, MSG_BOX_TITEL, MB_OK);

 		bRet = false;

 	}

-	else

-	{

-		nMaxLineWidth = nTmp;

-	}

+	else nMaxLineWidth = nTmp;

 

 	GetDlgItemText(hwndDlg, IDC_EXPORT_TIMEFORMAT, szTemp, _countof(szTemp));

 	sTimeFormat = szTemp;

@@ -374,8 +343,7 @@ BOOL bApplyChanges(HWND hwndDlg)
 	bUseInternalViewer(IsDlgButtonChecked(hwndDlg, IDC_USE_INTERNAL_VIEWER) == BST_CHECKED);

 

 	bool bNewRp = IsDlgButtonChecked(hwndDlg, IDC_REPLACE_MIRANDA_HISTORY) == BST_CHECKED;

-	if (bReplaceHistory != bNewRp)

-	{

+	if (bReplaceHistory != bNewRp) {

 		bReplaceHistory = bNewRp;

 		MessageBox(hwndDlg, TranslateT("You need to restart Miranda to change the history function"), MSG_BOX_TITEL, MB_OK);

 	}

@@ -388,16 +356,14 @@ BOOL bApplyChanges(HWND hwndDlg)
 

 	HWND hMapUser = GetDlgItem(hwndDlg, IDC_MAP_USER_LIST);

 	int nCount = ListView_GetItemCount(hMapUser);

-	for (int nCur = 0; nCur < nCount; nCur++)

-	{

+	for (int nCur = 0; nCur < nCount; nCur++) {

 		LVITEM sItem = { 0 };

 		sItem.iItem = nCur;

 		sItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE;

 		sItem.pszText = szTemp;

 		sItem.cchTextMax = _countof(szTemp);

 

-		if (ListView_GetItem(hMapUser, &sItem))

-		{

+		if (ListView_GetItem(hMapUser, &sItem)) {

 			MCONTACT hUser = (MCONTACT)sItem.lParam;

 			if (mir_tstrlen(szTemp) > 0)

 				db_set_ts(hUser, MODULE, "FileName", szTemp);

@@ -440,13 +406,11 @@ void ClearAllFileNames(HWND hwndDlg)
 

 	HWND hMapUser = GetDlgItem(hwndDlg, IDC_MAP_USER_LIST);

 	int nCount = ListView_GetItemCount(hMapUser);

-	for (int nCur = 0; nCur < nCount; nCur++)

-	{

+	for (int nCur = 0; nCur < nCount; nCur++) {

 		sItem.iItem = nCur;

 		ListView_SetItem(hMapUser, &sItem);

 	}

-	if (!bUnaplyedChanges)

-	{

+	if (!bUnaplyedChanges) {

 		bUnaplyedChanges = TRUE;

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

 	}

@@ -467,7 +431,6 @@ void ClearAllFileNames(HWND hwndDlg)
 

 void AutoFindeFileNames(HWND hwndDlg)

 {

-

 	TCHAR szDefaultFile[500];

 	GetDlgItemText(hwndDlg, IDC_DEFAULT_FILE, szDefaultFile, _countof(szDefaultFile));

 

@@ -475,26 +438,20 @@ void AutoFindeFileNames(HWND hwndDlg)
 

 	HWND hMapUser = GetDlgItem(hwndDlg, IDC_MAP_USER_LIST);

 	int nCount = ListView_GetItemCount(hMapUser);

-	for (int nCur = 0; nCur < nCount; nCur++)

-	{

+	for (int nCur = 0; nCur < nCount; nCur++) {

 		TCHAR szSearch[100];

-

+		sItem.pszText = szSearch;

 		sItem.mask = LVIF_TEXT;

 		sItem.iItem = nCur;

 		sItem.iSubItem = 1;

-		sItem.pszText = szSearch;

 		sItem.cchTextMax = _countof(szSearch);

-

 		if (!ListView_GetItem(hMapUser, &sItem))

-		{

 			continue;

-		}

 

 		int nShortestMatch = 0xFFFF;

 		MCONTACT hStortest = 0;

 		int nStortestIndex = -1;

-		for (int nSubCur = 0; nSubCur < nCount; nSubCur++)

-		{

+		for (int nSubCur = 0; nSubCur < nCount; nSubCur++) {

 			if (nSubCur == nCur)

 				continue;

 			TCHAR szSubCur[100];

@@ -503,13 +460,10 @@ void AutoFindeFileNames(HWND hwndDlg)
 			sItem.iSubItem = 1;

 			sItem.pszText = szSubCur;

 			sItem.cchTextMax = _countof(szSubCur);

-			if (ListView_GetItem(hMapUser, &sItem))

-			{

+			if (ListView_GetItem(hMapUser, &sItem)) {

 				size_t nLen = mir_tstrlen(szSubCur);

-				if (_tcsncicmp(szSubCur, szSearch, nLen) == 0)

-				{

-					if (nLen < (size_t)nShortestMatch)

-					{

+				if (_tcsncicmp(szSubCur, szSearch, nLen) == 0) {

+					if (nLen < (size_t)nShortestMatch) {

 						nShortestMatch = (int)nLen;

 						nStortestIndex = nSubCur;

 						hStortest = (MCONTACT)sItem.lParam;

@@ -517,8 +471,8 @@ void AutoFindeFileNames(HWND hwndDlg)
 				}

 			}

 		}

-		if (nShortestMatch != 0xFFFF)

-		{

+		

+		if (nShortestMatch != 0xFFFF) {

 			tstring sFileName;

 			szSearch[0] = 0;

 			ListView_GetItemText(hMapUser, nCur, 0, szSearch, _countof(szSearch));

@@ -532,8 +486,7 @@ void AutoFindeFileNames(HWND hwndDlg)
 			if (bSubHasFileName)

 				sFileName = szSearch;

 

-			if (sFileName.empty())

-			{

+			if (sFileName.empty()) {

 				sFileName = szDefaultFile;

 				ReplaceDefines(hStortest, sFileName);

 				ReplaceTimeVariables(sFileName);

@@ -545,8 +498,7 @@ void AutoFindeFileNames(HWND hwndDlg)
 			if (!bSubHasFileName)

 				ListView_SetItemText(hMapUser, nStortestIndex, 0, (TCHAR*)sFileName.c_str());

 

-			if (!bUnaplyedChanges)

-			{

+			if (!bUnaplyedChanges) {

 				bUnaplyedChanges = TRUE;

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

 			}

@@ -554,7 +506,6 @@ void AutoFindeFileNames(HWND hwndDlg)
 	}

 }

 

-

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

 // Member Function : OpenHelp

 // Type            : Global

@@ -571,11 +522,9 @@ void AutoFindeFileNames(HWND hwndDlg)
 void OpenHelp(HWND hwndDlg)

 {

 	TCHAR szPath[MAX_PATH];

-	if (GetModuleFileName(hInstance, szPath, _countof(szPath)))

-	{

+	if (GetModuleFileName(hInstance, szPath, _countof(szPath))) {

 		size_t nLen = mir_tstrlen(szPath);

-		if (nLen > 3)

-		{

+		if (nLen > 3) {

 			szPath[nLen - 1] = 't';

 			szPath[nLen - 2] = 'x';

 			szPath[nLen - 3] = 't';

@@ -587,8 +536,6 @@ void OpenHelp(HWND hwndDlg)
 			st.lpFile = szPath;

 			st.nShow = SW_SHOWDEFAULT;

 			ShellExecuteEx(&st);

-

-			return;

 		}

 	}

 

@@ -617,78 +564,72 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wPar
 	// when initilizing 

 	static BOOL bWindowTextSet = FALSE;

 

-	switch (msg)

-	{

+	switch (msg) {

 	case WM_INITDIALOG:

-	{

-		bWindowTextSet = FALSE;

-

-		HWND hMapUser = GetDlgItem(hwndDlg, IDC_MAP_USER_LIST);

-

-		{ // init adv. win styles 

-			DWORD dw = ListView_GetExtendedListViewStyle(hMapUser);

-			dw |= LVS_EX_HEADERDRAGDROP | LVS_EX_FULLROWSELECT;

-			ListView_SetExtendedListViewStyle(hMapUser, dw /*| LVS_EX_LABELTIP*/);

-		}

-

+		TranslateDialogDefault(hwndDlg);

 

-		int nColumnWidth = 100;

-		RECT rListSize;

-		if (GetWindowRect(hMapUser, &rListSize))

+		bWindowTextSet = FALSE;

 		{

-			nColumnWidth = (rListSize.right - rListSize.left - GetSystemMetrics(SM_CXVSCROLL) - 5 - nUINColWitdh - nProtoColWitdh) / 2;

-			if (nColumnWidth < 10)

-				nColumnWidth = 10;

-		}

+			HWND hMapUser = GetDlgItem(hwndDlg, IDC_MAP_USER_LIST);

 

-			{ // header setup !!

+			{ // init adv. win styles 

+				DWORD dw = ListView_GetExtendedListViewStyle(hMapUser);

+				dw |= LVS_EX_HEADERDRAGDROP | LVS_EX_FULLROWSELECT;

+				ListView_SetExtendedListViewStyle(hMapUser, dw /*| LVS_EX_LABELTIP*/);

+			}

 

+			int nColumnWidth = 100;

+			RECT rListSize;

+			if (GetWindowRect(hMapUser, &rListSize)) {

+				nColumnWidth = (rListSize.right - rListSize.left - GetSystemMetrics(SM_CXVSCROLL) - 5 - nUINColWitdh - nProtoColWitdh) / 2;

+				if (nColumnWidth < 10)

+					nColumnWidth = 10;

+			}

+

+			// header setup !!

+			{

 				LVCOLUMN cCol = { 0 };

 				cCol.mask = LVCF_TEXT | LVCF_WIDTH;

 				cCol.cx = nColumnWidth;

 				cCol.pszText = TranslateT("File");

 				ListView_InsertColumn(hMapUser, 0, &cCol);

+

 				cCol.pszText = TranslateT("Nick");

 				ListView_InsertColumn(hMapUser, 1, &cCol);

+

 				cCol.cx = nProtoColWitdh;

 				cCol.pszText = TranslateT("Proto");

 				ListView_InsertColumn(hMapUser, 2, &cCol);

+

 				cCol.cx = nUINColWitdh;

 				cCol.mask |= LVCF_FMT;

 				cCol.fmt = LVCFMT_RIGHT;

 				cCol.pszText = TranslateT("UIN");

-

 				ListView_InsertColumn(hMapUser, 3, &cCol);

-

-				/*

-				int nOrder[3] = { 1, 2, 0 };

-				ListView_SetColumnOrderArray( hMapUser, 3, nOrder);*/

 			}

-

 			{

-				HIMAGELIST hIml;

-				hIml = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR4 | ILC_MASK, 2, 2);

-				ImageList_AddIcon(hIml, LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_NOTICK)));

-				ImageList_AddIcon(hIml, LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_TICK)));

+				HIMAGELIST hIml = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR4 | ILC_MASK, 2, 2);

+				ImageList_AddIcon(hIml, Skin_LoadIcon(SKINICON_OTHER_NOTICK));

+				ImageList_AddIcon(hIml, Skin_LoadIcon(SKINICON_OTHER_TICK));

 				ListView_SetImageList(hMapUser, hIml, LVSIL_SMALL);

 			}

-

 			{

+				int nUser = 0;

 				tstring sTmp;

 				LVITEM sItem = { 0 };

-				MCONTACT hContact = db_find_first();

-				for (int nUser = 0; /*hContact*/; nUser++)

-				{

+				for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

+					PROTOACCOUNT *pa = Proto_GetAccount(GetContactProto(hContact));

+					if (pa == NULL)

+						continue;

+

 					sItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE;

-					sItem.iItem = nUser;

+					sItem.iItem = nUser++;

 					sItem.iSubItem = 0;

 					sItem.iImage = db_get_b(hContact, MODULE, "EnableLog", 1);

 					sItem.lParam = hContact;

 

-

 					sTmp = _DBGetString(hContact, MODULE, "FileName", _T(""));

 					sItem.pszText = (TCHAR*)sTmp.c_str();

-

 					ListView_InsertItem(hMapUser, &sItem);

 

 					sItem.mask = LVIF_TEXT;

@@ -697,24 +638,15 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wPar
 					ListView_SetItem(hMapUser, &sItem);

 

 					sItem.iSubItem = 2;

-

-					sTmp = _DBGetString(hContact, "Protocol", "p", _T(""));

-					string sTmpA = _DBGetStringA(hContact, "Protocol", "p", "");

-					sItem.pszText = (TCHAR*)sTmp.c_str();

+					sItem.pszText = pa->tszAccountName;

 					ListView_SetItem(hMapUser, &sItem);

 

-

-					DWORD dwUIN = db_get_dw(hContact, sTmpA.c_str(), "UIN", 0);

+					DWORD dwUIN = db_get_dw(hContact, pa->szModuleName, "UIN", 0);

 					TCHAR szTmp[50];

 					mir_sntprintf(szTmp, _T("%d"), dwUIN);

 					sItem.iSubItem = 3;

 					sItem.pszText = szTmp;

 					ListView_SetItem(hMapUser, &sItem);

-

-					if (!hContact) // written like this to add the current user ( handle = 0 )

-						break;

-

-					hContact = db_find_next(hContact);

 				}

 				ListView_SortItems(hMapUser, CompareFunc, 1);

 

@@ -724,217 +656,175 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wPar
 				sItem.state = LVIS_FOCUSED;

 				sItem.stateMask = LVIS_FOCUSED;

 				ListView_SetItem(hMapUser, &sItem);

-

 			}

 			HWND hComboBox;

 

 			SetDlgItemInt(hwndDlg, IDC_MAX_CLOUMN_WIDTH, nMaxLineWidth, TRUE);

 

-			{// Export dir

-				SetDlgItemText(hwndDlg, IDC_EXPORT_DIR, sExportDir.c_str());

-				hComboBox = GetDlgItem(hwndDlg, IDC_EXPORT_DIR);

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%dbpath%\\MsgExport\\"));

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("C:\\Backup\\MsgExport\\"));

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%dbpath%\\MsgExport\\%group% - "));

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%dbpath%\\MsgExport\\%group%\\"));

-			}

-			{// default file

-				SetDlgItemText(hwndDlg, IDC_DEFAULT_FILE, sDefaultFile.c_str());

-				hComboBox = GetDlgItem(hwndDlg, IDC_DEFAULT_FILE);

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%nick%.txt"));

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%UIN%.txt"));

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%group%.txt"));

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%e-mail%.txt"));

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%identifier%.txt"));

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%year%-%month%-%day%.txt"));

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%group%\\%nick%.txt"));

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%group%\\%UIN%.txt"));

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%group%\\%identifier%.txt"));

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%protocol%\\%nick%.txt"));

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("History.txt"));

-			}

-			{// time format

-				SetDlgItemText(hwndDlg, IDC_EXPORT_TIMEFORMAT, sTimeFormat.c_str());

-				hComboBox = GetDlgItem(hwndDlg, IDC_EXPORT_TIMEFORMAT);

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("d t"));

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("d s"));

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("d m"));

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("D s"));

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("D m :"));

-			}

-			{// File viewer

-				SetDlgItemText(hwndDlg, IDC_FILE_VIEWER, sFileViewerPrg.c_str());

-				hComboBox = GetDlgItem(hwndDlg, IDC_FILE_VIEWER);

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T(""));

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("C:\\Windows\\Notepad.exe"));

-				SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("C:\\WinNT\\Notepad.exe"));

-				//EnableWindow( GetDlgItem(hwndDlg, IDC_FILE_VIEWER ), ! bUseInternalViewer());

-			}

-

+			// Export dir

+			SetDlgItemText(hwndDlg, IDC_EXPORT_DIR, sExportDir.c_str());

+			hComboBox = GetDlgItem(hwndDlg, IDC_EXPORT_DIR);

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%dbpath%\\MsgExport\\"));

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("C:\\Backup\\MsgExport\\"));

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%dbpath%\\MsgExport\\%group% - "));

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%dbpath%\\MsgExport\\%group%\\"));

+

+			// default file

+			SetDlgItemText(hwndDlg, IDC_DEFAULT_FILE, sDefaultFile.c_str());

+			hComboBox = GetDlgItem(hwndDlg, IDC_DEFAULT_FILE);

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%nick%.txt"));

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%UIN%.txt"));

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%group%.txt"));

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%e-mail%.txt"));

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%identifier%.txt"));

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%year%-%month%-%day%.txt"));

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%group%\\%nick%.txt"));

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%group%\\%UIN%.txt"));

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%group%\\%identifier%.txt"));

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%protocol%\\%nick%.txt"));

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("History.txt"));

+			

+			// time format

+			SetDlgItemText(hwndDlg, IDC_EXPORT_TIMEFORMAT, sTimeFormat.c_str());

+			hComboBox = GetDlgItem(hwndDlg, IDC_EXPORT_TIMEFORMAT);

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("d t"));

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("d s"));

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("d m"));

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("D s"));

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("D m :"));

+

+			// File viewer

+			SetDlgItemText(hwndDlg, IDC_FILE_VIEWER, sFileViewerPrg.c_str());

+			hComboBox = GetDlgItem(hwndDlg, IDC_FILE_VIEWER);

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T(""));

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("C:\\Windows\\Notepad.exe"));

+			SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("C:\\WinNT\\Notepad.exe"));

 

 			CheckDlgButton(hwndDlg, IDC_USE_INTERNAL_VIEWER, bUseInternalViewer() ? BST_CHECKED : BST_UNCHECKED);

 			CheckDlgButton(hwndDlg, IDC_REPLACE_MIRANDA_HISTORY, bReplaceHistory ? BST_CHECKED : BST_UNCHECKED);

 			CheckDlgButton(hwndDlg, IDC_APPEND_NEWLINE, bAppendNewLine ? BST_CHECKED : BST_UNCHECKED);

 			CheckDlgButton(hwndDlg, IDC_USE_UTF8_IN_NEW_FILES, bUseUtf8InNewFiles ? BST_CHECKED : BST_UNCHECKED);

 			CheckDlgButton(hwndDlg, IDC_USE_LESS_AND_GREATER_IN_EXPORT, bUseLessAndGreaterInExport ? BST_CHECKED : BST_UNCHECKED);

+		}

 

+		bWindowTextSet = TRUE;

+		return TRUE;

 

-			TranslateDialogDefault(hwndDlg);

-

-			bWindowTextSet = TRUE;

-			return TRUE;

-	}

 	case WM_COMMAND:

-	{

-		switch (LOWORD(wParam))

-		{

+		switch (LOWORD(wParam)) {

 		case ID_EXPORTSELECTED:

 		case IDC_EXPORTALL:

-		{

-			if (bUnaplyedChanges)

-			{

+			if (bUnaplyedChanges) {

 				DWORD res = MessageBox(hwndDlg, TranslateT("You have not applied the changes, do you wish to apply them first?"), MSG_BOX_TITEL, MB_YESNOCANCEL);

 				if (res == IDCANCEL)

 					return TRUE;

-				if (res == IDYES)

-				{

-					if (!bApplyChanges(hwndDlg))

-					{

+				if (res == IDYES) {

+					if (!bApplyChanges(hwndDlg)) {

 						return TRUE;

 					}

 				}

 			}

 			nExportCompleatList(hwndDlg, LOWORD(wParam) == ID_EXPORTSELECTED);

 			return TRUE;

-		}

+

 		case IDC_EXPORT_DIR:

 		case IDC_EXPORT_TIMEFORMAT:

 		case IDC_DEFAULT_FILE:

 		case IDC_FILE_VIEWER:

-		{

 			if (!bWindowTextSet)

 				return TRUE;

 

-			if (HIWORD(wParam) == CBN_EDITUPDATE || HIWORD(wParam) == CBN_SELCHANGE)

-			{

+			if (HIWORD(wParam) == CBN_EDITUPDATE || HIWORD(wParam) == CBN_SELCHANGE) {

 				bUnaplyedChanges = TRUE;

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

 			}

 			return TRUE;

-		}

+

 		case IDC_MAX_CLOUMN_WIDTH:

-		{

 			if (!bWindowTextSet)

 				return TRUE;

 

-			if (HIWORD(wParam) == EN_CHANGE)

-			{

+			if (HIWORD(wParam) == EN_CHANGE) {

 				bUnaplyedChanges = TRUE;

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

 			}

 			return TRUE;

-		}

-		case IDC_USE_INTERNAL_VIEWER:

-			/*				{

-								EnableWindow(

-								GetDlgItem(hwndDlg, IDC_FILE_VIEWER ),

-								BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_USE_INTERNAL_VIEWER )

-								);

-								}// fall thru here !!*/

+

+		case IDC_USE_INTERNAL_VIEWER: // fall thru here

 		case IDC_REPLACE_MIRANDA_HISTORY:

 		case IDC_APPEND_NEWLINE:

 		case IDC_USE_UTF8_IN_NEW_FILES:

 		case IDC_USE_LESS_AND_GREATER_IN_EXPORT:

-		{

-			if (HIWORD(wParam) == BN_CLICKED)

-			{

+			if (HIWORD(wParam) == BN_CLICKED) {

 				bUnaplyedChanges = TRUE;

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

 			}

 			return TRUE;

-		}

+

 		case ID_USERLIST_USERDETAILS:

-		{

-			LVITEM sItem = { 0 };

-			sItem.mask = LVIF_PARAM;

-			HWND hMapUser = GetDlgItem(hwndDlg, IDC_MAP_USER_LIST);

-			sItem.iItem = ListView_GetNextItem(hMapUser, -1, LVIS_SELECTED);

-			if (sItem.iItem >= 0 && ListView_GetItem(hMapUser, &sItem))

 			{

-				CallService(MS_USERINFO_SHOWDIALOG, (WPARAM)sItem.lParam, 0);

+				LVITEM sItem = { 0 };

+				sItem.mask = LVIF_PARAM;

+				HWND hMapUser = GetDlgItem(hwndDlg, IDC_MAP_USER_LIST);

+				sItem.iItem = ListView_GetNextItem(hMapUser, -1, LVIS_SELECTED);

+				if (sItem.iItem >= 0 && ListView_GetItem(hMapUser, &sItem))

+					CallService(MS_USERINFO_SHOWDIALOG, (WPARAM)sItem.lParam, 0);

 			}

 			return TRUE;

-		}

+

 		case IDC_AUTO_FILENAME:

-		{

 			AutoFindeFileNames(hwndDlg);

 			return TRUE;

-		}

+

 		case IDC_CLEAR_ALL:

-		{

 			ClearAllFileNames(hwndDlg);

 			return TRUE;

 

-		}

 		case IDC_OPEN_HELP:

-		{

 			OpenHelp(hwndDlg);

 			return TRUE;

-		}

+

 		case ID_SET_TO_DEFAULT:

-		{

 			SetToDefault(hwndDlg);

 			return TRUE;

-		}

+

 		case IDC_FILE_VIEWER_BROWSE:

-		{

-			OPENFILENAME ofn;       // common dialog box structure

 			TCHAR szFile[260];       // buffer for file name

-			TCHAR buf[MAX_PATH];

-

 			GetDlgItemText(hwndDlg, IDC_FILE_VIEWER, szFile, _countof(szFile));

-			// Initialize OPENFILENAME

-			memset(&ofn, 0, sizeof(OPENFILENAME));

-			ofn.lStructSize = sizeof(OPENFILENAME);

-			ofn.hwndOwner = hwndDlg;

-			ofn.lpstrFile = szFile;

-			ofn.nMaxFile = _countof(szFile);

-			mir_sntprintf(buf, _T("%s (*.exe;*.com;*.bat;*.cmd)%c*.exe;*.com;*.bat;*.cmd%c%s (*.*)%c*.*%c%c"), TranslateT("Executable files"), 0, 0, TranslateT("All files"), 0, 0, 0);

-			ofn.lpstrFilter = buf;

-			ofn.nFilterIndex = 1;

-			//ofn.lpstrFileTitle = NULL;

-			//ofn.nMaxFileTitle = 0;

-			//ofn.lpstrInitialDir = NULL;

-			ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;

 

-			// Display the Open dialog box. 

-

-			if (GetOpenFileName(&ofn))

+			TCHAR buf[MAX_PATH];

+			mir_sntprintf(buf, _T("%s (*.exe;*.com;*.bat;*.cmd)%c*.exe;*.com;*.bat;*.cmd%c%s (*.*)%c*.*%c%c"), TranslateT("Executable files"), 0, 0, TranslateT("All files"), 0, 0, 0);

 			{

-				SetDlgItemText(hwndDlg, IDC_FILE_VIEWER, szFile);

-				bUnaplyedChanges = TRUE;

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

+				OPENFILENAME ofn = {};       // common dialog box structure

+				ofn.lStructSize = sizeof(OPENFILENAME);

+				ofn.hwndOwner = hwndDlg;

+				ofn.lpstrFile = szFile;

+				ofn.nMaxFile = _countof(szFile);

+				ofn.lpstrFilter = buf;

+				ofn.nFilterIndex = 1;

+				ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;

+

+				// Display the Open dialog box. 

+				if (GetOpenFileName(&ofn)) {

+					SetDlgItemText(hwndDlg, IDC_FILE_VIEWER, szFile);

+					bUnaplyedChanges = TRUE;

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

+				}

 			}

-			// OPENFILENAME

-			//GetOpenFileName( 

 			return TRUE;

-		}

-		case IDC_EXPORT_DIR_BROWSE:

-		{

-			LPMALLOC pMalloc;

 

-			//CoInitializeEx(NULL,COINIT_APARTMENTTHREADED);

+		case IDC_EXPORT_DIR_BROWSE:

+			// CoInitializeEx(NULL,COINIT_APARTMENTTHREADED);

 			// Get the shells allocator

-			if (FAILED(SHGetMalloc(&pMalloc))) // we need to use this to support old Windows versions 

-			{

+			LPMALLOC pMalloc;

+			if (FAILED(SHGetMalloc(&pMalloc))) { // we need to use this to support old Windows versions 

 				MessageBox(hwndDlg, TranslateT("Failed to get the shells allocator!"), MSG_BOX_TITEL, MB_OK);

 				return TRUE; // TRUE because we have handled the message, sort of *S*

 			}

 

 			// Allocate the Dest Dir buffer to receive browse info

 			TCHAR *lpDestDir = (TCHAR *)pMalloc->Alloc(MAX_PATH + 100);

-			if (!lpDestDir)

-			{

+			if (!lpDestDir) {

 				pMalloc->Release();

 				MessageBox(hwndDlg, TranslateT("Failed to Allocate buffer space"), MSG_BOX_TITEL, MB_OK);

 				return TRUE;

@@ -951,12 +841,10 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wPar
 			sBrowseInfo.iImage = 0;

 

 			LPITEMIDLIST psItemIDList = SHBrowseForFolder(&sBrowseInfo);

-			if (psItemIDList)

-			{

+			if (psItemIDList) {

 				SHGetPathFromIDList(psItemIDList, lpDestDir);

 				size_t n = mir_tstrlen(lpDestDir);

-				if (n > 0 && lpDestDir[n] != '\\')

-				{

+				if (n > 0 && lpDestDir[n] != '\\') {

 					lpDestDir[n] = '\\';

 					lpDestDir[n + 1] = 0;

 				}

@@ -970,179 +858,148 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wPar
 			pMalloc->Release();

 			return TRUE;

 		}

-		}

 		break;

-	}

-	case WM_CONTEXTMENU:

-	{

-		if (wParam != (WPARAM)GetDlgItem(hwndDlg, IDC_MAP_USER_LIST))

-			return FALSE;

 

-		HMENU hMainMenu = LoadMenu(hInstance, MAKEINTRESOURCE(IDR_MSG_EXPORT));

-		if (hMainMenu)

-		{

-			HMENU hMenu = GetSubMenu(hMainMenu, 0);

+	case WM_CONTEXTMENU:

+		if (wParam == (WPARAM)GetDlgItem(hwndDlg, IDC_MAP_USER_LIST)) {

+			HMENU hMainMenu = LoadMenu(hInstance, MAKEINTRESOURCE(IDR_MSG_EXPORT));

+			if (hMainMenu) {

+				HMENU hMenu = GetSubMenu(hMainMenu, 0);

 

-			POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };

-			if (pt.x == -1 && pt.y == -1)

-			{

-				HWND hMapUser = GetDlgItem(hwndDlg, IDC_MAP_USER_LIST);

-				int nFirst = ListView_GetNextItem(hMapUser, -1, LVNI_FOCUSED);

-				if (nFirst >= 0)

-				{

-					ListView_GetItemPosition(hMapUser, nFirst, &pt);

-				}

+				POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };

+				if (pt.x == -1 && pt.y == -1) {

+					HWND hMapUser = GetDlgItem(hwndDlg, IDC_MAP_USER_LIST);

+					int nFirst = ListView_GetNextItem(hMapUser, -1, LVNI_FOCUSED);

+					if (nFirst >= 0) {

+						ListView_GetItemPosition(hMapUser, nFirst, &pt);

+					}

 

-				if (pt.y < 16)

-					pt.y = 16;

-				else

-				{

-					RECT rUserList;

-					GetClientRect(hMapUser, &rUserList);

-					if (pt.y > rUserList.bottom - 16)

-						pt.y = rUserList.bottom - 16;

-					else

-						pt.y += 8;

+					if (pt.y < 16)

+						pt.y = 16;

+					else {

+						RECT rUserList;

+						GetClientRect(hMapUser, &rUserList);

+						if (pt.y > rUserList.bottom - 16)

+							pt.y = rUserList.bottom - 16;

+						else

+							pt.y += 8;

+					}

+					pt.x = 8;

+					ClientToScreen(hMapUser, &pt);

 				}

-				pt.x = 8;

-				ClientToScreen(hMapUser, &pt);

-			}

 

-			TranslateMenu(hMenu);

-			TrackPopupMenu(hMenu, TPM_TOPALIGN | TPM_LEFTALIGN | TPM_RIGHTBUTTON, pt.x, pt.y, 0, hwndDlg, NULL);

+				TranslateMenu(hMenu);

+				TrackPopupMenu(hMenu, TPM_TOPALIGN | TPM_LEFTALIGN | TPM_RIGHTBUTTON, pt.x, pt.y, 0, hwndDlg, NULL);

 

-			DestroyMenu(hMainMenu);

+				DestroyMenu(hMainMenu);

+			}

+			return TRUE;

 		}

-		return TRUE;

-	}

+		return FALSE;

+

 	case WM_NOTIFY:

-	{

-		NMHDR * p = ((LPNMHDR)lParam);

-		if (p->idFrom == IDC_MAP_USER_LIST)

-		{

-			switch (p->code)

-			{

-			case NM_CLICK:

-			{	LVHITTESTINFO hti;

+		NMHDR *p = ((LPNMHDR)lParam);

+		if (p->idFrom == IDC_MAP_USER_LIST) {

+			LVHITTESTINFO hti;

 			LVITEM lvi;

-			hti.pt = ((NMLISTVIEW*)lParam)->ptAction;

-			ListView_SubItemHitTest(p->hwndFrom, &hti);

 

-			if (hti.flags != LVHT_ONITEMICON)

+			switch (p->code) {

+			case NM_CLICK:

+				hti.pt = ((NMLISTVIEW*)lParam)->ptAction;

+				ListView_SubItemHitTest(p->hwndFrom, &hti);

+

+				if (hti.flags != LVHT_ONITEMICON)

+					break;

+

+				lvi.mask = LVIF_IMAGE;

+				lvi.iItem = hti.iItem;

+				lvi.iSubItem = 0;

+				ListView_GetItem(p->hwndFrom, &lvi);

+				lvi.iImage ^= 1;

+				ListView_SetItem(p->hwndFrom, &lvi);

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

 				break;

 

-			lvi.mask = LVIF_IMAGE;

-			lvi.iItem = hti.iItem;

-			lvi.iSubItem = 0;

-			ListView_GetItem(p->hwndFrom, &lvi);

-			lvi.iImage ^= 1;

-			ListView_SetItem(p->hwndFrom, &lvi);

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

-			break;

-			}

 			case LVN_ENDLABELEDIT:

-			{

-				NMLVDISPINFO * pdi = (NMLVDISPINFO *)lParam;

-				if (pdi->item.mask & LVIF_TEXT)

 				{

-					pdi->item.mask &= LVIF_TEXT;

-					ListView_SetItem(p->hwndFrom, &pdi->item);

+					NMLVDISPINFO *pdi = (NMLVDISPINFO *)lParam;

+					if (pdi->item.mask & LVIF_TEXT) {

+						pdi->item.mask &= LVIF_TEXT;

+						ListView_SetItem(p->hwndFrom, &pdi->item);

 

-					bUnaplyedChanges = TRUE;

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

+						bUnaplyedChanges = TRUE;

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

+					}

 				}

 				return TRUE;

-			}

+

 			case LVN_KEYDOWN:

-			{

-				NMLVKEYDOWN * lpnmk = (NMLVKEYDOWN *)lParam;

-				if (lpnmk->wVKey == 'A' && (GetKeyState(VK_CONTROL) & 0x8000))

 				{

-					// select all 

-					int nCount = ListView_GetItemCount(p->hwndFrom);

-					for (int nCur = 0; nCur < nCount; nCur++)

-					{

-						ListView_SetItemState(p->hwndFrom, nCur, LVIS_SELECTED, LVIS_SELECTED);

-					}

-					return TRUE;

-				}

+					NMLVKEYDOWN *lpnmk = (NMLVKEYDOWN *)lParam;

+					if (lpnmk->wVKey == 'A' && (GetKeyState(VK_CONTROL) & 0x8000)) {

+						// select all 

+						int nCount = ListView_GetItemCount(p->hwndFrom);

+						for (int nCur = 0; nCur < nCount; nCur++)

+							ListView_SetItemState(p->hwndFrom, nCur, LVIS_SELECTED, LVIS_SELECTED);

 

+						return TRUE;

+					}

 

-				if (lpnmk->wVKey == VK_F2 ||

-					(lpnmk->wVKey >= 'A' &&  lpnmk->wVKey <= 'Z') ||

-					(lpnmk->wVKey >= '1' &&  lpnmk->wVKey <= '9') ||

-					lpnmk->wVKey == VK_BACK

-					)

-				{

-					HWND hEdit = ListView_EditLabel(p->hwndFrom, ListView_GetSelectionMark(p->hwndFrom));

-					if (hEdit && lpnmk->wVKey != VK_F2)

-					{

-						if (isupper(lpnmk->wVKey))

-							SendMessage(hEdit, WM_CHAR, tolower(lpnmk->wVKey), 0);

-						else

-							SendMessage(hEdit, WM_CHAR, lpnmk->wVKey, 0);

+					if (lpnmk->wVKey == VK_F2 || (lpnmk->wVKey >= 'A' &&  lpnmk->wVKey <= 'Z') || (lpnmk->wVKey >= '1' &&  lpnmk->wVKey <= '9') || lpnmk->wVKey == VK_BACK) {

+						HWND hEdit = ListView_EditLabel(p->hwndFrom, ListView_GetSelectionMark(p->hwndFrom));

+						if (hEdit && lpnmk->wVKey != VK_F2) {

+							if (isupper(lpnmk->wVKey))

+								SendMessage(hEdit, WM_CHAR, tolower(lpnmk->wVKey), 0);

+							else

+								SendMessage(hEdit, WM_CHAR, lpnmk->wVKey, 0);

+						}

 					}

 				}

 				return TRUE;

-			}

+

 			case NM_DBLCLK:

-			{

-				NMITEMACTIVATE * pdi = (NMITEMACTIVATE *)lParam;

-				if (pdi->iItem >= 0)

 				{

-					ListView_EditLabel(p->hwndFrom, pdi->iItem);

+					NMITEMACTIVATE *pdi = (NMITEMACTIVATE *)lParam;

+					if (pdi->iItem >= 0)

+						ListView_EditLabel(p->hwndFrom, pdi->iItem);

 				}

 				return TRUE;

-			}

+

 			case NM_CUSTOMDRAW:

-			{

-				LPNMLVCUSTOMDRAW  lplvcd = (LPNMLVCUSTOMDRAW)lParam;

-				switch (lplvcd->nmcd.dwDrawStage)

-				{

+				LPNMLVCUSTOMDRAW lplvcd = (LPNMLVCUSTOMDRAW)lParam;

+				switch (lplvcd->nmcd.dwDrawStage) {

 				case CDDS_PREPAINT:

-				{

 					SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, CDRF_NOTIFYITEMDRAW);

 					return true;

-				}

+

 				case CDDS_ITEMPREPAINT:

-				{

 					if (lplvcd->nmcd.lItemlParam == 0)

-					{

 						lplvcd->clrText = RGB(0, 0, 255);

-					}

+

 					SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, CDRF_NEWFONT);

 					return true;

 				}

-				}

 				return FALSE;

 			}

-			}

 		}

-		else

-		{

-			switch (p->code)

-			{

+		else {

+			switch (p->code) {

 			case PSN_APPLY:

-			{

 				bApplyChanges(hwndDlg);

 				return TRUE;

-			}

+

 			case HDN_ITEMCLICK:

-			{

-				NMHEADER * phdr = (LPNMHEADER)p;

-				if (phdr->iButton == 0)// 0 => Left button 

-				{

+				NMHEADER *phdr = (LPNMHEADER)p;

+				if (phdr->iButton == 0) { // 0 => Left button 

 					HWND hMapUser = GetDlgItem(hwndDlg, IDC_MAP_USER_LIST);

 					ListView_SortItems(hMapUser, CompareFunc, phdr->iItem);

 					return TRUE;

 				}

 				return FALSE;

 			}

-			}

 		}

 		break;

 	}

-	}

 	return FALSE;

 }

 

@@ -1180,15 +1037,13 @@ BOOL bApplyChanges2(HWND hwndDlg)
 

 	HWND hMapUser = GetDlgItem(hwndDlg, IDC_EXPORT_PROTOS);

 	int nCount = ListView_GetItemCount(hMapUser);

-	for (int nCur = 0; nCur < nCount; nCur++)

-	{

+	for (int nCur = 0; nCur < nCount; nCur++) {

 		LVITEMA sItem = { 0 };

 		sItem.iItem = nCur;

 		sItem.mask = LVIF_TEXT | LVIF_IMAGE;

 		sItem.pszText = &szTemp[12];

 		sItem.cchTextMax = (_countof(szTemp) - 15);

-		if (::SendMessage(hMapUser, LVM_GETITEMA, 0, (LPARAM)&sItem))

-		{

+		if (::SendMessage(hMapUser, LVM_GETITEMA, 0, (LPARAM)&sItem)) {

 			if (sItem.iImage)

 				db_unset(NULL, MODULE, szTemp); // default is Enabled !!

 			else

@@ -1219,13 +1074,12 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts2(HWND hwndDlg, UINT msg, WPARAM wPa
 {

 	static BOOL bWindowTextSet = FALSE;

 

-	switch (msg)

-	{

+	switch (msg) {

 	case WM_INITDIALOG:

-	{

+		TranslateDialogDefault(hwndDlg);

 		bWindowTextSet = FALSE;

-		switch (enRenameAction)

-		{

+

+		switch (enRenameAction) {

 		case eDAPromptUser:

 			CheckDlgButton(hwndDlg, IDC_FC_PROMPT, BST_CHECKED);

 			break;

@@ -1236,8 +1090,7 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts2(HWND hwndDlg, UINT msg, WPARAM wPa
 			CheckDlgButton(hwndDlg, IDC_FC_NOTHING, BST_CHECKED);

 			break;

 		}

-		switch (enDeleteAction)

-		{

+		switch (enDeleteAction) {

 		case eDAPromptUser:

 			CheckDlgButton(hwndDlg, IDC_FD_PROMPT, BST_CHECKED);

 			break;

@@ -1248,136 +1101,105 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts2(HWND hwndDlg, UINT msg, WPARAM wPa
 			CheckDlgButton(hwndDlg, IDC_FD_NOTHING, BST_CHECKED);

 			break;

 		}

-		HWND hMapUser = GetDlgItem(hwndDlg, IDC_EXPORT_PROTOS);

-		/*

-					{ // init adv. win styles

-					DWORD dw = ListView_GetExtendedListViewStyle( hMapUser);

-					dw |= LVS_EX_HEADERDRAGDROP | LVS_EX_FULLROWSELECT;

-					ListView_SetExtendedListViewStyle( hMapUser, dw /);

-					}

-					*/

-		int nColumnWidth = 100;

+

 		RECT rListSize;

-		if (GetWindowRect(hMapUser, &rListSize))

 		{

-			nColumnWidth = (rListSize.right - rListSize.left - GetSystemMetrics(SM_CXVSCROLL) - 5);

-			if (nColumnWidth < 10)

-				nColumnWidth = 10;

-		}

-

-			{ // header setup !!

-				LVCOLUMN cCol = { 0 };

-				cCol.mask = LVCF_TEXT | LVCF_WIDTH;

-				cCol.cx = nColumnWidth;

-				cCol.pszText = TranslateT("Export Protocols");

-				ListView_InsertColumn(hMapUser, 0, &cCol);

+			HWND hMapUser = GetDlgItem(hwndDlg, IDC_EXPORT_PROTOS);

+			int nColumnWidth = 100;

+			if (GetWindowRect(hMapUser, &rListSize)) {

+				nColumnWidth = (rListSize.right - rListSize.left - GetSystemMetrics(SM_CXVSCROLL) - 5);

+				if (nColumnWidth < 10)

+					nColumnWidth = 10;

 			}

 

-			{

-				HIMAGELIST hIml;

-				hIml = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR4 | ILC_MASK, 2, 2);

-				ImageList_AddIcon(hIml, LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_NOTICK)));

-				ImageList_AddIcon(hIml, LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_TICK)));

-				ListView_SetImageList(hMapUser, hIml, LVSIL_SMALL);

-			}

-

-			{

-				PROTOACCOUNT **proto;

-				int nCount;

-				LVITEMA sItem = { 0 };

-				sItem.mask = LVIF_TEXT | LVIF_IMAGE;

-				char szTemp[500];

-

-				Proto_EnumAccounts(&nCount, &proto);

-

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

-				{

-					mir_snprintf(szTemp, "DisableProt_%s", proto[i]->szModuleName);

-					sItem.pszText = proto[i]->szModuleName;

-					sItem.iImage = db_get_b(NULL, MODULE, szTemp, 1);

-					::SendMessage(hMapUser, LVM_INSERTITEMA, 0, (LPARAM)&sItem);

-					sItem.iItem++;

-				}

+			// header setup !!

+			LVCOLUMN cCol = { 0 };

+			cCol.mask = LVCF_TEXT | LVCF_WIDTH;

+			cCol.cx = nColumnWidth;

+			cCol.pszText = TranslateT("Export Protocols");

+			ListView_InsertColumn(hMapUser, 0, &cCol);

+

+			HIMAGELIST hIml = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR4 | ILC_MASK, 2, 2);

+			ImageList_AddIcon(hIml, Skin_LoadIcon(SKINICON_OTHER_NOTICK));

+			ImageList_AddIcon(hIml, Skin_LoadIcon(SKINICON_OTHER_TICK));

+			ListView_SetImageList(hMapUser, hIml, LVSIL_SMALL);

+

+			PROTOACCOUNT **proto;

+			int nCount;

+			Proto_EnumAccounts(&nCount, &proto);

+

+			LVITEMA sItem = { 0 };

+			sItem.mask = LVIF_TEXT | LVIF_IMAGE;

+			char szTemp[500];

+

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

+				mir_snprintf(szTemp, "DisableProt_%s", proto[i]->szModuleName);

+				sItem.pszText = proto[i]->szModuleName;

+				sItem.iImage = db_get_b(NULL, MODULE, szTemp, 1);

+				::SendMessage(hMapUser, LVM_INSERTITEMA, 0, (LPARAM)&sItem);

+				sItem.iItem++;

 			}

+		}

+		bWindowTextSet = TRUE;

+		return TRUE;

 

-			TranslateDialogDefault(hwndDlg);

-

-			bWindowTextSet = TRUE;

-			return TRUE;

-	}

 	case WM_COMMAND:

-	{

-		switch (LOWORD(wParam))

-		{

+		switch (LOWORD(wParam)) {

 		case IDC_FC_PROMPT:

 		case IDC_FC_RENAME:

 		case IDC_FC_NOTHING:

 		case IDC_FD_PROMPT:

 		case IDC_FD_DELETE:

 		case IDC_FD_NOTHING:

-		{

 			if (!bWindowTextSet)

 				return TRUE;

 

-			if (HIWORD(wParam) == BN_CLICKED)

-			{

+			if (HIWORD(wParam) == BN_CLICKED) {

 				bUnaplyedChanges = TRUE;

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

 			}

 			return TRUE;

-		}

+	

 		case IDC_DEBUG_INFO:

-		{

 			ShowDebugInfo();

 			return TRUE;

 		}

-		}

 		break;

-	}

-	case WM_NOTIFY:

-	{

-		NMHDR * p = ((LPNMHDR)lParam);

-		if (p->idFrom == IDC_EXPORT_PROTOS)

-		{

-			switch (p->code)

-			{

-			case NM_CLICK:

-			{	LVHITTESTINFO hti;

-			LVITEM lvi;

-			hti.pt = ((NMLISTVIEW*)lParam)->ptAction;

-			ListView_SubItemHitTest(p->hwndFrom, &hti);

 

-			if (hti.flags != LVHT_ONITEMICON)

+	case WM_NOTIFY:

+		NMHDR *p = ((LPNMHDR)lParam);

+		if (p->idFrom == IDC_EXPORT_PROTOS) {

+			if (p->code == NM_CLICK) {

+				LVHITTESTINFO hti;

+				hti.pt = ((NMLISTVIEW*)lParam)->ptAction;

+				ListView_SubItemHitTest(p->hwndFrom, &hti);

+				if (hti.flags != LVHT_ONITEMICON)

+					break;

+

+				LVITEM lvi;

+				lvi.mask = LVIF_IMAGE;

+				lvi.iItem = hti.iItem;

+				lvi.iSubItem = 0;

+				ListView_GetItem(p->hwndFrom, &lvi);

+				lvi.iImage ^= 1;

+				ListView_SetItem(p->hwndFrom, &lvi);

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

 				break;

-

-			lvi.mask = LVIF_IMAGE;

-			lvi.iItem = hti.iItem;

-			lvi.iSubItem = 0;

-			ListView_GetItem(p->hwndFrom, &lvi);

-			lvi.iImage ^= 1;

-			ListView_SetItem(p->hwndFrom, &lvi);

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

-			break;

-			}

 			}

 			break;

 		}

-		switch (p->code)

-		{

+

+		switch (p->code) {

 		case PSN_APPLY:

-		{

 			bApplyChanges2(hwndDlg);

 			return TRUE;

-		}

+

 		case HDN_ITEMCLICK:

-		{

 			return FALSE;

 		}

-		}

 		break;

 	}

-	}

-	//

+

 	return FALSE;

 }

 

diff --git a/plugins/Msg_Export/src/stdafx.h b/plugins/Msg_Export/src/stdafx.h
index a0b6b97e54..b655a1b511 100755
--- a/plugins/Msg_Export/src/stdafx.h
+++ b/plugins/Msg_Export/src/stdafx.h
@@ -39,6 +39,7 @@ using namespace std;
 #include <m_protosvc.h>

 #include <m_timezones.h>

 #include <m_icq.h>

+#include <m_skin.h>

 #include <win2k.h>

 

 #include "utils.h"