Glued in code to new globalOverlay.xul and tasksOverlay.xul and dialogOverlay.xul

This commit is contained in:
hangas%netscape.com 1999-07-19 21:43:27 +00:00
parent 83b9e99d62
commit 2bb0fe9f6f
7 changed files with 25 additions and 128 deletions

View File

@ -124,15 +124,6 @@ function GetSelectedAddresses()
return selectedAddresses;
}
function AbExit()
{
var editorShell = Components.classes["component://netscape/editor/editorshell"].createInstance();
editorShell = editorShell.QueryInterface(Components.interfaces.nsIEditorShell);
if ( editorShell )
editorShell.Exit();
}
function AbClose()
{
top.window.close();

View File

@ -1,10 +1,11 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://addressbook/skin/" type="text/css"?>
<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
<?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
<!DOCTYPE window
[
<!ENTITY addressbookWindow.title "Address Book">
<!-- menu items: the . means that the menu item isn't implemented yet -->
@ -24,7 +25,6 @@
<!ENTITY printCardViewCmd.label ".Print Card View...">
<!ENTITY printAddressBook.label ".Print Address Book...">
<!ENTITY closeCmd.label "Close">
<!ENTITY exitCmd.label "Exit">
<!ENTITY editMenu.label "Edit">
<!ENTITY undoCmd.label ".Undo">
@ -54,38 +54,6 @@
<!ENTITY sortAscendingCmd.label ".Ascending">
<!ENTITY sortDescendingCmd.label ".Descending">
<!ENTITY stopSearchingCmd.label ".Stop Searching">
<!ENTITY tasksMenu.label "Tasks">
<!ENTITY navigatorCmd.label "Navigator">
<!ENTITY messengerCmd.label ".Messenger">
<!ENTITY addressBookCmd.label ".Address Book">
<!ENTITY bookmarkMenu.label ".Bookmarks">
<!ENTITY addBookmarkCmd.label ".Add Bookmark">
<!ENTITY fileBookmarkCmd.label ".File Bookmark">
<!ENTITY editBookmarkCmd.label ".Edit Bookmark">
<!ENTITY newsgroupsCmd.label ".Newsgroups">
<!ENTITY toolsMenu.label ".Tools">
<!ENTITY historyCmd.label ".History">
<!ENTITY securityInfoCmd.label ".Security Info">
<!ENTITY messageCenterCmd.label ".Message Center">
<!ENTITY importUtilCmd.label ".Import Utility">
<!ENTITY javaConsoleCmd.label ".Java Console">
<!ENTITY windowMenu.label ".Window">
<!ENTITY helpMenu.label "Help">
<!ENTITY helpContentCmd.label ".Help Contents">
<!ENTITY referenceLibraryCmd.label ".Reference Library">
<!ENTITY releaseNotesCmd.label ".Release Notes">
<!ENTITY productInfoCmd.label ".Product Information and Support">
<!ENTITY softwareUpdatesCmd.label ".Software Updates">
<!ENTITY registerCmd.label ".Register Now">
<!ENTITY memberServicesCmd.label ".Member Services">
<!ENTITY internationalCmd.label ".International Users">
<!ENTITY securityCmd.label ".Security">
<!ENTITY netwatchCmd.label ".NetWatch">
<!ENTITY aboutPluginsCmd.label ".About Plug-ins">
<!ENTITY aboutFontCmd.label ".About Font Displayers">
<!ENTITY aboutCmd.label ".About Communicator...">
<!-- Toolbar items -->
<!ENTITY newcardButton.img "chrome://addressbook/skin/newcard.gif">
@ -121,12 +89,12 @@
<html:script language="javascript" src="chrome://addressbook/content/resultPane.js"/>
<html:script language="javascript" src="chrome://addressbook/content/cardviewPane.js"/>
<html:script language="JavaScript" src="chrome://addressbook/content/editcard.js"/>
<html:script language="JavaScript" src="chrome://messenger/content/commandglue.js"/>
<!--
<html:script language="JavaScript" src="chrome://messenger/content/commandglue.js"/>
<html:script language="JavaScript" src="resource://res/samples/DumpDOM.js"/>
-->
<menubar>
<menu name="&fileMenu.label;">
<menu id="fileMenu" name="&fileMenu.label;">
<menu name="&newMenu.label;">
<menuitem name="&newNavCmd.label;" onclick="NewBrowserWindow();"/>
<menuitem name="&newMessageCmd.label;" onclick="AbNewMessage();"/>
@ -145,7 +113,6 @@
<menuitem name="&printAddressBook.label;" onclick="AbPrintAddressBook()"/>
<separator/>
<menuitem name="&closeCmd.label;" onclick="AbClose()"/>
<menuitem name="&exitCmd.label;" onclick="AbExit()"/>
</menu>
<menu name="&editMenu.label;">
@ -185,48 +152,8 @@
</menu>
</menu>
<menu name="&tasksMenu.label;">
<menuitem name="&navigatorCmd.label;" onclick="NavigatorWindow()"/>
<menuitem name="&messengerCmd.label;" onclick="MessengerWindow()"/>
<menuitem name="&addressBookCmd.label;" onclick="AddressBook()"/>
<separator/>
<menu name="&bookmarkMenu.label;">
<menuitem name="&addBookmarkCmd.label;" onclick="AddBookmark()"/>
<menuitem name="&fileBookmarkCmd.label;" onclick="FileBookmark()"/>
<menuitem name="&editBookmarkCmd.label;" onclick="EditBookmark()"/>
</menu>
<menuitem name="&newsgroupsCmd.label;" onclick="Newsgroups()"/>
<separator/>
<menu name="&toolsMenu.label;">
<menuitem name="&historyCmd.label;" onclick="History()"/>
<menuitem name="&securityInfoCmd.label;" onclick="SecurityInfo()"/>
<menuitem name="&messageCenterCmd.label;" onclick="MessengerCenter()"/>
<menuitem name="&importUtilCmd.label;" onclick="Import()"/>
<menuitem name="&javaConsoleCmd.label;" onclick="JavaConsole()"/>
</menu>
<separator/>
<menu name="&windowMenu.label;">
</menu>
</menu>
<menu name="&helpMenu.label;">
<menuitem name="&helpContentCmd.label;" onclick="Help()"/>
<menuitem name="&referenceLibraryCmd.label;" onclick="Help()"/>
<menuitem name="&releaseNotesCmd.label;" onclick="Help()"/>
<menuitem name="&productInfoCmd.label;" onclick="Help()"/>
<separator/>
<menuitem name="&softwareUpdatesCmd.label;" onclick="Help()"/>
<menuitem name="&registerCmd.label;" onclick="Help()"/>
<menuitem name="&memberServicesCmd.label;" onclick="Help()"/>
<separator/>
<menuitem name="&internationalCmd.label;" onclick="Help()"/>
<menuitem name="&securityCmd.label;" onclick="Help()"/>
<menuitem name="&netwatchCmd.label;" onclick="Help()"/>
<separator/>
<menuitem name="&aboutPluginsCmd.label;" onclick="About()"/>
<menuitem name="&aboutFontCmd.label;" onclick="About()"/>
<menuitem name="&aboutCmd.label;" onclick="About()"/>
</menu>
<menu id="tasksMenu"/>
<menu id="helpMenu"/>
</menubar>
<toolbox>

View File

@ -9,6 +9,8 @@ function OnLoadNewCard()
{
InitEditCard();
doSetOKCancel(NewCardOKButton, 0);
editCard.card = 0;
editCard.okCallback = 0;
editCard.generateDisplayName = true;
@ -25,6 +27,8 @@ function OnLoadEditCard()
{
InitEditCard();
doSetOKCancel(EditCardOKButton, 0);
if (window.arguments && window.arguments[0])
{
if ( window.arguments[0].card )
@ -83,7 +87,7 @@ function NewCardOKButton()
cardproperty.AddCardToDatabase();// Candice pass editCard.abURI this is the var containing GetResultTreeDirectory()
}
top.window.close();
return true; // close the window
}
@ -97,7 +101,7 @@ function EditCardOKButton()
if ( editCard.okCallback )
editCard.okCallback();
top.window.close();
return true; // close the window
}

View File

@ -1,6 +1,7 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://addressbook/skin/" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<!DOCTYPE window
[
@ -22,15 +23,7 @@
name="editcard"
src="chrome://addressbook/content/editcard.xul"/>
<spring style="height:10px"/>
<box align="horizontal">
<spring flex="100%"/>
<titledbutton id="ok" value="OK" class="push" onclick="EditCardOKButton()" />
<spring style="width:10px"/>
<titledbutton id="cancel" value="Cancel" class="push" onclick="EditCardCancelButton()" />
<spring style="width:10px"/>
</box>
<box id="okCancelButtons"/>
</window>

View File

@ -1,13 +1,14 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://addressbook/skin/" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<!DOCTYPE window
[
<!-- Title -->
<!ENTITY editcardWindow.title "New Card">
<!ENTITY editcardWindow.title "New Card">
<!-- Labels -->
<!ENTITY chooseAddressBook.label "Add to: ">
<!ENTITY chooseAddressBook.label "Add to: ">
]>
<window xmlns:html="http://www.w3.org/TR/REC-html40"
@ -37,15 +38,7 @@
name="editcard"
src="chrome://addressbook/content/editcard.xul"/>
<spring style="height:10px"/>
<box align="horizontal">
<spring flex="100%"/>
<titledbutton id="ok" value="OK" class="push" onclick="NewCardOKButton()" />
<spring style="width:10px"/>
<titledbutton id="cancel" value="Cancel" class="push" onclick="NewCardCancelButton()" />
<spring style="width:10px"/>
</box>
<box id="okCancelButtons"/>
</window>

View File

@ -10,6 +10,8 @@ function OnLoadSelectAddress()
{
var toAddress="", ccAddress="", bccAddress="";
doSetOKCancel(SelectAddressOKButton, 0);
// look in arguments[0] for parameters
if (window.arguments && window.arguments[0])
{
@ -105,15 +107,9 @@ function SelectAddressOKButton()
msgCompFields.SetBcc(bccAddress);
top.composeWindow.CompFields2Recipients(top.msgCompFields);
top.window.close();
return true;
}
function SelectAddressCancelButton()
{
top.window.close();
}
function saChangeDirectoryByDOMNode(dirNode)
{
var uri = dirNode.getAttribute('id');

View File

@ -1,6 +1,7 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://addressbook/skin/" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<!--
The contents of this file are subject to the Netscape Public
@ -136,7 +137,7 @@ Rights Reserved.
<box align="vertical" style="height:6px; background-color:#9999CC; border-top:thin solid; border-bottom:thin solid"/>
<!-- The bucket -->
<html:iframe flex="100%" style="border:none; border-bottom:thin solid"
<html:iframe flex="100%" style="border:none"
name="addressbucket"
src="chrome://addressbook/content/addressbucket.xul"/>
</box>
@ -162,16 +163,8 @@ Rights Reserved.
</box>
</box>
<!-- Bottom 3/4 inch box, OK, Cancel, Help buttons -->
<box align="horizontal" style="margin-top: 0.5em">
<spring flex="100%"/>
<titledbutton id="ok" value="&okButton.label;" class="push" onclick="SelectAddressOKButton()"/>
<spring style="width:10px"/>
<titledbutton id="cancel" value="&cancelButton.label;" class="push" onclick="SelectAddressCancelButton()"/>
<spring style="width:10px"/>
<titledbutton id="help" value="&helpButton.label;" class="push" onclick="SelectAddressHelpButton()"/>
<spring style="width:10px"/>
</box>
<!-- OK & Cancel buttons -->
<box id="okCancelButtons"/>
</window>