From 57f42840a028b8b26b31d4445b0be1ce6f8effec Mon Sep 17 00:00:00 2001
From: "gerv%gerv.net" <gerv%gerv.net>
Date: Wed, 17 May 2006 02:30:16 +0000
Subject: [PATCH] Polish: fix alignment of a few things in preferences. Bug
 81671. Patch by doronr@naboonline.com, r=gerv, sr=blake.

---
 suite/common/pref/pref-proxies.xul | 14 +++++++-------
 suite/common/pref/pref-search.xul  | 18 ++++++++++--------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/suite/common/pref/pref-proxies.xul b/suite/common/pref/pref-proxies.xul
index bb33409d2f08..a3bdbbda1f34 100644
--- a/suite/common/pref/pref-proxies.xul
+++ b/suite/common/pref/pref-proxies.xul
@@ -69,8 +69,8 @@
         </columns>
         
         <rows>
-          <row>
-            <text class="label" value="&ftp.label;" accesskey="&ftp.accesskey;" for="networkProxyFTP"/>
+          <row autostretch="never">
+              <text class="label" value="&ftp.label;" accesskey="&ftp.accesskey;" for="networkProxyFTP"/>
             <box autostretch="never">
               <textbox id="networkProxyFTP" pref="true" preftype="string" prefstring="network.proxy.ftp"
                          prefattribute="value" flex="1"/>
@@ -79,7 +79,7 @@
                          prefattribute="value" size="5"/>
             </box>
           </row>
-          <row>
+          <row autostretch="never">
             <text class="label" value="&gopher.label;" accesskey="&gopher.accesskey;" for="networkProxyGopher"/>
             <box autostretch="never">
               <textbox id="networkProxyGopher" pref="true" preftype="string" prefstring="network.proxy.gopher"
@@ -90,7 +90,7 @@
                          prefattribute="value" size="5"/>
             </box>
           </row>
-          <row>
+          <row autostretch="never">
             <text class="label" value="&http.label;" accesskey="&http.accesskey;" for="networkProxyHTTP"/>
             <box autostretch="never">
               <textbox id="networkProxyHTTP" pref="true" preftype="string" prefstring="network.proxy.http"
@@ -100,7 +100,7 @@
                          prefattribute="value" size="5"/>
             </box>
           </row>
-          <row>
+          <row autostretch="never">
             <text class="label" value="&ssl.label;" accesskey="&ssl.accesskey;" for="networkProxySSL"/>
             <box autostretch="never">
               <textbox id="networkProxySSL" pref="true" preftype="string" prefstring="network.proxy.ssl"
@@ -110,7 +110,7 @@
                          prefattribute="value" size="5"/>
             </box>
           </row>
-          <row>
+          <row autostretch="never">
             <text class="label" value="&socks.label;" accesskey="&socks.accesskey;" for="networkProxySOCKS"/>
             <box autostretch="never">
               <textbox id="networkProxySOCKS" pref="true" preftype="string" prefstring="network.proxy.socks"
@@ -120,7 +120,7 @@
                        prefattribute="value" size="5"/>
             </box>
           </row>
-          <row> 
+          <row autostretch="never"> 
             <text class="label" value="&noproxy.label;" accesskey="&noproxy.accesskey;" for="networkProxyNone"/>
             <textbox id="networkProxyNone" pref="true" preftype="string" prefstring="network.proxy.no_proxies_on"
                        prefattribute="value"/>
diff --git a/suite/common/pref/pref-search.xul b/suite/common/pref/pref-search.xul
index 0976acdeea74..932ca2187cac 100755
--- a/suite/common/pref/pref-search.xul
+++ b/suite/common/pref/pref-search.xul
@@ -42,18 +42,20 @@
   <titledbox>
     <label value="&legendHeader;"/>
 
-    <text class="label" value="&defaultSearchEngine.label;" accesskey="&defaultSearchEngine.accesskey;" for="engineList"/>
-    <menulist id="engineList" ref="NC:SearchEngineRoot" datasources="rdf:internetsearch"
+    <box autostretch="never" valign="middle">
+      <text class="label" value="&defaultSearchEngine.label;" accesskey="&defaultSearchEngine.accesskey;" for="engineList"/>
+      <menulist id="engineList" ref="NC:SearchEngineRoot" datasources="rdf:internetsearch"
               sortResource="http://home.netscape.com/NC-rdf#Name" sortDirection="ascending"
               pref="true" preftype="string" prefstring="browser.search.defaultengine"
               prefattribute="value">
               
-      <template>
-        <menupopup>
-          <menuitem label="rdf:http://home.netscape.com/NC-rdf#Name" value="..." uri="..."/>
-        </menupopup>
-      </template>
-    </menulist>                      
+        <template>
+          <menupopup>
+            <menuitem label="rdf:http://home.netscape.com/NC-rdf#Name" value="..." uri="..."/>
+          </menupopup>
+        </template>
+      </menulist>
+    </box>                      
   </titledbox>
 
   <titledbox orient="vertical">