mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-03-20 13:48:38 -05:00
efc31ee30d
Now Windows Pageant has two clearly distinct dialog boxes for requesting a key passphrase: one to use synchronously when the user has just used the 'Add Key' GUI action, and one to use asynchronously in response to an agent client's attempt to use a key that was loaded encrypted. Also fixed the wording in the asynchronous box: there were two copies of the 'enter passphrase' instruction, one from the dialog definition in pageant.rc file and one from the cross-platform pageant.c. Now pageant.c doesn't format a whole user-facing message any more: it leaves that to the platform front end to do it the way it wants. I've also added a call to SetForegroundWindow, to try to get the passphrase prompt into the foreground. In my experience this doesn't actually get it the keyboard focus, which I think is deliberate on Windows's part and there's nothing I can do about it. But at least the user should _see_ that the prompt is there, so they can focus it themself.
83 lines
2.6 KiB
Plaintext
83 lines
2.6 KiB
Plaintext
/*
|
|
* Windows resources for Pageant.
|
|
*/
|
|
|
|
#include "rcstuff.h"
|
|
|
|
#define APPNAME "Pageant"
|
|
#define APPDESC "PuTTY SSH authentication agent"
|
|
|
|
#include "winhelp.rc2"
|
|
|
|
200 ICON "pageant.ico"
|
|
201 ICON "pageants.ico"
|
|
|
|
210 DIALOG DISCARDABLE 0, 0, 140, 60
|
|
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
|
CAPTION "Pageant: Loading Encrypted Key"
|
|
FONT 8, "MS Shell Dlg"
|
|
BEGIN
|
|
CTEXT "Enter passphrase to load key", 100, 10, 6, 120, 8
|
|
CTEXT "", 101, 10, 16, 120, 8
|
|
EDITTEXT 102, 10, 26, 120, 12, ES_PASSWORD | ES_AUTOHSCROLL
|
|
DEFPUSHBUTTON "O&K", IDOK, 20, 42, 40, 14
|
|
PUSHBUTTON "&Cancel", IDCANCEL, 80, 42, 40, 14
|
|
END
|
|
|
|
212 DIALOG DISCARDABLE 0, 0, 250, 70
|
|
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
|
CAPTION "Pageant: Decrypting Stored Key"
|
|
FONT 8, "MS Shell Dlg"
|
|
BEGIN
|
|
CTEXT "A client of Pageant wants to use the following encrypted key:", 100, 10, 6, 230, 8
|
|
CTEXT "", 101, 10, 16, 230, 8
|
|
CTEXT "If you intended this, enter the passphrase to decrypt the key.", 101, 10, 26, 230, 8
|
|
EDITTEXT 102, 10, 36, 230, 12, ES_PASSWORD | ES_AUTOHSCROLL
|
|
DEFPUSHBUTTON "O&K", IDOK, 75, 52, 40, 14
|
|
PUSHBUTTON "&Cancel", IDCANCEL, 135, 52, 40, 14
|
|
END
|
|
|
|
211 DIALOG DISCARDABLE 0, 0, 450, 211
|
|
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
|
CAPTION "Pageant Key List"
|
|
FONT 8, "MS Shell Dlg"
|
|
BEGIN
|
|
LISTBOX 100, 10, 10, 420, 155,
|
|
LBS_EXTENDEDSEL | LBS_HASSTRINGS | LBS_USETABSTOPS | WS_VSCROLL | WS_TABSTOP
|
|
PUSHBUTTON "&Add Key", 101, 75, 187, 60, 14
|
|
PUSHBUTTON "&Remove Key", 102, 315, 187, 60, 14
|
|
PUSHBUTTON "&Help", 103, 10, 187, 50, 14
|
|
DEFPUSHBUTTON "&Close", IDOK, 390, 187, 50, 14
|
|
LTEXT "&Fingerprint type:", 104, 10, 172, 60, 8
|
|
COMBOBOX 105, 70, 170, 60, 12, CBS_DROPDOWNLIST
|
|
END
|
|
|
|
/* Accelerators used: cl */
|
|
213 DIALOG DISCARDABLE 140, 40, 270, 136
|
|
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
|
CAPTION "About Pageant"
|
|
FONT 8, "MS Shell Dlg"
|
|
BEGIN
|
|
DEFPUSHBUTTON "&Close", IDOK, 216, 118, 48, 14
|
|
PUSHBUTTON "View &Licence", 101, 6, 118, 70, 14
|
|
PUSHBUTTON "Visit &Web Site", 102, 140, 118, 70, 14
|
|
EDITTEXT 1000, 10, 6, 250, 110, ES_READONLY | ES_MULTILINE | ES_CENTER, WS_EX_STATICEDGE
|
|
END
|
|
|
|
/* No accelerators used */
|
|
214 DIALOG DISCARDABLE 50, 50, 326, 239
|
|
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
|
CAPTION "PuTTY Licence"
|
|
FONT 8, "MS Shell Dlg"
|
|
BEGIN
|
|
DEFPUSHBUTTON "OK", IDOK, 148, 219, 44, 14
|
|
|
|
EDITTEXT 1000, 10, 10, 306, 200, ES_READONLY | ES_MULTILINE | ES_LEFT, WS_EX_STATICEDGE
|
|
END
|
|
|
|
#include "version.rc2"
|
|
|
|
#ifndef NO_MANIFESTS
|
|
1 RT_MANIFEST "pageant.mft"
|
|
#endif /* NO_MANIFESTS */
|