Commit: 5054213b0bcac27cf73d6dd5fa7bf1d58c03d819 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revision: 5054213b0bcac27cf73d6dd5fa7bf1d58c03d819 (tree)
• Zeit: 2012-12-22 16:58:58
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Add options for displaying file permissions in numbers.

Ändern Zusammenfassung

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Resource/FFFTP.rc
• modified: Resource/resource.h
• modified: Resource_eng/FFFTP-eng.rc
• modified: Resource_eng/resource.h
• modified: common.h
• modified: filelist.c
• modified: main.c
• modified: mesg-eng.h
• modified: mesg-jpn.h
• modified: misc.c
• modified: option.c
• modified: registry.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
@@ -1283,7 +1283,7 @@ BEGIN
     PUSHBUTTON      "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,96,72,50,14
 END
 
-opt_disp_dlg DIALOG  0, 0, 211, 155
+opt_disp1_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -1449,6 +1449,13 @@ BEGIN
     CONTROL         "UTF-8 BOM",TRMODE4_UTF8BOM_CNV,"Button",BS_AUTORADIOBUTTON,12,69,81,10
 END
 
+opt_disp2_dlg DIALOG  0, 0, 211, 155
+STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+FONT 9, "MS Shell Dlg"
+BEGIN
+    CONTROL         "ƒtƒ@ƒCƒ‹‚Ì‘®«‚𐔎š‚Å•\Ž¦‚·‚é(&P)",DISP2_PERMIT_NUM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,196,10
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -2017,7 +2024,7 @@ BEGIN
         BOTTOMMARGIN, 86
     END
 
-    opt_disp_dlg, DIALOG
+    opt_disp1_dlg, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
@@ -2120,6 +2127,14 @@ BEGIN
         TOPMARGIN, 7
         BOTTOMMARGIN, 148
     END
+
+    opt_disp2_dlg, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 204
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 148
+    END
 END
 #endif    // APSTUDIO_INVOKED
 

--- a/Resource/resource.h
+++ b/Resource/resource.h
@@ -101,7 +101,7 @@
 #define rasreconnect_dlg                178
 #define dial_dlg                        179
 #define dial_password_dlg               180
-#define opt_disp_dlg                    181
+#define opt_disp1_dlg                   181
 #define bmark_edit_dlg                  182
 #define opt_tool_dlg1                   183
 #define IDD_OLEDRAG                     184
@@ -116,6 +116,7 @@
 #define updown_as_with_ext_dlg          193
 #define ini_from_reg_dlg                194
 #define opt_trmode4_dlg                 195
+#define opt_disp2_dlg                   196
 #define TRANS_TIME_BAR                  1002
 #define TRANS_TEXT                      1003
 #define TRANS_REMOTE                    1003
@@ -224,6 +225,7 @@
 #define SOUND_TRNNG                     1015
 #define TOOL_EDITOR1_BR                 1015
 #define CONNECT_CLOSE_NOTIFY            1015
+#define DISP2_PERMIT_NUM                1015
 #define PERM_O_EXEC                     1016
 #define TOOL_EDITOR2_BR                 1016
 #define CONNECT_QUICK_ANONY             1016
@@ -639,7 +641,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        196
+#define _APS_NEXT_RESOURCE_VALUE        197
 #define _APS_NEXT_COMMAND_VALUE         40177
 #define _APS_NEXT_CONTROL_VALUE         1220
 #define _APS_NEXT_SYMED_VALUE           101

--- a/Resource_eng/FFFTP-eng.rc
+++ b/Resource_eng/FFFTP-eng.rc
@@ -1309,7 +1309,7 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,96,63,50,14
 END
 
-opt_disp_dlg DIALOG  0, 0, 211, 155
+opt_disp1_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -1479,6 +1479,13 @@ BEGIN
     CONTROL         "UTF-8 BOM",TRMODE4_UTF8BOM_CNV,"Button",BS_AUTORADIOBUTTON,12,69,81,10
 END
 
