X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/c9def1b8e8960113ab4fd91d0b69d5b422cf339f..a4e14164742bbf69bfc294167fd46e203f7eacdd:/win_res.rc

diff --git a/win_res.rc b/win_res.rc
index a9d0e608..e365f1c7 100644
--- a/win_res.rc
+++ b/win_res.rc
@@ -8,10 +8,15 @@
 #define TCS_MULTILINE 0x0200
 #endif
 
+#ifdef MINGW32_FIX
+#define EDITTEXT     EDITTEXT "",
+#endif
+
 #include "win_res.h"
 
 IDI_MAINICON ICON "putty.ico"
 
+/* Accelerators used: cl */
 IDD_ABOUTBOX DIALOG DISCARDABLE 140, 40, 136, 70
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About PuTTY"
@@ -25,6 +30,7 @@ BEGIN
           IDA_TEXT2, 10, 34, 120, 16
 END
 
+/* Accelerators used: aco */
 IDD_MAINBOX DIALOG DISCARDABLE 0, 0, 180, 216
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTY Configuration"
@@ -42,6 +48,7 @@ BEGIN
 	TCS_MULTILINE | WS_TABSTOP, 3, 3, 174, 193
 END
 
+/* Accelerators used: ac */
 IDD_RECONF DIALOG DISCARDABLE 0, 0, 180, 216
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTY Reconfiguration"
@@ -58,6 +65,7 @@ BEGIN
 	TCS_MULTILINE | WS_TABSTOP, 3, 3, 174, 193
 END
 
+/* Accelerators used: [aco] dehlnprstwx */
 IDD_PANEL0 DIALOG DISCARDABLE 6, 30, 168, 163
 STYLE WS_CHILD | WS_VISIBLE | NOT WS_BORDER
 FONT 8, "MS Sans Serif"
@@ -99,10 +107,11 @@ BEGIN
     
 
     
-    AUTOCHECKBOX "Close &Window on Exit", IDC0_CLOSEEXIT, 3, 130, 162, 8
-    AUTOCHECKBOX "Warn on C&lose", IDC0_CLOSEWARN, 3, 140, 162, 8
+    AUTOCHECKBOX "Close Window on E&xit", IDC0_CLOSEEXIT, 3, 130, 162, 8
+    AUTOCHECKBOX "&Warn on Close", IDC0_CLOSEWARN, 3, 140, 162, 8
 END
 
+/* Accelerators used: [aco] 4?ehiklmnprsuvxy */
 IDD_PANEL1 DIALOG DISCARDABLE 6, 30, 168, 163
 STYLE WS_CHILD | WS_VISIBLE | NOT WS_BORDER
 FONT 8, "MS Sans Serif"
@@ -136,6 +145,7 @@ BEGIN
     AUTOCHECKBOX "Reset scrollback on &keypress", IDC1_SCROLLKEY, 3, 143, 162, 8
 END
 
+/* Accelerators used: [aco] dghlmnprsw */
 IDD_PANEL2 DIALOG DISCARDABLE 6, 30, 168, 163
 STYLE WS_CHILD | WS_VISIBLE | NOT WS_BORDER
 FONT 8, "MS Sans Serif"
@@ -160,19 +170,33 @@ BEGIN
     
     AUTOCHECKBOX "Auto &wrap mode initially on", IDC2_WRAPMODE, 3, 62, 162, 8
     AUTOCHECKBOX "&DEC Origin Mode initially on", IDC2_DECOM, 3, 72, 162, 8
