Added taskbar to address book, turned on abilty to go to front most mail 3pane or ab from Tasks menu. Added Page Setup to messenger compose. Hook? = jj

mailnews/addrbook/resources/content/addressbook.xul

@@ -82,6 +82,7 @@
 		style="width:100%; height:100%"
 		align="vertical"
 		title="&addressbookWindow.title;"
+		windowtype="mail:addressbook"
 		onload="OnLoadAddressBook()">
 
 <html:script language="JavaScript" src="chrome://addressbook/content/addressbook.js"/>
@@ -180,5 +181,8 @@
 	<!-- The main address book three pane frame -->
 	<html:iframe src="chrome://addressbook/content/addresspanes.html" name="3paneaddressbook" flex="100%" />
 
+	<toolbox>                                                               
+		<toolbar id="taskbar" />
+	</toolbox>                                                               
 </window>
 

mailnews/base/resources/content/messenger.xul

@@ -248,7 +248,9 @@ Rights Reserved.
 		onload="OnLoadMessenger()"
 		onunload="OnUnloadMessenger()"
 		id="messengerWindow"
-		style="width:100%;height:100%" align="vertical" width="640" height="480">
+		style="width:100%;height:100%" align="vertical"
+		width="640" height="480"
+		windowtype="mail:3pane">
 
 
 <html:script src="chrome://messenger/content/widgetglue.js"/>

mailnews/compose/resources/content/messengercompose.xul

@@ -65,7 +65,7 @@ Rights Reserved.
 		<menuitem name="&quoteOrigCmd.label;" cmd="nsCmd:ComposeQuote"/>
 		<menuitem name="&selectAddressCmd.label;" onclick="SelectAddress()"/>
 		<separator/>
-		<menuitem name="&printSetupCmd.label;" cmd="nsCmd:BrowserPrintSetup"/>
+		<menuitem id="pageSetup"/>
 		<menuitem name="&printPreviewCmd.label;" cmd="nsCmd:BrowserPrintPreview"/>
 		<menuitem name="&printCmd.label;" cmd="nsCmd:BrowserPrint"/>
 		<separator/>

mailnews/compose/resources/locale/en-US/messengercompose.dtd

@@ -24,7 +24,6 @@
 <!ENTITY sendLaterCmd.label "Send Later">
 <!ENTITY quoteOrigCmd.label ".Quote Original Message">
 <!ENTITY selectAddressCmd.label "Select Addresses...">
-<!ENTITY printSetupCmd.label ".Print Setup">
 <!ENTITY printPreviewCmd.label ".Print Preview">
 <!ENTITY printCmd.label ".Print">
 <!ENTITY closeCmd.label "Close">

suite/locales/en-US/chrome/mailnews/compose/messengercompose.dtd

@@ -24,7 +24,6 @@
 <!ENTITY sendLaterCmd.label "Send Later">
 <!ENTITY quoteOrigCmd.label ".Quote Original Message">
 <!ENTITY selectAddressCmd.label "Select Addresses...">
-<!ENTITY printSetupCmd.label ".Print Setup">
 <!ENTITY printPreviewCmd.label ".Print Preview">
 <!ENTITY printCmd.label ".Print">
 <!ENTITY closeCmd.label "Close">

xpfe/global/resources/content/dialogOverlay.js

@@ -6,6 +6,8 @@ var doCancelFunction = 0;
 // functions should return true if they want the dialog to close
 function doSetOKCancel(okFunc, cancelFunc)
 {
+	dump("top.window.navigator.platform: " + top.window.navigator.platform + "\n");
+	
 	doOKFunction = okFunc;
 	doCancelFunction = cancelFunc;
 }

xpfe/global/resources/content/tasksOverlay.js

@@ -6,18 +6,13 @@ function toNavigator()
 
 function toMessengerWindow()
 {
-	// FIX ME - Really need to find the front most messenger window
-	//          and bring it all the way to the front
-	
-	window.open("chrome://messenger/content/", "messenger", "chrome");
+	toOpenWindowByType("mail:3pane", "chrome://messenger/content/");
 }
 
 
 function toAddressBook() 
 {
-	var wind = window.open("chrome://addressbook/content/addressbook.xul",
-						   "addressbook", "chrome");
-	return wind;
+	toOpenWindowByType("mail:addressbook", "chrome://addressbook/content/addressbook.xul");
 }
 
 function toHistory()
@@ -34,6 +29,20 @@ function toHistory()
     }
 }
 
+function toOpenWindowByType( inType, uri )
+{
+	var windowManager = Components.classes['component://netscape/rdf/datasource?name=window-mediator'].getService();
+
+	var	windowManagerInterface = windowManager.QueryInterface( Components.interfaces.nsIWindowMediator);
+
+	var topWindow = windowManagerInterface.GetMostRecentWindow( inType );
+	
+	if ( topWindow )
+		topWindow.focus();
+	else
+		window.open(uri, "_New", "chrome");
+}
+
 function CycleWindow( inType, inChromeURL )
 {
 	var windowManager = Components.classes['component://netscape/rdf/datasource?name=window-mediator'].getService();
@@ -150,4 +159,4 @@ function OpenTaskURL( inURL )
 	window.content.location.href= inURL;
 	dump(window.content.location.href+"\n");
     RefreshUrlbar();
-}
+}

xpfe/global/resources/content/tasksOverlay.xul

@@ -5,8 +5,8 @@
 <!ENTITY tasksMenu.label				"Tasks">
 <!ENTITY navigatorCmd.label					"Navigator">  
 <!ENTITY messengerCmd.label					"Messenger">
-<!ENTITY editorCmd.label "Editor">
-<!ENTITY textEditorCmd.label "Plaintext Editor">
+<!ENTITY editorCmd.label					"Editor">
+<!ENTITY textEditorCmd.label				"Plaintext Editor">
 
 <!ENTITY addressBookCmd.label				"Address Book">  
  
@@ -89,8 +89,8 @@
 	  	 <box align="horizontal">
   			
   	 		<titledbutton align="left" id="mini-nav" value="" onclick="toNavigator();"/>
-  	 		<titledbutton align="left" id="mini-mail" value="" onclick="OpenMessenger()"/>
-  	 		<titledbutton align="left" id="mini-addr" value="" onclick="OpenAddressbook()"/>
+  	 		<titledbutton align="left" id="mini-mail" value="" onclick="toMessengerWindow()"/>
+  	 		<titledbutton align="left" id="mini-addr" value="" onclick="toAddressBook()"/>
   	 		<titledbutton align="left" id="mini-comp" value="" onclick="toEditor();" />
 	      </box>
 		  <spring flex="100%"/>