From be3185a374d39a8ee0f12a4e985ecca279633fff Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 28 Jul 2012 18:29:52 +0000
Subject: - MS_DB_CHECKPROFILE - service for checking databases - added menu
 item "Check" to a context menu in profile manager

git-svn-id: http://svn.miranda-ng.org/main/trunk@1228 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/DbChecker/src/progress.cpp | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

(limited to 'plugins/DbChecker/src/progress.cpp')

diff --git a/plugins/DbChecker/src/progress.cpp b/plugins/DbChecker/src/progress.cpp
index 4fe976f61f..f223066b1d 100644
--- a/plugins/DbChecker/src/progress.cpp
+++ b/plugins/DbChecker/src/progress.cpp
@@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 void __cdecl WorkerThread(void *unused);
 static HWND hwndStatus, hdlgProgress, hwndBar;
+static bool bShortModeDone;
 HANDLE hEventRun = NULL, hEventAbort = NULL;
 int errorCount;
 
@@ -74,6 +75,7 @@ INT_PTR CALLBACK ProgressDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM
 		hdlgProgress = hdlg;
 		hwndStatus = GetDlgItem(hdlg, IDC_STATUS);
 		errorCount = 0;
+		bShortModeDone = false;
 		hwndBar = GetDlgItem(hdlg, IDC_PROGRESS);
 		SendMessage(hwndBar, PBM_SETRANGE, 0, MAKELPARAM(0, 1000));
 		{
@@ -147,25 +149,41 @@ INT_PTR CALLBACK ProgressDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM
 
 	case WM_PROCESSINGDONE:
 		SetProgressBar(1000);
-		EnableWindow(GetDlgItem(GetParent(hdlg), IDOK), TRUE);
+		if (bShortMode) {
+			EnableWindow(GetDlgItem(GetParent(hdlg), IDC_BACK), FALSE);
+			EnableWindow(GetDlgItem(GetParent(hdlg), IDOK), FALSE);
+			SetDlgItemText(GetParent(hdlg), IDCANCEL, TranslateT("&Finish"));
+			bShortModeDone = true;
+		}
+		else {
+			AddToStatus(STATUS_SUCCESS, TranslateT("Click Next to continue"));
+			EnableWindow(GetDlgItem(GetParent(hdlg), IDOK), TRUE);
+		}
+
 		if (manualAbort == 1)
 			EndDialog(GetParent(hdlg), 0);
 		else if (manualAbort == 2) {
 			if (opts.bCheckOnly)
-				SendMessage(GetParent(hdlg), WZM_GOTOPAGE, IDD_FILEACCESS, (LPARAM)FileAccessDlgProc);
+				PostMessage(GetParent(hdlg), WZM_GOTOPAGE, IDD_FILEACCESS, (LPARAM)FileAccessDlgProc);
 			else {
-				SendMessage(GetParent(hdlg), WZM_GOTOPAGE, IDD_CLEANING, (LPARAM)CleaningDlgProc);
+				PostMessage(GetParent(hdlg), WZM_GOTOPAGE, IDD_CLEANING, (LPARAM)CleaningDlgProc);
 				CloseHandle(opts.hOutFile);
 				opts.hOutFile = NULL;
 			}
 			break;
 		}
-		AddToStatus(STATUS_SUCCESS, TranslateT("Click Next to continue"));
 		break;
 
 	case WZN_CANCELCLICKED:
+		if (bShortModeDone) {
+			EndDialog( GetParent(hdlg), 1);
+			return TRUE;
+		}
+
 		ResetEvent(hEventRun);
-		if (IsWindowEnabled(GetDlgItem(GetParent(hdlg), IDOK))) break;
+		if (IsWindowEnabled(GetDlgItem(GetParent(hdlg), IDOK)))
+			break;
+
 		if (MessageBox(hdlg, TranslateT("Processing has not yet completed, if you cancel now then the changes that have currently been made will be rolled back and the original database will be restored. Do you still want to cancel?"), TranslateT("Miranda Database Tool"), MB_YESNO) == IDYES) {
 			manualAbort = 1;
 			SetEvent(hEventAbort);
@@ -188,12 +206,12 @@ INT_PTR CALLBACK ProgressDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM
 			}
 			SetEvent(hEventRun);
 			if (opts.bCheckOnly)
-				SendMessage(GetParent(hdlg), WZM_GOTOPAGE, IDD_FILEACCESS, (LPARAM)FileAccessDlgProc);
+				PostMessage(GetParent(hdlg), WZM_GOTOPAGE, IDD_FILEACCESS, (LPARAM)FileAccessDlgProc);
 			else
-				SendMessage(GetParent(hdlg), WZM_GOTOPAGE, IDD_CLEANING, (LPARAM)CleaningDlgProc);
+				PostMessage(GetParent(hdlg), WZM_GOTOPAGE, IDD_CLEANING, (LPARAM)CleaningDlgProc);
 			break;
 		case IDOK:
-			SendMessage(GetParent(hdlg), WZM_GOTOPAGE, IDD_FINISHED, (LPARAM)FinishedDlgProc);
+			PostMessage(GetParent(hdlg), WZM_GOTOPAGE, IDD_FINISHED, (LPARAM)FinishedDlgProc);
 			break;
 		}
 		break;
-- 
cgit v1.2.3