Tweak Search UI.

suite/browser/navigator.js

@@ -494,9 +494,11 @@ function UpdateBookmarksLastVisitiedDate(event)
     RefreshUrlbar();
   }
 
-function OpenSearch(tabName)
+function OpenSearch(tabName, searchStr)
 {
-	window.openDialog("resource:/res/samples/search.xul", "SearchWindow", "dialog=no,close,chrome,resizable", tabName);
+	dump("OpenSearch searchStr: '" + searchStr + "'\n\n");
+
+	window.openDialog("resource:/res/samples/search.xul", "SearchWindow", "dialog=no,close,chrome,resizable", tabName, searchStr);
 }
 
   function BrowserNewWindow()

suite/browser/navigator.xul

@@ -323,10 +323,10 @@ Contributor(s): ______________________________________. -->
 		  <menuitem value="&appSpecificCmd.label;" onaction="BrowserReload();"/>
 		  <menuitem value="&appSpecificCmd.label;" onaction="BrowserReload();"/>
 		  <menuseparator />
-		  <menuitem value="&searchBookmarksHistoryCmd.label;" onaction="OpenSearch('find');"/>
-		  <menuitem value="&searchInternetCmd.label;" onaction="OpenSearch('internet');"/>
-		  <menuitem value="&searchAllMailCmd.label;" onaction="OpenSearch('mail');"/>
-		  <menuitem value="&searchAddressbookCmd.label;" onaction="OpenSearch('addressbook');"/>
+		  <menuitem value="&searchBookmarksHistoryCmd.label;" onaction="OpenSearch('find', null);"/>
+		  <menuitem value="&searchInternetCmd.label;" onaction="OpenSearch('internet', null);"/>
+		  <menuitem value="&searchAllMailCmd.label;" onaction="OpenSearch('mail', null);"/>
+		  <menuitem value="&searchAddressbookCmd.label;" onaction="OpenSearch('addressbook', null);"/>
 		  <menuseparator />
 		  <menuitem value="&searchComputerCmd.label;" onaction="BrowserReload();"/>
 	  </menupopup>
@@ -499,6 +499,8 @@ Contributor(s): ______________________________________. -->
             <spring flex="100%"/>
           </box>
 
+			<titledbutton id="search-button" align="top" value="Search" onclick="OpenSearch('internet', document.getElementById('urlbar').value);" />
+
           <titledbutton id="print-button" align="top" value="&printButton.label;"  
                 onclick="BrowserPrint()">
             <observes element="canPrint" attribute="disabled"/>

xpfe/browser/resources/content/navigator.js

@@ -494,9 +494,11 @@ function UpdateBookmarksLastVisitiedDate(event)
     RefreshUrlbar();
   }
 
-function OpenSearch(tabName)
+function OpenSearch(tabName, searchStr)
 {
-	window.openDialog("resource:/res/samples/search.xul", "SearchWindow", "dialog=no,close,chrome,resizable", tabName);
+	dump("OpenSearch searchStr: '" + searchStr + "'\n\n");
+
+	window.openDialog("resource:/res/samples/search.xul", "SearchWindow", "dialog=no,close,chrome,resizable", tabName, searchStr);
 }
 
   function BrowserNewWindow()

xpfe/browser/resources/content/navigator.xul

@@ -323,10 +323,10 @@ Contributor(s): ______________________________________. -->
 		  <menuitem value="&appSpecificCmd.label;" onaction="BrowserReload();"/>
 		  <menuitem value="&appSpecificCmd.label;" onaction="BrowserReload();"/>
 		  <menuseparator />
-		  <menuitem value="&searchBookmarksHistoryCmd.label;" onaction="OpenSearch('find');"/>
-		  <menuitem value="&searchInternetCmd.label;" onaction="OpenSearch('internet');"/>
-		  <menuitem value="&searchAllMailCmd.label;" onaction="OpenSearch('mail');"/>
-		  <menuitem value="&searchAddressbookCmd.label;" onaction="OpenSearch('addressbook');"/>
+		  <menuitem value="&searchBookmarksHistoryCmd.label;" onaction="OpenSearch('find', null);"/>
+		  <menuitem value="&searchInternetCmd.label;" onaction="OpenSearch('internet', null);"/>
+		  <menuitem value="&searchAllMailCmd.label;" onaction="OpenSearch('mail', null);"/>
+		  <menuitem value="&searchAddressbookCmd.label;" onaction="OpenSearch('addressbook', null);"/>
 		  <menuseparator />
 		  <menuitem value="&searchComputerCmd.label;" onaction="BrowserReload();"/>
 	  </menupopup>
@@ -499,6 +499,8 @@ Contributor(s): ______________________________________. -->
             <spring flex="100%"/>
           </box>
 
+			<titledbutton id="search-button" align="top" value="Search" onclick="OpenSearch('internet', document.getElementById('urlbar').value);" />
+
           <titledbutton id="print-button" align="top" value="&printButton.label;"  
                 onclick="BrowserPrint()">
             <observes element="canPrint" attribute="disabled"/>

xpfe/browser/resources/skin/navigator.css

@@ -29,6 +29,10 @@ titledbutton#stop-button {
 	list-style-image:url(resource:/res/toolbar/TB_Stop.gif);
 } 
 
+titledbutton#search-button {
+	list-style-image:url(resource:/res/toolbar/TB_Reload.gif);
+}
+
 titledbutton#reload-button {
 	list-style-image:url(resource:/res/toolbar/TB_Reload.gif);
 }