+opt_disp2_dlg DIALOG  0, 0, 211, 155
+STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+FONT 9, "MS Shell Dlg"
+BEGIN
+    CONTROL         "Display file &permissions in numbers",DISP2_PERMIT_NUM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,196,10
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -2047,7 +2054,7 @@ BEGIN
         BOTTOMMARGIN, 78
     END
 
-    opt_disp_dlg, DIALOG
+    opt_disp1_dlg, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
@@ -2147,6 +2154,14 @@ BEGIN
         TOPMARGIN, 7
         BOTTOMMARGIN, 148
     END
+
+    opt_disp2_dlg, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 204
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 148
+    END
 END
 #endif    // APSTUDIO_INVOKED
 

--- a/Resource_eng/resource.h
+++ b/Resource_eng/resource.h
@@ -101,7 +101,7 @@
 #define rasreconnect_dlg                178
 #define dial_dlg                        179
 #define dial_password_dlg               180
-#define opt_disp_dlg                    181
+#define opt_disp1_dlg                   181
 #define bmark_edit_dlg                  182
 #define opt_tool_dlg1                   183
 #define IDD_OLEDRAG                     184
@@ -116,6 +116,7 @@
 #define updown_as_with_ext_dlg          193
 #define ini_from_reg_dlg                194
 #define opt_trmode4_dlg                 195
+#define opt_disp2_dlg                   196
 #define TRANS_TIME_BAR                  1002
 #define TRANS_TEXT                      1003
 #define TRANS_REMOTE                    1003
@@ -224,6 +225,7 @@
 #define SOUND_TRNNG                     1015
 #define TOOL_EDITOR1_BR                 1015
 #define CONNECT_CLOSE_NOTIFY            1015
+#define DISP2_PERMIT_NUM                1015
 #define PERM_O_EXEC                     1016
 #define TOOL_EDITOR2_BR                 1016
 #define CONNECT_QUICK_ANONY             1016
@@ -639,7 +641,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        196
+#define _APS_NEXT_RESOURCE_VALUE        197
 #define _APS_NEXT_COMMAND_VALUE         40177
 #define _APS_NEXT_CONTROL_VALUE         1220
 #define _APS_NEXT_SYMED_VALUE           101

--- a/common.h
+++ b/common.h
@@ -1830,7 +1830,9 @@ int TimeString2FileTime(char *Time, FILETIME *Buf);
 void FileTime2TimeString(FILETIME *Time, char *Buf, int Mode, int InfoExist, int ShowSeconds);
 void SpecificLocalFileTime2FileTime(FILETIME *Time, int TimeZone);
 int AttrString2Value(char *Str);
-void AttrValue2String(int Attr, char *Buf);
+// ファイルの属性を数字で表示
+//void AttrValue2String(int Attr, char *Buf);
+void AttrValue2String(int Attr, char *Buf, int ShowNumber);
 void FormatIniString(char *Str);
 int SelectFile(HWND hWnd, char *Fname, char *Title, char *Filters, char *Ext, int Flags, int Save);
 int SelectDir(HWND hWnd, char *Buf, int MaxLen);

--- a/filelist.c
+++ b/filelist.c
@@ -146,6 +146,8 @@ extern int MoveMode;
 extern int DispFileIcon;
 // タイムスタンプのバグ修正
 extern int DispTimeSeconds;
+// ファイルの属性を数字で表示
+extern int DispPermissionsNumber;
 
 /*===== ローカルなワーク =====*/
 
