diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-09 12:31:43 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-09 12:31:43 +0100 |
| commit | 480a7a0a6c9a8fae5b8fc7b7688173d5e425ae0e (patch) | |
| tree | 0b6908caf655de903727499e279a6b87ffb886c8 /xorg-server/hw/xwin/xlaunch/resources | |
| parent | e679303a065ecf6e961993c4fe169950c101c08c (diff) | |
| download | vcxsrv-480a7a0a6c9a8fae5b8fc7b7688173d5e425ae0e.tar.gz vcxsrv-480a7a0a6c9a8fae5b8fc7b7688173d5e425ae0e.tar.bz2 vcxsrv-480a7a0a6c9a8fae5b8fc7b7688173d5e425ae0e.zip | |
Allow specifying a key file in putty format when starting a remote program
Now plink is a real console application in the release build (no -console
option anymore)
Diffstat (limited to 'xorg-server/hw/xwin/xlaunch/resources')
| -rw-r--r-- | xorg-server/hw/xwin/xlaunch/resources/dialog.rc | 13 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/xlaunch/resources/resources.h | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/xlaunch/resources/strings.rc | 3 |
3 files changed, 12 insertions, 6 deletions
diff --git a/xorg-server/hw/xwin/xlaunch/resources/dialog.rc b/xorg-server/hw/xwin/xlaunch/resources/dialog.rc index 2809bcc4b..fd7dae522 100644 --- a/xorg-server/hw/xwin/xlaunch/resources/dialog.rc +++ b/xorg-server/hw/xwin/xlaunch/resources/dialog.rc @@ -73,21 +73,24 @@ BEGIN AUTORADIOBUTTON STR_CLIENT_REMOTE,IDC_CLIENT_REMOTE,7,50,300,10 LTEXT STR_CLIENT_PROGRAM_DESC,IDC_CLIENT_PROGRAM_DESC,19,28,64,10 - COMBOBOX IDC_CLIENT_PROGRAM,100,26,64,54,CBS_DROPDOWN | WS_VSCROLL + COMBOBOX IDC_CLIENT_PROGRAM,110,26,64,54,CBS_DROPDOWN | WS_VSCROLL LTEXT STR_CLIENT_REMOTEPROGRAM_DESC,IDC_CLIENT_REMOTEPROGRAM_DESC,19,64,70,10 - EDITTEXT IDC_CLIENT_REMOTEPROGRAM,100,62,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_CLIENT_REMOTEPROGRAM,110,62,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL LTEXT STR_CLIENT_PASSWORD_DESC,IDC_CLIENT_PASSWORD_DESC,19,78,70,10 - EDITTEXT IDC_CLIENT_PASSWORD,100,76,64,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_CLIENT_PASSWORD,110,76,64,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL LTEXT STR_CLIENT_HOST_DESC,IDC_CLIENT_HOST_DESC,19,92,70,10 - EDITTEXT IDC_CLIENT_HOST,100,90,64,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_CLIENT_HOST,110,90,64,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL LTEXT STR_CLIENT_USER_DESC,IDC_CLIENT_USER_DESC,19,106,70,10 - EDITTEXT IDC_CLIENT_USER,100,104,64,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_CLIENT_USER,110,104,64,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + + LTEXT STR_CLIENT_PRIVATEKEY_DESC,IDC_CLIENT_PRIVATEKEY_DESC,19,120,90,10 + EDITTEXT IDC_CLIENT_PRIVATEKEY,110,118,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL END IDD_XDMCP DIALOGEX 0, 0, 317, 143 diff --git a/xorg-server/hw/xwin/xlaunch/resources/resources.h b/xorg-server/hw/xwin/xlaunch/resources/resources.h index 8db7ef190..bccfb1702 100644 --- a/xorg-server/hw/xwin/xlaunch/resources/resources.h +++ b/xorg-server/hw/xwin/xlaunch/resources/resources.h @@ -73,6 +73,8 @@ #define IDC_CLIENT_PASSWORD_DESC 232
#define IDC_CLIENT_REMOTEPROGRAM 233
#define IDC_CLIENT_REMOTEPROGRAM_DESC 234
+#define IDC_CLIENT_PRIVATEKEY 235
+#define IDC_CLIENT_PRIVATEKEY_DESC 236
#define IDC_FONTPATH_DESC 240
diff --git a/xorg-server/hw/xwin/xlaunch/resources/strings.rc b/xorg-server/hw/xwin/xlaunch/resources/strings.rc index 8a3c487f5..f34f46208 100644 --- a/xorg-server/hw/xwin/xlaunch/resources/strings.rc +++ b/xorg-server/hw/xwin/xlaunch/resources/strings.rc @@ -48,7 +48,8 @@ #define STR_CLIENT_HOST_DESC "Connect to computer" #define STR_CLIENT_USER_DESC "Login as user" -#define STR_CLIENT_REMOTEPROGRAM_DESC "Remote program" +#define STR_CLIENT_REMOTEPROGRAM_DESC "Remote program" +#define STR_CLIENT_PRIVATEKEY_DESC "Private key (putty format)" #define STR_CAPTION_XDMCP "XDMCP settings" |