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 282 by douglas, 2003-08-25T23:41:12-07:00 vs.
Revision 283 by douglas, 2003-08-28T21:16:30-07:00

#	Line 2 | Line 2
2		//
3		// Douglas Thrift
4		//
5	<	// $Id: ScanUtility.cxx,v 1.11 2003/08/26 06:41:12 douglas Exp $
5	>	// $Id: ScanUtility.cxx,v 1.12 2003/08/29 04:16:30 douglas Exp $
6
7		#include "ScanUtility.h"
8
#	Line 534 | Line 534 | INT_PTR ScanUtility::start(HWND dialog,
534		PSWIZB_NEXT);
535
536		{
537	<	char folder[44];
537	>	SHFILEINFO info;
538
539	<	PathCompactPathEx(folder, data->scanDir.c_str(), 44, 0);
539	>	SHGetFileInfo(data->scanDir.c_str(), 0, &info,
540	>	sizeof(info), SHGFI_ICONLOCATION);
541	>
542	>	HICON icon = ExtractAssociatedIcon(gui.instance,
543	>	info.szDisplayName, LPWORD(&info.iIcon));
544	>
545	>	SendDlgItemMessage(dialog, IDC_START_SCAN_ICON,
546	>	STM_SETIMAGE, IMAGE_ICON, LPARAM(icon));
547	>	SHGetFileInfo(data->saveDir.c_str(), 0, &info,
548	>	sizeof(info), SHGFI_ICONLOCATION);
549	>
550	>	icon = ExtractAssociatedIcon(gui.instance,
551	>	info.szDisplayName, LPWORD(&info.iIcon));
552	>
553	>	SendDlgItemMessage(dialog, IDC_START_SAVE_ICON,
554	>	STM_SETIMAGE, IMAGE_ICON, LPARAM(icon));
555	>	}
556	>
557	>	{
558	>	char folder[38];
559	>
560	>	PathCompactPathEx(folder, data->scanDir.c_str(), 38, 0);
561		SetDlgItemText(dialog, IDC_START_SCAN_TEXT, folder);
562	<	PathCompactPathEx(folder, data->saveDir.c_str(), 44, 0);
562	>	PathCompactPathEx(folder, data->saveDir.c_str(), 38, 0);
563		SetDlgItemText(dialog, IDC_START_SAVE_TEXT, folder);
564		}
565		break;
#	Line 553 | Line 574 | INT_PTR ScanUtility::start(HWND dialog,
574		{
575		case IDC_START_SCAN_BROWSE:
576		data->setScanDir(dialog);
577	+
578	+	{
579	+	SHFILEINFO info;
580	+
581	+	SHGetFileInfo(data->scanDir.c_str(), 0, &info, sizeof(info),
582	+	SHGFI_ICONLOCATION);
583	+
584	+	HICON icon = ExtractAssociatedIcon(gui.instance,
585	+	info.szDisplayName, LPWORD(&info.iIcon));
586	+
587	+	SendDlgItemMessage(dialog, IDC_START_SCAN_ICON, STM_SETIMAGE,
588	+	IMAGE_ICON, LPARAM(icon));
589	+	}
590	+
591		{
592	<	char folder[44];
592	>	char folder[38];
593
594	<	PathCompactPathEx(folder, data->scanDir.c_str(), 44, 0);
594	>	PathCompactPathEx(folder, data->scanDir.c_str(), 38, 0);
595		SetDlgItemText(dialog, IDC_START_SCAN_TEXT, folder);
596		}
597		break;
598		case IDC_START_SAVE_BROWSE:
599		data->setSaveDir(dialog);
600	+
601	+	{
602	+	SHFILEINFO info;
603	+
604	+	SHGetFileInfo(data->saveDir.c_str(), 0, &info, sizeof(info),
605	+	SHGFI_ICONLOCATION);
606	+
607	+	HICON icon = ExtractAssociatedIcon(gui.instance,
608	+	info.szDisplayName, LPWORD(&info.iIcon));
609	+
610	+	SendDlgItemMessage(dialog, IDC_START_SAVE_ICON, STM_SETIMAGE,
611	+	IMAGE_ICON, LPARAM(icon));
612	+	}
613	+
614		{
615	<	char folder[44];
615	>	char folder[38];
616
617	<	PathCompactPathEx(folder, data->saveDir.c_str(), 44, 0);
617	>	PathCompactPathEx(folder, data->saveDir.c_str(), 38, 0);
618		SetDlgItemText(dialog, IDC_START_SAVE_TEXT, folder);
619		}
620		break;

Diff Legend

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