@@ -1820,7 +1822,9 @@ static void AddListView(HWND hWnd, int Pos, char *Name, int Type, LONGLONG Size,
 #else
 		if(InfoExist & FINFO_ATTR)
 #endif
-			AttrValue2String(Attr, Tmp);
+			// ファイルの属性を数字で表示
+//			AttrValue2String(Attr, Tmp);
+			AttrValue2String(Attr, Tmp, DispPermissionsNumber);
 		LvItem.mask = LVIF_TEXT;
 		LvItem.iItem = Pos;
 		LvItem.iSubItem = 4;

--- a/main.c
+++ b/main.c
@@ -248,6 +248,8 @@ BYTE SSLRootCAFileHash[20];
 int DispFileIcon = NO;
 // タイムスタンプのバグ修正
 int DispTimeSeconds = NO;
+// ファイルの属性を数字で表示
+int DispPermissionsNumber = NO;
 // ディレクトリ自動作成
 int MakeAllDir = YES;
 // UTF-8対応

--- a/mesg-eng.h
+++ b/mesg-eng.h
@@ -190,7 +190,7 @@
 #define MSGJPN189		_Tu8("Transfer3", "Transfer3")
 #define MSGJPN190		_Tu8("Mirroring", "Mirroring")
 #define MSGJPN191		_Tu8("Operation", "Operation")
-#define MSGJPN192		_Tu8("View", "View")
+#define MSGJPN192		_Tu8("View1", "View1")
 #define MSGJPN193		_Tu8("Connecting", "Connecting")
 #define MSGJPN194		_Tu8("Firewall", "Firewall")
 #define MSGJPN195		_Tu8("Tool", "Tool")
@@ -338,6 +338,7 @@
 #define MSGJPN337		_Tu8("Resume all later", "Resume all later")
 #define MSGJPN338		_Tu8("Skip all", "Skip all")
 #define MSGJPN339		_Tu8("Transfer4", "Transfer4")
+#define MSGJPN340		_Tu8("View2", "View2")
 #if defined(HAVE_TANDEM)
 #define MSGJPN2000		_Tu8("NonStop Server", "NonStop Server")
 #define MSGJPN2001		_Tu8("OSS<->GUARDIAN Switch(&O)", "OSS<->GUARDIAN Switch(&O)")

--- a/mesg-jpn.h
+++ b/mesg-jpn.h
@@ -190,7 +190,7 @@
 #define MSGJPN189		_Tu8("転送3", "\xE8\xBB\xA2\xE9\x80\x81\x33")
 #define MSGJPN190		_Tu8("ミラーリング", "\xE3\x83\x9F\xE3\x83\xA9\xE3\x83\xBC\xE3\x83\xAA\xE3\x83\xB3\xE3\x82\xB0")
 #define MSGJPN191		_Tu8("操作", "\xE6\x93\x8D\xE4\xBD\x9C")
-#define MSGJPN192		_Tu8("表示", "\xE8\xA1\xA8\xE7\xA4\xBA")
+#define MSGJPN192		_Tu8("表示1", "\xE8\xA1\xA8\xE7\xA4\xBA\x31")
 #define MSGJPN193		_Tu8("接続/切断", "\xE6\x8E\xA5\xE7\xB6\x9A/\xE5\x88\x87\xE6\x96\xAD")
 #define MSGJPN194		_Tu8("FireWall", "FireWall")
 #define MSGJPN195		_Tu8("ツール", "\xE3\x83\x84\xE3\x83\xBC\xE3\x83\xAB")
@@ -338,6 +338,7 @@
 #define MSGJPN337		_Tu8("全て後でリジューム", "\xE5\x85\xA8\xE3\x81\xA6\xE5\xBE\x8C\xE3\x81\xA7\xE3\x83\xAA\xE3\x82\xB8\xE3\x83\xA5\xE3\x83\xBC\xE3\x83\xA0")
 #define MSGJPN338		_Tu8("全てスキップ", "\xE5\x85\xA8\xE3\x81\xA6\xE3\x82\xB9\xE3\x82\xAD\xE3\x83\x83\xE3\x83\x97")
 #define MSGJPN339		_Tu8("転送4", "\xE8\xBB\xA2\xE9\x80\x81\x34")
+#define MSGJPN340		_Tu8("表示2", "\xE8\xA1\xA8\xE7\xA4\xBA\x32")
 #if defined(HAVE_TANDEM)
 #define MSGJPN2000		_Tu8("NonStop Server", "NonStop Server")
 #define MSGJPN2001		_Tu8("OSS<->GUARDIAN 切り替え(&O)", "OSS<->GUARDIAN \xE5\x88\x87\xE3\x82\x8A\xE6\x9B\xBF\xE3\x81\x88(&O)")

--- a/misc.c
+++ b/misc.c
@@ -1240,28 +1240,59 @@ int AttrString2Value(char *Str)
 
 	Ret = 0;
 	memset(Tmp, 0, 10);
-	strncpy(Tmp, Str, 9);
-
-	if(Tmp[0] != '-')
-		Ret |= 0x400;
-	if(Tmp[1] != '-')
-		Ret |= 0x200;
-	if(Tmp[2] != '-')
-		Ret |= 0x100;
-
-	if(Tmp[3] != '-')
-		Ret |= 0x40;
-	if(Tmp[4] != '-')
-		Ret |= 0x20;
-	if(Tmp[5] != '-')
-		Ret |= 0x10;
-
-	if(Tmp[6] != '-')
-		Ret |= 0x4;
-	if(Tmp[7] != '-')
-		Ret |= 0x2;
-	if(Tmp[8] != '-')
-		Ret |= 0x1;
+	// ファイルの属性を数字で表示
+//	strncpy(Tmp, Str, 9);
+//
+//	if(Tmp[0] != '-')
+//		Ret |= 0x400;
+//	if(Tmp[1] != '-')
+//		Ret |= 0x200;
+//	if(Tmp[2] != '-')
+//		Ret |= 0x100;
+//
+//	if(Tmp[3] != '-')
+//		Ret |= 0x40;
+//	if(Tmp[4] != '-')
+//		Ret |= 0x20;
+//	if(Tmp[5] != '-')
+//		Ret |= 0x10;
+//
+//	if(Tmp[6] != '-')
+//		Ret |= 0x4;
+//	if(Tmp[7] != '-')
+//		Ret |= 0x2;
+//	if(Tmp[8] != '-')
+//		Ret |= 0x1;
+	if(strlen(Str) >= 9)
+	{
+		strncpy(Tmp, Str, 9);
+
+		if(Tmp[0] != '-')
+			Ret |= 0x400;
+		if(Tmp[1] != '-')
+			Ret |= 0x200;
+		if(Tmp[2] != '-')
+			Ret |= 0x100;
+
+		if(Tmp[3] != '-')
+			Ret |= 0x40;
+		if(Tmp[4] != '-')
+			Ret |= 0x20;
+		if(Tmp[5] != '-')
+			Ret |= 0x10;
+
+		if(Tmp[6] != '-')
+			Ret |= 0x4;
+		if(Tmp[7] != '-')
+			Ret |= 0x2;
+		if(Tmp[8] != '-')
+			Ret |= 0x1;
+	}
+	else if(strlen(Str) >= 3)
+	{
+		strncpy(Tmp, Str, 3);
+		Ret = strtol(Tmp, NULL, 16);
+	}
 
 	return(Ret);
 }
