From a9e4d75b262003eabe0bced74ce4abd1238b01b8 Mon Sep 17 00:00:00 2001 From: "danm%netscape.com" Date: Tue, 11 Aug 1998 03:40:14 +0000 Subject: [PATCH] moved privacy prefs to their own (private) pane git-svn-id: svn://10.0.0.236/trunk@7728 18797224-902f-48f8-a5cc-f745e15eee43 --- .../cmd/winfe/prefs/brpref/src/advpages.cpp | 26 -------- .../cmd/winfe/prefs/brpref/src/brpages.cpp | 64 +++++++++++++++++++ mozilla/cmd/winfe/prefs/brpref/src/brpref.cpp | 3 +- mozilla/cmd/winfe/prefs/brpref/src/brpref.rc | 35 +++++++--- mozilla/cmd/winfe/prefs/brpref/src/pages.h | 24 +++++-- mozilla/cmd/winfe/prefs/brpref/src/resource.h | 1 + 6 files changed, 113 insertions(+), 40 deletions(-) diff --git a/mozilla/cmd/winfe/prefs/brpref/src/advpages.cpp b/mozilla/cmd/winfe/prefs/brpref/src/advpages.cpp index 31d5ca00be2..46e1ce61a08 100644 --- a/mozilla/cmd/winfe/prefs/brpref/src/advpages.cpp +++ b/mozilla/cmd/winfe/prefs/brpref/src/advpages.cpp @@ -69,15 +69,6 @@ CAdvancedPrefs::InitDialog() CheckIfLockedPref("javascript.enabled", IDC_CHECK3); CheckIfLockedPref("browser.enable_style_sheets", IDC_CHECK4); CheckIfLockedPref("security.email_as_ftp_password", IDC_CHECK6); - CheckIfLockedPref("network.signon.rememberSignons", IDC_CHECK7); - CheckIfLockedPref("privacy.warn_no_policy", IDC_CHECK8); - - if (PREF_PrefIsLocked("network.cookie.cookieBehavior")) { - // Disable all the radio buttons in the group - DisableRadioButtonGroup(IDC_RADIO1); - } - - CheckIfLockedPref("network.cookie.warnAboutCookies", IDC_CHECK9); return CBrowserPropertyPage::InitDialog(); } @@ -92,15 +83,6 @@ CAdvancedPrefs::Activate(HWND hwndParent, LPCRECT lprc, BOOL bModal) PREF_GetBoolPref("javascript.enabled", &m_bEnableJavaScript); PREF_GetBoolPref("browser.enable_style_sheets", &m_bEnableStyleSheets); PREF_GetBoolPref("security.email_as_ftp_password", &m_bSendEmailAddressForFTPPassword); - - int32 n; - - PREF_GetIntPref("network.cookie.cookieBehavior", &n); - m_nCookieAcceptance = (int)n; - - PREF_GetBoolPref("network.signon.rememberSignons", &m_bRememberSignons); - PREF_GetBoolPref("privacy.warn_no_policy", &m_bPrivacyPolicy); - PREF_GetBoolPref("network.cookie.warnAboutCookies", &m_bWarnAboutCookies); } return CBrowserPropertyPage::Activate(hwndParent, lprc, bModal); @@ -114,10 +96,6 @@ CAdvancedPrefs::DoTransfer(BOOL bSaveAndValidate) CheckBoxTransfer(IDC_CHECK3, m_bEnableJavaScript, bSaveAndValidate); CheckBoxTransfer(IDC_CHECK4, m_bEnableStyleSheets, bSaveAndValidate); CheckBoxTransfer(IDC_CHECK6, m_bSendEmailAddressForFTPPassword, bSaveAndValidate); - RadioButtonTransfer(IDC_RADIO1, m_nCookieAcceptance, bSaveAndValidate); - CheckBoxTransfer(IDC_CHECK7, m_bRememberSignons, bSaveAndValidate); - CheckBoxTransfer(IDC_CHECK8, m_bPrivacyPolicy, bSaveAndValidate); - CheckBoxTransfer(IDC_CHECK9, m_bWarnAboutCookies, bSaveAndValidate); return TRUE; } @@ -130,10 +108,6 @@ CAdvancedPrefs::ApplyChanges() PREF_SetBoolPref("javascript.enabled", m_bEnableJavaScript); PREF_SetBoolPref("browser.enable_style_sheets", m_bEnableStyleSheets); PREF_SetBoolPref("security.email_as_ftp_password", m_bSendEmailAddressForFTPPassword); - PREF_SetIntPref("network.cookie.cookieBehavior", (int32)m_nCookieAcceptance); - PREF_SetBoolPref("network.signon.rememberSignons", m_bRememberSignons); - PREF_SetBoolPref("privacy.warn_no_policy", m_bPrivacyPolicy); - PREF_SetBoolPref("network.cookie.warnAboutCookies", m_bWarnAboutCookies); return TRUE; } diff --git a/mozilla/cmd/winfe/prefs/brpref/src/brpages.cpp b/mozilla/cmd/winfe/prefs/brpref/src/brpages.cpp index 6b0bfedc7ca..d3a8156e314 100644 --- a/mozilla/cmd/winfe/prefs/brpref/src/brpages.cpp +++ b/mozilla/cmd/winfe/prefs/brpref/src/brpages.cpp @@ -2112,3 +2112,67 @@ CSmartBrowsingPrefs::InitDialog() return CBrowserPropertyPage::InitDialog(); } + +///////////////////////////////////////////////////////////////////////////// +// CPrivacyPrefs implementation + +CPrivacyPrefs::CPrivacyPrefs() + : CBrowserPropertyPage(IDD_PRIVACY, HELP_PREFS_BROWSER) +{ +} + +// Initialize member data using XP preferences +STDMETHODIMP +CPrivacyPrefs::Activate(HWND hwndParent, LPCRECT lprc, BOOL bModal) +{ + if (!m_bHasBeenActivated) { + + int32 n; + + PREF_GetIntPref("network.cookie.cookieBehavior", &n); + m_nCookieAcceptance = (int)n; + + PREF_GetBoolPref("network.signon.rememberSignons", &m_bRememberSignons); + PREF_GetBoolPref("privacy.warn_no_policy", &m_bPrivacyPolicy); + PREF_GetBoolPref("network.cookie.warnAboutCookies", &m_bWarnAboutCookies); + } + + return CBrowserPropertyPage::Activate(hwndParent, lprc, bModal); +} + +BOOL +CPrivacyPrefs::DoTransfer(BOOL bSaveAndValidate) +{ + RadioButtonTransfer(IDC_RADIO1, m_nCookieAcceptance, bSaveAndValidate); + CheckBoxTransfer(IDC_CHECK7, m_bRememberSignons, bSaveAndValidate); + CheckBoxTransfer(IDC_CHECK8, m_bPrivacyPolicy, bSaveAndValidate); + CheckBoxTransfer(IDC_CHECK9, m_bWarnAboutCookies, bSaveAndValidate); + return TRUE; +} + +// Apply changes using XP preferences +BOOL +CPrivacyPrefs::ApplyChanges() +{ + PREF_SetIntPref("network.cookie.cookieBehavior", (int32)m_nCookieAcceptance); + PREF_SetBoolPref("network.signon.rememberSignons", m_bRememberSignons); + PREF_SetBoolPref("privacy.warn_no_policy", m_bPrivacyPolicy); + PREF_SetBoolPref("network.cookie.warnAboutCookies", m_bWarnAboutCookies); + return TRUE; +} + +BOOL +CPrivacyPrefs::InitDialog() +{ + CheckIfLockedPref("network.signon.rememberSignons", IDC_CHECK7); + CheckIfLockedPref("privacy.warn_no_policy", IDC_CHECK8); + + if (PREF_PrefIsLocked("network.cookie.cookieBehavior")) { + // Disable all the radio buttons in the group + DisableRadioButtonGroup(IDC_RADIO1); + } + + CheckIfLockedPref("network.cookie.warnAboutCookies", IDC_CHECK9); + + return CBrowserPropertyPage::InitDialog(); +} diff --git a/mozilla/cmd/winfe/prefs/brpref/src/brpref.cpp b/mozilla/cmd/winfe/prefs/brpref/src/brpref.cpp index e31041b83c3..48b2521ffb5 100644 --- a/mozilla/cmd/winfe/prefs/brpref/src/brpref.cpp +++ b/mozilla/cmd/winfe/prefs/brpref/src/brpref.cpp @@ -281,7 +281,7 @@ CBrowserCategory::CSpecifyBrowserPageObjects::GetPageObjects(CAPPAGE *pPages) if (!pPages) return ResultFromScode(E_POINTER); - pPages->cElems = 4; + pPages->cElems = 5; pPages->pElems = (LPPROPERTYPAGE *)CoTaskMemAlloc(pPages->cElems * sizeof(LPPROPERTYPAGE)); if (!pPages->pElems) return ResultFromScode(E_OUTOFMEMORY); @@ -290,6 +290,7 @@ CBrowserCategory::CSpecifyBrowserPageObjects::GetPageObjects(CAPPAGE *pPages) pPages->pElems[1] = new CLanguagesPrefs; pPages->pElems[2] = new CApplicationsPrefs; pPages->pElems[3] = new CSmartBrowsingPrefs; + pPages->pElems[4] = new CPrivacyPrefs; for (ULONG i = 0; i < pPages->cElems; i++) pPages->pElems[i]->AddRef(); diff --git a/mozilla/cmd/winfe/prefs/brpref/src/brpref.rc b/mozilla/cmd/winfe/prefs/brpref/src/brpref.rc index e64c8d8bcd3..f27e3143e70 100644 --- a/mozilla/cmd/winfe/prefs/brpref/src/brpref.rc +++ b/mozilla/cmd/winfe/prefs/brpref/src/brpref.rc @@ -152,7 +152,7 @@ IDD_ADVANCED DIALOG DISCARDABLE 0, 0, 256, 190 STYLE WS_CHILD | WS_CLIPSIBLINGS FONT 8, "MS Sans Serif" BEGIN - GROUPBOX "",-1,7,7,242,106,WS_GROUP + GROUPBOX "",-1,7,7,242,82,WS_GROUP CONTROL "Automatically load &images",IDC_CHECK1,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,18,97,10 CONTROL "Enable &Java",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | @@ -164,19 +164,26 @@ BEGIN CONTROL "Send &email address as anonymous FTP password", IDC_CHECK6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,70, 172,10 +END + +IDD_PRIVACY DIALOG DISCARDABLE 0, 0, 256, 190 +STYLE WS_CHILD | WS_CLIPSIBLINGS +FONT 8, "MS Sans Serif" +BEGIN + GROUPBOX "Privacy",-1,7,7,242,39,WS_GROUP CONTROL "Save Logins and Passwords",IDC_CHECK7,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,17,83,150,10 - CONTROL "Warn me if server has no privacy policy",IDC_CHECK8,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,17,96,150,10 - GROUPBOX "Cookies",-1,7,119,242,72 + BS_AUTOCHECKBOX | WS_TABSTOP,17,18,150,10 + CONTROL "Warn me if server has no privacy policy",IDC_CHECK8, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,31,150,10 + GROUPBOX "Cookies",-1,7,50,242,65 CONTROL "&Accept all cookies",IDC_RADIO1,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,17,130,74,10 + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,17,61,74,10 CONTROL "Accept &only cookies that get sent back to the originating server", - IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,17,143,215,10 + IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,17,74,215,10 CONTROL "&Disable cookies",IDC_RADIO3,"Button", - BS_AUTORADIOBUTTON,17,156,66,10 + BS_AUTORADIOBUTTON,17,87,66,10 CONTROL "&Warn me before accepting a cookie",IDC_CHECK9,"Button", - BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,18,174,139,10 + BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,17,100,139,10 END IDD_CACHE DIALOG DISCARDABLE 0, 0, 256, 190 @@ -632,6 +639,15 @@ BEGIN TOPMARGIN, 7 BOTTOMMARGIN, 183 END + + IDD_PRIVACY, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 249 + TOPMARGIN, 7 + BOTTOMMARGIN, 183 + END + END #endif // APSTUDIO_INVOKED @@ -811,6 +827,7 @@ BEGIN IDS_NUMERIC_ONLY "Please enter numeric digits only." IDS_MORE_DISK_SPACE "More disk space" IDD_SMARTBROWSING "Smart Browsing\nConfigure browsing aids" + IDD_PRIVACY "Privacy\nEstablish your level of privacy protection" END #ifdef MOZ_SMARTUPDATE diff --git a/mozilla/cmd/winfe/prefs/brpref/src/pages.h b/mozilla/cmd/winfe/prefs/brpref/src/pages.h index bb06e83c5f6..d8b0e0dbbf9 100644 --- a/mozilla/cmd/winfe/prefs/brpref/src/pages.h +++ b/mozilla/cmd/winfe/prefs/brpref/src/pages.h @@ -262,6 +262,26 @@ class CSmartBrowsingPrefs : public CBrowserPropertyPage { CString m_strExcludedDomains; }; +///////////////////////////////////////////////////////////////////////////// +// CPrivacyPrefs + +class CPrivacyPrefs : public CBrowserPropertyPage { + public: + CPrivacyPrefs(); + + protected: + STDMETHODIMP Activate(HWND hwndParent, LPCRECT lprc, BOOL bModal); + BOOL DoTransfer(BOOL bSaveAndValidate); + BOOL ApplyChanges(); + BOOL InitDialog(); + + private: + int m_nCookieAcceptance; + BOOL m_bRememberSignons; + BOOL m_bPrivacyPolicy; + BOOL m_bWarnAboutCookies; +}; + ///////////////////////////////////////////////////////////////////////////// // CAdvancedPrefs @@ -281,10 +301,6 @@ class CAdvancedPrefs : public CBrowserPropertyPage { BOOL m_bEnableJavaScript; BOOL m_bEnableStyleSheets; BOOL m_bSendEmailAddressForFTPPassword; - int m_nCookieAcceptance; - BOOL m_bRememberSignons; - BOOL m_bPrivacyPolicy; - BOOL m_bWarnAboutCookies; }; ///////////////////////////////////////////////////////////////////////////// diff --git a/mozilla/cmd/winfe/prefs/brpref/src/resource.h b/mozilla/cmd/winfe/prefs/brpref/src/resource.h index 2c62474fa3e..cd4728f1222 100644 --- a/mozilla/cmd/winfe/prefs/brpref/src/resource.h +++ b/mozilla/cmd/winfe/prefs/brpref/src/resource.h @@ -131,6 +131,7 @@ #define IDS_ERROR_UNINSTALL 146 #endif /* MOZ_SMARTUPDATE */ #define IDD_SMARTBROWSING 147 +#define IDD_PRIVACY 148 #define IDC_EXTENSION 309 #define IDC_ICON1 316 #define IDC_ICON2 317