[ViewVC] Diff of: proj/trunk/VTBFileUtil2/ScanUtility.cxx

Comparing trunk/VTBFileUtil2/ScanUtility.cxx (file contents):
Revision 281 by douglas, 2003-08-25T14:56:30-07:00 vs.
Revision 292 by douglas, 2003-09-08T18:43:28-07:00

#	Line 2 \| Line 2
2		//
3		// Douglas Thrift
4		//
5	<	// $Id: ScanUtility.cxx,v 1.10 2003/08/25 21:56:30 douglas Exp $
5	>	// $Id: ScanUtility.cxx,v 1.17 2003/09/09 01:43:28 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 163 \| Line 130 \| void ScanUtility::loadDirs(void)
130
131		ExpandEnvironmentStrings(data, folder, MAX_PATH);
132
133	<	scanDir = folder;
133	>	scanDir = tail(folder);
134		}
135		break;
136		case REG_SZ:
137	<	scanDir = data;
137	>	scanDir = tail(data);
138		break;
139		default:
140		setScanDir();
#	Line 194 \| Line 161 \| void ScanUtility::loadDirs(void)
161
162		ExpandEnvironmentStrings(data, folder, MAX_PATH);
163
164	<	saveDir = folder;
164	>	saveDir = tail(folder);
165		}
166		break;
167		case REG_SZ:
168	<	saveDir = data;
168	>	saveDir = tail(data);
169		break;
170		default:
171		setSaveDir();
#	Line 226 \| Line 193 \| void ScanUtility::saveDirs(void)
193		{
194		HKEY key;
195
196	<	if (RegCreateKeyEx(HKEY_CURRENT_USER,
196	>	if (LONG code = RegCreateKeyEx(HKEY_CURRENT_USER,
197		"Software\\DouglasThrift\\VTBFileUtil2", 0, NULL,
198		REG_OPTION_NON_VOLATILE, KEY_QUERY_VALUE \| KEY_SET_VALUE, NULL, &key,
199		NULL) == ERROR_SUCCESS)
#	Line 251 \| Line 218 \| void ScanUtility::saveDirs(void)
218		LPBYTE(scanDir.c_str()), scanDir.length() + 1) !=
219		ERROR_SUCCESS)
220		{
221	<	error();
221	>	error(NULL, code);
222		}
223		}
224
#	Line 273 \| Line 240 \| void ScanUtility::saveDirs(void)
240		LPBYTE(saveDir.c_str()), saveDir.length() + 1) !=
241		ERROR_SUCCESS)
242		{
243	<	error();
243	>	error(NULL, code);
244		}
245		}
246
#	Line 281 \| Line 248 \| void ScanUtility::saveDirs(void)
248		}
249		else
250		{
251	<	error();
251	>	error(NULL, code);
252		}
253		}
254
255		void ScanUtility::setScanDir(HWND parent)
256		{
257	+	char buffer[MAX_PATH];
258	+
259	+	SHGetFolderPath(parent, CSIDL_FLAG_CREATE \| CSIDL_DESKTOPDIRECTORY, NULL,
260	+	0, buffer);
261	+
262		BROWSEINFO info;
263
264		info.hwndOwner = parent;
#	Line 306 \| Line 278 \| void ScanUtility::setScanDir(HWND parent
278		{
279		char folder[MAX_PATH];
280
281	<	if (SHGetPathFromIDList(id, folder))
310	<	{
311	<	scanDir = folder;
312	<	}
281	>	if (SHGetPathFromIDList(id, folder)) scanDir = tail(folder);
282		}
283
284		LPMALLOC destruct;
#	Line 321 \| Line 290 \| void ScanUtility::setScanDir(HWND parent
290		if (scanDir == "")
291		{
292		switch (MessageBox(parent, "Scan Directory needs to be selected.",
293	<	programName.c_str(), MB_ABORTRETRYIGNORE \| MB_ICONERROR))
293	>	title.c_str(), MB_ABORTRETRYIGNORE \| MB_ICONERROR))
294		{
295		case IDABORT:
296		exit(1);
#	Line 344 \| Line 313 \| void ScanUtility::setScanDir(HWND parent
313
314		void ScanUtility::setSaveDir(HWND parent)
315		{
316	+	char buffer[MAX_PATH];
317	+
318	+	SHGetFolderPath(parent, CSIDL_FLAG_CREATE \| CSIDL_DESKTOPDIRECTORY, NULL,
319	+	0, buffer);
320	+
321		BROWSEINFO info;
322
323		info.hwndOwner = parent;
#	Line 363 \| Line 337 \| void ScanUtility::setSaveDir(HWND parent
337		{
338		char folder[MAX_PATH];
339
340	<	if (SHGetPathFromIDList(id, folder))
367	<	{
368	<	saveDir = folder;
369	<	}
340	>	if (SHGetPathFromIDList(id, folder)) saveDir = tail(folder);
341		}
342
343		LPMALLOC destruct;
#	Line 378 \| Line 349 \| void ScanUtility::setSaveDir(HWND parent
349		if (saveDir == "")
350		{
351		switch (MessageBox(parent, "Scan Directory needs to be selected.",
352	<	programName.c_str(), MB_ABORTRETRYIGNORE \| MB_ICONERROR))
352	>	title.c_str(), MB_ABORTRETRYIGNORE \| MB_ICONERROR))
353		{
354		case IDABORT:
355		exit(1);
#	Line 405 \| Line 376 \| void ScanUtility::populate(HWND parent)
376
377		do
378		{
379	<	string scan = scanDir + "\\SCAN????_000." +
379	>	string scan = scanDir + "SCAN????_000." +
380		IndividualClient::getExtension();
381		WIN32_FIND_DATA found;
382		HANDLE finder = FindFirstFile(scan.c_str(), &found);
#	Line 424 \| Line 395 \| void ScanUtility::populate(HWND parent)
395		if (scans.empty())
396		{
397		if (MessageBox(parent, "No scanned documents found.",
398	<	programName.c_str(), MB_RETRYCANCEL \| MB_ICONQUESTION) ==
399	<	IDCANCEL) break;
398	>	title.c_str(), MB_RETRYCANCEL \| MB_ICONQUESTION) == IDCANCEL)
399	>	break;
400		}
401		}
402		while (scans.empty());
#	Line 501 \| Line 472 \| int ScanUtility::browse(HWND dialog, UIN
472		SendMessage(dialog, BFFM_SETOKTEXT, 0,
473		LPARAM(toWide("&Select").c_str()));
474		SendMessage(dialog, BFFM_SETEXPANDED, FALSE, CSIDL_DRIVES);
475	<	SendMessage(dialog, BFFM_SETSELECTION, TRUE, LPARAM(HIWORD(d) ?
476	<	data->scanDir.c_str() : data->saveDir.c_str()));
475	>
476	>	if ((HIWORD(d) ? data->scanDir : data->saveDir) != "")
477	>	{
478	>	IShellFolder* desktop;
479	>	LPWSTR path = new WCHAR[(HIWORD(d) ? data->scanDir.length() :
480	>	data->saveDir.length()) + 1];
481	>	LPITEMIDLIST id;
482	>
483	>	wsprintfW(path, toWide(HIWORD(d) ? data->scanDir :
484	>	data->saveDir).c_str());
485	>
486	>	if (debug) cerr << "path = " << toAnsi(path) << "\n";
487	>
488	>	SHGetDesktopFolder(&desktop);
489	>	desktop->ParseDisplayName(dialog, NULL, path, NULL, &id, NULL);
490	>
491	>	if (id != NULL)
492	>	{
493	>	SendMessage(dialog, BFFM_SETSELECTION, FALSE, LPARAM(id));
494	>
495	>	LPMALLOC destruct;
496	>
497	>	SHGetMalloc(&destruct);
498	>	destruct->Free(id);
499	>	destruct->Release();
500	>	}
501	>
502	>	desktop->Release();
503	>	}
504		break;
505		case BFFM_SELCHANGED:
506		{
507	<	IShellFolder* object;
510	<
511	<	SHGetDesktopFolder(&object);
507	>	SHFILEINFO info;
508
509	<	STRRET thing;
510	<	char* folder;
509	>	SHGetFileInfo(LPCSTR(l), 0, &info, sizeof(info), SHGFI_DISPLAYNAME
510	>	\| SHGFI_PIDL);
511	>	SendMessage(dialog, BFFM_SETSTATUSTEXT, 0,
512	>	LPARAM(info.szDisplayName));
513
514	<	object->GetDisplayNameOf(LPCITEMIDLIST(l), SHGDN_FORPARSING,
517	<	&thing);
518	<	StrRetToStr(&thing, LPCITEMIDLIST(l), &folder);
519	<	SendMessage(dialog, BFFM_SETSTATUSTEXT, 0, LPARAM(folder));
514	>	char folder[MAX_PATH];
515
516	<	if (PathIsUNCServer(folder))
516	>	if (!SHGetPathFromIDList(LPCITEMIDLIST(l), folder))
517		{
518		SendMessage(dialog, BFFM_ENABLEOK, 0, 0);
519		}
520	<
521	<	CoTaskMemFree(folder);
522	<	object->Release();
520	>	else
521	>	{
522	>	SendMessage(dialog, BFFM_SETSTATUSTEXT, 0, LPARAM(folder));
523	>	}
524		}
525		break;
526		}
#	Line 567 \| Line 563 \| INT_PTR ScanUtility::start(HWND dialog,
563		PSWIZB_NEXT);
564
565		{
566	<	char folder[44];
566	>	SHFILEINFO info;
567	>
568	>	SHGetFileInfo(data->scanDir.c_str(), 0, &info,
569	>	sizeof(info), SHGFI_ICONLOCATION);
570	>
571	>	HICON icon = ExtractIcon(gui.instance, info.szDisplayName,
572	>	info.iIcon);
573	>
574	>	SendDlgItemMessage(dialog, IDC_START_SCAN_ICON,
575	>	STM_SETIMAGE, IMAGE_ICON, LPARAM(icon));
576	>	SHGetFileInfo(data->saveDir.c_str(), 0, &info,
577	>	sizeof(info), SHGFI_ICONLOCATION);
578	>
579	>	icon = ExtractIcon(gui.instance, info.szDisplayName,
580	>	info.iIcon);
581	>
582	>	SendDlgItemMessage(dialog, IDC_START_SAVE_ICON,
583	>	STM_SETIMAGE, IMAGE_ICON, LPARAM(icon));
584	>	}
585	>
586	>	{
587	>	char folder[38];
588
589	<	PathCompactPathEx(folder, data->scanDir.c_str(), 44, 0);
589	>	PathCompactPathEx(folder, data->scanDir.substr(0,
590	>	data->scanDir.length() - 1).c_str(), 38, 0);
591		SetDlgItemText(dialog, IDC_START_SCAN_TEXT, folder);
592	<	PathCompactPathEx(folder, data->saveDir.c_str(), 44, 0);
592	>	PathCompactPathEx(folder, data->saveDir.substr(0,
593	>	data->saveDir.length() - 1).c_str(), 38, 0);
594		SetDlgItemText(dialog, IDC_START_SAVE_TEXT, folder);
595		}
596		break;
#	Line 586 \| Line 605 \| INT_PTR ScanUtility::start(HWND dialog,
605		{
606		case IDC_START_SCAN_BROWSE:
607		data->setScanDir(dialog);
608	+
609	+	{
610	+	SHFILEINFO info;
611	+
612	+	SHGetFileInfo(data->scanDir.c_str(), 0, &info, sizeof(info),
613	+	SHGFI_ICONLOCATION);
614	+
615	+	HICON icon = ExtractIcon(gui.instance, info.szDisplayName,
616	+	info.iIcon);
617	+
618	+	SendDlgItemMessage(dialog, IDC_START_SCAN_ICON, STM_SETIMAGE,
619	+	IMAGE_ICON, LPARAM(icon));
620	+	}
621	+
622		{
623	<	char folder[44];
623	>	char folder[38];
624
625	<	PathCompactPathEx(folder, data->scanDir.c_str(), 44, 0);
625	>	PathCompactPathEx(folder, data->scanDir.substr(0,
626	>	data->scanDir.length() - 1).c_str(), 38, 0);
627		SetDlgItemText(dialog, IDC_START_SCAN_TEXT, folder);
628		}
629		break;
630		case IDC_START_SAVE_BROWSE:
631		data->setSaveDir(dialog);
632	+
633		{
634	<	char folder[44];
634	>	SHFILEINFO info;
635
636	<	PathCompactPathEx(folder, data->saveDir.c_str(), 44, 0);
636	>	SHGetFileInfo(data->saveDir.c_str(), 0, &info, sizeof(info),
637	>	SHGFI_ICONLOCATION);
638	>
639	>	HICON icon = ExtractIcon(gui.instance, info.szDisplayName,
640	>	info.iIcon);
641	>
642	>	SendDlgItemMessage(dialog, IDC_START_SAVE_ICON, STM_SETIMAGE,
643	>	IMAGE_ICON, LPARAM(icon));
644	>	}
645	>
646	>	{
647	>	char folder[38];
648	>
649	>	PathCompactPathEx(folder, data->saveDir.substr(0,
650	>	data->saveDir.length() - 1).c_str(), 38, 0);
651		SetDlgItemText(dialog, IDC_START_SAVE_TEXT, folder);
652		}
653		break;
#	Line 621 \| Line 670 \| INT_PTR ScanUtility::select(HWND dialog,
670		{
671		ostringstream select;
672
673	<	select << "Select the scanned document that you need to be save.";
673	>	select << "Select the scanned document that you need to save.";
674
675		SetDlgItemText(dialog, IDC_SELECT_TEXT, select.str().c_str());
676		}
#	Line 646 \| Line 695 \| INT_PTR ScanUtility::select(HWND dialog,
695		switch (ni->hdr.code)
696		{
697		case NM_DBLCLK:
698	+	if (ni->iItem != -1)
699		{
700		char scan[MAX_PATH];
701
#	Line 678 \| Line 728 \| INT_PTR ScanUtility::select(HWND dialog,
728		IDC_SELECT_SCANS), -1, LVNI_SELECTED);
729		char scan[MAX_PATH];
730
731	<	ListView_GetItemText(GetDlgItem(dialog, IDC_SELECT_SCANS),
732	<	index, 0, scan, MAX_PATH);
731	>	if (index != -1)
732	>	{
733	>	ListView_GetItemText(GetDlgItem(dialog,
734	>	IDC_SELECT_SCANS), index, 0, scan, MAX_PATH);
735	>	}
736	>	else
737	>	{
738	>	ListView_GetItemText(GetDlgItem(dialog,
739	>	IDC_SELECT_SCANS), 0, 0, scan, MAX_PATH);
740	>	}
741
742		data->scan = scan;
743		}
744
687	–	ListView_DeleteAllItems(GetDlgItem(dialog, IDC_SELECT_SCANS));
688	–
745		if (debug) cerr << "scan = " << data->scan << "\n";
746	+
747	+	ListView_DeleteAllItems(GetDlgItem(dialog, IDC_SELECT_SCANS));
748		break;
749		}
750		}
751		break;
752		case WM_CONTEXTMENU:
753	+	if (ListView_GetNextItem(GetDlgItem(dialog, IDC_SELECT_SCANS), -1,
754	+	LVNI_SELECTED) != -1)
755		{
756		char scan[MAX_PATH];
757		POINT spot;
#	Line 727 \| Line 787 \| INT_PTR ScanUtility::select(HWND dialog,
787		spot.x = rect.left;
788		spot.y = rect.top;
789		}
730	–	else
731	–	{
732	–	break;
733	–	}
790
791		ClientToScreen(GetDlgItem(dialog, IDC_SELECT_SCANS), &spot);
792
#	Line 829 \| Line 885 \| INT_PTR ScanUtility::enter(HWND dialog,
885		<< "}\n";
886		}
887
888	<	data->save = data->saveDir + '\\' + data->client.getFile();
888	>	data->save = data->saveDir + data->client.getFile();
889
890		if (debug) cerr << "save = " << data->save << "\n";
891
#	Line 955 \| Line 1011 \| INT_PTR ScanUtility::confirm(HWND dialog
1011		LPVOID message;
1012
1013		FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER \|
1014	<	FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), 0,
1015	<	LPTSTR(&message), 0, NULL);
1014	>	FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(),
1015	>	0, LPTSTR(&message), 0, NULL);
1016
1017		int code = MessageBox(dialog, LPCTSTR(message),
1018	<	programName.c_str(), MB_RETRYCANCEL \|
1018	>	data->title.c_str(), MB_RETRYCANCEL \|
1019		MB_ICONEXCLAMATION);
1020
1021		LocalFree(message);

Diff Legend

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

Comparing trunk/VTBFileUtil2/ScanUtility.cxx (file contents): Revision 281 by douglas, 2003-08-25T14:56:30-07:00 vs. Revision 292 by douglas, 2003-09-08T18:43:28-07:00

Diff Legend

Comparing trunk/VTBFileUtil2/ScanUtility.cxx (file contents):
Revision 281 by douglas, 2003-08-25T14:56:30-07:00 vs.
Revision 292 by douglas, 2003-09-08T18:43:28-07:00