@@ -1277,30 +1308,62 @@ int AttrString2Value(char *Str)
 *		int 値
 *----------------------------------------------------------------------------*/
 
-void AttrValue2String(int Attr, char *Buf)
+// ファイルの属性を数字で表示
+//void AttrValue2String(int Attr, char *Buf)
+void AttrValue2String(int Attr, char *Buf, int ShowNumber)
 {
-	strcpy(Buf, "---------");
-
-	if(Attr & 0x400)
-		Buf[0] = 'r';
-	if(Attr & 0x200)
-		Buf[1] = 'w';
-	if(Attr & 0x100)
-		Buf[2] = 'x';
-
-	if(Attr & 0x40)
-		Buf[3] = 'r';
-	if(Attr & 0x20)
-		Buf[4] = 'w';
-	if(Attr & 0x10)
-		Buf[5] = 'x';
-
-	if(Attr & 0x4)
-		Buf[6] = 'r';
-	if(Attr & 0x2)
-		Buf[7] = 'w';
-	if(Attr & 0x1)
-		Buf[8] = 'x';
+	// ファイルの属性を数字で表示
+//	strcpy(Buf, "---------");
+//
+//	if(Attr & 0x400)
+//		Buf[0] = 'r';
+//	if(Attr & 0x200)
+//		Buf[1] = 'w';
+//	if(Attr & 0x100)
+//		Buf[2] = 'x';
+//
+//	if(Attr & 0x40)
+//		Buf[3] = 'r';
+//	if(Attr & 0x20)
+//		Buf[4] = 'w';
+//	if(Attr & 0x10)
+//		Buf[5] = 'x';
+//
+//	if(Attr & 0x4)
+//		Buf[6] = 'r';
+//	if(Attr & 0x2)
+//		Buf[7] = 'w';
+//	if(Attr & 0x1)
+//		Buf[8] = 'x';
+	if(ShowNumber == YES)
+	{
+		sprintf(Buf, "%03x", Attr);
+	}
+	else
+	{
+		strcpy(Buf, "---------");
+
+		if(Attr & 0x400)
+			Buf[0] = 'r';
+		if(Attr & 0x200)
+			Buf[1] = 'w';
+		if(Attr & 0x100)
+			Buf[2] = 'x';
+
+		if(Attr & 0x40)
+			Buf[3] = 'r';
+		if(Attr & 0x20)
+			Buf[4] = 'w';
+		if(Attr & 0x10)
+			Buf[5] = 'x';
+
+		if(Attr & 0x4)
+			Buf[6] = 'r';
+		if(Attr & 0x2)
+			Buf[7] = 'w';
+		if(Attr & 0x1)
+			Buf[8] = 'x';
+	}
 
 	return;
 }

