bugzilla bug 91753 - r=hwaara sr=sspitzer Search Button in search messages window relocation + other changes to match spec.

mailnews/base/search/resources/content/SearchDialog.xul

@@ -67,45 +67,42 @@ Rights Reserved.
   </commands>
 
   <dummy class="usesMailWidgets"/>
-  <vbox flex="1">
     
-    <groupbox flex="1">
-      <caption label="&conditions.label;"/>
-      <hbox align="center">
-        <label value="&searchHeading.label;"/>
-        <menulist id="searchableFolders" flex="2"/>
-        <spacer flex="1"/>
-          <checkbox id="checkSearchSubFolders" label="&searchSubfolders.label;" checked="true"/>
-      </hbox>
-      <separator/>
-      <label value="&conditionDesc.label;"/>
+    <vbox flex="1">
+      <vbox>
+         <hbox align="center">
+         <label value="&searchHeading.label;" accesskey="&searchHeading.accesskey;"/>
+         <menulist id="searchableFolders" flex="2"/>
+         <spacer flex="10"/>
+         <button label="&searchButton.label;" id="search-button" oncommand="onSearchButton(event);" default="true" accesskey="&searchButton.accesskey;"/>
+ 
+        </hbox>
+        <hbox align="center">
+             <checkbox id="checkSearchSubFolders" label="&searchSubfolders.label;" checked="true" accesskey="&searchSubfolders.accesskey;"/>
+             <spacer flex="2"/>
+             <button label="&resetButton.label;" oncommand="onReset(event);" accesskey="&resetButton.accesskey;"/>
+         </hbox>
+      </vbox>
 
       <hbox flex="1">
         <vbox id="searchTermListBox" flex="1"/>
-        <vbox>
-           <spacer flex="1"/>
-           <button label="&searchButton.label;" id="search-button" oncommand="onSearchButton(event);" default="true"/>
-           <button label="&resetButton.label;" oncommand="onReset(event);"/>
-           <spacer flex="1"/>
-         </vbox>
       </hbox>
-    </groupbox>
+    </vbox>
     
     <splitter id="gray_horizontal_splitter" collapse="after" persist="state">
       <grippy/>
     </splitter>
     
-    <groupbox orient="horizontal" flex="1">
-       <caption label="&results.label;"/>
-       <vbox id="searchTermListBox" flex="1">
+    <vbox flex="1">
+       <vbox id="searchResultListBox" flex="1" >
             <outliner id="threadOutliner" flex="1" context="threadPaneContext"/>
-            <statusbar id="status-bar" class="chromeclass-status"/>
 
        </vbox>
-       <vbox>
-            <spacer flex="1" />
-            <button label="&openButton.label;" id="openButton" command="cmd_open" />
+       <hbox align="start">
+            
+            <button label="&openButton.label;" id="openButton" command="cmd_open" accesskey="&openButton.accesskey;"/>
             <button id="fileMessageButton" type="menu" label="&fileButton.label;"
+                    accesskey="&fileButton.accesskey;"
                     observes="file_message_button"
                     oncommand="MoveMessageInSearch(event.target)" 
                     sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
@@ -174,11 +171,11 @@ Rights Reserved.
         </template>
       </button>
 
-      <button label="&deleteButton.label;" id="deleteButton" command="button_delete"/>
+      <button label="&deleteButton.label;" id="deleteButton" command="button_delete" accesskey="&deleteButton.accesskey;"/>
       <button label="&goToFolderButton.label;" id="goToFolderButton" command="goto_folder_button" accesskey="&goToFolderButton.accesskey;" />
       <spacer flex="1" />
-    </vbox>      
-  </groupbox>
+    </hbox>      
   </vbox>
+
   <statusbar class="chromeclass-status" id="status-bar"/>
 </window>

mailnews/base/search/resources/content/searchTermOverlay.xul

@@ -29,12 +29,12 @@
 
   <script src="chrome://messenger/content/searchTermOverlay.js"/>
 
-  <vbox id="searchTermListBox" class="indent">
+  <vbox id="searchTermListBox" >
 
     <radiogroup id="booleanAndGroup" orient="horizontal"
                 selectedItem="or" oncommand="booleanChanged(event);">
