From e9260deb0f09979c2d4f56a47ca39a2d59aebe49 Mon Sep 17 00:00:00 2001 From: "sdagley%netscape.com" Date: Wed, 7 Oct 1998 01:34:35 +0000 Subject: [PATCH] Implement Privacy menu on Mac git-svn-id: svn://10.0.0.236/trunk@12145 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/cmd/macfe/central/uapp.cp | 36 ++++++++++++++++++ mozilla/cmd/macfe/gui/CBrowserView.cp | 31 +++++++++++++++ mozilla/cmd/macfe/gui/CBrowserWindow.cp | 4 ++ mozilla/cmd/macfe/gui/CHTMLView.cp | 4 ++ mozilla/cmd/macfe/include/resgui.h | 8 ++++ .../cmd/macfe/rsrc/navigator/MenusRat.cnst | Bin 13653 -> 13825 bytes 6 files changed, 83 insertions(+) diff --git a/mozilla/cmd/macfe/central/uapp.cp b/mozilla/cmd/macfe/central/uapp.cp index 72c892faa51..c154a77c40d 100644 --- a/mozilla/cmd/macfe/central/uapp.cp +++ b/mozilla/cmd/macfe/central/uapp.cp @@ -183,6 +183,8 @@ PREventQueue *mozilla_event_queue = NULL; #endif #include +#include "privacy.h" + // HERE ONLY UNTIL NAV SERVICES CODE MERGED INTO TIP Boolean SimpleOpenDlog ( short numTypes, const OSType typeList[], FSSpec* outFSSpec ) ; @@ -2521,9 +2523,18 @@ void CFrontApp::FindCommandStatus( CommandT command, Boolean& enabled, case cmd_BookmarksWindow: case cmd_HistoryWindow: + case cmd_PrivDisplayCookies: + case cmd_PrivDisplaySignons: + case cmd_PrivAboutPrivacy: enabled = !Memory_MemoryIsLow(); break; + case cmd_PrivAnonMode: + usesMark = true; + mark = PRVCY_IsAnonymous() ? 0x12 : 0; + enabled = TRUE; + break; + case cmd_LaunchImportModule: enabled = mImportModuleExists; break; @@ -2651,6 +2662,31 @@ Boolean CFrontApp::ObeyCommand(CommandT inCommand, void* ioParam) } break; + case cmd_PrivAnonMode: + { + PRVCY_ToggleAnonymous(); + SetUpdateCommandStatus(true); + break; + } + + case cmd_PrivDisplayCookies: + { + NET_DisplayCookieInfoAsHTML(nil); + break; + } + + case cmd_PrivDisplaySignons: + { + SI_DisplaySignonInfoAsHTML(nil); + break; + } + + case cmd_PrivAboutPrivacy: + { + DoGetURL(PRVCY_TutorialURL()); + break; + } + case cmd_NCOpenNewWindow: { HT_Resource node = reinterpret_cast(ioParam); diff --git a/mozilla/cmd/macfe/gui/CBrowserView.cp b/mozilla/cmd/macfe/gui/CBrowserView.cp index 335330634f4..7822f35d3e4 100644 --- a/mozilla/cmd/macfe/gui/CBrowserView.cp +++ b/mozilla/cmd/macfe/gui/CBrowserView.cp @@ -45,6 +45,7 @@ extern "C" { #include "resgui.h" #include "CMochaHacks.h" +#include "privacy.h" class CBrowserViewDoDragReceiveMochaCallback; @@ -202,6 +203,18 @@ void CBrowserView::FindCommandStatus(CommandT inCommand, outEnabled = HasFTPUpload( GetContext() ) && !isHTMLHelp; break; + case cmd_PrivDisplayPolicy: + mwcontext = *GetContext(); + if (mwcontext && !XP_IsContextBusy(mwcontext)) + outEnabled = PRVCY_CurrentHasPrivacyPolicy(mwcontext); + else + outEnabled = false; + break; + + case cmd_PrivDisplaySiteInfo: + outEnabled = true; + break; + default: Inherited::FindCommandStatus(inCommand, outEnabled, outUsesMark, outMark, outName); break; @@ -211,6 +224,7 @@ void CBrowserView::FindCommandStatus(CommandT inCommand, Boolean CBrowserView::ObeyCommand(CommandT inCommand, void* ioParam) { Boolean cmdHandled = false; + MWContext* mwcontext; switch (inCommand) { @@ -264,6 +278,8 @@ Boolean CBrowserView::ObeyCommand(CommandT inCommand, void* ioParam) request->files_to_post = newFileList; GetContext()->SwitchLoadURL( request, FO_CACHE_AND_PRESENT ); } + + cmdHandled = true; } break; @@ -273,6 +289,21 @@ Boolean CBrowserView::ObeyCommand(CommandT inCommand, void* ioParam) // CURLDispatcher::GetURLDispatcher()->DispatchToView(mContext, aboutURL, FO_CACHE_AND_PRESENT, false, 1010, false); // break; + case cmd_PrivDisplayPolicy: + mwcontext = *GetContext(); + char * url = PRVCY_GetCurrentPrivacyPolicyURL(mwcontext); + URL_Struct* theURL = NET_CreateURLStruct(url, NET_DONT_RELOAD); + if (theURL) + FE_MakeNewWindow(NULL, theURL, NULL, NULL); + cmdHandled = true; + break; + + case cmd_PrivDisplaySiteInfo: + mwcontext = *GetContext(); + PRVCY_SiteInfo(mwcontext); + cmdHandled = true; + break; + default: cmdHandled = Inherited::ObeyCommand(inCommand, ioParam); break; diff --git a/mozilla/cmd/macfe/gui/CBrowserWindow.cp b/mozilla/cmd/macfe/gui/CBrowserWindow.cp index 841679ad6e3..410c1a20fb9 100644 --- a/mozilla/cmd/macfe/gui/CBrowserWindow.cp +++ b/mozilla/cmd/macfe/gui/CBrowserWindow.cp @@ -426,6 +426,8 @@ void CBrowserWindow::FindCommandStatus( case cmd_Reload: case cmd_FontLarger: case cmd_FontSmaller: + case cmd_PrivDisplayPolicy: + case cmd_PrivDisplaySiteInfo: { // Need to be very careful what gets delegated here, in order to aviod infinite // recursion a la bug #313498. Handling the command status in CBrowserView is not @@ -601,6 +603,8 @@ Boolean CBrowserWindow::ObeyCommand( case cmd_FTPUpload: case cmd_FontLarger: case cmd_FontSmaller: + case cmd_PrivDisplayPolicy: + case cmd_PrivDisplaySiteInfo: { // Delegate this to the view. GetHTMLView()->ObeyCommand(inCommand, ioParam); diff --git a/mozilla/cmd/macfe/gui/CHTMLView.cp b/mozilla/cmd/macfe/gui/CHTMLView.cp index 83063a09a75..ab66b791725 100644 --- a/mozilla/cmd/macfe/gui/CHTMLView.cp +++ b/mozilla/cmd/macfe/gui/CHTMLView.cp @@ -2325,6 +2325,8 @@ void CHTMLView::FindCommandStatus(CommandT inCommand, } break; case cmd_FTPUpload: // fix for #313498 + case cmd_PrivDisplayPolicy: + case cmd_PrivDisplaySiteInfo: outEnabled = false; break; default: @@ -2663,6 +2665,8 @@ Boolean CHTMLView::ObeyCommand(CommandT inCommand, void* ioParam) case cmd_FTPUpload: case msg_TabSelect: + case cmd_PrivDisplayPolicy: + case cmd_PrivDisplaySiteInfo: cmdHandled = true; break; diff --git a/mozilla/cmd/macfe/include/resgui.h b/mozilla/cmd/macfe/include/resgui.h index b9056992b49..257a404ab75 100644 --- a/mozilla/cmd/macfe/include/resgui.h +++ b/mozilla/cmd/macfe/include/resgui.h @@ -90,6 +90,14 @@ #define cmd_ShowLocationBar 1500 #define cmd_HideLocationBar 1501 +// Privacy commands +#define cmd_PrivAnonMode 1550 +#define cmd_PrivDisplayPolicy 1551 +#define cmd_PrivDisplayCookies 1552 +#define cmd_PrivDisplaySignons 1553 +#define cmd_PrivDisplaySiteInfo 1554 +#define cmd_PrivAboutPrivacy 1555 + /* nav center toggle in Netscape_Constants.h */ #define cmd_FancyFTP 1020 #define cmd_SaveDefaultCharset 1021 diff --git a/mozilla/cmd/macfe/rsrc/navigator/MenusRat.cnst b/mozilla/cmd/macfe/rsrc/navigator/MenusRat.cnst index 12a55c1c582226122f08371602675014da5fdaea..dcc3f0ef9c9bd7db0e930cded7b8de1fdb087d1f 100644 GIT binary patch delta 713 zcmcbb)tEEEK+beA0|Nsm1B2;9Ag#c_zzC!?w=ytj05SKwiGHTsCZ?7~CI*(NMU{FJ z`;@sYq^<##0D0{{R19jjD*xF)u%_GB>}pSiv_xB^9KBQ5Qstxnvd> zphN!yxk?Ni3=C|15FQ&pkSzejfqaG)6vEO_19dSlPZYFsQGa{98MSNh5NzzfKop zz4BX#6gxXGDfENbOnX317gPd^GlAGD#vnGM9*C_9i3=vSnLzPyu(&?kY9PBEqJ|Ba zoK!Y~*bEJ9=NTB(4593MKsMNXcBi8J^5WDY9_Rer+|53EFWHm?>=Zzp{5)82VhBt& HHB|rrz>cwa delta 536 zcmY+AJ!lj`6vy9A)(v_H3L+AM4BnlWi^t?H=cbR>8%ToeCQxAKAt!ea-T}ak>|&MUj|T6_qfW2R*@fEWxd_ zS`Cgjgi3WYFpMj0Y@eR#1ZrN;pxdR=CaLKJhNfDCxKDU$qWCs7v300k(nd%sL(yh* zDh#nk$5PM-Ql+-0CFUbVb=vF2iJ@_u>Q2-)6I_Ng;9PV?5|}vAEZZs-oLcs`bm`9j zUo`aN>zC12c&$}kwy!3e`}+VV&shdyxj16cVTb(NG7#?> s`qwQw6W$wSb;!(nkNng!JoI(|N@rZBXpp}l|8kxD;1k>PvhO}U00S+IlK=n!