Tera TermRevision: 7513
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7513
Author: zmatsuo
Date: 2019-03-26 01:32:00 +0900 (Tue, 26 Mar 2019)
Log Message:
-----------
ssh auth dialog 調整
Modified Paths:
--------------
branches/ssh_auth_dialog/ttssh2/ttxssh/auth.c
branches/ssh_auth_dialog/ttssh2/ttxssh/resource.h
branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.rc
Added Paths:
-----------
branches/ssh_auth_dialog/
-------------- next part --------------
Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/auth.c
===================================================================
--- trunk/ttssh2/ttxssh/auth.c 2019-03-25 14:45:53 UTC (rev 7512)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/auth.c 2019-03-25 16:32:00 UTC (rev 7513)
@@ -79,17 +79,27 @@
(LPARAM) (TCHAR *) chars);
if (tipwin == NULL) {
- TCHAR *s;
+ TCHAR uimsg[MAX_UIMSG];
RECT rect;
+ const TCHAR *s;
+ s = _T("\x90\xA7\x8C䕶\x8E\x9A\x82\xAA\x93\xFC\x97͂\xB3\x82\xEA\x82܂\xB5\x82\xBD")
+ _T("\n")
+ _T("\x89p\x8C\xEA:")
+ _T("\n")
+ _T("control character is entered");
+ _tcscpy_s(uimsg, _countof(uimsg), s);
if (wParam == 'V' - 'A' + 1) {
- s = _T("\x90\xA7\x8C䕶\x8E\x9A\x82\xF0\x93\xFC\x97͂\xB5\x82Ă\xA2\x82܂\xB7")
+ // CTRL + V
+ s = _T("\n")
+ _T("Shift+Insert\x82ŃN\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82\xA9\x82\xE7\x83y\x81[\x83X\x83g\x82ł\xAB\x82܂\xB7")
_T("\n")
- _T("\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82\xA9\x82\xE7\x82̓\\x82\xE8\x95t\x82\xAF\x82̃V\x83\x87\x81[\x83g\x83J\x83b\x83g\x82\xCDCTRL+Insert\x82ł\xB7");
- } else {
- s = _T("\x90\xA7\x8C䕶\x8E\x9A\x82\xF0\x93\xFC\x97͂\xB5\x82Ă\xA2\x82܂\xB7");
+ _T("\x89p\x8C\xEA:")
+ _T("\n")
+ _T("Use Shift + Insert to paste from clipboard");
+ _tcscat_s(uimsg, _countof(uimsg), s);
}
GetWindowRect(control, &rect);
- tipwin = TipWinCreate(control, rect.left, rect.bottom, s);
+ tipwin = TipWinCreate(control, rect.left, rect.bottom, uimsg);
}
return 0;
Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/resource.h
===================================================================
--- trunk/ttssh2/ttxssh/resource.h 2019-03-25 14:45:53 UTC (rev 7512)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/resource.h 2019-03-25 16:32:00 UTC (rev 7513)
@@ -117,7 +117,6 @@
#define IDC_ECDSA256_TYPE 1067
#define IDC_HISTORY_LABEL 1068
#define IDC_ECDSA384_TYPE 1068
-#define IDC_EDIT1 1069
#define IDC_FINGER_PRINT 1069
#define IDC_SENDFILE_EDIT 1069
#define IDC_PASSWD 1069
@@ -177,7 +176,6 @@
#define IDC_RECVFILE_TO 1101
#define IDC_CHOOSEHOSTRSAFILE 1102
#define IDC_HOSTRSAFILENAME 1103
-#define IDC_EDIT3 1103
#define IDC_FP_RANDOMART 1103
#define IDC_CONFIRM_PASSWD 1103
#define IDC_TTSSH_ICON 1104
@@ -201,7 +199,6 @@
#define IDC_SSHUSEPAGEANT 1205
#define IDC_SSHUSETIS2 1206
#define IDC_REMEMBERPASSWORD 1207
-#define IDC_EDIT2 1208
#define IDC_SENDFILE_TO 1208
#define IDC_SFTP_CONSOLE 1208
#define IDC_REMOVEKEY_EDIT 1208
@@ -228,14 +225,19 @@
#define IDC_SSHFWDLOCALDYNAMIC_LISTEN 1229
#define IDC_SSHDYNLISTENADDR 1230
#define IDC_FROM_CLIPBOARD 1231
+#define IDC_SHOW_PASSPHRASE 1232
+#define IDC_CLEAR_CLIPBOARD 1233
+#define IDC_USE_CONTROL_CHARACTER 1234
+#define IDC_HOSTRSAFILENAMELABEL 1235
+#define IDC_RSAFILENAMELABEL 1236
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 115
+#define _APS_NEXT_RESOURCE_VALUE 116
#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1232
+#define _APS_NEXT_CONTROL_VALUE 1237
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc 2019-03-25 14:45:53 UTC (rev 7512)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.rc 2019-03-25 16:32:00 UTC (rev 7513)
@@ -48,42 +48,45 @@
DEFPUSHBUTTON "OK",IDOK,112,310,50,14
END
-IDD_SSHAUTH DIALOGEX 0, 0, 330, 262
+IDD_SSHAUTH DIALOGEX 0, 0, 331, 402
STYLE DS_SETFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "SSH Authentication"
FONT 8, "Tahoma", 0, 0, 0x0
BEGIN
LTEXT "Logging in to %s",IDC_SSHAUTHBANNER,6,3,166,10
- LTEXT "Authentication required.",IDC_SSHAUTHBANNER2,6,16,296,10
- RTEXT "User &name:",IDC_SSHUSERNAMELABEL,13,31,57,8,0,WS_EX_RIGHT
- EDITTEXT IDC_SSHUSERNAME,75,29,145,12,ES_AUTOHSCROLL
- RTEXT "&Passphrase:",IDC_SSHPASSWORDCAPTION,14,48,56,8,0,WS_EX_RIGHT
- EDITTEXT IDC_SSHPASSWORD,75,46,145,12,ES_PASSWORD | ES_AUTOHSCROLL
- PUSHBUTTON "&From Clipboard",IDC_FROM_CLIPBOARD,225,46,60,14
+ LTEXT "Authentication required.",IDC_SSHAUTHBANNER2,6,16,319,10
+ LTEXT "User &name:",IDC_SSHUSERNAMELABEL,17,31,57,8
+ EDITTEXT IDC_SSHUSERNAME,28,44,145,12,ES_AUTOHSCROLL
+ LTEXT "&Passphrase:",IDC_SSHPASSWORDCAPTION,17,62,56,8
+ EDITTEXT IDC_SSHPASSWORD,28,76,145,12,ES_PASSWORD | ES_AUTOHSCROLL
+ PUSHBUTTON "Paste from &clipboard",IDC_FROM_CLIPBOARD,28,92,80,14
+ CONTROL "Cl&ear clipboard after paste",IDC_CLEAR_CLIPBOARD,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,110,132,10
+ CONTROL "Use control characters",IDC_USE_CONTROL_CHARACTER,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,28,125,132,10
+ CONTROL "&Show passphrase",IDC_SHOW_PASSPHRASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,28,140,132,10
CONTROL "Remember password in &memory",IDC_REMEMBER_PASSWORD,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,75,61,132,10
- CONTROL "F&orward agent",IDC_FORWARD_AGENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,75,74,132,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,157,132,10
+ CONTROL "F&orward agent",IDC_FORWARD_AGENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,173,132,10
CONTROL "Use p&lain password to log in",IDC_SSHUSEPASSWORD,
- "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,13,94,219,10
+ "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,27,204,219,10
CONTROL "Use &RSA/DSA/ECDSA/ED25519 key to log in",IDC_SSHUSERSA,
- "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,122,152,10
- CONTROL "Use r&hosts to log in (SSH1)",IDC_SSHUSERHOSTS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,149,99,10
+ "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,27,222,152,10
+ CONTROL "Use r&hosts to log in (SSH1)",IDC_SSHUSERHOSTS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,27,272,99,10
CONTROL "Use SSH1:challenge/response(&TIS) / SSH2:keyboard-interactive to log in",IDC_SSHUSETIS,
- "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,193,300,10
- CONTROL "Use P&ageant to log in",IDC_SSHUSEPAGEANT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,219,276,10
- PUSHBUTTON "Private &key file:",IDC_CHOOSERSAFILE,169,120,58,14,WS_GROUP
- EDITTEXT IDC_RSAFILENAME,231,121,89,13,ES_AUTOHSCROLL
- RTEXT "Local &user name:",IDC_LOCALUSERNAMELABEL,120,150,91,8,0,WS_EX_RIGHT
- EDITTEXT IDC_LOCALUSERNAME,214,148,106,13,ES_AUTOHSCROLL
- PUSHBUTTON "Host private key &file:",IDC_CHOOSEHOSTRSAFILE,92,164,73,14
- EDITTEXT IDC_HOSTRSAFILENAME,169,164,151,13,ES_AUTOHSCROLL
- DEFPUSHBUTTON "OK",IDOK,96,242,50,14,WS_GROUP
- PUSHBUTTON "&Disconnect",IDCANCEL,183,242,50,14
- GROUPBOX "",IDC_STATIC,6,85,320,25
- GROUPBOX "",IDC_STATIC,6,113,320,25
- GROUPBOX "",IDC_STATIC,6,140,320,42
- GROUPBOX "",IDC_STATIC,6,184,320,25
- GROUPBOX "",IDC_STATIC,6,210,320,25
+ "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,27,341,260,10
+ CONTROL "Use P&ageant to log in",IDC_SSHUSEPAGEANT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,27,358,276,10
+ LTEXT "Private &key file:",IDC_RSAFILENAMELABEL,38,238,91,8
+ EDITTEXT IDC_RSAFILENAME,50,250,150,13,ES_AUTOHSCROLL
+ PUSHBUTTON "...",IDC_CHOOSERSAFILE,207,249,14,14,WS_GROUP
+ LTEXT "Local &user name:",IDC_LOCALUSERNAMELABEL,38,284,91,8
+ EDITTEXT IDC_LOCALUSERNAME,50,296,106,13,ES_AUTOHSCROLL
+ LTEXT "Host private key &file:",IDC_HOSTRSAFILENAMELABEL,38,312,91,8
+ EDITTEXT IDC_HOSTRSAFILENAME,50,326,151,13,ES_AUTOHSCROLL
+ PUSHBUTTON "...",IDC_CHOOSEHOSTRSAFILE,208,325,17,14
+ DEFPUSHBUTTON "OK",IDOK,217,382,50,14,WS_GROUP
+ PUSHBUTTON "&Disconnect",IDCANCEL,275,382,50,14
+ GROUPBOX "authentication methods ",IDC_STATIC,17,191,300,185
END
IDD_HOSTDLG DIALOGEX 20, 20, 240, 128
@@ -446,7 +449,7 @@
//
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
+GUIDELINES DESIGNINFO
BEGIN
IDD_ABOUTDIALOG, DIALOG
BEGIN
@@ -459,9 +462,14 @@
IDD_SSHAUTH, DIALOG
BEGIN
LEFTMARGIN, 6
- RIGHTMARGIN, 302
+ RIGHTMARGIN, 325
+ VERTGUIDE, 17
+ VERTGUIDE, 28
+ VERTGUIDE, 40
+ VERTGUIDE, 52
TOPMARGIN, 3
- BOTTOMMARGIN, 256
+ BOTTOMMARGIN, 396
+ HORZGUIDE, 234
END
IDD_HOSTDLG, DIALOG