dfm's privacy tools menu.

This commit is contained in:
ramiro%netscape.com 1998-08-07 09:51:55 +00:00
parent 74d5115b8c
commit c6a59fc40e
6 changed files with 150 additions and 51 deletions

View File

@ -3145,6 +3145,9 @@ Open the address book
*menuBar*toolsSubmenu.labelString: Tools
*menuBar*toolsSubmenu.mnemonic: T
*menuBar*privacyToolsSubmenu.labelString: Privacy Tools
*menuBar*privacyToolsSubmenu.mnemonic: P
*menuBar*serverToolsSubmenu.labelString: Server Tools
*menuBar*serverToolsSubmenu.mnemonic: S
@ -3203,6 +3206,31 @@ File the current page in a Bookmarks folder
*viewSecurity.documentationString: \
Show security information for this page
! Privacy Tools Submenu
*menuBar*privacyPolicy.labelString: Display Privacy Disclosure
*menuBar*privacyPolicy.mnemonic: P
*menuBar*anonymousMode.labelString: Anonymous Mode
*menuBar*anonymousMode.mnemonic: A
*menuBar*toggleReceipt.labelString: Make Receipt
*menuBar*toggleReceipt.mnemonic: M
*menuBar*viewCookies.labelString: Display Cookies
*menuBar*viewCookies.mnemonic: C
*menuBar*viewSignons.labelString: Display Signons
*menuBar*viewSignons.mnemonic: S
*menuBar*viewReceipts.labelString: Display Receipts
*menuBar*viewReceipts.mnemonic: R
*menuBar*privacyTutorial.labelString: Privacy Tutorial
*menuBar*privacyTutorial.mnemonic: T
! end Privacy Tools Submenu
! Communicator/Server Tools Submenu
*menuBar*manageMailingList.labelString: Mailing Lists
*menuBar*manageMailingList.mnemonic: L
@ -4830,19 +4858,6 @@ in transit. If you are submitting passwords, credit card numbers,\n\
or other information you would like to keep private, it would be\n\
safer for you to cancel the submission.
*noPrivacyPolicyDialog_popup.title: @NAME@: Privacy Warning
*noPrivacyPolicyDialog*toggle.labelString: Show this Alert Next Time
*noPrivacyPolicyDialog*toggle.alignment: ALIGNMENT_BEGINNING
*noPrivacyPolicyDialog.OkLabelString: Continue Submission
*noPrivacyPolicyDialog.CancelLabelString: Cancel Submission
*noPrivacyPolicyDialog*toggle.leftOffset: 100
*noPrivacyPolicyDialog.selectionLabelString:\
There is no privacy policy in effect for this form submission.\n\
This site has not disclosed how the information you are providing\n\
will be used. If you are concerned by this, you may want to cancel\n\
this submission.
*insecurePostFromInsecureDocDialog_popup.title: @NAME@: Security Warning
*insecurePostFromInsecureDocDialog.OkLabelString: Continue Submission
*insecurePostFromInsecureDocDialog.CancelLabelString: Cancel Submission

View File

