From 5fb71671d06dd40ca37a1918f08f1c018fa5d05a Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Thu, 9 Aug 2007 22:13:42 +0000 Subject: [PATCH] pull up r19769 from trunk r19769@cathode-dark-space: kpkoch | 2007-08-09 09:31:11 -0400 Ticket: 5609 Tags: pullup Target_Version: 1.6.3 Control watermark display with registry entry; document the registry entry. ticket: 5609 version_fixed: 1.6.3 git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19796 dc483132-0cff-0310-8789-dd5450dbe970 --- src/windows/identity/ui/credwnd.c | 7 ++++++- src/windows/identity/ui/uiconfig.csv | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/windows/identity/ui/credwnd.c b/src/windows/identity/ui/credwnd.c index c1b824e50..f991fd046 100644 --- a/src/windows/identity/ui/credwnd.c +++ b/src/windows/identity/ui/credwnd.c @@ -33,6 +33,8 @@ khm_int32 khui_cw_flag_id; khm_int32 attr_to_action[KCDB_ATTR_MAX_ID + 1]; +khm_int32 bHideWatermarks = 0; + void khm_set_cw_element_font(wchar_t * name, LOGFONT * pfont) { khm_handle csp_cw = NULL; @@ -462,6 +464,8 @@ cw_load_view(khui_credwnd_tbl * tbl, wchar_t * view, HWND hwnd) { &hc_cw))) return; + khc_read_int32(hc_cw, L"HideWatermarks", &bHideWatermarks); + if(KHM_FAILED(khc_open_space(hc_cw, L"Views", KHM_PERM_READ, &hc_vs))) goto _exit; @@ -2274,7 +2278,8 @@ cw_erase_rect(HDC hdc, rlogo.right = r_wnd->right; rlogo.top = r_wnd->bottom - tbl->kbm_logo_shade.cy; rlogo.bottom = r_wnd->bottom; - rie = IntersectRect(&ri, r_erase, &rlogo); + if (bHideWatermarks) {rie = FALSE;} + else {rie = IntersectRect(&ri, r_erase, &rlogo);} } else { ZeroMemory(&rlogo, sizeof(rlogo)); ZeroMemory(&ri, sizeof(ri)); diff --git a/src/windows/identity/ui/uiconfig.csv b/src/windows/identity/ui/uiconfig.csv index b23f5e7ff..0c76dc065 100644 --- a/src/windows/identity/ui/uiconfig.csv +++ b/src/windows/identity/ui/uiconfig.csv @@ -4,6 +4,7 @@ CredWindow,KC_SPACE,0,"Options for the credentials window as well as the Network AutoStart,KC_INT32,0,"[PRIVATE] Boolean. Start Network Identity Manager automatically when the current user logs in." AutoImport,KC_INT32,1,"Boolean. Import credentials from the LSA cache when Network Identity Manager starts." AutoDetectNet,KC_INT32,1,"Boolean. Automatically detect network connectivity changes." + HideWatermark,KC_INT32,0,"Boolean. Suppress watermark in Credentials display. NOTE: there is no guarantee that this value will exist in future versions." KeepRunning,KC_INT32,1,"Boolean. Run from the system notification area after the main window is closed." DefaultView,KC_STRING,ByIdentity,"[PRIVATE] Name of the default view in Advanced mode." DefaultViewMini,KC_STRING,CompactIdentity,"[PRIVATE] Name of the default view in Basic mode." -- 2.26.2