X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/937973abb24d92b9e0082e2d8d2eda5a4eb765d3..a4e14164742bbf69bfc294167fd46e203f7eacdd:/win_res.rc diff --git a/win_res.rc b/win_res.rc index d181ed78..e365f1c7 100644 --- a/win_res.rc +++ b/win_res.rc @@ -8,6 +8,10 @@ #define TCS_MULTILINE 0x0200 #endif +#ifdef MINGW32_FIX +#define EDITTEXT EDITTEXT "", +#endif + #include "win_res.h" IDI_MAINICON ICON "putty.ico" @@ -69,9 +73,9 @@ FONT 8, "MS Sans Serif" BEGIN LTEXT "Host &Name", IDC0_HOSTSTATIC, 3, 3, 119, 8 - EDITTEXT "", IDC0_HOST, 3, 11, 119, 12, ES_AUTOHSCROLL + EDITTEXT IDC0_HOST, 3, 11, 119, 12, ES_AUTOHSCROLL LTEXT "&Port", IDC0_PORTSTATIC, 129, 3, 35, 8 - EDITTEXT "", IDC0_PORT, 129, 11, 35, 12 + EDITTEXT IDC0_PORT, 129, 11, 35, 12 #ifdef FWHACK @@ -91,7 +95,7 @@ BEGIN LTEXT "Stor&ed Sessions", IDC0_SESSSTATIC, 3, 37, 162, 8 - EDITTEXT "", IDC0_SESSEDIT, 3, 45, 119, 12, ES_AUTOHSCROLL + EDITTEXT IDC0_SESSEDIT, 3, 45, 119, 12, ES_AUTOHSCROLL LISTBOX IDC0_SESSLIST, 3, 59, 119, 71, @@ -141,7 +145,7 @@ BEGIN AUTOCHECKBOX "Reset scrollback on &keypress", IDC1_SCROLLKEY, 3, 143, 162, 8 END -/* Accelerators used: [aco] bdghiklmnprswy */ +/* 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" @@ -151,12 +155,12 @@ BEGIN LTEXT "Terminal screen dimensions:", IDC2_DIMSTATIC, 3, 3, 162, 8 RTEXT "&Rows", IDC2_ROWSSTATIC, 3, 15, 35, 8 - EDITTEXT "", IDC2_ROWSEDIT, 45, 13, 35, 12 + EDITTEXT IDC2_ROWSEDIT, 45, 13, 35, 12 RTEXT "Colu&mns", IDC2_COLSSTATIC, 87, 15, 35, 8 - EDITTEXT "", IDC2_COLSEDIT, 129, 13, 35, 12 + EDITTEXT IDC2_COLSEDIT, 129, 13, 35, 12 RTEXT "&Saved lines of scrollback", IDC2_SAVESTATIC, 3, 30, 119, 8 - EDITTEXT "", IDC2_SAVEEDIT, 129, 28, 35, 12 + EDITTEXT IDC2_SAVEEDIT, 129, 28, 35, 12 RTEXT "Font:", IDC2_FONTSTATIC, 3, 48, 105, 8 @@ -166,17 +170,30 @@ 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 Back&ground colour erase", IDC2_BCE, 3, 142, 162, 8 - AUTOCHECKBOX "Enable bli&nking 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 */ @@ -187,22 +204,22 @@ FONT 8, "MS Sans Serif" BEGIN LTEXT "Terminal-&type string", IDC3_TTSTATIC, 3, 5, 77, 8 - EDITTEXT "", IDC3_TTEDIT, 87, 3, 77, 12, ES_AUTOHSCROLL + EDITTEXT IDC3_TTEDIT, 87, 3, 77, 12, ES_AUTOHSCROLL LTEXT "Terminal-&speed string", IDC3_TSSTATIC, 3, 19, 77, 8 - EDITTEXT "", IDC3_TSEDIT, 87, 17, 77, 12, ES_AUTOHSCROLL + EDITTEXT IDC3_TSEDIT, 87, 17, 77, 12, ES_AUTOHSCROLL LTEXT "Auto-login &username", IDC3_LOGSTATIC, 3, 33, 77, 8 - EDITTEXT "", IDC3_LOGEDIT, 87, 31, 77, 12, ES_AUTOHSCROLL + EDITTEXT IDC3_LOGEDIT, 87, 31, 77, 12, ES_AUTOHSCROLL LTEXT "Environment variables:", IDC3_ENVSTATIC, 3, 53, 162, 8 LTEXT "&Variable", IDC3_VARSTATIC, 3, 65, 26, 8 - EDITTEXT "", IDC3_VAREDIT, 36, 63, 26, 12, ES_AUTOHSCROLL + EDITTEXT IDC3_VAREDIT, 36, 63, 26, 12, ES_AUTOHSCROLL LTEXT "Va&lue", IDC3_VALSTATIC, 70, 65, 26, 8 - EDITTEXT "", IDC3_VALEDIT, 104, 63, 59, 12, ES_AUTOHSCROLL + EDITTEXT IDC3_VALEDIT, 104, 63, 59, 12, ES_AUTOHSCROLL @@ -220,7 +237,7 @@ BEGIN END -/* Accelerators used: [aco] 123abdhkmptu */ +/* 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" @@ -228,18 +245,18 @@ FONT 8, "MS Sans Serif" BEGIN LTEXT "Terminal-&type string", IDC3_TTSTATIC, 3, 5, 77, 8 - EDITTEXT "", IDC3_TTEDIT, 87, 3, 77, 12, ES_AUTOHSCROLL + EDITTEXT IDC3_TTEDIT, 87, 3, 77, 12, ES_AUTOHSCROLL AUTOCHECKBOX "Don't allocate a &pseudo-terminal", IDC3_NOPTY, 3, 19, 162, 8 LTEXT "Auto-login &username", IDC3_LOGSTATIC, 3, 31, 77, 8 - EDITTEXT "", IDC3_LOGEDIT, 87, 29, 77, 12, ES_AUTOHSCROLL + EDITTEXT IDC3_LOGEDIT, 87, 29, 77, 12, ES_AUTOHSCROLL 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, WS_GROUP + AUTORADIOBUTTON "&Blowfish", IDC3_CIPHERBLOWF, 79, 45, 38, 8 AUTORADIOBUTTON "&DES", IDC3_CIPHERDES, 125, 45, 38, 8 @@ -252,12 +269,15 @@ BEGIN LTEXT "Public &key file:", IDC3_PKSTATIC, 3, 85, 119, 8 - EDITTEXT "", IDC3_PKEDIT, 3, 93, 119, 12, ES_AUTOHSCROLL + 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, 93, 35, 12 + PUSHBUTTON "C&hange...", IDC3_PKBUTTON, 129, 119, 35, 12 - AUTOCHECKBOX "Allow &agent forwarding", IDC3_AGENTFWD, 3, 109, 162, 8 + AUTOCHECKBOX "Allow &agent forwarding", IDC3_AGENTFWD, 3, 135, 162, 8 END /* Accelerators used: [aco] stwx */ @@ -280,7 +300,7 @@ BEGIN PUSHBUTTON "&Set", IDC4_CCSET, 33, 147, 34, 14 LTEXT "&to class", IDC4_CCSTATIC2, 73, 147+3, 26, 8 - EDITTEXT "", IDC4_CCEDIT, 105, 147+1, 36, 12 + EDITTEXT IDC4_CCEDIT, 105, 147+1, 36, 12 END