Index: src/ch/MiniViewDlg.cpp
===================================================================
diff -u -r8068e0c351055554340ac9755d1bc846893bf2b8 -rf102f95617e81f56adbed6403e42602ea8c509b5
--- src/ch/MiniViewDlg.cpp	(.../MiniViewDlg.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
+++ src/ch/MiniViewDlg.cpp	(.../MiniViewDlg.cpp)	(revision f102f95617e81f56adbed6403e42602ea8c509b5)
@@ -17,15 +17,14 @@
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
 #include "stdafx.h"
-#include "../libchcore/TTaskManager.h"
-#include "../libchcore/TTask.h"
 #include "MiniViewDlg.h"
 #include "ch.h"
 #include <assert.h>
 #include "MemDC.h"
-#include "../libchcore/TTaskManagerStatsSnapshot.h"
 #include "CfgProperties.h"
 #include "resource.h"
+#include "../libchengine/TTaskManager.h"
+#include "../libchengine/TTask.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -43,17 +42,275 @@
 
 bool CMiniViewDlg::m_bLock=false;
 
+void OnPause(CMiniViewDlg* pDlg, UINT uiMsg, CMiniViewDlg::_BTNDATA_* pData, CDC* pDC)
+{
+	switch (uiMsg)
+	{
+	case MSG_DRAWBUTTON:
+	{
+		CRect rcCopy = pData->rcButton;
+		rcCopy.DeflateRect(2, 2, 2, 2);
+
+		// frame drawing
+		if (!pData->bPressed || pDlg->m_ctlStatus.GetCurSel() == LB_ERR)
+			pDC->Draw3dRect(&rcCopy, GetSysColor(COLOR_BTNHIGHLIGHT), GetSysColor(COLOR_BTNSHADOW));
+		else
+			pDC->Draw3dRect(&rcCopy, GetSysColor(COLOR_BTNSHADOW), GetSysColor(COLOR_BTNHIGHLIGHT));
+
+		// fill the background
+		rcCopy.DeflateRect(1, 1, 1, 1);
+		pDC->FillSolidRect(&rcCopy, GetSysColor(COLOR_3DFACE));
+
+		// pause
+		CPen pen;
+		int iPenWidth = rcCopy.Width() / 10 + 1;
+		pen.CreatePen(PS_SOLID, iPenWidth, pData->bEnabled ? GetSysColor(COLOR_BTNTEXT) : GetSysColor(COLOR_BTNSHADOW));
+		CPen* pOld = pDC->SelectObject(&pen);
+
+		int iOffset = rcCopy.Width() / 3;
+		pDC->MoveTo(rcCopy.left + iOffset - ROUND(0.66*iPenWidth) + pData->bPressed, rcCopy.top + 1 * iPenWidth + pData->bPressed);
+		pDC->LineTo(rcCopy.left + iOffset - ROUND(0.66*iPenWidth) + pData->bPressed, rcCopy.bottom - ROUND(1.5*iPenWidth) + pData->bPressed);
+		pDC->MoveTo(rcCopy.right - iOffset - ROUND(0.66*iPenWidth) + pData->bPressed, rcCopy.top + 1 * iPenWidth + pData->bPressed);
+		pDC->LineTo(rcCopy.right - iOffset - ROUND(0.66*iPenWidth) + pData->bPressed, rcCopy.bottom - ROUND(1.5*iPenWidth) + pData->bPressed);
+
+		pDC->SelectObject(pOld);
+		break;
+	}
+	case MSG_ONCLICK:
+	{
+		int iSel = pDlg->m_ctlStatus.GetCurSel();
+		if (iSel == LB_ERR || (size_t)iSel >= pDlg->m_ctlStatus.m_vItems.size())
+			return;
+
+		chengine::TTaskPtr spTask = pDlg->m_pTasks->GetTaskByTaskID(pDlg->m_ctlStatus.m_vItems.at(iSel)->m_tTaskID);
+		if (spTask)
+			spTask->PauseProcessing();
+		else
+			pDlg->m_pTasks->TasksPauseProcessing();
+
+		break;
+	}
+	}
+}
+
+void OnCloseBtn(CMiniViewDlg* pDlg, UINT uiMsg, CMiniViewDlg::_BTNDATA_* pData, CDC* pDC)
+{
+	switch (uiMsg)
+	{
+	case MSG_DRAWBUTTON:
+	{
+		CRect rcCopy = pData->rcButton;
+		rcCopy.DeflateRect(2, 2, 2, 2);
+
+		// frame
+		if (!pData->bPressed)
+			pDC->Draw3dRect(&rcCopy, GetSysColor(COLOR_BTNHIGHLIGHT), GetSysColor(COLOR_BTNSHADOW));
+		else
+			pDC->Draw3dRect(&rcCopy, GetSysColor(COLOR_BTNSHADOW), GetSysColor(COLOR_BTNHIGHLIGHT));
+
+		// background
+		rcCopy.DeflateRect(1, 1, 1, 1);
+		pDC->FillSolidRect(&rcCopy, GetSysColor(COLOR_3DFACE));
+
+		// close
+		CPen pen;
+		int iPenSize = rcCopy.Width() / 10 + 1;
+		pen.CreatePen(PS_SOLID | PS_INSIDEFRAME, iPenSize, GetSysColor(COLOR_BTNTEXT));
+		CPen* pOld = pDC->SelectObject(&pen);
+
+		switch (iPenSize)
+		{
+		case 1:
+			pDC->MoveTo(rcCopy.left + pData->bPressed + ROUND(1.4*iPenSize), rcCopy.top + pData->bPressed + ROUND(1.4*iPenSize));
+			pDC->LineTo(rcCopy.right + pData->bPressed - ROUND(1.4*iPenSize), rcCopy.bottom + pData->bPressed - ROUND(1.6*iPenSize));
+			pDC->MoveTo(rcCopy.left + pData->bPressed + ROUND(1.4*iPenSize), rcCopy.bottom + pData->bPressed - ROUND(2.6*iPenSize));
+			pDC->LineTo(rcCopy.right + pData->bPressed - ROUND(1.4*iPenSize), rcCopy.top + pData->bPressed + ROUND(0.4*iPenSize));
+			break;
+		default:
+			pDC->MoveTo(rcCopy.left + pData->bPressed + ROUND(1.4*iPenSize), rcCopy.top + pData->bPressed + ROUND(1.4*iPenSize));
+			pDC->LineTo(rcCopy.right + pData->bPressed - ROUND(2.0*iPenSize), rcCopy.bottom + pData->bPressed - ROUND(2.0*iPenSize));
+			pDC->MoveTo(rcCopy.left + pData->bPressed + ROUND(1.4*iPenSize), rcCopy.bottom + pData->bPressed - ROUND(2.0*iPenSize));
+			pDC->LineTo(rcCopy.right + pData->bPressed - ROUND(2.0*iPenSize), rcCopy.top + pData->bPressed + ROUND(1.4*iPenSize));
+			break;
+		}
+
+		pDC->SelectObject(pOld);
+		break;
+	}
+	case MSG_ONCLICK:
+		pDlg->SendMessage(WM_CLOSE, 0, 0);
+		break;
+	}
+}
+
+void OnResume(CMiniViewDlg* pDlg, UINT uiMsg, CMiniViewDlg::_BTNDATA_* pData, CDC* pDC)
+{
+	switch (uiMsg)
+	{
+	case MSG_DRAWBUTTON:
+	{
+		CRect rcCopy = pData->rcButton;
+		rcCopy.DeflateRect(2, 2, 2, 2);
+
+		// frame
+		if (!pData->bPressed || pDlg->m_ctlStatus.GetCurSel() == LB_ERR)
+			pDC->Draw3dRect(&rcCopy, GetSysColor(COLOR_BTNHIGHLIGHT), GetSysColor(COLOR_BTNSHADOW));
+		else
+			pDC->Draw3dRect(&rcCopy, GetSysColor(COLOR_BTNSHADOW), GetSysColor(COLOR_BTNHIGHLIGHT));
+
+		// bkgnd
+		rcCopy.DeflateRect(1, 1, 1, 1);
+		pDC->FillSolidRect(&rcCopy, GetSysColor(COLOR_3DFACE));
+
+		// triangle
+		int iOffset = rcCopy.Width() / 4;
+		int iHeight = rcCopy.Width() / 10 + 1;
+		POINT pt[3] = { {rcCopy.left + iOffset - 1 + pData->bPressed, rcCopy.top + 1 * iHeight + pData->bPressed}, {rcCopy.left + iOffset - 1 + pData->bPressed, rcCopy.bottom - ROUND(1.625*iHeight) + pData->bPressed},
+						{rcCopy.right - iOffset - 1 + pData->bPressed, rcCopy.top + 1 * iHeight + pData->bPressed + (rcCopy.Height() - 3 * iHeight + 1) / 2} };
+
+		CBrush brs;
+		brs.CreateSolidBrush(pData->bEnabled ? GetSysColor(COLOR_BTNTEXT) : GetSysColor(COLOR_BTNSHADOW));
+		CBrush* pOld = pDC->SelectObject(&brs);
+
+		CPen pen;
+		pen.CreatePen(PS_SOLID, 1, pData->bEnabled ? GetSysColor(COLOR_BTNTEXT) : GetSysColor(COLOR_BTNSHADOW));
+		CPen *pOldPen = pDC->SelectObject(&pen);
+		pDC->SetPolyFillMode(WINDING);
+
+		pDC->Polygon(pt, 3);
+
+		pDC->SelectObject(pOld);
+		pDC->SelectObject(pOldPen);
+
+		break;
+	}
+	case MSG_ONCLICK:
+	{
+		int iSel = pDlg->m_ctlStatus.GetCurSel();
+		if (iSel == LB_ERR || (size_t)iSel >= pDlg->m_ctlStatus.m_vItems.size())
+			return;
+
+		chengine::TTaskPtr spTask = pDlg->m_pTasks->GetTaskByTaskID(pDlg->m_ctlStatus.m_vItems.at(iSel)->m_tTaskID);
+		if (spTask)
+		{
+			if (spTask->GetTaskState() == chengine::eTaskState_Waiting)
+				spTask->SetForceFlag(true);
+			else
+				spTask->ResumeProcessing();
+		}
+		else
+			pDlg->m_pTasks->TasksResumeProcessing();
+		break;
+	}
+	}
+}
+
+void OnCancelBtn(CMiniViewDlg* pDlg, UINT uiMsg, CMiniViewDlg::_BTNDATA_* pData, CDC* pDC)
+{
+	switch (uiMsg)
+	{
+	case MSG_DRAWBUTTON:
+	{
+		CRect rcCopy = pData->rcButton;
+		rcCopy.DeflateRect(2, 2, 2, 2);
+
+		// frame
+		if (!pData->bPressed || pDlg->m_ctlStatus.GetCurSel() == LB_ERR)
+			pDC->Draw3dRect(&rcCopy, GetSysColor(COLOR_BTNHIGHLIGHT), GetSysColor(COLOR_BTNSHADOW));
+		else
+			pDC->Draw3dRect(&rcCopy, GetSysColor(COLOR_BTNSHADOW), GetSysColor(COLOR_BTNHIGHLIGHT));
+
+		// bkgnd
+		rcCopy.DeflateRect(1, 1, 1, 1);
+		pDC->FillSolidRect(&rcCopy, GetSysColor(COLOR_3DFACE));
+
+		// square
+		int iWidth = rcCopy.Width() / 10 + 1;
+		rcCopy.DeflateRect(1 * iWidth + pData->bPressed, 1 * iWidth + pData->bPressed, ROUND(1.6*iWidth) - pData->bPressed, 1 * iWidth - pData->bPressed);
+		pDC->FillSolidRect(&rcCopy, pData->bEnabled ? GetSysColor(COLOR_BTNTEXT) : GetSysColor(COLOR_BTNSHADOW));
+		break;
+	}
+	case MSG_ONCLICK:
+		int iSel = pDlg->m_ctlStatus.GetCurSel();
+		if (iSel == LB_ERR || (size_t)iSel >= pDlg->m_ctlStatus.m_vItems.size())
+			return;
+
+		chengine::TTaskPtr spTask = pDlg->m_pTasks->GetTaskByTaskID(pDlg->m_ctlStatus.m_vItems.at(iSel)->m_tTaskID);
+		if (spTask)
+			spTask->CancelProcessing();
+		else
+			pDlg->m_pTasks->TasksCancelProcessing();
+		break;
+	}
+}
+
+void OnRestartBtn(CMiniViewDlg* pDlg, UINT uiMsg, CMiniViewDlg::_BTNDATA_* pData, CDC* pDC)
+{
+	switch (uiMsg)
+	{
+	case MSG_DRAWBUTTON:
+	{
+		CRect rcCopy = pData->rcButton;
+		rcCopy.DeflateRect(2, 2, 2, 2);
+
+		// frame
+		if (!pData->bPressed || pDlg->m_ctlStatus.GetCurSel() == LB_ERR)
+			pDC->Draw3dRect(&rcCopy, GetSysColor(COLOR_BTNHIGHLIGHT), GetSysColor(COLOR_BTNSHADOW));
+		else
+			pDC->Draw3dRect(&rcCopy, GetSysColor(COLOR_BTNSHADOW), GetSysColor(COLOR_BTNHIGHLIGHT));
+
+		// bkgnd
+		rcCopy.DeflateRect(1, 1, 1, 1);
+		pDC->FillSolidRect(&rcCopy, GetSysColor(COLOR_3DFACE));
+
+		// triangle in a square
+		int iOffset = rcCopy.Width() / 4;
+		int iHeight = rcCopy.Width() / 10 + 1;
+		POINT pt[3] = { {rcCopy.left + iOffset - 1 + pData->bPressed, rcCopy.top + 1 * iHeight + pData->bPressed}, {rcCopy.left + iOffset - 1 + pData->bPressed, rcCopy.bottom - ROUND(1.625*iHeight) + pData->bPressed},
+						{rcCopy.right - iOffset - 1 + pData->bPressed, rcCopy.top + 1 * iHeight + pData->bPressed + (rcCopy.Height() - 3 * iHeight + 1) / 2} };
+
+		CBrush brs;
+		brs.CreateSolidBrush(pData->bEnabled ? RGB(255, 0, 0) : GetSysColor(COLOR_BTNSHADOW));
+		CBrush* pOld = pDC->SelectObject(&brs);
+
+		CPen pen;
+		pen.CreatePen(PS_SOLID, 1, pData->bEnabled ? RGB(255, 0, 0) : GetSysColor(COLOR_BTNSHADOW));
+		CPen *pOldPen = pDC->SelectObject(&pen);
+
+		pDC->SetPolyFillMode(WINDING);
+		pDC->Polygon(pt, 3);
+		pDC->SelectObject(pOld);
+		pDC->SelectObject(pOldPen);
+
+		break;
+	}
+	case MSG_ONCLICK:
+	{
+		int iSel = pDlg->m_ctlStatus.GetCurSel();
+		if (iSel == LB_ERR || (size_t)iSel >= pDlg->m_ctlStatus.m_vItems.size())
+			return;
+
+		chengine::TTaskPtr spTask = pDlg->m_pTasks->GetTaskByTaskID(pDlg->m_ctlStatus.m_vItems.at(iSel)->m_tTaskID);
+		if (spTask)
+			spTask->RestartProcessing();
+		else
+			pDlg->m_pTasks->TasksRestartProcessing();
+		break;
+	}
+	}
+}
+
 /////////////////////////////////////////////////////////////////////////////
 // CMiniViewDlg dialog
 
-CMiniViewDlg::CMiniViewDlg(chcore::TTaskManager* pTaskManager, bool *pbHide, CWnd* pParent /*=nullptr*/)
+CMiniViewDlg::CMiniViewDlg(chengine::TTaskManager* pTaskManager, bool *pbHide, CWnd* pParent /*=nullptr*/)
 	:ictranslate::CLanguageDialog(IDD_MINIVIEW_DIALOG, pParent, &m_bLock),
+	m_pTasks(pTaskManager),
 	m_iLastHeight(0),
 	m_bShown(false),
-	m_pTasks(pTaskManager),
 	m_bActive(false),
-	m_iIndex(-1),
-	m_pbHide(pbHide)
+	m_pbHide(pbHide),
+	m_iIndex(-1)
 {
 	COLORREF cr3DFace = GetSysColor(COLOR_3DFACE);
 	m_brBackground.CreateSolidBrush(cr3DFace);
@@ -195,7 +452,7 @@
 	if(!m_pTasks)
 		return;
 
-	chcore::TTaskManagerStatsSnapshotPtr spTaskMgrStats(new chcore::TTaskManagerStatsSnapshot);
+	chengine::TTaskManagerStatsSnapshotPtr spTaskMgrStats(new chengine::TTaskManagerStatsSnapshot);
 
 	m_pTasks->GetStatsSnapshot(spTaskMgrStats);
 
@@ -207,25 +464,25 @@
 		size_t stTasksCount = spTaskMgrStats->GetTaskStatsCount();
 		for(size_t stIndex = 0; stIndex < stTasksCount; ++stIndex)
 		{
-			chcore::TTaskStatsSnapshotPtr spTaskStats = spTaskMgrStats->GetTaskStatsAt(stIndex);
-			chcore::ETaskCurrentState eTaskState = spTaskStats->GetTaskState();
+			chengine::TTaskStatsSnapshotPtr spTaskStats = spTaskMgrStats->GetTaskStatsAt(stIndex);
+			chengine::ETaskCurrentState eTaskState = spTaskStats->GetTaskState();
 
-			if(eTaskState != chcore::eTaskState_Finished && eTaskState != chcore::eTaskState_Cancelled && eTaskState != chcore::eTaskState_LoadError)
+			if(eTaskState != chengine::eTaskState_Finished && eTaskState != chengine::eTaskState_Cancelled && eTaskState != chengine::eTaskState_LoadError)
 			{
 				pItem = m_ctlStatus.GetItemAddress(index++);
 
 				// load
-				if(eTaskState == chcore::eTaskState_Error)
+				if(eTaskState == chengine::eTaskState_Error)
 					pItem->m_crColor=RGB(255, 0, 0);
-				else if(eTaskState == chcore::eTaskState_Paused)
+				else if(eTaskState == chengine::eTaskState_Paused)
 					pItem->m_crColor=RGB(255, 255, 0);
-				else if(eTaskState == chcore::eTaskState_Waiting)
+				else if(eTaskState == chengine::eTaskState_Waiting)
 					pItem->m_crColor=RGB(0, 0, 255);
 				else
 					pItem->m_crColor=RGB(0, 255, 0);
 
-				chcore::TString strPath;
-				chcore::TSubTaskStatsSnapshotPtr spSubtaskStats = spTaskStats->GetSubTasksStats().GetCurrentSubTaskSnapshot();
+				string::TString strPath;
+				chengine::TSubTaskStatsSnapshotPtr spSubtaskStats = spTaskStats->GetSubTasksStats().GetCurrentSubTaskSnapshot();
 				if(spSubtaskStats)
 					strPath = spSubtaskStats->GetCurrentPath();
 
@@ -277,7 +534,7 @@
 	pItem->m_crColor=GetSysColor(COLOR_HIGHLIGHT);
 	pItem->m_strText=GetResManager().LoadString(IDS_MINIVIEWALL_STRING);
 	pItem->m_uiPos = boost::numeric_cast<int>(spTaskMgrStats->GetCombinedProgress() * 100.0);
-	pItem->m_tTaskID = chcore::NoTaskID;
+	pItem->m_tTaskID = chengine::NoTaskID;
 
 	// get rid of the rest
 	m_ctlStatus.SetSmoothProgress(GetPropValue<PP_MVUSESMOOTHPROGRESS>(GetConfig()));
@@ -398,264 +655,6 @@
 	}
 }
 
-void OnPause(CMiniViewDlg* pDlg, UINT uiMsg, CMiniViewDlg::_BTNDATA_* pData, CDC* pDC)
-{
-	switch (uiMsg)
-	{
-	case MSG_DRAWBUTTON:
-		{
-			CRect rcCopy=pData->rcButton;
-			rcCopy.DeflateRect(2,2,2,2);
-			
-			// frame drawing
-			if (!pData->bPressed || pDlg->m_ctlStatus.GetCurSel() == LB_ERR)
-				pDC->Draw3dRect(&rcCopy, GetSysColor(COLOR_BTNHIGHLIGHT), GetSysColor(COLOR_BTNSHADOW));
-			else
-				pDC->Draw3dRect(&rcCopy, GetSysColor(COLOR_BTNSHADOW), GetSysColor(COLOR_BTNHIGHLIGHT));
-			
-			// fill the background
-			rcCopy.DeflateRect(1, 1, 1, 1);
-			pDC->FillSolidRect(&rcCopy, GetSysColor(COLOR_3DFACE));
-			
-			// pause
-			CPen pen;
-			int iPenWidth=rcCopy.Width()/10+1;
-			pen.CreatePen(PS_SOLID, iPenWidth, pData->bEnabled ? GetSysColor(COLOR_BTNTEXT) : GetSysColor(COLOR_BTNSHADOW));
-			CPen* pOld=pDC->SelectObject(&pen);
-
-			int iOffset=rcCopy.Width()/3;
-			pDC->MoveTo(rcCopy.left+iOffset-ROUND(0.66*iPenWidth)+pData->bPressed, rcCopy.top+1*iPenWidth+pData->bPressed);
-			pDC->LineTo(rcCopy.left+iOffset-ROUND(0.66*iPenWidth)+pData->bPressed, rcCopy.bottom-ROUND(1.5*iPenWidth)+pData->bPressed);
-			pDC->MoveTo(rcCopy.right-iOffset-ROUND(0.66*iPenWidth)+pData->bPressed, rcCopy.top+1*iPenWidth+pData->bPressed);
-			pDC->LineTo(rcCopy.right-iOffset-ROUND(0.66*iPenWidth)+pData->bPressed, rcCopy.bottom-ROUND(1.5*iPenWidth)+pData->bPressed);
-
-			pDC->SelectObject(pOld);
-			break;
-		}
-	case MSG_ONCLICK:
-		{
-			int iSel=pDlg->m_ctlStatus.GetCurSel();
-			if (iSel == LB_ERR || (size_t)iSel >= pDlg->m_ctlStatus.m_vItems.size())
-				return;
-
-			chcore::TTaskPtr spTask = pDlg->m_pTasks->GetTaskByTaskID(pDlg->m_ctlStatus.m_vItems.at(iSel)->m_tTaskID);
-			if(spTask)
-				spTask->PauseProcessing();
-			else
-				pDlg->m_pTasks->TasksPauseProcessing();
-
-			break;
-		}
-	}
-}
-
-void OnCloseBtn(CMiniViewDlg* pDlg, UINT uiMsg, CMiniViewDlg::_BTNDATA_* pData, CDC* pDC)
-{
-	switch (uiMsg)
-	{
-	case MSG_DRAWBUTTON:
-		{
-			CRect rcCopy=pData->rcButton;
-			rcCopy.DeflateRect(2,2,2,2);
-			
-			// frame
-			if (!pData->bPressed)
-				pDC->Draw3dRect(&rcCopy, GetSysColor(COLOR_BTNHIGHLIGHT), GetSysColor(COLOR_BTNSHADOW));
-			else
-				pDC->Draw3dRect(&rcCopy, GetSysColor(COLOR_BTNSHADOW), GetSysColor(COLOR_BTNHIGHLIGHT));
-
-			// background
-			rcCopy.DeflateRect(1, 1, 1, 1);
-			pDC->FillSolidRect(&rcCopy, GetSysColor(COLOR_3DFACE));
-			
-			// close
-			CPen pen;
-			int iPenSize=rcCopy.Width()/10+1;
-			pen.CreatePen(PS_SOLID | PS_INSIDEFRAME, iPenSize, GetSysColor(COLOR_BTNTEXT));
-			CPen* pOld=pDC->SelectObject(&pen);
-
-			switch (iPenSize)
-			{
-			case 1:
-				pDC->MoveTo(rcCopy.left+pData->bPressed+ROUND(1.4*iPenSize), rcCopy.top+pData->bPressed+ROUND(1.4*iPenSize));
-				pDC->LineTo(rcCopy.right+pData->bPressed-ROUND(1.4*iPenSize), rcCopy.bottom+pData->bPressed-ROUND(1.6*iPenSize));
-				pDC->MoveTo(rcCopy.left+pData->bPressed+ROUND(1.4*iPenSize), rcCopy.bottom+pData->bPressed-ROUND(2.6*iPenSize));
-				pDC->LineTo(rcCopy.right+pData->bPressed-ROUND(1.4*iPenSize), rcCopy.top+pData->bPressed+ROUND(0.4*iPenSize));
-				break;
-			default:
-				pDC->MoveTo(rcCopy.left+pData->bPressed+ROUND(1.4*iPenSize), rcCopy.top+pData->bPressed+ROUND(1.4*iPenSize));
-				pDC->LineTo(rcCopy.right+pData->bPressed-ROUND(2.0*iPenSize), rcCopy.bottom+pData->bPressed-ROUND(2.0*iPenSize));
-				pDC->MoveTo(rcCopy.left+pData->bPressed+ROUND(1.4*iPenSize), rcCopy.bottom+pData->bPressed-ROUND(2.0*iPenSize));
-				pDC->LineTo(rcCopy.right+pData->bPressed-ROUND(2.0*iPenSize), rcCopy.top+pData->bPressed+ROUND(1.4*iPenSize));
-				break;
-			}
-
-			pDC->SelectObject(pOld);
-			break;
-		}
-	case MSG_ONCLICK:
-		pDlg->SendMessage(WM_CLOSE, 0, 0);
-		break;
-	}
-}
-
-void OnResume(CMiniViewDlg* pDlg, UINT uiMsg, CMiniViewDlg::_BTNDATA_* pData, CDC* pDC)
-{
-	switch (uiMsg)
-	{
-	case MSG_DRAWBUTTON:
-		{
-			CRect rcCopy=pData->rcButton;
-			rcCopy.DeflateRect(2,2,2,2);
-			
-			// frame
-			if (!pData->bPressed || pDlg->m_ctlStatus.GetCurSel() == LB_ERR)
-				pDC->Draw3dRect(&rcCopy, GetSysColor(COLOR_BTNHIGHLIGHT), GetSysColor(COLOR_BTNSHADOW));
-			else
-				pDC->Draw3dRect(&rcCopy, GetSysColor(COLOR_BTNSHADOW), GetSysColor(COLOR_BTNHIGHLIGHT));
-			
-			// bkgnd
-			rcCopy.DeflateRect(1, 1, 1, 1);
-			pDC->FillSolidRect(&rcCopy, GetSysColor(COLOR_3DFACE));
-
-			// triangle
-			int iOffset=rcCopy.Width()/4;
-			int iHeight=rcCopy.Width()/10+1;
-			POINT pt[3]={ {rcCopy.left+iOffset-1+pData->bPressed, rcCopy.top+1*iHeight+pData->bPressed}, {rcCopy.left+iOffset-1+pData->bPressed, rcCopy.bottom-ROUND(1.625*iHeight)+pData->bPressed},
-							{rcCopy.right-iOffset-1+pData->bPressed, rcCopy.top+1*iHeight+pData->bPressed+(rcCopy.Height()-3*iHeight+1)/2} };
-
-			CBrush brs;
-			brs.CreateSolidBrush(pData->bEnabled ? GetSysColor(COLOR_BTNTEXT) : GetSysColor(COLOR_BTNSHADOW));
-			CBrush* pOld=pDC->SelectObject(&brs);
-
-			CPen pen;
-			pen.CreatePen(PS_SOLID, 1, pData->bEnabled ? GetSysColor(COLOR_BTNTEXT) : GetSysColor(COLOR_BTNSHADOW));
-			CPen *pOldPen=pDC->SelectObject(&pen);
-			pDC->SetPolyFillMode(WINDING);
-
-			pDC->Polygon(pt, 3);
-
-			pDC->SelectObject(pOld);
-			pDC->SelectObject(pOldPen);
-
-			break;
-		}
-	case MSG_ONCLICK:
-		{
-			int iSel=pDlg->m_ctlStatus.GetCurSel();
-			if (iSel == LB_ERR || (size_t)iSel >= pDlg->m_ctlStatus.m_vItems.size())
-				return;
-
-			chcore::TTaskPtr spTask = pDlg->m_pTasks->GetTaskByTaskID(pDlg->m_ctlStatus.m_vItems.at(iSel)->m_tTaskID);
-			if (spTask)
-			{
-				if(spTask->GetTaskState() == chcore::eTaskState_Waiting)
-					spTask->SetForceFlag(true);
-				else
-					spTask->ResumeProcessing();
-			}
-			else
-				pDlg->m_pTasks->TasksResumeProcessing();
-			break;
-		}
-	}
-}
-
-void OnCancelBtn(CMiniViewDlg* pDlg, UINT uiMsg, CMiniViewDlg::_BTNDATA_* pData, CDC* pDC)
-{
-	switch (uiMsg)
-	{
-	case MSG_DRAWBUTTON:
-		{
-			CRect rcCopy=pData->rcButton;
-			rcCopy.DeflateRect(2,2,2,2);
-			
-			// frame
-			if (!pData->bPressed || pDlg->m_ctlStatus.GetCurSel() == LB_ERR)
-				pDC->Draw3dRect(&rcCopy, GetSysColor(COLOR_BTNHIGHLIGHT), GetSysColor(COLOR_BTNSHADOW));
-			else
-				pDC->Draw3dRect(&rcCopy, GetSysColor(COLOR_BTNSHADOW), GetSysColor(COLOR_BTNHIGHLIGHT));
-			
-			// bkgnd
-			rcCopy.DeflateRect(1, 1, 1, 1);
-			pDC->FillSolidRect(&rcCopy, GetSysColor(COLOR_3DFACE));
-
-			// square
-			int iWidth=rcCopy.Width()/10+1;
-			rcCopy.DeflateRect(1*iWidth+pData->bPressed, 1*iWidth+pData->bPressed, ROUND(1.6*iWidth)-pData->bPressed, 1*iWidth-pData->bPressed);
-			pDC->FillSolidRect(&rcCopy, pData->bEnabled ? GetSysColor(COLOR_BTNTEXT) : GetSysColor(COLOR_BTNSHADOW));
-			break;
-		}
-	case MSG_ONCLICK:
-		int iSel=pDlg->m_ctlStatus.GetCurSel();
-		if (iSel == LB_ERR || (size_t)iSel >= pDlg->m_ctlStatus.m_vItems.size())
-			return;
-
-		chcore::TTaskPtr spTask = pDlg->m_pTasks->GetTaskByTaskID(pDlg->m_ctlStatus.m_vItems.at(iSel)->m_tTaskID);
-		if(spTask)
-			spTask->CancelProcessing();
-		else
-			pDlg->m_pTasks->TasksCancelProcessing();
-		break;
-	}
-}
-
-void OnRestartBtn(CMiniViewDlg* pDlg, UINT uiMsg, CMiniViewDlg::_BTNDATA_* pData, CDC* pDC)
-{
-	switch (uiMsg)
-	{
-	case MSG_DRAWBUTTON:
-		{
-			CRect rcCopy=pData->rcButton;
-			rcCopy.DeflateRect(2,2,2,2);
-			
-			// frame
-			if (!pData->bPressed || pDlg->m_ctlStatus.GetCurSel() == LB_ERR)
-				pDC->Draw3dRect(&rcCopy, GetSysColor(COLOR_BTNHIGHLIGHT), GetSysColor(COLOR_BTNSHADOW));
-			else
-				pDC->Draw3dRect(&rcCopy, GetSysColor(COLOR_BTNSHADOW), GetSysColor(COLOR_BTNHIGHLIGHT));
-			
-			// bkgnd
-			rcCopy.DeflateRect(1, 1, 1, 1);
-			pDC->FillSolidRect(&rcCopy, GetSysColor(COLOR_3DFACE));
-
-			// triangle in a square
-			int iOffset=rcCopy.Width()/4;
-			int iHeight=rcCopy.Width()/10+1;
-			POINT pt[3]={ {rcCopy.left+iOffset-1+pData->bPressed, rcCopy.top+1*iHeight+pData->bPressed}, {rcCopy.left+iOffset-1+pData->bPressed, rcCopy.bottom-ROUND(1.625*iHeight)+pData->bPressed},
-							{rcCopy.right-iOffset-1+pData->bPressed, rcCopy.top+1*iHeight+pData->bPressed+(rcCopy.Height()-3*iHeight+1)/2} };
-
-			CBrush brs;
-			brs.CreateSolidBrush(pData->bEnabled ? RGB(255, 0, 0) : GetSysColor(COLOR_BTNSHADOW));
-			CBrush* pOld=pDC->SelectObject(&brs);
-
-			CPen pen;
-			pen.CreatePen(PS_SOLID, 1, pData->bEnabled ? RGB(255, 0, 0) : GetSysColor(COLOR_BTNSHADOW));
-			CPen *pOldPen=pDC->SelectObject(&pen);
-
-			pDC->SetPolyFillMode(WINDING);
-			pDC->Polygon(pt, 3);
-			pDC->SelectObject(pOld);
-			pDC->SelectObject(pOldPen);
-
-			break;
-		}
-	case MSG_ONCLICK:
-		{
-			int iSel=pDlg->m_ctlStatus.GetCurSel();
-			if (iSel == LB_ERR || (size_t)iSel >= pDlg->m_ctlStatus.m_vItems.size())
-				return;
-
-			chcore::TTaskPtr spTask = pDlg->m_pTasks->GetTaskByTaskID(pDlg->m_ctlStatus.m_vItems.at(iSel)->m_tTaskID);
-			if(spTask)
-				spTask->RestartProcessing();
-			else
-				pDlg->m_pTasks->TasksRestartProcessing();
-			break;
-		}
-	}
-}
-
 void CMiniViewDlg::OnSelchangeProgressList() 
 {
 	RefreshStatus();
@@ -713,7 +712,7 @@
 	}
 
 	if (!bProcessed)
-		m_ctlStatus.SetCurSel(-1);
+		m_ctlStatus.SetCurrentSelection(-1);
 
 	m_iIndex=-1;
 
@@ -804,7 +803,7 @@
 	if(iSel == LB_ERR || (size_t)iSel >= m_ctlStatus.m_vItems.size())
 		return;
 
-	chcore::taskid_t tTaskID = m_ctlStatus.m_vItems.at(iSel)->m_tTaskID;
+	chengine::taskid_t tTaskID = m_ctlStatus.m_vItems.at(iSel)->m_tTaskID;
 	GetParent()->PostMessage(WM_MINIVIEWDBLCLK, 0, boost::numeric_cast<LPARAM>(tTaskID));
 }