-    AUTOCHECKBOX "Avoid ever using &icon title", IDC2_WINNAME, 3, 82, 162, 8
-    AUTOCHECKBOX "Implicit CR in every &LF", IDC2_LFHASCR, 3, 92, 162, 8
-    AUTOCHECKBOX "&Blinking cursor", IDC1_BLINKCUR, 3, 102, 162, 8
-    AUTOCHECKBOX "Bee&p enabled", IDC1_BEEP, 3, 112, 162, 8
-    AUTOCHECKBOX "Displa&y scrollbar", IDC2_SCROLLBAR, 3, 122, 162, 8
-    AUTOCHECKBOX "Loc&k Window size", IDC2_LOCKSIZE, 3, 132, 162, 8
-    AUTOCHECKBOX "Use Backgroud colour erase", IDC2_BCE, 3, 142, 162, 8
-    AUTOCHECKBOX "Enable blinking text", IDC2_BLINKTEXT, 3, 152, 162, 8
+    AUTOCHECKBOX "Implicit CR in every &LF", IDC2_LFHASCR, 3, 82, 162, 8
+    AUTOCHECKBOX "Bee&p enabled", IDC1_BEEP, 3, 92, 162, 8
+    AUTOCHECKBOX "Use Back&ground colour erase", IDC2_BCE, 3, 102, 162, 8
+    AUTOCHECKBOX "Enable bli&nking text", IDC2_BLINKTEXT, 3, 112, 162, 8
     
     
     
 END
 
+/* Accelerators used: [aco] bikty */
+IDD_PANELW DIALOG DISCARDABLE 6, 30, 168, 163
+STYLE WS_CHILD | WS_VISIBLE | NOT WS_BORDER
+FONT 8, "MS Sans Serif"
+  
+BEGIN
+    
+    LTEXT "Initial window &title:", IDCW_WINTITLE, 3, 3, 119, 8
+    EDITTEXT IDCW_WINEDIT,  3, 11, 119, 12, ES_AUTOHSCROLL
+    
+    
+    AUTOCHECKBOX "Avoid ever using &icon title", IDCW_WINNAME, 3, 29, 162, 8
+    AUTOCHECKBOX "&Blinking cursor", IDCW_BLINKCUR, 3, 39, 162, 8
+    AUTOCHECKBOX "Displa&y scrollbar", IDCW_SCROLLBAR, 3, 49, 162, 8
+    AUTOCHECKBOX "Loc&k Window size", IDCW_LOCKSIZE, 3, 59, 162, 8
+END
+
+/* Accelerators used: [aco] bdflrstuv */
 IDD_PANEL3 DIALOG DISCARDABLE 6, 30, 168, 163
 STYLE WS_CHILD | WS_VISIBLE | NOT WS_BORDER
 FONT 8, "MS Sans Serif"
@@ -213,6 +237,7 @@ BEGIN
     
 END
 
+/* Accelerators used: [aco] 123abdhkmprtu */
 IDD_PANEL35 DIALOG DISCARDABLE 6, 30, 168, 163
 STYLE WS_CHILD | WS_VISIBLE | NOT WS_BORDER
 FONT 8, "MS Sans Serif"
@@ -229,15 +254,33 @@ BEGIN
     EDITTEXT IDC3_LOGEDIT, 87, 29, 77, 12, ES_AUTOHSCROLL
     
     
