From 3a329723fef1cc72d1349072fad2db2543ba09c0 Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org"
 <scott%scott-macgregor.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 23 Sep 2004 20:12:51 +0000
Subject: [PATCH] Address book polish. Move the search addresses menu item
 under Edit / Find to match the main 3:pane.

Hide the advanced search button.

Establish a new set of default buttons for the address book toolbar.


git-svn-id: svn://10.0.0.236/trunk@162714 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../components/addrbook/content/addressbook.xul    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/mozilla/mail/components/addrbook/content/addressbook.xul b/mozilla/mail/components/addrbook/content/addressbook.xul
index 5df7fdeaaac..64426c10a02 100644
--- a/mozilla/mail/components/addrbook/content/addressbook.xul
+++ b/mozilla/mail/components/addrbook/content/addressbook.xul
@@ -270,6 +270,11 @@
                       key="key_selectAll"
                       accesskey="&selectAllCmd.accesskey;"
                       command="cmd_selectAll"/>
+
+            <menuseparator/>
+            <menuitem label="&searchAddressesCmd.label;" accesskey="&searchAddressesCmd.accesskey;"
+                          id="menu_search_addresses" oncommand="onAdvancedAbSearch();"/>
+
             <menuseparator/>
             <!-- LOCALIZATION NOTE: set "hideSwapFnLnUI" to false in .dtd to enable the UI -->
             <menuitem label="&swapFirstNameLastNameCmd.label;"
@@ -410,10 +415,6 @@
             <menuitem accesskey="&messengerCmd.accesskey;" label="&messengerCmd.label;"  key="key_mail" oncommand="toMessengerWindow();" id="tasksMenuMail" class="menuitem-iconic icon-mail16 menu-iconic"/>
             <menuseparator />  
 #endif
-            <menuitem label="&searchAddressesCmd.label;" 
-                      accesskey="&searchAddressesCmd.accesskey;"
-                      id="menu_search_addresses" 
-                      oncommand="onAdvancedAbSearch();"/>
             <menuitem label="&importCmd.label;" accesskey="&importCmd.accesskey;" oncommand="toImport()"/>
             <menuitem label="&exportCmd.label;" accesskey="&exportCmd.accesskey;" oncommand="AbExport()"/>
             <menuseparator />  
@@ -484,7 +485,7 @@
            fullscreentoolbar="true" mode="full"
            customizable="true"
            context="toolbar-context-menu"
-           defaultset="button-newcard,button-newlist,space,button-editcard,button-newmessage,button-newim,button-abdelete,spring,throbber-box">
+           defaultset="button-newcard,button-newlist,spacer,button-editcard,button-newmessage,spacer,button-abdelete,spring,throbber-box">
    </toolbar>
    <toolbarset id="customToolbars" context="toolbar-context-menu"/>
   </toolbox>
@@ -568,10 +569,13 @@
                 accesskey="&clearButton.accesskey;"
                 oncommand="onAbClearSearch();"
                 tooltiptext="&clearButton.tooltip;"/>
+
+<!-- Hide the advanced button like we do for the main 3-pane window...
         <button id="advancedButton" label="&advancedButton.label;" 
                 accesskey="&advancedButton.accesskey;"
                 tooltiptext="&advancedButton.tooltip;" 
                 oncommand="onAdvancedAbSearch();"/>
+-->
       </hbox>
 
       <!-- results pane -->