ext-4015 Preferences: non-standard position of field labels

indra/newview/skins/default/xui/en/panel_preferences_privacy.xml

@@ -134,18 +134,6 @@
      name="show_timestamps_check_im"
      top_pad="10"
      width="237" />
-    <line_editor
-     bottom="366"
-     control_name="InstantMessageLogFolder"
-     enabled="false"
-     follows="top|left|right"
-     halign="right"
-     height="19"
-     layout="topleft"
-     left_delta="0"
-     mouse_opaque="false"
-     name="log_path_string"
-     top_pad="5" />
     <text
      type="string"
      length="1"
@@ -155,11 +143,23 @@
      left_delta="0"
      mouse_opaque="false"
      name="log_path_desc"
-     top_pad="1"
-     width="128"
-     text_color="LtGray_50">
-        Location of logs
+     top_pad="5"
+     width="128">
+        Location of logs:
     </text>    
+    <line_editor
+     bottom="366"
+     control_name="InstantMessageLogFolder"
+     enabled="false"
+     follows="top|left|right"
+     halign="right"
+     height="23"
+     layout="topleft"
+     left_delta="0"
+     mouse_opaque="false"
+     name="log_path_string"
+     top_pad="5"
+     width="250"/>
     <button
 	 enabled="false"
      follows="right|bottom"
@@ -167,9 +167,9 @@
      label="Browse"
      label_selected="Browse"
      layout="topleft"
-     left_pad="115"
+     left_pad="5"
      name="log_path_button"
-     top_delta="-21"
+     top_delta="0"
      width="145">
         <button.commit_callback
          function="Pref.LogPath" />

indra/newview/skins/default/xui/en/panel_preferences_setup.xml

@@ -134,20 +134,20 @@
 		 parameter="ChangeConnectionPort" />
     </check_box>
     <spinner
-     control_name="ConnectionPort"
-     enabled_control="ConnectionPortEnabled"
+     control_name="BrowserProxyPort"
+     enabled_control="BrowserProxyEnabled"
 	 decimal_digits="0"
      follows="left|top"
      height="23"
      increment="1"
-     initial_value="13000"
+     initial_value="80"
      label="Port number:"
      label_width="75"
      layout="topleft"
      left_delta="160"
-     max_val="13050"
-     min_val="13000"
-     name="connection_port"
+     max_val="12000"
+     min_val="10"
+     name="web_proxy_port"
      top_delta="-2"
      width="140" />
     <text
@@ -176,7 +176,7 @@
      max_val="1024"
      min_val="32"
      name="cache_size"
-     top_delta="-1"
+     top_delta="-2"
      width="180" />
     <text
      type="string"
@@ -191,6 +191,18 @@
      width="40">
         MB
     </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="80"
+     name="Cache location"
+     top_delta="20"
+     width="300">
+        Cache location:
+    </text>
     <line_editor
      control_name="CacheLocationTopFolder"
      border_style="line"
@@ -199,12 +211,12 @@
      follows="left|top"
      font="SansSerif"
      handle_edit_keys_directly="true"
-     height="20"
+     height="23"
      layout="topleft"
      left="80"
      max_length="4096"
      name="cache_location"
-     top_pad="20"
+     top_pad="5"
      width="205" />
     <button
      follows="left|top"
@@ -232,20 +244,6 @@
         <button.commit_callback
          function="Pref.ResetCache" />
     </button>
-
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="80"
-     name="Cache location"
-     top_delta="20"
-     width="300"
-     text_color="LtGray_50">
-        Cache location
-    </text>
     <text
      type="string"
      length="1"
@@ -296,53 +294,49 @@
      follows="left|top"
      height="16"
      initial_value="false"
-     control_name="BrowserProxyEnabled" 
-     label="Enable Web Proxy"
+     label="Web proxy"
      left_delta="0"
      mouse_opaque="true"
      name="web_proxy_enabled"
      radio_style="false"
-     width="400" />
-    <line_editor
-     control_name="BrowserProxyAddress"
-     enabled_control="BrowserProxyEnabled"
-	 follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left_delta="1"
-     name="web_proxy_editor"
-     tool_tip="The name or IP address of the proxy you would like to use"
-     top_pad="4"
-     width="200" />
+     width="400"
+     top_pad="5"/>
     <text
      type="string"
      length="1"
      follows="left|top"
      height="10"
      layout="topleft"
-     left_delta="0"
+     left_delta="1"
      name="Proxy location"
      top_delta="20"
-     width="300"
-     text_color="LtGray_50">
-        Proxy location
+     width="300">
+        Proxy location:
     </text>
-  <spinner
-     control_name="BrowserProxyPort"
+    <line_editor
+     control_name="BrowserProxyAddress"
      enabled_control="BrowserProxyEnabled"
-	 decimal_digits="0"
 	 follows="left|top"
+     font="SansSerif"
      height="23"
-     increment="1"
-     initial_value="80"
-     label="Port number:"
-     label_width="75"
      layout="topleft"
-     left_delta="230"
-     max_val="12000"
-     min_val="10"
-     name="web_proxy_port"
-     top_delta="-20"
-     width="140" />
+     left_delta="0"
+     name="web_proxy_editor"
+     tool_tip="The name or IP address of the proxy you would like to use"
+     top_pad="4"
+     width="200" />
+    <button
+     follows="left|top"
+     height="23"
+     enabled="false"
+     label="Browse"
+     label_selected="Browse"
+     layout="topleft"
+     left_pad="5"
+     name="set_proxy"
+     top_pad="-21"
+     width="100">
+        <button.commit_callback
+         function="Pref.SetCache" />
+    </button>
   </panel>