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 283 by douglas, 2003-08-28T21:16:30-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.12 2003/08/29 04:16:30 douglas Exp $
5	>	// $Id: ScanUtility.cxx,v 1.13 2003/09/02 06:05:56 douglas Exp $
6
7		#include "ScanUtility.h"
8
#	Line 473 | Line 473 | int ScanUtility::browse(HWND dialog, UIN
473		break;
474		case BFFM_SELCHANGED:
475		{
476	<	IShellFolder* object;
476	>	SHFILEINFO info;
477
478	<	SHGetDesktopFolder(&object);
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	<	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));
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 539 | Line 537 | INT_PTR ScanUtility::start(HWND dialog,
537		SHGetFileInfo(data->scanDir.c_str(), 0, &info,
538		sizeof(info), SHGFI_ICONLOCATION);
539
540	<	HICON icon = ExtractAssociatedIcon(gui.instance,
541	<	info.szDisplayName, LPWORD(&info.iIcon));
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 = ExtractAssociatedIcon(gui.instance,
549	<	info.szDisplayName, LPWORD(&info.iIcon));
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));
#	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 604 | Line 602 | INT_PTR ScanUtility::start(HWND dialog,
602		SHGetFileInfo(data->saveDir.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_SAVE_ICON, STM_SETIMAGE,
609		IMAGE_ICON, LPARAM(icon));
#	Line 662 | 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 694 | 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
703	–	ListView_DeleteAllItems(GetDlgItem(dialog, IDC_SELECT_SCANS));
704	–
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 743 | Line 752 | INT_PTR ScanUtility::select(HWND dialog,
752		spot.x = rect.left;
753		spot.y = rect.top;
754		}
746	–	else
747	–	{
748	–	break;
749	–	}
755
756		ClientToScreen(GetDlgItem(dialog, IDC_SELECT_SCANS), &spot);
757

Diff Legend

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