-      <radio value="and" label="&matchAll.label;"/>
-      <radio selected="true" value="or" label="&matchAny.label;"/>
+      <radio value="and" label="&matchAll.label;" accesskey="&matchAll.accesskey;"/>
+      <radio selected="true" value="or" label="&matchAny.label;" accesskey="&matchAny.accesskey;"/>
     </radiogroup>
     
     <hbox flex="1">
@@ -83,8 +83,8 @@
       </tree>
     </hbox>
     <hbox>
-      <button id="more" label="&more.label;" oncommand="onMore(event);"/>
-      <button id="less" label="&less.label;" disabled="true" oncommand="onLess(event);"/>
+      <button id="more" label="&more.label;" oncommand="onMore(event);" accesskey="&more.label;"/>
+      <button id="less" label="&less.label;" disabled="true" oncommand="onLess(event);" accesskey="&less.accesskey;"/>
     </hbox>
   </vbox>
 

mailnews/base/search/resources/locale/en-US/SearchDialog.dtd

@@ -1,13 +1,19 @@
 <!-- extracted from SearchDialog.xul -->
 
-<!ENTITY searchHeading.label         "Search for items in:">
+<!ENTITY searchHeading.label         "Search for messages in:">
+<!ENTITY searchHeading.accesskey     "S">
 <!ENTITY searchSubfolders.label      "Search subfolders">
+<!ENTITY searchSubfolders.accesskey  "e">
 <!ENTITY searchButton.label          "Search">
+<!ENTITY searchButton.accesskey      "h">
 <!ENTITY resetButton.label           "Clear">
+<!ENTITY resetButton.accesskey       "C">
 <!ENTITY optionsButton.label         "Options">
 <!ENTITY closeButton.label           "Close">
 <!ENTITY openButton.label            "Open">
+<!ENTITY openButton.accesskey        "n">
 <!ENTITY deleteButton.label          "Delete">
+<!ENTITY deleteButton.accesskey      "D">
 <!ENTITY searchDialogTitle.label     "Search Messages">
 <!ENTITY conditionDesc.label         "Search for messages that match:">
 <!ENTITY conditions.label            "Criteria">
@@ -15,5 +21,6 @@
 <!ENTITY fileHereMenu.label          "File Here">
 <!ENTITY fileHereMenu.accesskey      "F">
 <!ENTITY fileButton.label            "File">
-<!ENTITY goToFolderButton.label      "Go to Message Folder">
-<!ENTITY goToFolderButton.accesskey  "G">
+<!ENTITY fileButton.accesskey        "i">
+<!ENTITY goToFolderButton.label      "Open Message Folder">
+<!ENTITY goToFolderButton.accesskey  "r">

mailnews/base/search/resources/locale/en-US/searchTermOverlay.dtd

@@ -1,4 +1,9 @@
-<!ENTITY more.label "More">
-<!ENTITY less.label "Fewer">
-<!ENTITY matchAll.label "All of the following">
-<!ENTITY matchAny.label "Any of the following">
+<!ENTITY more.label         "More">
+<!ENTITY more.accesskey     "M">
+<!ENTITY less.label         "Fewer">
+<!ENTITY less.accesskey     "F">
+<!ENTITY matchAll.label     "Match all of the following">
+<!ENTITY matchAll.accesskey "a">
+<!ENTITY matchAny.label     "Match any of the following">
+<!ENTITY matchAny.accesskey "o">
+

themes/classic/messenger/searchDialog.css

@@ -34,3 +34,13 @@
 #searchTermTree {
   min-height: 50px;
 }
+
+#searchTermListBox {
+  height: 100px;
+}
+
+#searchResultListBox {
+  margin: 5px;
+  height: 100px;
+
+}

themes/modern/messenger/searchDialog.css

@@ -45,10 +45,16 @@
 
 /* ::::: Search Dialog adjustments ::::: */
 
-#fileMessageButton {
-   margin: 0px 0px 0px 0px;
- }
 
 #searchTermTree {
   min-height: 50px;
 }
+
+#searchTermListBox {
+  height: 100px;
+}
+
+#searchResultListBox {
+  margin: 5px;
+  height: 100px;
+}