From b596fcb42174a3ea5bd35a620a75f7e3b6c2a3ce Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org" <scott%scott-macgregor.org>
Date: Thu, 23 Sep 2004 19:56:54 +0000
Subject: [PATCH] Address Book Search polish. Let the escape key close the
 search dialog.

Don't include mailWindowOverlay.xul as this causes us to pick up the offline icon by mistake.

Fix up the status bar.

Search progress isn't showing up in the progress bar yet....
---
 mail/base/content/ABSearchDialog.xul | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/mail/base/content/ABSearchDialog.xul b/mail/base/content/ABSearchDialog.xul
index 2e0a7acfb9d..ba298cf20be 100644
--- a/mail/base/content/ABSearchDialog.xul
+++ b/mail/base/content/ABSearchDialog.xul
@@ -22,7 +22,6 @@
 
 <?xul-overlay href="chrome://messenger/content/addressbook/abResultsPaneOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/searchTermOverlay.xul"?>
-<?xul-overlay href="chrome://messenger/content/mailWindowOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 
 <!DOCTYPE window [
@@ -64,6 +63,10 @@
 
   <broadcaster id="Communicator:WorkMode"/>
 
+  <keyset id="mailKeys">
+    <key keycode="VK_ESCAPE" xulkey="false" oncommand="onSearchStop(); closeWindow(true);"/>
+  </keyset>
+
   <dummy class="usesMailWidgets"/>
     
     <vbox id="searchTerms" flex="3" persist="height">
@@ -191,6 +194,12 @@
       </hbox>      
     </vbox>
 
-    <statusbar class="chromeclass-status" id="status-bar"/>
+  <statusbar class="chromeclass-status" id="status-bar"> 
+    <statusbarpanel id="statusText" crop="right" flex="1"/>   
+    <statusbarpanel class="statusbarpanel-progress" id="statusbar-progresspanel">
+      <progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0"/>
+    </statusbarpanel>    
+  </statusbar> 
+
 
 </window>