--- a/option.c
+++ b/option.c
@@ -66,12 +66,14 @@ static INT_PTR CALLBACK DefAttrDlgProc(HWND hDlg, UINT message, WPARAM wParam, L
 static void AddFnameAttrToListView(HWND hDlg, char *Fname, char *Attr);
 static void GetFnameAttrFromListView(HWND hDlg, char *Buf);
 // 64ビット対応
+// ファイルの属性を数字で表示
 //static BOOL CALLBACK MirrorSettingProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 //static BOOL CALLBACK NotifySettingProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 //static BOOL CALLBACK DispSettingProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 static INT_PTR CALLBACK MirrorSettingProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 static INT_PTR CALLBACK NotifySettingProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
-static INT_PTR CALLBACK DispSettingProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+static INT_PTR CALLBACK Disp1SettingProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+static INT_PTR CALLBACK Disp2SettingProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 static int SelectListFont(HWND hWnd, LOGFONT *lFont);
 // 64ビット対応
 //static BOOL CALLBACK ConnectSettingProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
@@ -172,6 +174,8 @@ extern int FolderAttrNum;
 extern int DispFileIcon;
 // タイムスタンプのバグ修正
 extern int DispTimeSeconds;
+// ファイルの属性を数字で表示
+extern int DispPermissionsNumber;
 // ディレクトリ自動作成
 extern int MakeAllDir;
 
@@ -189,7 +193,7 @@ void SetOption(int Start)
 {
 	// UTF-8対応
 //	PROPSHEETPAGE psp[12];
-	PROPSHEETPAGE psp[13];
+	PROPSHEETPAGE psp[14];
 	PROPSHEETHEADER psh;
 
 	// 変数が未初期化のバグ修正
@@ -350,9 +354,9 @@ void SetOption(int Start)
 	psp[7].dwSize = sizeof(PROPSHEETPAGE);
 	psp[7].dwFlags = PSP_USETITLE | PSP_HASHELP;
 	psp[7].hInstance = GetFtpInst();
-	psp[7].pszTemplate = MAKEINTRESOURCE(opt_disp_dlg);
+	psp[7].pszTemplate = MAKEINTRESOURCE(opt_disp1_dlg);
 	psp[7].pszIcon = NULL;
-	psp[7].pfnDlgProc = DispSettingProc;
+	psp[7].pfnDlgProc = Disp1SettingProc;
 	psp[7].pszTitle = MSGJPN192;
 	psp[7].lParam = 0;
 	psp[7].pfnCallback = NULL;
@@ -360,53 +364,63 @@ void SetOption(int Start)
 	psp[8].dwSize = sizeof(PROPSHEETPAGE);
 	psp[8].dwFlags = PSP_USETITLE | PSP_HASHELP;
 	psp[8].hInstance = GetFtpInst();
-	psp[8].pszTemplate = MAKEINTRESOURCE(opt_connect_dlg);
+	psp[8].pszTemplate = MAKEINTRESOURCE(opt_disp2_dlg);
 	psp[8].pszIcon = NULL;
-	psp[8].pfnDlgProc = ConnectSettingProc;
-	psp[8].pszTitle = MSGJPN193;
+	psp[8].pfnDlgProc = Disp2SettingProc;
+	psp[8].pszTitle = MSGJPN340;
 	psp[8].lParam = 0;
 	psp[8].pfnCallback = NULL;
 
 	psp[9].dwSize = sizeof(PROPSHEETPAGE);
 	psp[9].dwFlags = PSP_USETITLE | PSP_HASHELP;
 	psp[9].hInstance = GetFtpInst();
-	psp[9].pszTemplate = MAKEINTRESOURCE(opt_fire_dlg);
+	psp[9].pszTemplate = MAKEINTRESOURCE(opt_connect_dlg);
 	psp[9].pszIcon = NULL;
-	psp[9].pfnDlgProc = FireSettingProc;
-	psp[9].pszTitle = MSGJPN194;
+	psp[9].pfnDlgProc = ConnectSettingProc;
+	psp[9].pszTitle = MSGJPN193;
 	psp[9].lParam = 0;
 	psp[9].pfnCallback = NULL;
 
 	psp[10].dwSize = sizeof(PROPSHEETPAGE);
 	psp[10].dwFlags = PSP_USETITLE | PSP_HASHELP;
 	psp[10].hInstance = GetFtpInst();
-	psp[10].pszTemplate = MAKEINTRESOURCE(opt_tool_dlg);
+	psp[10].pszTemplate = MAKEINTRESOURCE(opt_fire_dlg);
 	psp[10].pszIcon = NULL;
-	psp[10].pfnDlgProc = ToolSettingProc;
-	psp[10].pszTitle = MSGJPN195;
+	psp[10].pfnDlgProc = FireSettingProc;
+	psp[10].pszTitle = MSGJPN194;
 	psp[10].lParam = 0;
 	psp[10].pfnCallback = NULL;
 
 	psp[11].dwSize = sizeof(PROPSHEETPAGE);
 	psp[11].dwFlags = PSP_USETITLE | PSP_HASHELP;
 	psp[11].hInstance = GetFtpInst();
-	psp[11].pszTemplate = MAKEINTRESOURCE(opt_sound_dlg);
+	psp[11].pszTemplate = MAKEINTRESOURCE(opt_tool_dlg);
 	psp[11].pszIcon = NULL;
-	psp[11].pfnDlgProc = SoundSettingProc;
-	psp[11].pszTitle = MSGJPN196;
+	psp[11].pfnDlgProc = ToolSettingProc;
+	psp[11].pszTitle = MSGJPN195;
 	psp[11].lParam = 0;
 	psp[11].pfnCallback = NULL;
 
 	psp[12].dwSize = sizeof(PROPSHEETPAGE);
 	psp[12].dwFlags = PSP_USETITLE | PSP_HASHELP;
 	psp[12].hInstance = GetFtpInst();
-	psp[12].pszTemplate = MAKEINTRESOURCE(opt_misc_dlg);
+	psp[12].pszTemplate = MAKEINTRESOURCE(opt_sound_dlg);
 	psp[12].pszIcon = NULL;
-	psp[12].pfnDlgProc = MiscSettingProc;
-	psp[12].pszTitle = MSGJPN197;
+	psp[12].pfnDlgProc = SoundSettingProc;
+	psp[12].pszTitle = MSGJPN196;
 	psp[12].lParam = 0;
 	psp[12].pfnCallback = NULL;
 
+	psp[13].dwSize = sizeof(PROPSHEETPAGE);
+	psp[13].dwFlags = PSP_USETITLE | PSP_HASHELP;
+	psp[13].hInstance = GetFtpInst();
+	psp[13].pszTemplate = MAKEINTRESOURCE(opt_misc_dlg);
+	psp[13].pszIcon = NULL;
+	psp[13].pfnDlgProc = MiscSettingProc;
+	psp[13].pszTitle = MSGJPN197;
+	psp[13].lParam = 0;
+	psp[13].pfnCallback = NULL;
+
 	psh.dwSize = sizeof(PROPSHEETHEADER);
 	psh.dwFlags = PSH_HASHELP | PSH_NOAPPLYNOW | PSH_PROPSHEETPAGE;
 	psh.hwndParent = GetMainHwnd();
@@ -1111,8 +1125,9 @@ static INT_PTR CALLBACK NotifySettingProc(HWND hDlg, UINT message, WPARAM wParam
 *----------------------------------------------------------------------------*/
 
 // 64ビット対応
+// ファイルの属性を数字で表示
 //static BOOL CALLBACK DispSettingProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
-static INT_PTR CALLBACK DispSettingProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK Disp1SettingProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
 	NMHDR *pnmhdr;
 	static LOGFONT TmpFont;
@@ -1172,6 +1187,40 @@ static INT_PTR CALLBACK DispSettingProc(HWND hDlg, UINT message, WPARAM wParam,
 }
 
 
+// ファイルの属性を数字で表示
+static INT_PTR CALLBACK Disp2SettingProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
+{
+	NMHDR *pnmhdr;
+	static LOGFONT TmpFont;
+
+	switch (message)
+	{
+		case WM_INITDIALOG :
+			SendDlgItemMessage(hDlg, DISP2_PERMIT_NUM, BM_SETCHECK, DispPermissionsNumber, 0);
+		    return(TRUE);
+
+		case WM_NOTIFY:
+			pnmhdr = (NMHDR FAR *)lParam;
+			switch(pnmhdr->code)
+			{
+				case PSN_APPLY :
+					DispPermissionsNumber = SendDlgItemMessage(hDlg, DISP2_PERMIT_NUM, BM_GETCHECK, 0, 0);
+					break;
+
+				case PSN_RESET :
+					break;
+
+				case PSN_HELP :
+					// TODO:
+//					hHelpWin = HtmlHelp(NULL, AskHelpFilePath(), HH_HELP_CONTEXT, IDH_HELP_TOPIC_0000047);
+					break;
+			}
+			break;
+	}
+    return(FALSE);
+}
+
+
 /*----- フォントを選ぶ --------------------------------------------------------
 *
 *	Parameter

--- a/registry.c
+++ b/registry.c
@@ -197,6 +197,8 @@ extern BYTE SSLRootCAFileHash[20];
 extern int DispFileIcon;
 // タイムスタンプのバグ修正
 extern int DispTimeSeconds;
+// ファイルの属性を数字で表示
+extern int DispPermissionsNumber;
 // ディレクトリ自動作成
 extern int MakeAllDir;
 // UTF-8対応
@@ -629,6 +631,8 @@ void SaveRegistry(void)
 				WriteIntValueToReg(hKey4, "ListIcon", DispFileIcon);
 				// タイムスタンプのバグ修正
 				WriteIntValueToReg(hKey4, "ListSecond", DispTimeSeconds);
+				// ファイルの属性を数字で表示
+				WriteIntValueToReg(hKey4, "ListPermitNum", DispPermissionsNumber);
 				// ディレクトリ自動作成
 				WriteIntValueToReg(hKey4, "MakeDir", MakeAllDir);
 				// UTF-8対応
@@ -1037,6 +1041,8 @@ int LoadRegistry(void)
 			ReadIntValueFromReg(hKey4, "ListIcon", &DispFileIcon);
 			// タイムスタンプのバグ修正
 			ReadIntValueFromReg(hKey4, "ListSecond", &DispTimeSeconds);
+			// ファイルの属性を数字で表示
+			ReadIntValueFromReg(hKey4, "ListPermitNum", &DispPermissionsNumber);
 			// ディレクトリ自動作成
 			ReadIntValueFromReg(hKey4, "MakeDir", &MakeAllDir);
 			// UTF-8対応