Add the sidebar search mode pref to the search pref panel.

b  = 4995
r  = mcafee
sr = sfraser


git-svn-id: svn://10.0.0.236/trunk@210800 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/suite/browser/navigator.js

@@ -672,6 +672,23 @@ function OpenSearch(tabName, forceDialogFlag, searchStr)
     RevealSearchPanel();
 }
 
+function syncSearchModeMenuWithPref()
+{
+  try {
+    var searchMode = pref.GetIntPref("browser.search.mode");
+    
+    // update search menu
+    var simpleMenuItem = document.getElementById("simpleSearch");
+    simpleMenuItem.setAttribute("checked", 
+      (searchMode == 0) ? "true" : "false");
+
+    var advancedMenuItem = document.getElementById("advancedSearch");
+    advancedMenuItem.setAttribute("checked", 
+      (searchMode == 1) ? "true" : "false");
+  } catch (ex) {
+  }
+}
+
 function setBrowserSearchMode(searchMode)
 {
   // set search mode preference

mozilla/suite/browser/navigatorOverlay.xul

@@ -277,7 +277,7 @@
         <menuitem label="&searchBookmarksHistoryCmd.label;" accesskey="&searchBookmarksHistoryCmd.accesskey;" oncommand="window.openDialog('chrome://communicator/content/bookmarks/bm-find.xul', 'FindBookmarksWindow', 'dialog=no,close,chrome,resizable', 'bookmarks');"/>
         <menuseparator id="searchSeparator" />
          <menu id="searchOptionsMenu" label="&searchOptions.label;">
-            <menupopup>
+            <menupopup oncreate="syncSearchModeMenuWithPref();">
               <menuitem id="simpleSearch" type="radio" label="&simpleMode.label;" oncommand="setBrowserSearchMode(0);" />
               <menuitem id="advancedSearch" type="radio" label="&advancedMode.label;" oncommand="setBrowserSearchMode(1);" />
             </menupopup>