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 284 by douglas, 2003-09-01T23:05:56-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.13 2003/09/02 06:05:56 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		{
#	Line 555 | 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 589 | 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 612 | 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;

Diff Legend

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