@ -165,9 +165,6 @@ MenuSpec XFE_BrowserFrame::view_menu_spec[] = {
{ xfeCmdViewPageSource, PUSHBUTTON },
{ xfeCmdViewPageInfo, PUSHBUTTON },
{ xfeCmdPageServices, PUSHBUTTON },
#ifdef PRIVACY_POLICIES
{ xfeCmdPrivacyPolicy, PUSHBUTTON },
#endif
MENU_SEPARATOR,
{ "encodingSubmenu", CASCADEBUTTON,
(MenuSpec*)&XFE_BrowserFrame::encoding_menu_spec },

View File

@ -92,6 +92,12 @@
#include "gmon.h"
#endif /*MOZILLA_GPROF*/
#include "privacy.h"
#ifdef TRANSACTION_RECEIPTS
#include "receipt.h"
#endif /* TRANSACTION_RECEIPTS */
#define MM_PER_INCH (25.4)
#define POINTS_PER_INCH (72.0)
@ -175,6 +181,23 @@ MenuSpec XFE_Frame::tools_submenu_spec[] = {
{ NULL }
};
MenuSpec XFE_Frame::privacytools_submenu_spec[] = {
{ xfeCmdAnonymousMode, TOGGLEBUTTON, NULL, NULL },
#ifdef TRANSACTION_RECEIPTS
{ xfeCmdToggleReceipt, PUSHBUTTON },
#endif
MENU_SEPARATOR,
{ xfeCmdPrivacyPolicy, PUSHBUTTON },
{ xfeCmdViewCookies, PUSHBUTTON },
{ xfeCmdViewSignons, PUSHBUTTON },
#ifdef TRANSACTION_RECEIPTS
{ xfeCmdViewReceipts, PUSHBUTTON },
#endif
MENU_SEPARATOR,
{ xfeCmdPrivacyTutorial, PUSHBUTTON },
{ NULL }
};
MenuSpec XFE_Frame::servertools_submenu_spec[] = {
{ xfeCmdPageServices, PUSHBUTTON },
#ifndef MOZ_LITE
@ -220,6 +243,7 @@ MenuSpec XFE_Frame::window_menu_spec[] = {
HG87782
MENU_SEPARATOR,
{ "toolsSubmenu", CASCADEBUTTON, tools_submenu_spec },
{ "privacyToolsSubmenu", CASCADEBUTTON, privacytools_submenu_spec },
{ "serverToolsSubmenu", CASCADEBUTTON, servertools_submenu_spec },
MENU_SEPARATOR,
{ "frameListPlaceHolder", DYNA_MENUITEMS, NULL, NULL, False, NULL, XFE_FrameListMenu::generate },
@ -3170,6 +3194,10 @@ XFE_Frame::isCommandSelected(CommandType cmd,
{
return fe_globalPrefs.task_bar_ontop;
}
else if (cmd == xfeCmdAnonymousMode)
{
return PRVCY_IsAnonymous();
}
return (m_view && m_view->isCommandSelected(cmd, calldata, info));
}
@ -3272,6 +3300,33 @@ XFE_Frame::isCommandEnabled(CommandType cmd,
{
return !fe_globalData.all_databases_locked;
}
else if (cmd == xfeCmdPrivacyPolicy)
{
return PRVCY_CurrentHasPrivacyPolicy(m_context);
}
else if (cmd == xfeCmdToggleReceipt)
{
#ifdef TRANSACTION_RECEIPTS
return RT_GetMakeReceiptEnabled(m_context);
#else
return FALSE;
#endif
}
else if ((cmd == xfeCmdAnonymousMode) ||
(cmd == xfeCmdViewCookies) ||
(cmd == xfeCmdViewSignons) ||
(cmd == xfeCmdPrivacyTutorial))
{
return TRUE;
}
else if (cmd == xfeCmdViewReceipts)
{
#ifdef TRANSACTION_RECEIPTS
return TRUE;
#else
return FALSE;
#endif
}
else
{
return (m_view && m_view->isCommandEnabled(cmd, calldata, info));
@ -3612,6 +3667,55 @@ XFE_Frame::doCommand(CommandType cmd, void *calldata, XFE_CommandInfo* info)
{
fe_openTargetUrl(m_context,(LO_AnchorData *) calldata);
}
else if (cmd == xfeCmdPrivacyPolicy)
{
char *url = PRVCY_GetCurrentPrivacyPolicyURL(m_context);
if (url != NULL)
{
History_entry *he = SHIST_GetCurrent(&m_context->hist);
URL_Struct *url_s = NET_CreateURLStruct (url, NET_DONT_RELOAD);
if (he->address != NULL)
url_s->referer = XP_STRDUP(he->address);
url_s->window_target = XP_STRDUP("");
fe_MakeWindow (XtParent (CONTEXT_WIDGET (m_context)),
m_context, url_s, NULL,
MWContextBrowser, FALSE);
}
}
else if (cmd == xfeCmdPrivacyTutorial)
{
char *url;
url = PRVCY_TutorialURL();
if (url != NULL)
{
URL_Struct *tutorial_url = NET_CreateURLStruct (url, NET_DONT_RELOAD);
tutorial_url->window_target = XP_STRDUP("");
fe_MakeWindow (XtParent(CONTEXT_WIDGET (m_context)),
m_context, tutorial_url, NULL,
MWContextBrowser, FALSE);
}
}
else if (cmd == xfeCmdViewCookies)
{
NET_DisplayCookieInfoAsHTML(m_context);
}
else if (cmd == xfeCmdViewSignons)
{
#ifdef SingleSignon
SI_DisplaySignonInfoAsHTML(m_context);
#endif
}
else if (cmd == xfeCmdAnonymousMode)
{
PRVCY_ToggleAnonymous();
}
else if (cmd == xfeCmdViewReceipts)
{
#ifdef TRANSACTION_RECEIPTS
//RT_DisplayReceipts(m_context);
#endif
}
/* if we don't recognize the command, send it along to the view. */
else if (m_view
&& m_view->handlesCommand(cmd, calldata, info))
@ -3656,6 +3760,13 @@ XFE_Frame::handlesCommand(CommandType cmd,
|| cmd == xfeCmdToggleMenubar
|| cmd == xfeCmdToggleNavigationToolbar
|| cmd == xfeCmdWindowListRaiseItem
|| cmd == xfeCmdPrivacyPolicy
|| cmd == xfeCmdAnonymousMode
|| cmd == xfeCmdToggleReceipt
|| cmd == xfeCmdViewCookies
|| cmd == xfeCmdViewSignons
|| cmd == xfeCmdViewReceipts
|| cmd == xfeCmdPrivacyTutorial
#ifdef MOZ_TASKBAR
|| cmd == xfeCmdToggleTaskbarShowing
|| cmd == xfeCmdFloatingTaskBarHorizontal

View File

@ -415,6 +415,7 @@ protected:
static MenuSpec compose_message_submenu_spec[];
static MenuSpec compose_article_submenu_spec[];
static MenuSpec tools_submenu_spec[];
static MenuSpec privacytools_submenu_spec[];
static MenuSpec servertools_submenu_spec[];

View File

@ -64,10 +64,6 @@
#include <Xfe/Xfe.h>
#include "fonts.h"
#ifdef PRIVACY_POLICIES
#include "privacy.h"
#endif /* PRIVACY_POLICIES */
#include <unistd.h> // for getcwd()
extern int XFE_ERROR_SAVING_OPTIONS;
@ -1096,24 +1092,6 @@ XFE_HTMLView::doCommand(CommandType cmd, void *callData, XFE_CommandInfo* info)
}
return;
}
else if (IS_CMD(xfeCmdPrivacyPolicy))
{
#ifdef PRIVACY_POLICIES
if (PRVCY_CurrentHasPrivacyPolicy(m_contextData))
{
char *url = PRVCY_GetCurrentPrivacyPolicyURL(m_contextData);
if (url)
{
URL_Struct *url_s = NET_CreateURLStruct (url, NET_DONT_RELOAD);
fe_MakeWindow (XtParent (CONTEXT_WIDGET (m_contextData)),
m_contextData, url_s, NULL,
MWContextBrowser, FALSE);
}
}
#endif /* PRIVACY_POLICIES */
return;
}
else if (IS_CMD(xfeCmdChangeDocumentEncoding))
{
int/*16*/ new_doc_csid = (int/*16*/)callData;
@ -1370,14 +1348,6 @@ XFE_HTMLView::isCommandEnabled(CommandType cmd, void *calldata, XFE_CommandInfo*
{
return SHIST_CurrentHandlesPageServices(m_contextData);
}
else if (IS_CMD(xfeCmdPrivacyPolicy))
{
#ifdef PRIVACY_POLICIES
return PRVCY_CurrentHasPrivacyPolicy(m_contextData);
#else
return FALSE;
#endif /* PRIVACY_POLICIES */
}
else
{
return XFE_View::isCommandEnabled(cmd, calldata);
@ -1450,9 +1420,6 @@ XFE_HTMLView::handlesCommand(CommandType cmd, void *calldata, XFE_CommandInfo*)
|| IS_CMD(xfeCmdAddFrameBookmark)
|| IS_CMD(xfeCmdShowImage)
|| IS_CMD(xfeCmdPageServices)
#ifdef PRIVACY_POLICIES
|| IS_CMD(xfeCmdPrivacyPolicy)
#endif
)
{
return True;

View File

@ -515,13 +515,21 @@ xfeCmdFrameReload frameReload
xfeCmdViewFrameSource framePageSource
xfeCmdViewFrameInfo framePageInfo
xfeCmdPageServices pageServices
xfeCmdPrivacyPolicy privacyPolicy
xfeCmdAddLinkBookmark addLinkBookmark
xfeCmdAddFrameBookmark addFrameBookmark
xfeCmdShowImage showImage
xfeCmdWindowListRaiseItem windowListRaiseItem
# privacy tools submenu items
xfeCmdPrivacyPolicy privacyPolicy
xfeCmdAnonymousMode anonymousMode
xfeCmdToggleReceipt toggleReceipt
xfeCmdViewCookies viewCookies
xfeCmdViewSignons viewSignons
xfeCmdViewReceipts viewReceipts
xfeCmdPrivacyTutorial privacyTutorial
# special command to show the parent window in mail and news
xfeCmdMommy mommy