Commit: 2bffe82de6811b380d280099f638dd7b4cbb3404 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revision: 2bffe82de6811b380d280099f638dd7b4cbb3404 (tree)
• Zeit: 2012-02-11 17:24:12
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of displaying icons in the local file list.

Ändern Zusammenfassung

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Resource/FFFTP.rc
• add: Resource/list_16.bmp
• modified: Resource/list_bmp.bmp
• modified: Resource/resource.h
• modified: Resource_eng/FFFTP-eng.rc
• add: Resource_eng/list_16.bmp
• modified: Resource_eng/list_bmp.bmp
• modified: Resource_eng/resource.h
• modified: filelist.c

Diff

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

--- a/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -73,6 +73,7 @@ main_toolbar_bmp        BITMAP                  "toolbar1.bmp"
 remote_toolbar_bmp      BITMAP                  "main_too.bmp"
 dirattr_bmp             BITMAP                  "list_bmp.bmp"
 hlist_bmp               BITMAP                  "bitmap1.bmp"
+dirattr16_bmp           BITMAP                  "list_16.bmp"
 
 /////////////////////////////////////////////////////////////////////////////
 //

Binary files /dev/null and b/Resource/list_16.bmp differ

Binary files a/Resource/list_bmp.bmp and b/Resource/list_bmp.bmp differ

--- a/Resource/resource.h
+++ b/Resource/resource.h
@@ -20,6 +20,7 @@
 #define rename_dlg                      110
 #define hlist_bmp                       110
 #define delete_dlg                      111
+#define dirattr16_bmp                   111
 #define hostlist_dlg                    112
 #define hostset_dlg                     113
 #define hset_main_dlg                   113

--- a/Resource_eng/FFFTP-eng.rc
+++ b/Resource_eng/FFFTP-eng.rc
@@ -73,6 +73,7 @@ main_toolbar_bmp        BITMAP                  "toolbar1.bmp"
 remote_toolbar_bmp      BITMAP                  "main_too.bmp"
 dirattr_bmp             BITMAP                  "list_bmp.bmp"
 hlist_bmp               BITMAP                  "bitmap1.bmp"
+dirattr16_bmp           BITMAP                  "list_16.bmp"
 
 /////////////////////////////////////////////////////////////////////////////
 //

Binary files /dev/null and b/Resource_eng/list_16.bmp differ

Binary files a/Resource_eng/list_bmp.bmp and b/Resource_eng/list_bmp.bmp differ

--- a/Resource_eng/resource.h
+++ b/Resource_eng/resource.h
@@ -20,6 +20,7 @@
 #define rename_dlg                      110
 #define hlist_bmp                       110
 #define delete_dlg                      111
+#define dirattr16_bmp                   111
 #define hostlist_dlg                    112
 #define hostset_dlg                     113
 #define hset_main_dlg                   113

--- a/filelist.c
+++ b/filelist.c
@@ -147,6 +147,8 @@ static WNDPROC LocalProcPtr;
 static WNDPROC RemoteProcPtr;
 
 static HIMAGELIST ListImg = NULL;
+// ファイルアイコン表示対応
+static HIMAGELIST ListImgFileIcon = NULL;
 
 static char FindStr[40+1] = { "*" };		/* 検索文字列 */
 static int IgnoreNew = NO;
@@ -1340,22 +1342,22 @@ void RefreshIconImageList(FLISTANCHOR *Anchor)
 	int i;
 	char Cur[FMAX_PATH+1];
 	SHFILEINFO FileInfo;
-	SendMessage(hWndListLocal, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)NULL);
-	ShowWindow(hWndListLocal, SW_SHOW);
-	SendMessage(hWndListRemote, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)NULL);
-	ShowWindow(hWndListRemote, SW_SHOW);
-	ImageList_Destroy(ListImg);
-	ListImg = ImageList_Create(16, 16, ILC_MASK | ILC_COLOR24, 0, 1);
-	hBitmap = LoadBitmap(GetFtpInst(), MAKEINTRESOURCE(dirattr_bmp));
-	ImageList_AddMasked(ListImg, hBitmap, RGB(255,0,0));
-	DeleteObject(hBitmap);
-	ImageId = 0;
-	Pos = Anchor->Top;
-	for(i = 0; i < Anchor->Files; i++)
+	if(AskDispFileIcon() == YES)
 	{
-		Pos->ImageId = -1;
-		if(AskDispFileIcon() == YES)
+		SendMessage(hWndListLocal, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)NULL);
+		ShowWindow(hWndListLocal, SW_SHOW);
+		SendMessage(hWndListRemote, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)NULL);
+		ShowWindow(hWndListRemote, SW_SHOW);
+		ImageList_Destroy(ListImgFileIcon);
+		ListImgFileIcon = ImageList_Create(16, 16, ILC_MASK | ILC_COLOR32, 0, 1);
+		hBitmap = LoadBitmap(GetFtpInst(), MAKEINTRESOURCE(dirattr16_bmp));
+		ImageList_AddMasked(ListImgFileIcon, hBitmap, RGB(255, 0, 0));
+		DeleteObject(hBitmap);
+		ImageId = 0;
+		Pos = Anchor->Top;
+		for(i = 0; i < Anchor->Files; i++)
 		{
+			Pos->ImageId = -1;
 			if(Pos->Node == NODE_DRIVE)
 				strcpy(Cur, Pos->File);
 			else
@@ -1366,20 +1368,27 @@ void RefreshIconImageList(FLISTANCHOR *Anchor)
 			}
 			if(SHGetFileInfoM(Cur, 0, &FileInfo, sizeof(SHFILEINFO), SHGFI_SMALLICON | SHGFI_ICON) != 0)
 			{
-				if(ImageList_AddIcon(ListImg, FileInfo.hIcon) >= 0)
+				if(ImageList_AddIcon(ListImgFileIcon, FileInfo.hIcon) >= 0)
 				{
 					Pos->ImageId = ImageId;
 					ImageId++;
 				}
 				DestroyIcon(FileInfo.hIcon);
 			}
+			Pos = Pos->Next;
 		}
-		Pos = Pos->Next;
+		SendMessage(hWndListLocal, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)ListImgFileIcon);
+		ShowWindow(hWndListLocal, SW_SHOW);
+		SendMessage(hWndListRemote, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)ListImgFileIcon);
+		ShowWindow(hWndListRemote, SW_SHOW);
+	}
+	else
+	{
+		SendMessage(hWndListLocal, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)ListImg);
+		ShowWindow(hWndListLocal, SW_SHOW);
+		SendMessage(hWndListRemote, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)ListImg);
+		ShowWindow(hWndListRemote, SW_SHOW);
 	}
-	SendMessage(hWndListLocal, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)ListImg);
-	ShowWindow(hWndListLocal, SW_SHOW);
-	SendMessage(hWndListRemote, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)ListImg);
-	ShowWindow(hWndListRemote, SW_SHOW);
 }
 
 void GetLocalDirForWnd(void)
@@ -1695,8 +1704,8 @@ static void AddListView(HWND hWnd, int Pos, char *Name, int Type, LONGLONG Size,
 	else
 		LvItem.iImage = 4;
 	// ファイルアイコン表示対応
-	if(hWnd == GetLocalHwnd() && ImageId >= 0)
-		LvItem.iImage = 5 + ImageId;
+	if(AskDispFileIcon() == YES && hWnd == GetLocalHwnd())
+		LvItem.iImage = ImageId + 5;
 	LvItem.iItem = SendMessage(hWnd, LVM_INSERTITEM, 0, (LPARAM)&LvItem);
 
 	/* 日付/時刻 */