mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-03-16 03:53:01 -05:00
Split the Window panel into two to make room for proper comments
[originally from svn r1422]
This commit is contained in:
parent
59f3434672
commit
66a5fe7301
62
windlg.c
62
windlg.c
@ -361,17 +361,22 @@ enum { IDCX_ABOUT =
|
|||||||
IDC_RESIZEEITHER,
|
IDC_RESIZEEITHER,
|
||||||
IDC_SCROLLBAR,
|
IDC_SCROLLBAR,
|
||||||
IDC_SCROLLBARFULLSCREEN,
|
IDC_SCROLLBARFULLSCREEN,
|
||||||
IDC_CLOSEWARN,
|
|
||||||
IDC_SAVESTATIC,
|
IDC_SAVESTATIC,
|
||||||
IDC_SAVEEDIT,
|
IDC_SAVEEDIT,
|
||||||
|
IDC_SCROLLKEY,
|
||||||
|
IDC_SCROLLDISP,
|
||||||
|
windowpanelend,
|
||||||
|
|
||||||
|
behaviourpanelstart,
|
||||||
|
IDC_TITLE_BEHAVIOUR,
|
||||||
|
IDC_BOX_BEHAVIOUR1,
|
||||||
|
IDC_CLOSEWARN,
|
||||||
IDC_ALTF4,
|
IDC_ALTF4,
|
||||||
IDC_ALTSPACE,
|
IDC_ALTSPACE,
|
||||||
IDC_ALTONLY,
|
IDC_ALTONLY,
|
||||||
IDC_SCROLLKEY,
|
|
||||||
IDC_SCROLLDISP,
|
|
||||||
IDC_ALWAYSONTOP,
|
IDC_ALWAYSONTOP,
|
||||||
IDC_FULLSCREENONALTENTER,
|
IDC_FULLSCREENONALTENTER,
|
||||||
windowpanelend,
|
behaviourpanelend,
|
||||||
|
|
||||||
appearancepanelstart,
|
appearancepanelstart,
|
||||||
IDC_TITLE_APPEARANCE,
|
IDC_TITLE_APPEARANCE,
|
||||||
@ -1010,10 +1015,8 @@ static void create_controls(HWND hwnd, int dlgtype, int panel)
|
|||||||
/* The Keyboard panel. Accelerators used: [acgo] bhf ruyntd */
|
/* The Keyboard panel. Accelerators used: [acgo] bhf ruyntd */
|
||||||
struct ctlpos cp;
|
struct ctlpos cp;
|
||||||
ctlposinit(&cp, hwnd, 80, 3, 13);
|
ctlposinit(&cp, hwnd, 80, 3, 13);
|
||||||
/*
|
bartitle(&cp, "Options controlling the effects of keys",
|
||||||
bartitle(&cp, "Options controlling the effects of keys",
|
IDC_TITLE_KEYBOARD);
|
||||||
IDC_TITLE_KEYBOARD);
|
|
||||||
*/
|
|
||||||
beginbox(&cp, "Change the sequences sent by:", IDC_BOX_KEYBOARD1);
|
beginbox(&cp, "Change the sequences sent by:", IDC_BOX_KEYBOARD1);
|
||||||
radioline(&cp, "The &Backspace key", IDC_DELSTATIC, 2,
|
radioline(&cp, "The &Backspace key", IDC_DELSTATIC, 2,
|
||||||
"Control-H", IDC_DEL008,
|
"Control-H", IDC_DEL008,
|
||||||
@ -1050,7 +1053,7 @@ static void create_controls(HWND hwnd, int dlgtype, int panel)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (panel == windowpanelstart) {
|
if (panel == windowpanelstart) {
|
||||||
/* The Window panel. Accelerators used: [acgo] rmz sdikp w4ylt f */
|
/* The Window panel. Accelerators used: [acgo] rmz sdikp */
|
||||||
struct ctlpos cp;
|
struct ctlpos cp;
|
||||||
ctlposinit(&cp, hwnd, 80, 3, 13);
|
ctlposinit(&cp, hwnd, 80, 3, 13);
|
||||||
bartitle(&cp, "Options controlling PuTTY's window",
|
bartitle(&cp, "Options controlling PuTTY's window",
|
||||||
@ -1059,11 +1062,11 @@ static void create_controls(HWND hwnd, int dlgtype, int panel)
|
|||||||
multiedit(&cp,
|
multiedit(&cp,
|
||||||
"&Rows", IDC_ROWSSTATIC, IDC_ROWSEDIT, 50,
|
"&Rows", IDC_ROWSSTATIC, IDC_ROWSEDIT, 50,
|
||||||
"Colu&mns", IDC_COLSSTATIC, IDC_COLSEDIT, 50, NULL);
|
"Colu&mns", IDC_COLSSTATIC, IDC_COLSEDIT, 50, NULL);
|
||||||
radioline(&cp, "When window is resi&zed, change:", IDC_RESIZESTATIC,
|
radiobig(&cp, "When window is resi&zed:", IDC_RESIZESTATIC,
|
||||||
4, "Terminal", IDC_RESIZETERM,
|
"Change the number of rows and columns", IDC_RESIZETERM,
|
||||||
"Font", IDC_RESIZEFONT,
|
"Change the size of the font", IDC_RESIZEFONT,
|
||||||
"Special", IDC_RESIZEEITHER,
|
"Change font size only when maximised", IDC_RESIZEEITHER,
|
||||||
"Nothing", IDC_RESIZENONE, NULL);
|
"Forbid resizing completely", IDC_RESIZENONE, NULL);
|
||||||
endbox(&cp);
|
endbox(&cp);
|
||||||
beginbox(&cp, "Control the scrollback in the window",
|
beginbox(&cp, "Control the scrollback in the window",
|
||||||
IDC_BOX_WINDOW2);
|
IDC_BOX_WINDOW2);
|
||||||
@ -1075,22 +1078,14 @@ static void create_controls(HWND hwnd, int dlgtype, int panel)
|
|||||||
checkbox(&cp, "Reset scrollback on dis&play activity",
|
checkbox(&cp, "Reset scrollback on dis&play activity",
|
||||||
IDC_SCROLLDISP);
|
IDC_SCROLLDISP);
|
||||||
endbox(&cp);
|
endbox(&cp);
|
||||||
beginbox(&cp, NULL, IDC_BOX_WINDOW3);
|
|
||||||
checkbox(&cp, "&Warn before closing window", IDC_CLOSEWARN);
|
|
||||||
checkbox(&cp, "Window closes on ALT-F&4", IDC_ALTF4);
|
|
||||||
checkbox(&cp, "S&ystem menu appears on ALT-Space", IDC_ALTSPACE);
|
|
||||||
checkbox(&cp, "System menu appears on A< alone", IDC_ALTONLY);
|
|
||||||
checkbox(&cp, "Ensure window is always on &top", IDC_ALWAYSONTOP);
|
|
||||||
checkbox(&cp, "&Full screen on Alt-Enter", IDC_FULLSCREENONALTENTER);
|
|
||||||
endbox(&cp);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (panel == appearancepanelstart) {
|
if (panel == appearancepanelstart) {
|
||||||
/* The Appearance panel. Accelerators used: [acgo] luvb h ti p s */
|
/* The Appearance panel. Accelerators used: [acgo] luvb h ti p s */
|
||||||
struct ctlpos cp;
|
struct ctlpos cp;
|
||||||
ctlposinit(&cp, hwnd, 80, 3, 13);
|
ctlposinit(&cp, hwnd, 80, 3, 13);
|
||||||
/* bartitle(&cp, "Options controlling PuTTY's appearance",
|
bartitle(&cp, "Configure the appearance of PuTTY's window",
|
||||||
IDC_TITLE_APPEARANCE); */
|
IDC_TITLE_APPEARANCE);
|
||||||
beginbox(&cp, "Adjust the use of the cursor", IDC_BOX_APPEARANCE1);
|
beginbox(&cp, "Adjust the use of the cursor", IDC_BOX_APPEARANCE1);
|
||||||
radioline(&cp, "Cursor appearance:", IDC_CURSORSTATIC, 3,
|
radioline(&cp, "Cursor appearance:", IDC_CURSORSTATIC, 3,
|
||||||
"B&lock", IDC_CURBLOCK,
|
"B&lock", IDC_CURBLOCK,
|
||||||
@ -1121,6 +1116,22 @@ static void create_controls(HWND hwnd, int dlgtype, int panel)
|
|||||||
endbox(&cp);
|
endbox(&cp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (panel == behaviourpanelstart) {
|
||||||
|
/* The Behaviour panel. Accelerators used: [acgo] w4yltf */
|
||||||
|
struct ctlpos cp;
|
||||||
|
ctlposinit(&cp, hwnd, 80, 3, 13);
|
||||||
|
bartitle(&cp, "Configure the behaviour of PuTTY's window",
|
||||||
|
IDC_TITLE_WINDOW);
|
||||||
|
beginbox(&cp, NULL, IDC_BOX_BEHAVIOUR1);
|
||||||
|
checkbox(&cp, "&Warn before closing window", IDC_CLOSEWARN);
|
||||||
|
checkbox(&cp, "Window closes on ALT-F&4", IDC_ALTF4);
|
||||||
|
checkbox(&cp, "S&ystem menu appears on ALT-Space", IDC_ALTSPACE);
|
||||||
|
checkbox(&cp, "System menu appears on A< alone", IDC_ALTONLY);
|
||||||
|
checkbox(&cp, "Ensure window is always on &top", IDC_ALWAYSONTOP);
|
||||||
|
checkbox(&cp, "&Full screen on Alt-Enter", IDC_FULLSCREENONALTENTER);
|
||||||
|
endbox(&cp);
|
||||||
|
}
|
||||||
|
|
||||||
if (panel == translationpanelstart) {
|
if (panel == translationpanelstart) {
|
||||||
/* The Translation panel. Accelerators used: [acgo] rxbepus */
|
/* The Translation panel. Accelerators used: [acgo] rxbepus */
|
||||||
struct ctlpos cp;
|
struct ctlpos cp;
|
||||||
@ -1479,6 +1490,7 @@ static int GenericMainDlgProc(HWND hwnd, UINT msg,
|
|||||||
treeview_insert(&tvfaff, 1, "Bell");
|
treeview_insert(&tvfaff, 1, "Bell");
|
||||||
treeview_insert(&tvfaff, 0, "Window");
|
treeview_insert(&tvfaff, 0, "Window");
|
||||||
treeview_insert(&tvfaff, 1, "Appearance");
|
treeview_insert(&tvfaff, 1, "Appearance");
|
||||||
|
treeview_insert(&tvfaff, 1, "Behaviour");
|
||||||
treeview_insert(&tvfaff, 1, "Translation");
|
treeview_insert(&tvfaff, 1, "Translation");
|
||||||
treeview_insert(&tvfaff, 1, "Selection");
|
treeview_insert(&tvfaff, 1, "Selection");
|
||||||
treeview_insert(&tvfaff, 1, "Colours");
|
treeview_insert(&tvfaff, 1, "Colours");
|
||||||
@ -1559,6 +1571,8 @@ static int GenericMainDlgProc(HWND hwnd, UINT msg,
|
|||||||
create_controls(hwnd, dlgtype, windowpanelstart);
|
create_controls(hwnd, dlgtype, windowpanelstart);
|
||||||
if (!strcmp(buffer, "Appearance"))
|
if (!strcmp(buffer, "Appearance"))
|
||||||
create_controls(hwnd, dlgtype, appearancepanelstart);
|
create_controls(hwnd, dlgtype, appearancepanelstart);
|
||||||
|
if (!strcmp(buffer, "Behaviour"))
|
||||||
|
create_controls(hwnd, dlgtype, behaviourpanelstart);
|
||||||
if (!strcmp(buffer, "Tunnels"))
|
if (!strcmp(buffer, "Tunnels"))
|
||||||
create_controls(hwnd, dlgtype, tunnelspanelstart);
|
create_controls(hwnd, dlgtype, tunnelspanelstart);
|
||||||
if (!strcmp(buffer, "Connection"))
|
if (!strcmp(buffer, "Connection"))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user