Jabber not to eat the trailing symbol in chat's topic

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

1 files changed, 67 insertions, 87 deletions

diff --git a/protocols/JabberG/src/jabber_opttree.cpp b/protocols/JabberG/src/jabber_opttree.cpp
index ae063fcbbf..e177b0897b 100644
--- a/protocols/JabberG/src/jabber_opttree.cpp
+++ b/protocols/JabberG/src/jabber_opttree.cpp
@@ -48,52 +48,49 @@ void CCtrlTreeOpts::AddOption(TCHAR *szOption, CMOption<BYTE> &option)
 

 BOOL CCtrlTreeOpts::OnNotify(int idCtrl, NMHDR *pnmh)

 {

-	switch (pnmh->code)

-	{

-		case TVN_KEYDOWN:

+	switch (pnmh->code) {

+	case TVN_KEYDOWN:

 		{

 			LPNMTVKEYDOWN lpnmtvkd = (LPNMTVKEYDOWN)pnmh;

 			HTREEITEM hti;

 			if ((lpnmtvkd->wVKey == VK_SPACE) && (hti = GetSelection()))

 				ProcessItemClick(hti);

-			break;

 		}

+		break;

 

-		case NM_CLICK:

+	case NM_CLICK:

 		{

 			TVHITTESTINFO hti;

-			hti.pt.x=(short)LOWORD(GetMessagePos());

-			hti.pt.y=(short)HIWORD(GetMessagePos());

-			ScreenToClient(pnmh->hwndFrom,&hti.pt);

+			hti.pt.x = (short)LOWORD(GetMessagePos());

+			hti.pt.y = (short)HIWORD(GetMessagePos());

+			ScreenToClient(pnmh->hwndFrom, &hti.pt);

 			if (HitTest(&hti))

-				if (hti.flags&TVHT_ONITEMICON)

-					ProcessItemClick(hti.hItem);

-			break;

+			if (hti.flags&TVHT_ONITEMICON)

+				ProcessItemClick(hti.hItem);

 		}

+		break;

 

-		case TVN_ITEMEXPANDEDW:

+	case TVN_ITEMEXPANDEDW:

 		{

 			LPNMTREEVIEWW lpnmtv = (LPNMTREEVIEWW)pnmh;

 			TVITEM tvi;

-			tvi.mask=TVIF_HANDLE|TVIF_IMAGE|TVIF_SELECTEDIMAGE;

+			tvi.mask = TVIF_HANDLE | TVIF_IMAGE | TVIF_SELECTEDIMAGE;

 			tvi.hItem = lpnmtv->itemNew.hItem;

 			tvi.iImage = tvi.iSelectedImage =

 				(lpnmtv->itemNew.state & TVIS_EXPANDED) ? IMG_GRPOPEN : IMG_GRPCLOSED;

 			SendMessageW(pnmh->hwndFrom, TVM_SETITEMW, 0, (LPARAM)&tvi);

-			break;

-		}

-

-		case TVN_ITEMEXPANDEDA:

-		{

-			LPNMTREEVIEWA lpnmtv = (LPNMTREEVIEWA)pnmh;

-			TVITEM tvi;

-			tvi.mask=TVIF_HANDLE|TVIF_IMAGE|TVIF_SELECTEDIMAGE;

-			tvi.hItem = lpnmtv->itemNew.hItem;

-			tvi.iImage = tvi.iSelectedImage =

-				(lpnmtv->itemNew.state & TVIS_EXPANDED) ? IMG_GRPOPEN : IMG_GRPCLOSED;

-			SendMessageA(pnmh->hwndFrom, TVM_SETITEMA, 0, (LPARAM)&tvi);

-			break;

 		}

+		break;

+

+	case TVN_ITEMEXPANDEDA:

+		LPNMTREEVIEWA lpnmtv = (LPNMTREEVIEWA)pnmh;

+		TVITEM tvi;

+		tvi.mask = TVIF_HANDLE | TVIF_IMAGE | TVIF_SELECTEDIMAGE;

+		tvi.hItem = lpnmtv->itemNew.hItem;

+		tvi.iImage = tvi.iSelectedImage =

+			(lpnmtv->itemNew.state & TVIS_EXPANDED) ? IMG_GRPOPEN : IMG_GRPCLOSED;

+		SendMessageA(pnmh->hwndFrom, TVM_SETITEMA, 0, (LPARAM)&tvi);

+		break;

 	}

 

 	return CCtrlTreeView::OnNotify(idCtrl, pnmh);

@@ -109,7 +106,7 @@ void CCtrlTreeOpts::OnInit()
 	SelectItem(NULL);

 	DeleteAllItems();

 

-	hImgLst = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR|ILC_COLOR32|ILC_MASK, 5, 1);

+	hImgLst = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR | ILC_COLOR32 | ILC_MASK, 5, 1);

 	ImageList_AddIcon_Icolib(hImgLst, LoadSkinnedIcon(SKINICON_OTHER_MIRANDA));

 	ImageList_AddIcon_Icolib(hImgLst, LoadSkinnedIcon(SKINICON_OTHER_TICK));	// check on

 	ImageList_AddIcon_Icolib(hImgLst, LoadSkinnedIcon(SKINICON_OTHER_NOTICK));	// check off

