Tera TermRevision: 8058
https://osdn.net/projects/ttssh2/scm/svn/commits/8058
Author: yutakapon
Date: 2019-09-01 15:56:54 +0900 (Sun, 01 Sep 2019)
Log Message:
-----------
設定ダイアログ：SSH、SSH認証、SSH転送、SSH鍵生成
ヘルプボタンを追加した。
Modified Paths:
--------------
branches/ttssh_improved/installer/release/lang/English.lng
branches/ttssh_improved/installer/release/lang/French.lng
branches/ttssh_improved/installer/release/lang/German.lng
branches/ttssh_improved/installer/release/lang/Japanese.lng
branches/ttssh_improved/installer/release/lang/Korean.lng
branches/ttssh_improved/installer/release/lang/Russian.lng
branches/ttssh_improved/installer/release/lang/Simplified Chinese.lng
branches/ttssh_improved/installer/release/lang/Traditional Chinese.lng
branches/ttssh_improved/ttssh2/ttxssh/auth.c
branches/ttssh_improved/ttssh2/ttxssh/fwdui.c
branches/ttssh_improved/ttssh2/ttxssh/resource.h
branches/ttssh_improved/ttssh2/ttxssh/ttxssh.c
branches/ttssh_improved/ttssh2/ttxssh/ttxssh.rc
-------------- next part --------------
Modified: branches/ttssh_improved/installer/release/lang/English.lng
===================================================================
--- branches/ttssh_improved/installer/release/lang/English.lng 2019-09-01 04:03:50 UTC (rev 8057)
+++ branches/ttssh_improved/installer/release/lang/English.lng 2019-09-01 06:56:54 UTC (rev 8058)
@@ -937,6 +937,7 @@
BTN_CONTINUE=&Continue
BTN_YES=&Yes
BTN_NO=&No
+BTN_HELP=&Help
[TTProxy]
Modified: branches/ttssh_improved/installer/release/lang/French.lng
===================================================================
--- branches/ttssh_improved/installer/release/lang/French.lng 2019-09-01 04:03:50 UTC (rev 8057)
+++ branches/ttssh_improved/installer/release/lang/French.lng 2019-09-01 06:56:54 UTC (rev 8058)
@@ -941,6 +941,7 @@
BTN_CONTINUE=&Continuer
BTN_YES=&Yes
BTN_NO=&No
+BTN_HELP=&Help
[TTProxy]
Modified: branches/ttssh_improved/installer/release/lang/German.lng
===================================================================
--- branches/ttssh_improved/installer/release/lang/German.lng 2019-09-01 04:03:50 UTC (rev 8057)
+++ branches/ttssh_improved/installer/release/lang/German.lng 2019-09-01 06:56:54 UTC (rev 8058)
@@ -941,6 +941,7 @@
BTN_CONTINUE=&Fortsetzen
BTN_YES=&Yes
BTN_NO=&No
+BTN_HELP=&Help
[TTProxy]
Modified: branches/ttssh_improved/installer/release/lang/Japanese.lng
===================================================================
--- branches/ttssh_improved/installer/release/lang/Japanese.lng 2019-09-01 04:03:50 UTC (rev 8057)
+++ branches/ttssh_improved/installer/release/lang/Japanese.lng 2019-09-01 06:56:54 UTC (rev 8058)
@@ -937,6 +937,7 @@
BTN_CONTINUE=\x91\xB1\x8Ds(&C)
BTN_YES=\x82͂\xA2(&Y)
BTN_NO=\x82\xA2\x82\xA2\x82\xA6(&N)
+BTN_HELP=\x83w\x83\x8B\x83v(&H)
[TTProxy]
Modified: branches/ttssh_improved/installer/release/lang/Korean.lng
===================================================================
--- branches/ttssh_improved/installer/release/lang/Korean.lng 2019-09-01 04:03:50 UTC (rev 8057)
+++ branches/ttssh_improved/installer/release/lang/Korean.lng 2019-09-01 06:56:54 UTC (rev 8058)
@@ -941,6 +941,7 @@
BTN_CONTINUE=\xB0\xE8\xBC\xD3(&C)
BTN_YES=&Yes
BTN_NO=&No
+BTN_HELP=&Help
[TTProxy]
Modified: branches/ttssh_improved/installer/release/lang/Russian.lng
===================================================================
--- branches/ttssh_improved/installer/release/lang/Russian.lng 2019-09-01 04:03:50 UTC (rev 8057)
+++ branches/ttssh_improved/installer/release/lang/Russian.lng 2019-09-01 06:56:54 UTC (rev 8058)
@@ -941,6 +941,7 @@
BTN_CONTINUE=&\xCF\xF0\xEE\xE4\xEE\xEB\xE6\xE5\xED\xE8\xE5
BTN_YES=&Yes
BTN_NO=&No
+BTN_HELP=&Help
[TTProxy]
Modified: branches/ttssh_improved/installer/release/lang/Simplified Chinese.lng
===================================================================
--- branches/ttssh_improved/installer/release/lang/Simplified Chinese.lng 2019-09-01 04:03:50 UTC (rev 8057)
+++ branches/ttssh_improved/installer/release/lang/Simplified Chinese.lng 2019-09-01 06:56:54 UTC (rev 8058)
@@ -941,6 +941,7 @@
BTN_CONTINUE=\xBC\xCC\xD0\xF8(&C)
BTN_YES=&Yes
BTN_NO=&No
+BTN_HELP=&Help
[TTProxy]
Modified: branches/ttssh_improved/installer/release/lang/Traditional Chinese.lng
===================================================================
--- branches/ttssh_improved/installer/release/lang/Traditional Chinese.lng 2019-09-01 04:03:50 UTC (rev 8057)
+++ branches/ttssh_improved/installer/release/lang/Traditional Chinese.lng 2019-09-01 06:56:54 UTC (rev 8058)
@@ -941,6 +941,7 @@
BTN_CONTINUE=\xC4~\xC4\xF2(&C)
BTN_YES=&Yes
BTN_NO=&No
+BTN_HELP=&Help
[TTProxy]
Modified: branches/ttssh_improved/ttssh2/ttxssh/auth.c
===================================================================
--- branches/ttssh_improved/ttssh2/ttxssh/auth.c 2019-09-01 04:03:50 UTC (rev 8057)
+++ branches/ttssh_improved/ttssh2/ttxssh/auth.c 2019-09-01 06:56:54 UTC (rev 8058)
@@ -46,6 +46,7 @@
#include "libputty.h"
#include "tipwin.h"
#include "auth.h"
+#include "helpid.h"
#if defined(_DEBUG) && !defined(_CRTDBG_MAP_ALLOC)
#define malloc(l) _malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
@@ -1505,6 +1506,7 @@
{ IDC_CHECKAUTH, "DLG_AUTHSETUP_CHECKAUTH" },
{ IDOK, "BTN_OK" },
{ IDCANCEL, "BTN_CANCEL" },
+ { IDC_SSHAUTHSETUP_HELP, "BTN_HELP" },
};
SetI18DlgStrs("TTSSH", dlg, text_info, _countof(text_info), pvar->ts->UILanguageFile);
@@ -1632,6 +1634,10 @@
EndDialog(dlg, 0);
return TRUE;
+ case IDC_SSHAUTHSETUP_HELP:
+ PostMessage(GetParent(dlg), WM_USER_DLGHELP2, HlpMenuSetupSshauth, 0);
+ return TRUE;
+
case IDC_CHOOSERSAFILE:
choose_RSA_key_file(dlg, pvar);
return TRUE;
Modified: branches/ttssh_improved/ttssh2/ttxssh/fwdui.c
===================================================================
--- branches/ttssh_improved/ttssh2/ttxssh/fwdui.c 2019-09-01 04:03:50 UTC (rev 8057)
+++ branches/ttssh_improved/ttssh2/ttxssh/fwdui.c 2019-09-01 06:56:54 UTC (rev 8058)
@@ -40,6 +40,7 @@
#include "dlglib.h"
#include "servicenames.h"
+#include "helpid.h"
#undef DialogBoxParam
#define DialogBoxParam(p1,p2,p3,p4,p5) \
@@ -526,6 +527,9 @@
GetDlgItemText(dlg, IDCANCEL, uimsg, sizeof(uimsg));
UTIL_get_lang_msg("BTN_CANCEL", pvar, uimsg);
SetDlgItemText(dlg, IDCANCEL, pvar->ts->UIMsg);
+ GetDlgItemText(dlg, IDC_SSHFWDSETUP_HELP, uimsg, sizeof(uimsg));
+ UTIL_get_lang_msg("BTN_HELP", pvar, uimsg);
+ SetDlgItemText(dlg, IDC_SSHFWDSETUP_HELP, pvar->ts->UIMsg);
FWD_get_request_specs(pvar, requests, num_specs);
@@ -1130,6 +1134,10 @@
EndDialog(dlg, 0);
return TRUE;
+ case IDC_SSHFWDSETUP_HELP:
+ PostMessage(GetParent(dlg), WM_USER_DLGHELP2, HlpMenuSetupSshforward, 0);
+ return TRUE;
+
case IDC_ADD:
add_forwarding_entry(pvar, dlg);
return TRUE;
Modified: branches/ttssh_improved/ttssh2/ttxssh/resource.h
===================================================================
--- branches/ttssh_improved/ttssh2/ttxssh/resource.h 2019-09-01 04:03:50 UTC (rev 8057)
+++ branches/ttssh_improved/ttssh2/ttxssh/resource.h 2019-09-01 06:56:54 UTC (rev 8058)
@@ -236,6 +236,10 @@
#define IDC_LOGLEVEL 1242
#define IDC_LOGLEVEL_VALUE 1243
#define IDC_LOGLEVEL_UNIT 1244
+#define IDC_SSHKEYGENSETUP_HELP 1245
+#define IDC_SSHSETUP_HELP 1246
+#define IDC_SSHFWDSETUP_HELP 1247
+#define IDC_SSHAUTHSETUP_HELP 1248
// Next default values for new objects
//
@@ -243,7 +247,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 118
#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1245
+#define _APS_NEXT_CONTROL_VALUE 1249
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
Modified: branches/ttssh_improved/ttssh2/ttxssh/ttxssh.c
===================================================================
--- branches/ttssh_improved/ttssh2/ttxssh/ttxssh.c 2019-09-01 04:03:50 UTC (rev 8057)
+++ branches/ttssh_improved/ttssh2/ttxssh/ttxssh.c 2019-09-01 06:56:54 UTC (rev 8058)
@@ -43,6 +43,7 @@
#include "keyfiles.h"
#include "arc4random.h"
#include "auth.h"
+#include "helpid.h"
#include <stdlib.h>
#include <stdio.h>
@@ -2750,6 +2751,9 @@
GetDlgItemText(dlg, IDCANCEL, uimsg, sizeof(uimsg));
UTIL_get_lang_msg("BTN_CANCEL", pvar, uimsg);
SetDlgItemText(dlg, IDCANCEL, pvar->ts->UIMsg);
+ GetDlgItemText(dlg, IDC_SSHSETUP_HELP, uimsg, sizeof(uimsg));
+ UTIL_get_lang_msg("BTN_HELP", pvar, uimsg);
+ SetDlgItemText(dlg, IDC_SSHSETUP_HELP, pvar->ts->UIMsg);
GetDlgItemText(dlg, IDC_HOSTKEY_ROTATION_STATIC, uimsg, sizeof(uimsg));
UTIL_get_lang_msg("DLG_SSHSETUP_HOSTKEY_ROTATION", pvar, uimsg);
@@ -3318,6 +3322,9 @@
UI things can send this message */
EndDialog(dlg, 0);
return TRUE;
+ case IDC_SSHSETUP_HELP:
+ PostMessage(GetParent(dlg), WM_USER_DLGHELP2, HlpMenuSetupSsh, 0);
+ return TRUE;
// Cipher order
case IDC_SSHMOVECIPHERUP:
move_cur_sel_delta(GetDlgItem(dlg, IDC_SSHCIPHERPREFS), -1);
@@ -4274,6 +4281,9 @@
GetDlgItemText(dlg, IDCANCEL, uimsg, sizeof(uimsg));
UTIL_get_lang_msg("BTN_CLOSE", pvar, uimsg);
SetDlgItemText(dlg, IDCANCEL, pvar->ts->UIMsg);
+ GetDlgItemText(dlg, IDC_SSHKEYGENSETUP_HELP, uimsg, sizeof(uimsg));
+ UTIL_get_lang_msg("BTN_HELP", pvar, uimsg);
+ SetDlgItemText(dlg, IDC_SSHKEYGENSETUP_HELP, pvar->ts->UIMsg);
GetDlgItemText(dlg, IDC_BCRYPT_KDF_CHECK, uimsg, sizeof(uimsg));
UTIL_get_lang_msg("DLG_KEYGEN_BCRYPT_KDF", pvar, uimsg);
SetDlgItemText(dlg, IDC_BCRYPT_KDF_CHECK, pvar->ts->UIMsg);
@@ -4441,6 +4451,10 @@
EndDialog(dlg, 0); // dialog close
return TRUE;
+ case IDC_SSHKEYGENSETUP_HELP:
+ PostMessage(GetParent(dlg), WM_USER_DLGHELP2, HlpMenuSetupSshkeygen, 0);
+ return TRUE;
+
// if radio button pressed...
case IDC_RSA1_TYPE | (BN_CLICKED << 16):
if (isFixedLengthKey(key_type)) {
Modified: branches/ttssh_improved/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- branches/ttssh_improved/ttssh2/ttxssh/ttxssh.rc 2019-09-01 04:03:50 UTC (rev 8057)
+++ branches/ttssh_improved/ttssh2/ttxssh/ttxssh.rc 2019-09-01 06:56:54 UTC (rev 8058)
@@ -163,7 +163,7 @@
PUSHBUTTON "Move Down(&0)",IDC_SSHCOMP_MOVEDOWN,515,187,58,13
RTEXT "&LogLevel",IDC_LOGLEVEL,221,223,43,8
EDITTEXT IDC_LOGLEVEL_VALUE,270,220,30,14,ES_AUTOHSCROLL
- LTEXT "All options take effect the next time a session is started.",IDC_NOTICEBANNER,216,250,187,12
+ LTEXT "All options take effect the next time a session is started.",IDC_NOTICEBANNER,216,246,187,12
LTEXT "None",IDC_COMPRESSNONE,499,210,18,8
LTEXT "Highest",IDC_COMPRESSHIGH,576,210,25,8
RTEXT "&Compression level:",IDC_COMPRESSLABEL,422,218,62,13
@@ -172,6 +172,7 @@
DEFPUSHBUTTON "OK",IDOK,48,266,50,14
PUSHBUTTON "Cancel",IDCANCEL,118,266,50,14
LTEXT "(0 to turn off)",IDC_LOGLEVEL_UNIT,307,223,93,8
+ PUSHBUTTON "Help",IDC_SSHSETUP_HELP,186,266,50,14
END
IDD_SSHUNKNOWNHOST DIALOGEX 0, 0, 260, 276
@@ -247,8 +248,9 @@
PUSHBUTTON "...",IDC_CHOOSEHOSTRSAFILE,210,246,15,14
CONTROL "&Check the enabled authentication methods before login (SSH2)",IDC_CHECKAUTH,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,303,281,10
- DEFPUSHBUTTON "OK",IDOK,195,324,50,14,WS_GROUP
- PUSHBUTTON "Cancel",IDCANCEL,251,324,50,14
+ DEFPUSHBUTTON "OK",IDOK,128,324,50,14,WS_GROUP
+ PUSHBUTTON "Cancel",IDCANCEL,190,324,50,14
+ PUSHBUTTON "Help",IDC_SSHAUTHSETUP_HELP,251,324,50,14
END
IDD_SSHFWDSETUP DIALOGEX 0, 0, 309, 185
@@ -263,9 +265,10 @@
PUSHBUTTON "&Remove",IDC_REMOVE,195,105,50,14
CONTROL "Display remote &X applications on local X server",IDC_SSHFWDX11,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,139,274,14
- DEFPUSHBUTTON "OK",IDOK,86,164,50,14,WS_GROUP
- PUSHBUTTON "Cancel",IDCANCEL,173,164,50,14
+ DEFPUSHBUTTON "OK",IDOK,53,164,50,14,WS_GROUP
+ PUSHBUTTON "Cancel",IDCANCEL,143,164,50,14
GROUPBOX "X Forwarding",IDC_XFORWARD,6,130,296,27
+ PUSHBUTTON "Help",IDC_SSHFWDSETUP_HELP,232,164,50,14
END
IDD_SSHFWDEDIT DIALOGEX 0, 0, 309, 175
@@ -320,7 +323,7 @@
FONT 8, "Tahoma", 0, 0, 0x0
BEGIN
DEFPUSHBUTTON "&Generate",IDOK,199,7,50,14
- PUSHBUTTON "Close",IDCANCEL,199,24,50,14
+ PUSHBUTTON "Close",IDCANCEL,199,23,50,14
GROUPBOX "Key type",IDC_KEYTYPE,11,7,130,47
CONTROL "RS&A1",IDC_RSA1_TYPE,"Button",BS_AUTORADIOBUTTON,17,17,35,10
CONTROL "&RSA",IDC_RSA_TYPE,"Button",BS_AUTORADIOBUTTON,57,17,30,10
@@ -343,6 +346,7 @@
EDITTEXT IDC_BCRYPT_KDF_ROUNDS,182,117,25,12,ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
PUSHBUTTON "Save publ&ic key",IDC_SAVE_PUBLIC_KEY,49,135,68,14
PUSHBUTTON "Save &private key",IDC_SAVE_PRIVATE_KEY,133,135,68,14
+ PUSHBUTTON "Help",IDC_SSHKEYGENSETUP_HELP,199,40,50,14
END
IDD_SSHSCP DIALOGEX 0, 0, 279, 125
@@ -497,6 +501,7 @@
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 612
+ VERTGUIDE, 146
TOPMARGIN, 7
BOTTOMMARGIN, 282
END