Revision: 7738 https://osdn.net/projects/ttssh2/scm/svn/commits/7738 Author: maya Date: 2019-06-06 21:00:59 +0900 (Thu, 06 Jun 2019) Log Message: ----------- About ダイアログの記述内容を調整 表示順を調整・インデントを追加 Modified Paths: -------------- trunk/teraterm/ttpdlg/dlg_res.h trunk/teraterm/ttpdlg/ttpdlg.rc trunk/ttssh2/ttxssh/resource.h trunk/ttssh2/ttxssh/ttxssh.c trunk/ttssh2/ttxssh/ttxssh.rc -------------- next part -------------- Modified: trunk/teraterm/ttpdlg/dlg_res.h =================================================================== --- trunk/teraterm/ttpdlg/dlg_res.h 2019-06-06 11:49:30 UTC (rev 7737) +++ trunk/teraterm/ttpdlg/dlg_res.h 2019-06-06 12:00:59 UTC (rev 7738) @@ -126,13 +126,13 @@ #define IDC_FORUM_LABEL 1029 #define IDC_FORUM_URL 1030 #define IDC_ONIGURUMA_LABEL 1031 -#define IDC_RIGHTS_LABEL 1032 +#define IDC_IPV6_LABEL 1032 #define IDC_PROJECT_LABEL 1033 -#define IDC_TERANISHI_LABEL 1034 +#define IDC_TT23_RIGHTS_LABEL 1034 #define IDC_TT_PRO 1035 #define IDC_INLUCDE_LABEL 1036 #define IDC_TT23_LABEL 1037 -#define IDC_TT23DATE_LABEL 1038 +#define IDC_IPV6_RIGHTS_LABEL 1038 #define IDC_AUTHOR_LABEL 1039 #define IDC_TT_ICON 1040 #define IDC_DIRCURRENT_LABEL 1041 Modified: trunk/teraterm/ttpdlg/ttpdlg.rc =================================================================== --- trunk/teraterm/ttpdlg/ttpdlg.rc 2019-06-06 11:49:30 UTC (rev 7737) +++ trunk/teraterm/ttpdlg/ttpdlg.rc 2019-06-06 12:00:59 UTC (rev 7738) @@ -223,23 +223,25 @@ FONT 14, "System", 0, 0, 0x0 BEGIN ICON "",IDC_TT_ICON,6,9,20,20 - CONTROL "Tera Term",IDC_TT_PRO,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,4,78,8 - LTEXT "Version",IDC_TT_VERSION,38,13,101,8 - LTEXT "Includes:",IDC_INLUCDE_LABEL,38,29,31,8 - LTEXT "Oniguruma: ",IDC_ONIGURUMA_LABEL,38,38,114,8 - CONTROL "Tera Term Pro version 2.3 + IPv6 0.81",IDC_TT23_LABEL, - "Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,47,137,8 - CONTROL "Mar 10, 1998 T. Teranishi",IDC_TT23DATE_LABEL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,56,90,8 - CONTROL "Copyright (C) 1994-1998 T. Teranishi",IDC_TERANISHI_LABEL, - "Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,65,134,8 + CONTROL "Tera Term",IDC_TT_PRO,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,4,100,8 + LTEXT "Version",IDC_TT_VERSION,38,13,100,8 CONTROL "(C) 2004-2019 TeraTerm Project",IDC_PROJECT_LABEL, - "Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,74,122,8 - CONTROL "All Rights Reserved.",IDC_RIGHTS_LABEL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,83,76,8 + "Static",SS_LEFTNOWORDWRAP | WS_GROUP,43,22,135,8 + LTEXT "Includes:",IDC_INLUCDE_LABEL,38,38,140,8 + CONTROL "Tera Term Pro version 2.3",IDC_TT23_LABEL, + "Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,47,140,8 + CONTROL "Copyright (C) 1994-1998 T. Teranishi",IDC_TT23_RIGHTS_LABEL, + "Static",SS_LEFTNOWORDWRAP | WS_GROUP,43,56,135,8 + CONTROL "IPv6 extention version 0.81",IDC_IPV6_LABEL, + "Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,65,140,8 + CONTROL "(C) 2000-2003 Jun-ya KATO",IDC_IPV6_RIGHTS_LABEL, + "Static",SS_LEFTNOWORDWRAP | WS_GROUP,43,74,135,8 + LTEXT "Oniguruma: ",IDC_ONIGURUMA_LABEL,38,83,140,8 LTEXT "Built using Microsoft Visual C++",IDC_BUILDTOOL,7,95,172,8 - LTEXT "Build time: ",IDC_BUILDTIME,7,103,165,8 + LTEXT "Build time: ",IDC_BUILDTIME,7,103,172,8 LTEXT "Author:",IDC_AUTHOR_LABEL,7,112,28,8 - LTEXT "https://ttssh2.osdn.jp/",IDC_AUTHOR_URL,36,112,128,8,SS_NOTIFY | WS_TABSTOP - DEFPUSHBUTTON "OK",IDOK,145,9,32,14,WS_GROUP + LTEXT "https://ttssh2.osdn.jp/",IDC_AUTHOR_URL,36,112,143,8,SS_NOTIFY | WS_TABSTOP + DEFPUSHBUTTON "OK",IDOK,145,5,32,14,WS_GROUP END IDD_GENDLG DIALOGEX 20, 20, 162, 80 Modified: trunk/ttssh2/ttxssh/resource.h =================================================================== --- trunk/ttssh2/ttxssh/resource.h 2019-06-06 11:49:30 UTC (rev 7737) +++ trunk/ttssh2/ttxssh/resource.h 2019-06-06 12:00:59 UTC (rev 7738) @@ -126,7 +126,7 @@ #define IDC_ADDKEY_EDIT 1069 #define IDC_STATIC1 1070 #define IDC_COMPRESSLABEL 1070 -#define IDC_SSHVERSIONS 1070 +#define IDC_TTSSH_RIGHTS 1070 #define IDC_STATIC2 1071 #define IDC_COMPRESSNONE 1071 #define IDC_STATIC3 1072 Modified: trunk/ttssh2/ttxssh/ttxssh.c =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.c 2019-06-06 11:49:30 UTC (rev 7737) +++ trunk/ttssh2/ttxssh/ttxssh.c 2019-06-06 12:00:59 UTC (rev 7738) @@ -2370,7 +2370,7 @@ // TTSSH\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x90ݒ肷\x82\xE9 (2005.2.28 yutaka) _snprintf_s(buf, sizeof(buf), _TRUNCATE, - "TTSSH\r\nTera Term Secure Shell extension, %d.%d", TTSSH_VERSION_MAJOR, TTSSH_VERSION_MINOR); + "TTSSH\r\nTera Term Secure Shell extension, %d.%d\r\nCompatible with SSH protocol version 1.5 and 2.0", TTSSH_VERSION_MAJOR, TTSSH_VERSION_MINOR); SendMessage(GetDlgItem(dlg, IDC_TTSSH_VERSION), WM_SETTEXT, 0, (LPARAM)buf); // OpenSSL\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x90ݒ肷\x82\xE9 (2005.1.24 yutaka) Modified: trunk/ttssh2/ttxssh/ttxssh.rc =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.rc 2019-06-06 11:49:30 UTC (rev 7737) +++ trunk/ttssh2/ttxssh/ttxssh.rc 2019-06-06 12:00:59 UTC (rev 7738) @@ -19,8 +19,10 @@ // \x89p\x8C\xEA (\x95č\x91) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) +#endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// // @@ -32,10 +34,10 @@ CAPTION "About TTSSH" FONT 8, "Tahoma", 0, 0, 0x0 BEGIN - LTEXT "Tera Term Secure Shell extension, ",IDC_TTSSH_VERSION,6,7,220,15 + LTEXT "TTSSH\r\nTera Term Secure Shell extension,\r\nCompatible with SSH protocol version 1.5 and 2.0",IDC_TTSSH_VERSION,6,7,220,24 ICON "",IDC_TTSSH_ICON,248,7,20,20 - LTEXT "Compatible with SSH protocol version 1.5 and 2.0",IDC_SSHVERSIONS,6,23,206,11 - LTEXT "Includes:\r\nTTSSH 1.5.4, (C) 1998-2001 Robert O'Callahan roc+t****@cs*****\r\nIPv6 extention version 0.81, (C) 2000-2003 Jun-ya KATO kato****@win6*****\r\nSSH2 support, (C) 2004-2019 TeraTerm Project",IDC_INCLUDES,6,36,262,34 + LTEXT "(C) 2004-2019 TeraTerm Project",IDC_TTSSH_RIGHTS,11,32,206,8 + LTEXT "Includes:\r\nTTSSH 1.5.4, (C) 1998-2001 Robert O'Callahan roc+t****@cs*****\r\nIPv6 extention version 0.81, (C) 2000-2003 Jun-ya KATO kato****@win6*****",IDC_INCLUDES,6,45,262,24 LTEXT "OpenSSL:",IDC_OPENSSL_VERSION,6,69,175,8 LTEXT "zlib:",IDC_ZLIB_VERSION,6,78,175,8 LTEXT "PuTTY:",IDC_PUTTY_VERSION,6,87,175,8 @@ -448,7 +450,7 @@ // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO +GUIDELINES DESIGNINFO BEGIN IDD_ABOUTDIALOG, DIALOG BEGIN @@ -643,27 +645,23 @@ // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. IDI_SECURETT ICON "ttsecure.ico" - IDI_SECURETT_GREEN ICON "ttsecure_green.ico" - IDI_SECURETT_YELLOW ICON "ttsecure_yellow.ico" - IDI_DROPDOWN ICON "dropdown.ico" - ///////////////////////////////////////////////////////////////////////////// // // AFX_DIALOG_LAYOUT // -IDD_SSHAUTH AFX_DIALOG_LAYOUT +IDD_SSHAUTH AFX_DIALOG_LAYOUT BEGIN - 0 + 0x0000 END -IDD_SSHAUTHSETUP AFX_DIALOG_LAYOUT +IDD_SSHAUTHSETUP AFX_DIALOG_LAYOUT BEGIN - 0 + 0x0000 END #endif // \x89p\x8C\xEA (\x95č\x91) resources