Minor 'Get Tickets' dialog fixes

-Move 'Remember this principal' and keep visible even when 'advanced'
options are hidden.
-Increase size of 'Forwardable and Proxiable' checkbox.

Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
(cherry picked from commit eb952e349c4e37b81b3f1f30faba6fb707f67dca)

ticket: 7301
status: resolved

diff --git a/src/windows/leashdll/lsh_pwd.c b/src/windows/leashdll/lsh_pwd.c
index 0b753009391a0ad504e0d917b58098a742aed775..d5b7d6988f473b8ccb6ad28f6e76db3df8716c85 100644 (file)
--- a/src/windows/leashdll/lsh_pwd.c
+++ b/src/windows/leashdll/lsh_pwd.c
@@ -1281,7 +1281,6 @@ AdjustOptions(HWND hDialog, int show, int hideDiff)
     ShowWindow(GetDlgItem(hDialog,IDC_CHECK_RENEWABLE),show);
     ShowWindow(GetDlgItem(hDialog,IDC_STATIC_KRB5),show);
     ShowWindow(GetDlgItem(hDialog,IDC_BUTTON_CLEAR_HISTORY),show);
-    ShowWindow(GetDlgItem(hDialog,IDC_CHECK_REMEMBER_PRINCIPAL),show);
 
     GetWindowRect( hDialog, &dlgRect );
     diff = dlgRect.top + GetSystemMetrics(SM_CYCAPTION)

diff --git a/src/windows/leashdll/lsh_pwd.rc b/src/windows/leashdll/lsh_pwd.rc
index fb6e38dab69af3202c9cae1a384429041e67d659..98b4d5c647abf76d48da7baed184a3bdee0ec4b6 100644 (file)
--- a/src/windows/leashdll/lsh_pwd.rc
+++ b/src/windows/leashdll/lsh_pwd.rc
@@ -105,15 +105,15 @@ BEGIN
     PUSHBUTTON      "Hide Advanced",IDC_BUTTON_OPTIONS,146,219,89,14
     PUSHBUTTON      "Clear History",IDC_BUTTON_CLEAR_HISTORY,288,42,60,14
     CONTROL         "Remember this principal", IDC_CHECK_REMEMBER_PRINCIPAL,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,248,78,100,14
+                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,89,72,100,14
     CONTROL         "Ticket Lifetime",IDC_SLIDER_LIFETIME,"msctls_trackbar32",
                     TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,90,97,258,15
     CONTROL         "Forwardable and Proxiable (can be forwarded to other machines)",
                     IDC_CHECK_FORWARDABLE,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,89,123,203,10
+                    WS_TABSTOP,89,123,253,10
     CONTROL         "Renewable (can be renewed during the renewable lifetime)",
                     IDC_CHECK_RENEWABLE,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,89,135,203,10
+                    WS_TABSTOP,89,135,253,10
     CONTROL         "Slider2",IDC_SLIDER_RENEWLIFE,"msctls_trackbar32",
                     TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,90,178,258,15
     RTEXT           "Principal:",IDC_STATIC_NAME,13,44,74,8