-    LTEXT "Cipher:", IDC3_CIPHERSTATIC, 3, 45, 35, 8
-    AUTORADIOBUTTON "&3DES", IDC3_CIPHER3DES, 45, 45, 35, 8, WS_GROUP
-    AUTORADIOBUTTON "&Blowfish", IDC3_CIPHERBLOWF, 87, 45, 35, 8
-    AUTORADIOBUTTON "&DES", IDC3_CIPHERDES, 129, 45, 35, 8
+    LTEXT "Cipher:", IDC3_CIPHERSTATIC, 3, 45, 23, 8
+    AUTORADIOBUTTON "&3DES", IDC3_CIPHER3DES, 33, 45, 38, 8, WS_GROUP
+    AUTORADIOBUTTON "&Blowfish", IDC3_CIPHERBLOWF, 79, 45, 38, 8
+    AUTORADIOBUTTON "&DES", IDC3_CIPHERDES, 125, 45, 38, 8
+    
+    
+    AUTOCHECKBOX "Atte&mpt TIS or CryptoCard authentication", IDC3_AUTHTIS, 3, 55, 162, 8
+    
+    
+    LTEXT "Prefer protocol version:", IDC3_SSHPROTSTATIC, 3, 75, 105, 8
+    AUTORADIOBUTTON "&1", IDC3_SSHPROT1, 115, 75, 21, 8, WS_GROUP
+    AUTORADIOBUTTON "&2", IDC3_SSHPROT2, 143, 75, 21, 8
+    
+    
+    LTEXT "Public &key file:", IDC3_PKSTATIC, 3, 85, 119, 8
+    EDITTEXT IDC3_PKEDIT,  3, 93, 119, 12, ES_AUTOHSCROLL
+    
+    LTEXT "&Remote command:", IDC3_CMDSTATIC, 3, 111, 119, 8
+    EDITTEXT IDC3_CMDEDIT,  3, 119, 119, 12, ES_AUTOHSCROLL
+    
+    PUSHBUTTON "C&hange...", IDC3_PKBUTTON,  129, 119, 35, 12
     
     
-    AUTOCHECKBOX "Attempt TIS authentication", IDC3_AUTHTIS, 3, 55, 162, 8
+    AUTOCHECKBOX "Allow &agent forwarding", IDC3_AGENTFWD, 3, 135, 162, 8
 END
 
+/* Accelerators used: [aco] stwx */
 IDD_PANEL4 DIALOG DISCARDABLE 6, 30, 168, 163
 STYLE WS_CHILD | WS_VISIBLE | NOT WS_BORDER
 FONT 8, "MS Sans Serif"
@@ -261,6 +304,7 @@ BEGIN
     
 END
 
+/* Accelerators used: [aco] bhlu */
 IDD_PANEL5 DIALOG DISCARDABLE 6, 30, 168, 163
 STYLE WS_CHILD | WS_VISIBLE | NOT WS_BORDER
 FONT 8, "MS Sans Serif"
@@ -271,7 +315,7 @@ BEGIN
     
     AUTOCHECKBOX "Attempt to use &logical palettes", IDC5_PALETTE, 3, 19, 162, 8
     
-    LTEXT "C&olours:", IDC5_STATIC, 3, 35, 162, 8
+    LTEXT "Colo&urs:", IDC5_STATIC, 3, 35, 162, 8
 
     LISTBOX IDC5_LIST, 3, 45, 100, 110,
         LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
@@ -286,6 +330,7 @@ BEGIN
     
 END
 
+/* Accelerators used: [aco] beiknpsx */
 IDD_PANEL6 DIALOG DISCARDABLE  6, 30, 168, 163
 STYLE WS_CHILD | WS_VISIBLE
 FONT 8, "MS Sans Serif"
@@ -307,10 +352,11 @@ BEGIN
     AUTORADIOBUTTON "&KOI8 / Win-1251", IDC6_KOI8WIN1251, 3, 79, 162, 8
     AUTORADIOBUTTON "&ISO-8859-2 / Win-1250", IDC6_88592WIN1250, 3, 89, 162, 8
     
-    AUTOCHECKBOX "CA&PS LOCK acts as cyrillic switch", IDC6_CAPSLOCKCYR, 3, 105, 162, 8
+    AUTOCHECKBOX "CAP&S LOCK acts as cyrillic switch", IDC6_CAPSLOCKCYR, 3, 105, 162, 8
     
 END
 
+/* Accelerators used: c */
 IDD_LOGBOX DIALOG DISCARDABLE 100, 20, 160, 119
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTY Event Log"
@@ -320,6 +366,7 @@ BEGIN
     LISTBOX IDN_LIST, 3, 3, 154, 95, LBS_HASSTRINGS | LBS_USETABSTOPS | WS_VSCROLL
 END
 
+/* No accelerators used */
 IDD_LICENCEBOX DIALOG DISCARDABLE 50, 50, 226, 223
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTY Licence"