Bug 118624 - Implement customizable prefs: mail.addr_book.quicksearchquery.format, autocompletequery.format; add Nickname & other fields to AB quick search, contacts side bar and SM's Select Addresses dialogue. Seamonkey part. r=Neil a=Neil SM CLOSED TREE

--HG--
extra : amend_source : 9fcf006b6daf47f1a40cac7c8c52aab2b4f08a9c

suite/locales/en-US/chrome/mailnews/messenger.properties

@@ -255,17 +255,6 @@ mailnews.view_default_charset=ISO-8859-1
 # the only valid values are: true OR false (choose from the untranslated English words)
 mail.addr_book.displayName.lastnamefirst=false
 
-# the format for "mail.addr_book.quicksearchquery.format" is:
-# @V == the escaped value typed in the quick search bar in the addressbook
-#
-# note, changing this might require a change to SearchNameOrEmail.label
-# in messenger.dtd
-#
-# LOCALIZATION NOTE - please add phonetic names as below when "mail.addr_book.show_phonetic_fields" is true
-# "?(or(PrimaryEmail,c,@V)(DisplayName,c,@V)(FirstName,c,@V)(LastName,c,@V)(PhoneticFirstName,c,@V)(PhoneticLastName,c,@V))"
-#
-mail.addr_book.quicksearchquery.format=?(or(PrimaryEmail,c,@V)(DisplayName,c,@V)(FirstName,c,@V)(LastName,c,@V))
-
 # whether to also show phonetic fields in the addressbook
 # LOCALIZATION NOTE(mail.addr_book.show_phonetic_fields):
 # the only valid values are: true OR false (choose from the untranslated English words)

suite/mailnews/addrbook/abSelectAddressesDialog.js

@@ -360,7 +360,8 @@ function onEnterInSearchBar()
     return;
 
   if (!gQueryURIFormat) {
-    gQueryURIFormat = GetLocalizedStringPref("mail.addr_book.quicksearchquery.format");
+    // Get model query from pref, without preceding "?", so we need to add it again
+    gQueryURIFormat = "?" + getModelQuery("mail.addr_book.quicksearchquery.format");
   }
   
   var searchURI = selectedNode.value;

suite/mailnews/addrbook/addressbook.js

@@ -353,9 +353,10 @@ function onEnterInSearchBar()
 {
   ClearCardViewPane();  
 
-  if (!gQueryURIFormat)
-    gQueryURIFormat = GetLocalizedStringPref("mail.addr_book.quicksearchquery.format");
-
+  if (!gQueryURIFormat) {
+    // Get model query from pref, without preceding "?", so we need to add it again
+    gQueryURIFormat = "?" + getModelQuery("mail.addr_book.quicksearchquery.format");
+  }
   var searchURI = GetSelectedDirectory();
   if (!searchURI) return;