[or-cvs] r13552: Well, I can't say it's definitely an aesthetic improvement.. (torbutton/trunk/src/chrome/content)

[mikeperry@xxxxxxxx]

Author: mikeperry
Date: 2008-02-18 02:25:11 -0500 (Mon, 18 Feb 2008)
New Revision: 13552

Modified:
   torbutton/trunk/src/chrome/content/preferences.xul
Log:

Well, I can't say it's definitely an aesthetic improvement..
But hey, it's smaller and still functional.



Modified: torbutton/trunk/src/chrome/content/preferences.xul
===================================================================
--- torbutton/trunk/src/chrome/content/preferences.xul	2008-02-18 05:47:26 UTC (rev 13551)
+++ torbutton/trunk/src/chrome/content/preferences.xul	2008-02-18 07:25:11 UTC (rev 13552)
@@ -16,18 +16,14 @@
 
     <script type="application/x-javascript" src="torbutton_util.js"/>
     <script type="application/x-javascript" src="preferences.js"/>
-    <groupbox>
-        <caption label="&torbutton.prefs.display_settings;"/>
-        <checkbox id="torbutton_displayStatusPanel" label="&torbutton.prefs.display_panel;" 
-                  oncommand="torbutton_prefs_set_field_attributes(document)"/>
-        <label class="indent" control="torbutton_panelStyle" value="&torbutton.prefs.panel_format;"/>
-        <radiogroup class="indent" id="torbutton_panelStyle">
-            <radio value="text" id="torbutton_panelStyleText" label="&torbutton.prefs.panel_text_format;"/>
-            <radio value="iconic" id="torbutton_panelStyleIcon" label="&torbutton.prefs.panel_icon_format;"/>
-        </radiogroup>
-    </groupbox>
-    <groupbox>
-        <caption label="&torbutton.prefs.tor_settings;"/>
+    <tabbox>
+     <tabs>
+      <tab label="&torbutton.prefs.tor_settings;"/>
+      <tab label="&torbutton.prefs.sec_settings;"/>
+      <tab label="&torbutton.prefs.display_settings;"/>
+     </tabs>
+     <tabpanels>
+    <tabpanel>
         <radiogroup id="torbutton_settingsMethod">
             <radio value="recommended" id="torbutton_useRecommendedSettings"
                    label="&torbutton.prefs.recommended_settings;"
@@ -111,11 +107,10 @@
         <label value="&torbutton.prefs.port;" control="socks_port"/>
         <textbox id="socks_port"/>
 -->
-    </groupbox>
-    <groupbox>
-        <caption label="&torbutton.prefs.sec_settings;"/>
-        <tabbox>
-         <tabs>
+    </tabpanel>
+    <tabpanel>
+        <tabbox style="border: 0px">
+         <tabs style="border: 0px">
           <tab label="&torbutton.prefs.dynamic;"/>
           <tab label="&torbutton.prefs.history;"/>
           <tab label="&torbutton.prefs.forms;"/>
@@ -124,8 +119,9 @@
           <tab label="&torbutton.prefs.shutdown;"/>
           <tab label="&torbutton.prefs.headers;"/>
          </tabs>
-         <tabpanels>
+         <tabpanels style="border: 0px">
           <tabpanel id="plugins">
+        <!-- XXX: Border? -->
            <vbox>
         <checkbox id="torbutton_disablePlugins" label="&torbutton.prefs.disable_plugins;" 
                   oncommand="torbutton_prefs_set_field_attributes(document)"/>
@@ -245,8 +241,22 @@
           </tabpanel>
          </tabpanels>
         </tabbox>
-    </groupbox>
+     </tabpanel>
+    <tabpanel>
+       <vbox>
+        <label class="indent" control="torbutton_panelStyle" value="&torbutton.prefs.panel_format;"/>
+        <radiogroup class="indent" id="torbutton_panelStyle">
+            <radio value="text" id="torbutton_panelStyleText" label="&torbutton.prefs.panel_text_format;"/>
+            <radio value="iconic" id="torbutton_panelStyleIcon" label="&torbutton.prefs.panel_icon_format;"/>
+        </radiogroup>
+        <checkbox id="torbutton_displayStatusPanel" label="&torbutton.prefs.display_panel;" 
+                  oncommand="torbutton_prefs_set_field_attributes(document)"/>
+       </vbox>
+    </tabpanel>
 
+    </tabpanels>
+   </tabbox>
+
 <!--
     <checkbox id="torbutton_warnUponExcludedSite" label="&torbutton.prefs.prompt_before_visiting_excluded_sites;" />
     <description>