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 288 by douglas, 2003-09-03T15:58:38-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.14 2003/09/03 22:58:38 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 387 | Line 381 | void ScanUtility::populate(HWND parent)
381
382		FindClose(finder);
383		}
384	+	else
385	+	{
386	+	error(parent);
387	+	}
388
389		if (scans.empty())
390		{
#	Line 473 | Line 471 | int ScanUtility::browse(HWND dialog, UIN
471		break;
472		case BFFM_SELCHANGED:
473		{
474	<	IShellFolder* object;
477	<
478	<	SHGetDesktopFolder(&object);
474	>	SHFILEINFO info;
475
476	<	STRRET thing;
477	<	char* folder;
476	>	SHGetFileInfo(LPCSTR(l), 0, &info, sizeof(info), SHGFI_DISPLAYNAME
477	>	| SHGFI_PIDL);
478	>	SendMessage(dialog, BFFM_SETSTATUSTEXT, 0,
479	>	LPARAM(info.szDisplayName));
480
481	<	object->GetDisplayNameOf(LPCITEMIDLIST(l), SHGDN_FORPARSING,
484	<	&thing);
485	<	StrRetToStr(&thing, LPCITEMIDLIST(l), &folder);
486	<	SendMessage(dialog, BFFM_SETSTATUSTEXT, 0, LPARAM(folder));
481	>	char folder[MAX_PATH];
482
483	<	if (PathIsUNCServer(folder))
483	>	if (!SHGetPathFromIDList(LPCITEMIDLIST(l), folder))
484		{
485		SendMessage(dialog, BFFM_ENABLEOK, 0, 0);
486		}
487	<
488	<	CoTaskMemFree(folder);
489	<	object->Release();
487	>	else
488	>	{
489	>	SendMessage(dialog, BFFM_SETSTATUSTEXT, 0, LPARAM(folder));
490	>	}
491		}
492		break;
493		}
#	Line 539 | Line 535 | INT_PTR ScanUtility::start(HWND dialog,
535		SHGetFileInfo(data->scanDir.c_str(), 0, &info,
536		sizeof(info), SHGFI_ICONLOCATION);
537
538	<	HICON icon = ExtractAssociatedIcon(gui.instance,
539	<	info.szDisplayName, LPWORD(&info.iIcon));
538	>	HICON icon = ExtractIcon(gui.instance, info.szDisplayName,
539	>	info.iIcon);
540
541		SendDlgItemMessage(dialog, IDC_START_SCAN_ICON,
542		STM_SETIMAGE, IMAGE_ICON, LPARAM(icon));
543		SHGetFileInfo(data->saveDir.c_str(), 0, &info,
544		sizeof(info), SHGFI_ICONLOCATION);
545
546	<	icon = ExtractAssociatedIcon(gui.instance,
547	<	info.szDisplayName, LPWORD(&info.iIcon));
546	>	icon = ExtractIcon(gui.instance, info.szDisplayName,
547	>	info.iIcon);
548
549		SendDlgItemMessage(dialog, IDC_START_SAVE_ICON,
550		STM_SETIMAGE, IMAGE_ICON, LPARAM(icon));
#	Line 557 | Line 553 | INT_PTR ScanUtility::start(HWND dialog,
553		{
554		char folder[38];
555
556	<	PathCompactPathEx(folder, data->scanDir.c_str(), 38, 0);
556	>	PathCompactPathEx(folder, data->scanDir.substr(0,
557	>	data->scanDir.length() - 1).c_str(), 38, 0);
558		SetDlgItemText(dialog, IDC_START_SCAN_TEXT, folder);
559	<	PathCompactPathEx(folder, data->saveDir.c_str(), 38, 0);
559	>	PathCompactPathEx(folder, data->saveDir.substr(0,
560	>	data->saveDir.length() - 1).c_str(), 38, 0);
561		SetDlgItemText(dialog, IDC_START_SAVE_TEXT, folder);
562		}
563		break;
#	Line 581 | Line 579 | INT_PTR ScanUtility::start(HWND dialog,
579		SHGetFileInfo(data->scanDir.c_str(), 0, &info, sizeof(info),
580		SHGFI_ICONLOCATION);
581
582	<	HICON icon = ExtractAssociatedIcon(gui.instance,
583	<	info.szDisplayName, LPWORD(&info.iIcon));
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));
#	Line 591 | Line 589 | INT_PTR ScanUtility::start(HWND dialog,
589		{
590		char folder[38];
591
592	<	PathCompactPathEx(folder, data->scanDir.c_str(), 38, 0);
592	>	PathCompactPathEx(folder, data->scanDir.substr(0,
593	>	data->scanDir.length() - 1).c_str(), 38, 0);
594		SetDlgItemText(dialog, IDC_START_SCAN_TEXT, folder);
595		}
596		break;
#	Line 604 | Line 603 | INT_PTR ScanUtility::start(HWND dialog,
603		SHGetFileInfo(data->saveDir.c_str(), 0, &info, sizeof(info),
604		SHGFI_ICONLOCATION);
605
606	<	HICON icon = ExtractAssociatedIcon(gui.instance,
607	<	info.szDisplayName, LPWORD(&info.iIcon));
606	>	HICON icon = ExtractIcon(gui.instance, info.szDisplayName,
607	>	info.iIcon);
608
609		SendDlgItemMessage(dialog, IDC_START_SAVE_ICON, STM_SETIMAGE,
610		IMAGE_ICON, LPARAM(icon));
#	Line 614 | Line 613 | INT_PTR ScanUtility::start(HWND dialog,
613		{
614		char folder[38];
615
616	<	PathCompactPathEx(folder, data->saveDir.c_str(), 38, 0);
616	>	PathCompactPathEx(folder, data->saveDir.substr(0,
617	>	data->saveDir.length() - 1).c_str(), 38, 0);
618		SetDlgItemText(dialog, IDC_START_SAVE_TEXT, folder);
619		}
620		break;
#	Line 662 | Line 662 | INT_PTR ScanUtility::select(HWND dialog,
662		switch (ni->hdr.code)
663		{
664		case NM_DBLCLK:
665	+	if (ni->iItem != -1)
666		{
667		char scan[MAX_PATH];
668
#	Line 694 | Line 695 | INT_PTR ScanUtility::select(HWND dialog,
695		IDC_SELECT_SCANS), -1, LVNI_SELECTED);
696		char scan[MAX_PATH];
697
698	<	ListView_GetItemText(GetDlgItem(dialog, IDC_SELECT_SCANS),
699	<	index, 0, scan, MAX_PATH);
698	>	if (index != -1)
699	>	{
700	>	ListView_GetItemText(GetDlgItem(dialog,
701	>	IDC_SELECT_SCANS), index, 0, scan, MAX_PATH);
702	>	}
703	>	else
704	>	{
705	>	ListView_GetItemText(GetDlgItem(dialog,
706	>	IDC_SELECT_SCANS), 0, 0, scan, MAX_PATH);
707	>	}
708
709		data->scan = scan;
710		}
711
703	–	ListView_DeleteAllItems(GetDlgItem(dialog, IDC_SELECT_SCANS));
704	–
712		if (debug) cerr << "scan = " << data->scan << "\n";
713	+
714	+	ListView_DeleteAllItems(GetDlgItem(dialog, IDC_SELECT_SCANS));
715		break;
716		}
717		}
718		break;
719		case WM_CONTEXTMENU:
720	+	if (ListView_GetNextItem(GetDlgItem(dialog, IDC_SELECT_SCANS), -1,
721	+	LVNI_SELECTED) != -1)
722		{
723		char scan[MAX_PATH];
724		POINT spot;
#	Line 743 | Line 754 | INT_PTR ScanUtility::select(HWND dialog,
754		spot.x = rect.left;
755		spot.y = rect.top;
756		}
746	–	else
747	–	{
748	–	break;
749	–	}
757
758		ClientToScreen(GetDlgItem(dialog, IDC_SELECT_SCANS), &spot);
759

Diff Legend

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