[ViewVC] Diff of: 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 284 by douglas, 2003-09-01T23:05:56-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.13 2003/09/02 06:05:56 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 506 \| Line 473 \| int ScanUtility::browse(HWND dialog, UIN
473		break;
474		case BFFM_SELCHANGED:
475		{
476	<	IShellFolder* object;
510	<
511	<	SHGetDesktopFolder(&object);
476	>	SHFILEINFO info;
477
478	<	STRRET thing;
479	<	char* folder;
478	>	SHGetFileInfo(LPCSTR(l), 0, &info, sizeof(info), SHGFI_DISPLAYNAME
479	>	\| SHGFI_PIDL);
480	>	SendMessage(dialog, BFFM_SETSTATUSTEXT, 0,
481	>	LPARAM(info.szDisplayName));
482
483	<	object->GetDisplayNameOf(LPCITEMIDLIST(l), SHGDN_FORPARSING,
517	<	&thing);
518	<	StrRetToStr(&thing, LPCITEMIDLIST(l), &folder);
519	<	SendMessage(dialog, BFFM_SETSTATUSTEXT, 0, LPARAM(folder));
483	>	char folder[MAX_PATH];
484
485	<	if (PathIsUNCServer(folder))
485	>	if (!SHGetPathFromIDList(LPCITEMIDLIST(l), folder))
486		{
487		SendMessage(dialog, BFFM_ENABLEOK, 0, 0);
488		}
489	<
490	<	CoTaskMemFree(folder);
491	<	object->Release();
489	>	else
490	>	{
491	>	SendMessage(dialog, BFFM_SETSTATUSTEXT, 0, LPARAM(folder));
492	>	}
493		}
494		break;
495		}
#	Line 567 \| Line 532 \| INT_PTR ScanUtility::start(HWND dialog,
532		PSWIZB_NEXT);
533
534		{
535	<	char folder[44];
535	>	SHFILEINFO info;
536	>
537	>	SHGetFileInfo(data->scanDir.c_str(), 0, &info,
538	>	sizeof(info), SHGFI_ICONLOCATION);
539	>
540	>	HICON icon = ExtractIcon(gui.instance, info.szDisplayName,
541	>	info.iIcon);
542	>
543	>	SendDlgItemMessage(dialog, IDC_START_SCAN_ICON,
544	>	STM_SETIMAGE, IMAGE_ICON, LPARAM(icon));
545	>	SHGetFileInfo(data->saveDir.c_str(), 0, &info,
546	>	sizeof(info), SHGFI_ICONLOCATION);
547	>
548	>	icon = ExtractIcon(gui.instance, info.szDisplayName,
549	>	info.iIcon);
550	>
551	>	SendDlgItemMessage(dialog, IDC_START_SAVE_ICON,
552	>	STM_SETIMAGE, IMAGE_ICON, LPARAM(icon));
553	>	}
554	>
555	>	{
556	>	char folder[38];
557
558	<	PathCompactPathEx(folder, data->scanDir.c_str(), 44, 0);
558	>	PathCompactPathEx(folder, data->scanDir.c_str(), 38, 0);
559		SetDlgItemText(dialog, IDC_START_SCAN_TEXT, folder);
560	<	PathCompactPathEx(folder, data->saveDir.c_str(), 44, 0);
560	>	PathCompactPathEx(folder, data->saveDir.c_str(), 38, 0);
561		SetDlgItemText(dialog, IDC_START_SAVE_TEXT, folder);
562		}
563		break;
#	Line 586 \| Line 572 \| INT_PTR ScanUtility::start(HWND dialog,
572		{
573		case IDC_START_SCAN_BROWSE:
574		data->setScanDir(dialog);
575	+
576	+	{
577	+	SHFILEINFO info;
578	+
579	+	SHGetFileInfo(data->scanDir.c_str(), 0, &info, sizeof(info),
580	+	SHGFI_ICONLOCATION);
581	+
582	+	HICON icon = ExtractIcon(gui.instance, info.szDisplayName,
583	+	info.iIcon);
584	+
585	+	SendDlgItemMessage(dialog, IDC_START_SCAN_ICON, STM_SETIMAGE,
586	+	IMAGE_ICON, LPARAM(icon));
587	+	}
588	+
589		{
590	<	char folder[44];
590	>	char folder[38];
591
592	<	PathCompactPathEx(folder, data->scanDir.c_str(), 44, 0);
592	>	PathCompactPathEx(folder, data->scanDir.c_str(), 38, 0);
593		SetDlgItemText(dialog, IDC_START_SCAN_TEXT, folder);
594		}
595		break;
596		case IDC_START_SAVE_BROWSE:
597		data->setSaveDir(dialog);
598	+
599	+	{
600	+	SHFILEINFO info;
601	+
602	+	SHGetFileInfo(data->saveDir.c_str(), 0, &info, sizeof(info),
603	+	SHGFI_ICONLOCATION);
604	+
605	+	HICON icon = ExtractIcon(gui.instance, info.szDisplayName,
606	+	info.iIcon);
607	+
608	+	SendDlgItemMessage(dialog, IDC_START_SAVE_ICON, STM_SETIMAGE,
609	+	IMAGE_ICON, LPARAM(icon));
610	+	}
611	+
612		{
613	<	char folder[44];
613	>	char folder[38];
614
615	<	PathCompactPathEx(folder, data->saveDir.c_str(), 44, 0);
615	>	PathCompactPathEx(folder, data->saveDir.c_str(), 38, 0);
616		SetDlgItemText(dialog, IDC_START_SAVE_TEXT, folder);
617		}
618		break;
#	Line 621 \| Line 635 \| INT_PTR ScanUtility::select(HWND dialog,
635		{
636		ostringstream select;
637
638	<	select << "Select the scanned document that you need to be save.";
638	>	select << "Select the scanned document that you need to save.";
639
640		SetDlgItemText(dialog, IDC_SELECT_TEXT, select.str().c_str());
641		}
#	Line 646 \| Line 660 \| INT_PTR ScanUtility::select(HWND dialog,
660		switch (ni->hdr.code)
661		{
662		case NM_DBLCLK:
663	+	if (ni->iItem != -1)
664		{
665		char scan[MAX_PATH];
666
#	Line 678 \| Line 693 \| INT_PTR ScanUtility::select(HWND dialog,
693		IDC_SELECT_SCANS), -1, LVNI_SELECTED);
694		char scan[MAX_PATH];
695
696	<	ListView_GetItemText(GetDlgItem(dialog, IDC_SELECT_SCANS),
697	<	index, 0, scan, MAX_PATH);
696	>	if (index != -1)
697	>	{
698	>	ListView_GetItemText(GetDlgItem(dialog,
699	>	IDC_SELECT_SCANS), index, 0, scan, MAX_PATH);
700	>	}
701	>	else
702	>	{
703	>	ListView_GetItemText(GetDlgItem(dialog,
704	>	IDC_SELECT_SCANS), 0, 0, scan, MAX_PATH);
705	>	}
706
707		data->scan = scan;
708		}
709
687	–	ListView_DeleteAllItems(GetDlgItem(dialog, IDC_SELECT_SCANS));
688	–
710		if (debug) cerr << "scan = " << data->scan << "\n";
711	+
712	+	ListView_DeleteAllItems(GetDlgItem(dialog, IDC_SELECT_SCANS));
713		break;
714		}
715		}
716		break;
717		case WM_CONTEXTMENU:
718	+	if (ListView_GetNextItem(GetDlgItem(dialog, IDC_SELECT_SCANS), -1,
719	+	LVNI_SELECTED) != -1)
720		{
721		char scan[MAX_PATH];
722		POINT spot;
#	Line 727 \| Line 752 \| INT_PTR ScanUtility::select(HWND dialog,
752		spot.x = rect.left;
753		spot.y = rect.top;
754		}
730	–	else
731	–	{
732	–	break;
733	–	}
755
756		ClientToScreen(GetDlgItem(dialog, IDC_SELECT_SCANS), &spot);
757
#	Line 955 \| Line 976 \| INT_PTR ScanUtility::confirm(HWND dialog
976		LPVOID message;
977
978		FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER \|
979	<	FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), 0,
980	<	LPTSTR(&message), 0, NULL);
979	>	FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(),
980	>	0, LPTSTR(&message), 0, NULL);
981
982		int code = MessageBox(dialog, LPCTSTR(message),
983	<	programName.c_str(), MB_RETRYCANCEL \|
983	>	data->title.c_str(), MB_RETRYCANCEL \|
984		MB_ICONEXCLAMATION);
985
986		LocalFree(message);
#	Line 1008 \| Line 1029 \| INT_PTR ScanUtility::done(HWND dialog, U
1029		{
1030		case WM_INITDIALOG:
1031		data = which(dialog, l);
1032	+
1033	+	{
1034	+	ostringstream done;
1035	+
1036	+	done << "You are done saving the scanned document. Click Finish to"
1037	+	<< " exit or click Back to return to the beginning.";
1038	+
1039	+	SetDlgItemText(dialog, IDC_DONE_TEXT, done.str().c_str());
1040	+	}
1041		break;
1042		case WM_NOTIFY:
1043		{

Diff Legend

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

Comparing trunk/VTBFileUtil2/ScanUtility.cxx (file contents): Revision 278 by douglas, 2003-08-25T00:29:00-07:00 vs. Revision 284 by douglas, 2003-09-01T23:05:56-07:00

Diff Legend

Comparing trunk/VTBFileUtil2/ScanUtility.cxx (file contents):
Revision 278 by douglas, 2003-08-25T00:29:00-07:00 vs.
Revision 284 by douglas, 2003-09-01T23:05:56-07:00