ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/proj/trunk/VTBFileUtil2/ScanUtility.cxx

Comparing trunk/VTBFileUtil2/ScanUtility.cxx (file contents):
Revision 278 by douglas, 2003-08-25T00:29:00-07:00 vs.
Revision 282 by douglas, 2003-08-25T23:41:12-07:00

#	Line 2 | Line 2
2		//
3		// Douglas Thrift
4		//
5	<	// $Id: ScanUtility.cxx,v 1.9 2003/08/25 07:29:00 douglas Exp $
5	>	// $Id: ScanUtility.cxx,v 1.11 2003/08/26 06:41:12 douglas Exp $
6
7		#include "ScanUtility.h"
8
9	<	ScanUtility::ScanUtility()
9	>	ScanUtility::ScanUtility() : DiscBrowse()
10		{
11		number = count++;
12	–	utilities.insert(pair<unsigned, ScanUtility*>(number, this));
13	–	title = new char[programName.length() + 16];
14	–
15	–	sprintf(title, "%s - Scan Utility", programName.c_str());
16	–	loadDirs();
12
13	<	popup = CreatePopupMenu();
13	>	utilities.insert(pair<unsigned, ScanUtility*>(number, this));
14
15	<	MENUITEMINFO open, separator, properties;
15	>	title = programName + " - Scan Utility";
16
22	–	open.cbSize = sizeof(open);
23	–	open.fMask = MIIM_ID | MIIM_STATE | MIIM_TYPE;
24	–	open.fType = MFT_STRING;
25	–	open.fState = MFS_DEFAULT;
26	–	open.wID = 1;
27	–	open.dwTypeData = "&Open";
28	–	open.cch = 5;
29	–	separator.cbSize = sizeof(open);
30	–	separator.fMask = MIIM_TYPE;
31	–	separator.fType = MFT_SEPARATOR;
32	–	properties.cbSize = sizeof(open);
33	–	properties.fMask = MIIM_ID | MIIM_TYPE;
34	–	properties.fType = MFT_STRING;
35	–	properties.wID = 2;
36	–	properties.dwTypeData = "P&roperties";
37	–	properties.cch = 11;
38	–
39	–	InsertMenuItem(popup, 0, TRUE, &open);
40	–	InsertMenuItem(popup, 1, TRUE, &separator);
41	–	InsertMenuItem(popup, 2, TRUE, &properties);
42	–
17		// start
18		wizard[0].dwSize = sizeof(wizard[0]);
19	<	wizard[0].dwFlags = PSP_DEFAULT | PSP_USEHICON | PSP_USETITLE |
20	<	PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
19	>	wizard[0].dwFlags = PSP_DEFAULT | PSP_USETITLE | PSP_USEHEADERTITLE |
20	>	PSP_USEHEADERSUBTITLE;
21		wizard[0].hInstance = gui.instance;
22		wizard[0].pszTemplate = MAKEINTRESOURCE(IDD_START);
23	<	wizard[0].hIcon = gui.icon;
50	<	wizard[0].pszTitle = title;
23	>	wizard[0].pszTitle = title.c_str();
24		wizard[0].pfnDlgProc = start;
25		wizard[0].lParam = number;
26		wizard[0].pszHeaderTitle = "Start";
#	Line 55 | Line 28 | ScanUtility::ScanUtility()
28
29		// select
30		wizard[1].dwSize = sizeof(wizard[1]);
31	<	wizard[1].dwFlags = PSP_DEFAULT | PSP_USEHICON | PSP_USETITLE |
32	<	PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
31	>	wizard[1].dwFlags = PSP_DEFAULT | PSP_USETITLE | PSP_USEHEADERTITLE |
32	>	PSP_USEHEADERSUBTITLE;
33		wizard[1].hInstance = gui.instance;
34		wizard[1].pszTemplate = MAKEINTRESOURCE(IDD_SELECT);
35	<	wizard[1].hIcon = gui.icon;
63	<	wizard[1].pszTitle = title;
35	>	wizard[1].pszTitle = title.c_str();
36		wizard[1].pfnDlgProc = select;
37		wizard[1].lParam = number;
38		wizard[1].pszHeaderTitle = "Select";
#	Line 68 | Line 40 | ScanUtility::ScanUtility()
40
41		// enter
42		wizard[2].dwSize = sizeof(wizard[2]);
43	<	wizard[2].dwFlags = PSP_DEFAULT | PSP_USEHICON | PSP_USETITLE |
44	<	PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
43	>	wizard[2].dwFlags = PSP_DEFAULT | PSP_USETITLE | PSP_USEHEADERTITLE |
44	>	PSP_USEHEADERSUBTITLE;
45		wizard[2].hInstance = gui.instance;
46		wizard[2].pszTemplate = MAKEINTRESOURCE(IDD_ENTER);
47	<	wizard[2].hIcon = gui.icon;
76	<	wizard[2].pszTitle = title;
47	>	wizard[2].pszTitle = title.c_str();
48		wizard[2].pfnDlgProc = enter;
49		wizard[2].lParam = number;
50		wizard[2].pszHeaderTitle = "Enter";
#	Line 81 | Line 52 | ScanUtility::ScanUtility()
52
53		// confirm
54		wizard[3].dwSize = sizeof(wizard[3]);
55	<	wizard[3].dwFlags = PSP_DEFAULT | PSP_USEHICON | PSP_USETITLE |
56	<	PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
55	>	wizard[3].dwFlags = PSP_DEFAULT | PSP_USETITLE | PSP_USEHEADERTITLE |
56	>	PSP_USEHEADERSUBTITLE;
57		wizard[3].hInstance = gui.instance;
58		wizard[3].pszTemplate = MAKEINTRESOURCE(IDD_CONFIRM);
59	<	wizard[3].hIcon = gui.icon;
89	<	wizard[3].pszTitle = title;
59	>	wizard[3].pszTitle = title.c_str();
60		wizard[3].pfnDlgProc = confirm;
61		wizard[3].lParam = number;
62		wizard[3].pszHeaderTitle = "Confirm";
#	Line 94 | Line 64 | ScanUtility::ScanUtility()
64
65		// complete
66		wizard[4].dwSize = sizeof(wizard[3]);
67	<	wizard[4].dwFlags = PSP_DEFAULT | PSP_USEHICON | PSP_USETITLE |
68	<	PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
67	>	wizard[4].dwFlags = PSP_DEFAULT | PSP_USETITLE | PSP_USEHEADERTITLE |
68	>	PSP_USEHEADERSUBTITLE;
69		wizard[4].hInstance = gui.instance;
70		wizard[4].pszTemplate = MAKEINTRESOURCE(IDD_DONE);
71	<	wizard[4].hIcon = gui.icon;
102	<	wizard[4].pszTitle = title;
71	>	wizard[4].pszTitle = title.c_str();
72		wizard[4].pfnDlgProc = done;
73		wizard[4].lParam = number;
74		wizard[4].pszHeaderTitle = "Done";
#	Line 108 | Line 77 | ScanUtility::ScanUtility()
77
78		ScanUtility::~ScanUtility()
79		{
111	–	DestroyMenu(popup);
80		utilities.erase(number);
113	–	saveDirs();
114	–
115	–	delete [] title;
81		}
82
83		void ScanUtility::run(void)
84		{
85	+	loadDirs();
86	+
87		PROPSHEETHEADER header;
88
89		// header
#	Line 132 | Line 99 | void ScanUtility::run(void)
99		header.pszbmHeader = MAKEINTRESOURCE(IDB_VTB_BMP);
100
101		PropertySheet(&header);
102	+	saveDirs();
103		}
104
137	–	unsigned ScanUtility::count = 0;
105		map<unsigned, ScanUtility*> ScanUtility::utilities;
106		map<HWND, ScanUtility*> ScanUtility::windows;
107
#	Line 321 | Line 288 | void ScanUtility::setScanDir(HWND parent
288		if (scanDir == "")
289		{
290		switch (MessageBox(parent, "Scan Directory needs to be selected.",
291	<	programName.c_str(), MB_ABORTRETRYIGNORE | MB_ICONERROR))
291	>	title.c_str(), MB_ABORTRETRYIGNORE | MB_ICONERROR))
292		{
293		case IDABORT:
294		exit(1);
#	Line 378 | Line 345 | void ScanUtility::setSaveDir(HWND parent
345		if (saveDir == "")
346		{
347		switch (MessageBox(parent, "Scan Directory needs to be selected.",
348	<	programName.c_str(), MB_ABORTRETRYIGNORE | MB_ICONERROR))
348	>	title.c_str(), MB_ABORTRETRYIGNORE | MB_ICONERROR))
349		{
350		case IDABORT:
351		exit(1);
#	Line 424 | Line 391 | void ScanUtility::populate(HWND parent)
391		if (scans.empty())
392		{
393		if (MessageBox(parent, "No scanned documents found.",
394	<	programName.c_str(), MB_RETRYCANCEL | MB_ICONQUESTION) ==
395	<	IDCANCEL) break;
394	>	title.c_str(), MB_RETRYCANCEL | MB_ICONQUESTION) == IDCANCEL)
395	>	break;
396		}
397		}
398		while (scans.empty());
#	Line 621 | Line 588 | INT_PTR ScanUtility::select(HWND dialog,
588		{
589		ostringstream select;
590
591	<	select << "Select the scanned document that you need to be save.";
591	>	select << "Select the scanned document that you need to save.";
592
593		SetDlgItemText(dialog, IDC_SELECT_TEXT, select.str().c_str());
594		}
#	Line 955 | Line 922 | INT_PTR ScanUtility::confirm(HWND dialog
922		LPVOID message;
923
924		FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
925	<	FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), 0,
926	<	LPTSTR(&message), 0, NULL);
925	>	FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(),
926	>	0, LPTSTR(&message), 0, NULL);
927
928		int code = MessageBox(dialog, LPCTSTR(message),
929	<	programName.c_str(), MB_RETRYCANCEL |
929	>	data->title.c_str(), MB_RETRYCANCEL |
930		MB_ICONEXCLAMATION);
931
932		LocalFree(message);
#	Line 1008 | Line 975 | INT_PTR ScanUtility::done(HWND dialog, U
975		{
976		case WM_INITDIALOG:
977		data = which(dialog, l);
978	+
979	+	{
980	+	ostringstream done;
981	+
982	+	done << "You are done saving the scanned document. Click Finish to"
983	+	<< " exit or click Back to return to the beginning.";
984	+
985	+	SetDlgItemText(dialog, IDC_DONE_TEXT, done.str().c_str());
986	+	}
987		break;
988		case WM_NOTIFY:
989		{

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines