[Ttssh2-commit] [7615] ttssh のSSH認証設定ダイアログのデザインを調整

scmno****@osdn***** scmno****@osdn*****
2019年 4月 24日 (水) 23:09:41 JST


Revision: 7615
          https://osdn.net/projects/ttssh2/scm/svn/commits/7615
Author:   zmatsuo
Date:     2019-04-24 23:09:40 +0900 (Wed, 24 Apr 2019)
Log Message:
-----------
ttssh のSSH認証設定ダイアログのデザインを調整

Modified Paths:
--------------
    branches/ssh_auth_dialog/ttssh2/ttxssh/resource.h
    branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.rc

-------------- next part --------------
Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/resource.h
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/resource.h	2019-04-24 14:09:30 UTC (rev 7614)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/resource.h	2019-04-24 14:09:40 UTC (rev 7615)
@@ -36,6 +36,7 @@
 #define IDC_SSHUSERNAME                 1000
 #define IDC_HOSTTELNET                  1000
 #define IDC_HOSTSSH                     1001
+#define IDC_SSHUSERNAME2                1001
 #define IDC_SSHPASSWORD                 1002
 #define IDC_HOSTOTHER                   1002
 #define IDC_SSHAUTHBANNER               1003
@@ -199,10 +200,13 @@
 #define IDC_SSHUSEPAGEANT               1205
 #define IDC_SSHUSETIS2                  1206
 #define IDC_REMEMBERPASSWORD            1207
+#define IDC_SSHUSERSA2                  1207
 #define IDC_SENDFILE_TO                 1208
 #define IDC_SFTP_CONSOLE                1208
 #define IDC_REMOVEKEY_EDIT              1208
+#define IDC_SSHUSERSA3                  1208
 #define IDC_PUTTY_VERSION               1209
+#define IDC_SSHUSERSA4                  1209
 #define IDC_ED25519_TYPE                1211
 #define IDC_HOSTKEY_ROTATION_STATIC     1212
 #define IDC_LIST1                       1213
@@ -231,12 +235,13 @@
 #define IDC_HOSTRSAFILENAMELABEL        1235
 #define IDC_RSAFILENAMELABEL            1236
 #define IDC_FROM_GETUSERNAME            1237
+#define IDC_RSAFILENAMELABEL2           1237
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        117
+#define _APS_NEXT_RESOURCE_VALUE        118
 #define _APS_NEXT_COMMAND_VALUE         40001
 #define _APS_NEXT_CONTROL_VALUE         1237
 #define _APS_NEXT_SYMED_VALUE           101

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.rc	2019-04-24 14:09:30 UTC (rev 7614)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.rc	2019-04-24 14:09:40 UTC (rev 7615)
@@ -216,37 +216,39 @@
     DEFPUSHBUTTON   "&Disconnect",IDCANCEL,145,256,50,14,WS_GROUP
 END
 
-IDD_SSHAUTHSETUP DIALOGEX 0, 0, 330, 228
+IDD_SSHAUTHSETUP DIALOGEX 0, 0, 305, 345
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "TTSSH: Authentication Setup"
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
     LTEXT           "Select defaults for authentication:",IDC_SSHAUTHBANNER,6,7,166,10
-    LTEXT           "User &name:",IDC_SSHUSERNAMELABEL,13,24,57,8,0,WS_EX_RIGHT
-    EDITTEXT        IDC_SSHUSERNAME,75,22,145,12,ES_AUTOHSCROLL
+    GROUPBOX        "User name",IDC_STATIC,6,22,295,88
+    CONTROL         "User name is empty",IDC_SSHUSERSA2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,19,35,152,10
+    CONTROL         "Use following use name",IDC_SSHUSERSA4,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,19,50,152,10
+    CONTROL         "Use system user name",IDC_SSHUSERSA3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,19,78,152,10
+    EDITTEXT        IDC_SSHUSERNAME,35,62,145,12,ES_AUTOHSCROLL
+    LTEXT           "Current user name is ""%s""",IDC_RSAFILENAMELABEL2,35,93,128,10
+    GROUPBOX        "Authentication methods ",IDC_STATIC,6,120,295,200
     CONTROL         "Use p&lain password to log in",IDC_SSHUSEPASSWORD,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,13,45,120,10
+                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,19,134,120,10
     CONTROL         "Use &RSA/DSA/ECDSA/ED25519 key to log in",IDC_SSHUSERSA,
-                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,73,152,10
-    CONTROL         "Use r&hosts to log in (SSH1)",IDC_SSHUSERHOSTS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,100,99,10
+                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,19,148,152,10
+    CONTROL         "Use r&hosts to log in (SSH1)",IDC_SSHUSERHOSTS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,19,191,99,10
     CONTROL         "Use SSH1:challenge/response(&TIS) / SSH2:keyboard-interactive to log in",IDC_SSHUSETIS,
-                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,144,300,10
-    CONTROL         "Use P&ageant to log in",IDC_SSHUSEPAGEANT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,171,278,10
-    PUSHBUTTON      "Private &key file:",IDC_CHOOSERSAFILE,169,72,58,14,WS_GROUP
-    EDITTEXT        IDC_RSAFILENAME,231,73,89,13,ES_AUTOHSCROLL
-    RTEXT           "Local &user name:",IDC_LOCALUSERNAMELABEL,118,100,91,8,0,WS_EX_RIGHT
-    EDITTEXT        IDC_LOCALUSERNAME,214,99,106,13,ES_AUTOHSCROLL
-    PUSHBUTTON      "Host private key &file:",IDC_CHOOSEHOSTRSAFILE,92,114,73,14
-    EDITTEXT        IDC_HOSTRSAFILENAME,169,115,151,13,ES_AUTOHSCROLL
+                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,19,271,282,10
+    CONTROL         "Use P&ageant to log in",IDC_SSHUSEPAGEANT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,19,286,278,10
+    LTEXT           "Private &key file:",IDC_RSAFILENAMELABEL,35,160,144,8
+    EDITTEXT        IDC_RSAFILENAME,46,172,153,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_CHOOSERSAFILE,207,172,15,14,WS_GROUP
+    LTEXT           "Local &user name:",IDC_LOCALUSERNAMELABEL,35,206,91,8
+    EDITTEXT        IDC_LOCALUSERNAME,46,219,106,13,ES_AUTOHSCROLL
+    LTEXT           "Host private key &file:",IDC_HOSTRSAFILENAMELABEL,35,234,165,8
+    EDITTEXT        IDC_HOSTRSAFILENAME,46,247,151,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_CHOOSEHOSTRSAFILE,210,246,15,14
     CONTROL         "&Check the enabled authentication methods before login (SSH2)",IDC_CHECKAUTH,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,192,281,10
-    DEFPUSHBUTTON   "OK",IDOK,96,207,50,14,WS_GROUP
-    PUSHBUTTON      "Cancel",IDCANCEL,183,207,50,14
-    GROUPBOX        "",IDC_STATIC,6,36,320,25
-    GROUPBOX        "",IDC_STATIC,6,64,320,25
-    GROUPBOX        "",IDC_STATIC,6,91,320,42
-    GROUPBOX        "",IDC_STATIC,6,135,320,25
-    GROUPBOX        "",IDC_STATIC,6,162,320,25
+                    "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
 END
 
 IDD_SSHFWDSETUP DIALOGEX 0, 0, 309, 185
@@ -507,9 +509,12 @@
     IDD_SSHAUTHSETUP, DIALOG
     BEGIN
         LEFTMARGIN, 6
-        RIGHTMARGIN, 302
+        RIGHTMARGIN, 301
+        VERTGUIDE, 19
+        VERTGUIDE, 35
+        VERTGUIDE, 46
         TOPMARGIN, 7
-        BOTTOMMARGIN, 221
+        BOTTOMMARGIN, 338
     END
 
     IDD_SSHFWDSETUP, DIALOG


Ttssh2-commit メーリングリストの案内