ViewVC Help

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

root/proj/VTBFileUtil2/ScanUtility.cxx

Comparing trunk/VTBFileUtil2/ScanUtility.cxx (file contents):
Revision 283 by douglas, 2003-08-28T21:16:30-07:00 vs.
Revision 290 by douglas, 2003-09-04T18:57:00-07:00

#	Line 2 | Line 2
2		//
3		// Douglas Thrift
4		//
5	<	// $Id: ScanUtility.cxx,v 1.12 2003/08/29 04:16:30 douglas Exp $
5	>	// $Id: ScanUtility.cxx,v 1.15 2003/09/05 01:57:00 douglas Exp $
6
7		#include "ScanUtility.h"
8
#	Line 130 | 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 161 | 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 273 | Line 273 | void ScanUtility::setScanDir(HWND parent
273		{
274		char folder[MAX_PATH];
275
276	<	if (SHGetPathFromIDList(id, folder))
277	<	{
278	<	scanDir = folder;
279	<	}
276	>	if (SHGetPathFromIDList(id, folder)) scanDir = tail(folder);
277		}
278
279		LPMALLOC destruct;
#	Line 330 | Line 327 | void ScanUtility::setSaveDir(HWND parent
327		{
328		char folder[MAX_PATH];
329
330	<	if (SHGetPathFromIDList(id, folder))
334	<	{
335	<	saveDir = folder;
336	<	}
330	>	if (SHGetPathFromIDList(id, folder)) saveDir = tail(folder);
331		}
332
333		LPMALLOC destruct;
#	Line 372 | Line 366 | void ScanUtility::populate(HWND parent)
366
367		do
368		{
369	<	string scan = scanDir + "\\SCAN????_000." +
369	>	string scan = scanDir + "SCAN????_000." +
370		IndividualClient::getExtension();
371		WIN32_FIND_DATA found;
372		HANDLE finder = FindFirstFile(scan.c_str(), &found);
#	Line 468 | Line 462 | int ScanUtility::browse(HWND dialog, UIN
462		SendMessage(dialog, BFFM_SETOKTEXT, 0,
463		LPARAM(toWide("&Select").c_str()));
464		SendMessage(dialog, BFFM_SETEXPANDED, FALSE, CSIDL_DRIVES);
465	<	SendMessage(dialog, BFFM_SETSELECTION, TRUE, LPARAM(HIWORD(d) ?
466	<	data->scanDir.c_str() : data->saveDir.c_str()));
465	>
466	>	if ((HIWORD(d) ? data->scanDir : data->saveDir) != "")
467	>	{
468	>	IShellFolder* desktop;
469	>	LPWSTR path = new WCHAR[(HIWORD(d) ? data->scanDir.length() :
470	>	data->saveDir.length()) + 1];
471	>	LPITEMIDLIST id;
472	>
473	>	wsprintfW(path, toWide(HIWORD(d) ? data->scanDir :
474	>	data->saveDir).c_str());
475	>
476	>	if (debug) cerr << "path = " << toAnsi(path) << "\n";
477	>
478	>	SHGetDesktopFolder(&desktop);
479	>	desktop->ParseDisplayName(dialog, NULL, path, NULL, &id, NULL);
480	>
481	>	if (id != NULL)
482	>	{
483	>	SendMessage(dialog, BFFM_SETSELECTION, FALSE, LPARAM(id));
484	>
485	>	LPMALLOC destruct;
486	>
487	>	SHGetMalloc(&destruct);
488	>	destruct->Free(id);
489	>	destruct->Release();
490	>	}
491	>
492	>	desktop->Release();
493	>	}
494		break;
495		case BFFM_SELCHANGED:
496		{
497	<	IShellFolder* object;
497	>	SHFILEINFO info;
498
499	<	SHGetDesktopFolder(&object);
499	>	SHGetFileInfo(LPCSTR(l), 0, &info, sizeof(info), SHGFI_DISPLAYNAME
500	>	| SHGFI_PIDL);
501	>	SendMessage(dialog, BFFM_SETSTATUSTEXT, 0,
502	>	LPARAM(info.szDisplayName));
503
504	<	STRRET thing;
481	<	char* folder;
482	<
483	<	object->GetDisplayNameOf(LPCITEMIDLIST(l), SHGDN_FORPARSING,
484	<	&thing);
485	<	StrRetToStr(&thing, LPCITEMIDLIST(l), &folder);
486	<	SendMessage(dialog, BFFM_SETSTATUSTEXT, 0, LPARAM(folder));
504	>	char folder[MAX_PATH];
505
506	<	if (PathIsUNCServer(folder))
506	>	if (!SHGetPathFromIDList(LPCITEMIDLIST(l), folder))
507		{
508		SendMessage(dialog, BFFM_ENABLEOK, 0, 0);
509		}
510	<
511	<	CoTaskMemFree(folder);
512	<	object->Release();
510	>	else
511	>	{
512	>	SendMessage(dialog, BFFM_SETSTATUSTEXT, 0, LPARAM(folder));
513	>	}
514		}
515		break;
516		}
#	Line 539 | Line 558 | INT_PTR ScanUtility::start(HWND dialog,
558		SHGetFileInfo(data->scanDir.c_str(), 0, &info,
559		sizeof(info), SHGFI_ICONLOCATION);
560
561	<	HICON icon = ExtractAssociatedIcon(gui.instance,
562	<	info.szDisplayName, LPWORD(&info.iIcon));
561	>	HICON icon = ExtractIcon(gui.instance, info.szDisplayName,
562	>	info.iIcon);
563
564		SendDlgItemMessage(dialog, IDC_START_SCAN_ICON,
565		STM_SETIMAGE, IMAGE_ICON, LPARAM(icon));
566		SHGetFileInfo(data->saveDir.c_str(), 0, &info,
567		sizeof(info), SHGFI_ICONLOCATION);
568
569	<	icon = ExtractAssociatedIcon(gui.instance,
570	<	info.szDisplayName, LPWORD(&info.iIcon));
569	>	icon = ExtractIcon(gui.instance, info.szDisplayName,
570	>	info.iIcon);
571
572		SendDlgItemMessage(dialog, IDC_START_SAVE_ICON,
573		STM_SETIMAGE, IMAGE_ICON, LPARAM(icon));
#	Line 557 | Line 576 | INT_PTR ScanUtility::start(HWND dialog,
576		{
577		char folder[38];
578
579	<	PathCompactPathEx(folder, data->scanDir.c_str(), 38, 0);
579	>	PathCompactPathEx(folder, data->scanDir.substr(0,
580	>	data->scanDir.length() - 1).c_str(), 38, 0);
581		SetDlgItemText(dialog, IDC_START_SCAN_TEXT, folder);
582	<	PathCompactPathEx(folder, data->saveDir.c_str(), 38, 0);
582	>	PathCompactPathEx(folder, data->saveDir.substr(0,
583	>	data->saveDir.length() - 1).c_str(), 38, 0);
584		SetDlgItemText(dialog, IDC_START_SAVE_TEXT, folder);
585		}
586		break;
#	Line 581 | Line 602 | INT_PTR ScanUtility::start(HWND dialog,
602		SHGetFileInfo(data->scanDir.c_str(), 0, &info, sizeof(info),
603		SHGFI_ICONLOCATION);
604
605	<	HICON icon = ExtractAssociatedIcon(gui.instance,
606	<	info.szDisplayName, LPWORD(&info.iIcon));
605	>	HICON icon = ExtractIcon(gui.instance, info.szDisplayName,
606	>	info.iIcon);
607
608		SendDlgItemMessage(dialog, IDC_START_SCAN_ICON, STM_SETIMAGE,
609		IMAGE_ICON, LPARAM(icon));
#	Line 591 | Line 612 | INT_PTR ScanUtility::start(HWND dialog,
612		{
613		char folder[38];
614
615	<	PathCompactPathEx(folder, data->scanDir.c_str(), 38, 0);
615	>	PathCompactPathEx(folder, data->scanDir.substr(0,
616	>	data->scanDir.length() - 1).c_str(), 38, 0);
617		SetDlgItemText(dialog, IDC_START_SCAN_TEXT, folder);
618		}
619		break;
#	Line 604 | Line 626 | INT_PTR ScanUtility::start(HWND dialog,
626		SHGetFileInfo(data->saveDir.c_str(), 0, &info, sizeof(info),
627		SHGFI_ICONLOCATION);
628
629	<	HICON icon = ExtractAssociatedIcon(gui.instance,
630	<	info.szDisplayName, LPWORD(&info.iIcon));
629	>	HICON icon = ExtractIcon(gui.instance, info.szDisplayName,
630	>	info.iIcon);
631
632		SendDlgItemMessage(dialog, IDC_START_SAVE_ICON, STM_SETIMAGE,
633		IMAGE_ICON, LPARAM(icon));
#	Line 614 | Line 636 | INT_PTR ScanUtility::start(HWND dialog,
636		{
637		char folder[38];
638
639	<	PathCompactPathEx(folder, data->saveDir.c_str(), 38, 0);
639	>	PathCompactPathEx(folder, data->saveDir.substr(0,
640	>	data->saveDir.length() - 1).c_str(), 38, 0);
641		SetDlgItemText(dialog, IDC_START_SAVE_TEXT, folder);
642		}
643		break;
#	Line 662 | Line 685 | INT_PTR ScanUtility::select(HWND dialog,
685		switch (ni->hdr.code)
686		{
687		case NM_DBLCLK:
688	+	if (ni->iItem != -1)
689		{
690		char scan[MAX_PATH];
691
#	Line 694 | Line 718 | INT_PTR ScanUtility::select(HWND dialog,
718		IDC_SELECT_SCANS), -1, LVNI_SELECTED);
719		char scan[MAX_PATH];
720
721	<	ListView_GetItemText(GetDlgItem(dialog, IDC_SELECT_SCANS),
722	<	index, 0, scan, MAX_PATH);
721	>	if (index != -1)
722	>	{
723	>	ListView_GetItemText(GetDlgItem(dialog,
724	>	IDC_SELECT_SCANS), index, 0, scan, MAX_PATH);
725	>	}
726	>	else
727	>	{
728	>	ListView_GetItemText(GetDlgItem(dialog,
729	>	IDC_SELECT_SCANS), 0, 0, scan, MAX_PATH);
730	>	}
731
732		data->scan = scan;
733		}
734
703	–	ListView_DeleteAllItems(GetDlgItem(dialog, IDC_SELECT_SCANS));
704	–
735		if (debug) cerr << "scan = " << data->scan << "\n";
736	+
737	+	ListView_DeleteAllItems(GetDlgItem(dialog, IDC_SELECT_SCANS));
738		break;
739		}
740		}
741		break;
742		case WM_CONTEXTMENU:
743	+	if (ListView_GetNextItem(GetDlgItem(dialog, IDC_SELECT_SCANS), -1,
744	+	LVNI_SELECTED) != -1)
745		{
746		char scan[MAX_PATH];
747		POINT spot;
#	Line 743 | Line 777 | INT_PTR ScanUtility::select(HWND dialog,
777		spot.x = rect.left;
778		spot.y = rect.top;
779		}
746	–	else
747	–	{
748	–	break;
749	–	}
780
781		ClientToScreen(GetDlgItem(dialog, IDC_SELECT_SCANS), &spot);
782

Diff Legend

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