@@ -120,8 +117,7 @@ void CCtrlTreeOpts::OnInit()
 	SetImageList(hImgLst, TVSIL_NORMAL);

 

 	/* build options tree. based on code from IcoLib */

-	for (int i=0; i < m_options.getCount(); i++)

-	{

+	for (int i = 0; i < m_options.getCount(); i++) {

 		TCHAR *sectionName;

 		int sectionLevel = 0;

 

@@ -129,50 +125,41 @@ void CCtrlTreeOpts::OnInit()
 		lstrcpy(itemName, m_options[i]->m_szOptionName);

 		sectionName = itemName;

 

-		while (sectionName)

-		{

+		while (sectionName) {

 			// allow multi-level tree

 			TCHAR *pItemName = sectionName;

 			HTREEITEM hItem;

 

-			if (sectionName = _tcschr(sectionName, '/'))

-			{

+			if (sectionName = _tcschr(sectionName, '/')) {

 				// one level deeper

 				*sectionName = 0;

 				sectionName++;

 			}

 

 			hItem = FindNamedItem(hSection, pItemName);

-			if (!sectionName || !hItem)

-			{

-				if (!hItem)

-				{

-					TVINSERTSTRUCT tvis = {0};

-

+			if (!sectionName || !hItem) {

+				if (!hItem) {

+					TVINSERTSTRUCT tvis = { 0 };

 					tvis.hParent = hSection;

 					tvis.hInsertAfter = TVI_LAST;//TVI_SORT;

-					tvis.item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_STATE|TVIF_IMAGE|TVIF_SELECTEDIMAGE;

+					tvis.item.mask = TVIF_TEXT | TVIF_PARAM | TVIF_STATE | TVIF_IMAGE | TVIF_SELECTEDIMAGE;

 					tvis.item.pszText = pItemName;

 					tvis.item.state = tvis.item.stateMask = TVIS_EXPANDED;

-					if (sectionName)

-					{

+					if (sectionName) {

 						tvis.item.lParam = -1;

 						tvis.item.state |= TVIS_BOLD;

 						tvis.item.stateMask |= TVIS_BOLD;

 						tvis.item.iImage = tvis.item.iSelectedImage = IMG_GRPOPEN;

-					} else

-					{

+					}

+					else {

 						tvis.item.lParam = i;

 

 						BYTE val = *m_options[i]->m_option;

 

 						if (m_options[i]->m_groupId == OPTTREE_CHECK)

-						{

 							tvis.item.iImage = tvis.item.iSelectedImage = val ? IMG_CHECK : IMG_NOCHECK;

-						} else

-						{

+						else

 							tvis.item.iImage = tvis.item.iSelectedImage = val ? IMG_RCHECK : IMG_NORCHECK;

-						}

 					}

 					hItem = InsertItem(&tvis);

 					if (!sectionName)

@@ -198,8 +185,7 @@ void CCtrlTreeOpts::OnApply()
 {

 	CCtrlTreeView::OnApply();

 

-	for (int i=0; i < m_options.getCount(); i++)

-	{

+	for (int i = 0; i < m_options.getCount(); i++) {

 		TVITEMEX tvi;

 		GetItem(m_options[i]->m_hItem, &tvi);

 		*m_options[i]->m_option = ((tvi.iImage == IMG_CHECK) || (tvi.iImage == IMG_RCHECK)) ? 1 : 0;

@@ -210,50 +196,44 @@ void CCtrlTreeOpts::ProcessItemClick(HTREEITEM hti)
 {

 	TVITEMEX tvi;

 	GetItem(hti, &tvi);

-	switch (tvi.iImage)

-	{

-		case IMG_GRPOPEN:

-			tvi.iImage = tvi.iSelectedImage = IMG_GRPCLOSED;

-			Expand(tvi.hItem, TVE_COLLAPSE);

-			break;

-		case IMG_GRPCLOSED:

-			tvi.iImage = tvi.iSelectedImage = IMG_GRPOPEN;

-			Expand(tvi.hItem, TVE_EXPAND);

-			break;

-

-		case IMG_CHECK:

-			tvi.iImage = tvi.iSelectedImage = IMG_NOCHECK;

-			SendMessage(::GetParent(::GetParent(m_hwnd)), PSM_CHANGED, 0, 0);

-			break;

-		case IMG_NOCHECK:

-			tvi.iImage = tvi.iSelectedImage = IMG_CHECK;

-			SendMessage(::GetParent(::GetParent(m_hwnd)), PSM_CHANGED, 0, 0);

-			break;

-		case IMG_NORCHECK:

-		{

-			int i;

-			for (i=0; i < m_options.getCount(); i++)

-			{

-				if (m_options[i]->m_groupId == m_options[tvi.lParam]->m_groupId)

-				{

-					TVITEMEX tvi_tmp;

-					tvi_tmp.mask = TVIF_HANDLE|TVIF_IMAGE|TVIF_SELECTEDIMAGE;

-					tvi_tmp.hItem = m_options[i]->m_hItem;

-					tvi_tmp.iImage = tvi_tmp.iSelectedImage = IMG_NORCHECK;

-					SetItem(&tvi_tmp);

-				}

+	switch (tvi.iImage) {

+	case IMG_GRPOPEN:

+		tvi.iImage = tvi.iSelectedImage = IMG_GRPCLOSED;

+		Expand(tvi.hItem, TVE_COLLAPSE);

+		break;

+	case IMG_GRPCLOSED:

+		tvi.iImage = tvi.iSelectedImage = IMG_GRPOPEN;

+		Expand(tvi.hItem, TVE_EXPAND);

+		break;

+

+	case IMG_CHECK:

+		tvi.iImage = tvi.iSelectedImage = IMG_NOCHECK;

+		SendMessage(::GetParent(::GetParent(m_hwnd)), PSM_CHANGED, 0, 0);

+		break;

+	case IMG_NOCHECK:

+		tvi.iImage = tvi.iSelectedImage = IMG_CHECK;

+		SendMessage(::GetParent(::GetParent(m_hwnd)), PSM_CHANGED, 0, 0);

+		break;

+	case IMG_NORCHECK:

+		for (int i = 0; i < m_options.getCount(); i++) {

+			if (m_options[i]->m_groupId == m_options[tvi.lParam]->m_groupId) {

+				TVITEMEX tvi_tmp;

+				tvi_tmp.mask = TVIF_HANDLE | TVIF_IMAGE | TVIF_SELECTEDIMAGE;

+				tvi_tmp.hItem = m_options[i]->m_hItem;

+				tvi_tmp.iImage = tvi_tmp.iSelectedImage = IMG_NORCHECK;

+				SetItem(&tvi_tmp);

 			}

-			tvi.iImage = tvi.iSelectedImage = IMG_RCHECK;

-			SendMessage(::GetParent(::GetParent(m_hwnd)), PSM_CHANGED, 0, 0);

-			break;

 		}

+		tvi.iImage = tvi.iSelectedImage = IMG_RCHECK;

+		SendMessage(::GetParent(::GetParent(m_hwnd)), PSM_CHANGED, 0, 0);

+		break;

 	}

 

 	SetItem(&tvi);

 }

 

-CCtrlTreeOpts::COptionsItem::COptionsItem(TCHAR *szOption, CMOption<BYTE> &option):

-	m_option(&option), m_groupId(OPTTREE_CHECK), m_hItem(NULL)

+CCtrlTreeOpts::COptionsItem::COptionsItem(TCHAR *szOption, CMOption<BYTE> &option) :

+m_option(&option), m_groupId(OPTTREE_CHECK), m_hItem(NULL)

 {

 	m_szOptionName = mir_tstrdup(szOption);

 }